Skip to content

Commit 5f66494

Browse files
nyalldawsonnyalldawson
committed
[needs-docs] Remove " Panel" suffixes from panel titles
This extra text adds a lot of visual clutter to the interface, and makes tabbed dock's tab bars take up a lot of room. Instead only show the "panel" suffix in the menus.
1 parent 18ab200 commit 5f66494

12 files changed

+182
-54
lines changed

‎python/plugins/processing/ui/ProcessingToolbox.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Processing Toolbox Panel</string>
14+
<string>Processing Toolbox</string>
1515
</property>
1616
<widget class="QWidget" name="dockWidgetContents">
1717
<layout class="QVBoxLayout" name="verticalLayout">

‎python/plugins/processing/ui/resultsdockbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Results Viewer Panel</string>
14+
<string>Results Viewer</string>
1515
</property>
1616
<widget class="QWidget" name="dockWidgetContents">
1717
<layout class="QVBoxLayout" name="verticalLayout">

‎src/app/layout/qgslayoutdesignerdialog.cpp

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ QgsLayoutDesignerDialog::QgsLayoutDesignerDialog( QWidget *parent, Qt::WindowFla
640640
int minDockWidth( fontMetrics().width( QStringLiteral( "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" ) ) );
641641

642642
setTabPosition( Qt::AllDockWidgetAreas, QTabWidget::North );
643-
mGeneralDock = new QgsDockWidget( tr( "Layout Panel" ), this );
643+
mGeneralDock = new QgsDockWidget( tr( "Layout" ), this );
644644
mGeneralDock->setObjectName( QStringLiteral( "LayoutDock" ) );
645645
mGeneralDock->setMinimumWidth( minDockWidth );
646646
mGeneralPropertiesStack = new QgsPanelWidgetStack();
@@ -651,14 +651,14 @@ QgsLayoutDesignerDialog::QgsLayoutDesignerDialog( QWidget *parent, Qt::WindowFla
651651
mGeneralDock->setUserVisible( true );
652652
} );
653653

654-
mItemDock = new QgsDockWidget( tr( "Item Properties Panel" ), this );
654+
mItemDock = new QgsDockWidget( tr( "Item Properties" ), this );
655655
mItemDock->setObjectName( QStringLiteral( "ItemDock" ) );
656656
mItemDock->setMinimumWidth( minDockWidth );
657657
mItemPropertiesStack = new QgsPanelWidgetStack();
658658
mItemDock->setWidget( mItemPropertiesStack );
659659
mPanelsMenu->addAction( mItemDock->toggleViewAction() );
660660

661-
mGuideDock = new QgsDockWidget( tr( "Guides Panel" ), this );
661+
mGuideDock = new QgsDockWidget( tr( "Guides" ), this );
662662
mGuideDock->setObjectName( QStringLiteral( "GuideDock" ) );
663663
mGuideDock->setMinimumWidth( minDockWidth );
664664
mGuideStack = new QgsPanelWidgetStack();
@@ -669,25 +669,25 @@ QgsLayoutDesignerDialog::QgsLayoutDesignerDialog( QWidget *parent, Qt::WindowFla
669669
mGuideDock->setUserVisible( true );
670670
} );
671671

672-
mUndoDock = new QgsDockWidget( tr( "Undo History Panel" ), this );
672+
mUndoDock = new QgsDockWidget( tr( "Undo History" ), this );
673673
mUndoDock->setObjectName( QStringLiteral( "UndoDock" ) );
674674
mPanelsMenu->addAction( mUndoDock->toggleViewAction() );
675675
mUndoView = new QUndoView( this );
676676
mUndoDock->setWidget( mUndoView );
677677

678-
mItemsDock = new QgsDockWidget( tr( "Items Panel" ), this );
678+
mItemsDock = new QgsDockWidget( tr( "Items" ), this );
679679
mItemsDock->setObjectName( QStringLiteral( "ItemsDock" ) );
680680
mPanelsMenu->addAction( mItemsDock->toggleViewAction() );
681681

682682
//items tree widget
683683
mItemsTreeView = new QgsLayoutItemsListView( mItemsDock, this );
684684
mItemsDock->setWidget( mItemsTreeView );
685685

