From 6cd31a2b985e419531fe7c67e55be4c1de2f37cf Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Mon, 24 Oct 2016 11:49:40 +0200 Subject: [PATCH] QmlDesigner: deactivate use of F4 to switch in design mode Introduce a setting for a not implemented in design text edit. Change-Id: Ie4973ec4fcb2c9b2e2534e40187cf33a0202abaa Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designersettings.h | 1 + src/plugins/qmldesigner/qmldesignerplugin.cpp | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h index bc53d15aca1..0756be0d974 100644 --- a/src/plugins/qmldesigner/designersettings.h +++ b/src/plugins/qmldesigner/designersettings.h @@ -60,6 +60,7 @@ const char FORWARD_PUPPET_OUTPUT[] = "ForwardPuppetOutput"; const char REFORMAT_UI_QML_FILES[] = "ReformatUiQmlFiles"; /* This Setting is not exposed in ui. The setting can be used to turn off the feature, if there are serious issues */ +const char TEXTEDIT_IN_DESIGNMODE[] = "TextEditInDesignMode"; } class DesignerSettings : public QHash diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index a0ba2a936ee..0cca310bc7f 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -130,6 +130,12 @@ static bool shouldAssertInException() return !processEnvironment.value("QMLDESIGNER_ASSERT_ON_EXCEPTION").isEmpty(); } +static bool useTextEditInDesignMode() +{ + DesignerSettings settings = QmlDesignerPlugin::instance()->settings(); + return settings.value(DesignerSettingsKey::TEXTEDIT_IN_DESIGNMODE, false).toBool(); +} + static bool warningsForQmlFilesInsteadOfUiQmlEnabled() { DesignerSettings settings = QmlDesignerPlugin::instance()->settings(); @@ -208,12 +214,11 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e createDesignModeWidget(); connect(switchTextDesignAction, &QAction::triggered, this, [](){ - if (Core::ModeManager::currentMode() == Core::Constants::MODE_EDIT) { - Core::IEditor *editor = Core::EditorManager::currentEditor(); - if (checkIfEditorIsQtQuick(editor)) - Core::ModeManager::activateMode(Core::Constants::MODE_DESIGN); - } else if (Core::ModeManager::currentMode() == Core::Constants::MODE_DESIGN) { - Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); + if (Core::ModeManager::currentMode() == Core::Constants::MODE_DESIGN) { + if (useTextEditInDesignMode()) + qDebug() << "not implemented"; + else + Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); } });