Merge pull request #1578 from alexbruy/layer-submenu

move all "Add Layer" actions to submenu
qgis · Sep 9, 2014 · 47613da · 47613da
2 parents b9fc2b5 + e037697
commit 47613da
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 15 deletions.
diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip
@@ -337,6 +337,9 @@ class QgisInterface : QObject
     /** \note added in 2.0
     */
     virtual QMenu *newLayerMenu() = 0;
+    /** \note added in 2.5
+    */
+    virtual QMenu *addLayerMenu() = 0;
     virtual QMenu *settingsMenu() = 0;
     virtual QMenu *pluginMenu() = 0;
     virtual QMenu *rasterMenu() = 0;

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8145,12 +8145,12 @@ QMenu* QgisApp::getWebMenu( QString menuName )
 
 void QgisApp::insertAddLayerAction( QAction *action )
 {
-  mLayerMenu->insertAction( mActionAddLayerSeparator, action );
+  mAddLayerMenu->insertAction( mActionAddLayerSeparator, action );
 }
 
 void QgisApp::removeAddLayerAction( QAction *action )
 {
-  mLayerMenu->removeAction( action );
+  mAddLayerMenu->removeAction( action );
 }
 
 void QgisApp::addPluginToDatabaseMenu( QString name, QAction* action )

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -394,6 +394,8 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     QMenu *layerMenu() { return mLayerMenu; }
     //! @note added in 2.0
     QMenu *newLayerMenu() { return mNewLayerMenu; }
+    //! @note added in 2.5
+    QMenu *addLayerMenu() { return mAddLayerMenu; }
     QMenu *settingsMenu() { return mSettingsMenu; }
     QMenu *pluginMenu() { return mPluginMenu; }
     QMenu *databaseMenu() { return mDatabaseMenu; }

diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -449,6 +449,7 @@ QMenu *QgisAppInterface::editMenu() { return qgis->editMenu(); }
 QMenu *QgisAppInterface::viewMenu() { return qgis->viewMenu(); }
 QMenu *QgisAppInterface::layerMenu() { return qgis->layerMenu(); }
 QMenu *QgisAppInterface::newLayerMenu() { return qgis->newLayerMenu(); }
+QMenu *QgisAppInterface::addLayerMenu() { return qgis->addLayerMenu(); }
 QMenu *QgisAppInterface::settingsMenu() { return qgis->settingsMenu(); }
 QMenu *QgisAppInterface::pluginMenu() { return qgis->pluginMenu(); }
 QMenu *QgisAppInterface::rasterMenu() { return qgis->rasterMenu(); }

diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h
@@ -298,6 +298,8 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
     virtual QMenu *layerMenu();
     //! @note added in 2.0
     virtual QMenu *newLayerMenu();
+    //! @note added in 2.5
+    virtual QMenu *addLayerMenu();
     virtual QMenu *settingsMenu();
     virtual QMenu *pluginMenu();
     virtual QMenu *rasterMenu();

diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h
@@ -389,6 +389,9 @@ class GUI_EXPORT QgisInterface : public QObject
     /** \note added in 2.0
     */
     virtual QMenu *newLayerMenu() = 0;
+    /** \note added in 2.5
+    */
+    virtual QMenu *addLayerMenu() = 0;
     virtual QMenu *settingsMenu() = 0;
     virtual QMenu *pluginMenu() = 0;
     virtual QMenu *rasterMenu() = 0;

diff --git a/src/plugins/oracle_raster/qgsoracle_plugin.cpp b/src/plugins/oracle_raster/qgsoracle_plugin.cpp
@@ -64,7 +64,7 @@ void QgsOraclePlugin::initGui()
   // Add the icon to the new layers toolbar
   mQGisIface->layerToolBar()->insertAction( mQGisIface->actionAddWmsLayer(), mQActionPointer );
   // Also add to Layer menu
-  mQGisIface->layerMenu()->insertAction( mQGisIface->actionAddWmsLayer(), mQActionPointer );
+  mQGisIface->insertAddLayerAction( mQActionPointer );
 }
 //method defined in interface
 

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -17,7 +17,7 @@
      <x>0</x>
      <y>0</y>
      <width>1050</width>
-     <height>25</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="mProjectMenu">
@@ -132,20 +132,26 @@
      <addaction name="mActionNewVectorLayer"/>
      <addaction name="mActionNewSpatiaLiteLayer"/>
     </widget>
+    <widget class="QMenu" name="mAddLayerMenu">
+     <property name="title">
+      <string>Add</string>
+     </property>
+     <addaction name="mActionAddOgrLayer"/>
+     <addaction name="mActionAddRasterLayer"/>
+     <addaction name="mActionAddPgLayer"/>
+     <addaction name="mActionAddSpatiaLiteLayer"/>
+     <addaction name="mActionAddMssqlLayer"/>
+     <addaction name="mActionAddOracleLayer"/>
+     <addaction name="mActionAddWmsLayer"/>
+     <addaction name="mActionAddLayerSeparator"/>
+     <addaction name="mActionAddWcsLayer"/>
+     <addaction name="mActionAddWfsLayer"/>
+     <addaction name="mActionAddDelimitedText"/>
+    </widget>
     <addaction name="mNewLayerMenu"/>
+    <addaction name="mAddLayerMenu"/>
     <addaction name="mActionEmbedLayers"/>
     <addaction name="mActionAddLayerDefinition"/>
-    <addaction name="mActionAddOgrLayer"/>
-    <addaction name="mActionAddRasterLayer"/>
-    <addaction name="mActionAddPgLayer"/>
-    <addaction name="mActionAddSpatiaLiteLayer"/>
-    <addaction name="mActionAddMssqlLayer"/>
-    <addaction name="mActionAddOracleLayer"/>
-    <addaction name="mActionAddWmsLayer"/>
-    <addaction name="mActionAddLayerSeparator"/>
-    <addaction name="mActionAddWcsLayer"/>
-    <addaction name="mActionAddWfsLayer"/>
-    <addaction name="mActionAddDelimitedText"/>
     <addaction name="separator"/>
     <addaction name="mActionCopyStyle"/>
     <addaction name="mActionPasteStyle"/>