Consolidate all composer tools/add item actions to same toolbar, make…

… this toolbar display on left of compositions by default
qgis · Nov 1, 2013 · 6652f970144f5c6083b639d61f00fadbd9901f44 · 6652f97
1 parent fcbff6a
commit 6652f970144f5c6083b639d61f00fadbd9901f44
Unified Split

Showing with 28 additions and 24 deletions.

+23 −20 src/app/ui_defaults.h

+5 −4 src/ui/qgscomposerbase.ui
diff --git a/src/app/ui_defaults.h b/src/app/ui_defaults.h
@@ -110,35 +110,38 @@ static const unsigned char defaultComposerUIgeometry[] =
 static const unsigned char defaultComposerUIstate[] =
 {
   0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x01, 0x00, 0x00, 0x01, 0x93, 0x00, 0x00, 0x02, 0x21, 0xfc, 0x02, 0x00, 0x00, 0x00, 0x02, 0xfb,
+  0x01, 0x00, 0x00, 0x01, 0xa9, 0x00, 0x00, 0x03, 0xad, 0xfc, 0x02, 0x00, 0x00, 0x00, 0x02, 0xfb,
   0x00, 0x00, 0x00, 0x16, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x6e,
-  0x00, 0x64, 0x00, 0x44, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x6b, 0x01, 0x00, 0x00, 0x00, 0x40, 0x00,
-  0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x72, 0x00, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0xbe,
-  0x00, 0x00, 0x01, 0xa3, 0x00, 0x00, 0x01, 0x93, 0x01, 0x00, 0x00, 0x16, 0xfa, 0x00, 0x00, 0x00,
-  0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0xfb, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x43, 0x00, 0x6f, 0x00,
+  0x00, 0x64, 0x00, 0x44, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x6b, 0x01, 0x00, 0x00, 0x00, 0x41, 0x00,
+  0x00, 0x00, 0xa9, 0x00, 0x00, 0x00, 0x67, 0x00, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0xf0,
+  0x00, 0x00, 0x02, 0xfe, 0x00, 0x00, 0x01, 0xcf, 0x01, 0x00, 0x00, 0x1d, 0xfa, 0x00, 0x00, 0x00,
+  0x01, 0x02, 0x00, 0x00, 0x00, 0x03, 0xfb, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x43, 0x00, 0x6f, 0x00,
   0x6d, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x69, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6f, 0x00,
   0x6e, 0x00, 0x44, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x6b, 0x01, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-  0xff, 0xff, 0x00, 0x00, 0x01, 0x7c, 0x00, 0xff, 0xff, 0xff, 0xfb, 0x00, 0x00, 0x00, 0x10, 0x00,
+  0xff, 0xff, 0x00, 0x00, 0x01, 0xb1, 0x00, 0xff, 0xff, 0xff, 0xfb, 0x00, 0x00, 0x00, 0x10, 0x00,
   0x49, 0x00, 0x74, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x44, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x6b, 0x01,
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x14, 0x00, 0xff, 0xff, 0xff,
+  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x19, 0x00, 0xff, 0xff, 0xff,
   0xfb, 0x00, 0x00, 0x00, 0x12, 0x00, 0x41, 0x00, 0x74, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x73, 0x00,
   0x44, 0x00, 0x6f, 0x00, 0x63, 0x00, 0x6b, 0x01, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-  0x00, 0x00, 0x00, 0x8d, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x02, 0xe3, 0x00, 0x00, 0x02, 0x21,
+  0x00, 0x00, 0x00, 0x82, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x05, 0x72, 0x00, 0x00, 0x03, 0xad,
   0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08,
-  0xfc, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0x20, 0x00, 0x6d, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, 0x00,
-  0x65, 0x00, 0x72, 0x00, 0x54, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x62, 0x00, 0x61, 0x00,
-  0x72, 0x01, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x50, 0x00, 0x61, 0x00, 0x70, 0x00, 0x65,
-  0x00, 0x72, 0x00, 0x4e, 0x00, 0x61, 0x00, 0x76, 0x00, 0x54, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x6c,
-  0x00, 0x62, 0x00, 0x61, 0x00, 0x72, 0x01, 0x00, 0x00, 0x01, 0xb8, 0xff, 0xff, 0xff, 0xff, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x6d, 0x00, 0x49, 0x00,
-  0x74, 0x00, 0x65, 0x00, 0x6d, 0x00, 0x54, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x62, 0x00,
-  0x61, 0x00, 0x72, 0x01, 0x00, 0x00, 0x02, 0x52, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x6d, 0x00, 0x49, 0x00, 0x74, 0x00,
+  0x65, 0x00, 0x6d, 0x00, 0x54, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x62, 0x00, 0x61, 0x00,
+  0x72, 0x03, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x20, 0x00, 0x6d,
+  0x00, 0x43, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x65, 0x00, 0x72,
+  0x00, 0x54, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x62, 0x00, 0x61, 0x00, 0x72, 0x01, 0x00,
+  0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x20, 0x00, 0x6d, 0x00, 0x50, 0x00, 0x61, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00,
+  0x4e, 0x00, 0x61, 0x00, 0x76, 0x00, 0x54, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x62, 0x00,
+  0x61, 0x00, 0x72, 0x01, 0x00, 0x00, 0x01, 0xd3, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x6d, 0x00, 0x49, 0x00, 0x74, 0x00, 0x65,
   0x00, 0x6d, 0x00, 0x41, 0x00, 0x63, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x54,
-  0x00, 0x6f, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x62, 0x00, 0x61, 0x00, 0x72, 0x01, 0x00, 0x00, 0x03,
-  0x9b, 0x00, 0x00, 0x01, 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x6f, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x62, 0x00, 0x61, 0x00, 0x72, 0x01, 0x00, 0x00, 0x02,
+  0x70, 0x00, 0x00, 0x01, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x02, 0x00, 0x00, 0x00, 0x00,
 };

diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui
@@ -90,10 +90,6 @@
    <attribute name="toolBarBreak">
     <bool>true</bool>
    </attribute>
-   <addaction name="mActionPan"/>
-   <addaction name="mActionMouseZoom"/>
-   <addaction name="mActionSelectMoveItem"/>
-   <addaction name="mActionMoveItemContent"/>
    <addaction name="mActionGroupItems"/>
    <addaction name="mActionUngroupItems"/>
    <addaction name="mActionLockItems"/>
@@ -109,6 +105,11 @@
    <attribute name="toolBarBreak">
     <bool>true</bool>
    </attribute>
+   <addaction name="mActionPan"/>
+   <addaction name="mActionMouseZoom"/>
+   <addaction name="mActionSelectMoveItem"/>
+   <addaction name="mActionMoveItemContent"/>
+   <addaction name="separator"/>
    <addaction name="mActionAddNewMap"/>
    <addaction name="mActionAddImage"/>
    <addaction name="mActionAddNewLabel"/>