diff --git a/rtdata/images/Chanmixer_BB.png b/rtdata/images/Chanmixer-BB.png similarity index 100% rename from rtdata/images/Chanmixer_BB.png rename to rtdata/images/Chanmixer-BB.png diff --git a/rtdata/images/Chanmixer_BG.png b/rtdata/images/Chanmixer-BG.png similarity index 100% rename from rtdata/images/Chanmixer_BG.png rename to rtdata/images/Chanmixer-BG.png diff --git a/rtdata/images/Chanmixer_BR.png b/rtdata/images/Chanmixer-BR.png similarity index 100% rename from rtdata/images/Chanmixer_BR.png rename to rtdata/images/Chanmixer-BR.png diff --git a/rtdata/images/Chanmixer_GB.png b/rtdata/images/Chanmixer-GB.png similarity index 100% rename from rtdata/images/Chanmixer_GB.png rename to rtdata/images/Chanmixer-GB.png diff --git a/rtdata/images/Chanmixer_GG.png b/rtdata/images/Chanmixer-GG.png similarity index 100% rename from rtdata/images/Chanmixer_GG.png rename to rtdata/images/Chanmixer-GG.png diff --git a/rtdata/images/Chanmixer_GR.png b/rtdata/images/Chanmixer-GR.png similarity index 100% rename from rtdata/images/Chanmixer_GR.png rename to rtdata/images/Chanmixer-GR.png diff --git a/rtdata/images/Chanmixer_RB.png b/rtdata/images/Chanmixer-RB.png similarity index 100% rename from rtdata/images/Chanmixer_RB.png rename to rtdata/images/Chanmixer-RB.png diff --git a/rtdata/images/Chanmixer_RG.png b/rtdata/images/Chanmixer-RG.png similarity index 100% rename from rtdata/images/Chanmixer_RG.png rename to rtdata/images/Chanmixer-RG.png diff --git a/rtdata/images/Chanmixer_RR.png b/rtdata/images/Chanmixer-RR.png similarity index 100% rename from rtdata/images/Chanmixer_RR.png rename to rtdata/images/Chanmixer-RR.png diff --git a/rtdata/images/Dark/actions/PanelEnding_01.png b/rtdata/images/Dark/actions/PanelEnding.png similarity index 100% rename from rtdata/images/Dark/actions/PanelEnding_01.png rename to rtdata/images/Dark/actions/PanelEnding.png diff --git a/rtdata/images/Dark/actions/add.png b/rtdata/images/Dark/actions/add.png deleted file mode 100644 index 12bd431f3..000000000 Binary files a/rtdata/images/Dark/actions/add.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/addtag.png b/rtdata/images/Dark/actions/addtag.png deleted file mode 100644 index 0f1b674e5..000000000 Binary files a/rtdata/images/Dark/actions/addtag.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/addtags.png b/rtdata/images/Dark/actions/addtags.png deleted file mode 100644 index 1daa96953..000000000 Binary files a/rtdata/images/Dark/actions/addtags.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/closedhand22.png b/rtdata/images/Dark/actions/closedhand.png similarity index 100% rename from rtdata/images/Dark/actions/closedhand22.png rename to rtdata/images/Dark/actions/closedhand.png diff --git a/rtdata/images/Dark/actions/colour-24.png b/rtdata/images/Dark/actions/colour-24.png deleted file mode 100644 index 5cc6da0b4..000000000 Binary files a/rtdata/images/Dark/actions/colour-24.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/colour.png b/rtdata/images/Dark/actions/colour.png new file mode 100644 index 000000000..fb3358d60 Binary files /dev/null and b/rtdata/images/Dark/actions/colour.png differ diff --git a/rtdata/images/Dark/actions/computer.png b/rtdata/images/Dark/actions/computer.png deleted file mode 100644 index 13895d772..000000000 Binary files a/rtdata/images/Dark/actions/computer.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/crop_auto_22.png b/rtdata/images/Dark/actions/crop-auto.png similarity index 100% rename from rtdata/images/Dark/actions/crop_auto_22.png rename to rtdata/images/Dark/actions/crop-auto.png diff --git a/rtdata/images/Dark/actions/crop22.png b/rtdata/images/Dark/actions/crop.png similarity index 100% rename from rtdata/images/Dark/actions/crop22.png rename to rtdata/images/Dark/actions/crop.png diff --git a/rtdata/images/Dark/actions/crossed_arrows_in_45_02.png b/rtdata/images/Dark/actions/crossed-arrows-in.png similarity index 100% rename from rtdata/images/Dark/actions/crossed_arrows_in_45_02.png rename to rtdata/images/Dark/actions/crossed-arrows-in.png diff --git a/rtdata/images/Dark/actions/crossed_arrows_out_45_02.png b/rtdata/images/Dark/actions/crossed-arrows-out.png similarity index 100% rename from rtdata/images/Dark/actions/crossed_arrows_out_45_02.png rename to rtdata/images/Dark/actions/crossed-arrows-out.png diff --git a/rtdata/images/Dark/actions/delete.png b/rtdata/images/Dark/actions/delete.png deleted file mode 100644 index bf8832ca1..000000000 Binary files a/rtdata/images/Dark/actions/delete.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/deltags.png b/rtdata/images/Dark/actions/deltags.png deleted file mode 100644 index 6eb643e3b..000000000 Binary files a/rtdata/images/Dark/actions/deltags.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/detail-24.png b/rtdata/images/Dark/actions/detail.png similarity index 100% rename from rtdata/images/Dark/actions/detail-24.png rename to rtdata/images/Dark/actions/detail.png diff --git a/rtdata/images/Dark/actions/distortion_auto.png b/rtdata/images/Dark/actions/distortion-auto.png similarity index 100% rename from rtdata/images/Dark/actions/distortion_auto.png rename to rtdata/images/Dark/actions/distortion-auto.png diff --git a/rtdata/images/Dark/actions/drive-harddisk.png b/rtdata/images/Dark/actions/drive-harddisk.png deleted file mode 100644 index 13895d772..000000000 Binary files a/rtdata/images/Dark/actions/drive-harddisk.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/drive-optical.png b/rtdata/images/Dark/actions/drive-optical.png deleted file mode 100644 index 09babc056..000000000 Binary files a/rtdata/images/Dark/actions/drive-optical.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/drive-removable-media.png b/rtdata/images/Dark/actions/drive-removable-media.png deleted file mode 100644 index 3381c5a9b..000000000 Binary files a/rtdata/images/Dark/actions/drive-removable-media.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/edited_10.png b/rtdata/images/Dark/actions/edited-small.png similarity index 100% rename from rtdata/images/Dark/actions/edited_10.png rename to rtdata/images/Dark/actions/edited-small.png diff --git a/rtdata/images/Dark/actions/editedg_10.png b/rtdata/images/Dark/actions/editedg-small.png similarity index 100% rename from rtdata/images/Dark/actions/editedg_10.png rename to rtdata/images/Dark/actions/editedg-small.png diff --git a/rtdata/images/Dark/actions/editednot_10.png b/rtdata/images/Dark/actions/editednot-small.png similarity index 100% rename from rtdata/images/Dark/actions/editednot_10.png rename to rtdata/images/Dark/actions/editednot-small.png diff --git a/rtdata/images/Dark/actions/editednotg_10.png b/rtdata/images/Dark/actions/editednotg-small.png similarity index 100% rename from rtdata/images/Dark/actions/editednotg_10.png rename to rtdata/images/Dark/actions/editednotg-small.png diff --git a/rtdata/images/Dark/actions/exposure-24.png b/rtdata/images/Dark/actions/exposure.png similarity index 100% rename from rtdata/images/Dark/actions/exposure-24.png rename to rtdata/images/Dark/actions/exposure.png diff --git a/rtdata/images/Dark/actions/filterclear_18.png b/rtdata/images/Dark/actions/filterclear.png similarity index 100% rename from rtdata/images/Dark/actions/filterclear_18.png rename to rtdata/images/Dark/actions/filterclear.png diff --git a/rtdata/images/Dark/actions/folder.png b/rtdata/images/Dark/actions/folder.png deleted file mode 100644 index 66c83e0b3..000000000 Binary files a/rtdata/images/Dark/actions/folder.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/folder_open.png b/rtdata/images/Dark/actions/folder_open.png deleted file mode 100644 index 2aa5559ed..000000000 Binary files a/rtdata/images/Dark/actions/folder_open.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/fullscreen_exit.png b/rtdata/images/Dark/actions/fullscreen-exit.png similarity index 100% rename from rtdata/images/Dark/actions/fullscreen_exit.png rename to rtdata/images/Dark/actions/fullscreen-exit.png diff --git a/rtdata/images/Dark/actions/gtk-cancel.png b/rtdata/images/Dark/actions/gtk-cancel.png index c4e23f6bd..6eb643e3b 100644 Binary files a/rtdata/images/Dark/actions/gtk-cancel.png and b/rtdata/images/Dark/actions/gtk-cancel.png differ diff --git a/rtdata/images/Dark/actions/gtk-cdrom.png b/rtdata/images/Dark/actions/gtk-cdrom.png deleted file mode 100644 index 09babc056..000000000 Binary files a/rtdata/images/Dark/actions/gtk-cdrom.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/x_10.png b/rtdata/images/Dark/actions/gtk-close-small.png similarity index 100% rename from rtdata/images/Dark/actions/x_10.png rename to rtdata/images/Dark/actions/gtk-close-small.png diff --git a/rtdata/images/Dark/actions/wbpicker16.png b/rtdata/images/Dark/actions/gtk-color-picker-small.png similarity index 100% rename from rtdata/images/Dark/actions/wbpicker16.png rename to rtdata/images/Dark/actions/gtk-color-picker-small.png diff --git a/rtdata/images/Dark/actions/wbpicker22.png b/rtdata/images/Dark/actions/gtk-color-picker.png similarity index 100% rename from rtdata/images/Dark/actions/wbpicker22.png rename to rtdata/images/Dark/actions/gtk-color-picker.png diff --git a/rtdata/images/Dark/actions/gtk-directory.png b/rtdata/images/Dark/actions/gtk-directory.png deleted file mode 100644 index 66c83e0b3..000000000 Binary files a/rtdata/images/Dark/actions/gtk-directory.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/save_hdd_01.png b/rtdata/images/Dark/actions/gtk-save-large.png similarity index 100% rename from rtdata/images/Dark/actions/save_hdd_01.png rename to rtdata/images/Dark/actions/gtk-save-large.png diff --git a/rtdata/images/Dark/actions/gimp.png b/rtdata/images/Dark/actions/image-editor.png similarity index 100% rename from rtdata/images/Dark/actions/gimp.png rename to rtdata/images/Dark/actions/image-editor.png diff --git a/rtdata/images/Dark/actions/list-add12.png b/rtdata/images/Dark/actions/list-add-small.png similarity index 100% rename from rtdata/images/Dark/actions/list-add12.png rename to rtdata/images/Dark/actions/list-add-small.png diff --git a/rtdata/images/Dark/actions/list-remove12r.png b/rtdata/images/Dark/actions/list-remove-red-small.png similarity index 100% rename from rtdata/images/Dark/actions/list-remove12r.png rename to rtdata/images/Dark/actions/list-remove-red-small.png diff --git a/rtdata/images/Dark/actions/lock_off.png b/rtdata/images/Dark/actions/lock-off.png similarity index 100% rename from rtdata/images/Dark/actions/lock_off.png rename to rtdata/images/Dark/actions/lock-off.png diff --git a/rtdata/images/Dark/actions/lock_on.png b/rtdata/images/Dark/actions/lock-on.png similarity index 100% rename from rtdata/images/Dark/actions/lock_on.png rename to rtdata/images/Dark/actions/lock-on.png diff --git a/rtdata/images/Dark/actions/media-flash.png b/rtdata/images/Dark/actions/media-flash.png deleted file mode 100644 index 13895d772..000000000 Binary files a/rtdata/images/Dark/actions/media-flash.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/media-floppy.png b/rtdata/images/Dark/actions/media-floppy.png deleted file mode 100644 index 3381c5a9b..000000000 Binary files a/rtdata/images/Dark/actions/media-floppy.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/media-optical-bd.png b/rtdata/images/Dark/actions/media-optical-bd.png deleted file mode 100644 index 09babc056..000000000 Binary files a/rtdata/images/Dark/actions/media-optical-bd.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/media-optical-dvd.png b/rtdata/images/Dark/actions/media-optical-dvd.png deleted file mode 100644 index 09babc056..000000000 Binary files a/rtdata/images/Dark/actions/media-optical-dvd.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/media-optical.png b/rtdata/images/Dark/actions/media-optical.png deleted file mode 100644 index 09babc056..000000000 Binary files a/rtdata/images/Dark/actions/media-optical.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/media-tape.png b/rtdata/images/Dark/actions/media-tape.png deleted file mode 100644 index 13895d772..000000000 Binary files a/rtdata/images/Dark/actions/media-tape.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/media-usb.png b/rtdata/images/Dark/actions/media-usb.png new file mode 100644 index 000000000..a9891cbfd Binary files /dev/null and b/rtdata/images/Dark/actions/media-usb.png differ diff --git a/rtdata/images/Dark/actions/exif-24.png b/rtdata/images/Dark/actions/meta.png similarity index 100% rename from rtdata/images/Dark/actions/exif-24.png rename to rtdata/images/Dark/actions/meta.png diff --git a/rtdata/images/Dark/actions/new_detail_window.png b/rtdata/images/Dark/actions/new-detail-window.png similarity index 100% rename from rtdata/images/Dark/actions/new_detail_window.png rename to rtdata/images/Dark/actions/new-detail-window.png diff --git a/rtdata/images/Dark/actions/openhand_gray22.png b/rtdata/images/Dark/actions/openhand.png similarity index 100% rename from rtdata/images/Dark/actions/openhand_gray22.png rename to rtdata/images/Dark/actions/openhand.png diff --git a/rtdata/images/Dark/actions/panel_to_bottom.png b/rtdata/images/Dark/actions/panel-to-bottom.png similarity index 100% rename from rtdata/images/Dark/actions/panel_to_bottom.png rename to rtdata/images/Dark/actions/panel-to-bottom.png diff --git a/rtdata/images/Dark/actions/panel_to_left.png b/rtdata/images/Dark/actions/panel-to-left.png similarity index 100% rename from rtdata/images/Dark/actions/panel_to_left.png rename to rtdata/images/Dark/actions/panel-to-left.png diff --git a/rtdata/images/Dark/actions/panel_to_right.png b/rtdata/images/Dark/actions/panel-to-right.png similarity index 100% rename from rtdata/images/Dark/actions/panel_to_right.png rename to rtdata/images/Dark/actions/panel-to-right.png diff --git a/rtdata/images/Dark/actions/panel_to_top.png b/rtdata/images/Dark/actions/panel-to-top.png similarity index 100% rename from rtdata/images/Dark/actions/panel_to_top.png rename to rtdata/images/Dark/actions/panel-to-top.png diff --git a/rtdata/images/Dark/actions/popuparrow.png b/rtdata/images/Dark/actions/popuparrow.png new file mode 100644 index 000000000..118ddef79 Binary files /dev/null and b/rtdata/images/Dark/actions/popuparrow.png differ diff --git a/rtdata/images/Dark/actions/ratednot_10.png b/rtdata/images/Dark/actions/ratednot.png similarity index 100% rename from rtdata/images/Dark/actions/ratednot_10.png rename to rtdata/images/Dark/actions/ratednot.png diff --git a/rtdata/images/Dark/actions/ratednotg_10.png b/rtdata/images/Dark/actions/ratednotg.png similarity index 100% rename from rtdata/images/Dark/actions/ratednotg_10.png rename to rtdata/images/Dark/actions/ratednotg.png diff --git a/rtdata/images/Dark/actions/raw-24.png b/rtdata/images/Dark/actions/raw.png similarity index 100% rename from rtdata/images/Dark/actions/raw-24.png rename to rtdata/images/Dark/actions/raw.png diff --git a/rtdata/images/Dark/actions/refresh_red.png b/rtdata/images/Dark/actions/refresh-red.png similarity index 100% rename from rtdata/images/Dark/actions/refresh_red.png rename to rtdata/images/Dark/actions/refresh-red.png diff --git a/rtdata/images/Dark/actions/refresh_white.png b/rtdata/images/Dark/actions/refresh-white.png similarity index 100% rename from rtdata/images/Dark/actions/refresh_white.png rename to rtdata/images/Dark/actions/refresh-white.png diff --git a/rtdata/images/Dark/actions/stock-flip-horizontal-16.png b/rtdata/images/Dark/actions/stock-flip-horizontal.png similarity index 100% rename from rtdata/images/Dark/actions/stock-flip-horizontal-16.png rename to rtdata/images/Dark/actions/stock-flip-horizontal.png diff --git a/rtdata/images/Dark/actions/stock-flip-vertical-16.png b/rtdata/images/Dark/actions/stock-flip-vertical.png similarity index 100% rename from rtdata/images/Dark/actions/stock-flip-vertical-16.png rename to rtdata/images/Dark/actions/stock-flip-vertical.png diff --git a/rtdata/images/Dark/actions/stock-rotate-270-16.png b/rtdata/images/Dark/actions/stock-rotate-270.png similarity index 100% rename from rtdata/images/Dark/actions/stock-rotate-270-16.png rename to rtdata/images/Dark/actions/stock-rotate-270.png diff --git a/rtdata/images/Dark/actions/stock-rotate-90-16.png b/rtdata/images/Dark/actions/stock-rotate-90.png similarity index 100% rename from rtdata/images/Dark/actions/stock-rotate-90-16.png rename to rtdata/images/Dark/actions/stock-rotate-90.png diff --git a/rtdata/images/Dark/actions/straighten16.png b/rtdata/images/Dark/actions/straighten-small.png similarity index 100% rename from rtdata/images/Dark/actions/straighten16.png rename to rtdata/images/Dark/actions/straighten-small.png diff --git a/rtdata/images/Dark/actions/straighten22.png b/rtdata/images/Dark/actions/straighten.png similarity index 100% rename from rtdata/images/Dark/actions/straighten22.png rename to rtdata/images/Dark/actions/straighten.png diff --git a/rtdata/images/Dark/actions/transform-24.png b/rtdata/images/Dark/actions/transform.png similarity index 100% rename from rtdata/images/Dark/actions/transform-24.png rename to rtdata/images/Dark/actions/transform.png diff --git a/rtdata/images/Dark/actions/user-desktop.png b/rtdata/images/Dark/actions/user-desktop.png deleted file mode 100644 index 4b3e7ab6d..000000000 Binary files a/rtdata/images/Dark/actions/user-desktop.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/user-home.png b/rtdata/images/Dark/actions/user-home.png deleted file mode 100644 index 8e1e020be..000000000 Binary files a/rtdata/images/Dark/actions/user-home.png and /dev/null differ diff --git a/rtdata/images/Dark/actions/wbpicker16_test.png b/rtdata/images/Dark/actions/wbpicker16_test.png deleted file mode 100644 index ef82380be..000000000 Binary files a/rtdata/images/Dark/actions/wbpicker16_test.png and /dev/null differ diff --git a/rtdata/images/Light/actions/PanelEnding_01.png b/rtdata/images/Light/actions/PanelEnding.png similarity index 100% rename from rtdata/images/Light/actions/PanelEnding_01.png rename to rtdata/images/Light/actions/PanelEnding.png diff --git a/rtdata/images/Light/actions/add.png b/rtdata/images/Light/actions/add.png deleted file mode 100644 index 8ab0fa042..000000000 Binary files a/rtdata/images/Light/actions/add.png and /dev/null differ diff --git a/rtdata/images/Light/actions/addtag.png b/rtdata/images/Light/actions/addtag.png deleted file mode 100644 index 9dc30c0c0..000000000 Binary files a/rtdata/images/Light/actions/addtag.png and /dev/null differ diff --git a/rtdata/images/Light/actions/addtags.png b/rtdata/images/Light/actions/addtags.png deleted file mode 100644 index 02f1e1620..000000000 Binary files a/rtdata/images/Light/actions/addtags.png and /dev/null differ diff --git a/rtdata/images/Light/actions/closedhand22.png b/rtdata/images/Light/actions/closedhand.png similarity index 100% rename from rtdata/images/Light/actions/closedhand22.png rename to rtdata/images/Light/actions/closedhand.png diff --git a/rtdata/images/Light/actions/colour-24.png b/rtdata/images/Light/actions/colour-24.png deleted file mode 100644 index 032dcff5a..000000000 Binary files a/rtdata/images/Light/actions/colour-24.png and /dev/null differ diff --git a/rtdata/images/Light/actions/colour.png b/rtdata/images/Light/actions/colour.png new file mode 100644 index 000000000..0217886e7 Binary files /dev/null and b/rtdata/images/Light/actions/colour.png differ diff --git a/rtdata/images/Light/actions/computer.png b/rtdata/images/Light/actions/computer.png deleted file mode 100644 index 45589ad74..000000000 Binary files a/rtdata/images/Light/actions/computer.png and /dev/null differ diff --git a/rtdata/images/Light/actions/crop_auto_22.png b/rtdata/images/Light/actions/crop-auto.png similarity index 100% rename from rtdata/images/Light/actions/crop_auto_22.png rename to rtdata/images/Light/actions/crop-auto.png diff --git a/rtdata/images/Light/actions/crop22.png b/rtdata/images/Light/actions/crop.png similarity index 100% rename from rtdata/images/Light/actions/crop22.png rename to rtdata/images/Light/actions/crop.png diff --git a/rtdata/images/Light/actions/crossed_arrows_in_45_02.png b/rtdata/images/Light/actions/crossed-arrows-in.png similarity index 100% rename from rtdata/images/Light/actions/crossed_arrows_in_45_02.png rename to rtdata/images/Light/actions/crossed-arrows-in.png diff --git a/rtdata/images/Light/actions/crossed_arrows_out_45_02.png b/rtdata/images/Light/actions/crossed-arrows-out.png similarity index 100% rename from rtdata/images/Light/actions/crossed_arrows_out_45_02.png rename to rtdata/images/Light/actions/crossed-arrows-out.png diff --git a/rtdata/images/Light/actions/delete.png b/rtdata/images/Light/actions/delete.png deleted file mode 100644 index f02585013..000000000 Binary files a/rtdata/images/Light/actions/delete.png and /dev/null differ diff --git a/rtdata/images/Light/actions/deltags.png b/rtdata/images/Light/actions/deltags.png deleted file mode 100644 index 39b1aada8..000000000 Binary files a/rtdata/images/Light/actions/deltags.png and /dev/null differ diff --git a/rtdata/images/Light/actions/detail-24.png b/rtdata/images/Light/actions/detail.png similarity index 100% rename from rtdata/images/Light/actions/detail-24.png rename to rtdata/images/Light/actions/detail.png diff --git a/rtdata/images/Light/actions/distortion_auto.png b/rtdata/images/Light/actions/distortion-auto.png similarity index 100% rename from rtdata/images/Light/actions/distortion_auto.png rename to rtdata/images/Light/actions/distortion-auto.png diff --git a/rtdata/images/Light/actions/drive-harddisk.png b/rtdata/images/Light/actions/drive-harddisk.png deleted file mode 100644 index 45589ad74..000000000 Binary files a/rtdata/images/Light/actions/drive-harddisk.png and /dev/null differ diff --git a/rtdata/images/Light/actions/drive-optical.png b/rtdata/images/Light/actions/drive-optical.png deleted file mode 100644 index c0f68bcb6..000000000 Binary files a/rtdata/images/Light/actions/drive-optical.png and /dev/null differ diff --git a/rtdata/images/Light/actions/drive-removable-media.png b/rtdata/images/Light/actions/drive-removable-media.png deleted file mode 100644 index 6ce1d20ae..000000000 Binary files a/rtdata/images/Light/actions/drive-removable-media.png and /dev/null differ diff --git a/rtdata/images/Light/actions/edited_10.png b/rtdata/images/Light/actions/edited-small.png similarity index 100% rename from rtdata/images/Light/actions/edited_10.png rename to rtdata/images/Light/actions/edited-small.png diff --git a/rtdata/images/Light/actions/editedg_10.png b/rtdata/images/Light/actions/editedg-small.png similarity index 100% rename from rtdata/images/Light/actions/editedg_10.png rename to rtdata/images/Light/actions/editedg-small.png diff --git a/rtdata/images/Light/actions/editednot_10.png b/rtdata/images/Light/actions/editednot-small.png similarity index 100% rename from rtdata/images/Light/actions/editednot_10.png rename to rtdata/images/Light/actions/editednot-small.png diff --git a/rtdata/images/Light/actions/editednotg_10.png b/rtdata/images/Light/actions/editednotg-small.png similarity index 100% rename from rtdata/images/Light/actions/editednotg_10.png rename to rtdata/images/Light/actions/editednotg-small.png diff --git a/rtdata/images/Light/actions/exposure-24.png b/rtdata/images/Light/actions/exposure.png similarity index 100% rename from rtdata/images/Light/actions/exposure-24.png rename to rtdata/images/Light/actions/exposure.png diff --git a/rtdata/images/Light/actions/filterclear_18.png b/rtdata/images/Light/actions/filterclear.png similarity index 100% rename from rtdata/images/Light/actions/filterclear_18.png rename to rtdata/images/Light/actions/filterclear.png diff --git a/rtdata/images/Light/actions/folder.png b/rtdata/images/Light/actions/folder.png deleted file mode 100644 index ad31e8d1d..000000000 Binary files a/rtdata/images/Light/actions/folder.png and /dev/null differ diff --git a/rtdata/images/Light/actions/folder_open.png b/rtdata/images/Light/actions/folder_open.png deleted file mode 100644 index 0fa283169..000000000 Binary files a/rtdata/images/Light/actions/folder_open.png and /dev/null differ diff --git a/rtdata/images/Light/actions/fullscreen_exit.png b/rtdata/images/Light/actions/fullscreen-exit.png similarity index 100% rename from rtdata/images/Light/actions/fullscreen_exit.png rename to rtdata/images/Light/actions/fullscreen-exit.png diff --git a/rtdata/images/Light/actions/gtk-cancel.png b/rtdata/images/Light/actions/gtk-cancel.png index 6e785110c..39b1aada8 100644 Binary files a/rtdata/images/Light/actions/gtk-cancel.png and b/rtdata/images/Light/actions/gtk-cancel.png differ diff --git a/rtdata/images/Light/actions/gtk-cdrom.png b/rtdata/images/Light/actions/gtk-cdrom.png deleted file mode 100644 index c0f68bcb6..000000000 Binary files a/rtdata/images/Light/actions/gtk-cdrom.png and /dev/null differ diff --git a/rtdata/images/Light/actions/x_10.png b/rtdata/images/Light/actions/gtk-close-small.png similarity index 100% rename from rtdata/images/Light/actions/x_10.png rename to rtdata/images/Light/actions/gtk-close-small.png diff --git a/rtdata/images/Light/actions/wbpicker16.png b/rtdata/images/Light/actions/gtk-color-picker-small.png similarity index 100% rename from rtdata/images/Light/actions/wbpicker16.png rename to rtdata/images/Light/actions/gtk-color-picker-small.png diff --git a/rtdata/images/Light/actions/wbpicker22.png b/rtdata/images/Light/actions/gtk-color-picker.png similarity index 100% rename from rtdata/images/Light/actions/wbpicker22.png rename to rtdata/images/Light/actions/gtk-color-picker.png diff --git a/rtdata/images/Light/actions/gtk-directory.png b/rtdata/images/Light/actions/gtk-directory.png deleted file mode 100644 index ad31e8d1d..000000000 Binary files a/rtdata/images/Light/actions/gtk-directory.png and /dev/null differ diff --git a/rtdata/images/Light/actions/save_hdd_01.png b/rtdata/images/Light/actions/gtk-save-large.png similarity index 100% rename from rtdata/images/Light/actions/save_hdd_01.png rename to rtdata/images/Light/actions/gtk-save-large.png diff --git a/rtdata/images/Light/actions/gimp.png b/rtdata/images/Light/actions/image-editor.png similarity index 100% rename from rtdata/images/Light/actions/gimp.png rename to rtdata/images/Light/actions/image-editor.png diff --git a/rtdata/images/Light/actions/list-add12.png b/rtdata/images/Light/actions/list-add-small.png similarity index 100% rename from rtdata/images/Light/actions/list-add12.png rename to rtdata/images/Light/actions/list-add-small.png diff --git a/rtdata/images/Light/actions/list-remove12r.png b/rtdata/images/Light/actions/list-remove-red-small.png similarity index 100% rename from rtdata/images/Light/actions/list-remove12r.png rename to rtdata/images/Light/actions/list-remove-red-small.png diff --git a/rtdata/images/Light/actions/lock_off.png b/rtdata/images/Light/actions/lock-off.png similarity index 100% rename from rtdata/images/Light/actions/lock_off.png rename to rtdata/images/Light/actions/lock-off.png diff --git a/rtdata/images/Light/actions/lock_on.png b/rtdata/images/Light/actions/lock-on.png similarity index 100% rename from rtdata/images/Light/actions/lock_on.png rename to rtdata/images/Light/actions/lock-on.png diff --git a/rtdata/images/Light/actions/media-flash.png b/rtdata/images/Light/actions/media-flash.png deleted file mode 100644 index 45589ad74..000000000 Binary files a/rtdata/images/Light/actions/media-flash.png and /dev/null differ diff --git a/rtdata/images/Light/actions/media-floppy.png b/rtdata/images/Light/actions/media-floppy.png deleted file mode 100644 index 6ce1d20ae..000000000 Binary files a/rtdata/images/Light/actions/media-floppy.png and /dev/null differ diff --git a/rtdata/images/Light/actions/media-optical-bd.png b/rtdata/images/Light/actions/media-optical-bd.png deleted file mode 100644 index c0f68bcb6..000000000 Binary files a/rtdata/images/Light/actions/media-optical-bd.png and /dev/null differ diff --git a/rtdata/images/Light/actions/media-optical-dvd.png b/rtdata/images/Light/actions/media-optical-dvd.png deleted file mode 100644 index c0f68bcb6..000000000 Binary files a/rtdata/images/Light/actions/media-optical-dvd.png and /dev/null differ diff --git a/rtdata/images/Light/actions/media-optical.png b/rtdata/images/Light/actions/media-optical.png deleted file mode 100644 index c0f68bcb6..000000000 Binary files a/rtdata/images/Light/actions/media-optical.png and /dev/null differ diff --git a/rtdata/images/Light/actions/media-tape.png b/rtdata/images/Light/actions/media-tape.png deleted file mode 100644 index 45589ad74..000000000 Binary files a/rtdata/images/Light/actions/media-tape.png and /dev/null differ diff --git a/rtdata/images/Light/actions/media-usb.png b/rtdata/images/Light/actions/media-usb.png new file mode 100644 index 000000000..f321e5e13 Binary files /dev/null and b/rtdata/images/Light/actions/media-usb.png differ diff --git a/rtdata/images/Light/actions/exif-24.png b/rtdata/images/Light/actions/meta.png similarity index 100% rename from rtdata/images/Light/actions/exif-24.png rename to rtdata/images/Light/actions/meta.png diff --git a/rtdata/images/Light/actions/new_detail_window.png b/rtdata/images/Light/actions/new-detail-window.png similarity index 100% rename from rtdata/images/Light/actions/new_detail_window.png rename to rtdata/images/Light/actions/new-detail-window.png diff --git a/rtdata/images/Light/actions/openhand_gray22.png b/rtdata/images/Light/actions/openhand.png similarity index 100% rename from rtdata/images/Light/actions/openhand_gray22.png rename to rtdata/images/Light/actions/openhand.png diff --git a/rtdata/images/Light/actions/panel_to_bottom.png b/rtdata/images/Light/actions/panel-to-bottom.png similarity index 100% rename from rtdata/images/Light/actions/panel_to_bottom.png rename to rtdata/images/Light/actions/panel-to-bottom.png diff --git a/rtdata/images/Light/actions/panel_to_left.png b/rtdata/images/Light/actions/panel-to-left.png similarity index 100% rename from rtdata/images/Light/actions/panel_to_left.png rename to rtdata/images/Light/actions/panel-to-left.png diff --git a/rtdata/images/Light/actions/panel_to_right.png b/rtdata/images/Light/actions/panel-to-right.png similarity index 100% rename from rtdata/images/Light/actions/panel_to_right.png rename to rtdata/images/Light/actions/panel-to-right.png diff --git a/rtdata/images/Light/actions/panel_to_top.png b/rtdata/images/Light/actions/panel-to-top.png similarity index 100% rename from rtdata/images/Light/actions/panel_to_top.png rename to rtdata/images/Light/actions/panel-to-top.png diff --git a/rtdata/images/Light/actions/popuparrow.png b/rtdata/images/Light/actions/popuparrow.png new file mode 100644 index 000000000..376eb2312 Binary files /dev/null and b/rtdata/images/Light/actions/popuparrow.png differ diff --git a/rtdata/images/Light/actions/ratednot_10.png b/rtdata/images/Light/actions/ratednot.png similarity index 100% rename from rtdata/images/Light/actions/ratednot_10.png rename to rtdata/images/Light/actions/ratednot.png diff --git a/rtdata/images/Light/actions/ratednotg_10.png b/rtdata/images/Light/actions/ratednotg.png similarity index 100% rename from rtdata/images/Light/actions/ratednotg_10.png rename to rtdata/images/Light/actions/ratednotg.png diff --git a/rtdata/images/Light/actions/raw-24.png b/rtdata/images/Light/actions/raw.png similarity index 100% rename from rtdata/images/Light/actions/raw-24.png rename to rtdata/images/Light/actions/raw.png diff --git a/rtdata/images/Light/actions/refresh_red.png b/rtdata/images/Light/actions/refresh-red.png similarity index 100% rename from rtdata/images/Light/actions/refresh_red.png rename to rtdata/images/Light/actions/refresh-red.png diff --git a/rtdata/images/Light/actions/refresh_white.png b/rtdata/images/Light/actions/refresh-white.png similarity index 100% rename from rtdata/images/Light/actions/refresh_white.png rename to rtdata/images/Light/actions/refresh-white.png diff --git a/rtdata/images/Light/actions/stock-flip-horizontal-16.png b/rtdata/images/Light/actions/stock-flip-horizontal.png similarity index 100% rename from rtdata/images/Light/actions/stock-flip-horizontal-16.png rename to rtdata/images/Light/actions/stock-flip-horizontal.png diff --git a/rtdata/images/Light/actions/stock-flip-vertical-16.png b/rtdata/images/Light/actions/stock-flip-vertical.png similarity index 100% rename from rtdata/images/Light/actions/stock-flip-vertical-16.png rename to rtdata/images/Light/actions/stock-flip-vertical.png diff --git a/rtdata/images/Light/actions/stock-rotate-270-16.png b/rtdata/images/Light/actions/stock-rotate-270.png similarity index 100% rename from rtdata/images/Light/actions/stock-rotate-270-16.png rename to rtdata/images/Light/actions/stock-rotate-270.png diff --git a/rtdata/images/Light/actions/stock-rotate-90-16.png b/rtdata/images/Light/actions/stock-rotate-90.png similarity index 100% rename from rtdata/images/Light/actions/stock-rotate-90-16.png rename to rtdata/images/Light/actions/stock-rotate-90.png diff --git a/rtdata/images/Light/actions/straighten16.png b/rtdata/images/Light/actions/straighten-small.png similarity index 100% rename from rtdata/images/Light/actions/straighten16.png rename to rtdata/images/Light/actions/straighten-small.png diff --git a/rtdata/images/Light/actions/straighten22.png b/rtdata/images/Light/actions/straighten.png similarity index 100% rename from rtdata/images/Light/actions/straighten22.png rename to rtdata/images/Light/actions/straighten.png diff --git a/rtdata/images/Light/actions/transform-24.png b/rtdata/images/Light/actions/transform.png similarity index 100% rename from rtdata/images/Light/actions/transform-24.png rename to rtdata/images/Light/actions/transform.png diff --git a/rtdata/images/Light/actions/user-desktop.png b/rtdata/images/Light/actions/user-desktop.png deleted file mode 100644 index a1f604de2..000000000 Binary files a/rtdata/images/Light/actions/user-desktop.png and /dev/null differ diff --git a/rtdata/images/Light/actions/user-home.png b/rtdata/images/Light/actions/user-home.png deleted file mode 100644 index c4578b776..000000000 Binary files a/rtdata/images/Light/actions/user-home.png and /dev/null differ diff --git a/rtdata/images/Light/actions/wbpicker16_test.png b/rtdata/images/Light/actions/wbpicker16_test.png deleted file mode 100644 index 2b3048bd3..000000000 Binary files a/rtdata/images/Light/actions/wbpicker16_test.png and /dev/null differ diff --git a/rtdata/images/PanelEnding_01.png b/rtdata/images/PanelEnding.png similarity index 100% rename from rtdata/images/PanelEnding_01.png rename to rtdata/images/PanelEnding.png diff --git a/rtdata/images/addtagl.png b/rtdata/images/addtagl.png deleted file mode 100644 index b8520b7d8..000000000 Binary files a/rtdata/images/addtagl.png and /dev/null differ diff --git a/rtdata/images/cdrom.png b/rtdata/images/cdrom.png deleted file mode 100644 index d27facd69..000000000 Binary files a/rtdata/images/cdrom.png and /dev/null differ diff --git a/rtdata/images/closedhand22.png b/rtdata/images/closedhand.png similarity index 100% rename from rtdata/images/closedhand22.png rename to rtdata/images/closedhand.png diff --git a/rtdata/images/colour-24.png b/rtdata/images/colour.png similarity index 100% rename from rtdata/images/colour-24.png rename to rtdata/images/colour.png diff --git a/rtdata/images/crop_auto_22.png b/rtdata/images/crop-auto.png similarity index 100% rename from rtdata/images/crop_auto_22.png rename to rtdata/images/crop-auto.png diff --git a/rtdata/images/crop22.png b/rtdata/images/crop.png similarity index 100% rename from rtdata/images/crop22.png rename to rtdata/images/crop.png diff --git a/rtdata/images/crop16.png b/rtdata/images/crop16.png deleted file mode 100644 index 5184119c8..000000000 Binary files a/rtdata/images/crop16.png and /dev/null differ diff --git a/rtdata/images/cross22.png b/rtdata/images/cross.png similarity index 100% rename from rtdata/images/cross22.png rename to rtdata/images/cross.png diff --git a/rtdata/images/crossed_arrows_out_45_02.png b/rtdata/images/crossed-arrows-out.png similarity index 100% rename from rtdata/images/crossed_arrows_out_45_02.png rename to rtdata/images/crossed-arrows-out.png diff --git a/rtdata/images/deltagl.png b/rtdata/images/deltagl.png deleted file mode 100644 index 694043073..000000000 Binary files a/rtdata/images/deltagl.png and /dev/null differ diff --git a/rtdata/images/deltags.png b/rtdata/images/deltags.png deleted file mode 100644 index 4a6d480ed..000000000 Binary files a/rtdata/images/deltags.png and /dev/null differ diff --git a/rtdata/images/deltags.pp2 b/rtdata/images/deltags.pp2 deleted file mode 100644 index f9dbf95df..000000000 --- a/rtdata/images/deltags.pp2 +++ /dev/null @@ -1,124 +0,0 @@ - -[Version] -Version=231 - -[Exposure] -Auto=false -Clip=0.002 -Compensation=0 -Brightness=0 -Contrast=0 -Black=0 -HighlightCompr=85 -ShadowCompr=85 -Curve= - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Luminance Curve] -Brightness=0 -Contrast=0 -Black=0 -HighlightCompr=0 -ShadowCompr=0 -Curve= - -[Sharpening] -Enabled=true -Method=usm -Radius=1 -Amount=90 -Threshold=768 -OnlyEdges=false -EdgedetectionRadius=3 -EdgeTolerance=1000 -HalocontrolEnabled=false -HalocontrolAmount=85 -DeconvRadius=0.75 -DeconvAmount=75 -DeconvDamping=20 -DeconvIterations=30 - -[Color Boost] -ChannelA=0 -ChannelB=0 -AvoidColorClipping=false -SaturationLimiter=false -SaturationLimit=50 - -[White Balance] -Setting=Camera -Temperature=6504 -Green=1.0009615390996527 - -[Color Shift] -ChannelA=0 -ChannelB=0 - -[Luminance Denoising] -Enabled=false -Radius=1.8999999999999999 -EdgeTolerance=2000 - -[Chrominance Denoising] -Enabled=false -EdgeSensitive=false -Radius=1.8999999999999999 -EdgeTolerance=2000 - -[Shadows & Highlights] -Enabled=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=15 -Radius=40 - -[Crop] -Enabled=false -X=-1 -Y=-1 -W=15000 -H=15000 -FixedRatio=false -Ratio=3:2 -Orientation=Landscape -Guide=None - -[Coarse Transformation] -Rotate=0 -HorizontalFlip=false -VerticalFlip=false - -[Rotation] -Degree=0 -Fill=1 - -[Distortion] -Amount=0 - -[CACorrection] -Red=0 -Blue=0 - -[Vignetting Correction] -Amount=0 -Radius=50 - -[HLRecovery] -Enabled=false -Method=Luminance - -[Resize] -Scale=1 -Method=Bicubic - -[Color Management] -InputProfile= -ApplyGammaBeforeInputProfile=false -WorkingProfile=sRGB -OutputProfile=sRGB diff --git a/rtdata/images/detail-24.png b/rtdata/images/detail.png similarity index 100% rename from rtdata/images/detail-24.png rename to rtdata/images/detail.png diff --git a/rtdata/images/distortion_auto.png b/rtdata/images/distortion-auto.png similarity index 100% rename from rtdata/images/distortion_auto.png rename to rtdata/images/distortion-auto.png diff --git a/rtdata/images/down.png b/rtdata/images/down.png deleted file mode 100644 index 61be34066..000000000 Binary files a/rtdata/images/down.png and /dev/null differ diff --git a/rtdata/images/edited_10.png b/rtdata/images/edited-small.png similarity index 100% rename from rtdata/images/edited_10.png rename to rtdata/images/edited-small.png diff --git a/rtdata/images/editedg_10.png b/rtdata/images/editedg-small.png similarity index 100% rename from rtdata/images/editedg_10.png rename to rtdata/images/editedg-small.png diff --git a/rtdata/images/editednot_10.png b/rtdata/images/editednot-small.png similarity index 100% rename from rtdata/images/editednot_10.png rename to rtdata/images/editednot-small.png diff --git a/rtdata/images/editednotg_10.png b/rtdata/images/editednotg-small.png similarity index 100% rename from rtdata/images/editednotg_10.png rename to rtdata/images/editednotg-small.png diff --git a/rtdata/images/exposure-24.png b/rtdata/images/exposure.png similarity index 100% rename from rtdata/images/exposure-24.png rename to rtdata/images/exposure.png diff --git a/rtdata/images/fileopen.png b/rtdata/images/fileopen.png deleted file mode 100644 index dad846ba0..000000000 Binary files a/rtdata/images/fileopen.png and /dev/null differ diff --git a/rtdata/images/filesave.png b/rtdata/images/filesave.png deleted file mode 100644 index 3eec2240c..000000000 Binary files a/rtdata/images/filesave.png and /dev/null differ diff --git a/rtdata/images/filter.png b/rtdata/images/filter.png index d21c939a9..cc2fdbd58 100644 Binary files a/rtdata/images/filter.png and b/rtdata/images/filter.png differ diff --git a/rtdata/images/filterclear_18.png b/rtdata/images/filterclear_18.png deleted file mode 100644 index 98b81b9b5..000000000 Binary files a/rtdata/images/filterclear_18.png and /dev/null differ diff --git a/rtdata/images/filterclearg_18.png b/rtdata/images/filterclearg_18.png deleted file mode 100644 index cc2fdbd58..000000000 Binary files a/rtdata/images/filterclearg_18.png and /dev/null differ diff --git a/rtdata/images/flame22.png b/rtdata/images/flame22.png deleted file mode 100644 index a1029fc86..000000000 Binary files a/rtdata/images/flame22.png and /dev/null differ diff --git a/rtdata/images/floppy.png b/rtdata/images/floppy.png deleted file mode 100644 index a54bd6128..000000000 Binary files a/rtdata/images/floppy.png and /dev/null differ diff --git a/rtdata/images/folder_bw.png b/rtdata/images/folder_bw.png deleted file mode 100644 index 102f9fa1a..000000000 Binary files a/rtdata/images/folder_bw.png and /dev/null differ diff --git a/rtdata/images/folder_open_r.png b/rtdata/images/folder_open_r.png deleted file mode 100644 index 9e523b696..000000000 Binary files a/rtdata/images/folder_open_r.png and /dev/null differ diff --git a/rtdata/images/folder_orange.png b/rtdata/images/folder_orange.png deleted file mode 100644 index db12f5cfb..000000000 Binary files a/rtdata/images/folder_orange.png and /dev/null differ diff --git a/rtdata/images/folder_orange_open.png b/rtdata/images/folder_orange_open.png deleted file mode 100644 index bc2086890..000000000 Binary files a/rtdata/images/folder_orange_open.png and /dev/null differ diff --git a/rtdata/images/folder_r.png b/rtdata/images/folder_r.png deleted file mode 100644 index 3f7d2a6aa..000000000 Binary files a/rtdata/images/folder_r.png and /dev/null differ diff --git a/rtdata/images/fullscreen_exit.png b/rtdata/images/fullscreen-exit.png similarity index 100% rename from rtdata/images/fullscreen_exit.png rename to rtdata/images/fullscreen-exit.png diff --git a/rtdata/images/green.png b/rtdata/images/green.png deleted file mode 100644 index baad6202c..000000000 Binary files a/rtdata/images/green.png and /dev/null differ diff --git a/rtdata/images/add.png b/rtdata/images/gtk-add.png similarity index 100% rename from rtdata/images/add.png rename to rtdata/images/gtk-add.png diff --git a/rtdata/images/addtags.png b/rtdata/images/gtk-apply.png similarity index 100% rename from rtdata/images/addtags.png rename to rtdata/images/gtk-apply.png diff --git a/rtdata/images/x_10.png b/rtdata/images/gtk-close-small.png similarity index 100% rename from rtdata/images/x_10.png rename to rtdata/images/gtk-close-small.png diff --git a/rtdata/images/wbpicker16.png b/rtdata/images/gtk-color-picker-small.png similarity index 100% rename from rtdata/images/wbpicker16.png rename to rtdata/images/gtk-color-picker-small.png diff --git a/rtdata/images/wbpicker22.png b/rtdata/images/gtk-color-picker.png similarity index 100% rename from rtdata/images/wbpicker22.png rename to rtdata/images/gtk-color-picker.png diff --git a/rtdata/images/folder_open.png b/rtdata/images/gtk-open.png similarity index 100% rename from rtdata/images/folder_open.png rename to rtdata/images/gtk-open.png diff --git a/rtdata/images/save_hdd_01.png b/rtdata/images/gtk-save-large.png similarity index 100% rename from rtdata/images/save_hdd_01.png rename to rtdata/images/gtk-save-large.png diff --git a/rtdata/images/gtk-undoall-ltr-big.png b/rtdata/images/gtk-undoall-ltr-big.png deleted file mode 100644 index 68545f6b1..000000000 Binary files a/rtdata/images/gtk-undoall-ltr-big.png and /dev/null differ diff --git a/rtdata/images/gtk-undoall-rtl-big.png b/rtdata/images/gtk-undoall-rtl-big.png deleted file mode 100644 index 18db3e80e..000000000 Binary files a/rtdata/images/gtk-undoall-rtl-big.png and /dev/null differ diff --git a/rtdata/images/hdd.png b/rtdata/images/hdd.png deleted file mode 100644 index decc5f350..000000000 Binary files a/rtdata/images/hdd.png and /dev/null differ diff --git a/rtdata/images/head.png b/rtdata/images/head.png deleted file mode 100644 index 29b5b934a..000000000 Binary files a/rtdata/images/head.png and /dev/null differ diff --git a/rtdata/images/horizontal.png b/rtdata/images/horizontal.png deleted file mode 100644 index 7f6512f6b..000000000 Binary files a/rtdata/images/horizontal.png and /dev/null differ diff --git a/rtdata/images/horizontals.png b/rtdata/images/horizontals.png deleted file mode 100644 index 25aadb8b8..000000000 Binary files a/rtdata/images/horizontals.png and /dev/null differ diff --git a/rtdata/images/icon-gears.png b/rtdata/images/icon-gears.png deleted file mode 100644 index 0d39b4b3f..000000000 Binary files a/rtdata/images/icon-gears.png and /dev/null differ diff --git a/rtdata/images/gimp.png b/rtdata/images/image-editor.png similarity index 100% rename from rtdata/images/gimp.png rename to rtdata/images/image-editor.png diff --git a/rtdata/images/left.png b/rtdata/images/left.png deleted file mode 100644 index 0a6571ae0..000000000 Binary files a/rtdata/images/left.png and /dev/null differ diff --git a/rtdata/images/list-add12.png b/rtdata/images/list-add-small.png similarity index 100% rename from rtdata/images/list-add12.png rename to rtdata/images/list-add-small.png diff --git a/rtdata/images/list-add.png b/rtdata/images/list-add.png deleted file mode 100644 index 1aa7f095c..000000000 Binary files a/rtdata/images/list-add.png and /dev/null differ diff --git a/rtdata/images/list-remove12r.png b/rtdata/images/list-remove-red-small.png similarity index 100% rename from rtdata/images/list-remove12r.png rename to rtdata/images/list-remove-red-small.png diff --git a/rtdata/images/lock_off.png b/rtdata/images/lock-off.png similarity index 100% rename from rtdata/images/lock_off.png rename to rtdata/images/lock-off.png diff --git a/rtdata/images/lock_on.png b/rtdata/images/lock-on.png similarity index 100% rename from rtdata/images/lock_on.png rename to rtdata/images/lock-on.png diff --git a/rtdata/images/logoicon_wind_16.png b/rtdata/images/logoicon-wind.png similarity index 100% rename from rtdata/images/logoicon_wind_16.png rename to rtdata/images/logoicon-wind.png diff --git a/rtdata/images/logoicon16b.png b/rtdata/images/logoicon16b.png deleted file mode 100644 index 2eb641222..000000000 Binary files a/rtdata/images/logoicon16b.png and /dev/null differ diff --git a/rtdata/images/usbpendrive.png b/rtdata/images/media-usb.png similarity index 100% rename from rtdata/images/usbpendrive.png rename to rtdata/images/media-usb.png diff --git a/rtdata/images/exif-24.png b/rtdata/images/meta.png similarity index 100% rename from rtdata/images/exif-24.png rename to rtdata/images/meta.png diff --git a/rtdata/images/openhand.png b/rtdata/images/openhand.png index 9fb695def..1eab0d9b3 100644 Binary files a/rtdata/images/openhand.png and b/rtdata/images/openhand.png differ diff --git a/rtdata/images/openhand22.png b/rtdata/images/openhand22.png deleted file mode 100644 index e87604e77..000000000 Binary files a/rtdata/images/openhand22.png and /dev/null differ diff --git a/rtdata/images/openhand_gray22.png b/rtdata/images/openhand_gray22.png deleted file mode 100644 index 1eab0d9b3..000000000 Binary files a/rtdata/images/openhand_gray22.png and /dev/null differ diff --git a/rtdata/images/panel_to_bottom.png b/rtdata/images/panel-to-bottom.png similarity index 100% rename from rtdata/images/panel_to_bottom.png rename to rtdata/images/panel-to-bottom.png diff --git a/rtdata/images/panel_to_left.png b/rtdata/images/panel-to-left.png similarity index 100% rename from rtdata/images/panel_to_left.png rename to rtdata/images/panel-to-left.png diff --git a/rtdata/images/panel_to_right.png b/rtdata/images/panel-to-right.png similarity index 100% rename from rtdata/images/panel_to_right.png rename to rtdata/images/panel-to-right.png diff --git a/rtdata/images/panel_to_top.png b/rtdata/images/panel-to-top.png similarity index 100% rename from rtdata/images/panel_to_top.png rename to rtdata/images/panel-to-top.png diff --git a/rtdata/images/ratednot_10.png b/rtdata/images/ratednot.png similarity index 100% rename from rtdata/images/ratednot_10.png rename to rtdata/images/ratednot.png diff --git a/rtdata/images/ratednotg_10.png b/rtdata/images/ratednotg.png similarity index 100% rename from rtdata/images/ratednotg_10.png rename to rtdata/images/ratednotg.png diff --git a/rtdata/images/raw-24.png b/rtdata/images/raw.png similarity index 100% rename from rtdata/images/raw-24.png rename to rtdata/images/raw.png diff --git a/rtdata/images/recent-save.png b/rtdata/images/recent-save.png new file mode 100644 index 000000000..556a93fb5 Binary files /dev/null and b/rtdata/images/recent-save.png differ diff --git a/rtdata/images/red.png b/rtdata/images/red.png deleted file mode 100644 index a95830d23..000000000 Binary files a/rtdata/images/red.png and /dev/null differ diff --git a/rtdata/images/refresh_red.png b/rtdata/images/refresh-red.png similarity index 100% rename from rtdata/images/refresh_red.png rename to rtdata/images/refresh-red.png diff --git a/rtdata/images/refresh_white.png b/rtdata/images/refresh-white.png similarity index 100% rename from rtdata/images/refresh_white.png rename to rtdata/images/refresh-white.png diff --git a/rtdata/images/right.png b/rtdata/images/right.png deleted file mode 100644 index a5e40712e..000000000 Binary files a/rtdata/images/right.png and /dev/null differ diff --git a/rtdata/images/right_red.png b/rtdata/images/right_red.png deleted file mode 100644 index 094895916..000000000 Binary files a/rtdata/images/right_red.png and /dev/null differ diff --git a/rtdata/images/logoicon32.png b/rtdata/images/rt-logo-large.png similarity index 100% rename from rtdata/images/logoicon32.png rename to rtdata/images/rt-logo-large.png diff --git a/rtdata/images/logoicon16.png b/rtdata/images/rt-logo.png similarity index 100% rename from rtdata/images/logoicon16.png rename to rtdata/images/rt-logo.png diff --git a/rtdata/images/saved.png b/rtdata/images/saved.png index 556a93fb5..abe097d00 100644 Binary files a/rtdata/images/saved.png and b/rtdata/images/saved.png differ diff --git a/rtdata/images/saved_10.png b/rtdata/images/saved_10.png deleted file mode 100644 index abe097d00..000000000 Binary files a/rtdata/images/saved_10.png and /dev/null differ diff --git a/rtdata/images/savedg_10.png b/rtdata/images/savedg.png similarity index 100% rename from rtdata/images/savedg_10.png rename to rtdata/images/savedg.png diff --git a/rtdata/images/savednot_10.png b/rtdata/images/savednot.png similarity index 100% rename from rtdata/images/savednot_10.png rename to rtdata/images/savednot.png diff --git a/rtdata/images/savednotg_10.png b/rtdata/images/savednotg.png similarity index 100% rename from rtdata/images/savednotg_10.png rename to rtdata/images/savednotg.png diff --git a/rtdata/images/stock-color-picker-gray-18.png b/rtdata/images/stock-color-picker-gray-18.png deleted file mode 100644 index 9236fa1c7..000000000 Binary files a/rtdata/images/stock-color-picker-gray-18.png and /dev/null differ diff --git a/rtdata/images/stock-flip-horizontal-16.png b/rtdata/images/stock-flip-horizontal.png similarity index 100% rename from rtdata/images/stock-flip-horizontal-16.png rename to rtdata/images/stock-flip-horizontal.png diff --git a/rtdata/images/stock-flip-vertical-16.png b/rtdata/images/stock-flip-vertical.png similarity index 100% rename from rtdata/images/stock-flip-vertical-16.png rename to rtdata/images/stock-flip-vertical.png diff --git a/rtdata/images/stock-resize-16.png b/rtdata/images/stock-resize-16.png deleted file mode 100644 index 4666f5680..000000000 Binary files a/rtdata/images/stock-resize-16.png and /dev/null differ diff --git a/rtdata/images/stock-rotate-270-16.png b/rtdata/images/stock-rotate-270.png similarity index 100% rename from rtdata/images/stock-rotate-270-16.png rename to rtdata/images/stock-rotate-270.png diff --git a/rtdata/images/stock-rotate-90-16.png b/rtdata/images/stock-rotate-90.png similarity index 100% rename from rtdata/images/stock-rotate-90-16.png rename to rtdata/images/stock-rotate-90.png diff --git a/rtdata/images/stock-tool-color-picker-22.png b/rtdata/images/stock-tool-color-picker-22.png deleted file mode 100644 index f9d1943ea..000000000 Binary files a/rtdata/images/stock-tool-color-picker-22.png and /dev/null differ diff --git a/rtdata/images/stock-tool-crop-16.png b/rtdata/images/stock-tool-crop-16.png deleted file mode 100644 index da6afcf85..000000000 Binary files a/rtdata/images/stock-tool-crop-16.png and /dev/null differ diff --git a/rtdata/images/stock-tool-crop-22.png b/rtdata/images/stock-tool-crop-22.png deleted file mode 100644 index cf23381b8..000000000 Binary files a/rtdata/images/stock-tool-crop-22.png and /dev/null differ diff --git a/rtdata/images/stock_clear_24.png b/rtdata/images/stock_clear_24.png deleted file mode 100644 index 96b6d57dd..000000000 Binary files a/rtdata/images/stock_clear_24.png and /dev/null differ diff --git a/rtdata/images/stock_down_arrow_24.png b/rtdata/images/stock_down_arrow_24.png deleted file mode 100644 index ce290ba8d..000000000 Binary files a/rtdata/images/stock_down_arrow_24.png and /dev/null differ diff --git a/rtdata/images/stock_left_arrow_24.png b/rtdata/images/stock_left_arrow_24.png deleted file mode 100644 index c60eb07c1..000000000 Binary files a/rtdata/images/stock_left_arrow_24.png and /dev/null differ diff --git a/rtdata/images/stock_right_arrow_24.png b/rtdata/images/stock_right_arrow_24.png deleted file mode 100644 index 1a2162688..000000000 Binary files a/rtdata/images/stock_right_arrow_24.png and /dev/null differ diff --git a/rtdata/images/stock_up_arrow_24.png b/rtdata/images/stock_up_arrow_24.png deleted file mode 100644 index 493e14966..000000000 Binary files a/rtdata/images/stock_up_arrow_24.png and /dev/null differ diff --git a/rtdata/images/straighten16.png b/rtdata/images/straighten-small.png similarity index 100% rename from rtdata/images/straighten16.png rename to rtdata/images/straighten-small.png diff --git a/rtdata/images/straighten22.png b/rtdata/images/straighten.png similarity index 100% rename from rtdata/images/straighten22.png rename to rtdata/images/straighten.png diff --git a/rtdata/images/tail.png b/rtdata/images/tail.png deleted file mode 100644 index a40e93750..000000000 Binary files a/rtdata/images/tail.png and /dev/null differ diff --git a/rtdata/images/transform-24.png b/rtdata/images/transform.png similarity index 100% rename from rtdata/images/transform-24.png rename to rtdata/images/transform.png diff --git a/rtdata/images/vertical.png b/rtdata/images/vertical.png deleted file mode 100644 index 1870ddc90..000000000 Binary files a/rtdata/images/vertical.png and /dev/null differ diff --git a/rtdata/images/verticals.png b/rtdata/images/verticals.png deleted file mode 100644 index ef945a0e4..000000000 Binary files a/rtdata/images/verticals.png and /dev/null differ diff --git a/rtdata/images/wb22.png b/rtdata/images/wb22.png deleted file mode 100644 index ad1097c1e..000000000 Binary files a/rtdata/images/wb22.png and /dev/null differ diff --git a/rtgui/batchqueue.cc b/rtgui/batchqueue.cc index b0d223a0e..15e3aedbf 100644 --- a/rtgui/batchqueue.cc +++ b/rtgui/batchqueue.cc @@ -46,7 +46,7 @@ BatchQueue::BatchQueue () : processing(NULL), listener(NULL) { pmenu->attach (*Gtk::manage(new Gtk::SeparatorMenuItem ()), 0, 1, p, p+1); p++; pmenu->attach (*Gtk::manage(cancel = new Gtk::ImageMenuItem (M("FILEBROWSER_POPUPCANCELJOB"))), 0, 1, p, p+1); p++; - cancel->set_image(*Gtk::manage(new RTImage ("deltags.png"))); + cancel->set_image(*Gtk::manage(new RTImage ("gtk-close.png"))); pmenu->show_all (); diff --git a/rtgui/batchqueuebuttonset.cc b/rtgui/batchqueuebuttonset.cc index 91a834841..a88538b32 100644 --- a/rtgui/batchqueuebuttonset.cc +++ b/rtgui/batchqueuebuttonset.cc @@ -31,7 +31,7 @@ Cairo::RefPtr BatchQueueButtonSet::tailIcon; BatchQueueButtonSet::BatchQueueButtonSet (BatchQueueEntry* myEntry) { if (!iconsLoaded) { - cancelIcon = safe_create_from_png ("deltags.png"); + cancelIcon = safe_create_from_png ("gtk-close.png"); headIcon = safe_create_from_png ("toleftend.png"); tailIcon = safe_create_from_png ("torightend.png"); iconsLoaded = true; diff --git a/rtgui/chmixer.cc b/rtgui/chmixer.cc index bc7b7d8a6..e3d1a5db3 100644 --- a/rtgui/chmixer.cc +++ b/rtgui/chmixer.cc @@ -26,15 +26,15 @@ extern Glib::ustring argv0; ChMixer::ChMixer (): Gtk::VBox(), FoldableToolPanel(this) { - imgIcon[0] = Gtk::manage (new RTImage ("Chanmixer_RR.png")); - imgIcon[1] = Gtk::manage (new RTImage ("Chanmixer_RG.png")); - imgIcon[2] = Gtk::manage (new RTImage ("Chanmixer_RB.png")); - imgIcon[3] = Gtk::manage (new RTImage ("Chanmixer_GR.png")); - imgIcon[4] = Gtk::manage (new RTImage ("Chanmixer_GG.png")); - imgIcon[5] = Gtk::manage (new RTImage ("Chanmixer_GB.png")); - imgIcon[6] = Gtk::manage (new RTImage ("Chanmixer_BR.png")); - imgIcon[7] = Gtk::manage (new RTImage ("Chanmixer_BG.png")); - imgIcon[8] = Gtk::manage (new RTImage ("Chanmixer_BB.png")); + imgIcon[0] = Gtk::manage (new RTImage ("Chanmixer-RR.png")); + imgIcon[1] = Gtk::manage (new RTImage ("Chanmixer-RG.png")); + imgIcon[2] = Gtk::manage (new RTImage ("Chanmixer-RB.png")); + imgIcon[3] = Gtk::manage (new RTImage ("Chanmixer-GR.png")); + imgIcon[4] = Gtk::manage (new RTImage ("Chanmixer-GG.png")); + imgIcon[5] = Gtk::manage (new RTImage ("Chanmixer-GB.png")); + imgIcon[6] = Gtk::manage (new RTImage ("Chanmixer-BR.png")); + imgIcon[7] = Gtk::manage (new RTImage ("Chanmixer-BG.png")); + imgIcon[8] = Gtk::manage (new RTImage ("Chanmixer-BB.png")); Gtk::Label* rlabel = Gtk::manage (new Gtk::Label ()); rlabel->set_markup (Glib::ustring("\t") + M("TP_CHMIXER_RED") + Glib::ustring(":")); diff --git a/rtgui/coarsepanel.cc b/rtgui/coarsepanel.cc index 866828fd2..61e90c1a2 100644 --- a/rtgui/coarsepanel.cc +++ b/rtgui/coarsepanel.cc @@ -28,25 +28,25 @@ CoarsePanel::CoarsePanel () : ToolPanel () { degree = 0; - Gtk::Image* rotateli = Gtk::manage (new RTImage ("stock-rotate-270-16.png")); + Gtk::Image* rotateli = Gtk::manage (new RTImage ("stock-rotate-270.png")); rotate_left = Gtk::manage (new Gtk::Button ()); rotate_left->add (*rotateli); rotate_left->set_relief(Gtk::RELIEF_NONE); pack_start (*rotate_left); - Gtk::Image* rotateri = Gtk::manage (new RTImage ("stock-rotate-90-16.png")); + Gtk::Image* rotateri = Gtk::manage (new RTImage ("stock-rotate-90.png")); rotate_right = Gtk::manage (new Gtk::Button ()); rotate_right->add (*rotateri); rotate_right->set_relief(Gtk::RELIEF_NONE); pack_start (*rotate_right); - Gtk::Image* fliphi = Gtk::manage (new RTImage ("stock-flip-horizontal-16.png")); + Gtk::Image* fliphi = Gtk::manage (new RTImage ("stock-flip-horizontal.png")); hflip = Gtk::manage (new Gtk::ToggleButton ()); hflip->add (*fliphi); hflip->set_relief(Gtk::RELIEF_NONE); pack_start (*hflip); - Gtk::Image* flipvi = Gtk::manage (new RTImage ("stock-flip-vertical-16.png")); + Gtk::Image* flipvi = Gtk::manage (new RTImage ("stock-flip-vertical.png")); vflip = Gtk::manage (new Gtk::ToggleButton ()); vflip->add (*flipvi); vflip->set_relief(Gtk::RELIEF_NONE); diff --git a/rtgui/crop.cc b/rtgui/crop.cc index e16996b5b..8565988f9 100644 --- a/rtgui/crop.cc +++ b/rtgui/crop.cc @@ -77,7 +77,7 @@ Crop::Crop (): Gtk::VBox(), FoldableToolPanel(this) { pack_start (*hb2, Gtk::PACK_SHRINK, 4); selectCrop = Gtk::manage (new Gtk::Button (M("TP_CROP_SELECTCROP"))); - selectCrop->set_image (*Gtk::manage (new RTImage ("crop22.png"))); + selectCrop->set_image (*Gtk::manage (new RTImage ("crop.png"))); pack_start (*selectCrop, Gtk::PACK_SHRINK, 2); diff --git a/rtgui/cursormanager.cc b/rtgui/cursormanager.cc index 3c938ddf5..435b0b6e8 100644 --- a/rtgui/cursormanager.cc +++ b/rtgui/cursormanager.cc @@ -36,9 +36,9 @@ void CursorManager::init (Glib::RefPtr mainWin) { cAdd = new Gdk::Cursor (Gdk::PLUS); cWait = new Gdk::Cursor (Gdk::CLOCK); - Glib::RefPtr hand = safe_create_from_file("cross22.png"); - Glib::RefPtr close_hand = safe_create_from_file("closedhand22.png"); - Glib::RefPtr wbpick = safe_create_from_file("wbpicker16.png"); + Glib::RefPtr hand = safe_create_from_file("cross.png"); + Glib::RefPtr close_hand = safe_create_from_file("closedhand.png"); + Glib::RefPtr wbpick = safe_create_from_file("gtk-color-picker-small.png"); Glib::RefPtr empty = safe_create_from_file("empty.png"); cHand = hand ? new Gdk::Cursor (cAdd->get_display(), hand, 10, 10) : new Gdk::Cursor (Gdk::HAND2); diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc index 7e7c9534e..fbbe64d2e 100644 --- a/rtgui/dirbrowser.cc +++ b/rtgui/dirbrowser.cc @@ -55,12 +55,12 @@ DirBrowser::DirBrowser () { void DirBrowser::fillDirTree () { - openfolder = safe_create_from_file ("folder_open.png"); + openfolder = safe_create_from_file ("gtk-open.png"); closedfolder = safe_create_from_file ("folder.png"); icdrom = safe_create_from_file ("drive-optical.png"); ifloppy = safe_create_from_file ("drive-removable-media.png"); ihdd = safe_create_from_file ("drive-harddisk.png"); - iremovable = safe_create_from_file ("usbpendrive.png"); + iremovable = safe_create_from_file ("media-usb.png"); inetwork = safe_create_from_file ("network.png"); //Create the Tree model: diff --git a/rtgui/distortion.cc b/rtgui/distortion.cc index 769255a3f..c0827cdd9 100644 --- a/rtgui/distortion.cc +++ b/rtgui/distortion.cc @@ -29,7 +29,7 @@ Distortion::Distortion (): Gtk::VBox(), FoldableToolPanel(this) { rlistener = NULL; autoDistor = Gtk::manage (new Gtk::Button (M("TP_DISTORTION_AUTO"))); - autoDistor->set_image (*Gtk::manage (new RTImage ("distortion_auto.png"))); + autoDistor->set_image (*Gtk::manage (new RTImage ("distortion-auto.png"))); autoDistor->set_tooltip_text (M("TP_DISTORTION_AUTO_TIP")); idConn = autoDistor->signal_pressed().connect( sigc::mem_fun(*this, &Distortion::idPressed) ); autoDistor->show(); diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index 499b03ef8..e816ec1cc 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -83,8 +83,8 @@ EditorPanel::EditorPanel (FilePanel* filePanel) beforeAfter->set_relief(Gtk::RELIEF_NONE); beforeAfter->set_tooltip_markup (M("MAIN_TOOLTIP_TOGGLE")); - iBeforeLockON = new RTImage ("lock_on.png"); - iBeforeLockOFF = new RTImage ("lock_off.png"); + iBeforeLockON = new RTImage ("lock-on.png"); + iBeforeLockOFF = new RTImage ("lock-off.png"); Gtk::VSeparator* vsept = Gtk::manage (new Gtk::VSeparator ()); Gtk::VSeparator* vsepz = Gtk::manage (new Gtk::VSeparator ()); @@ -94,8 +94,8 @@ EditorPanel::EditorPanel (FilePanel* filePanel) hidehp = Gtk::manage (new Gtk::ToggleButton ()); - iHistoryShow = new RTImage ("panel_to_right.png"); - iHistoryHide = new RTImage ("panel_to_left.png"); + iHistoryShow = new RTImage ("panel-to-right.png"); + iHistoryHide = new RTImage ("panel-to-left.png"); hidehp->set_relief(Gtk::RELIEF_NONE); hidehp->set_active (options.showHistory); @@ -108,16 +108,16 @@ EditorPanel::EditorPanel (FilePanel* filePanel) } tbTopPanel_1 = new Gtk::ToggleButton (); - iTopPanel_1_Show = new RTImage ("panel_to_bottom.png"); - iTopPanel_1_Hide = new RTImage ("panel_to_top.png"); + iTopPanel_1_Show = new RTImage ("panel-to-bottom.png"); + iTopPanel_1_Hide = new RTImage ("panel-to-top.png"); tbTopPanel_1->set_relief(Gtk::RELIEF_NONE); tbTopPanel_1->set_active (true); tbTopPanel_1->set_tooltip_markup (M("MAIN_TOOLTIP_SHOWHIDETP1")); tbTopPanel_1->set_image (*iTopPanel_1_Hide); tbRightPanel_1 = new Gtk::ToggleButton (); - iRightPanel_1_Show = new RTImage ("panel_to_left.png"); - iRightPanel_1_Hide = new RTImage ("panel_to_right.png"); + iRightPanel_1_Show = new RTImage ("panel-to-left.png"); + iRightPanel_1_Hide = new RTImage ("panel-to-right.png"); tbRightPanel_1->set_relief(Gtk::RELIEF_NONE); tbRightPanel_1->set_active (true); tbRightPanel_1->set_tooltip_markup (M("MAIN_TOOLTIP_SHOWHIDERP1")); @@ -168,7 +168,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel) Gtk::HBox* iops = Gtk::manage (new Gtk::HBox ()); //Gtk::Image *saveButtonImage = Gtk::manage (new Gtk::Image (Gtk::StockID("gtk-save"), Gtk::ICON_SIZE_BUTTON)); - Gtk::Image *saveButtonImage = Gtk::manage (new RTImage ("save_hdd_01.png")); + Gtk::Image *saveButtonImage = Gtk::manage (new RTImage ("gtk-save-large.png")); saveimgas = Gtk::manage (new Gtk::Button ()); saveimgas->add(*saveButtonImage); saveimgas->set_tooltip_markup(M("MAIN_BUTTON_SAVE_TOOLTIP")); @@ -178,7 +178,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel) queueimg->add(*queueButtonImage); queueimg->set_tooltip_markup(M("MAIN_BUTTON_PUTTOQUEUE_TOOLTIP")); - Gtk::Image *sendToEditorButtonImage = Gtk::manage (new RTImage ("gimp.png")); + Gtk::Image *sendToEditorButtonImage = Gtk::manage (new RTImage ("image-editor.png")); sendtogimp = Gtk::manage (new Gtk::Button ()); sendtogimp->add(*sendToEditorButtonImage); sendtogimp->set_tooltip_markup(M("MAIN_BUTTON_SENDTOEDITOR_TOOLTIP")); @@ -202,7 +202,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel) // ShowHideSidePanels tbShowHideSidePanels = new Gtk::ToggleButton (); - iShowHideSidePanels = new RTImage ("crossed_arrows_out_45_02.png"); + iShowHideSidePanels = new RTImage ("crossed-arrows-out.png"); tbShowHideSidePanels->set_relief(Gtk::RELIEF_NONE); tbShowHideSidePanels->set_active (false); tbShowHideSidePanels->set_tooltip_markup (M("MAIN_BUTTON_SHOWHIDESIDEPANELS_TOOLTIP")); diff --git a/rtgui/editwindow.cc b/rtgui/editwindow.cc index bcfe61fd7..9e003ac51 100644 --- a/rtgui/editwindow.cc +++ b/rtgui/editwindow.cc @@ -61,7 +61,7 @@ EditWindow* EditWindow::getInstance(RTWindow* p) EditWindow::EditWindow (RTWindow* p) : parent(p) , isFullscreen(false) { - Glib::ustring fName = "logoicon16.png"; + Glib::ustring fName = "rt-logo.png"; Glib::ustring fullPath = RTImage::findIconAbsolutePath(fName); #ifdef GLIBMM_EXCEPTIONS_ENABLED diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc index 181b701e0..be0f2aa77 100644 --- a/rtgui/exifpanel.cc +++ b/rtgui/exifpanel.cc @@ -47,9 +47,9 @@ ExifPanel::ExifPanel () : idata(NULL) { exifTreeModel = Gtk::TreeStore::create(exifColumns); exifTree->set_model (exifTreeModel); - delicon = safe_create_from_file ("deltags.png"); - keepicon = safe_create_from_file ("addtags.png"); - editicon = safe_create_from_file ("add.png"); + delicon = safe_create_from_file ("gtk-close.png"); + keepicon = safe_create_from_file ("gtk-apply.png"); + editicon = safe_create_from_file ("gtk-add.png"); Gtk::TreeView::Column *viewcol = Gtk::manage(new Gtk::TreeView::Column ("Field Name")); Gtk::CellRendererPixbuf* render_pb = Gtk::manage(new Gtk::CellRendererPixbuf ()); diff --git a/rtgui/favoritbrowser.cc b/rtgui/favoritbrowser.cc index 8c84ab2d9..fce6b4555 100644 --- a/rtgui/favoritbrowser.cc +++ b/rtgui/favoritbrowser.cc @@ -50,7 +50,7 @@ FavoritBrowser::FavoritBrowser () : listener (NULL), lastSelectedDir ("") { add = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_ADD"))); del = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_DEL"))); - add->set_image (*Gtk::manage (new RTImage ("add.png"))); + add->set_image (*Gtk::manage (new RTImage ("gtk-add.png"))); del->set_image (*Gtk::manage (new RTImage ("list-remove.png"))); Gtk::HBox* buttonBox = Gtk::manage (new Gtk::HBox ()); buttonBox->pack_start (*add); diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index 96936f038..2a3987060 100644 --- a/rtgui/filebrowser.cc +++ b/rtgui/filebrowser.cc @@ -139,7 +139,7 @@ FileBrowser::FileBrowser () * *********************/ if (options.menuGroupProfileOperations){ pmenu->attach (*Gtk::manage(menuProfileOperations = new Gtk::ImageMenuItem (M("FILEBROWSER_POPUPPROFILEOPERATIONS"))), 0, 1, p, p+1); p++; - menuProfileOperations->set_image(*Gtk::manage(new RTImage ("logoicon_wind_16.png"))); + menuProfileOperations->set_image(*Gtk::manage(new RTImage ("logoicon-wind.png"))); Gtk::Menu* submenuProfileOperations = Gtk::manage (new Gtk::Menu ()); diff --git a/rtgui/filebrowserentry.cc b/rtgui/filebrowserentry.cc index 8ada3bb2d..f32b3f4d8 100644 --- a/rtgui/filebrowserentry.cc +++ b/rtgui/filebrowserentry.cc @@ -49,7 +49,7 @@ FileBrowserEntry::FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname) if (!iconsLoaded) { editedIcon = safe_create_from_file ("edited.png"); - recentlySavedIcon = safe_create_from_file ("saved.png"); + recentlySavedIcon = safe_create_from_file ("recent-save.png"); enqueuedIcon = safe_create_from_file ("processing.png"); iconsLoaded = true; } diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 7f325cce8..183043a5d 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -74,8 +74,8 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : hbToolBar1 = Gtk::manage(new Gtk::HBox ()); //setup BrowsePath - iRefreshWhite = new RTImage("refresh_white.png"); - iRefreshRed = new RTImage("refresh_red.png"); + iRefreshWhite = new RTImage("refresh-white.png"); + iRefreshRed = new RTImage("refresh-red.png"); BrowsePath = Gtk::manage(new Gtk::Entry ()); BrowsePath->set_width_chars (50); @@ -93,7 +93,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : BrowsePath->signal_activate().connect (sigc::mem_fun(*this, &FileCatalog::buttonBrowsePathPressed)); //respond to the Enter key //setup Query - iQueryClear = new RTImage("x_10.png"); + iQueryClear = new RTImage("gtk-close-small.png"); Gtk::Label* labelQuery = Gtk::manage(new Gtk::Label(M("FILEBROWSER_QUERYLABEL"))); Query = Gtk::manage(new Gtk::Entry ()); // cannot use Gtk::manage here as FileCatalog::getFilter will fail on Query->get_text() Query->set_text(""); @@ -122,8 +122,8 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK); tbLeftPanel_1 = new Gtk::ToggleButton (); - iLeftPanel_1_Show = new RTImage("panel_to_right.png"); - iLeftPanel_1_Hide = new RTImage("panel_to_left.png"); + iLeftPanel_1_Show = new RTImage("panel-to-right.png"); + iLeftPanel_1_Hide = new RTImage("panel-to-left.png"); tbLeftPanel_1->set_relief(Gtk::RELIEF_NONE); tbLeftPanel_1->set_active (true); @@ -135,8 +135,8 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : buttonBar->pack_start (*(new Gtk::VSeparator), Gtk::PACK_SHRINK); - iFilterClear = new RTImage ("filterclear_18.png"); - igFilterClear = new RTImage ("filterclearg_18.png"); + iFilterClear = new RTImage ("filterclear.png"); + igFilterClear = new RTImage ("filter.png"); bFilterClear = Gtk::manage(new Gtk::ToggleButton ()); bFilterClear->set_active (true); bFilterClear->set_image(*iFilterClear);//(*Gtk::manage(new RTImage ("filterclear.png"))); @@ -151,8 +151,8 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : fltrRankbox = Gtk::manage (new Gtk::HBox()); fltrLabelbox = Gtk::manage (new Gtk::HBox()); - iUnRanked = new RTImage ("ratednot_10.png"); - igUnRanked = new RTImage ("ratednotg_10.png"); + iUnRanked = new RTImage ("ratednot.png"); + igUnRanked = new RTImage ("ratednotg.png"); bUnRanked = Gtk::manage( new Gtk::ToggleButton () ); bUnRanked->set_active (false); bUnRanked->set_image (*igUnRanked); @@ -222,10 +222,10 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : fltrRecentlySavedBox = Gtk::manage (new Gtk::HBox()); // bEdited - iEdited[0] = new RTImage ("editednot_10.png"); - igEdited[0] = new RTImage ("editednotg_10.png"); - iEdited[1] = new RTImage ("edited_10.png"); - igEdited[1] = new RTImage ("editedg_10.png"); + iEdited[0] = new RTImage ("editednot-small.png"); + igEdited[0] = new RTImage ("editednotg-small.png"); + iEdited[1] = new RTImage ("edited-small.png"); + igEdited[1] = new RTImage ("editedg-small.png"); for (int i=0; i<2; i++) { iEdited[i]->show (); bEdited[i] = Gtk::manage(new Gtk::ToggleButton ()); @@ -241,10 +241,10 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : bEdited[1]->set_tooltip_markup (M("FILEBROWSER_SHOWEDITEDHINT")); // RecentlySaved - iRecentlySaved[0] = new RTImage ("savednot_10.png"); - igRecentlySaved[0] = new RTImage ("savednotg_10.png"); - iRecentlySaved[1] = new RTImage ("saved_10.png"); - igRecentlySaved[1] = new RTImage ("savedg_10.png"); + iRecentlySaved[0] = new RTImage ("savednot.png"); + igRecentlySaved[0] = new RTImage ("savednotg.png"); + iRecentlySaved[1] = new RTImage ("saved.png"); + igRecentlySaved[1] = new RTImage ("savedg.png"); for (int i=0; i<2; i++) { iRecentlySaved[i]->show (); bRecentlySaved[i] = Gtk::manage(new Gtk::ToggleButton ()); @@ -340,8 +340,8 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : if (options.FileBrowserToolbarSingleRow) buttonBar->pack_start (*hbToolBar1, Gtk::PACK_EXPAND_WIDGET,0); tbRightPanel_1 = new Gtk::ToggleButton (); - iRightPanel_1_Show = new RTImage("panel_to_left.png"); - iRightPanel_1_Hide = new RTImage("panel_to_right.png"); + iRightPanel_1_Show = new RTImage("panel-to-left.png"); + iRightPanel_1_Hide = new RTImage("panel-to-right.png"); tbRightPanel_1->set_relief(Gtk::RELIEF_NONE); tbRightPanel_1->set_active (true); diff --git a/rtgui/filethumbnailbuttonset.cc b/rtgui/filethumbnailbuttonset.cc index 9a111fbae..0f7af63e3 100644 --- a/rtgui/filethumbnailbuttonset.cc +++ b/rtgui/filethumbnailbuttonset.cc @@ -40,7 +40,7 @@ Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_5; FileThumbnailButtonSet::FileThumbnailButtonSet (FileBrowserEntry* myEntry) { if (!iconsLoaded) { - unRankIcon = safe_create_from_png ("ratednotg_10.png"); + unRankIcon = safe_create_from_png ("ratednotg.png"); rankIcon = safe_create_from_png ("rated.png"); gRankIcon = safe_create_from_png ("grayrated.png"); trashIcon = safe_create_from_png ("trash-thumbnail.png"); diff --git a/rtgui/history.cc b/rtgui/history.cc index 6baf812dc..204d105c8 100644 --- a/rtgui/history.cc +++ b/rtgui/history.cc @@ -78,7 +78,7 @@ History::History (bool bookmarkSupport) : blistener(NULL), tpc (NULL), bmnum (1) Gtk::HBox* ahbox = Gtk::manage (new Gtk::HBox ()); addBookmark = Gtk::manage (new Gtk::Button (M("HISTORY_NEWSNAPSHOT"))); - Gtk::Image* addimg = Gtk::manage (new RTImage ("list-add.png")); + Gtk::Image* addimg = Gtk::manage (new RTImage ("gtk-add.png")); addBookmark->set_image (*addimg); ahbox->pack_start (*addBookmark); diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index 99b375d58..55f232892 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -78,7 +78,7 @@ ICMPanel::ICMPanel () : Gtk::VBox(), FoldableToolPanel(this), iunchanged(NULL), pack_start (*ckbBlendCMSMatrix, Gtk::PACK_SHRINK, 4); saveRef = Gtk::manage (new Gtk::Button (M("TP_ICM_SAVEREFERENCE"))); - saveRef->set_image (*Gtk::manage (new RTImage ("save_hdd_01.png"))); + saveRef->set_image (*Gtk::manage (new RTImage ("gtk-save-large.png"))); pack_start (*saveRef, Gtk::PACK_SHRINK, 4); diff --git a/rtgui/iptcpanel.cc b/rtgui/iptcpanel.cc index 28a60bb38..1b1eff098 100644 --- a/rtgui/iptcpanel.cc +++ b/rtgui/iptcpanel.cc @@ -91,8 +91,8 @@ IPTCPanel::IPTCPanel () { keyword->set_tooltip_text (M("IPTCPANEL_KEYWORDSHINT")); addKW = Gtk::manage( new Gtk::Button () ); delKW = Gtk::manage( new Gtk::Button () ); - Gtk::Image* addKWImg = Gtk::manage( new RTImage ("list-add12.png") ); - Gtk::Image* delKWImg = Gtk::manage( new RTImage ("list-remove12r.png") ); + Gtk::Image* addKWImg = Gtk::manage( new RTImage ("list-add-small.png") ); + Gtk::Image* delKWImg = Gtk::manage( new RTImage ("list-remove-red-small.png") ); addKW->add (*addKWImg); delKW->add (*delKWImg); Gtk::HBox* kwhb = Gtk::manage( new Gtk::HBox () ); @@ -127,8 +127,8 @@ IPTCPanel::IPTCPanel () { suppCategory->set_tooltip_text (M("IPTCPANEL_SUPPCATEGORIESHINT")); addSC = Gtk::manage( new Gtk::Button () ); delSC = Gtk::manage( new Gtk::Button () ); - Gtk::Image* addSCImg = Gtk::manage( new RTImage ("list-add12.png") ); - Gtk::Image* delSCImg = Gtk::manage( new RTImage ("list-remove12r.png") ); + Gtk::Image* addSCImg = Gtk::manage( new RTImage ("list-add-small.png") ); + Gtk::Image* delSCImg = Gtk::manage( new RTImage ("list-remove-red-small.png") ); addSC->add (*addSCImg); delSC->add (*delSCImg); Gtk::HBox* schb = Gtk::manage( new Gtk::HBox () ); @@ -268,7 +268,7 @@ IPTCPanel::IPTCPanel () { bbox->pack_start (*reset); file = Gtk::manage( new Gtk::Button (M("IPTCPANEL_EMBEDDED")) ); - file->set_image (*Gtk::manage(new RTImage ("folder_open.png"))); + file->set_image (*Gtk::manage(new RTImage ("gtk-open.png"))); bbox->pack_start (*file); copy = Gtk::manage( new Gtk::Button () ); diff --git a/rtgui/lensgeom.cc b/rtgui/lensgeom.cc index 2e29bc2cf..69b12353a 100644 --- a/rtgui/lensgeom.cc +++ b/rtgui/lensgeom.cc @@ -31,7 +31,7 @@ LensGeometry::LensGeometry () : Gtk::VBox(), FoldableToolPanel(this), rlistener( pack_start (*fill); autoCrop = Gtk::manage (new Gtk::Button (M("TP_LENSGEOM_AUTOCROP"))); - autoCrop->set_image (*Gtk::manage (new RTImage ("crop_auto_22.png"))); + autoCrop->set_image (*Gtk::manage (new RTImage ("crop-auto.png"))); pack_start (*autoCrop, Gtk::PACK_SHRINK, 2); packBox = Gtk::manage (new Gtk::VBox ()); diff --git a/rtgui/placesbrowser.cc b/rtgui/placesbrowser.cc index e22ecc901..9610bba47 100644 --- a/rtgui/placesbrowser.cc +++ b/rtgui/placesbrowser.cc @@ -31,7 +31,7 @@ PlacesBrowser::PlacesBrowser () : listener (NULL) { add = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_ADD"))); del = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_DEL"))); - add->set_image (*Gtk::manage (new RTImage ("add.png"))); + add->set_image (*Gtk::manage (new RTImage ("gtk-add.png"))); del->set_image (*Gtk::manage (new RTImage ("list-remove.png"))); Gtk::HBox* buttonBox = Gtk::manage (new Gtk::HBox ()); buttonBox->pack_start (*add); diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index f13ef26e1..a055dfe3e 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -62,8 +62,8 @@ Preferences::Preferences (RTWindow *rtwindow):parent(rtwindow) { Gtk::Button* ok = Gtk::manage (new Gtk::Button (M("GENERAL_OK"))); Gtk::Button* cancel = Gtk::manage (new Gtk::Button (M("GENERAL_CANCEL"))); - about->set_image (*Gtk::manage(new RTImage ("logoicon16.png"))); - ok->set_image (*Gtk::manage(new RTImage ("addtags.png"))); + about->set_image (*Gtk::manage(new RTImage ("rt-logo.png"))); + ok->set_image (*Gtk::manage(new RTImage ("gtk-apply.png"))); cancel->set_image (*Gtk::manage(new RTImage ("gtk-cancel.png"))); @@ -714,7 +714,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel () { startupdir = Gtk::manage( new Gtk::Entry () ); Gtk::Button* sdselect = Gtk::manage( new Gtk::Button ("") ); - sdselect->set_image (*Gtk::manage(new RTImage ("folder_open.png"))); + sdselect->set_image (*Gtk::manage(new RTImage ("gtk-open.png"))); Gtk::RadioButton::Group opts = sdcurrent->get_group(); sdlast->set_group (opts); @@ -785,8 +785,8 @@ Gtk::Widget* Preferences::getFileBrowserPanel () { delExt = Gtk::manage( new Gtk::Button () ); addExt->set_tooltip_text (M("PREFERENCES_PARSEDEXTADDHINT")); delExt->set_tooltip_text (M("PREFERENCES_PARSEDEXTDELHINT")); - Gtk::Image* addExtImg = Gtk::manage( new RTImage ("list-add12.png") ); - Gtk::Image* delExtImg = Gtk::manage( new RTImage ("list-remove12r.png") ); + Gtk::Image* addExtImg = Gtk::manage( new RTImage ("list-add-small.png") ); + Gtk::Image* delExtImg = Gtk::manage( new RTImage ("list-remove-red-small.png") ); addExt->add (*addExtImg); delExt->add (*delExtImg); hb0->pack_end (*delExt, Gtk::PACK_SHRINK, 4); diff --git a/rtgui/profilepanel.cc b/rtgui/profilepanel.cc index 9bab288fd..94b862e7f 100644 --- a/rtgui/profilepanel.cc +++ b/rtgui/profilepanel.cc @@ -41,9 +41,9 @@ ProfilePanel::ProfilePanel () { pack_start (*hbox, Gtk::PACK_SHRINK, 4); save = Gtk::manage (new Gtk::Button ()); - save->add (*Gtk::manage (new RTImage ("save_hdd_01.png"))); + save->add (*Gtk::manage (new RTImage ("gtk-save-large.png"))); load = Gtk::manage (new Gtk::Button ()); - load->add (*Gtk::manage (new RTImage ("folder_open.png"))); + load->add (*Gtk::manage (new RTImage ("gtk-open.png"))); copy = Gtk::manage (new Gtk::Button ()); copy->add (*Gtk::manage (new RTImage ("edit-copy.png"))); paste = Gtk::manage (new Gtk::Button ()); diff --git a/rtgui/renamedlg.cc b/rtgui/renamedlg.cc index 41863cacd..d9549c5f6 100644 --- a/rtgui/renamedlg.cc +++ b/rtgui/renamedlg.cc @@ -158,8 +158,8 @@ RenameTemplateEditor::RenameTemplateEditor (Gtk::Window* parent) templ = Gtk::manage (new Gtk::Entry ()); Gtk::Button* add = Gtk::manage (new Gtk::Button ()); Gtk::Button* del = Gtk::manage (new Gtk::Button ()); - add->add (*Gtk::manage (new RTImage ("list-add12.png"))); - del->add (*Gtk::manage (new RTImage ("list-remove12r.png"))); + add->add (*Gtk::manage (new RTImage ("list-add-small.png"))); + del->add (*Gtk::manage (new RTImage ("list-remove-red-small.png"))); hb->pack_start (*templ); hb->pack_start (*add, Gtk::PACK_SHRINK, 2); hb->pack_start (*del, Gtk::PACK_SHRINK, 2); diff --git a/rtgui/rotate.cc b/rtgui/rotate.cc index d5f969e57..acc957a9e 100644 --- a/rtgui/rotate.cc +++ b/rtgui/rotate.cc @@ -35,7 +35,7 @@ Rotate::Rotate () : Gtk::VBox(), FoldableToolPanel(this) { pack_start (*degree); selectStraight = Gtk::manage (new Gtk::Button (M("TP_ROTATE_SELECTLINE"))); - Gtk::Image* selimg = Gtk::manage (new RTImage ("straighten16.png")); + Gtk::Image* selimg = Gtk::manage (new RTImage ("straighten-small.png")); selectStraight->set_image (*selimg); pack_start (*selectStraight, Gtk::PACK_SHRINK, 2); diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index 23abe1ae1..6e706549f 100644 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -31,7 +31,7 @@ RTWindow::RTWindow () cacheMgr->init (); - Glib::ustring fName = "logoicon16.png"; + Glib::ustring fName = "rt-logo.png"; Glib::ustring fullPath = RTImage::findIconAbsolutePath(fName); #ifdef GLIBMM_EXCEPTIONS_ENABLED @@ -118,7 +118,7 @@ RTWindow::RTWindow () // decorate tab if (options.mainNBVertical) { Gtk::VBox* vbe = Gtk::manage (new Gtk::VBox ()); - vbe->pack_start (*Gtk::manage (new RTImage ("logoicon16.png"))); + vbe->pack_start (*Gtk::manage (new RTImage ("rt-logo.png"))); Gtk::Label* l=Gtk::manage (new Gtk::Label( Glib::ustring(" ") + M("MAIN_FRAME_EDITOR") )); //l->set_markup(Glib::ustring("Editor")); Bold difficult to read l->set_angle (90); @@ -130,7 +130,7 @@ RTWindow::RTWindow () mainNB->append_page (*epanel, *vbe); } else { Gtk::HBox* hbe = Gtk::manage (new Gtk::HBox ()); - hbe->pack_start (*Gtk::manage (new RTImage ("logoicon16.png"))); + hbe->pack_start (*Gtk::manage (new RTImage ("rt-logo.png"))); hbe->pack_start (*Gtk::manage (new Gtk::Label( Glib::ustring(" ") + M("MAIN_FRAME_EDITOR") ))); hbe->set_spacing (2); hbe->set_tooltip_markup (M("MAIN_FRAME_EDITOR_TOOLTIP")); @@ -148,7 +148,7 @@ RTWindow::RTWindow () // filling bottom box iFullscreen = new RTImage ("fullscreen.png"); - iFullscreen_exit = new RTImage ("fullscreen_exit.png"); + iFullscreen_exit = new RTImage ("fullscreen-exit.png"); Gtk::LinkButton* rtWeb = Gtk::manage (new Gtk::LinkButton ("http://rawtherapee.com")); //Gtk::Button* preferences = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_PREFERENCES")+"...")); diff --git a/rtgui/saveasdlg.cc b/rtgui/saveasdlg.cc index 5f2f957ed..2c438f7ca 100644 --- a/rtgui/saveasdlg.cc +++ b/rtgui/saveasdlg.cc @@ -90,7 +90,7 @@ SaveAsDialog::SaveAsDialog (Glib::ustring initialDir) { Gtk::Button* ok = Gtk::manage( new Gtk::Button (M("GENERAL_OK")) ); Gtk::Button* cancel = Gtk::manage( new Gtk::Button (M("GENERAL_CANCEL")) ); - ok->set_image (*Gtk::manage(new RTImage ("addtags.png"))); + ok->set_image (*Gtk::manage(new RTImage ("gtk-apply.png"))); cancel->set_image (*Gtk::manage(new RTImage ("gtk-cancel.png"))); ok->signal_clicked().connect( sigc::mem_fun(*this, &SaveAsDialog::okPressed) ); diff --git a/rtgui/toolbar.cc b/rtgui/toolbar.cc index 60f4ee15f..81f123842 100644 --- a/rtgui/toolbar.cc +++ b/rtgui/toolbar.cc @@ -25,7 +25,7 @@ extern Glib::ustring argv0; ToolBar::ToolBar () : listener (NULL) { handTool = Gtk::manage (new Gtk::ToggleButton ()); - Gtk::Image* handimg = Gtk::manage (new RTImage ("openhand_gray22.png")); + Gtk::Image* handimg = Gtk::manage (new RTImage ("openhand.png")); handTool->add (*handimg); handimg->show (); handTool->set_relief(Gtk::RELIEF_NONE); @@ -34,7 +34,7 @@ ToolBar::ToolBar () : listener (NULL) { pack_start (*handTool); wbTool = Gtk::manage (new Gtk::ToggleButton ()); - Gtk::Image* wbimg = Gtk::manage (new RTImage ("wbpicker22.png")); + Gtk::Image* wbimg = Gtk::manage (new RTImage ("gtk-color-picker.png")); wbTool->add (*wbimg); wbimg->show (); wbTool->set_relief(Gtk::RELIEF_NONE); @@ -43,7 +43,7 @@ ToolBar::ToolBar () : listener (NULL) { pack_start (*wbTool); cropTool = Gtk::manage (new Gtk::ToggleButton ()); - Gtk::Image* cropimg = Gtk::manage (new RTImage ("crop22.png")); + Gtk::Image* cropimg = Gtk::manage (new RTImage ("crop.png")); cropTool->add (*cropimg); cropimg->show (); cropTool->set_relief(Gtk::RELIEF_NONE); @@ -52,7 +52,7 @@ ToolBar::ToolBar () : listener (NULL) { pack_start (*cropTool); straTool = Gtk::manage (new Gtk::ToggleButton ()); - Gtk::Image* straimg = Gtk::manage (new RTImage ("straighten22.png")); + Gtk::Image* straimg = Gtk::manage (new RTImage ("straighten.png")); straTool->add (*straimg); straimg->show (); straTool->set_relief(Gtk::RELIEF_NONE); diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 767e4dac4..c8029a973 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -125,7 +125,7 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) { // load panel endings for (int i=0; i<5; i++) { vbPanelEnd[i] = Gtk::manage (new Gtk::VBox ()); - imgPanelEnd[i] = Gtk::manage (new RTImage("PanelEnding_01.png")); + imgPanelEnd[i] = Gtk::manage (new RTImage("PanelEnding.png")); imgPanelEnd[i]->show (); vbPanelEnd[i]->pack_start (*imgPanelEnd[i],Gtk::PACK_SHRINK); vbPanelEnd[i]->show_all(); @@ -153,12 +153,12 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) { TOITypes type = options.UseIconNoText ? TOI_ICON : TOI_TEXT; - toiE = Gtk::manage (new TextOrIcon ("exposure-24.png" , M("MAIN_TAB_EXPOSURE") , M("MAIN_TAB_EXPOSURE_TOOLTIP") , type)); - toiD = Gtk::manage (new TextOrIcon ("detail-24.png" , M("MAIN_TAB_DETAIL") , M("MAIN_TAB_DETAIL_TOOLTIP") , type)); - toiC = Gtk::manage (new TextOrIcon ("colour-24.png" , M("MAIN_TAB_COLOR") , M("MAIN_TAB_COLOR_TOOLTIP") , type)); - toiT = Gtk::manage (new TextOrIcon ("transform-24.png", M("MAIN_TAB_TRANSFORM"), M("MAIN_TAB_TRANSFORM_TOOLTIP"), type)); - toiR = Gtk::manage (new TextOrIcon ("raw-24.png" , M("MAIN_TAB_RAW") , M("MAIN_TAB_RAW_TOOLTIP") , type)); - toiM = Gtk::manage (new TextOrIcon ("exif-24.png" , M("MAIN_TAB_METADATA") , M("MAIN_TAB_METADATA_TOOLTIP") , type)); + toiE = Gtk::manage (new TextOrIcon ("exposure.png" , M("MAIN_TAB_EXPOSURE") , M("MAIN_TAB_EXPOSURE_TOOLTIP") , type)); + toiD = Gtk::manage (new TextOrIcon ("detail.png" , M("MAIN_TAB_DETAIL") , M("MAIN_TAB_DETAIL_TOOLTIP") , type)); + toiC = Gtk::manage (new TextOrIcon ("colour.png" , M("MAIN_TAB_COLOR") , M("MAIN_TAB_COLOR_TOOLTIP") , type)); + toiT = Gtk::manage (new TextOrIcon ("transform.png", M("MAIN_TAB_TRANSFORM"), M("MAIN_TAB_TRANSFORM_TOOLTIP"), type)); + toiR = Gtk::manage (new TextOrIcon ("raw.png" , M("MAIN_TAB_RAW") , M("MAIN_TAB_RAW_TOOLTIP") , type)); + toiM = Gtk::manage (new TextOrIcon ("meta.png" , M("MAIN_TAB_METADATA") , M("MAIN_TAB_METADATA_TOOLTIP") , type)); toolPanelNotebook->append_page (*exposurePanelSW, *toiE); toolPanelNotebook->append_page (*detailsPanelSW, *toiD); diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc index daeb85ad0..b7743b822 100644 --- a/rtgui/whitebalance.cc +++ b/rtgui/whitebalance.cc @@ -52,7 +52,7 @@ WhiteBalance::WhiteBalance () : Gtk::VBox(), FoldableToolPanel(this), wbp(NULL), spotbox->show (); spotbutton = Gtk::manage (new Gtk::Button (M("TP_WBALANCE_SPOTWB"))); - Gtk::Image* spotimg = Gtk::manage (new RTImage ("wbpicker16.png")); + Gtk::Image* spotimg = Gtk::manage (new RTImage ("gtk-color-picker-small.png")); spotimg->show (); spotbutton->set_image (*spotimg); spotbutton->show (); diff --git a/rtgui/zoompanel.cc b/rtgui/zoompanel.cc index 5491d4148..8fe79089b 100644 --- a/rtgui/zoompanel.cc +++ b/rtgui/zoompanel.cc @@ -55,7 +55,7 @@ ZoomPanel::ZoomPanel (ImageArea* iarea) : iarea(iarea) { zoomLabel = Gtk::manage (new Gtk::Label ()); pack_start (*zoomLabel, Gtk::PACK_SHRINK, 4); - Gtk::Image* imageCrop = Gtk::manage (new RTImage ("new_detail_window.png")); + Gtk::Image* imageCrop = Gtk::manage (new RTImage ("new-detail-window.png")); imageCrop->set_padding(0,0); newCrop = Gtk::manage (new Gtk::Button()); newCrop->add (*imageCrop); diff --git a/tools/source_icons/README b/tools/source_icons/README index f195f5ee0..45cd26083 100644 --- a/tools/source_icons/README +++ b/tools/source_icons/README @@ -19,3 +19,10 @@ The repository tools/source_icons contains source icons (in svg format) and the - the main script to create the icons in make_all_icon_theme.bash - launch make_all_icon_theme.bash tools/source_icons/scalable /tmp/png - the icons and an archive will be created in /tmp/png + +================================ +=== guidelines for icon name === +================================ +- Use stock item name when prebuilt icon exists (e.g. gtk-open.png). See http://developer.gnome.org/gtk/2.24/gtk-Stock-Items.html +- Use "-" to separate words (e.g. panel-to-left.png) +- Avoid the use of icon size as a suffix to name icon (colour.png and nor colour-24.png). If needed, use the suffix -large or -small (gtk-close-small.png). diff --git a/tools/source_icons/scalable/PanelEnding.file b/tools/source_icons/scalable/PanelEnding.file index 8a69b5f41..865b12983 100644 --- a/tools/source_icons/scalable/PanelEnding.file +++ b/tools/source_icons/scalable/PanelEnding.file @@ -1 +1 @@ -PanelEnding_01.png,h28 +PanelEnding.png,h28 diff --git a/tools/source_icons/scalable/check.file b/tools/source_icons/scalable/check.file deleted file mode 100644 index 93d680a43..000000000 --- a/tools/source_icons/scalable/check.file +++ /dev/null @@ -1,2 +0,0 @@ -edited.png,w18 -edited_10.png,h10 diff --git a/tools/source_icons/scalable/closedhand.file b/tools/source_icons/scalable/closedhand.file index 48462ba9b..38d9d360b 100644 --- a/tools/source_icons/scalable/closedhand.file +++ b/tools/source_icons/scalable/closedhand.file @@ -1 +1 @@ -closedhand22.png,w22 +closedhand.png,w22 diff --git a/tools/source_icons/scalable/colour.file b/tools/source_icons/scalable/colour.file index 9d661e1cb..e7685e5b8 100644 --- a/tools/source_icons/scalable/colour.file +++ b/tools/source_icons/scalable/colour.file @@ -1 +1 @@ -colour-24.png,w24 +colour.png,w24 diff --git a/tools/source_icons/scalable/colour.svg b/tools/source_icons/scalable/colour.svg index c7d6f6641..27b160e49 100644 --- a/tools/source_icons/scalable/colour.svg +++ b/tools/source_icons/scalable/colour.svg @@ -522,6 +522,69 @@ inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -694,6 +792,64 @@ id="path3645-5-0-4-7-6-6-7-5-8-5-1-8-6" /> + + + + + + + + + + diff --git a/tools/source_icons/scalable/crop-auto.file b/tools/source_icons/scalable/crop-auto.file new file mode 100644 index 000000000..2c3af9520 --- /dev/null +++ b/tools/source_icons/scalable/crop-auto.file @@ -0,0 +1 @@ +crop-auto.png,h18 diff --git a/tools/source_icons/scalable/crop_auto.svg b/tools/source_icons/scalable/crop-auto.svg similarity index 100% rename from tools/source_icons/scalable/crop_auto.svg rename to tools/source_icons/scalable/crop-auto.svg diff --git a/tools/source_icons/scalable/crop.file b/tools/source_icons/scalable/crop.file index 4fe2fdb0c..16d60cf10 100644 --- a/tools/source_icons/scalable/crop.file +++ b/tools/source_icons/scalable/crop.file @@ -1 +1 @@ -crop22.png,w22 +crop.png,w22 diff --git a/tools/source_icons/scalable/crop_auto.file b/tools/source_icons/scalable/crop_auto.file deleted file mode 100644 index 937689717..000000000 --- a/tools/source_icons/scalable/crop_auto.file +++ /dev/null @@ -1 +0,0 @@ -crop_auto_22.png,h18 diff --git a/tools/source_icons/scalable/crossed-arrows-in.file b/tools/source_icons/scalable/crossed-arrows-in.file new file mode 100644 index 000000000..8edfdde62 --- /dev/null +++ b/tools/source_icons/scalable/crossed-arrows-in.file @@ -0,0 +1 @@ +crossed-arrows-in.png,w22 diff --git a/tools/source_icons/scalable/crossed_arrows_in.svg b/tools/source_icons/scalable/crossed-arrows-in.svg similarity index 100% rename from tools/source_icons/scalable/crossed_arrows_in.svg rename to tools/source_icons/scalable/crossed-arrows-in.svg diff --git a/tools/source_icons/scalable/crossed-arrows-out.file b/tools/source_icons/scalable/crossed-arrows-out.file new file mode 100644 index 000000000..c9d3b3221 --- /dev/null +++ b/tools/source_icons/scalable/crossed-arrows-out.file @@ -0,0 +1 @@ +crossed-arrows-out.png,w22 diff --git a/tools/source_icons/scalable/crossed_arrows_out.svg b/tools/source_icons/scalable/crossed-arrows-out.svg similarity index 100% rename from tools/source_icons/scalable/crossed_arrows_out.svg rename to tools/source_icons/scalable/crossed-arrows-out.svg diff --git a/tools/source_icons/scalable/crossed_arrows_in.file b/tools/source_icons/scalable/crossed_arrows_in.file deleted file mode 100644 index 292466cc0..000000000 --- a/tools/source_icons/scalable/crossed_arrows_in.file +++ /dev/null @@ -1 +0,0 @@ -crossed_arrows_in_45_02.png,w22 diff --git a/tools/source_icons/scalable/crossed_arrows_out.file b/tools/source_icons/scalable/crossed_arrows_out.file deleted file mode 100644 index 9de902d4b..000000000 --- a/tools/source_icons/scalable/crossed_arrows_out.file +++ /dev/null @@ -1 +0,0 @@ -crossed_arrows_out_45_02.png,w22 diff --git a/tools/source_icons/scalable/delete-red.file b/tools/source_icons/scalable/delete-red.file deleted file mode 100644 index ae3d59e0e..000000000 --- a/tools/source_icons/scalable/delete-red.file +++ /dev/null @@ -1 +0,0 @@ -list-remove12r.png,w12 diff --git a/tools/source_icons/scalable/detail.file b/tools/source_icons/scalable/detail.file index a3ffaeec8..604baf302 100644 --- a/tools/source_icons/scalable/detail.file +++ b/tools/source_icons/scalable/detail.file @@ -1 +1 @@ -detail-24.png,w24 +detail.png,w24 diff --git a/tools/source_icons/scalable/distorsion_auto.file b/tools/source_icons/scalable/distorsion_auto.file deleted file mode 100644 index 512e9fd6e..000000000 --- a/tools/source_icons/scalable/distorsion_auto.file +++ /dev/null @@ -1 +0,0 @@ -distortion_auto.png,h18 diff --git a/tools/source_icons/scalable/distortion-auto.file b/tools/source_icons/scalable/distortion-auto.file new file mode 100644 index 000000000..50f15d361 --- /dev/null +++ b/tools/source_icons/scalable/distortion-auto.file @@ -0,0 +1 @@ +distortion-auto.png,h18 diff --git a/tools/source_icons/scalable/distorsion_auto.svg b/tools/source_icons/scalable/distortion-auto.svg similarity index 100% rename from tools/source_icons/scalable/distorsion_auto.svg rename to tools/source_icons/scalable/distortion-auto.svg diff --git a/tools/source_icons/scalable/edited.file b/tools/source_icons/scalable/edited.file new file mode 100644 index 000000000..9ccf82b1f --- /dev/null +++ b/tools/source_icons/scalable/edited.file @@ -0,0 +1,2 @@ +edited.png,w18 +edited-small.png,h10 diff --git a/tools/source_icons/scalable/check.svg b/tools/source_icons/scalable/edited.svg similarity index 100% rename from tools/source_icons/scalable/check.svg rename to tools/source_icons/scalable/edited.svg diff --git a/tools/source_icons/scalable/editedg.file b/tools/source_icons/scalable/editedg.file index ce30d41b5..c68c67d2f 100644 --- a/tools/source_icons/scalable/editedg.file +++ b/tools/source_icons/scalable/editedg.file @@ -1 +1 @@ -editedg_10.png,h10 +editedg-small.png,h10 diff --git a/tools/source_icons/scalable/editednot.file b/tools/source_icons/scalable/editednot.file index 19f48aefe..6cf77b756 100644 --- a/tools/source_icons/scalable/editednot.file +++ b/tools/source_icons/scalable/editednot.file @@ -1 +1 @@ -editednot_10.png,h10 +editednot-small.png,h10 diff --git a/tools/source_icons/scalable/editednotg.file b/tools/source_icons/scalable/editednotg.file index ac253d3c6..771e33ceb 100644 --- a/tools/source_icons/scalable/editednotg.file +++ b/tools/source_icons/scalable/editednotg.file @@ -1 +1 @@ -editednotg_10.png,h10 +editednotg-small.png,h10 diff --git a/tools/source_icons/scalable/exif.file b/tools/source_icons/scalable/exif.file deleted file mode 100644 index 8fe852f04..000000000 --- a/tools/source_icons/scalable/exif.file +++ /dev/null @@ -1 +0,0 @@ -exif-24.png,w24 diff --git a/tools/source_icons/scalable/exposure.file b/tools/source_icons/scalable/exposure.file index 6ea377731..3e4b9d150 100644 --- a/tools/source_icons/scalable/exposure.file +++ b/tools/source_icons/scalable/exposure.file @@ -1 +1 @@ -exposure-24.png,w24 +exposure.png,w24 diff --git a/tools/source_icons/scalable/filterclear.file b/tools/source_icons/scalable/filterclear.file index 29e1180a5..7c4efc1d6 100644 --- a/tools/source_icons/scalable/filterclear.file +++ b/tools/source_icons/scalable/filterclear.file @@ -1 +1 @@ -filterclear_18.png,w22 +filterclear.png,w22 diff --git a/tools/source_icons/scalable/gimp_icon.file b/tools/source_icons/scalable/gimp_icon.file deleted file mode 100644 index c792dc518..000000000 --- a/tools/source_icons/scalable/gimp_icon.file +++ /dev/null @@ -1 +0,0 @@ -gimp.png,w22 diff --git a/tools/source_icons/scalable/gtk-add.file b/tools/source_icons/scalable/gtk-add.file index 0148cac42..b49193f13 100644 --- a/tools/source_icons/scalable/gtk-add.file +++ b/tools/source_icons/scalable/gtk-add.file @@ -1,4 +1,3 @@ -add.png,w16 -list-add12.png,w12 list-add.png,w16,actions gtk-add.png,w16,actions +list-add-small.png,w12 diff --git a/tools/source_icons/scalable/gtk-apply.file b/tools/source_icons/scalable/gtk-apply.file index 9aba50710..a319cbc75 100644 --- a/tools/source_icons/scalable/gtk-apply.file +++ b/tools/source_icons/scalable/gtk-apply.file @@ -1,4 +1,2 @@ -addtags.png,h16 -addtag.png,w22 gtk-apply.png,w16,actions gtk-ok.png,w16,actions diff --git a/tools/source_icons/scalable/gtk-cancel.file b/tools/source_icons/scalable/gtk-cancel.file index c8698c6cb..92d2ea411 100644 --- a/tools/source_icons/scalable/gtk-cancel.file +++ b/tools/source_icons/scalable/gtk-cancel.file @@ -1,5 +1 @@ -gtk-cancel.png,h16,actions -gtk-undo-rtl.png,h16 -gtk-undo-rtl-small.png,h11 -gtk-undo-ltr.png,h16 -gtk-undo-ltr-small.png,h11 +gtk-cancel.png.old,h16,actions diff --git a/tools/source_icons/scalable/gtk-close.file b/tools/source_icons/scalable/gtk-close.file index fc0a2350d..db681bcc1 100644 --- a/tools/source_icons/scalable/gtk-close.file +++ b/tools/source_icons/scalable/gtk-close.file @@ -1,3 +1,3 @@ gtk-close.png,w16 -deltags.png,w16 -x_10.png,h13 +gtk-close-small.png,h13 +gtk-cancel.png,h16,actions diff --git a/tools/source_icons/scalable/gtk-color-picker.file b/tools/source_icons/scalable/gtk-color-picker.file index bc557b7a3..f9779f136 100644 --- a/tools/source_icons/scalable/gtk-color-picker.file +++ b/tools/source_icons/scalable/gtk-color-picker.file @@ -1,2 +1,2 @@ -wbpicker22.png,w22 -wbpicker16.png,h18 +gtk-color-picker.png,w22 +gtk-color-picker-small.png,h18 diff --git a/tools/source_icons/scalable/gtk-leave-fullscreen.file b/tools/source_icons/scalable/gtk-leave-fullscreen.file index 2aa8b4aa2..f6ee79d30 100644 --- a/tools/source_icons/scalable/gtk-leave-fullscreen.file +++ b/tools/source_icons/scalable/gtk-leave-fullscreen.file @@ -1 +1 @@ -fullscreen_exit.png,w22 +fullscreen-exit.png,w22 diff --git a/tools/source_icons/scalable/gtk-open.file b/tools/source_icons/scalable/gtk-open.file index 7f8cbffc9..ee4eb5b7f 100644 --- a/tools/source_icons/scalable/gtk-open.file +++ b/tools/source_icons/scalable/gtk-open.file @@ -1,3 +1,2 @@ -folder_open.png,h18 gtk-open.png,h18,actions document-open.png,h18,actions diff --git a/tools/source_icons/scalable/gtk-remove-red.file b/tools/source_icons/scalable/gtk-remove-red.file new file mode 100644 index 000000000..e65153cb4 --- /dev/null +++ b/tools/source_icons/scalable/gtk-remove-red.file @@ -0,0 +1 @@ +list-remove-red-small.png,w12 diff --git a/tools/source_icons/scalable/delete-red.svg b/tools/source_icons/scalable/gtk-remove-red.svg similarity index 100% rename from tools/source_icons/scalable/delete-red.svg rename to tools/source_icons/scalable/gtk-remove-red.svg diff --git a/tools/source_icons/scalable/delete.file b/tools/source_icons/scalable/gtk-remove.file similarity index 78% rename from tools/source_icons/scalable/delete.file rename to tools/source_icons/scalable/gtk-remove.file index 4eb3da39c..46f4b8ff3 100644 --- a/tools/source_icons/scalable/delete.file +++ b/tools/source_icons/scalable/gtk-remove.file @@ -1,3 +1,2 @@ -delete.png,w22 list-remove.png,w16,actions gtk-remove.png,w16,actions diff --git a/tools/source_icons/scalable/delete.svg b/tools/source_icons/scalable/gtk-remove.svg similarity index 100% rename from tools/source_icons/scalable/delete.svg rename to tools/source_icons/scalable/gtk-remove.svg diff --git a/tools/source_icons/scalable/save_hdd.file b/tools/source_icons/scalable/gtk-save.file similarity index 52% rename from tools/source_icons/scalable/save_hdd.file rename to tools/source_icons/scalable/gtk-save.file index 36d32a9ed..be6a39b76 100644 --- a/tools/source_icons/scalable/save_hdd.file +++ b/tools/source_icons/scalable/gtk-save.file @@ -1,2 +1,2 @@ -save_hdd_01.png,w22 +gtk-save-large.png,w22 gtk-save.png,h18,actions diff --git a/tools/source_icons/scalable/save_hdd.svg b/tools/source_icons/scalable/gtk-save.svg similarity index 100% rename from tools/source_icons/scalable/save_hdd.svg rename to tools/source_icons/scalable/gtk-save.svg diff --git a/tools/source_icons/scalable/image-editor.file b/tools/source_icons/scalable/image-editor.file new file mode 100644 index 000000000..f0f93d4dd --- /dev/null +++ b/tools/source_icons/scalable/image-editor.file @@ -0,0 +1 @@ +image-editor.png,w22 diff --git a/tools/source_icons/scalable/gimp_icon.svg b/tools/source_icons/scalable/image-editor.svg similarity index 100% rename from tools/source_icons/scalable/gimp_icon.svg rename to tools/source_icons/scalable/image-editor.svg diff --git a/tools/source_icons/scalable/index.theme b/tools/source_icons/scalable/index.theme deleted file mode 100755 index 58888599d..000000000 --- a/tools/source_icons/scalable/index.theme +++ /dev/null @@ -1,42 +0,0 @@ -[Icon Theme] -Name=dark-rt -Comment=dark theme for RT -Inherits=hicolor -Example=folder - -Directories=actions,apps,categories,devices,emblems,places,status - -[actions] -Size=22 -Context=Actions -Type=Fixed - -[apps] -Size=22 -Context=Applications -Type=Fixed - -[categories] -Size=22 -Context=Categories -Type=Fixed - -[devices] -Size=22 -Context=Devices -Type=Fixed - -[emblems] -Size=22 -Context=Emblems -Type=Fixed - -[places] -Size=22 -Context=Places -Type=Fixed - -[status] -Size=22 -Context=Status -Type=Fixed diff --git a/tools/source_icons/scalable/lock-off.file b/tools/source_icons/scalable/lock-off.file new file mode 100644 index 000000000..b557fade6 --- /dev/null +++ b/tools/source_icons/scalable/lock-off.file @@ -0,0 +1 @@ +lock-off.png,h10 diff --git a/tools/source_icons/scalable/lock_off.svg b/tools/source_icons/scalable/lock-off.svg similarity index 100% rename from tools/source_icons/scalable/lock_off.svg rename to tools/source_icons/scalable/lock-off.svg diff --git a/tools/source_icons/scalable/lock-on.file b/tools/source_icons/scalable/lock-on.file new file mode 100644 index 000000000..d5ac33f01 --- /dev/null +++ b/tools/source_icons/scalable/lock-on.file @@ -0,0 +1 @@ +lock-on.png,h10 diff --git a/tools/source_icons/scalable/lock_on.svg b/tools/source_icons/scalable/lock-on.svg similarity index 100% rename from tools/source_icons/scalable/lock_on.svg rename to tools/source_icons/scalable/lock-on.svg diff --git a/tools/source_icons/scalable/lock_off.file b/tools/source_icons/scalable/lock_off.file deleted file mode 100644 index 87259ae1d..000000000 --- a/tools/source_icons/scalable/lock_off.file +++ /dev/null @@ -1 +0,0 @@ -lock_off.png,h10 diff --git a/tools/source_icons/scalable/lock_on.file b/tools/source_icons/scalable/lock_on.file deleted file mode 100644 index 8a599e360..000000000 --- a/tools/source_icons/scalable/lock_on.file +++ /dev/null @@ -1 +0,0 @@ -lock_on.png,h10 diff --git a/tools/source_icons/scalable/media-usb.file b/tools/source_icons/scalable/media-usb.file new file mode 100644 index 000000000..3012badee --- /dev/null +++ b/tools/source_icons/scalable/media-usb.file @@ -0,0 +1 @@ +media-usb.png,h18,actions diff --git a/tools/source_icons/scalable/media-usb.svg b/tools/source_icons/scalable/media-usb.svg new file mode 100644 index 000000000..e9b36285c --- /dev/null +++ b/tools/source_icons/scalable/media-usb.svg @@ -0,0 +1,2590 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/meta.file b/tools/source_icons/scalable/meta.file new file mode 100644 index 000000000..1e54e9fd2 --- /dev/null +++ b/tools/source_icons/scalable/meta.file @@ -0,0 +1 @@ +meta.png,w24 diff --git a/tools/source_icons/scalable/exif.svg b/tools/source_icons/scalable/meta.svg similarity index 100% rename from tools/source_icons/scalable/exif.svg rename to tools/source_icons/scalable/meta.svg diff --git a/tools/source_icons/scalable/new-detail-window.file b/tools/source_icons/scalable/new-detail-window.file new file mode 100644 index 000000000..1f0a542d4 --- /dev/null +++ b/tools/source_icons/scalable/new-detail-window.file @@ -0,0 +1 @@ +new-detail-window.png,w22 diff --git a/tools/source_icons/scalable/new_detail_window.svg b/tools/source_icons/scalable/new-detail-window.svg similarity index 100% rename from tools/source_icons/scalable/new_detail_window.svg rename to tools/source_icons/scalable/new-detail-window.svg diff --git a/tools/source_icons/scalable/new_detail_window.file b/tools/source_icons/scalable/new_detail_window.file deleted file mode 100644 index 8a7ff1ede..000000000 --- a/tools/source_icons/scalable/new_detail_window.file +++ /dev/null @@ -1 +0,0 @@ -new_detail_window.png,w22 diff --git a/tools/source_icons/scalable/openhand.file b/tools/source_icons/scalable/openhand.file index f245a5134..8b792946a 100644 --- a/tools/source_icons/scalable/openhand.file +++ b/tools/source_icons/scalable/openhand.file @@ -1 +1 @@ -openhand_gray22.png,w22 +openhand.png,w22 diff --git a/tools/source_icons/scalable/panel-to-bottom.file b/tools/source_icons/scalable/panel-to-bottom.file new file mode 100644 index 000000000..34fead066 --- /dev/null +++ b/tools/source_icons/scalable/panel-to-bottom.file @@ -0,0 +1 @@ +panel-to-bottom.png,w22 diff --git a/tools/source_icons/scalable/panel_to_bottom.svg b/tools/source_icons/scalable/panel-to-bottom.svg similarity index 100% rename from tools/source_icons/scalable/panel_to_bottom.svg rename to tools/source_icons/scalable/panel-to-bottom.svg diff --git a/tools/source_icons/scalable/panel-to-left.file b/tools/source_icons/scalable/panel-to-left.file new file mode 100644 index 000000000..9fc879f5c --- /dev/null +++ b/tools/source_icons/scalable/panel-to-left.file @@ -0,0 +1 @@ +panel-to-left.png,h22 diff --git a/tools/source_icons/scalable/panel_to_left.svg b/tools/source_icons/scalable/panel-to-left.svg similarity index 100% rename from tools/source_icons/scalable/panel_to_left.svg rename to tools/source_icons/scalable/panel-to-left.svg diff --git a/tools/source_icons/scalable/panel-to-right.file b/tools/source_icons/scalable/panel-to-right.file new file mode 100644 index 000000000..fbaa341e0 --- /dev/null +++ b/tools/source_icons/scalable/panel-to-right.file @@ -0,0 +1 @@ +panel-to-right.png,h22 diff --git a/tools/source_icons/scalable/panel_to_right.svg b/tools/source_icons/scalable/panel-to-right.svg similarity index 100% rename from tools/source_icons/scalable/panel_to_right.svg rename to tools/source_icons/scalable/panel-to-right.svg diff --git a/tools/source_icons/scalable/panel-to-top.file b/tools/source_icons/scalable/panel-to-top.file new file mode 100644 index 000000000..4de3e9260 --- /dev/null +++ b/tools/source_icons/scalable/panel-to-top.file @@ -0,0 +1 @@ +panel-to-top.png,w22 diff --git a/tools/source_icons/scalable/panel_to_top.svg b/tools/source_icons/scalable/panel-to-top.svg similarity index 100% rename from tools/source_icons/scalable/panel_to_top.svg rename to tools/source_icons/scalable/panel-to-top.svg diff --git a/tools/source_icons/scalable/panel_to_bottom.file b/tools/source_icons/scalable/panel_to_bottom.file deleted file mode 100644 index 3eb75d919..000000000 --- a/tools/source_icons/scalable/panel_to_bottom.file +++ /dev/null @@ -1 +0,0 @@ -panel_to_bottom.png,w22 diff --git a/tools/source_icons/scalable/panel_to_left.file b/tools/source_icons/scalable/panel_to_left.file deleted file mode 100644 index e596423ef..000000000 --- a/tools/source_icons/scalable/panel_to_left.file +++ /dev/null @@ -1 +0,0 @@ -panel_to_left.png,h22 diff --git a/tools/source_icons/scalable/panel_to_right.file b/tools/source_icons/scalable/panel_to_right.file deleted file mode 100644 index 91e48b952..000000000 --- a/tools/source_icons/scalable/panel_to_right.file +++ /dev/null @@ -1 +0,0 @@ -panel_to_right.png,h22 diff --git a/tools/source_icons/scalable/panel_to_top.file b/tools/source_icons/scalable/panel_to_top.file deleted file mode 100644 index d497f9d68..000000000 --- a/tools/source_icons/scalable/panel_to_top.file +++ /dev/null @@ -1 +0,0 @@ -panel_to_top.png,w22 diff --git a/tools/source_icons/scalable/popuparrow.file b/tools/source_icons/scalable/popuparrow.file new file mode 100644 index 000000000..a33c25a9a --- /dev/null +++ b/tools/source_icons/scalable/popuparrow.file @@ -0,0 +1 @@ +popuparrow.png,h6 diff --git a/tools/source_icons/scalable/popuparrow.svg b/tools/source_icons/scalable/popuparrow.svg new file mode 100644 index 000000000..3328dbfb4 --- /dev/null +++ b/tools/source_icons/scalable/popuparrow.svg @@ -0,0 +1,355 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/ratednot.file b/tools/source_icons/scalable/ratednot.file index 978d99310..71fc46456 100644 --- a/tools/source_icons/scalable/ratednot.file +++ b/tools/source_icons/scalable/ratednot.file @@ -1 +1 @@ -ratednot_10.png,h10 +ratednot.png,h10 diff --git a/tools/source_icons/scalable/ratednotg.file b/tools/source_icons/scalable/ratednotg.file index e3561dc4f..136adbb25 100644 --- a/tools/source_icons/scalable/ratednotg.file +++ b/tools/source_icons/scalable/ratednotg.file @@ -1 +1 @@ -ratednotg_10.png,h10 +ratednotg.png,h10 diff --git a/tools/source_icons/scalable/raw.file b/tools/source_icons/scalable/raw.file index e248a9234..675289269 100644 --- a/tools/source_icons/scalable/raw.file +++ b/tools/source_icons/scalable/raw.file @@ -1 +1 @@ -raw-24.png,w24 +raw.png,w24 diff --git a/tools/source_icons/scalable/refresh-red.file b/tools/source_icons/scalable/refresh-red.file new file mode 100644 index 000000000..89432ea53 --- /dev/null +++ b/tools/source_icons/scalable/refresh-red.file @@ -0,0 +1 @@ +refresh-red.png,h13 diff --git a/tools/source_icons/scalable/refresh_red.svg b/tools/source_icons/scalable/refresh-red.svg similarity index 100% rename from tools/source_icons/scalable/refresh_red.svg rename to tools/source_icons/scalable/refresh-red.svg diff --git a/tools/source_icons/scalable/refresh-white.file b/tools/source_icons/scalable/refresh-white.file new file mode 100644 index 000000000..3fc99e981 --- /dev/null +++ b/tools/source_icons/scalable/refresh-white.file @@ -0,0 +1 @@ +refresh-white.png,h13 diff --git a/tools/source_icons/scalable/refresh_white.svg b/tools/source_icons/scalable/refresh-white.svg similarity index 100% rename from tools/source_icons/scalable/refresh_white.svg rename to tools/source_icons/scalable/refresh-white.svg diff --git a/tools/source_icons/scalable/refresh_red.file b/tools/source_icons/scalable/refresh_red.file deleted file mode 100644 index 970c9bca9..000000000 --- a/tools/source_icons/scalable/refresh_red.file +++ /dev/null @@ -1 +0,0 @@ -refresh_red.png,h13 diff --git a/tools/source_icons/scalable/refresh_white.file b/tools/source_icons/scalable/refresh_white.file deleted file mode 100644 index c2df67e69..000000000 --- a/tools/source_icons/scalable/refresh_white.file +++ /dev/null @@ -1 +0,0 @@ -refresh_white.png,h13 diff --git a/tools/source_icons/scalable/stock-flip-horizontal.file b/tools/source_icons/scalable/stock-flip-horizontal.file index 3eb6d0d1a..10da14b88 100644 --- a/tools/source_icons/scalable/stock-flip-horizontal.file +++ b/tools/source_icons/scalable/stock-flip-horizontal.file @@ -1 +1 @@ -stock-flip-horizontal-16.png,w22 +stock-flip-horizontal.png,w22 diff --git a/tools/source_icons/scalable/stock-flip-vertical.file b/tools/source_icons/scalable/stock-flip-vertical.file index da8e15ea8..ac00ea29c 100644 --- a/tools/source_icons/scalable/stock-flip-vertical.file +++ b/tools/source_icons/scalable/stock-flip-vertical.file @@ -1 +1 @@ -stock-flip-vertical-16.png,w22 +stock-flip-vertical.png,w22 diff --git a/tools/source_icons/scalable/stock-rotate-270.file b/tools/source_icons/scalable/stock-rotate-270.file index 9ed0b796f..c2a4f8db9 100644 --- a/tools/source_icons/scalable/stock-rotate-270.file +++ b/tools/source_icons/scalable/stock-rotate-270.file @@ -1 +1 @@ -stock-rotate-270-16.png,w22 +stock-rotate-270.png,w22 diff --git a/tools/source_icons/scalable/stock-rotate-90.file b/tools/source_icons/scalable/stock-rotate-90.file index df47b00ea..5e24f507f 100644 --- a/tools/source_icons/scalable/stock-rotate-90.file +++ b/tools/source_icons/scalable/stock-rotate-90.file @@ -1 +1 @@ -stock-rotate-90-16.png,w22 +stock-rotate-90.png,w22 diff --git a/tools/source_icons/scalable/stock-tool-color-picker-short.file b/tools/source_icons/scalable/stock-tool-color-picker-short.file deleted file mode 100644 index ebd6434dd..000000000 --- a/tools/source_icons/scalable/stock-tool-color-picker-short.file +++ /dev/null @@ -1 +0,0 @@ -wbpicker16_test.png,h22 diff --git a/tools/source_icons/scalable/stock-tool-color-picker-short.svg b/tools/source_icons/scalable/stock-tool-color-picker-short.svg deleted file mode 100644 index 8e944e049..000000000 --- a/tools/source_icons/scalable/stock-tool-color-picker-short.svg +++ /dev/null @@ -1,4720 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/source_icons/scalable/straighten.file b/tools/source_icons/scalable/straighten.file index 2d92b0b33..a41c40c49 100644 --- a/tools/source_icons/scalable/straighten.file +++ b/tools/source_icons/scalable/straighten.file @@ -1,2 +1,2 @@ -straighten22.png,w22 -straighten16.png,h18 +straighten.png,w22 +straighten-small.png,h18 diff --git a/tools/source_icons/scalable/transform.file b/tools/source_icons/scalable/transform.file index 9adcbc7dd..365df73ba 100644 --- a/tools/source_icons/scalable/transform.file +++ b/tools/source_icons/scalable/transform.file @@ -1 +1 @@ -transform-24.png,w24 +transform.png,w24 diff --git a/tools/source_icons/script/change_colour.bash b/tools/source_icons/script/change_colour.bash index 8517bb9b1..a3e63d22f 100755 --- a/tools/source_icons/script/change_colour.bash +++ b/tools/source_icons/script/change_colour.bash @@ -49,4 +49,4 @@ do done -cp $DIR_IN/index.theme $DIR_OUT +#cp $DIR_IN/index.theme $DIR_OUT