Skip to content

Commit

Permalink
[ui] settings menu cleanup (#3916)
Browse files Browse the repository at this point in the history
- rewording of several items for increased clarity
- re-ordering to have more often used items first
- new icons for keyboard shortcuts and interface customization
  • Loading branch information
nirvn authored Dec 29, 2016
1 parent dd9a03a commit ca30d97
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 36 deletions.
2 changes: 2 additions & 0 deletions images/images.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<file>themes/default/mActionEditNodesItem.svg</file>
<file>themes/default/mActionEditHelpContent.svg</file>
<file>themes/default/mActionIncreaseFont.svg</file>
<file>themes/default/mActionInterfaceCustomization.svg</file>
<file>themes/default/mActionDecreaseFont.svg</file>
<file>themes/default/mActionAddNodesItem.svg</file>
<file>themes/default/mActionAddPolygon.svg</file>
Expand Down Expand Up @@ -210,6 +211,7 @@
<file>themes/default/mActionIncreaseContrast.svg</file>
<file>themes/default/mActionInOverview.svg</file>
<file>themes/default/mActionInvertSelection.svg</file>
<file>themes/default/mActionKeyboardShortcuts.svg</file>
<file>themes/default/mActionLabel.svg</file>
<file>themes/default/mActionLabeling.svg</file>
<file>themes/default/mActionLocalCumulativeCutStretch.svg</file>
Expand Down
1 change: 1 addition & 0 deletions images/themes/default/mActionInterfaceCustomization.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions images/themes/default/mActionKeyboardShortcuts.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 1 addition & 24 deletions images/themes/default/mActionOptions.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1722,7 +1722,7 @@ void QgisApp::createActions()
connect( mActionOptions, SIGNAL( triggered() ), this, SLOT( options() ) );
connect( mActionCustomProjection, SIGNAL( triggered() ), this, SLOT( customProjection() ) );
connect( mActionConfigureShortcuts, SIGNAL( triggered() ), this, SLOT( configureShortcuts() ) );
connect( mActionStyleManagerV2, SIGNAL( triggered() ), this, SLOT( showStyleManager() ) );
connect( mActionStyleManager, SIGNAL( triggered() ), this, SLOT( showStyleManager() ) );
connect( mActionCustomization, SIGNAL( triggered() ), this, SLOT( customize() ) );

#ifdef Q_OS_MAC
Expand Down Expand Up @@ -2631,8 +2631,8 @@ void QgisApp::setTheme( const QString& theThemeName )
mActionShowPythonDialog->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "console/iconRunConsole.png" ) ) );
mActionCheckQgisVersion->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionCheckQgisVersion.png" ) ) );
mActionOptions->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOptions.svg" ) ) );
mActionConfigureShortcuts->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOptions.svg" ) ) );
mActionCustomization->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOptions.svg" ) ) );
mActionConfigureShortcuts->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionKeyboardShortcuts.svg" ) ) );
mActionCustomization->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionInterfaceCustomization.svg" ) ) );
mActionHelpContents->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionHelpContents.svg" ) ) );
mActionLocalHistogramStretch->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionLocalHistogramStretch.svg" ) ) );
mActionFullHistogramStretch->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionFullHistogramStretch.svg" ) ) );
Expand Down
16 changes: 9 additions & 7 deletions src/ui/qgisapp.ui
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,12 @@
<string>&amp;Settings</string>
</property>
<addaction name="mActionProjectProperties"/>
<addaction name="mActionStyleManager"/>
<addaction name="mActionCustomProjection"/>
<addaction name="mActionStyleManagerV2"/>
<addaction name="separator"/>
<addaction name="mActionConfigureShortcuts"/>
<addaction name="mActionCustomization"/>
<addaction name="separator"/>
<addaction name="mActionOptions"/>
</widget>
<widget class="QMenu" name="mRasterMenu">
Expand Down Expand Up @@ -1593,16 +1595,16 @@
<normaloff>:/images/themes/default/mActionCustomProjection.svg</normaloff>:/images/themes/default/mActionCustomProjection.svg</iconset>
</property>
<property name="text">
<string>Custom CRS...</string>
<string>Custom Projections...</string>
</property>
</action>
<action name="mActionConfigureShortcuts">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
<normaloff>:/images/themes/default/mActionKeyboardShortcuts.svg</normaloff>:/images/themes/default/mActionKeyboardShortcuts.svg</iconset>
</property>
<property name="text">
<string>Configure Shortcuts...</string>
<string>Keyboard Shortcuts...</string>
</property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
Expand Down Expand Up @@ -1725,7 +1727,7 @@ Ctrl (Cmd) increments by 15 deg.</string>
<string>Change Label</string>
</property>
</action>
<action name="mActionStyleManagerV2">
<action name="mActionStyleManager">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/propertyicons/symbology.svg</normaloff>:/images/themes/default/propertyicons/symbology.svg</iconset>
Expand Down Expand Up @@ -1775,10 +1777,10 @@ Ctrl (Cmd) increments by 15 deg.</string>
<action name="mActionCustomization">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
<normaloff>:/images/themes/default/mActionInterfaceCustomization.svg</normaloff>:/images/themes/default/mActionInterfaceCustomization.svg</iconset>
</property>
<property name="text">
<string>Customization...</string>
<string>Interface Customization...</string>
</property>
</action>
<action name="actionActionCatchForCustomization">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsconfigureshortcutsdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Configure shortcuts</string>
<string>Keyboard shortcuts</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgscustomizationdialogbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Customization</string>
<string>Interface customization</string>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout_2">
Expand Down

0 comments on commit ca30d97

Please sign in to comment.