sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rollback changes to app

Browse Source 
There's no need for a dedicated 'Add GeoNode layer' menu entry,
as the unified data source manager has been designed to replace
all these specific provider based actions.
This commit is contained in:
Nyall Dawson 2017-09-06 07:49:58 +10:00
parent 46b1e7d3bb
commit 876936900b
4 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/qgisapp.cpp
View File

@ -294,7 +294,6 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
#include "qgsuserprofile.h"
#include "qgssublayersdialog.h"
#include "geonode/qgsgeonodesourceselect.h"
#include "ogr/qgsvectorlayersaveasdialog.h"
#include "qgsosmdownloaddialog.h"
@ -1022,11 +1021,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
mActionInstallFromZip = nullptr;
}
// add geonode menu under web menu
addPluginToWebMenu( mGeonodeMenu->title(), mActionAddGeonodeLayer );
mActionAddGeonodeLayer = new QAction( tr( "Add GeoNode Layers..." ), this );
mGeonodeMenu->addAction( mActionAddGeonodeLayer );
// Set icon size of toolbars
if ( settings.contains( QStringLiteral( "IconSize" ) ) )
{
@ -1795,8 +1789,6 @@ void QgisApp::createActions()
connect( mActionLabeling, &QAction::triggered, this, &QgisApp::labeling );
connect( mActionStatisticalSummary, &QAction::triggered, this, &QgisApp::showStatisticsDockWidget );
// Web Menu Items
// Layer Menu Items
connect( mActionDataSourceManager, &QAction::triggered, this, [ = ]() { dataSourceManager(); } );
@ -1822,7 +1814,6 @@ void QgisApp::createActions()
connect( mActionAddAmsLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "arcgismapserver" ) ); } );
connect( mActionAddDelimitedText, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "delimitedtext" ) ); } );
connect( mActionAddVirtualLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "virtual" ) ); } );
connect( mActionAddGeonodeLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "geonode" ) ); } );
connect( mActionOpenTable, &QAction::triggered, this, &QgisApp::attributeTable );
connect( mActionOpenFieldCalc, &QAction::triggered, this, &QgisApp::fieldCalculator );
connect( mActionToggleEditing, &QAction::triggered, this, [ = ] { toggleEditing(); } );
@ -2098,12 +2089,6 @@ void QgisApp::createMenus()
mToolbarMenu = new QMenu( tr( "Toolbars" ), this );
mToolbarMenu->setObjectName( QStringLiteral( "mToolbarMenu" ) );
// Geonode Submenu
mGeonodeMenu = new QMenu( tr( "GeoNode" ), this );
mGeonodeMenu->setObjectName( QStringLiteral( "mGeonodeMenu" ) );
// Geonode Action
mActionAddGeonodeLayer = new QAction( tr( "Add GeoNode Layers..." ), this );
// Get platform for menu layout customization (Gnome, Kde, Mac, Win)
QDialogButtonBox::ButtonLayout layout =
QDialogButtonBox::ButtonLayout( style()->styleHint( QStyle::SH_DialogButtonLayout, nullptr, this ) );

4
src/app/qgisapp.h
View File

@ -439,8 +439,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
QAction *actionShowBookmarks() { return mActionShowBookmarks; }
QAction *actionDraw() { return mActionDraw; }
QAction *actionAddGeonodeLayer() { return mActionAddGeonodeLayer; }
QAction *actionDataSourceManager() { return mActionDataSourceManager; }
QAction *actionNewVectorLayer() { return mActionNewVectorLayer; }
QAction *actionNewSpatialLiteLayer() { return mActionNewSpatiaLiteLayer; }
@ -1748,7 +1746,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
QAction *mActionPluginSeparator1 = nullptr;
QAction *mActionPluginSeparator2 = nullptr;
QAction *mActionRasterSeparator = nullptr;
QAction *mActionAddGeonodeLayer = nullptr;
// action groups ----------------------------------
QActionGroup *mMapToolGroup = nullptr;
@ -1761,7 +1758,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
#endif
QMenu *mPanelMenu = nullptr;
QMenu *mToolbarMenu = nullptr;
QMenu *mGeonodeMenu = nullptr;
// docks ------------------------------------------
QgsDockWidget *mLayerTreeDock = nullptr;

3
src/app/qgisappinterface.cpp
View File

@ -652,9 +652,6 @@ QAction *QgisAppInterface::actionNewBookmark() { return qgis->actionNewBookmark(
QAction *QgisAppInterface::actionShowBookmarks() { return qgis->actionShowBookmarks(); }
QAction *QgisAppInterface::actionDraw() { return qgis->actionDraw(); }
//! Web menu actions
QAction *QgisAppInterface::actionAddGeonodeLayer() { return qgis->actionAddGeonodeLayer(); }
//! Layer menu actions
QAction *QgisAppInterface::actionNewVectorLayer() { return qgis->actionNewVectorLayer(); }
QAction *QgisAppInterface::actionAddOgrLayer() { return qgis->actionAddOgrLayer(); }

3
src/app/qgisappinterface.h
View File

@ -399,9 +399,6 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
virtual QAction *actionShowBookmarks() override;
virtual QAction *actionDraw() override;
//! Web menu actions
virtual QAction *actionAddGeonodeLayer();
//! Layer menu actions
virtual QAction *actionNewVectorLayer() override;
virtual QAction *actionAddOgrLayer() override;