Added menu icons for order, rotation, and flipping commands.

Split Align submenu, into Horizontal and Vertical submenus.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@184 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/src/glabels-ui.xml b/glabels2/src/glabels-ui.xml
index 57ade849391edb1c79fe5353d012cd019fdfd7eb..93000ccccfc258143c3227d366cbb36a1efd2653 100644 (file)
--- a/glabels2/src/glabels-ui.xml
+++ b/glabels2/src/glabels-ui.xml
@@ -142,22 +142,28 @@
              pixtype="stock" pixname="gtk-properties"/>
        
        <cmd name="ToolsRaiseObjects"
-            _tip="Raise object to top"/>
+            _tip="Raise object to top"
+             pixtype="stock" pixname="gl_stock_order_top"/>
        
        <cmd name="ToolsLowerObjects"
-            _tip="Lower object to bottom"/>
+            _tip="Lower object to bottom"
+             pixtype="stock" pixname="gl_stock_order_bottom"/>
        
        <cmd name="ToolsRotateLeft"
-            _tip="Rotate object 90 counter-clockwise"/>
+            _tip="Rotate object 90 counter-clockwise"
+             pixtype="stock" pixname="gl_stock_rotate_left"/>
        
        <cmd name="ToolsRotateRight"
-            _tip="Rotate object 90 clockwise"/>
+            _tip="Rotate object 90 clockwise"
+             pixtype="stock" pixname="gl_stock_rotate_right"/>
        
        <cmd name="ToolsFlipHorizontal"
-            _tip="Flip object horizontally"/>
+            _tip="Flip object horizontally"
+             pixtype="stock" pixname="gl_stock_flip_horiz"/>
        
        <cmd name="ToolsFlipVertical"
-            _tip="Flip object vertically"/>
+            _tip="Flip object vertically"
+             pixtype="stock" pixname="gl_stock_flip_vert"/>
 
        <cmd name="ToolsAlignLeft"
             _tip="Align objects to left edges"
@@ -304,50 +310,53 @@
 
 <submenu name="Objects" _label="_Objects" hidden="0">
 
-        <menuitem name="ToolsArrow" verb="" _label="Select Mode"/>
+        <menuitem name="ToolsArrow" verb="" _label="_Select Mode"/>
         
 
-       <submenu name="CreateObjects" _label="_Create object">
+       <submenu name="CreateObjects" _label="_Create Object">
 
-                <menuitem name="ToolsText" verb="" _label="Text"/>
-                <menuitem name="ToolsBox" verb="" _label="Box"/>
-                <menuitem name="ToolsLine" verb="" _label="Line"/>
-                <menuitem name="ToolsEllipse" verb="" _label="Ellipse"/>
-                <menuitem name="ToolsImage" verb="" _label="Image"/>
-                <menuitem name="ToolsBarcode" verb="" _label="Barcode"/>
+                <menuitem name="ToolsText" verb="" _label="_Text"/>
+                <menuitem name="ToolsBox" verb="" _label="_Box"/>
+                <menuitem name="ToolsLine" verb="" _label="_Line"/>
+                <menuitem name="ToolsEllipse" verb="" _label="_Ellipse"/>
+                <menuitem name="ToolsImage" verb="" _label="_Image"/>
+                <menuitem name="ToolsBarcode" verb="" _label="Bar_code"/>
 
        </submenu>
 
        <separator/>
 
        <submenu name="Order" _label="_Order">
-                <menuitem name="ToolsRaiseObjects" verb="" _label="Raise to Top"/>
-                <menuitem name="ToolsLowerObjects" verb="" _label="Lower to Bottom"/>
+                <menuitem name="ToolsRaiseObjects" verb="" _label="Bring to _Front"/>
+                <menuitem name="ToolsLowerObjects" verb="" _label="Send to _Back"/>
        </submenu>
 
        <submenu name="RotateFlip" _label="_Rotate/Flip">
-                <menuitem name="ToolsRotateLeft" verb="" _label="Rotate left"/>
-                <menuitem name="ToolsRotateRight" verb="" _label="Rotate right"/>
-                <menuitem name="ToolsFlipHorizontal" verb="" _label="Flip horizontally"/>
-                <menuitem name="ToolsFlipVertical" verb="" _label="Flip vertically"/>
+                <menuitem name="ToolsRotateLeft" verb="" _label="Rotate _Left"/>
+                <menuitem name="ToolsRotateRight" verb="" _label="Rotate _Right"/>
+                <menuitem name="ToolsFlipHorizontal" verb="" _label="Flip _Horizontally"/>
+                <menuitem name="ToolsFlipVertical" verb="" _label="Flip _Vertically"/>
        </submenu>
 
