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

First patch for issue 2648: "Improvements related to the GUI" ; now RT uses the new MyExpander class that integrates the Enabled button.

Browse Source
This commit is contained in:
Hombrenatureh.510
2015-03-11 02:03:48 +01:00
parent 1aa2ae3903
commit 6020234205
104 changed files with 5099 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
rtgui/toolpanelcoord.cc
View File

@@ -71,7 +71,7 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) {
icm = Gtk::manage (new ICMPanel ());
exifpanel = Gtk::manage (new ExifPanel ());
iptcpanel = Gtk::manage (new IPTCPanel ());
wavelet = Gtk::manage (new Wavelet ());
wavelet = Gtk::manage (new Wavelet ());
dirpyrequalizer = Gtk::manage (new DirPyrEqualizer ());
hsvequalizer = Gtk::manage (new HSVEqualizer ());
filmSimulation = Gtk::manage (new FilmSimulation ());
@@ -97,51 +97,51 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) {
// Best -> low ISO
// Medium -> High ISO
addPanel (colorPanel, whitebalance, M("TP_WBALANCE_LABEL")); toolPanels.push_back (whitebalance);
addPanel (exposurePanel, toneCurve, M("TP_EXPOSURE_LABEL")); toolPanels.push_back (toneCurve);
addPanel (colorPanel, vibrance, M("TP_VIBRANCE_LABEL")); toolPanels.push_back (vibrance);
addPanel (colorPanel, chmixer, M("TP_CHMIXER_LABEL")); toolPanels.push_back (chmixer);
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"), true); toolPanels.push_back (sharpening);
addPanel (detailsPanel, sharpenEdge, M("TP_SHARPENEDGE_LABEL"), true); toolPanels.push_back (sharpenEdge);
addPanel (detailsPanel, sharpenMicro, M("TP_SHARPENMICRO_LABEL"), true); toolPanels.push_back (sharpenMicro);
addPanel (colorPanel, hsvequalizer, M("TP_HSVEQUALIZER_LABEL")); toolPanels.push_back (hsvequalizer);
addPanel (colorPanel, filmSimulation, M("TP_FILMSIMULATION_LABEL")); toolPanels.push_back (filmSimulation);
addPanel (colorPanel, rgbcurves, M("TP_RGBCURVES_LABEL")); toolPanels.push_back (rgbcurves);
addPanel (colorPanel, colortoning, M("TP_COLORTONING_LABEL")); toolPanels.push_back (colortoning);
addPanel (exposurePanel, epd, M("TP_EPD_LABEL"), true); toolPanels.push_back (epd);
addPanel (exposurePanel, pcvignette, M("TP_PCVIGNETTE_LABEL")); toolPanels.push_back (pcvignette);
addPanel (exposurePanel, gradient, M("TP_GRADIENT_LABEL")); toolPanels.push_back (gradient);
addPanel (exposurePanel, lcurve, M("TP_LABCURVE_LABEL")); toolPanels.push_back (lcurve);
addPanel (exposurePanel, colorappearance, M("TP_COLORAPP_LABEL")); toolPanels.push_back (colorappearance);
addPanel (detailsPanel, impulsedenoise, M("TP_IMPULSEDENOISE_LABEL"), true); toolPanels.push_back (impulsedenoise);
addPanel (detailsPanel, dirpyrdenoise, M("TP_DIRPYRDENOISE_LABEL"), true); toolPanels.push_back (dirpyrdenoise);
addPanel (detailsPanel, defringe, M("TP_DEFRINGE_LABEL"), true); toolPanels.push_back (defringe);
addPanel (detailsPanel, dirpyrequalizer, M("TP_DIRPYREQUALIZER_LABEL"), true); toolPanels.push_back (dirpyrequalizer);
addPanel (detailsPanel, wavelet, M("TP_WAVELET_LABEL"),true); toolPanels.push_back (wavelet);
addPanel (transformPanel, crop, M("TP_CROP_LABEL")); toolPanels.push_back (crop);
addPanel (transformPanel, resize, M("TP_RESIZE_LABEL")); toolPanels.push_back (resize);
addPanel (transformPanel, lensgeom, M("TP_LENSGEOM_LABEL")); toolPanels.push_back (lensgeom);
addPanel (lensgeom->getPackBox(), rotate, M("TP_ROTATE_LABEL")); toolPanels.push_back (rotate);
addPanel (lensgeom->getPackBox(), perspective, M("TP_PERSPECTIVE_LABEL")); toolPanels.push_back (perspective);
addPanel (lensgeom->getPackBox(), lensProf, M("TP_LENSPROFILE_LABEL")); toolPanels.push_back (lensProf);
addPanel (lensgeom->getPackBox(), distortion, M("TP_DISTORTION_LABEL")); toolPanels.push_back (distortion);
addPanel (lensgeom->getPackBox(), cacorrection, M("TP_CACORRECTION_LABEL")); toolPanels.push_back (cacorrection);
addPanel (lensgeom->getPackBox(), vignetting, M("TP_VIGNETTING_LABEL")); toolPanels.push_back (vignetting);
addPanel (colorPanel, icm, M("TP_ICM_LABEL")); toolPanels.push_back (icm);
addPanel (rawPanel, sensorbayer, M("TP_RAW_SENSOR_BAYER_LABEL")); toolPanels.push_back (sensorbayer);
addPanel (sensorbayer->getPackBox(), bayerprocess, M("TP_RAW_LABEL"), true); toolPanels.push_back (bayerprocess);
addPanel (sensorbayer->getPackBox(), bayerrawexposure, M("TP_EXPOS_BLACKPOINT_LABEL")); toolPanels.push_back (bayerrawexposure);
addPanel (sensorbayer->getPackBox(), bayerpreprocess, M("TP_PREPROCESS_LABEL"), true); toolPanels.push_back (bayerpreprocess);
addPanel (sensorbayer->getPackBox(), rawcacorrection, M("TP_CHROMATABERR_LABEL")); toolPanels.push_back (rawcacorrection);
addPanel (rawPanel, sensorxtrans, M("TP_RAW_SENSOR_XTRANS_LABEL")); toolPanels.push_back (sensorxtrans);
addPanel (sensorxtrans->getPackBox(), xtransprocess, M("TP_RAW_LABEL"), true); toolPanels.push_back (xtransprocess);
addPanel (sensorxtrans->getPackBox(), xtransrawexposure, M("TP_EXPOS_BLACKPOINT_LABEL")); toolPanels.push_back (xtransrawexposure);
addPanel (rawPanel, rawexposure, M("TP_EXPOS_WHITEPOINT_LABEL")); toolPanels.push_back (rawexposure);
addPanel (rawPanel, preprocess, M("TP_PREPROCESS_LABEL"), true); toolPanels.push_back (preprocess);
addPanel (rawPanel, darkframe, M("TP_DARKFRAME_LABEL")); toolPanels.push_back (darkframe);
addPanel (rawPanel, flatfield, M("TP_FLATFIELD_LABEL")); toolPanels.push_back (flatfield);
addPanel (colorPanel, whitebalance); toolPanels.push_back (whitebalance);
addPanel (exposurePanel, toneCurve); toolPanels.push_back (toneCurve);
addPanel (colorPanel, vibrance); toolPanels.push_back (vibrance);
addPanel (colorPanel, chmixer); toolPanels.push_back (chmixer); // << TODO: Add "Enabled"
addPanel (colorPanel, blackwhite); toolPanels.push_back (blackwhite);
addPanel (exposurePanel, shadowshighlights); toolPanels.push_back (shadowshighlights);
addPanel (detailsPanel, sharpening); toolPanels.push_back (sharpening);
addPanel (detailsPanel, sharpenEdge); toolPanels.push_back (sharpenEdge);
addPanel (detailsPanel, sharpenMicro); toolPanels.push_back (sharpenMicro);
addPanel (colorPanel, hsvequalizer); toolPanels.push_back (hsvequalizer); // << TODO: Add "Enabled"
addPanel (colorPanel, filmSimulation); toolPanels.push_back (filmSimulation);
addPanel (colorPanel, rgbcurves); toolPanels.push_back (rgbcurves); // << TODO: Add "Enabled"
addPanel (colorPanel, colortoning); toolPanels.push_back (colortoning);
addPanel (exposurePanel, epd); toolPanels.push_back (epd);
addPanel (exposurePanel, pcvignette); toolPanels.push_back (pcvignette);
addPanel (exposurePanel, gradient); toolPanels.push_back (gradient);
addPanel (exposurePanel, lcurve); toolPanels.push_back (lcurve); // << TODO: Add "Enabled" ???
addPanel (exposurePanel, colorappearance); toolPanels.push_back (colorappearance);
addPanel (detailsPanel, impulsedenoise); toolPanels.push_back (impulsedenoise);
addPanel (detailsPanel, dirpyrdenoise); toolPanels.push_back (dirpyrdenoise);
addPanel (detailsPanel, defringe); toolPanels.push_back (defringe);
addPanel (detailsPanel, dirpyrequalizer); toolPanels.push_back (dirpyrequalizer);
addPanel (detailsPanel, wavelet); toolPanels.push_back (wavelet);
addPanel (transformPanel, crop); toolPanels.push_back (crop);
addPanel (transformPanel, resize); toolPanels.push_back (resize);
addPanel (transformPanel, lensgeom); toolPanels.push_back (lensgeom);
addPanel (lensgeom->getPackBox(), rotate); toolPanels.push_back (rotate);
addPanel (lensgeom->getPackBox(), perspective); toolPanels.push_back (perspective);
addPanel (lensgeom->getPackBox(), lensProf); toolPanels.push_back (lensProf);
addPanel (lensgeom->getPackBox(), distortion); toolPanels.push_back (distortion);
addPanel (lensgeom->getPackBox(), cacorrection); toolPanels.push_back (cacorrection);
addPanel (lensgeom->getPackBox(), vignetting); toolPanels.push_back (vignetting);
addPanel (colorPanel, icm); toolPanels.push_back (icm);
addPanel (rawPanel, sensorbayer); toolPanels.push_back (sensorbayer);
addPanel (sensorbayer->getPackBox(), bayerprocess); toolPanels.push_back (bayerprocess);
addPanel (sensorbayer->getPackBox(), bayerrawexposure); toolPanels.push_back (bayerrawexposure);
addPanel (sensorbayer->getPackBox(), bayerpreprocess); toolPanels.push_back (bayerpreprocess);
addPanel (sensorbayer->getPackBox(), rawcacorrection); toolPanels.push_back (rawcacorrection);
addPanel (rawPanel, sensorxtrans); toolPanels.push_back (sensorxtrans);
addPanel (sensorxtrans->getPackBox(), xtransprocess); toolPanels.push_back (xtransprocess);
addPanel (sensorxtrans->getPackBox(), xtransrawexposure); toolPanels.push_back (xtransrawexposure);
addPanel (rawPanel, rawexposure); toolPanels.push_back (rawexposure);
addPanel (rawPanel, preprocess); toolPanels.push_back (preprocess);
addPanel (rawPanel, darkframe); toolPanels.push_back (darkframe);
addPanel (rawPanel, flatfield); toolPanels.push_back (flatfield);
@@ -230,7 +230,7 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) {
toolBar->setToolBarListener(this);
}
void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel, Glib::ustring label, bool need100Percent) {
void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel) {
// no more separator!
/*if (where->children().size()) {
@@ -240,7 +240,6 @@ void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel,
}*/
panel->setParent(where);
panel->setLabel(escapeHtmlChars(label), need100Percent);
expList.push_back (panel->getExpander());
where->pack_start(*panel->getExpander(), false, false);