[QGIS Commit] r12457 - in trunk/qgis:
python/plugins/mapserver_export resources/context_help
src/app/attributetable src/plugins/evis/databaseconnection src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Dec 14 16:50:18 EST 2009
Author: jef
Date: 2009-12-14 16:50:16 -0500 (Mon, 14 Dec 2009)
New Revision: 12457
Added:
trunk/qgis/resources/context_help/MapServerExport-en_US
trunk/qgis/resources/context_help/QgsAttributeTableDialog-de_DE
trunk/qgis/resources/context_help/QgsAttributeTableDialog-en_US
trunk/qgis/resources/context_help/QgsAttributeTableDialog-fr_FR
trunk/qgis/resources/context_help/QgsAttributeTableDialog-pl_PL
trunk/qgis/resources/context_help/QgsAttributeTableDialog-ru_RU
trunk/qgis/resources/context_help/QgsAttributeTableDialog-sk_SK
trunk/qgis/resources/context_help/eVisDatabaseConnectionGui-en_US
Removed:
trunk/qgis/resources/context_help/QgsAttributeTable-de_DE
trunk/qgis/resources/context_help/QgsAttributeTable-en_US
trunk/qgis/resources/context_help/QgsAttributeTable-fr_FR
trunk/qgis/resources/context_help/QgsAttributeTable-pl_PL
trunk/qgis/resources/context_help/QgsAttributeTable-ru_RU
trunk/qgis/resources/context_help/QgsAttributeTable-sk_SK
Modified:
trunk/qgis/python/plugins/mapserver_export/mapserverexport.py
trunk/qgis/src/app/attributetable/qgsattributetabledialog.h
trunk/qgis/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h
trunk/qgis/src/ui/qgsattributetabledialog.ui
Log:
activate help for attribute table, mapserver export and evis
Modified: trunk/qgis/python/plugins/mapserver_export/mapserverexport.py
===================================================================
--- trunk/qgis/python/plugins/mapserver_export/mapserverexport.py 2009-12-14 21:06:45 UTC (rev 12456)
+++ trunk/qgis/python/plugins/mapserver_export/mapserverexport.py 2009-12-14 21:50:16 UTC (rev 12457)
@@ -84,6 +84,7 @@
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 @@
# 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():
Added: trunk/qgis/resources/context_help/MapServerExport-en_US
===================================================================
--- trunk/qgis/resources/context_help/MapServerExport-en_US (rev 0)
+++ trunk/qgis/resources/context_help/MapServerExport-en_US 2009-12-14 21:50:16 UTC (rev 12457)
@@ -0,0 +1 @@
+<h3>MapServer Export</h3>
Deleted: trunk/qgis/resources/context_help/QgsAttributeTable-de_DE
===================================================================
--- trunk/qgis/resources/context_help/QgsAttributeTable-de_DE 2009-12-14 21:06:45 UTC (rev 12456)
+++ trunk/qgis/resources/context_help/QgsAttributeTable-de_DE 2009-12-14 21:50:16 UTC (rev 12457)
@@ -1,3 +0,0 @@
-<h3>Attributtabelle</h3>
-Die Attributtabelle zeigt die Zeilen und Spalten des selektierten Layers an.
-Aus diesem Dialog können Sie die Attribute anzeigen, ändern oder durchsuchen.
Deleted: trunk/qgis/resources/context_help/QgsAttributeTable-en_US
===================================================================
--- trunk/qgis/resources/context_help/QgsAttributeTable-en_US 2009-12-14 21:06:45 UTC (rev 12456)
+++ trunk/qgis/resources/context_help/QgsAttributeTable-en_US 2009-12-14 21:50:16 UTC (rev 12457)
@@ -1,3 +0,0 @@
-<h3>Attribute Table</h3>
-The Attribute Table dialog displays the rows and columns from the selected
-layer. From this dialog you can view, edit, and search attributes.
Deleted: trunk/qgis/resources/context_help/QgsAttributeTable-fr_FR
===================================================================
--- trunk/qgis/resources/context_help/QgsAttributeTable-fr_FR 2009-12-14 21:06:45 UTC (rev 12456)
+++ trunk/qgis/resources/context_help/QgsAttributeTable-fr_FR 2009-12-14 21:50:16 UTC (rev 12457)
@@ -1,3 +0,0 @@
-<h3>Table d'Attributs</h3>
-La Table d'Attributs permet d'afficher les lignes et les colonnes contenant les attributs de la couche sélectionnée. Depuis la Table d'Attributs il est
-possible de visualiser, éditer et rechercher les attributs de la couche.
Deleted: trunk/qgis/resources/context_help/QgsAttributeTable-pl_PL
===================================================================
--- trunk/qgis/resources/context_help/QgsAttributeTable-pl_PL 2009-12-14 21:06:45 UTC (rev 12456)
+++ trunk/qgis/resources/context_help/QgsAttributeTable-pl_PL 2009-12-14 21:50:16 UTC (rev 12457)
@@ -1,2 +0,0 @@
-<h3>Tabela atrybutów</h3>
-Wyświetla tabelę wierszy i kolumn wybranej warstwy. W tym oknie mozesz ogladać, edytować i przeszukiwać atrybuty.
Deleted: trunk/qgis/resources/context_help/QgsAttributeTable-ru_RU
===================================================================
(Binary files differ)
Deleted: trunk/qgis/resources/context_help/QgsAttributeTable-sk_SK
===================================================================
--- trunk/qgis/resources/context_help/QgsAttributeTable-sk_SK 2009-12-14 21:06:45 UTC (rev 12456)
+++ trunk/qgis/resources/context_help/QgsAttributeTable-sk_SK 2009-12-14 21:50:16 UTC (rev 12457)
@@ -1 +0,0 @@
-<h3>Tabuľka atribútov</h3>
Copied: trunk/qgis/resources/context_help/QgsAttributeTableDialog-de_DE (from rev 12454, trunk/qgis/resources/context_help/QgsAttributeTable-de_DE)
===================================================================
--- trunk/qgis/resources/context_help/QgsAttributeTableDialog-de_DE (rev 0)
+++ trunk/qgis/resources/context_help/QgsAttributeTableDialog-de_DE 2009-12-14 21:50:16 UTC (rev 12457)
@@ -0,0 +1,3 @@
+<h3>Attributtabelle</h3>
+Die Attributtabelle zeigt die Zeilen und Spalten des selektierten Layers an.
+Aus diesem Dialog können Sie die Attribute anzeigen, ändern oder durchsuchen.
Copied: trunk/qgis/resources/context_help/QgsAttributeTableDialog-en_US (from rev 12454, trunk/qgis/resources/context_help/QgsAttributeTable-en_US)
===================================================================
--- trunk/qgis/resources/context_help/QgsAttributeTableDialog-en_US (rev 0)
+++ trunk/qgis/resources/context_help/QgsAttributeTableDialog-en_US 2009-12-14 21:50:16 UTC (rev 12457)
@@ -0,0 +1,3 @@
+<h3>Attribute Table</h3>
+The Attribute Table dialog displays the rows and columns from the selected
+layer. From this dialog you can view, edit, and search attributes.
Copied: trunk/qgis/resources/context_help/QgsAttributeTableDialog-fr_FR (from rev 12454, trunk/qgis/resources/context_help/QgsAttributeTable-fr_FR)
===================================================================
--- trunk/qgis/resources/context_help/QgsAttributeTableDialog-fr_FR (rev 0)
+++ trunk/qgis/resources/context_help/QgsAttributeTableDialog-fr_FR 2009-12-14 21:50:16 UTC (rev 12457)
@@ -0,0 +1,3 @@
+<h3>Table d'Attributs</h3>
+La Table d'Attributs permet d'afficher les lignes et les colonnes contenant les attributs de la couche sélectionnée. Depuis la Table d'Attributs il est
+possible de visualiser, éditer et rechercher les attributs de la couche.
Copied: trunk/qgis/resources/context_help/QgsAttributeTableDialog-pl_PL (from rev 12454, trunk/qgis/resources/context_help/QgsAttributeTable-pl_PL)
===================================================================
--- trunk/qgis/resources/context_help/QgsAttributeTableDialog-pl_PL (rev 0)
+++ trunk/qgis/resources/context_help/QgsAttributeTableDialog-pl_PL 2009-12-14 21:50:16 UTC (rev 12457)
@@ -0,0 +1,2 @@
+<h3>Tabela atrybutów</h3>
+Wyświetla tabelę wierszy i kolumn wybranej warstwy. W tym oknie mozesz ogladać, edytować i przeszukiwać atrybuty.
Copied: trunk/qgis/resources/context_help/QgsAttributeTableDialog-ru_RU (from rev 12454, trunk/qgis/resources/context_help/QgsAttributeTable-ru_RU)
===================================================================
(Binary files differ)
Copied: trunk/qgis/resources/context_help/QgsAttributeTableDialog-sk_SK (from rev 12454, trunk/qgis/resources/context_help/QgsAttributeTable-sk_SK)
===================================================================
--- trunk/qgis/resources/context_help/QgsAttributeTableDialog-sk_SK (rev 0)
+++ trunk/qgis/resources/context_help/QgsAttributeTableDialog-sk_SK 2009-12-14 21:50:16 UTC (rev 12457)
@@ -0,0 +1 @@
+<h3>Tabuľka atribútov</h3>
Added: trunk/qgis/resources/context_help/eVisDatabaseConnectionGui-en_US
===================================================================
--- trunk/qgis/resources/context_help/eVisDatabaseConnectionGui-en_US (rev 0)
+++ trunk/qgis/resources/context_help/eVisDatabaseConnectionGui-en_US 2009-12-14 21:50:16 UTC (rev 12457)
@@ -0,0 +1 @@
+<h3>Database connection</h3>
Modified: trunk/qgis/src/app/attributetable/qgsattributetabledialog.h
===================================================================
--- trunk/qgis/src/app/attributetable/qgsattributetabledialog.h 2009-12-14 21:06:45 UTC (rev 12456)
+++ trunk/qgis/src/app/attributetable/qgsattributetabledialog.h 2009-12-14 21:50:16 UTC (rev 12457)
@@ -23,6 +23,7 @@
#include <QMutex>
#include "ui_qgsattributetabledialog.h"
+#include "qgscontexthelp.h"
#include "qgsvectorlayer.h" //QgsFeatureIds
@@ -150,6 +151,8 @@
*/
void on_mDeleteSelectedButton_clicked();
+ void on_mHelpButton_clicked() { QgsContextHelp::run( metaObject()->className() ); }
+
signals:
/**
* Informs that editing mode ha been toggled
Modified: trunk/qgis/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h
===================================================================
--- trunk/qgis/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h 2009-12-14 21:06:45 UTC (rev 12456)
+++ trunk/qgis/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h 2009-12-14 21:50:16 UTC (rev 12457)
@@ -32,6 +32,7 @@
#include "evisdatabaseconnection.h"
#include "evisdatabaselayerfieldselectiongui.h"
#include "evisquerydefinition.h"
+#include "qgscontexthelp.h"
#include <QTemporaryFile>
#include <QDialog>
@@ -73,7 +74,7 @@
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 );
Modified: trunk/qgis/src/ui/qgsattributetabledialog.ui
===================================================================
--- trunk/qgis/src/ui/qgsattributetabledialog.ui 2009-12-14 21:06:45 UTC (rev 12456)
+++ trunk/qgis/src/ui/qgsattributetabledialog.ui 2009-12-14 21:50:16 UTC (rev 12457)
@@ -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">
More information about the QGIS-commit
mailing list