-       <submenu name="Align" _label="_Align">
-                <menuitem name="ToolsAlignLeft" verb="" _label="Align lefts"/>
-                <menuitem name="ToolsAlignRight" verb="" _label="Align rights"/>
-                <menuitem name="ToolsAlignHCenter" verb="" _label="Align horizontal centers"/>
-                <menuitem name="ToolsAlignTop" verb="" _label="Align tops"/>
-                <menuitem name="ToolsAlignBottom" verb="" _label="Align bottoms"/>
-                <menuitem name="ToolsAlignVCenter" verb="" _label="Align vertical centers"/>
+       <submenu name="AlignHoriz" _label="Align _Horizontal">
+                <menuitem name="ToolsAlignLeft" verb="" _label="_Left"/>
+                <menuitem name="ToolsAlignHCenter" verb="" _label="_Center"/>
+                <menuitem name="ToolsAlignRight" verb="" _label="_Right"/>
+       </submenu>
+
+       <submenu name="AlignVert" _label="Align _Vertical">
+                <menuitem name="ToolsAlignTop" verb="" _label="_Top"/>
+                <menuitem name="ToolsAlignVCenter" verb="" _label="_Center"/>
+                <menuitem name="ToolsAlignBottom" verb="" _label="_Bottom"/>
        </submenu>
 
        <separator/>
 
-        <menuitem name="ToolsObjectProperties" verb="" _label="Object Properties..."/>
+        <menuitem name="ToolsObjectProperties" verb="" _label="Object _Properties..."/>
 
        <separator/>
 
-        <menuitem name="ToolsMergeProperties" verb="" _label="Merge Properties..."/>
+        <menuitem name="ToolsMergeProperties" verb="" _label="_Merge Properties..."/>
 
 </submenu>
 

diff --git a/glabels2/src/stock.c b/glabels2/src/stock.c
index 28ab8a2228c36287b23257127f74a94647098cef..93187d9e6b4bf45790cf7854603572c8a00b3233 100644 (file)
--- a/glabels2/src/stock.c
+++ b/glabels2/src/stock.c
@@ -66,6 +66,12 @@ gl_stock_init (void)
                { GL_STOCK_IMAGE,         "Image",          0, 0, NULL },
                { GL_STOCK_BARCODE,       "Barcode",        0, 0, NULL },
                { GL_STOCK_MERGE,         "Merge",          0, 0, NULL },
+               { GL_STOCK_ORDER_TOP,     "OrderTop",       0, 0, NULL },
+               { GL_STOCK_ORDER_BOTTOM,  "OrderBottom",    0, 0, NULL },
+               { GL_STOCK_ROTATE_LEFT,   "RotateLeft",     0, 0, NULL },
+               { GL_STOCK_ROTATE_RIGHT,  "RotateRight",    0, 0, NULL },
+               { GL_STOCK_FLIP_HORIZ,    "FlipHoriz",      0, 0, NULL },
+               { GL_STOCK_FLIP_VERT,     "FlipVert",       0, 0, NULL },
                { GL_STOCK_ALIGN_LEFT,    "AlignLeft",      0, 0, NULL },
                { GL_STOCK_ALIGN_RIGHT,   "AlignRight",     0, 0, NULL },
                { GL_STOCK_ALIGN_HCENTER, "AlignHCenter",   0, 0, NULL },
@@ -87,12 +93,19 @@ gl_stock_init (void)
        add_icons (factory, GL_STOCK_IMAGE,         stock_image_24,   stock_image_16);
        add_icons (factory, GL_STOCK_BARCODE,       stock_barcode_24, stock_barcode_16);
        add_icons (factory, GL_STOCK_MERGE,         stock_merge_24,   stock_merge_16);
