Use QgisApp::instance and simplify code

qgis · Nov 27, 2015 · 055ef76 · 055ef76
1 parent 09c8239
commit 055ef76
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/app/qgsmeasuredialog.cpp b/src/app/qgsmeasuredialog.cpp
@@ -14,6 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgisapp.h"
 #include "qgsmeasuredialog.h"
 #include "qgsmeasuretool.h"
 
@@ -40,6 +41,11 @@ QgsMeasureDialog::QgsMeasureDialog( QgsMeasureTool* tool, Qt::WindowFlags f )
   buttonBox->addButton( nb, QDialogButtonBox::ActionRole );
   connect( nb, SIGNAL( clicked() ), this, SLOT( restart() ) );
 
+  // Add a configuration button
+  QPushButton* cb = new QPushButton( tr( "&Configuration" ) );
+  buttonBox->addButton( cb, QDialogButtonBox::ActionRole );
+  connect( cb, SIGNAL( clicked() ), this, SLOT( openConfigTab() ) );
+
   mMeasureArea = tool->measureArea();
   mTotal = 0.;
 
@@ -60,6 +66,11 @@ QgsMeasureDialog::QgsMeasureDialog( QgsMeasureTool* tool, Qt::WindowFlags f )
   groupBox->setCollapsed( true );
 }
 
+void QgsMeasureDialog::openConfigTab()
+{
+  QgisApp::instance()->showOptionsDialog( this, "mOptionsPageMapTools" );
+}
+
 void QgsMeasureDialog::updateSettings()
 {
   QSettings settings;

diff --git a/src/app/qgsmeasuredialog.h b/src/app/qgsmeasuredialog.h
@@ -68,6 +68,9 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
   private slots:
     void unitsChanged( const QString &units );
 
+    //! Open configuration tab
+    void openConfigTab();
+
   private:
 
     //! formats distance to most appropriate units