Merge pull request #6680 from DelazJ/topol

Enable Topology Checker help button
qgis · Mar 27, 2018 · f75c0a8 · f75c0a8
2 parents d24f8a3 + 0c59bc5
commit f75c0a8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/plugins/topology/rulesDialog.cpp b/src/plugins/topology/rulesDialog.cpp
@@ -26,6 +26,7 @@
 #include "qgisinterface.h"
 #include "qgsproject.h"
 #include "qgsapplication.h"
+#include "qgshelp.h"
 #include "rulesDialog.h"
 #include "topolTest.h"
 
@@ -52,6 +53,7 @@ rulesDialog::rulesDialog( const QMap<QString, TopologyRule> &testMap, QgisInterf
   // attempt to add new test when OK clicked
   //connect( buttonBox, SIGNAL( accepted() ), this, SLOT( addTest() ) );
   connect( mDeleteTestButton, &QAbstractButton::clicked, this, &rulesDialog::deleteTest );
+  connect( buttonBox, &QDialogButtonBox::helpRequested, this, &rulesDialog::showHelp );
 
   connect( mLayer1Box, static_cast<void ( QComboBox::* )( const QString & )>( &QComboBox::currentIndexChanged ), this, &rulesDialog::updateRuleItems );
   connect( mRuleBox, static_cast<void ( QComboBox::* )( const QString & )>( &QComboBox::currentIndexChanged ), this, &rulesDialog::showControls );
@@ -363,3 +365,8 @@ void rulesDialog::clearRules()
     mRulesTable->removeRow( 0 );
   }
 }
+
+void rulesDialog::showHelp()
+{
+  QgsHelp::openHelp( QStringLiteral( "plugins/plugins_topology_checker.html" ) );
+}
diff --git a/src/plugins/topology/rulesDialog.h b/src/plugins/topology/rulesDialog.h
@@ -104,7 +104,8 @@ class rulesDialog : public QDialog, private Ui::rulesDialog
      * \param layerId layer ID
      */
     void updateRuleItems( const QString &layerName );
-
+    //! Open the associated help
+    void showHelp();
 
 
 

diff --git a/src/plugins/topology/rulesDialog.ui b/src/plugins/topology/rulesDialog.ui
@@ -94,15 +94,15 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QPushButton" name="mDeleteTestButton">
+         <property name="text">
+          <string>Delete Rule</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
-     <item>
-      <widget class="QPushButton" name="mDeleteTestButton">
-       <property name="text">
-        <string>Delete Rule</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item row="3" column="0" colspan="2">