From cb882698b4fa265a0085df0818a36519f3420892 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 1 Jun 2016 10:08:31 +1000 Subject: [PATCH] Followup 1b2af79, more robust way of setting shortcuts --- src/app/qgisapp.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 1f457eb9356..abaf0b8e32c 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -936,14 +936,17 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh mMapCanvas->clearExtentHistory(); // reset zoomnext/zoomlast mLastComposerId = 0; - QAction* zoomAction = new QAction( this ); - connect( zoomAction, SIGNAL( triggered( bool ) ), mMapCanvas, SLOT( zoomIn() ) ); - zoomAction->setShortcut( QKeySequence( "Ctrl++" ) ); - QShortcut* zoomShortCut = new QShortcut( QKeySequence( tr( "Ctrl+=" ) ), this ); - connect( zoomShortCut, SIGNAL( activated() ), mMapCanvas, SLOT( zoomIn() ) ); - QAction* zoomOutAction = new QAction( this ); - connect( zoomOutAction, SIGNAL( triggered( bool ) ), mMapCanvas, SLOT( zoomOut() ) ); - zoomOutAction->setShortcut( QKeySequence( "Ctrl+-" ) ); + QShortcut* zoomInShortCut = new QShortcut( QKeySequence( tr( "Ctrl++" ) ), this ); + connect( zoomInShortCut, SIGNAL( activated() ), mMapCanvas, SLOT( zoomIn() ) ); + QShortcut* zoomShortCut2 = new QShortcut( QKeySequence( tr( "Ctrl+=" ) ), this ); + connect( zoomShortCut2, SIGNAL( activated() ), mMapCanvas, SLOT( zoomIn() ) ); + QShortcut* zoomOutShortCut = new QShortcut( QKeySequence( tr( "Ctrl+-" ) ), this ); + connect( zoomOutShortCut, SIGNAL( activated() ), mMapCanvas, SLOT( zoomOut() ) ); + + //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() ) ); + // Show a nice tip of the day if ( settings.value( QString( "/qgis/showTips%1" ).arg( QGis::QGIS_VERSION_INT / 100 ), true ).toBool() )