Merge pull request #2119 from nirvn/browser_toolbar_improvement

[browser] slight re-ordering and icon improvements
qgis · Jun 7, 2015 · aa6db0e · aa6db0e
2 parents ea31c68 + 4075979
commit aa6db0e
Show file tree

Hide file tree

Showing 3 changed files with 273 additions and 10 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -102,6 +102,7 @@
         <file>themes/default/mAction.svg</file>
         <file>themes/default/mActionAdd.png</file>
         <file>themes/default/mActionAdd.svg</file>
+        <file>themes/default/mActionAddLayer.svg</file>
         <file>themes/default/mActionAddAllToOverview.svg</file>
         <file>themes/default/mActionAddArrow.png</file>
         <file>themes/default/mActionAddBasicShape.png</file>

diff --git a/images/themes/default/mActionAddLayer.svg b/images/themes/default/mActionAddLayer.svg
diff --git a/src/ui/qgsbrowserdockwidgetbase.ui b/src/ui/qgsbrowserdockwidgetbase.ui
@@ -41,8 +41,8 @@
       <property name="floatable">
        <bool>false</bool>
       </property>
-      <addaction name="mActionRefresh"/>
       <addaction name="mActionAddLayers"/>
+      <addaction name="mActionRefresh"/>
       <addaction name="mActionShowFilter"/>
       <addaction name="mActionCollapse"/>
       <addaction name="mActionPropertiesWidget"/>
@@ -190,25 +190,25 @@
     </item>
    </layout>
   </widget>
-  <action name="mActionRefresh">
+  <action name="mActionAddLayers">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionDraw.svg</normaloff>:/images/themes/default/mActionDraw.svg</iconset>
+     <normaloff>:/images/themes/default/mActionAddLayer.svg</normaloff>:/images/themes/default/mActionAddLayer.svg</iconset>
    </property>
    <property name="text">
-    <string>Refresh</string>
+    <string>Add Layers</string>
+   </property>
+   <property name="toolTip">
+    <string>Add Selected Layers</string>
    </property>
   </action>
-  <action name="mActionAddLayers">
+  <action name="mActionRefresh">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionAdd.svg</normaloff>:/images/themes/default/mActionAdd.svg</iconset>
+     <normaloff>:/images/themes/default/mActionDraw.svg</normaloff>:/images/themes/default/mActionDraw.svg</iconset>
    </property>
    <property name="text">
-    <string>Add Layers</string>
-   </property>
-   <property name="toolTip">
-    <string>Add Selected Layers</string>
+    <string>Refresh</string>
    </property>
   </action>
   <action name="mActionShowFilter">