-       add_icons (factory, GL_STOCK_ALIGN_LEFT,    NULL,             stock_align_left_16);
-       add_icons (factory, GL_STOCK_ALIGN_RIGHT,   NULL,             stock_align_right_16);
-       add_icons (factory, GL_STOCK_ALIGN_HCENTER, NULL,             stock_align_hcenter_16);
-       add_icons (factory, GL_STOCK_ALIGN_TOP,     NULL,             stock_align_top_16);
-       add_icons (factory, GL_STOCK_ALIGN_BOTTOM,  NULL,             stock_align_bottom_16);
-       add_icons (factory, GL_STOCK_ALIGN_VCENTER, NULL,             stock_align_vcenter_16);
+
+       add_icons (factory, GL_STOCK_ORDER_TOP,     NULL, stock_order_top_16);
+       add_icons (factory, GL_STOCK_ORDER_BOTTOM,  NULL, stock_order_bottom_16);
+       add_icons (factory, GL_STOCK_ROTATE_LEFT,   NULL, stock_rotate_left_16);
+       add_icons (factory, GL_STOCK_ROTATE_RIGHT,  NULL, stock_rotate_right_16);
+       add_icons (factory, GL_STOCK_FLIP_HORIZ,    NULL, stock_flip_horiz_16);
+       add_icons (factory, GL_STOCK_FLIP_VERT,     NULL, stock_flip_vert_16);
+       add_icons (factory, GL_STOCK_ALIGN_LEFT,    NULL, stock_align_left_16);
+       add_icons (factory, GL_STOCK_ALIGN_RIGHT,   NULL, stock_align_right_16);
+       add_icons (factory, GL_STOCK_ALIGN_HCENTER, NULL, stock_align_hcenter_16);
+       add_icons (factory, GL_STOCK_ALIGN_TOP,     NULL, stock_align_top_16);
+       add_icons (factory, GL_STOCK_ALIGN_BOTTOM,  NULL, stock_align_bottom_16);
+       add_icons (factory, GL_STOCK_ALIGN_VCENTER, NULL, stock_align_vcenter_16);
 
        g_object_unref (G_OBJECT(factory));
 }

diff --git a/glabels2/src/stock.h b/glabels2/src/stock.h
index a83d09cf4e78e25bf278ad08d0285e44c1d0f345..63ddf952fb20383a2a7d5a727668c69c57365696 100644 (file)
--- a/glabels2/src/stock.h
+++ b/glabels2/src/stock.h
@@ -33,6 +33,12 @@
 #define GL_STOCK_IMAGE         "gl_stock_image"
 #define GL_STOCK_BARCODE       "gl_stock_barcode"
 #define GL_STOCK_MERGE         "gl_stock_merge"
+#define GL_STOCK_ORDER_TOP     "gl_stock_order_top"
+#define GL_STOCK_ORDER_BOTTOM  "gl_stock_order_bottom"
+#define GL_STOCK_ROTATE_LEFT   "gl_stock_rotate_left"
+#define GL_STOCK_ROTATE_RIGHT  "gl_stock_rotate_right"
+#define GL_STOCK_FLIP_HORIZ    "gl_stock_flip_horiz"
+#define GL_STOCK_FLIP_VERT     "gl_stock_flip_vert"
 #define GL_STOCK_ALIGN_LEFT    "gl_stock_align_left"
 #define GL_STOCK_ALIGN_RIGHT   "gl_stock_align_right"
 #define GL_STOCK_ALIGN_HCENTER "gl_stock_align_hcenter"

diff --git a/glabels2/src/ui.c b/glabels2/src/ui.c
index 9232ec41c38bf3fa001eff0a93686976347e3740..0f694bb22d451b70ed46be77d9fb068cdf4c9175 100644 (file)
--- a/glabels2/src/ui.c
+++ b/glabels2/src/ui.c
@@ -134,7 +134,8 @@ static gchar* doc_verbs [] = {
        "/menu/Objects/CreateObjects",
        "/menu/Objects/Order",
        "/menu/Objects/RotateFlip",
-       "/menu/Objects/Align",
+       "/menu/Objects/AlignHoriz",
+       "/menu/Objects/AlignVert",
        "/commands/ViewGrid",
        "/commands/ViewMarkup",
 
@@ -177,7 +178,8 @@ static gchar* multi_selection_verbs [] = {
        "/commands/ToolsAlignTop",
        "/commands/ToolsAlignBottom",
        "/commands/ToolsAlignVCenter",
-       "/menu/Objects/Align",
+       "/menu/Objects/AlignHoriz",
+       "/menu/Objects/AlignVert",
 
        NULL
 };