]> git.sur5r.net Git - glabels/blobdiff - src/ui.c
Adeed British English translation
[glabels] / src / ui.c
index 5449d28e505f5f2dffb30405680e436f4f9c4bec..26dc2cd4475a8b93d387d3f719c0685e0997827b 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -23,7 +23,6 @@
 #include "ui.h"
 
 #include <glib/gi18n.h>
-#include <gconf/gconf-client.h>
 #include <gtk/gtk.h>
 #include <string.h>
 
@@ -31,7 +30,6 @@
 #include "ui-commands.h"
 #include "file.h"
 #include "prefs.h"
-#include "stock.h"
 #include "window.h"
 #include "recent.h" 
 
@@ -61,6 +59,11 @@ static void set_app_drawing_toolbar_style  (GtkUIManager    *ui);
 
 static void set_view_style                 (GtkUIManager    *ui);
 
+static void descend_menu_set_always_show_image (GtkMenu *menu);
+
+static void set_additional_properties      (GtkUIManager    *ui);
+
+
 static void connect_proxy_cb               (GtkUIManager    *ui,
                                            GtkAction       *action,
                                            GtkWidget       *proxy,
@@ -96,8 +99,8 @@ static GtkActionEntry entries[] = {
        { "ObjectsCreateMenu",       NULL, N_("_Create") },
        { "ObjectsOrderMenu",        NULL, N_("_Order") },
        { "ObjectsRotateFlipMenu",   NULL, N_("_Rotate/Flip") },
-       { "ObjectsAlignHorizMenu",   NULL, N_("Align _Horizontal") },
-       { "ObjectsAlignVertMenu",    NULL, N_("Align _Vertical") },
+       { "ObjectsAlignMenu",        NULL, N_("_Alignment") },
+       { "ObjectsCenterMenu",        NULL, N_("C_enter") },
        { "HelpMenu",                NULL, N_("_Help") },
 
        /* Popup entries. */
@@ -170,6 +173,20 @@ static GtkActionEntry entries[] = {
 
 
        /* Edit action entries. */
+       { "EditUndo",
+         GTK_STOCK_UNDO,
+         N_("Undo"),
+         "<control>Z",
+         N_("Undo"),
+         G_CALLBACK (gl_ui_cmd_edit_undo) },
+
+       { "EditRedo",
+         GTK_STOCK_REDO,
+         N_("Redo"),
+         "<shift><control>Z",
+         N_("Redo"),
+         G_CALLBACK (gl_ui_cmd_edit_redo) },
+
        { "EditCut",
          GTK_STOCK_CUT,
          N_("Cut"),
@@ -252,154 +269,154 @@ static GtkActionEntry entries[] = {
 
        /* Objects action entries. */
        { "ObjectsArrowMode",
-         GL_STOCK_ARROW,
+         "glabels-arrow",
          N_("Select Mode"),
          NULL,
          N_("Select, move and modify objects"),
          G_CALLBACK (gl_ui_cmd_objects_arrow_mode) },
 
        { "ObjectsCreateText",
-         GL_STOCK_TEXT,
+         "glabels-text",
          N_("Text"),
          NULL,
          N_("Create text object"),
          G_CALLBACK (gl_ui_cmd_objects_create_text) },
 
        { "ObjectsCreateBox",
-         GL_STOCK_BOX,
+         "glabels-box",
          N_("Box"),
          NULL,
          N_("Create box/rectangle object"),
          G_CALLBACK (gl_ui_cmd_objects_create_box) },
 
        { "ObjectsCreateLine",
-         GL_STOCK_LINE,
+         "glabels-line",
          N_("Line"),
          NULL,
          N_("Create line object"),
          G_CALLBACK (gl_ui_cmd_objects_create_line) },
 
        { "ObjectsCreateEllipse",
-         GL_STOCK_ELLIPSE,
+         "glabels-ellipse",
          N_("Ellipse"),
          NULL,
          N_("Create ellipse/circle object"),
          G_CALLBACK (gl_ui_cmd_objects_create_ellipse) },
 
        { "ObjectsCreateImage",
-         GL_STOCK_IMAGE,
+         "glabels-image",
          N_("Image"),
          NULL,
          N_("Create image object"),
          G_CALLBACK (gl_ui_cmd_objects_create_image) },
 
        { "ObjectsCreateBarcode",
-         GL_STOCK_BARCODE,
+         "glabels-barcode",
          N_("Barcode"),
          NULL,
          N_("Create barcode object"),
          G_CALLBACK (gl_ui_cmd_objects_create_barcode) },
        
        { "ObjectsRaise",
-         GL_STOCK_ORDER_TOP,
+         "glabels-order-top",
          N_("Bring to front"),
          NULL,
          N_("Raise object to top"),
          G_CALLBACK (gl_ui_cmd_objects_raise) },
 
        { "ObjectsLower",
-         GL_STOCK_ORDER_BOTTOM,
+         "glabels-order-bottom",
          N_("Send to back"),
          NULL,
          N_("Lower object to bottom"),
          G_CALLBACK (gl_ui_cmd_objects_lower) },
 
        { "ObjectsRotateLeft",
-         GL_STOCK_ROTATE_LEFT,
+         "glabels-rotate-left",
          N_("Rotate left"),
          NULL,
          N_("Rotate object 90 degrees counter-clockwise"),
          G_CALLBACK (gl_ui_cmd_objects_rotate_left) },
 
        { "ObjectsRotateRight",
-         GL_STOCK_ROTATE_RIGHT,
+         "glabels-rotate-right",
          N_("Rotate right"),
          NULL,
          N_("Rotate object 90 degrees clockwise"),
          G_CALLBACK (gl_ui_cmd_objects_rotate_right) },
 
        { "ObjectsFlipHorizontal",
-         GL_STOCK_FLIP_HORIZ,
+         "glabels-flip-horiz",
          N_("Flip horizontally"),
          NULL,
          N_("Flip object horizontally"),
          G_CALLBACK (gl_ui_cmd_objects_flip_horiz) },
 
        { "ObjectsFlipVertical",
-         GL_STOCK_FLIP_VERT,
+         "glabels-flip-vert",
          N_("Flip vertically"),
          NULL,
          N_("Flip object vertically"),
          G_CALLBACK (gl_ui_cmd_objects_flip_vert) },
 
        { "ObjectsAlignLeft",
-         GL_STOCK_ALIGN_LEFT,
+         "glabels-align-left",
          N_("Align left"),
          NULL,
          N_("Align objects to left edges"),
          G_CALLBACK (gl_ui_cmd_objects_align_left) },
 
+       { "ObjectsAlignHCenter",
+         "glabels-align-hcenter",
+         N_("Align center"),
+         NULL,
+         N_("Align objects to horizontal centers"),
+         G_CALLBACK (gl_ui_cmd_objects_align_hcenter) },
+
        { "ObjectsAlignRight",
-         GL_STOCK_ALIGN_RIGHT,
+         "glabels-align-right",
          N_("Align right"),
          NULL,
          N_("Align objects to right edges"),
          G_CALLBACK (gl_ui_cmd_objects_align_right) },
 
-       { "ObjectsAlignHCenter",
-         GL_STOCK_ALIGN_HCENTER,
-         N_("Align horizontal center"),
-         NULL,
-         N_("Align objects to horizontal centers"),
-         G_CALLBACK (gl_ui_cmd_objects_align_hcenter) },
-
        { "ObjectsAlignTop",
-         GL_STOCK_ALIGN_TOP,
-         N_("Align tops"),
+         "glabels-align-top",
+         N_("Align top"),
          NULL,
          N_("Align objects to top edges"),
          G_CALLBACK (gl_ui_cmd_objects_align_top) },
 
-       { "ObjectsAlignBottom",
-         GL_STOCK_ALIGN_BOTTOM,
-         N_("Align bottoms"),
-         NULL,
-         N_("Align objects to bottom edges"),
-         G_CALLBACK (gl_ui_cmd_objects_align_bottom) },
-
        { "ObjectsAlignVCenter",
-         GL_STOCK_ALIGN_VCENTER,
-         N_("Align vertical center"),
+         "glabels-align-vcenter",
+         N_("Align middle"),
          NULL,
          N_("Align objects to vertical centers"),
          G_CALLBACK (gl_ui_cmd_objects_align_vcenter) },
 
+       { "ObjectsAlignBottom",
+         "glabels-align-bottom",
+         N_("Align bottom"),
+         NULL,
+         N_("Align objects to bottom edges"),
+         G_CALLBACK (gl_ui_cmd_objects_align_bottom) },
+
        { "ObjectsCenterHorizontal",
-         GL_STOCK_CENTER_HORIZ,
+         "glabels-center-horiz",
          N_("Center horizontally"),
          NULL,
          N_("Center objects to horizontal label center"),
          G_CALLBACK (gl_ui_cmd_objects_center_horiz) },
 
        { "ObjectsCenterVertical",
-         GL_STOCK_CENTER_VERT,
+         "glabels-center-vert",
          N_("Center vertically"),
          NULL,
          N_("Center objects to vertical label center"),
          G_CALLBACK (gl_ui_cmd_objects_center_vert) },
 
        { "ObjectsMergeProperties",
-         GL_STOCK_MERGE,
+         "glabels-merge",
          N_("Merge properties"),
          NULL,
          N_("Edit merge properties"),
@@ -495,6 +512,9 @@ static const gchar *ui_info =
 "                      <menuitem action='FileQuit' />"
 "              </menu>"
 "              <menu action='EditMenu'>"
+"                      <menuitem action='EditUndo' />"
+"                      <menuitem action='EditRedo' />"
+"                      <separator />"
 "                      <menuitem action='EditCut' />"
 "                      <menuitem action='EditCopy' />"
 "                      <menuitem action='EditPaste' />"
@@ -539,16 +559,17 @@ static const gchar *ui_info =
 "                              <menuitem action='ObjectsFlipHorizontal' />"
 "                              <menuitem action='ObjectsFlipVertical' />"
 "                      </menu>"
-"                      <menu action='ObjectsAlignHorizMenu'>"
+"                      <menu action='ObjectsAlignMenu'>"
 "                              <menuitem action='ObjectsAlignLeft' />"
 "                              <menuitem action='ObjectsAlignHCenter' />"
 "                              <menuitem action='ObjectsAlignRight' />"
-"                              <menuitem action='ObjectsCenterHorizontal' />"
-"                      </menu>"
-"                      <menu action='ObjectsAlignVertMenu'>"
+"                              <separator />"
 "                              <menuitem action='ObjectsAlignTop' />"
 "                              <menuitem action='ObjectsAlignVCenter' />"
 "                              <menuitem action='ObjectsAlignBottom' />"
+"                      </menu>"
+"                      <menu action='ObjectsCenterMenu'>"
+"                              <menuitem action='ObjectsCenterHorizontal' />"
 "                              <menuitem action='ObjectsCenterVertical' />"
 "                      </menu>"
 "                      <separator />"
@@ -601,16 +622,17 @@ static const gchar *ui_info =
 "                      <menuitem action='ObjectsFlipHorizontal' />"
 "                      <menuitem action='ObjectsFlipVertical' />"
 "              </menu>"
-"              <menu action='ObjectsAlignHorizMenu'>"
+"              <menu action='ObjectsAlignMenu'>"
 "                      <menuitem action='ObjectsAlignLeft' />"
 "                      <menuitem action='ObjectsAlignHCenter' />"
 "                      <menuitem action='ObjectsAlignRight' />"
-"                      <menuitem action='ObjectsCenterHorizontal' />"
-"              </menu>"
-"              <menu action='ObjectsAlignVertMenu'>"
+"                      <separator />"
 "                      <menuitem action='ObjectsAlignTop' />"
 "                      <menuitem action='ObjectsAlignVCenter' />"
 "                      <menuitem action='ObjectsAlignBottom' />"
+"              </menu>"
+"              <menu action='ObjectsCenterMenu'>"
+"                      <menuitem action='ObjectsCenterHorizontal' />"
 "                      <menuitem action='ObjectsCenterVertical' />"
 "              </menu>"
 "              <separator />"
@@ -633,9 +655,10 @@ static gchar* doc_verbs [] = {
        "/ui/MenuBar/FileMenu/FileSaveAs",
        "/ui/MenuBar/FileMenu/FilePrint",
        "/ui/MenuBar/FileMenu/FileClose",
+       "/ui/MenuBar/EditMenu/EditUndo",
+       "/ui/MenuBar/EditMenu/EditRedo",
        "/ui/MenuBar/EditMenu/EditCut",
        "/ui/MenuBar/EditMenu/EditCopy",
-       "/ui/MenuBar/EditMenu/EditPaste",
        "/ui/MenuBar/EditMenu/EditDelete",
        "/ui/MenuBar/EditMenu/EditSelectAll",
        "/ui/MenuBar/EditMenu/EditUnSelectAll",
@@ -646,26 +669,31 @@ static gchar* doc_verbs [] = {
        "/ui/MenuBar/ViewMenu/ViewGrid",
        "/ui/MenuBar/ViewMenu/ViewMarkup",
        "/ui/MenuBar/ObjectsMenu/ObjectsArrowMode",
+       "/ui/MenuBar/ObjectsMenu/ObjectsCreateMenu",
        "/ui/MenuBar/ObjectsMenu/ObjectsCreateMenu/ObjectsCreateText",
        "/ui/MenuBar/ObjectsMenu/ObjectsCreateMenu/ObjectsCreateLine",
        "/ui/MenuBar/ObjectsMenu/ObjectsCreateMenu/ObjectsCreateBox",
        "/ui/MenuBar/ObjectsMenu/ObjectsCreateMenu/ObjectsCreateEllipse",
        "/ui/MenuBar/ObjectsMenu/ObjectsCreateMenu/ObjectsCreateImage",
        "/ui/MenuBar/ObjectsMenu/ObjectsCreateMenu/ObjectsCreateBarcode",
+       "/ui/MenuBar/ObjectsMenu/ObjectsOrderMenu",
        "/ui/MenuBar/ObjectsMenu/ObjectsOrderMenu/ObjectsRaise",
        "/ui/MenuBar/ObjectsMenu/ObjectsOrderMenu/ObjectsLower",
+       "/ui/MenuBar/ObjectsMenu/ObjectsRotateFlipMenu",
        "/ui/MenuBar/ObjectsMenu/ObjectsRotateFlipMenu/ObjectsRotateLeft",
        "/ui/MenuBar/ObjectsMenu/ObjectsRotateFlipMenu/ObjectsRotateRight",
        "/ui/MenuBar/ObjectsMenu/ObjectsRotateFlipMenu/ObjectsFlipHorizontal",
        "/ui/MenuBar/ObjectsMenu/ObjectsRotateFlipMenu/ObjectsFlipVertical",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignHorizMenu/ObjectsAlignLeft",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignHorizMenu/ObjectsAlignRight",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignHorizMenu/ObjectsAlignHCenter",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignHorizMenu/ObjectsCenterHorizontal",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignVertMenu/ObjectsAlignTop",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignVertMenu/ObjectsAlignBottom",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignVertMenu/ObjectsAlignVCenter",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignVertMenu/ObjectsCenterVertical",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu/ObjectsAlignLeft",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu/ObjectsAlignRight",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu/ObjectsAlignHCenter",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu/ObjectsAlignTop",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu/ObjectsAlignBottom",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu/ObjectsAlignVCenter",
+       "/ui/MenuBar/ObjectsMenu/ObjectsCenterMenu",
+       "/ui/MenuBar/ObjectsMenu/ObjectsCenterMenu/ObjectsCenterHorizontal",
+       "/ui/MenuBar/ObjectsMenu/ObjectsCenterMenu/ObjectsCenterVertical",
        "/ui/MenuBar/ObjectsMenu/ObjectsMergeProperties",
 
        NULL
@@ -677,19 +705,28 @@ static gchar* doc_modified_verbs [] = {
        NULL
 };
 
+static gchar* paste_verbs [] = {
+       "/ui/MenuBar/EditMenu/EditPaste",
+
+       NULL
+};
+
 static gchar* selection_verbs [] = {
        "/ui/MenuBar/EditMenu/EditCut",
        "/ui/MenuBar/EditMenu/EditCopy",
        "/ui/MenuBar/EditMenu/EditDelete",
        "/ui/MenuBar/EditMenu/EditUnSelectAll",
+       "/ui/MenuBar/ObjectsMenu/ObjectsOrderMenu",
        "/ui/MenuBar/ObjectsMenu/ObjectsOrderMenu/ObjectsRaise",
        "/ui/MenuBar/ObjectsMenu/ObjectsOrderMenu/ObjectsLower",
+       "/ui/MenuBar/ObjectsMenu/ObjectsRotateFlipMenu",
        "/ui/MenuBar/ObjectsMenu/ObjectsRotateFlipMenu/ObjectsRotateLeft",
        "/ui/MenuBar/ObjectsMenu/ObjectsRotateFlipMenu/ObjectsRotateRight",
        "/ui/MenuBar/ObjectsMenu/ObjectsRotateFlipMenu/ObjectsFlipHorizontal",
        "/ui/MenuBar/ObjectsMenu/ObjectsRotateFlipMenu/ObjectsFlipVertical",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignHorizMenu/ObjectsCenterHorizontal",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignVertMenu/ObjectsCenterVertical",
+       "/ui/MenuBar/ObjectsMenu/ObjectsCenterMenu",
+       "/ui/MenuBar/ObjectsMenu/ObjectsCenterMenu/ObjectsCenterHorizontal",
+       "/ui/MenuBar/ObjectsMenu/ObjectsCenterMenu/ObjectsCenterVertical",
 
        NULL
 };
@@ -700,12 +737,13 @@ static gchar* atomic_selection_verbs [] = {
 };
 
 static gchar* multi_selection_verbs [] = {
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignHorizMenu/ObjectsAlignLeft",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignHorizMenu/ObjectsAlignRight",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignHorizMenu/ObjectsAlignHCenter",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignVertMenu/ObjectsAlignTop",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignVertMenu/ObjectsAlignBottom",
-       "/ui/MenuBar/ObjectsMenu/ObjectsAlignVertMenu/ObjectsAlignVCenter",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu/ObjectsAlignLeft",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu/ObjectsAlignRight",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu/ObjectsAlignHCenter",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu/ObjectsAlignTop",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu/ObjectsAlignBottom",
+       "/ui/MenuBar/ObjectsMenu/ObjectsAlignMenu/ObjectsAlignVCenter",
 
        NULL
 };
@@ -769,7 +807,10 @@ gl_ui_new (glWindow *window)
                                   recent_menu);
 
 
+        set_additional_properties (ui);
+
        gl_ui_util_set_verb_list_sensitive (ui, doc_verbs, FALSE);
+       gl_ui_util_set_verb_list_sensitive (ui, paste_verbs, FALSE);
 
        gl_debug (DEBUG_UI, "END");
 
@@ -821,28 +862,14 @@ gl_ui_update_all (GtkUIManager *ui,
                                       !gl_view_is_zoom_min (view));
 
        gl_ui_util_set_verb_list_sensitive (ui, selection_verbs,
-                                           !gl_view_is_selection_empty (view));
+                                           !gl_label_is_selection_empty (label));
 
        gl_ui_util_set_verb_list_sensitive (ui, atomic_selection_verbs,
-                                           gl_view_is_selection_atomic (view));
+                                           gl_label_is_selection_atomic (label));
 
        gl_ui_util_set_verb_list_sensitive (ui, multi_selection_verbs,
-                                           !gl_view_is_selection_empty (view)
-                                           && !gl_view_is_selection_atomic (view));
-
-       gl_debug (DEBUG_UI, "END");
-}
-
-
-/*****************************************************************************/
-/** Update all verbs of given UI component to "no document" state.           */
-/*****************************************************************************/
-void
-gl_ui_update_nodoc (GtkUIManager *ui)
-{
-       gl_debug (DEBUG_UI, "START");
-
-       gl_ui_util_set_verb_list_sensitive (ui, doc_verbs, FALSE);
+                                           !gl_label_is_selection_empty (label)
+                                           && !gl_label_is_selection_atomic (label));
 
        gl_debug (DEBUG_UI, "END");
 }
@@ -870,19 +897,29 @@ gl_ui_update_modified_verbs (GtkUIManager *ui,
 /*****************************************************************************/
 void
 gl_ui_update_selection_verbs (GtkUIManager *ui,
-                             glView       *view)
+                             glView       *view,
+                              gboolean      has_focus)
 {
        gl_debug (DEBUG_UI, "START");
 
-       gl_ui_util_set_verb_list_sensitive (ui, selection_verbs,
-                                           !gl_view_is_selection_empty (view));
-
-       gl_ui_util_set_verb_list_sensitive (ui, atomic_selection_verbs,
-                                           gl_view_is_selection_atomic (view));
-
-       gl_ui_util_set_verb_list_sensitive (ui, multi_selection_verbs,
-                                           !gl_view_is_selection_empty (view)
-                                           && !gl_view_is_selection_atomic (view));
+        if ( has_focus )
+        {
+                gl_ui_util_set_verb_list_sensitive (ui, selection_verbs,
+                                                    !gl_label_is_selection_empty (view->label));
+
+                gl_ui_util_set_verb_list_sensitive (ui, atomic_selection_verbs,
+                                                    gl_label_is_selection_atomic (view->label));
+
+                gl_ui_util_set_verb_list_sensitive (ui, multi_selection_verbs,
+                                                    !gl_label_is_selection_empty (view->label)
+                                                    && !gl_label_is_selection_atomic (view->label));
+        }
+        else
+        {
+                gl_ui_util_set_verb_list_sensitive (ui, selection_verbs, FALSE);
+                gl_ui_util_set_verb_list_sensitive (ui, atomic_selection_verbs, FALSE);
+                gl_ui_util_set_verb_list_sensitive (ui, multi_selection_verbs, FALSE);
+        }
 
        gl_debug (DEBUG_UI, "END");
 }
@@ -906,6 +943,21 @@ gl_ui_update_zoom_verbs (GtkUIManager *ui,
 }
 
 
+/*****************************************************************************/
+/** Update paste verbs of given UI component.                                */
+/*****************************************************************************/
+void
+gl_ui_update_paste_verbs (GtkUIManager      *ui,
+                          gboolean           can_paste)
+{
+       gl_debug (DEBUG_UI, "START");
+
+       gl_ui_util_set_verb_list_sensitive (ui, paste_verbs, can_paste);
+
+       gl_debug (DEBUG_UI, "END");
+}
+
+
 /*****************************************************************************/
 /** Update undo/redo verbs of given UI component.                            */
 /*****************************************************************************/
@@ -913,8 +965,26 @@ void
 gl_ui_update_undo_redo_verbs (GtkUIManager *ui,
                              glLabel      *label)
 {
+        GtkWidget  *menu_item;
+        gchar      *description;
+        gchar      *menu_label;
+
        gl_debug (DEBUG_UI, "START");
 
+        menu_item = gtk_ui_manager_get_widget (ui, "/MenuBar/EditMenu/EditUndo");
+        description = gl_label_get_undo_description (label);
+        menu_label = g_strdup_printf ("%s: %s", _("Undo"), description);
+        gtk_menu_item_set_label (GTK_MENU_ITEM (menu_item), menu_label);
+        g_free (menu_label);
+        g_free (description);
+
+        menu_item = gtk_ui_manager_get_widget (ui, "/MenuBar/EditMenu/EditRedo");
+        description = gl_label_get_redo_description (label);
+        menu_label = g_strdup_printf ("%s: %s", _("Redo"), description);
+        gtk_menu_item_set_label (GTK_MENU_ITEM (menu_item), menu_label);
+        g_free (menu_label);
+        g_free (description);
+
        gl_ui_util_set_verb_sensitive (ui, "/ui/MenuBar/EditMenu/EditUndo",
                                       gl_label_can_undo (label));
 
@@ -1038,6 +1108,74 @@ set_view_style (GtkUIManager *ui)
 }
 
 
+/*---------------------------------------------------------------------------*/
+/** PRIVATE.  Descend menu, set "always-show-image" for all image menu items.*/
+/*---------------------------------------------------------------------------*/
+static void
+descend_menu_set_always_show_image (GtkMenu *menu)
+{
+        GList       *children, *p;
+        GtkWidget   *submenu;
+        GtkWidget   *menu_item;
+
+        children = gtk_container_get_children (GTK_CONTAINER (menu));
+
+        for ( p = children; p != NULL; p = p->next )
+        {
+                menu_item = GTK_WIDGET (p->data);
+
+                submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item));
+                if ( submenu )
+                {
+                        descend_menu_set_always_show_image (GTK_MENU (submenu));
+                }
+                else if ( GTK_IS_IMAGE_MENU_ITEM (menu_item) )
+                {
+                        g_object_set (menu_item, "always-show-image", TRUE, NULL);
+                }
+        }
+}
+
+
+/*---------------------------------------------------------------------------*/
+/** PRIVATE.  Set additional properties.                                     */
+/*---------------------------------------------------------------------------*/
+static void
+set_additional_properties (GtkUIManager *ui)
+{
+        GtkWidget  *menu;
+        GtkWidget  *menu_item;
+
+        /*
+         * Set "always-show-image" property for all Object menuitems.  This is
+         * necessary because, as of Gtk-2.18, images are not shown by default
+         * and you really need these visual cues for these menu items.
+         */
+        menu_item = gtk_ui_manager_get_widget (ui, "/MenuBar/ObjectsMenu/");
+        menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item));
+        descend_menu_set_always_show_image (GTK_MENU (menu));
+
+        menu_item = gtk_ui_manager_get_widget (ui, "/MenuBar/ObjectsMenu/ObjectsMergeProperties");
+        g_object_set (menu_item, "always-show-image", FALSE, NULL); /* Leave this one out. */
+
+        menu_item = gtk_ui_manager_get_widget (ui, "/ContextMenu/ObjectsOrderMenu/");
+        menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item));
+        descend_menu_set_always_show_image (GTK_MENU (menu));
+
+        menu_item = gtk_ui_manager_get_widget (ui, "/ContextMenu/ObjectsRotateFlipMenu/");
+        menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item));
+        descend_menu_set_always_show_image (GTK_MENU (menu));
+
+        menu_item = gtk_ui_manager_get_widget (ui, "/ContextMenu/ObjectsAlignMenu/");
+        menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item));
+        descend_menu_set_always_show_image (GTK_MENU (menu));
+
+        menu_item = gtk_ui_manager_get_widget (ui, "/ContextMenu/ObjectsCenterMenu/");
+        menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item));
+        descend_menu_set_always_show_image (GTK_MENU (menu));
+}
+
+
 /*---------------------------------------------------------------------------*/
 /** PRIVATE.  Connect proxy callback.                                        */
 /*---------------------------------------------------------------------------*/