activate help for attribute table, mapserver export and evis

git-svn-id: http://svn.osgeo.org/qgis/trunk@12457 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 14, 2009 · 47d6b52 · 47d6b52
1 parent 400830b
commit 47d6b52
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 10 deletions.
diff --git a/python/plugins/mapserver_export/mapserverexport.py b/python/plugins/mapserver_export/mapserverexport.py
@@ -84,6 +84,7 @@ def run(self):
     QObject.connect(self.dlg.ui.btnChooseHeaderFile, SIGNAL("clicked()"), self.setHeaderFile)
     QObject.connect(self.dlg.ui.btnChooseTemplateFile, SIGNAL("clicked()"), self.setTemplateFile)
     QObject.connect(self.dlg.ui.buttonBox, SIGNAL("accepted()"), self.ok_clicked)
+    QObject.connect(self.dlg.ui.buttonBox, SIGNAL("helpRequested()"), self.helpRequested)
     # qgs-project defaults to current instance
     project = QgsProject.instance()
     self.dlg.ui.txtQgisFilePath.setText(project.fileName())
@@ -116,6 +117,9 @@ def run(self):
     # Mapserver: UNITS [feet|inches|kilometers|meters|miles|dd]
     self.dlg.show()
 
+  def helpRequested(self):
+    QgsContextHelp.run( "MapServerExport" )
+
   def ok_clicked(self):
     # check if current project is saved or dirty
     if not self.checkCurrentProject():

diff --git a/resources/context_help/MapServerExport-en_US b/resources/context_help/MapServerExport-en_US
@@ -0,0 +1 @@
+<h3>MapServer Export</h3>
diff --git a/...rces/context_help/QgsAttributeTable-de_DE → ...ontext_help/QgsAttributeTableDialog-de_DE b/...rces/context_help/QgsAttributeTable-de_DE → ...ontext_help/QgsAttributeTableDialog-de_DE
diff --git a/...rces/context_help/QgsAttributeTable-en_US → ...ontext_help/QgsAttributeTableDialog-en_US b/...rces/context_help/QgsAttributeTable-en_US → ...ontext_help/QgsAttributeTableDialog-en_US
diff --git a/...rces/context_help/QgsAttributeTable-fr_FR → ...ontext_help/QgsAttributeTableDialog-fr_FR b/...rces/context_help/QgsAttributeTable-fr_FR → ...ontext_help/QgsAttributeTableDialog-fr_FR
diff --git a/...rces/context_help/QgsAttributeTable-pl_PL → ...ontext_help/QgsAttributeTableDialog-pl_PL b/...rces/context_help/QgsAttributeTable-pl_PL → ...ontext_help/QgsAttributeTableDialog-pl_PL
diff --git a/...rces/context_help/QgsAttributeTable-ru_RU → ...ontext_help/QgsAttributeTableDialog-ru_RU b/...rces/context_help/QgsAttributeTable-ru_RU → ...ontext_help/QgsAttributeTableDialog-ru_RU
diff --git a/...rces/context_help/QgsAttributeTable-sk_SK → ...ontext_help/QgsAttributeTableDialog-sk_SK b/...rces/context_help/QgsAttributeTable-sk_SK → ...ontext_help/QgsAttributeTableDialog-sk_SK
diff --git a/resources/context_help/eVisDatabaseConnectionGui-en_US b/resources/context_help/eVisDatabaseConnectionGui-en_US
@@ -0,0 +1 @@
+<h3>Database connection</h3>
diff --git a/src/app/attributetable/qgsattributetabledialog.h b/src/app/attributetable/qgsattributetabledialog.h
@@ -23,6 +23,7 @@
 #include <QMutex>
 
 #include "ui_qgsattributetabledialog.h"
+#include "qgscontexthelp.h"
 
 #include "qgsvectorlayer.h" //QgsFeatureIds
 
@@ -150,6 +151,8 @@ class QgsAttributeTableDialog : public QDialog, private Ui::QgsAttributeTableDia
      */
     void on_mDeleteSelectedButton_clicked();
 
+    void on_mHelpButton_clicked() { QgsContextHelp::run( metaObject()->className() ); }
+
   signals:
     /**
      * Informs that editing mode ha been toggled

diff --git a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h
@@ -32,6 +32,7 @@
 #include "evisdatabaseconnection.h"
 #include "evisdatabaselayerfieldselectiongui.h"
 #include "evisquerydefinition.h"
+#include "qgscontexthelp.h"
 
 #include <QTemporaryFile>
 #include <QDialog>
@@ -73,7 +74,7 @@ class eVisDatabaseConnectionGui : public QDialog, private Ui::eVisDatabaseConnec
     void drawNewVectorLayer( QString, QString, QString );
 
     void on_buttonBox_accepted( );
-    void on_buttonBox_helpRequested( ) { /* TODO: implement me */ };
+    void on_buttonBox_helpRequested( ) { QgsContextHelp::run( metaObject()->className() ); };
 
     void on_cboxDatabaseType_currentIndexChanged( int );
     void on_cboxPredefinedQueryList_currentIndexChanged( int );

diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
@@ -51,19 +51,12 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Advanced search</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="mAdvancedSearchButton">
+      <widget class="QPushButton" name="mAdvancedSearchButton">
        <property name="toolTip">
         <string>Opens the search query builder</string>
        </property>
        <property name="text">
-        <string>...</string>
+        <string>Advanced search</string>
        </property>
        <property name="iconSize">
         <size>
@@ -73,6 +66,13 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QPushButton" name="mHelpButton">
+       <property name="text">
+        <string>Help</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item row="1" column="0">