gimp r24917 - in branches/weskaggs: . app/tools libgimpwidgets



Author: weskaggs
Date: Tue Feb 19 04:22:48 2008
New Revision: 24917
URL: http://svn.gnome.org/viewvc/gimp?rev=24917&view=rev

Log:
Bill Skaggs  <weskaggs primate ucdavis edu>

	* libgimpwidgets/gimpwidgets.h: Include gimpscalecontrol.h
	
	* libgimpwidgets/gimppropwidgets.c (gimp_prop_scale_entry_new):
	Use scale control rather than scale entry.

	* app/tools/gimppaintoptions-gui.c
	* app/tools/gimpinkoptions-gui.c
	* app/tools/gimpforegroundselectoptions.c
	* app/tools/gimpcoloroptions.c: corresponding tweaks.


Modified:
   branches/weskaggs/ChangeLog
   branches/weskaggs/app/tools/gimpcoloroptions.c
   branches/weskaggs/app/tools/gimpforegroundselectoptions.c
   branches/weskaggs/app/tools/gimpinkoptions-gui.c
   branches/weskaggs/app/tools/gimppaintoptions-gui.c
   branches/weskaggs/libgimpwidgets/gimppropwidgets.c
   branches/weskaggs/libgimpwidgets/gimpwidgets.h

Modified: branches/weskaggs/app/tools/gimpcoloroptions.c
==============================================================================
--- branches/weskaggs/app/tools/gimpcoloroptions.c	(original)
+++ branches/weskaggs/app/tools/gimpcoloroptions.c	Tue Feb 19 04:22:48 2008
@@ -171,7 +171,7 @@
                                    _("Radius:"),
                                    1.0, 10.0, 0,
                                    FALSE, 0.0, 0.0);
-  gimp_scale_entry_set_logarithmic (adj, TRUE);
+  gimp_scale_control_set_logarithmic (adj, TRUE);
 
   return vbox;
 }

Modified: branches/weskaggs/app/tools/gimpforegroundselectoptions.c
==============================================================================
--- branches/weskaggs/app/tools/gimpforegroundselectoptions.c	(original)
+++ branches/weskaggs/app/tools/gimpforegroundselectoptions.c	Tue Feb 19 04:22:48 2008
@@ -311,18 +311,15 @@
 
   adj = gimp_prop_opacity_entry_new (config, "sensitivity-l",
                                      GTK_TABLE (table), 0, row++, "L");
-  gtk_range_set_update_policy (GTK_RANGE (GIMP_SCALE_ENTRY_SCALE (adj)),
-                               GTK_UPDATE_DELAYED);
+  gimp_scale_control_set_update_policy (adj, GTK_UPDATE_DELAYED);
 
   adj = gimp_prop_opacity_entry_new (config, "sensitivity-a",
                                      GTK_TABLE (table), 0, row++, "a");
-  gtk_range_set_update_policy (GTK_RANGE (GIMP_SCALE_ENTRY_SCALE (adj)),
-                               GTK_UPDATE_DELAYED);
+  gimp_scale_control_set_update_policy (adj, GTK_UPDATE_DELAYED);
 
   adj = gimp_prop_opacity_entry_new (config, "sensitivity-b",
                                      GTK_TABLE (table), 0, row++, "b");
-  gtk_range_set_update_policy (GTK_RANGE (GIMP_SCALE_ENTRY_SCALE (adj)),
-                               GTK_UPDATE_DELAYED);
+  gimp_scale_control_set_update_policy (adj, GTK_UPDATE_DELAYED);
 
   return vbox;
 }

Modified: branches/weskaggs/app/tools/gimpinkoptions-gui.c
==============================================================================
--- branches/weskaggs/app/tools/gimpinkoptions-gui.c	(original)
+++ branches/weskaggs/app/tools/gimpinkoptions-gui.c	Tue Feb 19 04:22:48 2008
@@ -68,7 +68,7 @@
                                    _("Size:"),
                                    1.0, 2.0, 1,
                                    FALSE, 0.0, 0.0);
