liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First update of the iconset on behalf of Phil, see issue 1012: Proposal of an icon theme for RT

Browse Source 
...still work in progress
This commit is contained in:
natureh
2011-10-18 03:56:33 +02:00
parent c7b5ff71fc
commit 1270c77f3b
33 changed files with 77 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtdata/themes/09-Gray-Orange.gtkrc
View File

@@ -465,3 +465,4 @@ widget "*.histButton" style "clearlooks-histButton"
################################################################## ##################################################################
widget "gtk-tooltip*" style "clearlooks-tooltips" widget "gtk-tooltip*" style "clearlooks-tooltips"
gtk-icon-theme-name="Dark"

1
rtdata/themes/17-Gray-Red.gtkrc
View File

@@ -465,3 +465,4 @@ widget "*.histButton" style "clearlooks-histButton"
################################################################## ##################################################################
widget "gtk-tooltip*" style "clearlooks-tooltips" widget "gtk-tooltip*" style "clearlooks-tooltips"
gtk-icon-theme-name="Dark"

1
rtdata/themes/21-Gray-Gray.gtkrc
View File

@@ -476,3 +476,4 @@ widget "*.histButton" style "clearlooks-histButton"
################################################################## ##################################################################
widget "gtk-tooltip*" style "clearlooks-tooltips" widget "gtk-tooltip*" style "clearlooks-tooltips"
gtk-icon-theme-name="Dark"

1
rtdata/themes/25-Gray-Gray.gtkrc
View File

@@ -465,3 +465,4 @@ widget "*.histButton" style "clearlooks-histButton"
################################################################## ##################################################################
widget "gtk-tooltip*" style "clearlooks-tooltips" widget "gtk-tooltip*" style "clearlooks-tooltips"
gtk-icon-theme-name="Dark"

1
rtdata/themes/25-Gray-Purple.gtkrc
View File

@@ -465,3 +465,4 @@ widget "*.histButton" style "clearlooks-histButton"
################################################################## ##################################################################
widget "gtk-tooltip*" style "clearlooks-tooltips" widget "gtk-tooltip*" style "clearlooks-tooltips"
gtk-icon-theme-name="Dark"

1
rtdata/themes/25-Gray-Red.gtkrc
View File

@@ -465,3 +465,4 @@ widget "*.histButton" style "clearlooks-histButton"
################################################################## ##################################################################
widget "gtk-tooltip*" style "clearlooks-tooltips" widget "gtk-tooltip*" style "clearlooks-tooltips"
gtk-icon-theme-name="Dark"

1
rtdata/themes/37-Gray-Red-Textured.gtkrc
View File

@@ -816,3 +816,4 @@ widget "*.histButton" style "clearlooks-histButton"
################################################################## ##################################################################
widget "gtk-tooltip*" style "clearlooks-tooltips" widget "gtk-tooltip*" style "clearlooks-tooltips"
gtk-icon-theme-name="Dark"

1
rtdata/themes/37-Gray-Red.gtkrc
View File

@@ -466,3 +466,4 @@ widget "*.histButton" style "clearlooks-histButton"
################################################################## ##################################################################
widget "gtk-tooltip*" style "clearlooks-tooltips" widget "gtk-tooltip*" style "clearlooks-tooltips"
gtk-icon-theme-name="Dark"

1
rtdata/themes/63-Gray-Cyan.gtkrc
View File

@@ -466,3 +466,4 @@ widget "*.histButton" style "clearlooks-histButton"
################################################################## ##################################################################
widget "gtk-tooltip*" style "clearlooks-tooltips" widget "gtk-tooltip*" style "clearlooks-tooltips"
gtk-icon-theme-name="Light"

1
rtdata/themes/92-Beige-DarkCyan.gtkrc
View File

@@ -453,3 +453,4 @@ widget "*.histButton" style "clearlooks-histButton"
################################################################## ##################################################################
widget "gtk-tooltip*" style "clearlooks-tooltips" widget "gtk-tooltip*" style "clearlooks-tooltips"
gtk-icon-theme-name="Light"

2
rtdata/themes/Default.gtkrc
View File

@@ -406,3 +406,5 @@ widget "*.histButton" style "clearlooks-histButton"
################################################################## ##################################################################
widget "gtk-tooltip*" style "clearlooks-tooltips" widget "gtk-tooltip*" style "clearlooks-tooltips"
gtk-icon-theme-name="Light"

