Fix crs tab opening when clicking crs button in status bar

and cleanup code a lot
qgis · Nov 27, 2020 · 26a7add · 26a7add
1 parent d95820b
commit 26a7add
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 22 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -14389,10 +14389,8 @@ void QgisApp::showMapTip()
 
 void QgisApp::projectPropertiesProjections()
 {
-  // Driver to display the project props dialog and switch to the
-  // projections tab
-  mShowProjectionTab = true;
-  projectProperties();
+  // display the project props dialog and switch to the projections tab
+  projectProperties( QStringLiteral( "mProjOptsCRS" ) );
 }
 
 void QgisApp::projectProperties( const QString &currentPage )
@@ -14412,13 +14410,8 @@ void QgisApp::projectProperties( const QString &currentPage )
   }
   QgsProjectProperties *pp = new QgsProjectProperties( mMapCanvas, this, QgsGuiUtils::ModalDialogFlags, factories );
 
-  // if called from the status bar, show the projection tab
-  if ( mShowProjectionTab )
-  {
-    pp->showProjectionsTab();
-    mShowProjectionTab = false;
-  }
   qApp->processEvents();
+
   // Be told if the mouse display precision may have changed by the user
   // changing things in the project properties dialog box
   connect( pp, &QgsProjectProperties::displayPrecisionChanged, this,

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -2520,8 +2520,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
 
     //! QGIS-internal vector feature clipboard
     QgsClipboard *mInternalClipboard = nullptr;
-    //! Flag to indicate how the project properties dialog was summoned
-    bool mShowProjectionTab = false;
 
     /**
      * String containing supporting vector file formats

diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -1596,11 +1596,6 @@ void QgsProjectProperties::apply()
   }
 }
 
-void QgsProjectProperties::showProjectionsTab()
-{
-  mOptionsListWidget->setCurrentRow( 2 );
-}
-
 void QgsProjectProperties::lwWmsRowsInserted( const QModelIndex &parent, int first, int last )
 {
   Q_UNUSED( parent )

diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h
@@ -79,11 +79,6 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui:
      */
     void apply();
 
-    /**
-     * Slot to show the projections tab when the dialog is opened
-     */
-    void showProjectionsTab();
-
     /**
      * Let the user add a scale to the list of project scales
      * used in scale combobox instead of global ones.