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

QmlDesigner: refactor setup/integration code

Browse Source 
- moved switchTextFormAction to shortcut manager
 - renamed createDesignModeWidget
 - remove unncessary DesignerSettingsKey::TEXTEDIT_IN_DESIGNMODE
   (supporting it in future would be too much effort)
 - using delayed registration inside QtCreator
   (which does not bring more speed, but more time for the codemodel
    in case of opening a qml.ui file directly)

Change-Id: I1fd05f161e4bf4659c5a2fb09705b1f67d6f8e36
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2017-01-23 17:42:26 +01:00
parent 6b3df52690
commit 946d66b500
7 changed files with 41 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/shortcutmanager.cpp
View File

@@ -86,6 +86,7 @@ ShortCutManager::ShortCutManager()
m_toggleLeftSidebarAction(tr("Toggle &Left Sidebar"), 0),
m_toggleRightSidebarAction(tr("Toggle &Right Sidebar"), 0),
m_goIntoComponentAction(tr("&Go into Component"), 0),
m_switchTextFormAction(tr("Switch Text/Design"), 0),
m_escapeAction(this)
{
@@ -131,6 +132,11 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex
QmlDesignerPlugin::instance()->mainWidget(),
&Internal::DesignModeWidget::toggleRightSidebar);
connect(&m_switchTextFormAction,
&QAction::triggered,
QmlDesignerPlugin::instance()->mainWidget(),
&Internal::DesignModeWidget::switchTextOrForm);
connect(&m_collapseExpandStatesAction, &QAction::triggered, [] {
QmlDesignerPlugin::instance()->viewManager().toggleStatesViewExpanded();
});
@@ -252,6 +258,9 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex
command->setAttribute(Core::Command::CA_Hide);
viewsMenu->addAction(command);
command = Core::ActionManager::registerAction(&m_switchTextFormAction, QmlDesigner::Constants::SWITCH_TEXT_DESIGN, qmlDesignerMainContext);
command->setDefaultKeySequence(QKeySequence(Qt::Key_F4));
/* Registering disabled action for Escape, because Qt Quick does not support shortcut overrides. */
command = Core::ActionManager::registerAction(&m_escapeAction, Core::Constants::S_RETURNTOEDITOR, qmlDesignerMainContext);
command->setDefaultKeySequence(QKeySequence(Qt::Key_Escape));