4
rtgui/adjuster.cc
View File

@@ -59,7 +59,7 @@ Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep
hbox->pack_start (*label); hbox->pack_start (*label);
reset = Gtk::manage (new Gtk::Button ()); 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_relief (Gtk::RELIEF_NONE);
reset->set_border_width (0); reset->set_border_width (0);
reset->set_tooltip_text (M("ADJUSTER_RESET_TO_DEFAULT")); 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 = 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_relief (Gtk::RELIEF_NONE);
reset->set_border_width (0); reset->set_border_width (0);
reset->set_tooltip_text (M("ADJUSTER_RESET_TO_DEFAULT")); reset->set_tooltip_text (M("ADJUSTER_RESET_TO_DEFAULT"));

4
rtgui/batchqueuepanel.cc
View File

@@ -42,9 +42,9 @@ BatchQueuePanel::BatchQueuePanel () {
stop->set_active (true); stop->set_active (true);
autoStart->set_active (options.procQueueEnabled); 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)); 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)); stopConnection = stop->signal_toggled().connect (sigc::mem_fun(*this, &BatchQueuePanel::stopBatchProc));
batchQueueButtonBox->pack_start (*start, Gtk::PACK_SHRINK, 4); batchQueueButtonBox->pack_start (*start, Gtk::PACK_SHRINK, 4);
batchQueueButtonBox->pack_start (*stop, Gtk::PACK_SHRINK, 4); batchQueueButtonBox->pack_start (*stop, Gtk::PACK_SHRINK, 4);

2
rtgui/curveeditorgroup.cc
View File

