@@ -530,16 +530,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
530
530
mSaveRollbackInProgress = false ;
531
531
activateDeactivateLayerRelatedActions ( NULL );
532
532
533
- QAction* actionOSMDownload = new QAction ( tr ( " Download data" ), this );
534
- connect ( actionOSMDownload, SIGNAL ( triggered () ), this , SLOT ( osmDownloadDialog () ) );
535
- QAction* actionOSMImport = new QAction ( tr ( " Import topology from XML" ), this );
536
- connect ( actionOSMImport, SIGNAL ( triggered () ), this , SLOT ( osmImportDialog () ) );
537
- QAction* actionOSMExport = new QAction ( tr ( " Export topology to SpatiaLite" ), this );
538
- connect ( actionOSMExport, SIGNAL ( triggered () ), this , SLOT ( osmExportDialog () ) );
539
- addPluginToVectorMenu ( " OpenStreetMap" , actionOSMDownload );
540
- addPluginToVectorMenu ( " OpenStreetMap" , actionOSMImport );
541
- addPluginToVectorMenu ( " OpenStreetMap" , actionOSMExport );
542
-
543
533
addDockWidget ( Qt::LeftDockWidgetArea, mUndoWidget );
544
534
mUndoWidget ->hide ();
545
535
@@ -1061,6 +1051,11 @@ void QgisApp::createActions()
1061
1051
connect ( mActionLocalCumulativeCutStretch , SIGNAL ( triggered () ), this , SLOT ( localCumulativeCutStretch () ) );
1062
1052
connect ( mActionFullCumulativeCutStretch , SIGNAL ( triggered () ), this , SLOT ( fullCumulativeCutStretch () ) );
1063
1053
1054
+ // Vector Menu Items
1055
+ connect ( mActionOSMDownload , SIGNAL ( triggered () ), this , SLOT ( osmDownloadDialog () ) );
1056
+ connect ( mActionOSMImport , SIGNAL ( triggered () ), this , SLOT ( osmImportDialog () ) );
1057
+ connect ( mActionOSMExport , SIGNAL ( triggered () ), this , SLOT ( osmExportDialog () ) );
1058
+
1064
1059
// Help Menu Items
1065
1060
1066
1061
#ifdef Q_WS_MAC
@@ -1312,10 +1307,6 @@ void QgisApp::createMenus()
1312
1307
// don't add it yet, wait for a plugin
1313
1308
mDatabaseMenu = new QMenu ( tr ( " &Database" ), menuBar () );
1314
1309
mDatabaseMenu ->setObjectName ( " mDatabaseMenu" );
1315
- // Vector Menu
1316
- // don't add it yet, wait for a plugin
1317
- mVectorMenu = new QMenu ( tr ( " Vect&or" ), menuBar () );
1318
- mVectorMenu ->setObjectName ( " mVectorMenu" );
1319
1310
// Web Menu
1320
1311
// don't add it yet, wait for a plugin
1321
1312
mWebMenu = new QMenu ( tr ( " &Web" ), menuBar () );
@@ -7101,31 +7092,6 @@ void QgisApp::addPluginToVectorMenu( QString name, QAction* action )
7101
7092
{
7102
7093
QMenu* menu = getVectorMenu ( name );
7103
7094
menu->addAction ( action );
7104
-
7105
- // add the Vector menu to the menuBar if not added yet
7106
- if ( mVectorMenu ->actions ().count () != 1 )
7107
- return ;
7108
-
7109
- QAction* before = NULL ;
7110
- QList<QAction*> actions = menuBar ()->actions ();
7111
- for ( int i = 0 ; i < actions.count (); i++ )
7112
- {
7113
- if ( actions.at ( i )->menu () == mVectorMenu )
7114
- return ;
7115
-
7116
- // goes before Raster menu, which is already in qgisapp.ui
7117
- if ( actions.at ( i )->menu () == mRasterMenu )
7118
- {
7119
- before = actions.at ( i );
7120
- break ;
7121
- }
7122
- }
7123
-
7124
- if ( before )
7125
- menuBar ()->insertMenu ( before, mVectorMenu );
7126
- else
7127
- // fallback insert
7128
- menuBar ()->insertMenu ( firstRightStandardMenu ()->menuAction (), mVectorMenu );
7129
7095
}
7130
7096
7131
7097
void QgisApp::addPluginToWebMenu ( QString name, QAction* action )
0 commit comments