Skip to content

Commit ca30d97

Browse files
nirvnnirvn
authored
[ui] settings menu cleanup (#3916)
- rewording of several items for increased clarity - re-ordering to have more often used items first - new icons for keyboard shortcuts and interface customization
1 parent dd9a03a commit ca30d97

8 files changed

+19
-36
lines changed

‎images/images.qrc

+2
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<file>themes/default/mActionEditNodesItem.svg</file>
110110
<file>themes/default/mActionEditHelpContent.svg</file>
111111
<file>themes/default/mActionIncreaseFont.svg</file>
112+
<file>themes/default/mActionInterfaceCustomization.svg</file>
112113
<file>themes/default/mActionDecreaseFont.svg</file>
113114
<file>themes/default/mActionAddNodesItem.svg</file>
114115
<file>themes/default/mActionAddPolygon.svg</file>
@@ -210,6 +211,7 @@
210211
<file>themes/default/mActionIncreaseContrast.svg</file>
211212
<file>themes/default/mActionInOverview.svg</file>
212213
<file>themes/default/mActionInvertSelection.svg</file>
214+
<file>themes/default/mActionKeyboardShortcuts.svg</file>
213215
<file>themes/default/mActionLabel.svg</file>
214216
<file>themes/default/mActionLabeling.svg</file>
215217
<file>themes/default/mActionLocalCumulativeCutStretch.svg</file>

‎images/themes/default/mActionInterfaceCustomization.svg

+1
Loading

‎images/themes/default/mActionKeyboardShortcuts.svg

+1
Loading

‎images/themes/default/mActionOptions.svg

+1-24
Loading

‎src/app/qgisapp.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1722,7 +1722,7 @@ void QgisApp::createActions()
17221722
connect( mActionOptions, SIGNAL( triggered() ), this, SLOT( options() ) );
17231723
connect( mActionCustomProjection, SIGNAL( triggered() ), this, SLOT( customProjection() ) );
17241724
connect( mActionConfigureShortcuts, SIGNAL( triggered() ), this, SLOT( configureShortcuts() ) );
1725-
connect( mActionStyleManagerV2, SIGNAL( triggered() ), this, SLOT( showStyleManager() ) );
1725+
connect( mActionStyleManager, SIGNAL( triggered() ), this, SLOT( showStyleManager() ) );
17261726
connect( mActionCustomization, SIGNAL( triggered() ), this, SLOT( customize() ) );
17271727

17281728
#ifdef Q_OS_MAC
@@ -2631,8 +2631,8 @@ void QgisApp::setTheme( const QString& theThemeName )
26312631
mActionShowPythonDialog->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "console/iconRunConsole.png" ) ) );
26322632
mActionCheckQgisVersion->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionCheckQgisVersion.png" ) ) );
26332633
mActionOptions->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOptions.svg" ) ) );
2634-
mActionConfigureShortcuts->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOptions.svg" ) ) );
2635-
mActionCustomization->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOptions.svg" ) ) );
2634+
mActionConfigureShortcuts->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionKeyboardShortcuts.svg" ) ) );
2635+
mActionCustomization->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionInterfaceCustomization.svg" ) ) );
26362636
mActionHelpContents->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionHelpContents.svg" ) ) );
26372637
mActionLocalHistogramStretch->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionLocalHistogramStretch.svg" ) ) );
26382638
mActionFullHistogramStretch->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionFullHistogramStretch.svg" ) ) );

‎src/ui/qgisapp.ui

+9-7
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,12 @@
212212
<string>&amp;Settings</string>
213213
</property>
214214
<addaction name="mActionProjectProperties"/>
215+
<addaction name="mActionStyleManager"/>
215216
<addaction name="mActionCustomProjection"/>
216-
<addaction name="mActionStyleManagerV2"/>
217+
<addaction name="separator"/>
217218
<addaction name="mActionConfigureShortcuts"/>
218219
<addaction name="mActionCustomization"/>
220+
<addaction name="separator"/>
219221
<addaction name="mActionOptions"/>
220222
</widget>
221223
<widget class="QMenu" name="mRasterMenu">
@@ -1593,16 +1595,16 @@
15931595
<normaloff>:/images/themes/default/mActionCustomProjection.svg</normaloff>:/images/themes/default/mActionCustomProjection.svg</iconset>
15941596
</property>
15951597
<property name="text">
1596-
<string>Custom CRS...</string>
1598+
<string>Custom Projections...</string>
15971599
</property>
15981600
</action>
15991601
<action name="mActionConfigureShortcuts">
16001602
<property name="icon">
16011603
<iconset resource="../../images/images.qrc">
1602-
<normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
1604+
<normaloff>:/images/themes/default/mActionKeyboardShortcuts.svg</normaloff>:/images/themes/default/mActionKeyboardShortcuts.svg</iconset>
16031605
</property>
16041606
<property name="text">
1605-
<string>Configure Shortcuts...</string>
1607+
<string>Keyboard Shortcuts...</string>
16061608
</property>
16071609
<property name="menuRole">
16081610
<enum>QAction::NoRole</enum>
@@ -1725,7 +1727,7 @@ Ctrl (Cmd) increments by 15 deg.</string>
17251727
<string>Change Label</string>
17261728
</property>
17271729
</action>
1728-
<action name="mActionStyleManagerV2">
1730+
<action name="mActionStyleManager">
17291731
<property name="icon">
17301732
<iconset resource="../../images/images.qrc">
17311733
<normaloff>:/images/themes/default/propertyicons/symbology.svg</normaloff>:/images/themes/default/propertyicons/symbology.svg</iconset>
@@ -1775,10 +1777,10 @@ Ctrl (Cmd) increments by 15 deg.</string>
17751777
<action name="mActionCustomization">
17761778
<property name="icon">
17771779
<iconset resource="../../images/images.qrc">
1778-
<normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
1780+
<normaloff>:/images/themes/default/mActionInterfaceCustomization.svg</normaloff>:/images/themes/default/mActionInterfaceCustomization.svg</iconset>
17791781
</property>
17801782
<property name="text">
1781-
<string>Customization...</string>
1783+
<string>Interface Customization...</string>
17821784
</property>
17831785
</action>
17841786
<action name="actionActionCatchForCustomization">

‎src/ui/qgsconfigureshortcutsdialog.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Configure shortcuts</string>
14+
<string>Keyboard shortcuts</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
1717
<item>

‎src/ui/qgscustomizationdialogbase.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Customization</string>
14+
<string>Interface customization</string>
1515
</property>
1616
<widget class="QWidget" name="centralwidget">
1717
<layout class="QVBoxLayout" name="verticalLayout_2">

0 commit comments

Comments
 (0)