[FEATURE] toggle visibility of opened panels in main window

Accessible via: - View menu > Toggle Panels Visibility - Ctrl+Tab keyboard shortcut
qgis · Dec 15, 2016 · 3982498 · 3982498
1 parent 6377303
commit 3982498
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 10 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -368,10 +368,10 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   mToolbarMenu = new QMenu( tr( "&Toolbars" ), this );
   mToolbarMenu->setObjectName( QStringLiteral( "mToolbarMenu" ) );
   viewMenu->addSeparator();
-  viewMenu->addAction( mActionToggleFullScreen );
-  viewMenu->addAction( mActionHidePanels );
   viewMenu->addMenu( mPanelMenu );
   viewMenu->addMenu( mToolbarMenu );
+  viewMenu->addAction( mActionToggleFullScreen );
+  viewMenu->addAction( mActionHidePanels );
   // toolBar already exists, add other widgets as they are created
   mToolbarMenu->addAction( mComposerToolbar->toggleViewAction() );
   mToolbarMenu->addAction( mPaperNavToolbar->toggleViewAction() );
@@ -4048,11 +4048,6 @@ void QgsComposer::createComposerView()
 
   //view does not accept focus via tab
   mView->setFocusPolicy( Qt::ClickFocus );
-  //instead, if view is focused and tab is pressed than mActionHidePanels is triggered,
-  //to toggle display of panels
-  QShortcut* tab = new QShortcut( Qt::Key_Tab, mView );
-  tab->setContext( Qt::WidgetWithChildrenShortcut );
-  connect( tab, SIGNAL( activated() ), mActionHidePanels, SLOT( trigger() ) );
 }
 
 void QgsComposer::writeWorldFile( const QString& worldFileName, double a, double b, double c, double d, double e, double f ) const

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1714,6 +1714,7 @@ void QgisApp::createActions()
   // Settings Menu Items
 
   connect( mActionToggleFullScreen, SIGNAL( triggered() ), this, SLOT( toggleFullScreen() ) );
+  connect( mActionTogglePanelsVisibility, SIGNAL( triggered() ), this, SLOT( togglePanelsVisibility() ) );
   connect( mActionProjectProperties, SIGNAL( triggered() ), this, SLOT( projectProperties() ) );
   connect( mActionOptions, SIGNAL( triggered() ), this, SLOT( options() ) );
   connect( mActionCustomProjection, SIGNAL( triggered() ), this, SLOT( customProjection() ) );
@@ -1998,6 +1999,7 @@ void QgisApp::createMenus()
     mViewMenu->addMenu( mPanelMenu );
     mViewMenu->addMenu( mToolbarMenu );
     mViewMenu->addAction( mActionToggleFullScreen );
+    mViewMenu->addAction( mActionTogglePanelsVisibility );
   }
   else
   {
@@ -2006,6 +2008,7 @@ void QgisApp::createMenus()
     mSettingsMenu->insertMenu( before, mPanelMenu );
     mSettingsMenu->insertMenu( before, mToolbarMenu );
     mSettingsMenu->insertAction( before, mActionToggleFullScreen );
+    mSettingsMenu->insertAction( before, mActionTogglePanelsVisibility );
     mSettingsMenu->insertSeparator( before );
   }
 
@@ -5622,6 +5625,62 @@ void QgisApp::toggleFullScreen()
   }
 }
 
+void QgisApp::togglePanelsVisibility()
+{
+  QSettings settings;
+
+  QStringList docksTitle = settings.value( "UI/hiddenDocksTitle", QString() ).toStringList();
+  QStringList docksActive = settings.value( "UI/hiddenDocksActive", QString() ).toStringList();
+
+  QList<QDockWidget*> docks = findChildren<QDockWidget*>();
+  QList<QTabBar *> tabBars = findChildren<QTabBar *>();
+
+  if ( docksTitle.isEmpty() )
+  {
+
+    Q_FOREACH ( QDockWidget* dock, docks )
+    {
+      if ( dock->isVisible() && !dock->isFloating() )
+      {
+        docksTitle << dock->windowTitle();
+        dock->setVisible( false );
+      }
+    }
+
+    Q_FOREACH ( QTabBar* tabBar, tabBars )
+    {
+      docksActive << tabBar->tabText( tabBar->currentIndex() );
+    }
+
+    settings.setValue( QStringLiteral( "/UI/hiddenDocksTitle" ), docksTitle );
+    settings.setValue( QStringLiteral( "/UI/hiddenDocksActive" ), docksActive );
+  }
+  else
+  {
+    Q_FOREACH ( QDockWidget* dock, docks )
+    {
+      if ( docksTitle.contains( dock->windowTitle() ) )
+      {
+        dock->setVisible( true );
+      }
+    }
+
+    Q_FOREACH ( QTabBar* tabBar, tabBars )
+    {
+      for ( int i = 0; i < tabBar->count(); ++i )
+      {
+        if ( docksActive.contains( tabBar->tabText( i ) ) )
+        {
+          tabBar->setCurrentIndex( i );
+        }
+      }
+    }
+
+    settings.setValue( QStringLiteral( "/UI/hiddenDocksTitle" ), QStringList() );
+    settings.setValue( QStringLiteral( "/UI/hiddenDocksActive" ), QStringList() );
+  }
+}
+
 void QgisApp::showActiveWindowMinimized()
 {
   QWidget *window = QApplication::activeWindow();

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -418,6 +418,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     QAction *actionShowPythonDialog() { return mActionShowPythonDialog; }
 
     QAction *actionToggleFullScreen() { return mActionToggleFullScreen; }
+    QAction *actionTogglePanelsVisibility() { return mActionTogglePanelsVisibility; }
     QAction *actionOptions() { return mActionOptions; }
     QAction *actionCustomProjection() { return mActionCustomProjection; }
     QAction *actionConfigureShortcuts() { return mActionConfigureShortcuts; }
@@ -1279,6 +1280,9 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     //! Toggle full screen mode
     void toggleFullScreen();
 
+    //! Toggle visibility of opened panels
+    void togglePanelsVisibility();
+
     //! Set minimized mode of active window
     void showActiveWindowMinimized();
 

diff --git a/src/ui/composer/qgscomposerbase.ui b/src/ui/composer/qgscomposerbase.ui
@@ -1038,13 +1038,13 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>&amp;Hide Panels</string>
+    <string>Toggle Panel &amp;Visibility</string>
    </property>
    <property name="toolTip">
     <string>Hide panels</string>
    </property>
    <property name="shortcut">
-    <string>F10</string>
+    <string>Ctrl+Tab</string>
    </property>
   </action>
   <action name="mActionShowPage">

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -1548,12 +1548,20 @@
   </action>
   <action name="mActionToggleFullScreen">
    <property name="text">
-    <string>Toggle Full Screen Mode</string>
+    <string>Toggle Full Scr&amp;een Mode</string>
    </property>
    <property name="shortcut">
     <string>F11</string>
    </property>
   </action>
+  <action name="mActionTogglePanelsVisibility">
+   <property name="text">
+    <string>Toggle Panel &amp;Visibility</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Tab</string>
+   </property>
+  </action>
   <action name="mActionProjectProperties">
    <property name="icon">
     <iconset resource="../../images/images.qrc">