gpointing-device-settings r33 - in trunk: data modules

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Fri Feb 27 09:40:51 2009
New Revision: 33
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=33&view=rev

Log:
Remove unsupported value UI.
Set widget sensitivity.

Modified:
   trunk/data/touchpad.ui
   trunk/modules/gpds-touchpad-ui.c

Modified: trunk/data/touchpad.ui
==============================================================================
--- trunk/data/touchpad.ui	(original)
+++ trunk/data/touchpad.ui	Fri Feb 27 09:40:51 2009
@@ -734,88 +734,11 @@
                         </child>
                         <child>
                           <object class="GtkVBox" id="circular_scroll_box">
-                            <property name="visible">True</property>
+                            <property name="visible">False</property>
                             <property name="sensitive">False</property>
                             <property name="homogeneous">False</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkHBox" id="hbox25">
-                                <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="label21">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">&lt;i&gt;Slow&lt;/i&gt;</property>
-                                    <property name="use_underline">False</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">1</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkHScale" id="circular_scroll_scale">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="draw_value">False</property>
-                                    <property name="value_pos">GTK_POS_TOP</property>
-                                    <property name="digits">0</property>
-                                    <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
-                                    <property name="inverted">False</property>
-                                    <property name="adjustment">adjustment5</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label22">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">&lt;i&gt;Fast&lt;/i&gt;</property>
-                                    <property name="use_underline">False</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="padding">0</property>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                              </packing>
-                            </child>
-                            <child>
                               <object class="GtkLabel" id="label45">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Start point of circular scrolling:</property>

Modified: trunk/modules/gpds-touchpad-ui.c
==============================================================================
--- trunk/modules/gpds-touchpad-ui.c	(original)
+++ trunk/modules/gpds-touchpad-ui.c	Fri Feb 27 09:40:51 2009
@@ -344,6 +344,7 @@
     builder = gpds_ui_get_builder(GPDS_UI(user_data));
 
     set_toggle_property(ui->xinput, button, CIRCULAR_SCROLLING);
+    set_widget_sensitivity(builder, "circular_scroll_box", button);
 }
 
 static void