From 281b196b8b65290bb2b48b3539f7972a0eb3ef2f Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Wed, 20 Sep 2017 17:43:33 +0200
Subject: [PATCH] Fixed bug in GUI preferences - local adjustements

---
 rtengine/improccoordinator.cc | 12 +++++++++---
 rtgui/preferences.cc          | 35 ++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index c92f3776c..e7aad1562 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -1515,9 +1515,15 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
                 }
 
                 if (versionmip == 10009) {
-                    maxind = 58;
+                    maxind = 69;
                 }
 
+// I have forgotten 10010  ==> probably crash...but now it's passed...
+//enabled this code after...
+//               if (versionmip == 10011) {
+//                   maxind = 70;
+//               }
+
                 while (getline (fich, line)) {
                     spotline = line;
                     std::size_t pos = spotline.find ("=");
@@ -1663,7 +1669,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
             }
 
             if (versionmip == 10008) {
-
+				//vibrance
                 for (int sp = 1; sp < maxspot; sp++) { // spots default
 
                     dataspot[58][sp] = 19;
@@ -1678,7 +1684,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
                 }
             }
 
-            if (versionmip == 10009) {
+            if (versionmip == 10009) {//exposure
                 for (int sp = 1; sp < maxspot; sp++) { // spots default
                     dataspot[64][sp] = 0;
                     dataspot[65][sp] = 0;
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 9401c5b6b..5ccd08983 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -1001,22 +1001,6 @@ Gtk::Widget* Preferences::getGeneralPanel ()
 
     // ---------------------------------------------
 
-    Gtk::Frame* flocal = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_LOCAL")) );
-    setExpandAlignProperties (flocal, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
-    Gtk::Grid* localGrid = Gtk::manage ( new Gtk::Grid() );
-    localGrid->set_column_spacing (4);
-    localGrid->set_row_spacing (4);
-    setExpandAlignProperties (localGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
-
-    ckbShowdelimspot =  Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_LOCALSHOWDELIMSPOT")) );
-    setExpandAlignProperties (ckbShowdelimspot, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
-    localGrid->attach_next_to (*ckbShowdelimspot, Gtk::POS_LEFT, 3, 1);
-
-    flocal->add (*localGrid);
-    mvbsd->attach_next_to (*flocal, *fworklflow, Gtk::POS_BOTTOM, 2, 1);
-
-    // ---------------------------------------------
-
     Gtk::Frame* flang = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_LANG")) );
     setExpandAlignProperties (flang, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
     Gtk::Grid* langGrid = Gtk::manage ( new Gtk::Grid() );
@@ -1051,6 +1035,23 @@ Gtk::Widget* Preferences::getGeneralPanel ()
     mvbsd->attach_next_to (*flang, *fworklflow, Gtk::POS_BOTTOM, 2, 1);
 
     // ---------------------------------------------
+	
+
+    Gtk::Frame* flocal = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_LOCAL")) );
+    setExpandAlignProperties (flocal, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
+    Gtk::Grid* localGrid = Gtk::manage ( new Gtk::Grid() );
+    localGrid->set_column_spacing (4);
+    localGrid->set_row_spacing (4);
+    setExpandAlignProperties (localGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
+
+    ckbShowdelimspot =  Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_LOCALSHOWDELIMSPOT")) );
+    setExpandAlignProperties (ckbShowdelimspot, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
+    localGrid->attach_next_to (*ckbShowdelimspot, Gtk::POS_LEFT, 3, 1);
+
+    flocal->add (*localGrid);
+    mvbsd->attach_next_to (*flocal, *flang, Gtk::POS_BOTTOM, 2, 1);
+
+	//--------------------------------------------------
 
     Gtk::Frame* ftheme = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_THEME")) );
     setExpandAlignProperties (ftheme, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
@@ -1121,7 +1122,7 @@ Gtk::Widget* Preferences::getGeneralPanel ()
     themeGrid->attach_next_to (*butNavGuideCol, *navGuideLabel, Gtk::POS_RIGHT, 1, 1);
 
     ftheme->add (*themeGrid);
-    mvbsd->attach_next_to (*ftheme, *flang, Gtk::POS_BOTTOM, 2, 1);
+    mvbsd->attach_next_to (*ftheme, *flocal, Gtk::POS_BOTTOM, 2, 1);
 
     // ---------------------------------------------