sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix #7907

Browse Source
This commit is contained in:
Juergen E. Fischer 2013-05-26 18:39:08 +02:00
parent 3a987258b9
commit 0f132602ed
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/plugins/fTools/fTools.py
View File

@ -189,15 +189,12 @@ class fToolsPlugin:
self.updateThemeIcons("theme")
self.tmpAct = QAction( self.iface.mainWindow() )
self.iface.addPluginToVectorMenu( "tmp", self.tmpAct )
self.menu = self.iface.vectorMenu()
self.menu.addMenu( self.analysisMenu )
self.menu.addMenu( self.researchMenu )
self.menu.addMenu( self.geoMenu )
self.menu.addMenu( self.conversionMenu )
self.menu.addMenu( self.dataManageMenu )
self.iface.removePluginVectorMenu( "tmp", self.tmpAct )
QObject.connect(self.distMatrix, SIGNAL("triggered()"), self.dodistMatrix)
QObject.connect(self.sumLines, SIGNAL("triggered()"), self.dosumLines)
@ -246,14 +243,11 @@ class fToolsPlugin:
QObject.connect(self.spatialIndex, SIGNAL("triggered()"), self.doSpatIndex)
def unload(self):
self.iface.addPluginToVectorMenu( "tmp", self.tmpAct )
self.menu.removeAction( self.analysisMenu.menuAction() )
self.menu.removeAction( self.researchMenu.menuAction() )
self.menu.removeAction( self.geoMenu.menuAction() )
self.menu.removeAction( self.conversionMenu.menuAction() )
self.menu.removeAction( self.dataManageMenu.menuAction() )
self.iface.removePluginVectorMenu( "tmp", self.tmpAct )
def doSimplify(self):
d = doSimplify.Dialog(self.iface, 1)

2
src/app/qgsconfigureshortcutsdialog.cpp
View File

@ -326,7 +326,7 @@ void QgsConfigureShortcutsDialog::keyReleaseEvent( QKeyEvent * event )
{
if ( !mGettingShortcut )
{
QDialog::keyPressEvent( event );
QDialog::keyReleaseEvent( event );
return;
}