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

Ported Retinex to Gtk3 and removed "Theme=" workaround

Browse Source
This commit is contained in:
Beep6581 2015-10-17 16:35:57 +02:00
parent 35775f3b3f
commit 4c4430be34
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/main.cc
View File

@ -283,10 +283,6 @@ int main(int argc, char **argv)
simpleEditor = true; simpleEditor = true;
} }
if (options.theme.empty()) {
options.theme = "21-Gray-Gray";
}
Gtk::Main m(&argc, &argv); Gtk::Main m(&argc, &argv);
Glib::ustring icon_path = Glib::build_filename(argv0, "images"); Glib::ustring icon_path = Glib::build_filename(argv0, "images");

26
rtgui/retinex.cc
View File

@ -33,19 +33,19 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"),
dhbox->pack_start (*labmdh, Gtk::PACK_SHRINK, 1); dhbox->pack_start (*labmdh, Gtk::PACK_SHRINK, 1);
retinexMethod = Gtk::manage (new MyComboBoxText ()); retinexMethod = Gtk::manage (new MyComboBoxText ());
retinexMethod->append_text (M("TP_RETINEX_LOW")); retinexMethod->append (M("TP_RETINEX_LOW"));
retinexMethod->append_text (M("TP_RETINEX_UNIFORM")); retinexMethod->append (M("TP_RETINEX_UNIFORM"));
retinexMethod->append_text (M("TP_RETINEX_HIGH")); retinexMethod->append (M("TP_RETINEX_HIGH"));
retinexMethod->append_text (M("TP_RETINEX_HIGHLIG")); retinexMethod->append (M("TP_RETINEX_HIGHLIG"));
// retinexMethod->append_text (M("TP_RETINEX_HIGHLIGPLUS")); // retinexMethod->append (M("TP_RETINEX_HIGHLIGPLUS"));
retinexMethod->set_active(0); retinexMethod->set_active(0);
retinexMethodConn = retinexMethod->signal_changed().connect ( sigc::mem_fun(*this, &Retinex::retinexMethodChanged) ); retinexMethodConn = retinexMethod->signal_changed().connect ( sigc::mem_fun(*this, &Retinex::retinexMethodChanged) );
retinexMethod->set_tooltip_markup (M("TP_RETINEX_METHOD_TOOLTIP")); retinexMethod->set_tooltip_markup (M("TP_RETINEX_METHOD_TOOLTIP"));
retinexcolorspace = Gtk::manage (new MyComboBoxText ()); retinexcolorspace = Gtk::manage (new MyComboBoxText ());
retinexcolorspace->append_text (M("TP_RETINEX_LABSPACE")); retinexcolorspace->append (M("TP_RETINEX_LABSPACE"));
retinexcolorspace->append_text (M("TP_RETINEX_HSLSPACE_LOG")); retinexcolorspace->append (M("TP_RETINEX_HSLSPACE_LOG"));
retinexcolorspace->append_text (M("TP_RETINEX_HSLSPACE_LIN")); retinexcolorspace->append (M("TP_RETINEX_HSLSPACE_LIN"));
retinexcolorspace->set_active(0); retinexcolorspace->set_active(0);
retinexColorSpaceConn = retinexcolorspace->signal_changed().connect ( sigc::mem_fun(*this, &Retinex::retinexColorSpaceChanged) ); retinexColorSpaceConn = retinexcolorspace->signal_changed().connect ( sigc::mem_fun(*this, &Retinex::retinexColorSpaceChanged) );
@ -103,11 +103,11 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"),
gambox->pack_start (*labgam, Gtk::PACK_SHRINK, 1); gambox->pack_start (*labgam, Gtk::PACK_SHRINK, 1);
gammaretinex = Gtk::manage (new MyComboBoxText ()); gammaretinex = Gtk::manage (new MyComboBoxText ());
gammaretinex->append_text (M("TP_RETINEX_GAMMA_NONE")); gammaretinex->append (M("TP_RETINEX_GAMMA_NONE"));
gammaretinex->append_text (M("TP_RETINEX_GAMMA_LOW")); gammaretinex->append (M("TP_RETINEX_GAMMA_LOW"));
gammaretinex->append_text (M("TP_RETINEX_GAMMA_MID")); gammaretinex->append (M("TP_RETINEX_GAMMA_MID"));
gammaretinex->append_text (M("TP_RETINEX_GAMMA_HIGH")); gammaretinex->append (M("TP_RETINEX_GAMMA_HIGH"));
gammaretinex->append_text (M("TP_RETINEX_GAMMA_FREE")); gammaretinex->append (M("TP_RETINEX_GAMMA_FREE"));
gammaretinex->set_active(0); gammaretinex->set_active(0);
gammaretinexConn = gammaretinex->signal_changed().connect ( sigc::mem_fun(*this, &Retinex::gammaretinexChanged) ); gammaretinexConn = gammaretinex->signal_changed().connect ( sigc::mem_fun(*this, &Retinex::gammaretinexChanged) );
gammaretinex->set_tooltip_markup (M("TP_RETINEX_GAMMA_TOOLTIP")); gammaretinex->set_tooltip_markup (M("TP_RETINEX_GAMMA_TOOLTIP"));