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

QmlDesigner: move code

Browse Source 
Change-Id: I5367fc95fb7d54fad7ad3dfbf77412e96613049b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-10-06 18:12:08 +02:00
parent 0c207683c0
commit 3218a831f0
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,17 +130,6 @@ static bool shouldAssertInException()
return !processEnvironment.value("QMLDESIGNER_ASSERT_ON_EXCEPTION").isEmpty(); return !processEnvironment.value("QMLDESIGNER_ASSERT_ON_EXCEPTION").isEmpty();
} }
static void switchTextDesign()
{
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);
}
}
QmlDesignerPlugin::QmlDesignerPlugin() QmlDesignerPlugin::QmlDesignerPlugin()
{ {
m_instance = this; m_instance = this;
@@ -206,7 +195,15 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e
MetaInfo::setPluginPaths(QStringList(pluginPath)); MetaInfo::setPluginPaths(QStringList(pluginPath));
createDesignModeWidget(); createDesignModeWidget();
connect(switchTextDesignAction, &QAction::triggered, this, &switchTextDesign); 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);
}
});
addAutoReleasedObject(new Internal::SettingsPage); addAutoReleasedObject(new Internal::SettingsPage);