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

another GUI change - substantially as requested - except icons

Browse Source
This commit is contained in:
Desmis
2018-05-03 07:53:36 +02:00
parent 275058e232
commit d9d2175a25
3 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtdata/languages/default
View File

@@ -1598,12 +1598,12 @@ TP_FLATFIELD_LABEL;Flat-Field
TP_GAMMA_CURV;Gamma TP_GAMMA_CURV;Gamma
TP_GAMMA_FREE;Custom Output Integrate Profile & generate ICC TP_GAMMA_FREE;Custom Output Integrate Profile & generate ICC
TP_GAMMA_PRIM;Primaries Output profile TP_GAMMA_PRIM;Primaries Output profile
TP_GAMMA_OUTPUT;Gamma - TRC TP_GAMMA_OUTPUT;Tone responce curve
TP_GAMMA_PROF;Generate ICC profile TP_GAMMA_PROF;Generate ICC profile
TP_GAMMA_PROF_NONE;none TP_GAMMA_PROF_NONE;none
TP_GAMMA_PROF_V2;ICC v2 TP_GAMMA_PROF_V2;ICC v2
TP_GAMMA_PROF_V4;ICC v4 TP_GAMMA_PROF_V4;ICC v4
TP_GAMMA_SLOP;Slope (linear) TP_GAMMA_SLOP;Slope
TP_GAMMA_PRIM_ACESP0;AcesP0 TP_GAMMA_PRIM_ACESP0;AcesP0
TP_GAMMA_PRIM_ACESP1;AcesP1 TP_GAMMA_PRIM_ACESP1;AcesP1
TP_GAMMA_PRIM_ADOBE;Adobe TP_GAMMA_PRIM_ADOBE;Adobe
@@ -1615,12 +1615,12 @@ TP_GAMMA_PRIM_BEST;BestRGB
TP_GAMMA_PRIM_BETA;BetaRGB TP_GAMMA_PRIM_BETA;BetaRGB
TP_GAMMA_PRIM_BRUCE;BruceRGB TP_GAMMA_PRIM_BRUCE;BruceRGB
TP_GAMMA_PRIM_FREE;Custom primaries - ICC v4 TP_GAMMA_PRIM_FREE;Custom primaries - ICC v4
TP_GAMMA_PRIM_REDX;Red x primary TP_GAMMA_PRIM_REDX;Red x
TP_GAMMA_PRIM_REDY;Red y primary TP_GAMMA_PRIM_REDY;Red y
TP_GAMMA_PRIM_GREX;Green x primary TP_GAMMA_PRIM_GREX;Green x
TP_GAMMA_PRIM_GREY;Green y primary TP_GAMMA_PRIM_GREY;Green y
TP_GAMMA_PRIM_BLUX;Blue x primary TP_GAMMA_PRIM_BLUX;Blue x
TP_GAMMA_PRIM_BLUY;Blue y primary TP_GAMMA_PRIM_BLUY;Blue y
TP_GAMMA_TEMP;Illuminant (ICC v4) TP_GAMMA_TEMP;Illuminant (ICC v4)
TP_GAMMA_TEMP_DEF;Default TP_GAMMA_TEMP_DEF;Default
TP_GAMMA_TEMP_41;D41 TP_GAMMA_TEMP_41;D41

33
rtgui/icmpanel.cc
View File

