diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip index f90d6badb9ff..9eacbf198ddf 100644 --- a/python/gui/qgisinterface.sip +++ b/python/gui/qgisinterface.sip @@ -254,6 +254,9 @@ class QgisInterface : QObject virtual QMenu *editMenu() = 0; virtual QMenu *viewMenu() = 0; virtual QMenu *layerMenu() = 0; + /** \note added in 2.0 + */ + virtual QMenu *newLayerMenu() = 0; virtual QMenu *settingsMenu() = 0; virtual QMenu *pluginMenu() = 0; virtual QMenu *rasterMenu() = 0; diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h index 49dc265f5f64..cd006b6dbee0 100644 --- a/src/app/qgisapp.h +++ b/src/app/qgisapp.h @@ -351,6 +351,8 @@ class QgisApp : public QMainWindow, private Ui::MainWindow QMenu *editMenu() { return mEditMenu; } QMenu *viewMenu() { return mViewMenu; } QMenu *layerMenu() { return mLayerMenu; } + //! @note added in 2.0 + QMenu *newLayerMenu() { return mNewLayerMenu; } QMenu *settingsMenu() { return mSettingsMenu; } QMenu *pluginMenu() { return mPluginMenu; } QMenu *databaseMenu() { return mDatabaseMenu; } diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp index a209cf9ce9c1..579c5873c52f 100644 --- a/src/app/qgisappinterface.cpp +++ b/src/app/qgisappinterface.cpp @@ -362,6 +362,7 @@ QMenu *QgisAppInterface::fileMenu() { return qgis->fileMenu(); } 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::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 index c20aee3c369f..9c5fb3d45a7f 100644 --- a/src/app/qgisappinterface.h +++ b/src/app/qgisappinterface.h @@ -218,6 +218,8 @@ class QgisAppInterface : public QgisInterface virtual QMenu *editMenu(); virtual QMenu *viewMenu(); virtual QMenu *layerMenu(); + //! @note added in 2.0 + virtual QMenu *newLayerMenu(); virtual QMenu *settingsMenu(); virtual QMenu *pluginMenu(); virtual QMenu *rasterMenu(); diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h index 7052e9bb9287..475039c6c40a 100644 --- a/src/gui/qgisinterface.h +++ b/src/gui/qgisinterface.h @@ -303,6 +303,9 @@ class GUI_EXPORT QgisInterface : public QObject virtual QMenu *editMenu() = 0; virtual QMenu *viewMenu() = 0; virtual QMenu *layerMenu() = 0; + /** \note added in 2.0 + */ + virtual QMenu *newLayerMenu() = 0; virtual QMenu *settingsMenu() = 0; virtual QMenu *pluginMenu() = 0; virtual QMenu *rasterMenu() = 0; diff --git a/src/plugins/gps_importer/qgsgpsplugin.cpp b/src/plugins/gps_importer/qgsgpsplugin.cpp index becdc4fe24c1..e2c1fcb3d872 100644 --- a/src/plugins/gps_importer/qgsgpsplugin.cpp +++ b/src/plugins/gps_importer/qgsgpsplugin.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -95,7 +96,7 @@ void QgsGPSPlugin::initGui() connect( mCreateGPXAction, SIGNAL( triggered() ), this, SLOT( createGPX() ) ); mQGisInterface->layerToolBar()->addAction( mCreateGPXAction ); - mQGisInterface->insertAddLayerAction( mCreateGPXAction ); + mQGisInterface->newLayerMenu()->addAction( mCreateGPXAction ); mQGisInterface->addPluginToVectorMenu( tr( "&GPS" ), mQActionPointer ); mQGisInterface->addVectorToolBarIcon( mQActionPointer ); @@ -206,7 +207,7 @@ void QgsGPSPlugin::unload() { // remove the GUI mQGisInterface->layerToolBar()->removeAction( mCreateGPXAction ); - mQGisInterface->removeAddLayerAction( mCreateGPXAction ); + mQGisInterface->newLayerMenu()->removeAction( mCreateGPXAction ); mQGisInterface->removePluginVectorMenu( tr( "&GPS" ), mQActionPointer ); mQGisInterface->removeVectorToolBarIcon( mQActionPointer ); delete mQActionPointer; diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui index bdaefda8b701..0590101b95d8 100644 --- a/src/ui/qgisapp.ui +++ b/src/ui/qgisapp.ui @@ -17,7 +17,7 @@ 0 0 1052 - 25 + 24 @@ -140,14 +140,14 @@ &Layer - + New - + @@ -1970,19 +1970,19 @@ Acts on currently active editable layer - - true - - - - :/images/themes/default/mActionRotateFeature.png:/images/themes/default/mActionRotateFeature.png - - - Rotate Feature(s) - - - Rotate Feature(s) - + + true + + + + :/images/themes/default/mActionRotateFeature.png:/images/themes/default/mActionRotateFeature.png + + + Rotate Feature(s) + + + Rotate Feature(s) +