Better names for composer toolbars (refs #14066)

Author: nyalldawson

src/ui/composer/qgscomposerbase.ui

@@ -21,16 +21,7 @@
     <bool>true</bool>
    </property>
    <layout class="QGridLayout" name="gridLayout">
-    <property name="leftMargin">
-     <number>0</number>
-    </property>
-    <property name="topMargin">
-     <number>0</number>
-    </property>
-    <property name="rightMargin">
-     <number>0</number>
-    </property>
-    <property name="bottomMargin">
+    <property name="margin">
      <number>0</number>
     </property>
     <item row="0" column="0">
@@ -99,7 +90,7 @@
   </widget>
   <widget class="QToolBar" name="mPaperNavToolbar">
    <property name="windowTitle">
-    <string>Paper Navigation</string>
+    <string>Navigation</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -115,7 +106,7 @@
   </widget>
   <widget class="QToolBar" name="mItemActionToolbar">
    <property name="windowTitle">
-    <string>Composer Item Actions</string>
+    <string>Actions</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -130,7 +121,7 @@
   </widget>
   <widget class="QToolBar" name="mItemToolbar">
    <property name="windowTitle">
-    <string>Composer Items</string>
+    <string>Toolbox</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -1064,8 +1055,8 @@
   </action>
  </widget>
  <resources>
-  <include location="../../../images/images.qrc"/>
   <include location="../../../python/plugins/fTools/resources.qrc"/>
+  <include location="../../../images/images.qrc"/>
  </resources>
  <connections/>
 </ui>