-  gimp_scale_entry_set_logarithmic (adj, TRUE);
+  gimp_scale_control_set_logarithmic (adj, TRUE);
 
   /* angle adjust slider */
   gimp_prop_scale_entry_new (config, "tilt-angle",

Modified: branches/weskaggs/app/tools/gimppaintoptions-gui.c
==============================================================================
--- branches/weskaggs/app/tools/gimppaintoptions-gui.c	(original)
+++ branches/weskaggs/app/tools/gimppaintoptions-gui.c	Tue Feb 19 04:22:48 2008
@@ -129,7 +129,7 @@
                                        _("Scale:"),
                                        0.01, 0.1, 2,
                                        FALSE, 0.0, 0.0);
-      gimp_scale_entry_set_logarithmic (adj, TRUE);
+      gimp_scale_control_set_logarithmic (adj, TRUE);
     }
 
   /*  the gradient  */

Modified: branches/weskaggs/libgimpwidgets/gimppropwidgets.c
==============================================================================
--- branches/weskaggs/libgimpwidgets/gimppropwidgets.c	(original)
+++ branches/weskaggs/libgimpwidgets/gimppropwidgets.c	Tue Feb 19 04:22:48 2008
@@ -1175,25 +1175,25 @@
 
   if (! limit_scale)
     {
-      adjustment = gimp_scale_entry_new (table, column, row,
-                                         label, -1, -1,
-                                         value, lower, upper,
-                                         step_increment, page_increment,
-                                         digits,
-                                         TRUE, 0.0, 0.0,
-                                         tooltip,
-                                         NULL);
+      adjustment = gimp_scale_control_new (table, column, row,
+                                           label, -1, -1,
+                                           value, lower, upper,
+                                           step_increment, page_increment,
+                                           digits,
+                                           TRUE, 0.0, 0.0,
+                                           tooltip,
+                                           NULL);
     }
   else
     {
-      adjustment = gimp_scale_entry_new (table, column, row,
-                                         label, -1, -1,
-                                         value, lower_limit, upper_limit,
-                                         step_increment, page_increment,
-                                         digits,
-                                         FALSE, lower, upper,
-                                         tooltip,
-                                         NULL);
+      adjustment = gimp_scale_control_new (table, column, row,
+                                           label, -1, -1,
+                                           value, lower_limit, upper_limit,
+                                           step_increment, page_increment,
+                                           digits,
+                                           FALSE, lower, upper,
+                                           tooltip,
+                                           NULL);
     }
 
   set_param_spec (G_OBJECT (adjustment), NULL,  param_spec);
@@ -1260,13 +1260,13 @@
   lower = G_PARAM_SPEC_DOUBLE (param_spec)->minimum * 100.0;
   upper = G_PARAM_SPEC_DOUBLE (param_spec)->maximum * 100.0;
 
-  adjustment = gimp_scale_entry_new (table, column, row,
-                                     label, -1, -1,
-                                     value, lower, upper,
-                                     1.0, 10.0, 1,
-                                     TRUE, 0.0, 0.0,
-                                     tooltip,
-                                     NULL);
+  adjustment = gimp_scale_control_new (table, column, row,
+                                       label, -1, -1,
+                                       value, lower, upper,
+                                       1.0, 10.0, 1,
+                                       TRUE, 0.0, 0.0,
+                                       tooltip,
+                                       NULL);
 
   set_param_spec (G_OBJECT (adjustment), NULL,  param_spec);
   g_object_set_data (G_OBJECT (adjustment),

Modified: branches/weskaggs/libgimpwidgets/gimpwidgets.h
==============================================================================
--- branches/weskaggs/libgimpwidgets/gimpwidgets.h	(original)
+++ branches/weskaggs/libgimpwidgets/gimpwidgets.h	Tue Feb 19 04:22:48 2008
@@ -67,6 +67,7 @@
 #include <libgimpwidgets/gimppreviewarea.h>
 #include <libgimpwidgets/gimppropwidgets.h>
 #include <libgimpwidgets/gimpquerybox.h>
+#include <libgimpwidgets/gimpscalecontrol.h>
 #include <libgimpwidgets/gimpscaleentry.h>
 #include <libgimpwidgets/gimpscrolledpreview.h>
 #include <libgimpwidgets/gimpsizeentry.h>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]