686-
mAtlasDock = new QgsDockWidget( tr( "Atlas Panel" ), this );
686+
mAtlasDock = new QgsDockWidget( tr( "Atlas" ), this );
687687
mAtlasDock->setObjectName( QStringLiteral( "AtlasDock" ) );
688688
connect( mAtlasDock, &QDockWidget::visibilityChanged, mActionAtlasSettings, &QAction::setChecked );
689689

690-
mReportDock = new QgsDockWidget( tr( "Report Organizer Panel" ), this );
690+
mReportDock = new QgsDockWidget( tr( "Report Organizer" ), this );
691691
mReportDock->setObjectName( QStringLiteral( "ReportDock" ) );
692692
connect( mReportDock, &QDockWidget::visibilityChanged, mActionReportSettings, &QAction::setChecked );
693693

@@ -798,6 +798,15 @@ QMenu *QgsLayoutDesignerDialog::createPopupMenu()
798798
{
799799
a->setVisible( false );
800800
}
801+
802+
if ( !a->property( "fixed_title" ).toBool() )
803+
{
804+
// append " Panel" to menu text. Only ever do this once, because the actions are not unique to
805+
// this single popup menu
806+
a->setText( tr( "%1 Panel" ).arg( a->text() ) );
807+
a->setProperty( "fixed_title", true );
808+
}
809+
801810
menu->addAction( a );
802811
}
803812
menu->addSeparator();

‎src/app/qgisapp.cpp

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
809809

810810
// create undo widget
811811
startProfile( QStringLiteral( "Undo dock" ) );
812-
mUndoDock = new QgsDockWidget( tr( "Undo/Redo Panel" ), this );
812+
mUndoDock = new QgsDockWidget( tr( "Undo/Redo" ), this );
813813
mUndoWidget = new QgsUndoWidget( mUndoDock, mMapCanvas );
814814
mUndoWidget->setObjectName( QStringLiteral( "Undo" ) );
815815
mUndoDock->setWidget( mUndoWidget );
@@ -819,6 +819,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
819819
// Advanced Digitizing dock
820820
startProfile( QStringLiteral( "Advanced digitize panel" ) );
821821
mAdvancedDigitizingDockWidget = new QgsAdvancedDigitizingDockWidget( mMapCanvas, this );
822+
mAdvancedDigitizingDockWidget->setWindowTitle( tr( "Advanced Digitizing" ) );
822823
mAdvancedDigitizingDockWidget->setObjectName( QStringLiteral( "AdvancedDigitizingTools" ) );
823824
endProfile();
824825

@@ -902,7 +903,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
902903

903904
startProfile( QStringLiteral( "Layer Style dock" ) );
904905
mMapStylingDock = new QgsDockWidget( this );
905-
mMapStylingDock->setWindowTitle( tr( "Layer Styling Panel" ) );
906+
mMapStylingDock->setWindowTitle( tr( "Layer Styling" ) );
906907
mMapStylingDock->setObjectName( QStringLiteral( "LayerStyling" ) );
907908
mMapStyleWidget = new QgsLayerStylingWidget( mMapCanvas, mMapLayerPanelFactories );
908909
mMapStylingDock->setWidget( mMapStyleWidget );
@@ -940,7 +941,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
940941
endProfile();
941942

942943
mBrowserModel = new QgsBrowserModel( this );
943-
mBrowserWidget = new QgsBrowserDockWidget( tr( "Browser Panel" ), mBrowserModel, this );
944+
mBrowserWidget = new QgsBrowserDockWidget( tr( "Browser" ), mBrowserModel, this );
944945
mBrowserWidget->setObjectName( QStringLiteral( "Browser" ) );
945946
addDockWidget( Qt::LeftDockWidgetArea, mBrowserWidget );
946947
mBrowserWidget->hide();
@@ -951,7 +952,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
951952
connect( mBrowserWidget, &QgsBrowserDockWidget::openFile, this, &QgisApp::openFile );
952953
connect( mBrowserWidget, &QgsBrowserDockWidget::handleDropUriList, this, &QgisApp::handleDropUriList );
953954

