[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
qgis · Dec 29, 2016 · ca30d97 · ca30d97
1 parent dd9a03a
commit ca30d97
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 36 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -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>
@@ -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>

diff --git a/images/themes/default/mActionInterfaceCustomization.svg b/images/themes/default/mActionInterfaceCustomization.svg
diff --git a/images/themes/default/mActionKeyboardShortcuts.svg b/images/themes/default/mActionKeyboardShortcuts.svg
diff --git a/images/themes/default/mActionOptions.svg b/images/themes/default/mActionOptions.svg
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -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
@@ -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" ) ) );

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -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">
@@ -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>
@@ -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>
@@ -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">

diff --git a/src/ui/qgsconfigureshortcutsdialog.ui b/src/ui/qgsconfigureshortcutsdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Configure shortcuts</string>
+   <string>Keyboard shortcuts</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>

diff --git a/src/ui/qgscustomizationdialogbase.ui b/src/ui/qgscustomizationdialogbase.ui
@@ -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">