@@ -834,7 +834,11 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
834
834
// create undo widget
835
835
startProfile ( QStringLiteral ( " Undo dock" ) );
836
836
mUndoDock = new QgsDockWidget ( tr ( " Undo/Redo" ), this );
837
- mUndoDock ->toggleViewAction ()->setShortcut ( tr ( " Ctrl+5" , " Keyboard shortcut: Show undo/redo panel." ) );
837
+ QShortcut *showUndoDock = new QShortcut ( QKeySequence ( tr ( " Ctrl+5" ) ), this );
838
+ connect ( showUndoDock, &QShortcut::activated, mUndoDock , &QgsDockWidget::toggleUserVisible );
839
+ showUndoDock->setObjectName ( QStringLiteral ( " ShowUndoPanel" ) );
840
+ showUndoDock->setWhatsThis ( tr ( " Show Undo/Redo Panel" ) );
841
+
838
842
mUndoWidget = new QgsUndoWidget ( mUndoDock , mMapCanvas );
839
843
mUndoWidget ->setObjectName ( QStringLiteral ( " Undo" ) );
840
844
mUndoDock ->setWidget ( mUndoWidget );
@@ -845,23 +849,38 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
845
849
startProfile ( QStringLiteral ( " Advanced digitize panel" ) );
846
850
mAdvancedDigitizingDockWidget = new QgsAdvancedDigitizingDockWidget ( mMapCanvas , this );
847
851
mAdvancedDigitizingDockWidget ->setWindowTitle ( tr ( " Advanced Digitizing" ) );
848
- mAdvancedDigitizingDockWidget ->toggleViewAction ()->setShortcut ( tr ( " Ctrl+4" , " Keyboard shortcut: Show advanced digitizing panel." ) );
849
852
mAdvancedDigitizingDockWidget ->setObjectName ( QStringLiteral ( " AdvancedDigitizingTools" ) );
853
+
854
+ QShortcut *showAdvancedDigitizingDock = new QShortcut ( QKeySequence ( tr ( " Ctrl+4" ) ), this );
855
+ connect ( showAdvancedDigitizingDock, &QShortcut::activated, mAdvancedDigitizingDockWidget , &QgsDockWidget::toggleUserVisible );
856
+ showAdvancedDigitizingDock->setObjectName ( QStringLiteral ( " ShowAdvancedDigitizingPanel" ) );
857
+ showAdvancedDigitizingDock->setWhatsThis ( tr ( " Show Advanced Digitizing Panel" ) );
858
+
850
859
endProfile ();
851
860
852
861
// Statistical Summary dock
853
862
startProfile ( QStringLiteral ( " Stats dock" ) );
854
863
mStatisticalSummaryDockWidget = new QgsStatisticalSummaryDockWidget ( this );
855
864
mStatisticalSummaryDockWidget ->setObjectName ( QStringLiteral ( " StatistalSummaryDockWidget" ) );
856
- mStatisticalSummaryDockWidget ->toggleViewAction ()->setShortcut ( tr ( " Ctrl+6" , " Keyboard shortcut: Show statisics panel." ) );
865
+
866
+ QShortcut *showStatsDock = new QShortcut ( QKeySequence ( tr ( " Ctrl+6" ) ), this );
867
+ connect ( showStatsDock, &QShortcut::activated, mStatisticalSummaryDockWidget , &QgsDockWidget::toggleUserVisible );
868
+ showStatsDock->setObjectName ( QStringLiteral ( " ShowStatisticsPanel" ) );
869
+ showStatsDock->setWhatsThis ( tr ( " Show Statistics Panel" ) );
870
+
857
871
connect ( mStatisticalSummaryDockWidget , &QDockWidget::visibilityChanged, mActionStatisticalSummary , &QAction::setChecked );
858
872
endProfile ();
859
873
860
874
// Bookmarks dock
861
875
startProfile ( QStringLiteral ( " Bookmarks widget" ) );
862
876
mBookMarksDockWidget = new QgsBookmarks ( this );
863
877
mBookMarksDockWidget ->setObjectName ( QStringLiteral ( " BookmarksDockWidget" ) );
864
- mBookMarksDockWidget ->toggleViewAction ()->setShortcut ( tr ( " Ctrl+7" , " Keyboard shortcut: Show bookmarks panel." ) );
878
+
879
+ QShortcut *showBookmarksDock = new QShortcut ( QKeySequence ( tr ( " Ctrl+7" ) ), this );
880
+ connect ( showBookmarksDock, &QShortcut::activated, mBookMarksDockWidget , &QgsDockWidget::toggleUserVisible );
881
+ showBookmarksDock->setObjectName ( QStringLiteral ( " ShowBookmarksPanel" ) );
882
+ showBookmarksDock->setWhatsThis ( tr ( " Show Bookmarks Panel" ) );
883
+
865
884
connect ( mBookMarksDockWidget , &QDockWidget::visibilityChanged, mActionShowBookmarks , &QAction::setChecked );
866
885
endProfile ();
867
886
@@ -931,9 +950,13 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
931
950
932
951
startProfile ( QStringLiteral ( " Layer Style dock" ) );
933
952
mMapStylingDock = new QgsDockWidget ( this );
934
- mMapStylingDock ->toggleViewAction ()->setShortcut ( tr ( " Ctrl+3" , " Keyboard shortcut: Show style panel." ) );
935
953
mMapStylingDock ->setWindowTitle ( tr ( " Layer Styling" ) );
936
954
mMapStylingDock ->setObjectName ( QStringLiteral ( " LayerStyling" ) );
955
+ QShortcut *showStylingDock = new QShortcut ( QKeySequence ( tr ( " Ctrl+3" ) ), this );
956
+ connect ( showStylingDock, &QShortcut::activated, mMapStylingDock , &QgsDockWidget::toggleUserVisible );
957
+ showStylingDock->setObjectName ( QStringLiteral ( " ShowLayerStylingPanel" ) );
958
+ showStylingDock->setWhatsThis ( tr ( " Show Style Panel" ) );
959
+
937
960
mMapStyleWidget = new QgsLayerStylingWidget ( mMapCanvas , mMapLayerPanelFactories );
938
961
mMapStylingDock ->setWidget ( mMapStyleWidget );
939
962
connect ( mMapStyleWidget , &QgsLayerStylingWidget::styleChanged, this , &QgisApp::updateLabelToolButtons );
@@ -971,8 +994,13 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
971
994
972
995
mBrowserModel = new QgsBrowserModel ( this );
973
996
mBrowserWidget = new QgsBrowserDockWidget ( tr ( " Browser" ), mBrowserModel , this );
974
- mBrowserWidget ->toggleViewAction ()->setShortcut ( tr ( " Ctrl+2" , " Keyboard shortcut: Show browser panel." ) );
975
997
mBrowserWidget ->setObjectName ( QStringLiteral ( " Browser" ) );
998
+
999
+ QShortcut *showBrowserDock = new QShortcut ( QKeySequence ( tr ( " Ctrl+2" ) ), this );
1000
+ connect ( showBrowserDock, &QShortcut::activated, mBrowserWidget , &QgsDockWidget::toggleUserVisible );
1001
+ showBrowserDock->setObjectName ( QStringLiteral ( " ShowBrowserPanel" ) );
1002
+ showBrowserDock->setWhatsThis ( tr ( " Show Browser Panel" ) );
1003
+
976
1004
addDockWidget ( Qt::LeftDockWidgetArea, mBrowserWidget );
977
1005
mBrowserWidget ->hide ();
978
1006
connect ( this , &QgisApp::newProject, mBrowserWidget , &QgsBrowserDockWidget::updateProjectHome );
@@ -1004,7 +1032,12 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
1004
1032
mpGpsWidget = new QgsGpsInformationWidget ( mMapCanvas );
1005
1033
// create the dock widget
1006
1034
mpGpsDock = new QgsDockWidget ( tr ( " GPS Information" ), this );
1007
- mpGpsDock->toggleViewAction ()->setShortcut ( tr ( " Ctrl+0" , " Keyboard shortcut: Show GPS information panel." ) );
1035
+
1036
+ QShortcut *showGpsDock = new QShortcut ( QKeySequence ( tr ( " Ctrl+0" ) ), this );
1037
+ connect ( showGpsDock, &QShortcut::activated, mpGpsDock, &QgsDockWidget::toggleUserVisible );
1038
+ showGpsDock->setObjectName ( QStringLiteral ( " ShowGpsPanel" ) );
1039
+ showGpsDock->setWhatsThis ( tr ( " Show GPS Information Panel" ) );
1040
+
1008
1041
mpGpsDock->setObjectName ( QStringLiteral ( " GPSInformation" ) );
1009
1042
mpGpsDock->setAllowedAreas ( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
1010
1043
addDockWidget ( Qt::LeftDockWidgetArea, mpGpsDock );
@@ -3476,7 +3509,12 @@ void QgisApp::createOverview()
3476
3509
// myOverviewLayout->addWidget(overviewCanvas);
3477
3510
// overviewFrame->setLayout(myOverviewLayout);
3478
3511
mOverviewDock = new QgsDockWidget ( tr ( " Overview" ), this );
3479
- mOverviewDock ->toggleViewAction ()->setShortcut ( tr ( " Ctrl+8" , " Keyboard shortcut: Show overview panel." ) );
3512
+
3513
+ QShortcut *showOverviewDock = new QShortcut ( QKeySequence ( tr ( " Ctrl+8" ) ), this );
3514
+ connect ( showOverviewDock, &QShortcut::activated, mOverviewDock , &QgsDockWidget::toggleUserVisible );
3515
+ showOverviewDock->setObjectName ( QStringLiteral ( " ShowOverviewPanel" ) );
3516
+ showOverviewDock->setWhatsThis ( tr ( " Show Overview Panel" ) );
3517
+
3480
3518
mOverviewDock ->setObjectName ( QStringLiteral ( " Overview" ) );
3481
3519
mOverviewDock ->setAllowedAreas ( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
3482
3520
mOverviewDock ->setWidget ( mOverviewCanvas );
@@ -3709,10 +3747,14 @@ void QgisApp::initLayerTreeView()
3709
3747
mLayerTreeView ->setWhatsThis ( tr ( " Map legend that displays all the layers currently on the map canvas. Click on the checkbox to turn a layer on or off. Double-click on a layer in the legend to customize its appearance and set other properties." ) );
3710
3748
3711
3749
mLayerTreeDock = new QgsDockWidget ( tr ( " Layers" ), this );
3712
- mLayerTreeDock ->toggleViewAction ()->setShortcut ( tr ( " Ctrl+1" , " Keyboard shortcut: Show layers panel." ) );
3713
3750
mLayerTreeDock ->setObjectName ( QStringLiteral ( " Layers" ) );
3714
3751
mLayerTreeDock ->setAllowedAreas ( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
3715
3752
3753
+ QShortcut *showLayersTreeDock = new QShortcut ( QKeySequence ( tr ( " Ctrl+1" ) ), this );
3754
+ connect ( showLayersTreeDock, &QShortcut::activated, mLayerTreeDock , &QgsDockWidget::toggleUserVisible );
3755
+ showLayersTreeDock->setObjectName ( QStringLiteral ( " ShowLayersPanel" ) );
3756
+ showLayersTreeDock->setWhatsThis ( tr ( " Show Layers Panel" ) );
3757
+
3716
3758
QgsLayerTreeModel *model = new QgsLayerTreeModel ( QgsProject::instance ()->layerTreeRoot (), this );
3717
3759
#ifdef ENABLE_MODELTEST
3718
3760
new ModelTest ( model, this );
@@ -3809,10 +3851,14 @@ void QgisApp::initLayerTreeView()
3809
3851
3810
3852
mMapLayerOrder ->setWhatsThis ( tr ( " Map layer list that displays all layers in drawing order." ) );
3811
3853
mLayerOrderDock = new QgsDockWidget ( tr ( " Layer Order" ), this );
3812
- mLayerOrderDock ->toggleViewAction ()->setShortcut ( tr ( " Ctrl+9" , " Keyboard shortcut: Show layer order panel." ) );
3813
3854
mLayerOrderDock ->setObjectName ( QStringLiteral ( " LayerOrder" ) );
3814
3855
mLayerOrderDock ->setAllowedAreas ( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
3815
3856
3857
+ QShortcut *showLayerOrderDock = new QShortcut ( QKeySequence ( tr ( " Ctrl+9" ) ), this );
3858
+ connect ( showLayerOrderDock, &QShortcut::activated, mLayerOrderDock , &QgsDockWidget::toggleUserVisible );
3859
+ showLayerOrderDock->setObjectName ( QStringLiteral ( " ShowLayerOrderPanel" ) );
3860
+ showLayerOrderDock->setWhatsThis ( tr ( " Show Layer Order Panel" ) );
3861
+
3816
3862
mLayerOrderDock ->setWidget ( mMapLayerOrder );
3817
3863
addDockWidget ( Qt::LeftDockWidgetArea, mLayerOrderDock );
3818
3864
mLayerOrderDock ->hide ();
0 commit comments