respect shortcuts set to none (fixes #7905)

SebDieBln · SebDieBln · commit 111393e055f3 · 2015-12-07T21:50:02.000+01:00
Shortcuts, that have been set to none by the user, are no longer restored to their default value on application startup.
diff --git a/src/app/qgsshortcutsmanager.cpp b/src/app/qgsshortcutsmanager.cpp
@@ -47,8 +47,7 @@ bool QgsShortcutsManager::registerAction( QAction* action, const QString& defaul
   QSettings settings;
   QString shortcut = settings.value( "/shortcuts/" + actionText, defaultShortcut ).toString();
 
-  if ( !shortcut.isEmpty() )
-    action->setShortcut( shortcut );
+  action->setShortcut( shortcut );
 
   return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ bool QgsShortcutsManager::registerAction( QAction* action, const QString& defaul`
`47`	`47`	`QSettings settings;`
`48`	`48`	`QString shortcut = settings.value( "/shortcuts/" + actionText, defaultShortcut ).toString();`
`49`	`49`
`50`		`- if ( !shortcut.isEmpty() )`
`51`		`- action->setShortcut( shortcut );`
	`50`	`+ action->setShortcut( shortcut );`
`52`	`51`
`53`	`52`	`return true;`
`54`	`53`	`}`