[QGIS Commit] r10967 - in trunk/qgis:
python/plugins/mapserver_export
python/plugins/plugin_installer src/plugins/copyright_label
src/plugins/delimited_text src/plugins/dxf2shp_converter
src/plugins/gps_importer src/plugins/north_arrow
src/plugins/quick_print src/plugins/scale_bar
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Jun 23 08:03:19 EDT 2009
Author: borysiasty
Date: 2009-06-23 08:03:18 -0400 (Tue, 23 Jun 2009)
New Revision: 10967
Modified:
trunk/qgis/python/plugins/mapserver_export/mapserverexport.py
trunk/qgis/python/plugins/plugin_installer/installer_plugin.py
trunk/qgis/src/plugins/copyright_label/plugin.cpp
trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
trunk/qgis/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp
trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
trunk/qgis/src/plugins/north_arrow/plugin.cpp
trunk/qgis/src/plugins/quick_print/quickprintplugin.cpp
trunk/qgis/src/plugins/scale_bar/plugin.cpp
Log:
partial fix for #1743 : connection to proper QAction's triggered() signal in all core plugins
Modified: trunk/qgis/python/plugins/mapserver_export/mapserverexport.py
===================================================================
--- trunk/qgis/python/plugins/mapserver_export/mapserverexport.py 2009-06-22 15:33:52 UTC (rev 10966)
+++ trunk/qgis/python/plugins/mapserver_export/mapserverexport.py 2009-06-23 12:03:18 UTC (rev 10967)
@@ -59,7 +59,7 @@
"MapServer Export", self.iface.mainWindow())
#self.action.setWhatsThis("Configuration for Zoom To Point plugin")
# connect the action to the run method
- QObject.connect(self.action, SIGNAL("activated()"), self.run)
+ QObject.connect(self.action, SIGNAL("triggered()"), self.run)
QObject.connect(self.iface, SIGNAL("currentThemeChanged ( QString )"), self.setCurrentTheme)
# Add toolbar button and menu item
Modified: trunk/qgis/python/plugins/plugin_installer/installer_plugin.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/installer_plugin.py 2009-06-22 15:33:52 UTC (rev 10966)
+++ trunk/qgis/python/plugins/plugin_installer/installer_plugin.py 2009-06-23 12:03:18 UTC (rev 10967)
@@ -69,7 +69,7 @@
else: # old plugin API
nextAction = self.mainWindow().menuBar().actions()[4].menu().actions()[1]
self.mainWindow().menuBar().actions()[4].menu().insertAction(nextAction,self.action)
- QObject.connect(self.action, SIGNAL("activated()"), self.run)
+ QObject.connect(self.action, SIGNAL("triggered()"), self.run)
QObject.connect(self.iface, SIGNAL("currentThemeChanged ( QString )"), self.setCurrentTheme)
self.statusLabel = None
Modified: trunk/qgis/src/plugins/copyright_label/plugin.cpp
===================================================================
--- trunk/qgis/src/plugins/copyright_label/plugin.cpp 2009-06-22 15:33:52 UTC (rev 10966)
+++ trunk/qgis/src/plugins/copyright_label/plugin.cpp 2009-06-23 12:03:18 UTC (rev 10967)
@@ -80,7 +80,7 @@
setCurrentTheme( "" );
myQActionPointer->setWhatsThis( tr( "Creates a copyright label that is displayed on the map canvas." ) );
// Connect the action to the run
- connect( myQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) );
+ connect( myQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
// This calls the renderer everytime the cnavas has drawn itself
connect( qGisInterface->mapCanvas(), SIGNAL( renderComplete( QPainter * ) ), this, SLOT( renderLabel( QPainter * ) ) );
//this resets this plugin up if a project is loaded
Modified: trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp 2009-06-22 15:33:52 UTC (rev 10966)
+++ trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp 2009-06-23 12:03:18 UTC (rev 10967)
@@ -104,7 +104,7 @@
"The file must have a header row containing the field names. "
"X and Y fields are required and must contain coordinates in decimal units." ) );
// Connect the action to the run
- connect( myQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) );
+ connect( myQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
// Add the icon to the toolbar
qGisInterface->addToolBarIcon( myQActionPointer );
qGisInterface->addPluginToMenu( tr( "&Delimited text" ), myQActionPointer );
Modified: trunk/qgis/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp
===================================================================
--- trunk/qgis/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp 2009-06-22 15:33:52 UTC (rev 10966)
+++ trunk/qgis/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp 2009-06-23 12:03:18 UTC (rev 10967)
@@ -77,7 +77,7 @@
mQActionPointer->setWhatsThis( tr( "Converts DXF files in Shapefile format" ) );
// Connect the action to the run
- connect( mQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) );
+ connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
// Add the icon to the toolbar
mQGisIface->addToolBarIcon( mQActionPointer );
Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp 2009-06-22 15:33:52 UTC (rev 10966)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp 2009-06-23 12:03:18 UTC (rev 10967)
@@ -93,8 +93,8 @@
mQActionPointer->setWhatsThis( tr( "Creates a new GPX layer and displays it on the map canvas" ) );
mCreateGPXAction->setWhatsThis( tr( "Creates a new GPX layer and displays it on the map canvas" ) );
- connect( mQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) );
- connect( mCreateGPXAction, SIGNAL( activated() ), this, SLOT( createGPX() ) );
+ connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
+ connect( mCreateGPXAction, SIGNAL( triggered() ), this, SLOT( createGPX() ) );
mQGisInterface->fileToolBar()->addAction( mQActionPointer );
mQGisInterface->addPluginToMenu( tr( "&Gps" ), mQActionPointer );
Modified: trunk/qgis/src/plugins/north_arrow/plugin.cpp
===================================================================
--- trunk/qgis/src/plugins/north_arrow/plugin.cpp 2009-06-22 15:33:52 UTC (rev 10966)
+++ trunk/qgis/src/plugins/north_arrow/plugin.cpp 2009-06-23 12:03:18 UTC (rev 10967)
@@ -96,7 +96,7 @@
setCurrentTheme( "" );
myQActionPointer->setWhatsThis( tr( "Creates a north arrow that is displayed on the map canvas" ) );
// Connect the action to the run
- connect( myQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) );
+ connect( myQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
//render the arrow each time the map is rendered
connect( qGisInterface->mapCanvas(), SIGNAL( renderComplete( QPainter * ) ), this, SLOT( renderNorthArrow( QPainter * ) ) );
//this resets this plugin up if a project is loaded
Modified: trunk/qgis/src/plugins/quick_print/quickprintplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/quick_print/quickprintplugin.cpp 2009-06-22 15:33:52 UTC (rev 10966)
+++ trunk/qgis/src/plugins/quick_print/quickprintplugin.cpp 2009-06-23 12:03:18 UTC (rev 10967)
@@ -78,7 +78,7 @@
// Set the what's this text
mQActionPointer->setWhatsThis( tr( "Provides a way to quickly produce a map with minimal user input." ) );
// Connect the action to the run
- connect( mQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) );
+ connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
// Add the icon to the toolbar
mQGisIface->addToolBarIcon( mQActionPointer );
mQGisIface->addPluginToMenu( tr( "&Quick Print" ), mQActionPointer );
Modified: trunk/qgis/src/plugins/scale_bar/plugin.cpp
===================================================================
--- trunk/qgis/src/plugins/scale_bar/plugin.cpp 2009-06-22 15:33:52 UTC (rev 10966)
+++ trunk/qgis/src/plugins/scale_bar/plugin.cpp 2009-06-23 12:03:18 UTC (rev 10967)
@@ -103,7 +103,7 @@
setCurrentTheme( "" );
myQActionPointer->setWhatsThis( tr( "Creates a scale bar that is displayed on the map canvas" ) );
// Connect the action to the run
- connect( myQActionPointer, SIGNAL( activated() ), this, SLOT( run() ) );
+ connect( myQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
//render the scale bar each time the map is rendered
connect( qGisInterface->mapCanvas(), SIGNAL( renderComplete( QPainter * ) ), this, SLOT( renderScaleBar( QPainter * ) ) );
//this resets this plugin up if a project is loaded
More information about the QGIS-commit
mailing list