From 2d77d783e0855e479654a75a9a7f7bb3177fa62c Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Sun, 17 Jan 2016 10:06:22 +0100
Subject: [PATCH] Fixed various bug issue 2969

---
 rtdata/languages/default | 4 ++--
 rtgui/partialpastedlg.cc | 4 ++++
 rtgui/retinex.cc         | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/rtdata/languages/default b/rtdata/languages/default
index 415c27896..3a64f25fe 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -1664,7 +1664,7 @@ TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorre
 TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
 TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
 TP_RETINEX_FREEGAMMA;Free gamma
-TP_RETINEX_GAIN;Contrast
+TP_RETINEX_GAIN;Gain
 TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
 TP_RETINEX_GAMMA;Gamma
 TP_RETINEX_GAMMA_FREE;Free
@@ -1720,7 +1720,7 @@ TP_RETINEX_TRANSMISSION_TOOLTIP;Transmission according to transmission.\nAbsciss
 TP_RETINEX_UNIFORM;Uniform
 TP_RETINEX_VARIANCE;Contrast
 TP_RETINEX_VARIANCE_TOOLTIP;Low variance increase local contrast and saturation, but can lead to artifacts.
-TP_RETINEX_VIEW;Process (Preview)
+TP_RETINEX_VIEW;Process
 TP_RETINEX_VIEW_NONE;Standard
 TP_RETINEX_VIEW_MASK;Mask
 TP_RETINEX_VIEW_UNSHARP;Unsharp mask
diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc
index bbfdd0701..d017b5409 100644
--- a/rtgui/partialpastedlg.cc
+++ b/rtgui/partialpastedlg.cc
@@ -505,6 +505,7 @@ void PartialPasteDlg::basicToggled ()
     gradientConn.block (true);
     labcurveConn.block (true);
     colorappearanceConn.block (true);
+    retinexConn.block (true);
 
     basic->set_inconsistent (false);
 
@@ -514,6 +515,7 @@ void PartialPasteDlg::basicToggled ()
     epd->set_active (basic->get_active ());
     pcvignette->set_active (basic->get_active ());
     gradient->set_active (basic->get_active ());
+    retinex->set_active (basic->get_active ());
     labcurve->set_active (basic->get_active ());
     colorappearance->set_active (basic->get_active ());
 
@@ -523,6 +525,8 @@ void PartialPasteDlg::basicToggled ()
     epdConn.block (false);
     pcvignetteConn.block (false);
     gradientConn.block (false);
+    retinexConn.block (false);
+    
     labcurveConn.block (false);
     colorappearanceConn.block (false);
 }
diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc
index 0cad28377..0a2da4af3 100644
--- a/rtgui/retinex.cc
+++ b/rtgui/retinex.cc
@@ -993,7 +993,7 @@ void Retinex::mapMethodChanged()
 void Retinex::viewMethodChanged()
 {
     if(viewMethod->get_active_row_number() == 1 || viewMethod->get_active_row_number() == 2) {
-        vart->hide();
+    //    vart->hide();
         gain->hide();
         offs->hide();
         limd->hide();
@@ -1008,7 +1008,7 @@ void Retinex::viewMethodChanged()
     else if(viewMethod->get_active_row_number() == 3 || viewMethod->get_active_row_number() == 4) {
         gain->hide();
         offs->hide();
-        vart->hide();
+    //    vart->hide();
         curveEditorGH->hide();
     }
     else {