@@ -91,7 +91,7 @@ void CurveEditorGroup::newLine() {
headerBox->pack_start(*curveGroupLabel, Gtk::PACK_SHRINK, 2); headerBox->pack_start(*curveGroupLabel, Gtk::PACK_SHRINK, 2);
curve_reset = Gtk::manage (new Gtk::Button ()); 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_relief (Gtk::RELIEF_NONE);
curve_reset->set_border_width (0); curve_reset->set_border_width (0);
curve_reset->set_tooltip_text (M("CURVEEDITOR_TOOLTIPLINEAR")); curve_reset->set_tooltip_text (M("CURVEEDITOR_TOOLTIPLINEAR"));

3
rtgui/darkframe.cc
View File

@@ -21,6 +21,7 @@
#include <guiutils.h> #include <guiutils.h>
#include <safegtk.h> #include <safegtk.h>
#include <sstream> #include <sstream>
#include <rtimage.h>
using namespace rtengine; using namespace rtengine;
using namespace rtengine::procparams; 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)); darkFrameFile = Gtk::manage(new MyFileChooserButton(M("TP_DARKFRAME_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN));
dfLabel = Gtk::manage(new Gtk::Label(M("GENERAL_FILE"))); dfLabel = Gtk::manage(new Gtk::Label(M("GENERAL_FILE")));
btnReset = Gtk::manage(new Gtk::Button()); 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(*dfLabel, Gtk::PACK_SHRINK, 4);
hbdf->pack_start(*darkFrameFile); hbdf->pack_start(*darkFrameFile);
hbdf->pack_start(*btnReset, Gtk::PACK_SHRINK, 4); hbdf->pack_start(*btnReset, Gtk::PACK_SHRINK, 4);

6
rtgui/dirbrowser.cc
View File

@@ -57,9 +57,9 @@ void DirBrowser::fillDirTree () {
openfolder = safe_create_from_file ("folder_open.png"); openfolder = safe_create_from_file ("folder_open.png");
closedfolder = safe_create_from_file ("folder.png"); closedfolder = safe_create_from_file ("folder.png");
icdrom = safe_create_from_file ("cdrom.png"); icdrom = safe_create_from_file ("drive-optical.png");
ifloppy = safe_create_from_file ("floppy.png"); ifloppy = safe_create_from_file ("drive-removable-media.png");
ihdd = safe_create_from_file ("hdd.png"); ihdd = safe_create_from_file ("drive-harddisk.png");
iremovable = safe_create_from_file ("usbpendrive.png"); iremovable = safe_create_from_file ("usbpendrive.png");
inetwork = safe_create_from_file ("network.png"); inetwork = safe_create_from_file ("network.png");

2
rtgui/editorpanel.cc
View File

@@ -173,7 +173,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
saveimgas->add(*saveButtonImage); saveimgas->add(*saveButtonImage);
saveimgas->set_tooltip_markup(M("MAIN_BUTTON_SAVE_TOOLTIP")); 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 = Gtk::manage (new Gtk::Button ());
queueimg->add(*queueButtonImage); queueimg->add(*queueButtonImage);
queueimg->set_tooltip_markup(M("MAIN_BUTTON_PUTTOQUEUE_TOOLTIP")); queueimg->set_tooltip_markup(M("MAIN_BUTTON_PUTTOQUEUE_TOOLTIP"));

5
rtgui/editwindow.cc
View File

@@ -21,6 +21,7 @@
#include <cursormanager.h> #include <cursormanager.h>
#include <rtwindow.h> #include <rtwindow.h>
#include <gtk/gtkwidget.h> #include <gtk/gtkwidget.h>
#include <rtimage.h>
static EditWindow* editWnd = NULL; static EditWindow* editWnd = NULL;
@@ -123,10 +124,10 @@ void EditWindow::addEditorPanel (EditorPanel* ep, const std::string &name) {
// construct closeable tab for the image // construct closeable tab for the image
Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ()); 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))); hb->pack_start (*Gtk::manage (new Gtk::Label (name)));
Gtk::Button* closeb = Gtk::manage (new Gtk::Button ()); 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_relief (Gtk::RELIEF_NONE);
closeb->set_focus_on_click (false); closeb->set_focus_on_click (false);
// make the button as small as possible // make the button as small as possible

4
rtgui/exifpanel.cc
View File

@@ -49,7 +49,7 @@ ExifPanel::ExifPanel () : idata(NULL) {
delicon = safe_create_from_file ("deltags.png"); delicon = safe_create_from_file ("deltags.png");
keepicon = safe_create_from_file ("addtags.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::TreeView::Column *viewcol = Gtk::manage(new Gtk::TreeView::Column ("Field Name"));
Gtk::CellRendererPixbuf* render_pb = Gtk::manage(new Gtk::CellRendererPixbuf ()); Gtk::CellRendererPixbuf* render_pb = Gtk::manage(new Gtk::CellRendererPixbuf ());
@@ -361,7 +361,7 @@ void ExifPanel::resetAllPressed () {
void ExifPanel::addPressed () { void ExifPanel::addPressed () {
Gtk::Dialog* dialog = new Gtk::Dialog (M("EXIFPANEL_ADDTAGDLG_TITLE"), *((Gtk::Window*)get_toplevel()), true, true); 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); dialog->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
Gtk::HBox* hb1 = new Gtk::HBox (); Gtk::HBox* hb1 = new Gtk::HBox ();

5
rtgui/favoritbrowser.cc
View File

@@ -18,6 +18,7 @@
*/ */
#include <favoritbrowser.h> #include <favoritbrowser.h>
#include <multilangmgr.h> #include <multilangmgr.h>
#include <rtimage.h>
FavoritBrowser::FavoritBrowser () : listener (NULL), lastSelectedDir ("") { 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"))); add = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_ADD")));
del = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_DEL"))); 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))); add->set_image (*Gtk::manage (new RTImage ("add.png")));
del->set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REMOVE, Gtk::ICON_SIZE_MENU))); del->set_image (*Gtk::manage (new RTImage ("list-remove.png")));
Gtk::HBox* buttonBox = Gtk::manage (new Gtk::HBox ()); Gtk::HBox* buttonBox = Gtk::manage (new Gtk::HBox ());
buttonBox->pack_start (*add); buttonBox->pack_start (*add);
buttonBox->pack_start (*del); buttonBox->pack_start (*del);

2
rtgui/filecatalog.cc
View File

