Bug fix: Hide Bars - grave keystroke

[geeqie.git] / src / toolbar.c

diff --git a/src/toolbar.c b/src/toolbar.c
index 4a484a9..6aaff5d 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -65,7 +65,7 @@ struct _UseableToolbarItems
        gchar *stock_id;
 };
 
-/* FIXME Should be created by program from menu_entries[]
+/** @FIXME Should be created by program from menu_entries[]
  * in layout_util.c */
  /** The user is limited to selecting from this list of menu items
   * plus any desktop files
@@ -83,7 +83,9 @@ static const UseableToolbarItems useable_toolbar_items[] = {
        {"LastPage",    N_("Last Page"), GTK_STOCK_MEDIA_NEXT},
        {"NextPage",    N_("Next page"), GTK_STOCK_MEDIA_FORWARD},
        {"PrevPage",    N_("Previous Page"), GTK_STOCK_MEDIA_REWIND},
-       {"NewWindow",   N_("New _window"), GTK_STOCK_NEW},
+       {"ImageForward",        N_("Image Forward"), GTK_STOCK_GOTO_LAST},
+       {"ImageBack",   N_("Image Back"), GTK_STOCK_GOTO_FIRST},
+       {"NewWindow",   N_("New window"), GTK_STOCK_NEW},
        {"NewCollection",       N_("New collection"), GTK_STOCK_INDEX},
        {"OpenCollection",      N_("Open collection"), GTK_STOCK_OPEN},
        {"Search",      N_("Search"), GTK_STOCK_FIND},
@@ -95,6 +97,7 @@ static const UseableToolbarItems useable_toolbar_items[] = {
        {"Delete",      N_("Delete"), GTK_STOCK_DELETE},
        {"CloseWindow", N_("Close Window"), GTK_STOCK_CLOSE},
        {"PanView",     N_("Pan view"), PIXBUF_INLINE_ICON_PANORAMA},
+       {"OpenArchive", N_("Open Archive"), PIXBUF_INLINE_ARCHIVE},
        {"SelectAll",   N_("Select all"), PIXBUF_INLINE_ICON_SELECT_ALL},
        {"SelectNone",  N_("Select none"), PIXBUF_INLINE_ICON_SELECT_NONE},
        {"SelectInvert",        N_("Select invert"), PIXBUF_INLINE_ICON_SELECT_INVERT},
@@ -104,9 +107,9 @@ static const UseableToolbarItems useable_toolbar_items[] = {
        {"Preferences", N_("Preferences"), GTK_STOCK_PREFERENCES},
        {"LayoutConfig",        N_("Configure this window"), GTK_STOCK_PREFERENCES},
        {"Maintenance", N_("Cache maintenance"), PIXBUF_INLINE_ICON_MAINTENANCE},
-       {"RotateCW",    N_("Rotate clockwise"), PIXBUF_INLINE_ICON_CW},
-       {"RotateCCW",   N_("Rotate counterclockwise"), PIXBUF_INLINE_ICON_CCW},
-       {"Rotate180",   N_("Rotate 180"), PIXBUF_INLINE_ICON_180},
+       {"RotateCW",    N_("Rotate clockwise 90°"), PIXBUF_INLINE_ICON_CW},
+       {"RotateCCW",   N_("Rotate counterclockwise 90°"), PIXBUF_INLINE_ICON_CCW},
+       {"Rotate180",   N_("Rotate 180°"), PIXBUF_INLINE_ICON_180},
        {"Mirror",      N_("Mirror"), PIXBUF_INLINE_ICON_MIRROR},
        {"Flip",        N_("Flip"), PIXBUF_INLINE_ICON_FLIP},
        {"AlterNone",   N_("Original state"), PIXBUF_INLINE_ICON_ORIGINAL},
@@ -123,10 +126,12 @@ static const UseableToolbarItems useable_toolbar_items[] = {
        {"Zoom33",      N_("Zoom1:3"), GTK_STOCK_FILE},
        {"Zoom25",      N_("Zoom 1:4"), GTK_STOCK_FILE},
        {"ConnectZoomIn",       N_("Connected Zoom in"), GTK_STOCK_ZOOM_IN},
+       {"SplitPaneSync",       N_("Split Pane Sync"), PIXBUF_INLINE_SPLIT_PANE_SYNC},
        {"Grayscale",   N_("Grayscale"), PIXBUF_INLINE_ICON_GRAYSCALE},
        {"OverUnderExposed",    N_("Over Under Exposed"), PIXBUF_INLINE_ICON_EXPOSURE},
        {"ShowInfoPixel",       N_("Pixel Info"),       GTK_STOCK_COLOR_PICKER},
-       {"ExifRotate",  N_("_Exif rotate"),     GTK_STOCK_ORIENTATION_PORTRAIT},
+       {"IgnoreAlpha", N_("Ignore Alpha"),     GTK_STOCK_STRIKETHROUGH},
+       {"ExifRotate",  N_("Exif rotate"),      GTK_STOCK_ORIENTATION_PORTRAIT},
        {"UseColorProfiles",    N_("Use color profiles"),       GTK_STOCK_SELECT_COLOR},
        {"SaveMetadata",        N_("Save metadata"),    GTK_STOCK_SAVE},
        {"HideTools",   N_("Hide file list"), PIXBUF_INLINE_ICON_HIDETOOLS},
@@ -138,7 +143,6 @@ static const UseableToolbarItems useable_toolbar_items[] = {
        {"ExifWin",     N_("Exif window"), PIXBUF_INLINE_ICON_EXIF},
        {"Thumbnails",  N_("Show thumbnails"), PIXBUF_INLINE_ICON_THUMB},
        {"ShowMarks",   N_("Show marks"), PIXBUF_INLINE_ICON_MARKS},
-       {"ImageGuidelines",     N_("Show guidelines"), PIXBUF_INLINE_ICON_GUIDELINES},
        {"DrawRectangle",       N_("Draw Rectangle"), PIXBUF_INLINE_ICON_DRAW_RECTANGLE},
        {"FloatTools",  N_("Float file list"), PIXBUF_INLINE_ICON_FLOAT},
        {"SBar",        N_("Info sidebar"), PIXBUF_INLINE_ICON_INFO},
@@ -251,7 +255,7 @@ static void get_toolbar_item(const gchar *name, gchar **label, gchar **stock_id)
                {
                if (g_strcmp0(list->name, name) == 0)
                        {
-                       *label = g_strdup(list->label);
+                       *label = g_strdup(gettext(list->label));
                        *stock_id = g_strdup(list->stock_id);
                        break;
                        }
@@ -388,10 +392,10 @@ static void toolbar_menu_add_popup(GtkWidget *widget, gpointer data)
        while (list->name)
                {
                GtkWidget *item;
-               item = menu_item_add_stock(menu, list->label, list->stock_id,
+               item = menu_item_add_stock(menu, gettext(list->label), list->stock_id,
                                                                                G_CALLBACK(toolbarlist_add_cb), toolbarlist);
                g_object_set_data(G_OBJECT(item), "toolbar_add_name", g_strdup(list->name));
-               g_object_set_data(G_OBJECT(item), "toolbar_add_label", g_strdup(list->label));
+               g_object_set_data(G_OBJECT(item), "toolbar_add_label", g_strdup(gettext(list->label)));
                g_object_set_data(G_OBJECT(item), "toolbar_add_stock_id", g_strdup(list->stock_id));
                g_signal_connect(G_OBJECT(item), "destroy", G_CALLBACK(toolbar_button_free), item);
                list++;