@@ -325,6 +325,10 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
wprimaries->set_active(5); wprimaries->set_active(5);
prifreeVBox = Gtk::manage(new Gtk::VBox()); prifreeVBox = Gtk::manage(new Gtk::VBox());
priredHBox = Gtk::manage(new Gtk::HBox());
prigreenHBox = Gtk::manage(new Gtk::HBox());
priblueHBox = Gtk::manage(new Gtk::HBox());
Gtk::Image* gamuts0 = Gtk::manage(new RTImage("rt-logo-tiny.png")); Gtk::Image* gamuts0 = Gtk::manage(new RTImage("rt-logo-tiny.png"));
Gtk::Image* gamutl0 = Gtk::manage(new RTImage("rt-logo-small.png")); Gtk::Image* gamutl0 = Gtk::manage(new RTImage("rt-logo-small.png"));
Gtk::Image* gamuts1 = Gtk::manage(new RTImage("rt-logo-tiny.png")); Gtk::Image* gamuts1 = Gtk::manage(new RTImage("rt-logo-tiny.png"));
@@ -346,12 +350,18 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
pbluy = Gtk::manage(new Adjuster(M("TP_GAMMA_PRIM_BLUY"), -0.0700, 0.0700, 0.0001, 0.060, gamutl5, gamuts5)); pbluy = Gtk::manage(new Adjuster(M("TP_GAMMA_PRIM_BLUY"), -0.0700, 0.0700, 0.0001, 0.060, gamutl5, gamuts5));
prifreeVBox->pack_start(*predx, Gtk::PACK_SHRINK); priredHBox->pack_start(*predx, Gtk::PACK_SHRINK);
prifreeVBox->pack_start(*predy, Gtk::PACK_SHRINK); priredHBox->pack_start(*predy, Gtk::PACK_SHRINK);
prifreeVBox->pack_start(*pgrex, Gtk::PACK_SHRINK); prifreeVBox->pack_start(*priredHBox, Gtk::PACK_SHRINK);
prifreeVBox->pack_start(*pgrey, Gtk::PACK_SHRINK);
prifreeVBox->pack_start(*pblux, Gtk::PACK_SHRINK); prigreenHBox->pack_start(*pgrex, Gtk::PACK_SHRINK);
prifreeVBox->pack_start(*pbluy, Gtk::PACK_SHRINK); prigreenHBox->pack_start(*pgrey, Gtk::PACK_SHRINK);
prifreeVBox->pack_start(*prigreenHBox, Gtk::PACK_SHRINK);
priblueHBox->pack_start(*pblux, Gtk::PACK_SHRINK);
priblueHBox->pack_start(*pbluy, Gtk::PACK_SHRINK);
prifreeVBox->pack_start(*priblueHBox, Gtk::PACK_SHRINK);
fgVBox->pack_start(*prifreeVBox, Gtk::PACK_SHRINK); fgVBox->pack_start(*prifreeVBox, Gtk::PACK_SHRINK);
predx->setAdjusterListener(this); predx->setAdjusterListener(this);
@@ -363,6 +373,8 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
//sliders gampos and slpos //sliders gampos and slpos
fgVBox->pack_start(*gaHBox, Gtk::PACK_EXPAND_WIDGET); fgVBox->pack_start(*gaHBox, Gtk::PACK_EXPAND_WIDGET);
trcHBox = Gtk::manage(new Gtk::HBox());
gampos = Gtk::manage(new Adjuster(M("TP_GAMMA_CURV"), 1, 3.5, 0.00001, 2.4)); gampos = Gtk::manage(new Adjuster(M("TP_GAMMA_CURV"), 1, 3.5, 0.00001, 2.4));
gampos->setAdjusterListener(this); gampos->setAdjusterListener(this);
@@ -380,8 +392,9 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
} }
slpos->show(); slpos->show();
fgVBox->pack_start(*gampos, Gtk::PACK_SHRINK); //gamma trcHBox->pack_start(*gampos, Gtk::PACK_SHRINK); //gamma
fgVBox->pack_start(*slpos, Gtk::PACK_SHRINK); //slope trcHBox->pack_start(*slpos, Gtk::PACK_SHRINK); //slope
fgVBox->pack_start(*trcHBox, Gtk::PACK_SHRINK);
//V2 or V4 profiles //V2 or V4 profiles
profHBox = Gtk::manage(new Gtk::HBox()); profHBox = Gtk::manage(new Gtk::HBox());
@@ -391,7 +404,7 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
wprofile = Gtk::manage(new MyComboBoxText()); wprofile = Gtk::manage(new MyComboBoxText());
profHBox->pack_start(*wprofile, Gtk::PACK_EXPAND_WIDGET); profHBox->pack_start(*wprofile, Gtk::PACK_EXPAND_WIDGET);
fgVBox->pack_start(*profHBox, Gtk::PACK_EXPAND_WIDGET); // fgVBox->pack_start(*profHBox, Gtk::PACK_EXPAND_WIDGET);
wprofile->append(M("TP_GAMMA_PROF_NONE")); wprofile->append(M("TP_GAMMA_PROF_NONE"));
wprofile->append(M("TP_GAMMA_PROF_V2")); wprofile->append(M("TP_GAMMA_PROF_V2"));
wprofile->append(M("TP_GAMMA_PROF_V4")); wprofile->append(M("TP_GAMMA_PROF_V4"));
@@ -420,6 +433,8 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
wtemp->set_active(0); wtemp->set_active(0);
wtemp->set_tooltip_text(M("TP_GAMMA_TEMP_TOOLTIP")); wtemp->set_tooltip_text(M("TP_GAMMA_TEMP_TOOLTIP"));
fgVBox->pack_start(*profHBox, Gtk::PACK_EXPAND_WIDGET);
fgFrame->add(*fgVBox); fgFrame->add(*fgVBox);
oVBox->pack_start(*fgFrame, Gtk::PACK_EXPAND_WIDGET); oVBox->pack_start(*fgFrame, Gtk::PACK_EXPAND_WIDGET);

4
rtgui/icmpanel.h
View File

@@ -98,6 +98,10 @@ private:
Gtk::HBox* tempHBox; Gtk::HBox* tempHBox;
Gtk::VBox* prifreeVBox; Gtk::VBox* prifreeVBox;
Gtk::HBox* trcinHBox; Gtk::HBox* trcinHBox;
Gtk::HBox* priredHBox;
Gtk::HBox* prigreenHBox;
Gtk::HBox* priblueHBox;
Gtk::HBox* trcHBox;
Gtk::CheckButton* obpc; Gtk::CheckButton* obpc;
Gtk::CheckButton* freegamma; Gtk::CheckButton* freegamma;