[Rawstudio-commit] r4371 - branches/4175-enfuse/src

[Anders Kvist]

Author: akv
Date: 2013-04-27 18:06:52 +0200 (Sat, 27 Apr 2013)
New Revision: 4371

Modified:
   branches/4175-enfuse/src/rs-actions.c
   branches/4175-enfuse/src/rs-enfuse.c
Log:
Connected value-changed signal for slider and setting value to gconf for each 
change - reading the value from gconf in rs_enfuse().

Modified: branches/4175-enfuse/src/rs-actions.c
===================================================================
--- branches/4175-enfuse/src/rs-actions.c       2013-04-27 13:21:04 UTC (rev 
4370)
+++ branches/4175-enfuse/src/rs-actions.c       2013-04-27 16:06:52 UTC (rev 
4371)
@@ -1520,6 +1520,15 @@
   return thumbnails;
 }
 
+void
+enfuse_size_changed (GtkRange *range, gint *maxsize) {
+  gint size = gtk_range_get_value(GTK_RANGE(range));
+  /* to make it easier to adjust when using different size images next time */
+  if (size == *maxsize)
+    size = 0;
+  rs_conf_set_integer(CONF_ENFUSE_SIZE, size);  
+}
+
 ACTION(enfuse)
 {
   gboolean enfuse = TRUE;
@@ -1579,6 +1588,7 @@
 
   GtkWidget *size_scale = gtk_hscale_new_with_range(300, maxsize, 1.0);
   gtk_range_set_value(GTK_RANGE(size_scale), size_value);
+  g_signal_connect(size_scale, "value-changed", 
G_CALLBACK(enfuse_size_changed), &maxsize);
   GtkWidget *size_label = gtk_label_new("Size:");
   GtkWidget *size_box = gtk_hbox_new(FALSE, 5);
   gtk_box_pack_start(GTK_BOX(size_box), size_label, FALSE, TRUE, 5);
@@ -1595,15 +1605,9 @@
       rs_preview_widget_unlock_renderer((RSPreviewWidget *) rs->preview);
       return;
     }
-  gint size = gtk_range_get_value(GTK_RANGE(size_scale));
   gtk_widget_destroy(dialog);
 
-  /* to make it easier to adjust when using different size images next time */
-  if (size == maxsize)
-    size = 0;
-  rs_conf_set_integer(CONF_ENFUSE_SIZE, size);
-
-  gchar *filename = rs_enfuse(rs, selected_names, FALSE, size);
+  gchar *filename = rs_enfuse(rs, selected_names, FALSE, -1);
   g_list_free(selected_names);
   rs_cache_save_flags(filename, &priority, NULL, &enfuse);
 

Modified: branches/4175-enfuse/src/rs-enfuse.c
===================================================================
--- branches/4175-enfuse/src/rs-enfuse.c        2013-04-27 13:21:04 UTC (rev 
4370)
+++ branches/4175-enfuse/src/rs-enfuse.c        2013-04-27 16:06:52 UTC (rev 
4371)
@@ -304,6 +304,12 @@
   if (!rs_conf_get_integer(CONF_ENFUSE_METHOD, &method))
     method = DEFAULT_CONF_ENFUSE_METHOD;
 
+  if (boundingbox == -1) 
+    {
+      if (!rs_conf_get_integer(CONF_ENFUSE_SIZE, &boundingbox))
+       boundingbox = DEFAULT_CONF_ENFUSE_SIZE;
+    }
+
   gchar *method_options = NULL;
   if (method == ENFUSE_METHOD_EXPOSURE_BLENDING_ID) {
     method_options = g_strdup(ENFUSE_OPTIONS_EXPOSURE_BLENDING);
@@ -322,7 +328,10 @@
 
   RS_PROGRESS *progress = NULL;
   if (quick == FALSE)
-    progress = gui_progress_new("Enfusing...", 5);
+    {
+      progress = gui_progress_new("Enfusing...", 5);
+      GUI_CATCHUP();
+    }
 
   if (num_selected == 1)
     {


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