Additional optional entries for the toolbar

diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am
index 0e6efe9..dcca29f 100644 (file)
--- a/src/icons/Makefile.am
+++ b/src/icons/Makefile.am
@@ -33,7 +33,14 @@ ICONS_INLINE = \
        icon_info.png   \
        icon_sort.png   \
        icon_pdf.png    \
-       icon_draw_rectangle.png
+       icon_draw_rectangle.png \
+       icon_move.png \
+       icon_rename.png \
+       icon_select_all.png \
+       icon_select_none.png \
+       icon_select_invert.png \
+       icon_select_rectangle.png
+
 
 ICONS_INLINE_PAIRS = \
        folder_closed           $(srcdir)/folder_closed.png     \
@@ -65,7 +72,13 @@ ICONS_INLINE_PAIRS = \
        icon_info       $(srcdir)/icon_info.png \
        icon_sort       $(srcdir)/icon_sort.png \
        icon_pdf        $(srcdir)/icon_pdf.png \
-       icon_draw_rectangle     $(srcdir)/icon_draw_rectangle.png
+       icon_draw_rectangle     $(srcdir)/icon_draw_rectangle.png \
+       icon_move       $(srcdir)/icon_move.png \
+       icon_rename     $(srcdir)/icon_rename.png \
+       icon_select_all $(srcdir)/icon_select_all.png \
+       icon_select_none        $(srcdir)/icon_select_none.png \
+       icon_select_invert      $(srcdir)/icon_select_invert.png \
+       icon_select_rectangle   $(srcdir)/icon_select_rectangle.png
 
 icons_inline.h: $(ICONS_INLINE) Makefile.in
        @sh -ec "echo '/* Auto generated file, do not edit */'; echo; \
@@ -83,4 +96,3 @@ CLEANFILES = $(noinst_DATA)
 EXTRA_DIST = \
        $(ICONS_INLINE)         \
        marker.xpm
-

diff --git a/src/icons/icon_move.png b/src/icons/icon_move.png
new file mode 100644 (file)
index 0000000..de4551a
Binary files /dev/null and b/src/icons/icon_move.png differ

diff --git a/src/icons/icon_rename.png b/src/icons/icon_rename.png
new file mode 100644 (file)
index 0000000..085c90f
Binary files /dev/null and b/src/icons/icon_rename.png differ

diff --git a/src/icons/icon_select_all.png b/src/icons/icon_select_all.png
new file mode 100644 (file)
index 0000000..a9aee9e
Binary files /dev/null and b/src/icons/icon_select_all.png differ

diff --git a/src/icons/icon_select_invert.png b/src/icons/icon_select_invert.png
new file mode 100644 (file)
index 0000000..bc37f04
Binary files /dev/null and b/src/icons/icon_select_invert.png differ

diff --git a/src/icons/icon_select_none.png b/src/icons/icon_select_none.png
new file mode 100644 (file)
index 0000000..14140b3
Binary files /dev/null and b/src/icons/icon_select_none.png differ

diff --git a/src/icons/icon_select_rectangle.png b/src/icons/icon_select_rectangle.png
new file mode 100644 (file)
index 0000000..e6d51ec
Binary files /dev/null and b/src/icons/icon_select_rectangle.png differ

