[Rawstudio-commit] r3966 - trunk/src

[Klaus Post]

Author: post
Date: 2011-04-07 22:17:30 +0200 (Thu, 07 Apr 2011)
New Revision: 3966

Modified:
   trunk/src/rs-photo.c
   trunk/src/rs-toolbox.c
Log:
Only allow setting CA & Vignetting on snapshot A, and always use that setting.

Modified: trunk/src/rs-photo.c
===================================================================
--- trunk/src/rs-photo.c        2011-04-07 19:43:34 UTC (rev 3965)
+++ trunk/src/rs-photo.c        2011-04-07 20:17:30 UTC (rev 3966)
@@ -432,9 +432,9 @@
                                "lens", lens,
                                "focal", (gfloat) meta->focallength,
                                "aperture", meta->aperture,
-                               "tca_kr", photo->settings[snapshot]->tca_kr,
-                               "tca_kb", photo->settings[snapshot]->tca_kb,
-                               "vignetting", 
photo->settings[snapshot]->vignetting,
+                               "tca_kr", photo->settings[0]->tca_kr,
+                               "tca_kb", photo->settings[0]->tca_kb,
+                               "vignetting", photo->settings[0]->vignetting,
                                NULL);
                        g_object_unref(lens);
                }

Modified: trunk/src/rs-toolbox.c
===================================================================
--- trunk/src/rs-toolbox.c      2011-04-07 19:43:34 UTC (rev 3965)
+++ trunk/src/rs-toolbox.c      2011-04-07 20:17:30 UTC (rev 3966)
@@ -304,7 +304,10 @@
                gint snapshot = 
GPOINTER_TO_INT(g_object_get_data(G_OBJECT(range), "rs-snapshot"));
                gfloat value = gtk_range_get_value(range);
                BasicSettings *basic = g_object_get_data(G_OBJECT(range), 
"rs-basic");
-               g_object_set(toolbox->photo->settings[snapshot], 
basic->property_name, value, NULL);
+               if (snapshot != 0  && (basic->mask & (MASK_TCA_KR | MASK_TCA_KB 
| MASK_VIGNETTING)) != 0)
+                       return;
+               else
+                       g_object_set(toolbox->photo->settings[snapshot], 
basic->property_name, value, NULL);
        }
 
        if (toolbox->photo)
@@ -349,6 +352,9 @@
                }
                else
                        
rs_object_class_property_reset(G_OBJECT(toolbox->photo->settings[snapshot]), 
basic->property_name);
+
+               if (snapshot != 0 && (mask & (MASK_TCA_KR | MASK_TCA_KB 
|MASK_VIGNETTING)) != 0)
+                       rs_settings_copy(s[snapshot], mask, 
toolbox->photo->settings[0]);
        }
 
 
@@ -1007,6 +1013,9 @@
                                gfloat value;
                                
g_object_get(toolbox->photo->settings[snapshot], lens[i].property_name, &value, 
NULL);
                                gtk_range_set_value(toolbox->lens[snapshot][i], 
value);
+                               /* NOTICE: This disables sliders on B+C pages */
+                               if (snapshot != 0)
+                                       
gtk_widget_set_sensitive(GTK_WIDGET(toolbox->lens[snapshot][i]), FALSE);
                        }
 
                /* Update curve */


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit