GUI cleanup for White Balance tool (see issue 2010)
This commit is contained in:
@@ -65,7 +65,7 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) {
|
||||
cacorrection = Gtk::manage (new CACorrection ());
|
||||
hlrecovery = Gtk::manage (new HLRecovery ());
|
||||
chmixer = Gtk::manage (new ChMixer ());
|
||||
chmixerbw = Gtk::manage (new ChMixerbw ());
|
||||
blackwhite = Gtk::manage (new BlackWhite ());
|
||||
resize = Gtk::manage (new Resize ());
|
||||
crop = Gtk::manage (new Crop ());
|
||||
icm = Gtk::manage (new ICMPanel ());
|
||||
@@ -85,7 +85,7 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) {
|
||||
addPanel (exposurePanel, hlrecovery, M("TP_HLREC_LABEL")); toolPanels.push_back (hlrecovery);
|
||||
addPanel (colorPanel, vibrance, M("TP_VIBRANCE_LABEL")); toolPanels.push_back (vibrance);
|
||||
addPanel (colorPanel, chmixer, M("TP_CHMIXER_LABEL")); toolPanels.push_back (chmixer);
|
||||
addPanel (colorPanel, chmixerbw, M("TP_BWMIX_LABEL")); toolPanels.push_back (chmixerbw);
|
||||
addPanel (colorPanel, blackwhite, M("TP_BWMIX_LABEL")); toolPanels.push_back (blackwhite);
|
||||
addPanel (exposurePanel, shadowshighlights, M("TP_SHADOWSHLIGHTS_LABEL")); toolPanels.push_back (shadowshighlights);
|
||||
addPanel (detailsPanel, sharpening, M("TP_SHARPENING_LABEL")); toolPanels.push_back (sharpening);
|
||||
addPanel (detailsPanel, sharpenEdge, M("TP_SHARPENEDGE_LABEL")); toolPanels.push_back (sharpenEdge);
|
||||
@@ -213,7 +213,7 @@ void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel,
|
||||
}
|
||||
|
||||
panel->setParent(where);
|
||||
panel->setLabel(label);
|
||||
panel->setLabel(escapeHtmlChars(label));
|
||||
|
||||
expList.push_back (panel->exp);
|
||||
where->pack_start(*panel->exp, false, false);
|
||||
@@ -364,8 +364,8 @@ void ToolPanelCoordinator::initImage (rtengine::StagedImageProcessor* ipc_, bool
|
||||
if (ipc) {
|
||||
ipc->setAutoExpListener (toneCurve);
|
||||
ipc->setAutoCamListener (colorappearance);
|
||||
ipc->setAutoBWListener (chmixerbw);
|
||||
|
||||
ipc->setAutoBWListener (blackwhite);
|
||||
|
||||
ipc->setSizeListener (crop);
|
||||
ipc->setSizeListener (resize);
|
||||
}
|
||||
@@ -382,7 +382,7 @@ void ToolPanelCoordinator::initImage (rtengine::StagedImageProcessor* ipc_, bool
|
||||
void ToolPanelCoordinator::closeImage () {
|
||||
|
||||
if (ipc) {
|
||||
ipc->stopProcessing ();
|
||||
ipc->stopProcessing ();
|
||||
ipc = NULL;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user