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

Change in locallab.h and cc some labels frame Box with const

Browse Source
This commit is contained in:
Desmis 2019-11-05 13:43:44 +01:00
parent 34851ead73
commit eb1884d255
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rtgui/locallab.cc
View File

@ -467,6 +467,14 @@ Locallab::Locallab():
// retiBox(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_CLARIFRA")))), // retiBox(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_CLARIFRA")))),
retiBox(Gtk::manage(new ToolParamBlock())), retiBox(Gtk::manage(new ToolParamBlock())),
maskretiBox(Gtk::manage(new ToolParamBlock())), maskretiBox(Gtk::manage(new ToolParamBlock())),
labgrid(Gtk::manage(new LabGrid(EvLocallabLabGridValue, M("TP_LOCALLAB_LABGRID_VALUES")))),
mMLabels(Gtk::manage(new Gtk::Label("---"))),
transLabels(Gtk::manage(new Gtk::Label("---"))),
transLabels2(Gtk::manage(new Gtk::Label("---"))),
ctboxsoftmethod(Gtk::manage(new Gtk::HBox())),
ctboxexpmethod(Gtk::manage(new Gtk::HBox())),
// Others // Others
defparams(nullptr), defparams(nullptr),
defpedited(nullptr), defpedited(nullptr),
@ -771,7 +779,7 @@ Locallab::Locallab():
csThresholdcol->setAdjusterListener(this); csThresholdcol->setAdjusterListener(this);
labgrid = Gtk::manage(new LabGrid(EvLocallabLabGridValue, M("TP_LOCALLAB_LABGRID_VALUES"))); // labgrid = Gtk::manage(new LabGrid(EvLocallabLabGridValue, M("TP_LOCALLAB_LABGRID_VALUES")));
ToolParamBlock* const colorBox = Gtk::manage(new ToolParamBlock()); ToolParamBlock* const colorBox = Gtk::manage(new ToolParamBlock());
Gtk::Frame* const superFrame = Gtk::manage(new Gtk::Frame()); Gtk::Frame* const superFrame = Gtk::manage(new Gtk::Frame());
@ -858,7 +866,7 @@ Locallab::Locallab():
expMethod->set_tooltip_text(M("TP_LOCALLAB_EXPMETHOD_TOOLTIP")); expMethod->set_tooltip_text(M("TP_LOCALLAB_EXPMETHOD_TOOLTIP"));
} }
ctboxexpmethod = Gtk::manage(new Gtk::HBox()); // ctboxexpmethod = Gtk::manage(new Gtk::HBox());
Gtk::Label* const labelexpmethod = Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_NOISEMETH") + ":")); Gtk::Label* const labelexpmethod = Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_NOISEMETH") + ":"));
ctboxexpmethod->pack_start(*labelexpmethod, Gtk::PACK_SHRINK, 4); ctboxexpmethod->pack_start(*labelexpmethod, Gtk::PACK_SHRINK, 4);
@ -1387,7 +1395,7 @@ Locallab::Locallab():
softMethodConn = softMethod->signal_changed().connect(sigc::mem_fun(*this, &Locallab::softMethodChanged)); softMethodConn = softMethod->signal_changed().connect(sigc::mem_fun(*this, &Locallab::softMethodChanged));
ctboxsoftmethod = Gtk::manage(new Gtk::HBox()); // ctboxsoftmethod = Gtk::manage(new Gtk::HBox());
Gtk::Label* const labelsoftmethod = Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_SHOWDCT") + ":")); Gtk::Label* const labelsoftmethod = Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_SHOWDCT") + ":"));
ctboxsoftmethod->pack_start(*labelsoftmethod, Gtk::PACK_SHRINK, 4); ctboxsoftmethod->pack_start(*labelsoftmethod, Gtk::PACK_SHRINK, 4);
@ -1680,21 +1688,21 @@ Locallab::Locallab():
softradiusret->set_tooltip_text(M("TP_LOCALLAB_SOFTRETI_TOOLTIP")); softradiusret->set_tooltip_text(M("TP_LOCALLAB_SOFTRETI_TOOLTIP"));
} }
mMLabels = Gtk::manage(new Gtk::Label("---")); // mMLabels = Gtk::manage(new Gtk::Label("---"));
setExpandAlignProperties(mMLabels, true, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_START); setExpandAlignProperties(mMLabels, true, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_START);
if (showtooltip) { if (showtooltip) {
mMLabels->set_tooltip_markup(M("TP_LOCALLAB_MLABEL_TOOLTIP")); mMLabels->set_tooltip_markup(M("TP_LOCALLAB_MLABEL_TOOLTIP"));
} }
transLabels = Gtk::manage(new Gtk::Label("---")); // transLabels = Gtk::manage(new Gtk::Label("---"));
setExpandAlignProperties(transLabels, true, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_START); setExpandAlignProperties(transLabels, true, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_START);
if (showtooltip) { if (showtooltip) {
transLabels->set_tooltip_markup(M("TP_LOCALLAB_TLABEL_TOOLTIP")); transLabels->set_tooltip_markup(M("TP_LOCALLAB_TLABEL_TOOLTIP"));
} }
transLabels2 = Gtk::manage(new Gtk::Label("---")); // transLabels2 = Gtk::manage(new Gtk::Label("---"));
setExpandAlignProperties(transLabels2, true, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_START); setExpandAlignProperties(transLabels2, true, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_START);
LocalcurveEditortransT->setCurveListener(this); LocalcurveEditortransT->setCurveListener(this);

