# HG changeset patch # User Colin Clark # Date 1531583175 -3600 # Node ID 684ca84becd2b21ff4fb45232f47a340275e6595 # Parent 780a9b685335bf6c52e3040fe998d06f60fc3f08 Additional toolbar icons diff -r 780a9b685335 -r 684ca84becd2 src/icons/Makefile.am --- a/src/icons/Makefile.am Sat Jul 14 14:23:55 2018 +0100 +++ b/src/icons/Makefile.am Sat Jul 14 16:46:15 2018 +0100 @@ -22,7 +22,16 @@ icon_config.png \ icon_tools.png \ icon_view.png \ - icon_guidelines.png + icon_guidelines.png \ + icon_panorama.png \ + icon_maintenance.png \ + icon_zoomfillhor.png \ + icon_zoomfillvert.png \ + icon_hidetools.png \ + icon_exif.png \ + icon_marks.png \ + icon_info.png \ + icon_sort.png ICONS_INLINE_PAIRS = \ folder_closed $(srcdir)/folder_closed.png \ @@ -43,7 +52,16 @@ icon_config $(srcdir)/icon_config.png \ icon_tools $(srcdir)/icon_tools.png \ icon_view $(srcdir)/icon_view.png \ - icon_guidelines $(srcdir)/icon_guidelines.png + icon_guidelines $(srcdir)/icon_guidelines.png \ + icon_panorama $(srcdir)/icon_panorama.png \ + icon_maintenance $(srcdir)/icon_maintenance.png \ + icon_zoomfillhor $(srcdir)/icon_zoomfillhor.png \ + icon_zoomfillvert $(srcdir)/icon_zoomfillvert.png \ + icon_hidetools $(srcdir)/icon_hidetools.png \ + icon_exif $(srcdir)/icon_exif.png \ + icon_marks $(srcdir)/icon_marks.png \ + icon_info $(srcdir)/icon_info.png \ + icon_sort $(srcdir)/icon_sort.png icons_inline.h: $(ICONS_INLINE) Makefile.in @sh -ec "echo '/* Auto generated file, do not edit */'; echo; \ diff -r 780a9b685335 -r 684ca84becd2 src/icons/icon_exif.png Binary file src/icons/icon_exif.png has changed diff -r 780a9b685335 -r 684ca84becd2 src/icons/icon_hidetools.png Binary file src/icons/icon_hidetools.png has changed diff -r 780a9b685335 -r 684ca84becd2 src/icons/icon_info.png Binary file src/icons/icon_info.png has changed diff -r 780a9b685335 -r 684ca84becd2 src/icons/icon_maintenance.png Binary file src/icons/icon_maintenance.png has changed diff -r 780a9b685335 -r 684ca84becd2 src/icons/icon_marks.png Binary file src/icons/icon_marks.png has changed diff -r 780a9b685335 -r 684ca84becd2 src/icons/icon_panorama.png Binary file src/icons/icon_panorama.png has changed diff -r 780a9b685335 -r 684ca84becd2 src/icons/icon_sort.png Binary file src/icons/icon_sort.png has changed diff -r 780a9b685335 -r 684ca84becd2 src/icons/icon_zoomfillhor.png Binary file src/icons/icon_zoomfillhor.png has changed diff -r 780a9b685335 -r 684ca84becd2 src/icons/icon_zoomfillvert.png Binary file src/icons/icon_zoomfillvert.png has changed diff -r 780a9b685335 -r 684ca84becd2 src/layout_util.c --- a/src/layout_util.c Sat Jul 14 14:23:55 2018 +0100 +++ b/src/layout_util.c Sat Jul 14 16:46:15 2018 +0100 @@ -1828,7 +1828,7 @@ { "OpenRecent", NULL, N_("Open recen_t"), NULL, N_("Open recent"), NULL }, { "Search", GTK_STOCK_FIND, N_("_Search..."), "F3", N_("Search..."), CB(layout_menu_search_cb) }, { "FindDupes", GTK_STOCK_FIND, N_("_Find duplicates..."), "D", N_("Find duplicates..."), CB(layout_menu_dupes_cb) }, - { "PanView", GTK_STOCK_FILE, N_("Pa_n view"), "J", N_("Pan view"), CB(layout_menu_pan_cb) }, + { "PanView", PIXBUF_INLINE_ICON_PANORAMA, N_("Pa_n view"), "J", N_("Pan view"), CB(layout_menu_pan_cb) }, { "Print", GTK_STOCK_PRINT, N_("_Print..."), "P", N_("Print..."), CB(layout_menu_print_cb) }, { "NewFolder", GTK_STOCK_DIRECTORY, N_("N_ew folder..."), "F", N_("New folder..."), CB(layout_menu_dir_cb) }, { "Copy", GTK_STOCK_COPY, N_("_Copy..."), "C", N_("Copy..."), CB(layout_menu_copy_cb) }, @@ -1862,7 +1862,7 @@ { "Preferences", GTK_STOCK_PREFERENCES, N_("P_references..."), "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) }, - { "Maintenance", GTK_STOCK_FILE, N_("_Cache maintenance..."), NULL, N_("Cache maintenance..."), CB(layout_menu_remove_thumb_cb) }, + { "Maintenance", PIXBUF_INLINE_ICON_MAINTENANCE, N_("_Cache maintenance..."), NULL, N_("Cache maintenance..."), CB(layout_menu_remove_thumb_cb) }, { "Wallpaper", NULL, N_("Set as _wallpaper"), NULL, N_("Set as wallpaper"), CB(layout_menu_wallpaper_cb) }, { "SaveMetadata", GTK_STOCK_SAVE, N_("_Save metadata"), "S", N_("Save metadata"), CB(layout_menu_metadata_write_cb) }, { "ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _in"), "equal", N_("Zoom in"), CB(layout_menu_zoom_in_cb) }, @@ -1873,8 +1873,8 @@ { "Zoom100Alt1", GTK_STOCK_ZOOM_100, N_("Zoom _1:1"), "KP_Divide", N_("Zoom 1:1"), CB(layout_menu_zoom_1_1_cb) }, { "ZoomFit", GTK_STOCK_ZOOM_FIT, N_("_Zoom to fit"), "X", N_("Zoom to fit"), CB(layout_menu_zoom_fit_cb) }, { "ZoomFitAlt1", GTK_STOCK_ZOOM_FIT, N_("_Zoom to fit"), "KP_Multiply", N_("Zoom to fit"), CB(layout_menu_zoom_fit_cb) }, - { "ZoomFillHor", GTK_STOCK_FILE, N_("Fit _Horizontally"), "H", N_("Fit Horizontally"), CB(layout_menu_zoom_fit_hor_cb) }, - { "ZoomFillVert", GTK_STOCK_FILE, N_("Fit _Vertically"), "W", N_("Fit Vertically"), CB(layout_menu_zoom_fit_vert_cb) }, + { "ZoomFillHor", PIXBUF_INLINE_ICON_ZOOMFILLHOR, N_("Fit _Horizontally"), "H", N_("Fit Horizontally"), CB(layout_menu_zoom_fit_hor_cb) }, + { "ZoomFillVert", PIXBUF_INLINE_ICON_ZOOMFILLVERT, N_("Fit _Vertically"), "W", N_("Fit Vertically"), CB(layout_menu_zoom_fit_vert_cb) }, { "Zoom200", GTK_STOCK_FILE, N_("Zoom _2:1"), NULL, N_("Zoom 2:1"), CB(layout_menu_zoom_2_1_cb) }, { "Zoom300", GTK_STOCK_FILE, N_("Zoom _3:1"), NULL, N_("Zoom 3:1"), CB(layout_menu_zoom_3_1_cb) }, { "Zoom400", GTK_STOCK_FILE, N_("Zoom _4:1"), NULL, N_("Zoom 4:1"), CB(layout_menu_zoom_4_1_cb) }, @@ -1906,7 +1906,7 @@ { "ImageOverlayCycle",NULL, N_("_Cycle through overlay modes"), "I", N_("Cycle through Overlay modes"), CB(layout_menu_overlay_toggle_cb) }, { "HistogramChanCycle",NULL, N_("Cycle through histogram ch_annels"),"K", N_("Cycle through histogram channels"), CB(layout_menu_histogram_toggle_channel_cb) }, { "HistogramModeCycle",NULL, N_("Cycle through histogram mo_des"), "J", N_("Cycle through histogram modes"), CB(layout_menu_histogram_toggle_mode_cb) }, - { "HideTools", GTK_STOCK_FILE, N_("_Hide file list"), "H", N_("Hide file list"), CB(layout_menu_hide_cb) }, + { "HideTools", PIXBUF_INLINE_ICON_HIDETOOLS, N_("_Hide file list"), "H", N_("Hide file list"), CB(layout_menu_hide_cb) }, { "SlideShowPause", GTK_STOCK_MEDIA_PAUSE, N_("_Pause slideshow"), "P", N_("Pause slideshow"), CB(layout_menu_slideshow_pause_cb) }, { "SlideShowFaster", GTK_STOCK_FILE, N_("Faster"), "KP_Add", N_("Faster"), CB(layout_menu_slideshow_faster_cb) }, { "SlideShowSlower", GTK_STOCK_FILE, N_("Slower"), "KP_Subtract", N_("Slower"), CB(layout_menu_slideshow_slower_cb) }, @@ -1919,7 +1919,7 @@ { "HelpChangeLog", NULL, N_("_ChangeLog"), NULL, N_("ChangeLog notes"), CB(layout_menu_changelog_cb) }, { "About", GTK_STOCK_ABOUT, N_("_About"), NULL, N_("About"), CB(layout_menu_about_cb) }, { "LogWindow", NULL, N_("_Log Window"), NULL, N_("Log Window"), CB(layout_menu_log_window_cb) }, - { "ExifWin", GTK_STOCK_FILE, N_("_Exif window"), "E", N_("Exif window"), CB(layout_menu_bar_exif_cb) }, + { "ExifWin", PIXBUF_INLINE_ICON_EXIF, N_("_Exif window"), "E", N_("Exif window"), CB(layout_menu_bar_exif_cb) }, { "StereoCycle", NULL, N_("_Cycle through stereo modes"), NULL, N_("Cycle through stereo modes"), CB(layout_menu_stereo_mode_next_cb) }, { "SplitNextPane", NULL, N_("_Next Pane"), "Right", N_("Next Pane"), CB(layout_menu_split_pane_next_cb) }, { "SplitPreviousPane", NULL, N_("_Previous Pane"), "Left", N_("Previous Pane"), CB(layout_menu_split_pane_prev_cb) }, @@ -1932,12 +1932,12 @@ static GtkToggleActionEntry menu_toggle_entries[] = { { "Thumbnails", PIXBUF_INLINE_ICON_THUMB,N_("Show _Thumbnails"), "T", N_("Show Thumbnails"), CB(layout_menu_thumb_cb), FALSE }, - { "ShowMarks", GTK_STOCK_FILE, N_("Show _Marks"), "M", N_("Show Marks"), CB(layout_menu_marks_cb), FALSE }, + { "ShowMarks", PIXBUF_INLINE_ICON_MARKS, N_("Show _Marks"), "M", N_("Show Marks"), CB(layout_menu_marks_cb), FALSE }, { "ShowInfoPixel", GTK_STOCK_COLOR_PICKER, N_("Pi_xel Info"), NULL, N_("Show Pixel Info"), CB(layout_menu_info_pixel_cb), FALSE }, { "FloatTools", PIXBUF_INLINE_ICON_FLOAT,N_("_Float file list"), "L", N_("Float file list"), CB(layout_menu_float_cb), FALSE }, { "HideToolbar", NULL, N_("Hide tool_bar"), NULL, N_("Hide toolbar"), CB(layout_menu_toolbar_cb), FALSE }, - { "SBar", GTK_STOCK_FILE, N_("_Info sidebar"), "K", N_("Info sidebar"), CB(layout_menu_bar_cb), FALSE }, - { "SBarSort", GTK_STOCK_FILE, N_("Sort _manager"), "S", N_("Sort manager"), CB(layout_menu_bar_sort_cb), FALSE }, + { "SBar", PIXBUF_INLINE_ICON_INFO, N_("_Info sidebar"), "K", N_("Info sidebar"), CB(layout_menu_bar_cb), FALSE }, + { "SBarSort", PIXBUF_INLINE_ICON_SORT, N_("Sort _manager"), "S", N_("Sort manager"), CB(layout_menu_bar_sort_cb), FALSE }, { "HideBars", NULL, N_("Hide Bars"), "grave", N_("Hide Bars"), CB(layout_menu_hide_bars_cb), FALSE }, { "SlideShow", GTK_STOCK_MEDIA_PLAY, N_("Toggle _slideshow"), "S", N_("Toggle slideshow"), CB(layout_menu_slideshow_cb), FALSE }, { "UseColorProfiles", GTK_STOCK_SELECT_COLOR, N_("Use _color profiles"), NULL, N_("Use color profiles"), CB(layout_color_menu_enable_cb), FALSE}, diff -r 780a9b685335 -r 684ca84becd2 src/pixbuf_util.c --- a/src/pixbuf_util.c Sat Jul 14 14:23:55 2018 +0100 +++ b/src/pixbuf_util.c Sat Jul 14 16:46:15 2018 +0100 @@ -121,6 +121,15 @@ { PIXBUF_INLINE_ICON_TOOLS, icon_tools }, { PIXBUF_INLINE_ICON_VIEW, icon_view }, { PIXBUF_INLINE_ICON_GUIDELINES, icon_guidelines }, + { PIXBUF_INLINE_ICON_PANORAMA, icon_panorama }, + { PIXBUF_INLINE_ICON_MAINTENANCE, icon_maintenance }, + { PIXBUF_INLINE_ICON_ZOOMFILLHOR, icon_zoomfillhor }, + { PIXBUF_INLINE_ICON_ZOOMFILLVERT, icon_zoomfillvert }, + { PIXBUF_INLINE_ICON_HIDETOOLS, icon_hidetools }, + { PIXBUF_INLINE_ICON_EXIF, icon_exif }, + { PIXBUF_INLINE_ICON_MARKS, icon_marks }, + { PIXBUF_INLINE_ICON_INFO, icon_info }, + { PIXBUF_INLINE_ICON_SORT, icon_sort }, { NULL, NULL } }; diff -r 780a9b685335 -r 684ca84becd2 src/pixbuf_util.h --- a/src/pixbuf_util.h Sat Jul 14 14:23:55 2018 +0100 +++ b/src/pixbuf_util.h Sat Jul 14 16:46:15 2018 +0100 @@ -55,7 +55,15 @@ #define PIXBUF_INLINE_ICON_TOOLS "icon_tools" #define PIXBUF_INLINE_ICON_VIEW "icon_view" #define PIXBUF_INLINE_ICON_GUIDELINES "icon_guidelines" - +#define PIXBUF_INLINE_ICON_PANORAMA "icon_panorama" +#define PIXBUF_INLINE_ICON_MAINTENANCE "icon_maintenance" +#define PIXBUF_INLINE_ICON_ZOOMFILLHOR "icon_zoomfillhor" +#define PIXBUF_INLINE_ICON_ZOOMFILLVERT "icon_zoomfillvert" +#define PIXBUF_INLINE_ICON_HIDETOOLS "icon_hidetools" +#define PIXBUF_INLINE_ICON_EXIF "icon_exif" +#define PIXBUF_INLINE_ICON_MARKS "icon_marks" +#define PIXBUF_INLINE_ICON_INFO "icon_info" +#define PIXBUF_INLINE_ICON_SORT "icon_sort" GdkPixbuf *pixbuf_copy_rotate_90(GdkPixbuf *src, gboolean counter_clockwise); GdkPixbuf *pixbuf_copy_mirror(GdkPixbuf *src, gboolean mirror, gboolean flip); diff -r 780a9b685335 -r 684ca84becd2 src/toolbar.c --- a/src/toolbar.c Sat Jul 14 14:23:55 2018 +0100 +++ b/src/toolbar.c Sat Jul 14 16:46:15 2018 +0100 @@ -84,17 +84,17 @@ {"OpenCollection", N_("Open collection"), GTK_STOCK_OPEN}, {"Search", N_("Search"), GTK_STOCK_FIND}, {"FindDupes", N_("Find duplicates"), GTK_STOCK_FIND}, - {"PanView", N_("Pan view"), GTK_STOCK_FILE}, + {"PanView", N_("Pan view"), PIXBUF_INLINE_ICON_PANORAMA}, {"Print", N_("Print"), GTK_STOCK_PRINT}, {"Preferences", N_("Preferences"), GTK_STOCK_PREFERENCES}, {"LayoutConfig", N_("Configure this window"), GTK_STOCK_PREFERENCES}, - {"Maintenance", N_("Cache maintenance"), GTK_STOCK_FILE}, + {"Maintenance", N_("Cache maintenance"), PIXBUF_INLINE_ICON_MAINTENANCE}, {"ZoomIn", N_("Zoom in"), GTK_STOCK_ZOOM_IN}, {"ZoomOut", N_("Zoom out"), GTK_STOCK_ZOOM_OUT}, {"Zoom100", N_("Zoom 1:1"), GTK_STOCK_ZOOM_100}, {"ZoomFit", N_("Zoom to fit"), GTK_STOCK_ZOOM_FIT}, - {"ZoomFillHor", N_("Fit Horizontaly"), GTK_STOCK_FILE}, - {"ZoomFillVert", N_("Fit vertically"), GTK_STOCK_FILE}, + {"ZoomFillHor", N_("Fit Horizontaly"), PIXBUF_INLINE_ICON_ZOOMFILLHOR}, + {"ZoomFillVert", N_("Fit vertically"), PIXBUF_INLINE_ICON_ZOOMFILLVERT}, {"Zoom200", N_("Zoom 2:1"), GTK_STOCK_FILE}, {"Zoom300", N_("Zoom 3:1"), GTK_STOCK_FILE}, {"Zoom400", N_("Zoom 4:1"), GTK_STOCK_FILE}, @@ -102,19 +102,19 @@ {"Zoom33", N_("Zoom1:3"), GTK_STOCK_FILE}, {"Zoom25", N_("Zoom 1:4"), GTK_STOCK_FILE}, {"ConnectZoomIn", N_("Connected Zoom in"), GTK_STOCK_ZOOM_IN}, - {"HideTools", N_("Hide file list"), GTK_STOCK_FILE}, + {"HideTools", N_("Hide file list"), PIXBUF_INLINE_ICON_HIDETOOLS}, {"SlideShowPause", N_("Pause slideshow"), GTK_STOCK_MEDIA_PAUSE}, {"SlideShowFaster", N_("Slideshow Faster"), GTK_STOCK_FILE}, {"SlideShowSlower", N_("Slideshow Slower"), GTK_STOCK_FILE}, {"Refresh", N_("Refresh"), GTK_STOCK_REFRESH}, {"HelpContents", N_("Help"), GTK_STOCK_HELP}, - {"ExifWin", N_("Exif window"), GTK_STOCK_FILE}, + {"ExifWin", N_("Exif window"), PIXBUF_INLINE_ICON_EXIF}, {"Thumbnails", N_("Show thumbnails"), PIXBUF_INLINE_ICON_THUMB}, - {"ShowMarks", N_("Show marks"), GTK_STOCK_FILE}, + {"ShowMarks", N_("Show marks"), PIXBUF_INLINE_ICON_MARKS}, {"ImageGuidelines", N_("Show guidelines"), PIXBUF_INLINE_ICON_GUIDELINES}, {"FloatTools", N_("Float file list"), PIXBUF_INLINE_ICON_FLOAT}, - {"SBar", N_("Info sidebar"), GTK_STOCK_FILE}, - {"SBarSort", N_("Sort manager"), GTK_STOCK_FILE}, + {"SBar", N_("Info sidebar"), PIXBUF_INLINE_ICON_INFO}, + {"SBarSort", N_("Sort manager"), PIXBUF_INLINE_ICON_SORT}, {"Quit", N_("Quit"), GTK_STOCK_QUIT}, {NULL, NULL, NULL} };