diff --git a/src/layout_util.c b/src/layout_util.c
index 993794c..ba20794 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -1839,8 +1839,8 @@ static GtkActionEntry menu_entries[] = {
   { "Print",           GTK_STOCK_PRINT,        N_("_Print..."),                        "<shift>P",             N_("Print..."),                         CB(layout_menu_print_cb) },
   { "NewFolder",       GTK_STOCK_DIRECTORY,    N_("N_ew folder..."),                   "<control>F",           N_("New folder..."),                    CB(layout_menu_dir_cb) },
   { "Copy",            GTK_STOCK_COPY,         N_("_Copy..."),                         "<control>C",           N_("Copy..."),                          CB(layout_menu_copy_cb) },
-  { "Move",            NULL,                   N_("_Move..."),                         "<control>M",           N_("Move..."),                          CB(layout_menu_move_cb) },
-  { "Rename",          NULL,                   N_("_Rename..."),                       "<control>R",           N_("Rename..."),                        CB(layout_menu_rename_cb) },
+  { "Move",    PIXBUF_INLINE_ICON_MOVE,                        N_("_Move..."),                         "<control>M",           N_("Move..."),                          CB(layout_menu_move_cb) },
+  { "Rename",  PIXBUF_INLINE_ICON_RENAME,      N_("_Rename..."),                       "<control>R",           N_("Rename..."),                        CB(layout_menu_rename_cb) },
   { "Delete",          GTK_STOCK_DELETE,       N_("_Delete..."),                       "<control>D",           N_("Delete..."),                        CB(layout_menu_delete_cb) },
   { "DeleteAlt1",      GTK_STOCK_DELETE,       N_("_Delete..."),                       "Delete",               N_("Delete..."),                        CB(layout_menu_delete_key_cb) },
   { "DeleteAlt2",      GTK_STOCK_DELETE,       N_("_Delete..."),                       "KP_Delete",            N_("Delete..."),                        CB(layout_menu_delete_key_cb) },
@@ -1863,9 +1863,9 @@ static GtkActionEntry menu_entries[] = {
   { "Mirror",          NULL,                   N_("_Mirror"),                          "<shift>M",             N_("Mirror"),                           CB(layout_menu_alter_mirror_cb) },
   { "Flip",            NULL,                   N_("_Flip"),                            "<shift>F",             N_("Flip"),                             CB(layout_menu_alter_flip_cb) },
   { "AlterNone",       NULL,                   N_("_Original state"),                  "<shift>O",             N_("Original state"),                   CB(layout_menu_alter_none_cb) },
-  { "SelectAll",       NULL,                   N_("Select _all"),                      "<control>A",           N_("Select all"),                       CB(layout_menu_select_all_cb) },
-  { "SelectNone",      NULL,                   N_("Select _none"),                     "<control><shift>A",    N_("Select none"),                      CB(layout_menu_unselect_all_cb) },
-  { "SelectInvert",    NULL,                   N_("_Invert Selection"),                "<control><shift>I",    N_("Invert Selection"),                 CB(layout_menu_invert_selection_cb) },
+  { "SelectAll",       PIXBUF_INLINE_ICON_SELECT_ALL,                  N_("Select _all"),                      "<control>A",           N_("Select all"),                       CB(layout_menu_select_all_cb) },
+  { "SelectNone",      PIXBUF_INLINE_ICON_SELECT_NONE,                 N_("Select _none"),                     "<control><shift>A",    N_("Select none"),                      CB(layout_menu_unselect_all_cb) },
+  { "SelectInvert",    PIXBUF_INLINE_ICON_SELECT_INVERT,                       N_("_Invert Selection"),                "<control><shift>I",    N_("Invert Selection"),                 CB(layout_menu_invert_selection_cb) },
   { "Preferences",     GTK_STOCK_PREFERENCES,  N_("P_references..."),                  "<control>O",           N_("Preferences..."),                   CB(layout_menu_config_cb) },
   { "Plugins",         GTK_STOCK_PREFERENCES,  N_("Configure _Plugins..."),            NULL,                   N_("Configure Plugins..."),             CB(layout_menu_editors_cb) },
   { "LayoutConfig",    GTK_STOCK_PREFERENCES,  N_("_Configure this window..."),        NULL,                   N_("Configure this window..."),         CB(layout_menu_layout_config_cb) },
@@ -1953,7 +1953,7 @@ static GtkToggleActionEntry menu_toggle_entries[] = {
   { "ImageOverlay",    NULL,                   N_("Image _Overlay"),                   NULL,                   N_("Image Overlay"),                    CB(layout_menu_overlay_cb),      FALSE },
   { "ImageHistogram",  NULL,                   N_("_Show Histogram"),                  NULL,                   N_("Show Histogram"),                   CB(layout_menu_histogram_cb),    FALSE },
   { "ImageGuidelines", PIXBUF_INLINE_ICON_GUIDELINES,          N_("_Show Guidelines"),                 NULL,           N_("Show Guidelines"),                  CB(layout_menu_guidelines_cb),   FALSE },
-  { "RectangularSelection",    NULL,                   N_("Rectangular Selection"),                    "<alt>R",                       N_("Rectangular Selection"),                    CB(layout_menu_rectangular_selection_cb),        FALSE },
+  { "RectangularSelection",    PIXBUF_INLINE_ICON_SELECT_RECTANGLE,    N_("Rectangular Selection"),                    "<alt>R",                       N_("Rectangular Selection"),                    CB(layout_menu_rectangular_selection_cb),        FALSE },
   { "Animate", NULL,   N_("GIF _animation"),           "A",                    N_("Toggle GIF animation"),                     CB(layout_menu_animate_cb),      FALSE  },
   { "ExifRotate",      GTK_STOCK_ORIENTATION_PORTRAIT,                 N_("_Exif rotate"),             "<alt>X",               N_("Exif rotate"),                      CB(layout_menu_exif_rotate_cb), FALSE },
   { "DrawRectangle",   PIXBUF_INLINE_ICON_DRAW_RECTANGLE,                      N_("Draw Rectangle"),           NULL,           N_("Draw Rectangle"),                   CB(layout_menu_select_rectangle_cb), FALSE },

diff --git a/src/pixbuf_util.c b/src/pixbuf_util.c
index 3c69fa9..c694158 100644 (file)
--- a/src/pixbuf_util.c
+++ b/src/pixbuf_util.c
@@ -132,6 +132,12 @@ static PixbufInline inline_pixbuf_data[] = {
        { PIXBUF_INLINE_ICON_SORT,      icon_sort },
        { PIXBUF_INLINE_ICON_PDF,       icon_pdf },
        { PIXBUF_INLINE_ICON_DRAW_RECTANGLE,    icon_draw_rectangle },
+       { PIXBUF_INLINE_ICON_MOVE,      icon_move },
+       { PIXBUF_INLINE_ICON_RENAME,    icon_rename },
+       { PIXBUF_INLINE_ICON_SELECT_ALL,        icon_select_all },
+       { PIXBUF_INLINE_ICON_SELECT_NONE,       icon_select_none },
+       { PIXBUF_INLINE_ICON_SELECT_INVERT,     icon_select_invert },
+       { PIXBUF_INLINE_ICON_SELECT_RECTANGLE,  icon_select_rectangle },
        { NULL, NULL }
 };
 

diff --git a/src/pixbuf_util.h b/src/pixbuf_util.h
index 145224e..cfa8ffc 100644 (file)
--- a/src/pixbuf_util.h
+++ b/src/pixbuf_util.h
@@ -66,6 +66,12 @@ gboolean pixbuf_scale_aspect(gint req_w, gint req_h, gint old_w, gint old_h, gin
 #define PIXBUF_INLINE_ICON_SORT                "icon_sort"
 #define PIXBUF_INLINE_ICON_PDF         "icon_pdf"
 #define PIXBUF_INLINE_ICON_DRAW_RECTANGLE      "icon_draw_rectangle"
+#define PIXBUF_INLINE_ICON_MOVE                "icon_move"
+#define PIXBUF_INLINE_ICON_RENAME      "icon_rename"
+#define PIXBUF_INLINE_ICON_SELECT_ALL  "icon_select_all"
+#define PIXBUF_INLINE_ICON_SELECT_NONE "icon_select_none"
+#define PIXBUF_INLINE_ICON_SELECT_INVERT       "icon_select_invert"
+#define PIXBUF_INLINE_ICON_SELECT_RECTANGLE    "icon_select_rectangle"
 
 GdkPixbuf *pixbuf_copy_rotate_90(GdkPixbuf *src, gboolean counter_clockwise);
 GdkPixbuf *pixbuf_copy_mirror(GdkPixbuf *src, gboolean mirror, gboolean flip);

diff --git a/src/toolbar.c b/src/toolbar.c
index 4c22cac..2a6d913 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -84,7 +84,17 @@ static const UseableToolbarItems useable_toolbar_items[] = {
        {"OpenCollection",      N_("Open collection"), GTK_STOCK_OPEN},
        {"Search",      N_("Search"), GTK_STOCK_FIND},
        {"FindDupes",   N_("Find duplicates"), GTK_STOCK_FIND},
+       {"NewFolder",   N_("New folder"),GTK_STOCK_DIRECTORY},
+       {"Copy",        N_("Copy"), GTK_STOCK_COPY},
+       {"Move",        N_("Move"), PIXBUF_INLINE_ICON_MOVE},
+       {"Rename",      N_("Rename"), PIXBUF_INLINE_ICON_RENAME},
+       {"Delete",      N_("Delete"), GTK_STOCK_DELETE},
+       {"CloseWindow", N_("Close Window"), GTK_STOCK_CLOSE},
        {"PanView",     N_("Pan view"), PIXBUF_INLINE_ICON_PANORAMA},
+       {"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},
+       {"RectangularSelection",        N_("Select rectangle"), PIXBUF_INLINE_ICON_SELECT_RECTANGLE},
        {"Print",       N_("Print"), GTK_STOCK_PRINT},
        {"Preferences", N_("Preferences"), GTK_STOCK_PREFERENCES},
        {"LayoutConfig",        N_("Configure this window"), GTK_STOCK_PREFERENCES},