feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Show ui.qml reminder only once

Browse Source 
Show the dialog to open ui.qml files only once
if the user decides to cancel.

Moving this into a function.

Task-number: QDS-9470
Change-Id: I569aa063594de0012e30cdfe3c5f1f7096df7622
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Thomas Hartmann
2025-03-14 15:13:24 +01:00
committed by Thomas Hartmann
parent 54470472d6
commit f7831fdad2
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -489,6 +489,26 @@ void QmlDesignerPlugin::setupDesigner()
d->shortCutManager.updateUndoActions(currentDesignDocument());
}
static bool checkUiQMLNagScreen(const Utils::FilePath &fileName)
{
const QStringList allUiQmlFiles = allUiQmlFilesforCurrentProject(fileName);
static bool doOnce = true;
if (doOnce && warningsForQmlFilesInsteadOfUiQmlEnabled() && !fileName.endsWith(".ui.qml")
&& !allUiQmlFiles.isEmpty()) {
OpenUiQmlFileDialog dialog(Core::ICore::dialogParent());
dialog.setUiQmlFiles(projectPath(fileName), allUiQmlFiles);
dialog.exec();
if (dialog.uiFileOpened()) {
Core::ModeManager::activateMode(Core::Constants::MODE_EDIT);
Core::EditorManager::openEditorAt({Utils::FilePath::fromString(dialog.uiQmlFile()), 0, 0});
return true;
}
doOnce = false;
}
return false;
}
void QmlDesignerPlugin::showDesigner()
{
QTC_ASSERT(!d->documentManager.hasCurrentDesignDocument(), return);
@@ -497,20 +517,8 @@ void QmlDesignerPlugin::showDesigner()
d->mainWidget.initialize();
const Utils::FilePath fileName = Core::EditorManager::currentEditor()->document()->filePath();
const QStringList allUiQmlFiles = allUiQmlFilesforCurrentProject(fileName);
if (warningsForQmlFilesInsteadOfUiQmlEnabled() && !fileName.endsWith(".ui.qml")
&& !allUiQmlFiles.isEmpty()) {
OpenUiQmlFileDialog dialog(&d->mainWidget);
dialog.setUiQmlFiles(projectPath(fileName), allUiQmlFiles);
dialog.exec();
if (dialog.uiFileOpened()) {
Core::ModeManager::activateMode(Core::Constants::MODE_EDIT);
Core::EditorManager::openEditorAt(
{Utils::FilePath::fromString(dialog.uiQmlFile()), 0, 0});
return;
}
}
if (checkUiQMLNagScreen(Core::EditorManager::currentEditor()->document()->filePath()))
return;
setupDesigner();