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

Merge branch 'gtk3' into gtk3-bugfix

Browse Source
This commit is contained in:
Hombre
2016-12-18 18:30:58 +01:00
parent c241caef87 78ab525330
commit 7de1ec2d66
9 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rtdata/languages/default
View File

@@ -957,7 +957,7 @@ PREFERENCES_FLUOF7;Fluorescent F7
PREFERENCES_FLUOF11;Fluorescent F11 PREFERENCES_FLUOF11;Fluorescent F11
PREFERENCES_FORIMAGE;For non-raw photos PREFERENCES_FORIMAGE;For non-raw photos
PREFERENCES_FORRAW;For raw photos PREFERENCES_FORRAW;For raw photos
PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser. PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
PREFERENCES_GIMPPATH;GIMP installation directory PREFERENCES_GIMPPATH;GIMP installation directory
PREFERENCES_GREY;Output device's Yb luminance (%) PREFERENCES_GREY;Output device's Yb luminance (%)
@@ -1783,7 +1783,6 @@ TP_SHARPENING_RLD_AMOUNT;Amount
TP_SHARPENING_RLD_DAMPING;Damping TP_SHARPENING_RLD_DAMPING;Damping
TP_SHARPENING_RLD_ITERATIONS;Iterations TP_SHARPENING_RLD_ITERATIONS;Iterations
TP_SHARPENING_THRESHOLD;Threshold TP_SHARPENING_THRESHOLD;Threshold
TP_SHARPENING_TOOLTIP;Expect a slightly different effect when using with CIECAM02. If difference is observed, adjust to taste.
TP_SHARPENING_USM;Unsharp Mask TP_SHARPENING_USM;Unsharp Mask
TP_SHARPENMICRO_AMOUNT;Quantity TP_SHARPENMICRO_AMOUNT;Quantity
TP_SHARPENMICRO_LABEL;Microcontrast TP_SHARPENMICRO_LABEL;Microcontrast

4
rtengine/dcrop.cc
View File