@@ -64,7 +64,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
trashButtonBox = Gtk::manage( new Gtk::VBox ); trashButtonBox = Gtk::manage( new Gtk::VBox );
Gtk::Button* emptyT = Gtk::manage( new Gtk::Button (M("FILEBROWSER_EMPTYTRASH"))); Gtk::Button* emptyT = Gtk::manage( new Gtk::Button (M("FILEBROWSER_EMPTYTRASH")));
emptyT->set_tooltip_markup (M("FILEBROWSER_EMPTYTRASHHINT")); 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)); emptyT->signal_pressed().connect (sigc::mem_fun(*this, &FileCatalog::emptyTrash));
trashButtonBox->pack_start (*emptyT, Gtk::PACK_SHRINK, 4); trashButtonBox->pack_start (*emptyT, Gtk::PACK_SHRINK, 4);
emptyT->show (); emptyT->show ();

8
rtgui/filethumbnailbuttonset.cc
View File

@@ -40,12 +40,12 @@ Cairo::RefPtr<Cairo::ImageSurface> FileThumbnailButtonSet::colorLabelIcon_5;
FileThumbnailButtonSet::FileThumbnailButtonSet (FileBrowserEntry* myEntry) { FileThumbnailButtonSet::FileThumbnailButtonSet (FileBrowserEntry* myEntry) {
if (!iconsLoaded) { if (!iconsLoaded) {
unRankIcon = safe_create_from_png ("unrated.png"); unRankIcon = safe_create_from_png ("ratednotg_10.png");
rankIcon = safe_create_from_png ("rated.png"); rankIcon = safe_create_from_png ("rated.png");
gRankIcon = safe_create_from_png ("grayrated.png"); gRankIcon = safe_create_from_png ("grayrated.png");
trashIcon = safe_create_from_png ("trash.png"); trashIcon = safe_create_from_png ("trash-thumbnail.png");
unTrashIcon = safe_create_from_png ("undelete.png"); unTrashIcon = safe_create_from_png ("undelete-thumbnail.png");
processIcon = safe_create_from_png ("processing.png"); processIcon = safe_create_from_png ("processing-thumbnail.png");
colorLabelIcon_0 = safe_create_from_png ("nocolorlabel.png"); colorLabelIcon_0 = safe_create_from_png ("nocolorlabel.png");
colorLabelIcon_1 = safe_create_from_png ("clabel1.png"); colorLabelIcon_1 = safe_create_from_png ("clabel1.png");

3
rtgui/flatfield.cc
View File

@@ -21,6 +21,7 @@
#include <guiutils.h> #include <guiutils.h>
#include <safegtk.h> #include <safegtk.h>
#include <sstream> #include <sstream>
#include <rtimage.h>
using namespace rtengine; using namespace rtengine;
using namespace rtengine::procparams; 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)); flatFieldFile = Gtk::manage(new MyFileChooserButton(M("TP_FLATFIELD_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN));
ffLabel = Gtk::manage(new Gtk::Label(M("GENERAL_FILE"))); ffLabel = Gtk::manage(new Gtk::Label(M("GENERAL_FILE")));
flatFieldFileReset = Gtk::manage(new Gtk::Button()); 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(*ffLabel, Gtk::PACK_SHRINK, 4);
hbff->pack_start(*flatFieldFile); hbff->pack_start(*flatFieldFile);
hbff->pack_start(*flatFieldFileReset, Gtk::PACK_SHRINK, 4); hbff->pack_start(*flatFieldFileReset, Gtk::PACK_SHRINK, 4);

3
rtgui/icmpanel.cc
View File

@@ -21,6 +21,7 @@
#include <guiutils.h> #include <guiutils.h>
#include <safegtk.h> #include <safegtk.h>
#include <iccstore.h> #include <iccstore.h>
#include <rtimage.h>
using namespace rtengine; using namespace rtengine;
using namespace rtengine::procparams; using namespace rtengine::procparams;
@@ -77,7 +78,7 @@ ICMPanel::ICMPanel () : Gtk::VBox(), FoldableToolPanel(this), iunchanged(NULL),
pack_start (*ckbBlendCMSMatrix, Gtk::PACK_SHRINK, 4); pack_start (*ckbBlendCMSMatrix, Gtk::PACK_SHRINK, 4);
saveRef = Gtk::manage (new Gtk::Button (M("TP_ICM_SAVEREFERENCE"))); 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); pack_start (*saveRef, Gtk::PACK_SHRINK, 4);

8
rtgui/iptcpanel.cc
View File

@@ -264,19 +264,19 @@ IPTCPanel::IPTCPanel () {
Gtk::HBox* bbox = Gtk::manage( new Gtk::HBox () ); Gtk::HBox* bbox = Gtk::manage( new Gtk::HBox () );
reset = Gtk::manage( new Gtk::Button (M("IPTCPANEL_RESET")) ); 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); bbox->pack_start (*reset);
file = Gtk::manage( new Gtk::Button (M("IPTCPANEL_EMBEDDED")) ); 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); bbox->pack_start (*file);
copy = Gtk::manage( new Gtk::Button () ); 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); bbox->pack_start (*copy, Gtk::PACK_SHRINK, 0);
paste = Gtk::manage( new Gtk::Button () ); 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); bbox->pack_start (*paste, Gtk::PACK_SHRINK, 0);
pack_end (*bbox, Gtk::PACK_SHRINK, 2); pack_end (*bbox, Gtk::PACK_SHRINK, 2);

5
rtgui/main.cc
View File

@@ -138,6 +138,10 @@ int main(int argc, char **argv)
} }
Gtk::Main m(&argc, &argv); Gtk::Main m(&argc, &argv);
Glib::ustring icon_path = Glib::build_filename(argv0,"images");
Glib::RefPtr<Gtk::IconTheme> defaultIconTheme = Gtk::IconTheme::get_default();
defaultIconTheme->append_search_path(icon_path);
RTImage::setPaths(options); RTImage::setPaths(options);
#ifndef WIN32 #ifndef WIN32
@@ -150,6 +154,7 @@ int main(int argc, char **argv)
printf("Error: no default settings to update!\n"); printf("Error: no default settings to update!\n");
#endif #endif
RTWindow *rtWindow = new class RTWindow(); RTWindow *rtWindow = new class RTWindow();
gdk_threads_enter (); gdk_threads_enter ();
m.run(*rtWindow); m.run(*rtWindow);

5
rtgui/placesbrowser.cc
View File

@@ -21,6 +21,7 @@
#include <toolpanel.h> #include <toolpanel.h>
#include <safegtk.h> #include <safegtk.h>
#include <guiutils.h> #include <guiutils.h>
#include <rtimage.h>
PlacesBrowser::PlacesBrowser () : listener (NULL) { PlacesBrowser::PlacesBrowser () : listener (NULL) {
@@ -30,8 +31,8 @@ PlacesBrowser::PlacesBrowser () : listener (NULL) {
add = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_ADD"))); add = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_ADD")));
del = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_DEL"))); 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))); add->set_image (*Gtk::manage (new RTImage ("add.png")));
del->set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REMOVE, Gtk::ICON_SIZE_MENU))); del->set_image (*Gtk::manage (new RTImage ("list-remove.png")));
Gtk::HBox* buttonBox = Gtk::manage (new Gtk::HBox ()); Gtk::HBox* buttonBox = Gtk::manage (new Gtk::HBox ());
buttonBox->pack_start (*add); buttonBox->pack_start (*add);
buttonBox->pack_start (*del); buttonBox->pack_start (*del);

6
rtgui/preferences.cc
View File

@@ -63,8 +63,8 @@ Preferences::Preferences (RTWindow *rtwindow):parent(rtwindow) {
Gtk::Button* cancel = Gtk::manage (new Gtk::Button (M("GENERAL_CANCEL"))); Gtk::Button* cancel = Gtk::manage (new Gtk::Button (M("GENERAL_CANCEL")));
about->set_image (*Gtk::manage(new RTImage ("logoicon16.png"))); 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))); ok->set_image (*Gtk::manage(new RTImage ("addtags.png")));
cancel->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON))); cancel->set_image (*Gtk::manage(new RTImage ("gtk-cancel.png")));
about->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::aboutPressed) ); about->signal_clicked().connect( sigc::mem_fun(*this, &Preferences::aboutPressed) );
@@ -708,7 +708,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel () {
startupdir = Gtk::manage( new Gtk::Entry () ); startupdir = Gtk::manage( new Gtk::Entry () );
Gtk::Button* sdselect = Gtk::manage( new Gtk::Button ("") ); 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(); Gtk::RadioButton::Group opts = sdcurrent->get_group();
sdlast->set_group (opts); sdlast->set_group (opts);

9
rtgui/profilepanel.cc
View File

@@ -22,6 +22,7 @@
#include <clipboard.h> #include <clipboard.h>
#include <multilangmgr.h> #include <multilangmgr.h>
#include <safegtk.h> #include <safegtk.h>
#include <rtimage.h>
using namespace rtengine; using namespace rtengine;
using namespace rtengine::procparams; using namespace rtengine::procparams;
@@ -40,13 +41,13 @@ ProfilePanel::ProfilePanel () {
pack_start (*hbox, Gtk::PACK_SHRINK, 4); pack_start (*hbox, Gtk::PACK_SHRINK, 4);
save = Gtk::manage (new Gtk::Button ()); 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 = 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 = 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 = 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 (*profiles);
hbox->pack_start (*load, Gtk::PACK_SHRINK, 1); hbox->pack_start (*load, Gtk::PACK_SHRINK, 1);

12
rtgui/rtimage.cc
View File

@@ -113,14 +113,22 @@ void RTImage::setPaths(Options &opt) {
if (keyFile.has_key ("General", "Iconset")) if (keyFile.has_key ("General", "Iconset"))
iSet = keyFile.get_string ("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", 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(); iSet.clear();
if (keyFile.has_key ("General", "FallbackIconset")) if (keyFile.has_key ("General", "FallbackIconset"))
iSet = keyFile.get_string ("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", 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 // The images/ folder is the second fallback solution
imagesPaths.push_back (Glib::build_filename(argv0, "images")); imagesPaths.push_back (Glib::build_filename(argv0, "images"));

6
rtgui/rtwindow.cc
View File

@@ -153,7 +153,7 @@ RTWindow::RTWindow ()
Gtk::LinkButton* rtWeb = Gtk::manage (new Gtk::LinkButton ("http://rawtherapee.com")); 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 (M("MAIN_BUTTON_PREFERENCES")+"..."));
Gtk::Button* preferences = Gtk::manage (new Gtk::Button ()); 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->set_tooltip_markup (M("MAIN_BUTTON_PREFERENCES"));
preferences->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::showPreferences) ); 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 // construct closeable tab for the image
Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ()); 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))); hb->pack_start (*Gtk::manage (new Gtk::Label (name)));
Gtk::Button* closeb = Gtk::manage (new Gtk::Button ()); 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_relief (Gtk::RELIEF_NONE);
closeb->set_focus_on_click (false); closeb->set_focus_on_click (false);
// make the button as small as possible // make the button as small as possible