954-
mBrowserWidget2 = new QgsBrowserDockWidget( tr( "Browser Panel (2)" ), mBrowserModel, this );
955+
mBrowserWidget2 = new QgsBrowserDockWidget( tr( "Browser (2)" ), mBrowserModel, this );
955956
mBrowserWidget2->setObjectName( QStringLiteral( "Browser2" ) );
956957
addDockWidget( Qt::LeftDockWidgetArea, mBrowserWidget2 );
957958
mBrowserWidget2->hide();
@@ -972,7 +973,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
972973
// create the GPS tool on starting QGIS - this is like the browser
973974
mpGpsWidget = new QgsGpsInformationWidget( mMapCanvas );
974975
//create the dock widget
975-
mpGpsDock = new QgsDockWidget( tr( "GPS Information Panel" ), this );
976+
mpGpsDock = new QgsDockWidget( tr( "GPS Information" ), this );
976977
mpGpsDock->setObjectName( QStringLiteral( "GPSInformation" ) );
977978
mpGpsDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
978979
addDockWidget( Qt::LeftDockWidgetArea, mpGpsDock );
@@ -985,7 +986,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
985986

986987
mLogViewer = new QgsMessageLogViewer( this );
987988

988-
mLogDock = new QgsDockWidget( tr( "Log Messages Panel" ), this );
989+
mLogDock = new QgsDockWidget( tr( "Log Messages" ), this );
989990
mLogDock->setObjectName( QStringLiteral( "MessageLog" ) );
990991
mLogDock->setAllowedAreas( Qt::BottomDockWidgetArea | Qt::TopDockWidgetArea );
991992
addDockWidget( Qt::BottomDockWidgetArea, mLogDock );
@@ -3385,7 +3386,7 @@ void QgisApp::createOverview()
33853386
// QVBoxLayout *myOverviewLayout = new QVBoxLayout;
33863387
// myOverviewLayout->addWidget(overviewCanvas);
33873388
// overviewFrame->setLayout(myOverviewLayout);
3388-
mOverviewDock = new QgsDockWidget( tr( "Overview Panel" ), this );
3389+
mOverviewDock = new QgsDockWidget( tr( "Overview" ), this );
33893390
mOverviewDock->setObjectName( QStringLiteral( "Overview" ) );
33903391
mOverviewDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
33913392
mOverviewDock->setWidget( mOverviewCanvas );
@@ -3618,7 +3619,7 @@ void QgisApp::initLayerTreeView()
36183619
{
36193620
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." ) );
36203621

3621-
mLayerTreeDock = new QgsDockWidget( tr( "Layers Panel" ), this );
3622+
mLayerTreeDock = new QgsDockWidget( tr( "Layers" ), this );
36223623
mLayerTreeDock->setObjectName( QStringLiteral( "Layers" ) );
36233624
mLayerTreeDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
36243625

@@ -3715,7 +3716,7 @@ void QgisApp::initLayerTreeView()
37153716
mMapLayerOrder->setObjectName( QStringLiteral( "theMapLayerOrder" ) );
37163717

37173718
mMapLayerOrder->setWhatsThis( tr( "Map layer list that displays all layers in drawing order." ) );
3718-
mLayerOrderDock = new QgsDockWidget( tr( "Layer Order Panel" ), this );
3719+
mLayerOrderDock = new QgsDockWidget( tr( "Layer Order" ), this );
37193720
mLayerOrderDock->setObjectName( QStringLiteral( "LayerOrder" ) );
37203721
mLayerOrderDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
37213722

@@ -13118,6 +13119,14 @@ QMenu *QgisApp::createPopupMenu()
1311813119
menu->addAction( panelstitle );
1311913120
Q_FOREACH ( QAction *a, panels )
1312013121
{
13122+
if ( !a->property( "fixed_title" ).toBool() )
13123+
{
13124+
// append " Panel" to menu text. Only ever do this once, because the actions are not unique to
13125+
// this single popup menu
13126+
13127+
a->setText( tr( "%1 Panel" ).arg( a->text() ) );
13128+
a->setProperty( "fixed_title", true );
13129+
}
1312113130
menu->addAction( a );
1312213131
}
1312313132
menu->addSeparator();

‎src/app/qgsidentifyresultsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ QgsIdentifyResultsDialog::QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidge
326326
mOpenFormAction->setDisabled( true );
327327

328328
QgsSettings mySettings;
329-
mDock = new QgsDockWidget( tr( "Identify Results Panel" ), QgisApp::instance() );
329+
mDock = new QgsDockWidget( tr( "Identify Results" ), QgisApp::instance() );
330330
mDock->setObjectName( QStringLiteral( "IdentifyResultsDock" ) );
331331
mDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
332332
mDock->setWidget( this );

‎src/app/qgsundowidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ void QgsUndoWidget::setupUi( QWidget *UndoWidget )
190190

191191
void QgsUndoWidget::retranslateUi( QWidget *UndoWidget )
192192
{
193-
UndoWidget->setWindowTitle( QApplication::translate( "UndoWidget", "Undo/Redo Panel", nullptr, QApplication::UnicodeUTF8 ) );
193+
UndoWidget->setWindowTitle( QApplication::translate( "UndoWidget", "Undo/Redo", nullptr, QApplication::UnicodeUTF8 ) );
194194
undoButton->setText( QApplication::translate( "UndoWidget", "Undo", nullptr, QApplication::UnicodeUTF8 ) );
195195
redoButton->setText( QApplication::translate( "UndoWidget", "Redo", nullptr, QApplication::UnicodeUTF8 ) );
196196
Q_UNUSED( UndoWidget );

‎src/providers/wms/qgstilescalewidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void QgsTileScaleWidget::showTileScale( QMainWindow *mainWindow )
139139
}
140140

141141
//create the dock widget
142-
dock = new QgsDockWidget( tr( "Tile Scale Panel" ), mainWindow );
142+
dock = new QgsDockWidget( tr( "Tile Scale" ), mainWindow );
143143
dock->setObjectName( QStringLiteral( "theTileScaleDock" ) );
144144
dock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
145145
mainWindow->addDockWidget( Qt::RightDockWidgetArea, dock );

‎src/ui/qgsadvanceddigitizingdockwidgetbase.ui

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</size>
1818
</property>
1919
<property name="windowTitle">
20-
<string>Advanced Digitizing Panel</string>
20+
<string>Advanced Digitizing</string>
2121
</property>
2222
<widget class="QWidget" name="dockWidgetContents">
2323
<layout class="QGridLayout" name="gridLayout">
@@ -534,7 +534,34 @@
534534
<tabstop>mRepeatingLockYButton</tabstop>
535535
</tabstops>
536536
<resources>
537-
<include location="../plugins/georeferencer/georeferencer.qrc"/>
537+
<include location="../../images/images.qrc"/>
538+
<include location="../../images/images.qrc"/>
539+
<include location="../../images/images.qrc"/>
540+
<include location="../../images/images.qrc"/>
541+
<include location="../../images/images.qrc"/>
542+
<include location="../../images/images.qrc"/>
543+
<include location="../../images/images.qrc"/>
544+
<include location="../../images/images.qrc"/>
545+
<include location="../../images/images.qrc"/>
546+
<include location="../../images/images.qrc"/>
547+
<include location="../../images/images.qrc"/>
548+
<include location="../../images/images.qrc"/>
549+
<include location="../../images/images.qrc"/>
550+
<include location="../../images/images.qrc"/>
551+
<include location="../../images/images.qrc"/>
552+
<include location="../../images/images.qrc"/>
553+
<include location="../../images/images.qrc"/>
554+
<include location="../../images/images.qrc"/>
555+
<include location="../../images/images.qrc"/>
556+
<include location="../../images/images.qrc"/>
557+
<include location="../../images/images.qrc"/>
558+
<include location="../../images/images.qrc"/>
559+
<include location="../../images/images.qrc"/>
560+
<include location="../../images/images.qrc"/>
561+
<include location="../../images/images.qrc"/>
562+
<include location="../../images/images.qrc"/>
563+
<include location="../../images/images.qrc"/>
564+
<include location="../../images/images.qrc"/>
538565
<include location="../../images/images.qrc"/>
539566
</resources>
540567
<connections/>

‎src/ui/qgsbookmarksbase.ui

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Spatial Bookmarks Panel</string>
14+
<string>Spatial Bookmarks</string>
1515
</property>
1616
<widget class="QWidget" name="bookmarksDockContents">
1717
<layout class="QGridLayout" name="gridLayout">
@@ -114,6 +114,34 @@
114114
</customwidgets>
115115
<resources>
116116
<include location="../../images/images.qrc"/>
117+
<include location="../../images/images.qrc"/>
118+
<include location="../../images/images.qrc"/>
119+
<include location="../../images/images.qrc"/>
120+
<include location="../../images/images.qrc"/>
121+
<include location="../../images/images.qrc"/>
122+
<include location="../../images/images.qrc"/>
123+
<include location="../../images/images.qrc"/>
124+
<include location="../../images/images.qrc"/>
125+
<include location="../../images/images.qrc"/>
126+
<include location="../../images/images.qrc"/>
127+
<include location="../../images/images.qrc"/>
128+
<include location="../../images/images.qrc"/>
129+
<include location="../../images/images.qrc"/>
130+
<include location="../../images/images.qrc"/>
131+
<include location="../../images/images.qrc"/>
132+
<include location="../../images/images.qrc"/>
133+
<include location="../../images/images.qrc"/>
134+
<include location="../../images/images.qrc"/>
135+
<include location="../../images/images.qrc"/>
136+
<include location="../../images/images.qrc"/>
137+
<include location="../../images/images.qrc"/>
138+
<include location="../../images/images.qrc"/>
139+
<include location="../../images/images.qrc"/>
140+
<include location="../../images/images.qrc"/>
141+
<include location="../../images/images.qrc"/>
142+
<include location="../../images/images.qrc"/>
143+
<include location="../../images/images.qrc"/>
144+
<include location="../../images/images.qrc"/>
117145
</resources>
118146
<connections/>
119147
</ui>

‎src/ui/qgsidentifyresultsbase.ui

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Identify Results Panel</string>
14+
<string>Identify Results</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout_4">
1717
<property name="spacing">
@@ -351,6 +351,34 @@
351351
</customwidgets>
352352
<resources>
353353
<include location="../../images/images.qrc"/>
354+
<include location="../../images/images.qrc"/>
355+
<include location="../../images/images.qrc"/>
356+
<include location="../../images/images.qrc"/>
357+
<include location="../../images/images.qrc"/>
358+
<include location="../../images/images.qrc"/>
359+
<include location="../../images/images.qrc"/>
360+
<include location="../../images/images.qrc"/>
361+
<include location="../../images/images.qrc"/>
362+
<include location="../../images/images.qrc"/>
363+
<include location="../../images/images.qrc"/>
364+
<include location="../../images/images.qrc"/>
365+
<include location="../../images/images.qrc"/>
366+
<include location="../../images/images.qrc"/>
367+
<include location="../../images/images.qrc"/>
368+
<include location="../../images/images.qrc"/>
369+
<include location="../../images/images.qrc"/>
370+
<include location="../../images/images.qrc"/>
371+
<include location="../../images/images.qrc"/>
372+
<include location="../../images/images.qrc"/>
373+
<include location="../../images/images.qrc"/>
374+
<include location="../../images/images.qrc"/>
375+
<include location="../../images/images.qrc"/>
376+
<include location="../../images/images.qrc"/>
377+
<include location="../../images/images.qrc"/>
378+
<include location="../../images/images.qrc"/>
379+
<include location="../../images/images.qrc"/>
380+
<include location="../../images/images.qrc"/>
381+
<include location="../../images/images.qrc"/>
354382
</resources>
355383
<connections/>
356384
</ui>

‎src/ui/qgslocatoroptionswidgetbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Spatial Bookmarks Panel</string>
14+
<string>Locator Options</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout" columnstretch="1,0">
1717
<property name="leftMargin">

0 commit comments

Comments
 (0)