@@ -678,7 +678,7 @@ void Crop::update (int todo)
createBuffer(cropw, croph); createBuffer(cropw, croph);
// transform // transform
if (needstransform || ((todo & (M_TRANSFORM)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) { if (needstransform || ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) {
if (!transCrop) { if (!transCrop) {
transCrop = new Imagefloat (cropw, croph); transCrop = new Imagefloat (cropw, croph);
} }
@@ -701,7 +701,7 @@ void Crop::update (int todo)
transCrop = nullptr; transCrop = nullptr;
} }
if ((todo & (M_TRANSFORM)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) { if ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
const int W = baseCrop->getWidth(); const int W = baseCrop->getWidth();
const int H = baseCrop->getHeight(); const int H = baseCrop->getHeight();

6
rtengine/improccoordinator.cc
View File

@@ -372,12 +372,12 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
// Remove transformation if unneeded // Remove transformation if unneeded
bool needstransform = ipf.needsTransform(); bool needstransform = ipf.needsTransform();
if (!needstransform && !((todo & (M_TRANSFORM)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) && orig_prev != oprevi) { if (!needstransform && !((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) && orig_prev != oprevi) {
delete oprevi; delete oprevi;
oprevi = orig_prev; oprevi = orig_prev;
} }
if ((needstransform || ((todo & (M_TRANSFORM)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) ) { if ((needstransform || ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled)) ) {
if(!oprevi || oprevi == orig_prev) if(!oprevi || oprevi == orig_prev)
oprevi = new Imagefloat (pW, pH); oprevi = new Imagefloat (pW, pH);
if (needstransform) if (needstransform)
@@ -387,7 +387,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
orig_prev->copyData(oprevi); orig_prev->copyData(oprevi);
} }
if ((todo & (M_TRANSFORM)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) { if ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
const int W = oprevi->getWidth(); const int W = oprevi->getWidth();
const int H = oprevi->getHeight(); const int H = oprevi->getHeight();
LabImage labcbdl(W, H); LabImage labcbdl(W, H);

2
rtengine/rawimage.cc
View File

@@ -534,7 +534,7 @@ int RawImage::loadRaw (bool loadData, bool closeFile, ProgressListener *plistene
free (raw_image); free (raw_image);
raw_image = nullptr; raw_image = nullptr;
} else { } else {
if (cc && cc->has_rawCrop()) { // foveon images if (is_foveon && cc && cc->has_rawCrop()) { // foveon images
int lm, tm, w, h; int lm, tm, w, h;
cc->get_rawCrop(lm, tm, w, h); cc->get_rawCrop(lm, tm, w, h);
left_margin = lm; left_margin = lm;

2
rtgui/defringe.cc
View File

@@ -35,8 +35,6 @@ Defringe::Defringe () : FoldableToolPanel(this, "defringe", M("TP_DEFRINGE_LABEL
bottomMilestones.push_back( GradientMilestone(double(x), double(R), double(G), double(B)) ); bottomMilestones.push_back( GradientMilestone(double(x), double(R), double(G), double(B)) );
} }
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
curveEditorPF = new CurveEditorGroup (options.lastPFCurvesDir); curveEditorPF = new CurveEditorGroup (options.lastPFCurvesDir);
curveEditorPF->setCurveListener (this); curveEditorPF->setCurveListener (this);
chshape = static_cast<FlatCurveEditor*>(curveEditorPF->addCurve(CT_Flat, M("TP_PFCURVE_CURVEEDITOR_CH"))); chshape = static_cast<FlatCurveEditor*>(curveEditorPF->addCurve(CT_Flat, M("TP_PFCURVE_CURVEEDITOR_CH")));

2
rtgui/dirpyrequalizer.cc
View File

@@ -69,8 +69,6 @@ DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, "dirpyrequalizer",
cbVBox->pack_start(*cdbox); cbVBox->pack_start(*cdbox);
pack_start(*cbVBox); pack_start(*cbVBox);
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
Gtk::HBox * buttonBox1 = Gtk::manage (new Gtk::HBox(true, 10)); Gtk::HBox * buttonBox1 = Gtk::manage (new Gtk::HBox(true, 10));
pack_start(*buttonBox1); pack_start(*buttonBox1);

6
rtgui/options.cc
View File

@@ -354,10 +354,10 @@ void Options::setDefaults ()
profilePath = "profiles"; profilePath = "profiles";
loadSaveProfilePath = ""; // will be corrected in load as otherwise construction fails loadSaveProfilePath = ""; // will be corrected in load as otherwise construction fails
version = "0.0.0.0"; // temporary value; will be correctly set in RTWindow::on_realize version = "0.0.0.0"; // temporary value; will be correctly set in RTWindow::on_realize
thumbSize = 240; thumbSize = 160;
thumbSizeTab = 180; thumbSizeTab = 160;
thumbSizeQueue = 160; thumbSizeQueue = 160;
sameThumbSize = true; // preferring speed of switch between file browser and single editor tab sameThumbSize = false; // preferring speed of switch between file browser and single editor tab
showHistory = true; showHistory = true;
showFilePanelState = 0; // Not used anymore ; was the thumb strip state showFilePanelState = 0; // Not used anymore ; was the thumb strip state
showInfo = true; showInfo = true;

2
rtgui/sharpening.cc
View File

@@ -25,8 +25,6 @@ using namespace rtengine::procparams;
Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENING_LABEL"), true, true) Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENING_LABEL"), true, true)
{ {
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ()); Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
hb->show (); hb->show ();
Gtk::Label* ml = Gtk::manage (new Gtk::Label (M("TP_SHARPENING_METHOD") + ":")); Gtk::Label* ml = Gtk::manage (new Gtk::Label (M("TP_SHARPENING_METHOD") + ":"));

2
rtgui/sharpenmicro.cc
View File

@@ -28,8 +28,6 @@ using namespace rtengine::procparams;
SharpenMicro::SharpenMicro () : FoldableToolPanel(this, "sharpenmicro", M("TP_SHARPENMICRO_LABEL"), true, true) SharpenMicro::SharpenMicro () : FoldableToolPanel(this, "sharpenmicro", M("TP_SHARPENMICRO_LABEL"), true, true)
{ {
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
amount = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"), 0, 100, 1, 20)); amount = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"), 0, 100, 1, 20));
amount->setAdjusterListener (this); amount->setAdjusterListener (this);