Fix cannot set shortcut for zoom in (fix #14958)

nyalldawson · nyalldawson · commit f8f3b21b643e · 2016-06-08T09:45:54.000+10:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1009,7 +1009,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
   //also make ctrl+alt+= a shortcut to switch to zoom in map tool
   QShortcut* zoomInToolShortCut = new QShortcut( QKeySequence( tr( "Ctrl+Alt+=" ) ), this );
   connect( zoomInToolShortCut, SIGNAL( activated() ), this, SLOT( zoomIn() ) );
-  zoomInToolShortCut->setObjectName( "Zoom in" );
+  zoomInToolShortCut->setObjectName( "ZoomIn2" );
   zoomInToolShortCut->setWhatsThis( "Zoom in (secondary)" );
 
   // Show a nice tip of the day
diff --git a/src/gui/qgsshortcutsmanager.cpp b/src/gui/qgsshortcutsmanager.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include "qgsshortcutsmanager.h"
-
+#include "qgslogger.h"
 #include <QSettings>
 #include <QShortcut>
 
@@ -86,6 +86,12 @@ void QgsShortcutsManager::registerAllChildShortcuts( QObject* object, bool recur
 
 bool QgsShortcutsManager::registerAction( QAction* action, const QString& defaultSequence )
 {
+#ifdef QGISDEBUG
+  // if using a debug build, warn on duplicate actions
+  if ( actionByName( action->text() ) || shortcutByName( action->text() ) )
+    QgsLogger::warning( QString( "Duplicate shortcut registered: %1" ).arg( action->text() ) );
+#endif
+
   mActions.insert( action, defaultSequence );
   connect( action, SIGNAL( destroyed() ), this, SLOT( actionDestroyed() ) );
 
@@ -103,6 +109,12 @@ bool QgsShortcutsManager::registerAction( QAction* action, const QString& defaul
 
 bool QgsShortcutsManager::registerShortcut( QShortcut* shortcut, const QString& defaultSequence )
 {
+#ifdef QGISDEBUG
+  // if using a debug build, warn on duplicate actions
+  if ( actionByName( shortcut->objectName() ) || shortcutByName( shortcut->objectName() ) )
+    QgsLogger::warning( QString( "Duplicate shortcut registered: %1" ).arg( shortcut->objectName() ) );
+#endif
+
   mShortcuts.insert( shortcut, defaultSequence );
   connect( shortcut, SIGNAL( destroyed() ), this, SLOT( shortcutDestroyed() ) );
 
