Integrate ADS in QtCreator

 - Integrate DockManager in DesignModeWidget (create factory default
   workspace, create menu items, add qds constants, remove unused
   shortcuts)
 - Remove unused functions and variables due to new docking system usage
 - Add DockWidget style sheet to resources
 - Fix scrollbar style by merging base and scrollbar style sheets
 - Fix update of StatesEditorWidget when switching tabs
 - Add missing unique ids in widget info
 - Set minimum size on ItemLibraryWidget

Change-Id: I08be6d753233fc767037a33b41af335cec6d43b1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

1 files changed, 0 insertions, 45 deletions

diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp
index 45e7519474..d4dac41cf4 100644
--- a/src/plugins/qmldesigner/shortcutmanager.cpp
+++ b/src/plugins/qmldesigner/shortcutmanager.cpp
@@ -53,7 +53,6 @@
 
 #include "qmldesignerconstants.h"
 #include "qmldesignerplugin.h"
-#include "designmodewidget.h"
 
 #include <QApplication>
 #include <QClipboard>
@@ -71,10 +70,6 @@ ShortCutManager::ShortCutManager()
     m_pasteAction(tr("&Paste")),
     m_selectAllAction(tr("Select &All")),
     m_collapseExpandStatesAction(tr("Toggle States")),
-    m_restoreDefaultViewAction(tr("&Restore Default View")),
-    m_toggleLeftSidebarAction(tr("Toggle &Left Sidebar")),
-    m_toggleRightSidebarAction(tr("Toggle &Right Sidebar")),
-    m_switchTextFormAction(tr("Switch Text/Design")),
     m_escapeAction(this)
 {
 
@@ -101,26 +96,6 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex
 
     connect(&m_selectAllAction,&QAction::triggered, this, &ShortCutManager::selectAll);
 
-    connect(&m_restoreDefaultViewAction,
-            &QAction::triggered,
-            QmlDesignerPlugin::instance()->mainWidget(),
-            &Internal::DesignModeWidget::restoreDefaultView);
-
-    connect(&m_toggleLeftSidebarAction,
-            &QAction::triggered,
-            QmlDesignerPlugin::instance()->mainWidget(),
-            &Internal::DesignModeWidget::toggleLeftSidebar);
-
-    connect(&m_toggleRightSidebarAction,
-            &QAction::triggered,
-            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();
     });
@@ -216,21 +191,11 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex
 
     Core::ActionContainer *viewsMenu = Core::ActionManager::actionContainer(Core::Constants::M_WINDOW_VIEWS);
 
-    Core::ActionManager::registerAction(&m_toggleLeftSidebarAction, Core::Constants::TOGGLE_LEFT_SIDEBAR, qmlDesignerMainContext);
-    Core::ActionManager::registerAction(&m_toggleRightSidebarAction, Core::Constants::TOGGLE_RIGHT_SIDEBAR, qmlDesignerMainContext);
-
     command = Core::ActionManager::registerAction(&m_collapseExpandStatesAction,  Constants::TOGGLE_STATES_EDITOR, qmlDesignerMainContext);
     command->setAttribute(Core::Command::CA_Hide);
     command->setDefaultKeySequence(QKeySequence("Ctrl+Alt+s"));
     viewsMenu->addAction(command);
 
-    command = Core::ActionManager::registerAction(&m_restoreDefaultViewAction,  Constants::RESTORE_DEFAULT_VIEW, qmlDesignerMainContext);
-    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));
@@ -326,16 +291,6 @@ void ShortCutManager::selectAll()
         currentDesignDocument()->selectAll();
 }
 
-void ShortCutManager::toggleLeftSidebar()
-{
-    QmlDesignerPlugin::instance()->mainWidget()->toggleLeftSidebar();
-}
-
-void ShortCutManager::toggleRightSidebar()
-{
-     QmlDesignerPlugin::instance()->mainWidget()->toggleRightSidebar();
-}
-
 void ShortCutManager::connectUndoActions(DesignDocument *designDocument)
 {
     if (designDocument) {