Merge pull request #10021 from 3nids/itembrowser_shortcut

3nids · web-flow · commit b3555abd4e7f · 2019-05-22T11:27:24.000-05:00
add shortcuts to browse feature list
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1410,6 +1410,20 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
   QgsGui::shortcutsManager()->registerAllChildren( this );
   QgsGui::shortcutsManager()->registerAllChildren( mSnappingWidget );
 
+  // register additional action
+  auto registerShortcuts = [ = ]( const QString & sequence, const QString & objectName, const QString & whatsThis )
+  {
+    QShortcut *sc = new QShortcut( QKeySequence( sequence ), this );
+    sc->setContext( Qt::ApplicationShortcut );
+    sc->setObjectName( objectName );
+    sc->setWhatsThis( whatsThis );
+    QgsGui::shortcutsManager()->registerShortcut( sc, sequence );
+  };
+  registerShortcuts( QStringLiteral( "Ctrl+Alt+{" ), QStringLiteral( "mAttributeTableFirstEditedFeature" ), tr( "Edit first feature in attribute table" ) );
+  registerShortcuts( QStringLiteral( "Ctrl+Alt+[" ), QStringLiteral( "mAttributeTablePreviousEditedFeature" ), tr( "Edit previous feature in attribute table" ) );
+  registerShortcuts( QStringLiteral( "Ctrl+Alt+]" ), QStringLiteral( "mAttributeTableNextEditedFeature" ), tr( "Edit next feature in attribute table" ) );
+  registerShortcuts( QStringLiteral( "Ctrl+Alt+}" ), QStringLiteral( "mAttributeTableLastEditedFeature" ), tr( "Edit last feature in attribute table" ) );
+
   QgsProviderRegistry::instance()->registerGuis( this );
 
   setupLayoutManagerConnections();
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -21,6 +21,7 @@
 #include <QGroupBox>
 #include <QInputDialog>
 #include <QTimer>
+#include <QShortcut>
 
 #include "qgsapplication.h"
 #include "qgsactionmanager.h"
@@ -40,6 +41,7 @@
 #include "qgsscrollarea.h"
 #include "qgsgui.h"
 #include "qgsexpressioncontextutils.h"
+#include "qgsshortcutsmanager.h"
 
 
 QgsDualView::QgsDualView( QWidget *parent )
@@ -62,11 +64,23 @@ QgsDualView::QgsDualView( QWidget *parent )
   connect( mActionExpressionPreview, &QAction::triggered, this, &QgsDualView::previewExpressionBuilder );
   connect( mFeatureListView, &QgsFeatureListView::displayExpressionChanged, this, &QgsDualView::previewExpressionChanged );
 
+  // browsing toolbar
   connect( mNextFeatureButton, &QToolButton::clicked, mFeatureListView, &QgsFeatureListView::editNextFeature );
   connect( mPreviousFeatureButton, &QToolButton::clicked, mFeatureListView, &QgsFeatureListView::editPreviousFeature );
   connect( mFirstFeatureButton, &QToolButton::clicked, mFeatureListView, &QgsFeatureListView::editFirstFeature );
   connect( mLastFeatureButton, &QToolButton::clicked, mFeatureListView, &QgsFeatureListView::editLastFeature );
 
+  auto createShortcuts = [ = ]( const QString & objectName, void ( QgsFeatureListView::* slot )() )
+  {
+    QShortcut *sc = QgsGui::shortcutsManager()->shortcutByName( objectName );
+    Q_ASSERT( sc ); // the shortcut must have been registered in the shortcuts manager
+    connect( sc, &QShortcut::activated, mFeatureListView, slot );
+  };
+  createShortcuts( QStringLiteral( "mAttributeTableFirstEditedFeature" ), &QgsFeatureListView::editFirstFeature );
+  createShortcuts( QStringLiteral( "mAttributeTablePreviousEditedFeature" ), &QgsFeatureListView::editPreviousFeature );
+  createShortcuts( QStringLiteral( "mAttributeTableNextEditedFeature" ), &QgsFeatureListView::editNextFeature );
+  createShortcuts( QStringLiteral( "mAttributeTableLastEditedFeature" ), &QgsFeatureListView::editLastFeature );
+
   QButtonGroup *buttonGroup = new QButtonGroup( this );
   buttonGroup->setExclusive( false );
   buttonGroup->addButton( mFlashButton, FlashFeature );
diff --git a/src/gui/attributetable/qgsfeaturelistview.h b/src/gui/attributetable/qgsfeaturelistview.h
@@ -246,6 +246,8 @@ class GUI_EXPORT QgsFeatureListView : public QListView
     QItemSelectionModel::SelectionFlags mCtrlDragSelectionFlag;
 
     QTimer mUpdateEditSelectionTimer;
+
+    friend class QgsDualView;
 };
 
 #endif
diff --git a/src/gui/qgsshortcutsmanager.cpp b/src/gui/qgsshortcutsmanager.cpp
@@ -102,7 +102,7 @@ bool QgsShortcutsManager::registerAction( QAction *action, const QString &defaul
 
   action->setShortcut( sequence );
   action->setToolTip( "<b>" + action->toolTip() + "</b>" );
-  this->updateActionToolTip( action, sequence );
+  updateActionToolTip( action, sequence );
 
   return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ bool QgsShortcutsManager::registerAction( QAction *action, const QString &defaul`
`102`	`102`
`103`	`103`	`action->setShortcut( sequence );`
`104`	`104`	`action->setToolTip( "<b>" + action->toolTip() + "</b>" );`
`105`		`- this->updateActionToolTip( action, sequence );`
	`105`	`+ updateActionToolTip( action, sequence );`
`106`	`106`
`107`	`107`	`return true;`
`108`	`108`	`}`