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

Made Qt Quick Designer editor opening modal

Browse Source 
If you're in Design mode, any new editors will open in design mode
as well. If you're in Edit mode, new editors will open in Edit mode.

Task-number: BAUHAUS-609
This commit is contained in:
Lasse Holmstedt
2010-04-26 10:19:19 +02:00
parent 71297db227
commit fe48286ecc
4 changed files with 14 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -595,16 +595,22 @@ static bool openInDesignMode()
}
if (!bauhausPresent)
return false;
// Query the bauhaus setting if it wants to be opened in Design mode.
const QString settingsKey = QLatin1String(QmlDesigner::Constants::QML_SETTINGS_GROUP)
+ QLatin1Char('/') + QLatin1String(QmlDesigner::Constants::QML_DESIGNER_SETTINGS_GROUP)
+ QLatin1Char('/') + QLatin1String(QmlDesigner::Constants::QML_OPENDESIGNMODE_SETTINGS_KEY);
const QVariant openDesignMode = Core::ICore::instance()->settings()->value(settingsKey);
return openDesignMode.isValid() ? openDesignMode.toBool() : bool(QmlDesigner::Constants::QML_OPENDESIGNMODE_DEFAULT);
return bool(QmlDesigner::Constants::QML_OPENDESIGNMODE_DEFAULT);
}
QString QmlJSEditorEditable::preferredMode() const
{
Core::ModeManager *modeManager = Core::ModeManager::instance();
if (modeManager->currentMode()->id() == Core::Constants::MODE_DESIGN
|| modeManager->currentMode()->id() == Core::Constants::MODE_EDIT)
{
return modeManager->currentMode()->id();
}
// if we are in other mode than edit or design, use the hard-coded default.
// because the editor opening decision is modal, it would be confusing to
// have the user also access to this failsafe setting.
if (editor()->mimeType() == QLatin1String(QmlJSEditor::Constants::QML_MIMETYPE)
&& openInDesignMode())
return QLatin1String(Core::Constants::MODE_DESIGN);