mousetweaks r170 - in trunk: . data src

[gerdk svn gnome org]

Author: gerdk
Date: Sun Jun  1 08:37:01 2008
New Revision: 170
URL: http://svn.gnome.org/viewvc/mousetweaks?rev=170&view=rev

Log:
2008-06-01 Gerd Kohlberger <gerdk svn gnome org>

	* src/dwell-click-applet.c: Change 'enable dwell' icon to a label.



Modified:
   trunk/ChangeLog
   trunk/data/dwell-click-applet.glade
   trunk/src/dwell-click-applet.c

Modified: trunk/data/dwell-click-applet.glade
==============================================================================
--- trunk/data/dwell-click-applet.glade	(original)
+++ trunk/data/dwell-click-applet.glade	Sun Jun  1 08:37:01 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sat May 17 14:59:29 2008 -->
+<!--Generated with glade3 3.4.5 on Sun Jun  1 06:37:11 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="horizontal">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -15,13 +15,8 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="tooltip_text">Enable Dwell Click</property>
+            <property name="label" translatable="yes">On</property>
             <property name="response_id">0</property>
-            <child>
-              <widget class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="stock">gtk-ok</property>
-              </widget>
-            </child>
           </widget>
           <packing>
             <property name="expand">False</property>
@@ -152,13 +147,8 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="tooltip_text">Enable Dwell Click</property>
+            <property name="label" translatable="yes">On</property>
             <property name="response_id">0</property>
-            <child>
-              <widget class="GtkImage" id="image2">
-                <property name="visible">True</property>
-                <property name="stock">gtk-ok</property>
-              </widget>
-            </child>
           </widget>
           <packing>
             <property name="expand">False</property>

Modified: trunk/src/dwell-click-applet.c
==============================================================================
--- trunk/src/dwell-click-applet.c	(original)
+++ trunk/src/dwell-click-applet.c	Sun Jun  1 08:37:01 2008
@@ -107,6 +107,8 @@
 
     dwell = gtk_toggle_button_get_active (button);
     gconf_client_set_bool (dd->client, OPT_DWELL, dwell, NULL);
+
+    gtk_button_set_label (GTK_BUTTON (button), dwell ? _("On") : _("Off"));
 }
 
 static gboolean
@@ -339,18 +341,23 @@
 setup_box (DwellData *dd)
 {
     GtkWidget *widget;
+    GtkSizeGroup *hgroup, *vgroup;
     gint i;
 
     /* horizontal */
+    hgroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
     widget = WID ("single_click");
     init_button (dd, widget);
+    gtk_size_group_add_widget (hgroup, widget);
     g_signal_connect (widget, "size-allocate",
 		      G_CALLBACK (button_size_allocate), dd);
+
     init_button (dd, WID ("double_click"));
     init_button (dd, WID ("drag_click"));
     init_button (dd, WID ("right_click"));
 
     widget = WID ("enable");
+    gtk_size_group_add_widget (hgroup, widget);
     g_signal_connect (widget, "button-press-event",
 		      G_CALLBACK (do_not_eat), NULL);
     g_signal_connect (widget, "toggled",
@@ -361,7 +368,9 @@
 		      G_CALLBACK (enable_dwell_crossing), dd);
 
     /* vertical */
+    vgroup = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
     widget = WID ("single_click_v");
+    gtk_size_group_add_widget (vgroup, widget);
     init_button (dd, widget);
     g_signal_connect (WID ("single_click_v"), "size-allocate",
 		      G_CALLBACK (button_size_allocate), dd);
@@ -370,6 +379,7 @@
     init_button (dd, WID ("right_click_v"));
 
     widget = WID ("enable_v");
+    gtk_size_group_add_widget (vgroup, widget);
     g_signal_connect (widget, "button-press-event",
 		      G_CALLBACK (do_not_eat), NULL);
     g_signal_connect (widget, "toggled",
@@ -583,6 +593,7 @@
 
     dwell = gconf_client_get_bool (dd->client, OPT_DWELL, NULL);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dd->enable), dwell);
+    gtk_button_set_label (GTK_BUTTON (dd->enable), dwell ? _("On") : _("Off"));
 
     setup_box (dd);
     gtk_widget_reparent (dd->box, GTK_WIDGET (applet));