42
rtgui/locallab.h
View File

@ -461,28 +461,28 @@ private:
Gtk::Button* const lumaneutralButton; Gtk::Button* const lumaneutralButton;
Gtk::Button* const lumacontrastPlusButton; Gtk::Button* const lumacontrastPlusButton;
sigc::connection lumacontrastMinusPressedConn, lumaneutralPressedConn, lumacontrastPlusPressedConn; sigc::connection lumacontrastMinusPressedConn, lumaneutralPressedConn, lumacontrastPlusPressedConn;
Gtk::Frame* gridFrame; Gtk::Frame* const gridFrame;
Gtk::Frame* mergecolFrame; Gtk::Frame* const mergecolFrame;
Gtk::Frame* merge1colFrame; Gtk::Frame* const merge1colFrame;
Gtk::Frame* pdeFrame; Gtk::Frame* const pdeFrame;
Gtk::Frame* fatFrame; Gtk::Frame* const fatFrame;
Gtk::Frame* fatSHFrame; Gtk::Frame* const fatSHFrame;
Gtk::Frame* gamFrame; Gtk::Frame* const gamFrame;
Gtk::Frame* dehaFrame; Gtk::Frame* const dehaFrame;
Gtk::Frame* retiFrame; Gtk::Frame* const retiFrame;
Gtk::Frame* retitoolFrame; Gtk::Frame* const retitoolFrame;
Gtk::Frame* residFrame; Gtk::Frame* const residFrame;
Gtk::Frame* clariFrame; Gtk::Frame* const clariFrame;
Gtk::Frame* grainFrame; Gtk::Frame* const grainFrame;
ToolParamBlock * retiBox; ToolParamBlock * const retiBox;
ToolParamBlock * maskretiBox; ToolParamBlock * const maskretiBox;
LabGrid *labgrid; LabGrid * const labgrid;
Gtk::Label* mMLabels; Gtk::Label* const mMLabels;
Gtk::Label* transLabels; Gtk::Label* const transLabels;
Gtk::Label* transLabels2; Gtk::Label* const transLabels2;
// Others // Others
Gtk::HBox* ctboxsoftmethod; Gtk::HBox* const ctboxsoftmethod;
Gtk::HBox* ctboxexpmethod; Gtk::HBox* const ctboxexpmethod;
double nextmin; double nextmin;
double nextmax; double nextmax;
double nextminiT; double nextminiT;