5
rtgui/saveasdlg.cc
View File

@@ -20,6 +20,7 @@
#include <multilangmgr.h> #include <multilangmgr.h>
#include <guiutils.h> #include <guiutils.h>
#include <safegtk.h> #include <safegtk.h>
#include <rtimage.h>
extern Options options; extern Options options;
SaveAsDialog::SaveAsDialog (Glib::ustring initialDir) { 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* ok = Gtk::manage( new Gtk::Button (M("GENERAL_OK")) );
Gtk::Button* cancel = Gtk::manage( new Gtk::Button (M("GENERAL_CANCEL")) ); 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))); ok->set_image (*Gtk::manage(new RTImage ("addtags.png")));
cancel->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-cancel"), Gtk::ICON_SIZE_BUTTON))); cancel->set_image (*Gtk::manage(new RTImage ("gtk-cancel.png")));
ok->signal_clicked().connect( sigc::mem_fun(*this, &SaveAsDialog::okPressed) ); ok->signal_clicked().connect( sigc::mem_fun(*this, &SaveAsDialog::okPressed) );
cancel->signal_clicked().connect( sigc::mem_fun(*this, &SaveAsDialog::cancelPressed) ); cancel->signal_clicked().connect( sigc::mem_fun(*this, &SaveAsDialog::cancelPressed) );

2
rtgui/zoompanel.cc
View File

@@ -55,7 +55,7 @@ ZoomPanel::ZoomPanel (ImageArea* iarea) : iarea(iarea) {
zoomLabel = Gtk::manage (new Gtk::Label ()); zoomLabel = Gtk::manage (new Gtk::Label ());
pack_start (*zoomLabel, Gtk::PACK_SHRINK, 4); 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); imageCrop->set_padding(0,0);
newCrop = Gtk::manage (new Gtk::Button()); newCrop = Gtk::manage (new Gtk::Button());
newCrop->add (*imageCrop); newCrop->add (*imageCrop);