diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip index eb579f8a1ba..b820da057bf 100644 --- a/python/gui/qgisinterface.sip +++ b/python/gui/qgisinterface.sip @@ -98,7 +98,7 @@ class QgisInterface : QObject /** Add "add layer" action to the layer menu * @note added in 1.7 */ - virtual void addAddLayer( QAction* action )=0; + virtual void insertAddLayerAction( QAction* action )=0; /** Remove "add layer" action from the layer menu * @note added in 1.7 diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index a1fb44f8a29..670b152c35a 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -5299,7 +5299,7 @@ QMenu* QgisApp::getDatabaseMenu( QString menuName ) return menu; } -void QgisApp::addAddLayer( QAction *action ) +void QgisApp::insertAddLayerAction( QAction *action ) { mLayerMenu->insertAction( mActionAddLayerSeparator, action ); } diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h index 1696832ef4e..66436e3e6b2 100644 --- a/src/app/qgisapp.h +++ b/src/app/qgisapp.h @@ -520,7 +520,7 @@ class QgisApp : public QMainWindow, private Ui::MainWindow //! Remove the action to the submenu with the given name under the Database menu void removePluginDatabaseMenu( QString name, QAction* action ); //! Add "add layer" action to layer menu - void addAddLayer( QAction* action ); + void insertAddLayerAction( QAction* action ); //! Remove "add layer" action to layer menu void removeAddLayer( QAction* action ); //! Add an icon to the plugin toolbar diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp index 104fbedddd3..6de900844c4 100644 --- a/src/app/qgisappinterface.cpp +++ b/src/app/qgisappinterface.cpp @@ -140,9 +140,9 @@ void QgisAppInterface::addPluginToMenu( QString name, QAction* action ) qgis->addPluginToMenu( name, action ); } -void QgisAppInterface::addAddLayer( QAction *action ) +void QgisAppInterface::insertAddLayerAction( QAction *action ) { - qgis->addAddLayer( action ); + qgis->insertAddLayerAction( action ); } void QgisAppInterface::removeAddLayer( QAction *action ) diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h index 0faa9ec5e5d..36368d81ffd 100644 --- a/src/app/qgisappinterface.h +++ b/src/app/qgisappinterface.h @@ -118,7 +118,7 @@ class QgisAppInterface : public QgisInterface void removePluginDatabaseMenu( QString name, QAction* action ); /** Add "add layer" action to the layer menu */ - void addAddLayer( QAction *action ); + void insertAddLayerAction( QAction *action ); /** remove "add layer" action from the layer menu */ void removeAddLayer( QAction *action ); diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h index 53742c1a5b6..02531bcefea 100644 --- a/src/gui/qgisinterface.h +++ b/src/gui/qgisinterface.h @@ -139,7 +139,7 @@ class GUI_EXPORT QgisInterface : public QObject /** Add "add layer" action to layer menu * @note added in 1.7 */ - virtual void addAddLayer( QAction *action ) = 0; + virtual void insertAddLayerAction( QAction *action ) = 0; /** Remove "add layer" action from layer menu * @note added in 1.7 diff --git a/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp b/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp index 6a1037a0766..50a1c55d3cf 100644 --- a/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp +++ b/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp @@ -109,7 +109,7 @@ void QgsDelimitedTextPlugin::initGui() connect( myQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) ); // Add the icon to the toolbar qGisInterface->addToolBarIcon( myQActionPointer ); - qGisInterface->addAddLayer( myQActionPointer ); + qGisInterface->insertAddLayerAction( myQActionPointer ); // this is called when the icon theme is changed connect( qGisInterface, SIGNAL( currentThemeChanged( QString ) ), this, SLOT( setCurrentTheme( QString ) ) ); diff --git a/src/plugins/oracle_raster/qgsoracle_plugin.cpp b/src/plugins/oracle_raster/qgsoracle_plugin.cpp index 6cbea889706..b4ad1fe93e4 100644 --- a/src/plugins/oracle_raster/qgsoracle_plugin.cpp +++ b/src/plugins/oracle_raster/qgsoracle_plugin.cpp @@ -61,7 +61,7 @@ void QgsOraclePlugin::initGui() connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) ); // Add the icon to the toolbar mQGisIface->addToolBarIcon( mQActionPointer ); - mQGisIface->addAddLayer( mQActionPointer ); + mQGisIface->insertAddLayerAction( mQActionPointer ); } //method defined in interface diff --git a/src/plugins/sqlanywhere/sqlanywhere.cpp b/src/plugins/sqlanywhere/sqlanywhere.cpp index bd6f835eaff..47a3ccc1903 100644 --- a/src/plugins/sqlanywhere/sqlanywhere.cpp +++ b/src/plugins/sqlanywhere/sqlanywhere.cpp @@ -86,7 +86,7 @@ void SqlAnywhere::initGui() // mQGisIface->addToolBarIcon( mActionAddSqlAnywhereLayer ); // Also add to Layer menu - mQGisIface->addAddLayer( mActionAddSqlAnywhereLayer ); + mQGisIface->insertAddLayerAction( mActionAddSqlAnywhereLayer ); } //method defined in interface diff --git a/src/plugins/wfs/qgswfsplugin.cpp b/src/plugins/wfs/qgswfsplugin.cpp index 6723891e52d..3989993590c 100644 --- a/src/plugins/wfs/qgswfsplugin.cpp +++ b/src/plugins/wfs/qgswfsplugin.cpp @@ -54,7 +54,7 @@ void QgsWFSPlugin::initGui() setCurrentTheme( "" ); QObject::connect( mWfsDialogAction, SIGNAL( triggered() ), this, SLOT( showSourceDialog() ) ); mIface->layerToolBar()->addAction( mWfsDialogAction ); - mIface->addAddLayer( mWfsDialogAction ); + mIface->insertAddLayerAction( mWfsDialogAction ); // this is called when the icon theme is changed connect( mIface, SIGNAL( currentThemeChanged( QString ) ), this, SLOT( setCurrentTheme( QString ) ) ); }