From 1270c77f3bcc25c9081f18a54477af947b769248 Mon Sep 17 00:00:00 2001 From: natureh Date: Tue, 18 Oct 2011 03:56:33 +0200 Subject: [PATCH] First update of the iconset on behalf of Phil, see issue 1012: Proposal of an icon theme for RT ...still work in progress --- rtdata/themes/09-Gray-Orange.gtkrc | 1 + rtdata/themes/17-Gray-Red.gtkrc | 1 + rtdata/themes/21-Gray-Gray.gtkrc | 1 + rtdata/themes/25-Gray-Gray.gtkrc | 1 + rtdata/themes/25-Gray-Purple.gtkrc | 1 + rtdata/themes/25-Gray-Red.gtkrc | 1 + rtdata/themes/37-Gray-Red-Textured.gtkrc | 1 + rtdata/themes/37-Gray-Red.gtkrc | 1 + rtdata/themes/63-Gray-Cyan.gtkrc | 1 + rtdata/themes/92-Beige-DarkCyan.gtkrc | 1 + rtdata/themes/Default.gtkrc | 2 ++ rtgui/adjuster.cc | 4 ++-- rtgui/batchqueuepanel.cc | 4 ++-- rtgui/curveeditorgroup.cc | 2 +- rtgui/darkframe.cc | 3 ++- rtgui/dirbrowser.cc | 6 +++--- rtgui/editorpanel.cc | 2 +- rtgui/editwindow.cc | 5 +++-- rtgui/exifpanel.cc | 4 ++-- rtgui/favoritbrowser.cc | 5 +++-- rtgui/filecatalog.cc | 2 +- rtgui/filethumbnailbuttonset.cc | 8 ++++---- rtgui/flatfield.cc | 3 ++- rtgui/icmpanel.cc | 3 ++- rtgui/iptcpanel.cc | 8 ++++---- rtgui/main.cc | 5 +++++ rtgui/placesbrowser.cc | 5 +++-- rtgui/preferences.cc | 6 +++--- rtgui/profilepanel.cc | 9 +++++---- rtgui/rtimage.cc | 12 ++++++++++-- rtgui/rtwindow.cc | 6 +++--- rtgui/saveasdlg.cc | 5 +++-- rtgui/zoompanel.cc | 2 +- 33 files changed, 77 insertions(+), 44 deletions(-) diff --git a/rtdata/themes/09-Gray-Orange.gtkrc b/rtdata/themes/09-Gray-Orange.gtkrc index c37f31f9f..11b82bb25 100644 --- a/rtdata/themes/09-Gray-Orange.gtkrc +++ b/rtdata/themes/09-Gray-Orange.gtkrc @@ -465,3 +465,4 @@ widget "*.histButton" style "clearlooks-histButton" ################################################################## widget "gtk-tooltip*" style "clearlooks-tooltips" +gtk-icon-theme-name="Dark" diff --git a/rtdata/themes/17-Gray-Red.gtkrc b/rtdata/themes/17-Gray-Red.gtkrc index c71c8458b..6ff72761c 100644 --- a/rtdata/themes/17-Gray-Red.gtkrc +++ b/rtdata/themes/17-Gray-Red.gtkrc @@ -465,3 +465,4 @@ widget "*.histButton" style "clearlooks-histButton" ################################################################## widget "gtk-tooltip*" style "clearlooks-tooltips" +gtk-icon-theme-name="Dark" diff --git a/rtdata/themes/21-Gray-Gray.gtkrc b/rtdata/themes/21-Gray-Gray.gtkrc index 0b6117a9f..f7c723732 100644 --- a/rtdata/themes/21-Gray-Gray.gtkrc +++ b/rtdata/themes/21-Gray-Gray.gtkrc @@ -476,3 +476,4 @@ widget "*.histButton" style "clearlooks-histButton" ################################################################## widget "gtk-tooltip*" style "clearlooks-tooltips" +gtk-icon-theme-name="Dark" diff --git a/rtdata/themes/25-Gray-Gray.gtkrc b/rtdata/themes/25-Gray-Gray.gtkrc index 3968308c2..a75ddbbe9 100644 --- a/rtdata/themes/25-Gray-Gray.gtkrc +++ b/rtdata/themes/25-Gray-Gray.gtkrc @@ -465,3 +465,4 @@ widget "*.histButton" style "clearlooks-histButton" ################################################################## widget "gtk-tooltip*" style "clearlooks-tooltips" +gtk-icon-theme-name="Dark" diff --git a/rtdata/themes/25-Gray-Purple.gtkrc b/rtdata/themes/25-Gray-Purple.gtkrc index 022811d51..e571b08e9 100644 --- a/rtdata/themes/25-Gray-Purple.gtkrc +++ b/rtdata/themes/25-Gray-Purple.gtkrc @@ -465,3 +465,4 @@ widget "*.histButton" style "clearlooks-histButton" ################################################################## widget "gtk-tooltip*" style "clearlooks-tooltips" +gtk-icon-theme-name="Dark" diff --git a/rtdata/themes/25-Gray-Red.gtkrc b/rtdata/themes/25-Gray-Red.gtkrc index e67821f79..427ee936d 100644 --- a/rtdata/themes/25-Gray-Red.gtkrc +++ b/rtdata/themes/25-Gray-Red.gtkrc @@ -465,3 +465,4 @@ widget "*.histButton" style "clearlooks-histButton" ################################################################## widget "gtk-tooltip*" style "clearlooks-tooltips" +gtk-icon-theme-name="Dark" diff --git a/rtdata/themes/37-Gray-Red-Textured.gtkrc b/rtdata/themes/37-Gray-Red-Textured.gtkrc index a14919e3d..5f18b01f7 100644 --- a/rtdata/themes/37-Gray-Red-Textured.gtkrc +++ b/rtdata/themes/37-Gray-Red-Textured.gtkrc @@ -816,3 +816,4 @@ widget "*.histButton" style "clearlooks-histButton" ################################################################## widget "gtk-tooltip*" style "clearlooks-tooltips" +gtk-icon-theme-name="Dark" diff --git a/rtdata/themes/37-Gray-Red.gtkrc b/rtdata/themes/37-Gray-Red.gtkrc index 021820a8b..65a9f2ff1 100644 --- a/rtdata/themes/37-Gray-Red.gtkrc +++ b/rtdata/themes/37-Gray-Red.gtkrc @@ -466,3 +466,4 @@ widget "*.histButton" style "clearlooks-histButton" ################################################################## widget "gtk-tooltip*" style "clearlooks-tooltips" +gtk-icon-theme-name="Dark" diff --git a/rtdata/themes/63-Gray-Cyan.gtkrc b/rtdata/themes/63-Gray-Cyan.gtkrc index 1e4579d77..b45a21c8e 100644 --- a/rtdata/themes/63-Gray-Cyan.gtkrc +++ b/rtdata/themes/63-Gray-Cyan.gtkrc @@ -466,3 +466,4 @@ widget "*.histButton" style "clearlooks-histButton" ################################################################## widget "gtk-tooltip*" style "clearlooks-tooltips" +gtk-icon-theme-name="Light" diff --git a/rtdata/themes/92-Beige-DarkCyan.gtkrc b/rtdata/themes/92-Beige-DarkCyan.gtkrc index 3172ac645..195c8309c 100644 --- a/rtdata/themes/92-Beige-DarkCyan.gtkrc +++ b/rtdata/themes/92-Beige-DarkCyan.gtkrc @@ -453,3 +453,4 @@ widget "*.histButton" style "clearlooks-histButton" ################################################################## widget "gtk-tooltip*" style "clearlooks-tooltips" +gtk-icon-theme-name="Light" diff --git a/rtdata/themes/Default.gtkrc b/rtdata/themes/Default.gtkrc index 4bd7a0207..fc74d755b 100644 --- a/rtdata/themes/Default.gtkrc +++ b/rtdata/themes/Default.gtkrc @@ -406,3 +406,5 @@ widget "*.histButton" style "clearlooks-histButton" ################################################################## widget "gtk-tooltip*" style "clearlooks-tooltips" + +gtk-icon-theme-name="Light" diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc index d15bd4011..62126a5af 100644 --- a/rtgui/adjuster.cc +++ b/rtgui/adjuster.cc @@ -59,7 +59,7 @@ Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep hbox->pack_start (*label); reset = Gtk::manage (new Gtk::Button ()); - reset->add (*Gtk::manage (new RTImage ("default-settings-ltr.png", "default-settings-rtl.png"))); + reset->add (*Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png"))); reset->set_relief (Gtk::RELIEF_NONE); reset->set_border_width (0); reset->set_tooltip_text (M("ADJUSTER_RESET_TO_DEFAULT")); @@ -122,7 +122,7 @@ Adjuster::Adjuster (Gtk::Image *imgIcon, double vmin, double vmax, double vstep, reset = Gtk::manage (new Gtk::Button ()); - reset->add (*Gtk::manage (new RTImage ("default-settings-ltr.png", "default-settings-rtl.png"))); + reset->add (*Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png"))); reset->set_relief (Gtk::RELIEF_NONE); reset->set_border_width (0); reset->set_tooltip_text (M("ADJUSTER_RESET_TO_DEFAULT")); diff --git a/rtgui/batchqueuepanel.cc b/rtgui/batchqueuepanel.cc index b502faa42..a17347916 100644 --- a/rtgui/batchqueuepanel.cc +++ b/rtgui/batchqueuepanel.cc @@ -42,9 +42,9 @@ BatchQueuePanel::BatchQueuePanel () { stop->set_active (true); autoStart->set_active (options.procQueueEnabled); - start->set_image (*Gtk::manage (new Gtk::Image (Gtk::StockID("gtk-media-play"), Gtk::ICON_SIZE_BUTTON))); + start->set_image (*Gtk::manage (new RTImage ("gtk-media-play.png"))); startConnection = start->signal_toggled().connect (sigc::mem_fun(*this, &BatchQueuePanel::startBatchProc)); - stop->set_image (*Gtk::manage (new Gtk::Image (Gtk::StockID("gtk-media-stop"), Gtk::ICON_SIZE_BUTTON))); + stop->set_image (*Gtk::manage (new RTImage ("gtk-media-stop.png"))); stopConnection = stop->signal_toggled().connect (sigc::mem_fun(*this, &BatchQueuePanel::stopBatchProc)); batchQueueButtonBox->pack_start (*start, Gtk::PACK_SHRINK, 4); batchQueueButtonBox->pack_start (*stop, Gtk::PACK_SHRINK, 4); diff --git a/rtgui/curveeditorgroup.cc b/rtgui/curveeditorgroup.cc index 2ed7c201f..89aca03a9 100644 --- a/rtgui/curveeditorgroup.cc +++ b/rtgui/curveeditorgroup.cc @@ -91,7 +91,7 @@ void CurveEditorGroup::newLine() { headerBox->pack_start(*curveGroupLabel, Gtk::PACK_SHRINK, 2); curve_reset = Gtk::manage (new Gtk::Button ()); - curve_reset->add (*Gtk::manage (new RTImage ("default-settings-ltr.png", "default-settings-rtl.png"))); + curve_reset->add (*Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png"))); curve_reset->set_relief (Gtk::RELIEF_NONE); curve_reset->set_border_width (0); curve_reset->set_tooltip_text (M("CURVEEDITOR_TOOLTIPLINEAR")); diff --git a/rtgui/darkframe.cc b/rtgui/darkframe.cc index 9bd15e5bc..d1dce0779 100644 --- a/rtgui/darkframe.cc +++ b/rtgui/darkframe.cc @@ -21,6 +21,7 @@ #include #include #include +#include using namespace rtengine; using namespace rtengine::procparams; @@ -31,7 +32,7 @@ DarkFrame::DarkFrame () : Gtk::VBox(), FoldableToolPanel(this) darkFrameFile = Gtk::manage(new MyFileChooserButton(M("TP_DARKFRAME_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN)); dfLabel = Gtk::manage(new Gtk::Label(M("GENERAL_FILE"))); btnReset = Gtk::manage(new Gtk::Button()); - btnReset->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON))); + btnReset->set_image (*Gtk::manage(new RTImage ("gtk-cancel.png"))); hbdf->pack_start(*dfLabel, Gtk::PACK_SHRINK, 4); hbdf->pack_start(*darkFrameFile); hbdf->pack_start(*btnReset, Gtk::PACK_SHRINK, 4); diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc index a6711e696..7e7c9534e 100644 --- a/rtgui/dirbrowser.cc +++ b/rtgui/dirbrowser.cc @@ -57,9 +57,9 @@ void DirBrowser::fillDirTree () { openfolder = safe_create_from_file ("folder_open.png"); closedfolder = safe_create_from_file ("folder.png"); - icdrom = safe_create_from_file ("cdrom.png"); - ifloppy = safe_create_from_file ("floppy.png"); - ihdd = safe_create_from_file ("hdd.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"); inetwork = safe_create_from_file ("network.png"); diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index 750479164..499b03ef8 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -173,7 +173,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel) saveimgas->add(*saveButtonImage); saveimgas->set_tooltip_markup(M("MAIN_BUTTON_SAVE_TOOLTIP")); - Gtk::Image *queueButtonImage = Gtk::manage (new Gtk::Image (Gtk::StockID("gtk-execute"), Gtk::ICON_SIZE_BUTTON)); + Gtk::Image *queueButtonImage = Gtk::manage (new RTImage ("processing.png")); queueimg = Gtk::manage (new Gtk::Button ()); queueimg->add(*queueButtonImage); queueimg->set_tooltip_markup(M("MAIN_BUTTON_PUTTOQUEUE_TOOLTIP")); diff --git a/rtgui/editwindow.cc b/rtgui/editwindow.cc index 208e58d35..bcfe61fd7 100644 --- a/rtgui/editwindow.cc +++ b/rtgui/editwindow.cc @@ -21,6 +21,7 @@ #include #include #include +#include static EditWindow* editWnd = NULL; @@ -123,10 +124,10 @@ void EditWindow::addEditorPanel (EditorPanel* ep, const std::string &name) { // construct closeable tab for the image Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ()); - hb->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::FILE, Gtk::ICON_SIZE_MENU))); + hb->pack_start (*Gtk::manage (new RTImage ("rtwindow.png"))); hb->pack_start (*Gtk::manage (new Gtk::Label (name))); Gtk::Button* closeb = Gtk::manage (new Gtk::Button ()); - closeb->set_image (*Gtk::manage(new Gtk::Image (Gtk::Stock::CLOSE, Gtk::ICON_SIZE_MENU))); + closeb->set_image (*Gtk::manage(new RTImage ("gtk-close.png"))); closeb->set_relief (Gtk::RELIEF_NONE); closeb->set_focus_on_click (false); // make the button as small as possible diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc index 4be631af6..181b701e0 100644 --- a/rtgui/exifpanel.cc +++ b/rtgui/exifpanel.cc @@ -49,7 +49,7 @@ ExifPanel::ExifPanel () : idata(NULL) { delicon = safe_create_from_file ("deltags.png"); keepicon = safe_create_from_file ("addtags.png"); - editicon = safe_create_from_file ("logoicon16.png"); + editicon = safe_create_from_file ("add.png"); Gtk::TreeView::Column *viewcol = Gtk::manage(new Gtk::TreeView::Column ("Field Name")); Gtk::CellRendererPixbuf* render_pb = Gtk::manage(new Gtk::CellRendererPixbuf ()); @@ -361,7 +361,7 @@ void ExifPanel::resetAllPressed () { void ExifPanel::addPressed () { Gtk::Dialog* dialog = new Gtk::Dialog (M("EXIFPANEL_ADDTAGDLG_TITLE"), *((Gtk::Window*)get_toplevel()), true, true); - dialog->add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK); + dialog->add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK); dialog->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); Gtk::HBox* hb1 = new Gtk::HBox (); diff --git a/rtgui/favoritbrowser.cc b/rtgui/favoritbrowser.cc index 5280a83a6..8c84ab2d9 100644 --- a/rtgui/favoritbrowser.cc +++ b/rtgui/favoritbrowser.cc @@ -18,6 +18,7 @@ */ #include #include +#include FavoritBrowser::FavoritBrowser () : listener (NULL), lastSelectedDir ("") { @@ -49,8 +50,8 @@ 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 Gtk::Image (Gtk::Stock::ADD, Gtk::ICON_SIZE_MENU))); - del->set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REMOVE, Gtk::ICON_SIZE_MENU))); + add->set_image (*Gtk::manage (new RTImage ("add.png"))); + del->set_image (*Gtk::manage (new RTImage ("list-remove.png"))); Gtk::HBox* buttonBox = Gtk::manage (new Gtk::HBox ()); buttonBox->pack_start (*add); buttonBox->pack_start (*del); diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index b83ecfe78..7f325cce8 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -64,7 +64,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : trashButtonBox = Gtk::manage( new Gtk::VBox ); Gtk::Button* emptyT = Gtk::manage( new Gtk::Button (M("FILEBROWSER_EMPTYTRASH"))); emptyT->set_tooltip_markup (M("FILEBROWSER_EMPTYTRASHHINT")); - emptyT->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-delete"), Gtk::ICON_SIZE_BUTTON))); + emptyT->set_image (*Gtk::manage(new RTImage ("trash.png"))); emptyT->signal_pressed().connect (sigc::mem_fun(*this, &FileCatalog::emptyTrash)); trashButtonBox->pack_start (*emptyT, Gtk::PACK_SHRINK, 4); emptyT->show (); diff --git a/rtgui/filethumbnailbuttonset.cc b/rtgui/filethumbnailbuttonset.cc index f32e09a19..9a111fbae 100644 --- a/rtgui/filethumbnailbuttonset.cc +++ b/rtgui/filethumbnailbuttonset.cc @@ -40,12 +40,12 @@ Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_5; FileThumbnailButtonSet::FileThumbnailButtonSet (FileBrowserEntry* myEntry) { if (!iconsLoaded) { - unRankIcon = safe_create_from_png ("unrated.png"); + unRankIcon = safe_create_from_png ("ratednotg_10.png"); rankIcon = safe_create_from_png ("rated.png"); gRankIcon = safe_create_from_png ("grayrated.png"); - trashIcon = safe_create_from_png ("trash.png"); - unTrashIcon = safe_create_from_png ("undelete.png"); - processIcon = safe_create_from_png ("processing.png"); + trashIcon = safe_create_from_png ("trash-thumbnail.png"); + unTrashIcon = safe_create_from_png ("undelete-thumbnail.png"); + processIcon = safe_create_from_png ("processing-thumbnail.png"); colorLabelIcon_0 = safe_create_from_png ("nocolorlabel.png"); colorLabelIcon_1 = safe_create_from_png ("clabel1.png"); diff --git a/rtgui/flatfield.cc b/rtgui/flatfield.cc index 9213cf7d8..32a6b43aa 100644 --- a/rtgui/flatfield.cc +++ b/rtgui/flatfield.cc @@ -21,6 +21,7 @@ #include #include #include +#include using namespace rtengine; using namespace rtengine::procparams; @@ -31,7 +32,7 @@ FlatField::FlatField () : Gtk::VBox(), FoldableToolPanel(this) flatFieldFile = Gtk::manage(new MyFileChooserButton(M("TP_FLATFIELD_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN)); ffLabel = Gtk::manage(new Gtk::Label(M("GENERAL_FILE"))); flatFieldFileReset = Gtk::manage(new Gtk::Button()); - flatFieldFileReset->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON))); + flatFieldFileReset->set_image (*Gtk::manage(new RTImage ("gtk-cancel.png"))); hbff->pack_start(*ffLabel, Gtk::PACK_SHRINK, 4); hbff->pack_start(*flatFieldFile); hbff->pack_start(*flatFieldFileReset, Gtk::PACK_SHRINK, 4); diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index ab4fe4b25..99b375d58 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -21,6 +21,7 @@ #include #include #include +#include using namespace rtengine; using namespace rtengine::procparams; @@ -77,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 Gtk::Image (Gtk::StockID("gtk-save"), Gtk::ICON_SIZE_BUTTON))); + saveRef->set_image (*Gtk::manage (new RTImage ("save_hdd_01.png"))); pack_start (*saveRef, Gtk::PACK_SHRINK, 4); diff --git a/rtgui/iptcpanel.cc b/rtgui/iptcpanel.cc index 0b698ed1e..28a60bb38 100644 --- a/rtgui/iptcpanel.cc +++ b/rtgui/iptcpanel.cc @@ -264,19 +264,19 @@ IPTCPanel::IPTCPanel () { Gtk::HBox* bbox = Gtk::manage( new Gtk::HBox () ); reset = Gtk::manage( new Gtk::Button (M("IPTCPANEL_RESET")) ); - reset->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID ("gtk-undo"), Gtk::IconSize (2)))); + reset->set_image (*Gtk::manage(new RTImage ("gtk-undo-ltr.png", "gtk-undo-rtl.png"))); bbox->pack_start (*reset); file = Gtk::manage( new Gtk::Button (M("IPTCPANEL_EMBEDDED")) ); - file->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID ("gtk-open"), Gtk::IconSize (2)))); + file->set_image (*Gtk::manage(new RTImage ("folder_open.png"))); bbox->pack_start (*file); copy = Gtk::manage( new Gtk::Button () ); - copy->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID ("gtk-copy"), Gtk::IconSize (2)))); + copy->set_image (*Gtk::manage(new RTImage ("edit-copy.png"))); bbox->pack_start (*copy, Gtk::PACK_SHRINK, 0); paste = Gtk::manage( new Gtk::Button () ); - paste->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID ("gtk-paste"), Gtk::IconSize (2)))); + paste->set_image (*Gtk::manage(new RTImage ("edit-paste.png"))); bbox->pack_start (*paste, Gtk::PACK_SHRINK, 0); pack_end (*bbox, Gtk::PACK_SHRINK, 2); diff --git a/rtgui/main.cc b/rtgui/main.cc index 6272eebd8..c0699fdcf 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -138,6 +138,10 @@ int main(int argc, char **argv) } Gtk::Main m(&argc, &argv); + Glib::ustring icon_path = Glib::build_filename(argv0,"images"); + Glib::RefPtr defaultIconTheme = Gtk::IconTheme::get_default(); + defaultIconTheme->append_search_path(icon_path); + RTImage::setPaths(options); #ifndef WIN32 @@ -150,6 +154,7 @@ int main(int argc, char **argv) printf("Error: no default settings to update!\n"); #endif + RTWindow *rtWindow = new class RTWindow(); gdk_threads_enter (); m.run(*rtWindow); diff --git a/rtgui/placesbrowser.cc b/rtgui/placesbrowser.cc index 51d12f5f0..e22ecc901 100644 --- a/rtgui/placesbrowser.cc +++ b/rtgui/placesbrowser.cc @@ -21,6 +21,7 @@ #include #include #include +#include PlacesBrowser::PlacesBrowser () : listener (NULL) { @@ -30,8 +31,8 @@ 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 Gtk::Image (Gtk::Stock::ADD, Gtk::ICON_SIZE_MENU))); - del->set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REMOVE, Gtk::ICON_SIZE_MENU))); + add->set_image (*Gtk::manage (new RTImage ("add.png"))); + del->set_image (*Gtk::manage (new RTImage ("list-remove.png"))); Gtk::HBox* buttonBox = Gtk::manage (new Gtk::HBox ()); buttonBox->pack_start (*add); buttonBox->pack_start (*del); diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 235e5421b..4a1b5b6b6 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -63,8 +63,8 @@ Preferences::Preferences (RTWindow *rtwindow):parent(rtwindow) { 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 Gtk::Image (Gtk::StockID("gtk-ok"), Gtk::ICON_SIZE_BUTTON))); - cancel->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON))); + ok->set_image (*Gtk::manage(new RTImage ("addtags.png"))); + cancel->set_image (*Gtk::manage(new RTImage ("gtk-cancel.png"))); about->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::aboutPressed) ); @@ -708,7 +708,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 Gtk::Image (Gtk::StockID("gtk-open"), Gtk::ICON_SIZE_BUTTON))); + sdselect->set_image (*Gtk::manage(new RTImage ("folder_open.png"))); Gtk::RadioButton::Group opts = sdcurrent->get_group(); sdlast->set_group (opts); diff --git a/rtgui/profilepanel.cc b/rtgui/profilepanel.cc index a73d65295..9bab288fd 100644 --- a/rtgui/profilepanel.cc +++ b/rtgui/profilepanel.cc @@ -22,6 +22,7 @@ #include #include #include +#include using namespace rtengine; using namespace rtengine::procparams; @@ -40,13 +41,13 @@ ProfilePanel::ProfilePanel () { pack_start (*hbox, Gtk::PACK_SHRINK, 4); save = Gtk::manage (new Gtk::Button ()); - save->add (*Gtk::manage (new Gtk::Image (Gtk::StockID("gtk-save"), Gtk::ICON_SIZE_BUTTON))); + save->add (*Gtk::manage (new RTImage ("save_hdd_01.png"))); load = Gtk::manage (new Gtk::Button ()); - load->add (*Gtk::manage (new Gtk::Image (Gtk::StockID("gtk-open"), Gtk::ICON_SIZE_BUTTON))); + load->add (*Gtk::manage (new RTImage ("folder_open.png"))); copy = Gtk::manage (new Gtk::Button ()); - copy->add (*Gtk::manage (new Gtk::Image (Gtk::StockID("gtk-copy"), Gtk::ICON_SIZE_BUTTON))); + copy->add (*Gtk::manage (new RTImage ("edit-copy.png"))); paste = Gtk::manage (new Gtk::Button ()); - paste->add (*Gtk::manage (new Gtk::Image (Gtk::StockID("gtk-paste"), Gtk::ICON_SIZE_BUTTON))); + paste->add (*Gtk::manage (new RTImage ("edit-paste.png"))); hbox->pack_start (*profiles); hbox->pack_start (*load, Gtk::PACK_SHRINK, 1); diff --git a/rtgui/rtimage.cc b/rtgui/rtimage.cc index 85ef34aca..eb377c01a 100644 --- a/rtgui/rtimage.cc +++ b/rtgui/rtimage.cc @@ -113,14 +113,22 @@ void RTImage::setPaths(Options &opt) { if (keyFile.has_key ("General", "Iconset")) iSet = keyFile.get_string ("General", "Iconset"); - if (iSet.length()) + if (iSet.length()) { + imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", Glib::build_filename(iSet, "actions")))); imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", iSet))); + imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", Glib::build_filename(iSet, "devices")))); + imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", Glib::build_filename(iSet, "places")))); + } iSet.clear(); if (keyFile.has_key ("General", "FallbackIconset")) iSet = keyFile.get_string ("General", "FallbackIconset"); - if (iSet.length()) + if (iSet.length()) { + imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", Glib::build_filename(iSet, "actions")))); imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", iSet))); + imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", Glib::build_filename(iSet, "devices")))); + imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", Glib::build_filename(iSet, "places")))); + } } // The images/ folder is the second fallback solution imagesPaths.push_back (Glib::build_filename(argv0, "images")); diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index aa17ceeb3..23abe1ae1 100644 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -153,7 +153,7 @@ RTWindow::RTWindow () Gtk::LinkButton* rtWeb = Gtk::manage (new Gtk::LinkButton ("http://rawtherapee.com")); //Gtk::Button* preferences = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_PREFERENCES")+"...")); Gtk::Button* preferences = Gtk::manage (new Gtk::Button ()); - preferences->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-preferences"), Gtk::ICON_SIZE_BUTTON))); + preferences->set_image (*Gtk::manage(new RTImage ("gtk-preferences.png"))); preferences->set_tooltip_markup (M("MAIN_BUTTON_PREFERENCES")); preferences->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::showPreferences) ); @@ -248,10 +248,10 @@ void RTWindow::addEditorPanel (EditorPanel* ep, const std::string &name) { // construct closeable tab for the image Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ()); - hb->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::FILE, Gtk::ICON_SIZE_MENU))); + hb->pack_start (*Gtk::manage (new RTImage ("rtwindow.png"))); hb->pack_start (*Gtk::manage (new Gtk::Label (name))); Gtk::Button* closeb = Gtk::manage (new Gtk::Button ()); - closeb->set_image (*Gtk::manage(new Gtk::Image (Gtk::Stock::CLOSE, Gtk::ICON_SIZE_MENU))); + closeb->set_image (*Gtk::manage(new RTImage ("gtk-close.png"))); closeb->set_relief (Gtk::RELIEF_NONE); closeb->set_focus_on_click (false); // make the button as small as possible diff --git a/rtgui/saveasdlg.cc b/rtgui/saveasdlg.cc index e8c3e4c7c..077fd5ef1 100644 --- a/rtgui/saveasdlg.cc +++ b/rtgui/saveasdlg.cc @@ -20,6 +20,7 @@ #include #include #include +#include extern Options options; SaveAsDialog::SaveAsDialog (Glib::ustring initialDir) { @@ -84,8 +85,8 @@ 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 Gtk::Image (Gtk::StockID("gtk-ok"), Gtk::ICON_SIZE_BUTTON))); - cancel->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON))); + ok->set_image (*Gtk::manage(new RTImage ("addtags.png"))); + cancel->set_image (*Gtk::manage(new RTImage ("gtk-cancel.png"))); ok->signal_clicked().connect( sigc::mem_fun(*this, &SaveAsDialog::okPressed) ); cancel->signal_clicked().connect( sigc::mem_fun(*this, &SaveAsDialog::cancelPressed) ); diff --git a/rtgui/zoompanel.cc b/rtgui/zoompanel.cc index d86aae816..5491d4148 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 ("add.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);