fix #7907

qgis · May 26, 2013 · 0f13260 · 0f13260
1 parent 3a98725
commit 0f13260
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/python/plugins/fTools/fTools.py b/python/plugins/fTools/fTools.py
@@ -189,15 +189,12 @@ def initGui(self):
 
     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 @@ def initGui(self):
     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)

diff --git a/src/app/qgsconfigureshortcutsdialog.cpp b/src/app/qgsconfigureshortcutsdialog.cpp
@@ -326,7 +326,7 @@ void QgsConfigureShortcutsDialog::keyReleaseEvent( QKeyEvent * event )
 {
   if ( !mGettingShortcut )
   {
-    QDialog::keyPressEvent( event );
+    QDialog::keyReleaseEvent( event );
     return;
   }