applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hook up widget correctly.

Browse source 
Mon May 13 17:32:25 2002  Jonathan Blandford  <jrb@redhat.com>

	* gnome-keyboard-properties.c (delay_to_widget): hook up widget
	correctly.
This commit is contained in:
Jonathan Blandford 2002-05-13 21:32:58 +00:00 • committed by Jonathan Blandford
parent 1ce84d9eda
commit 107c6b5c0f
3 changed files with 141 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/keyboard/ChangeLog
View file

@ -1,3 +1,8 @@
Mon May 13 17:32:25 2002 Jonathan Blandford <jrb@redhat.com>
* gnome-keyboard-properties.c (delay_to_widget): hook up widget
correctly.
2002-05-09 Jody Goldberg <jody@gnome.org> 2002-05-09 Jody Goldberg <jody@gnome.org>
* gnome-keyboard-properties.c (dialog_response) : support help. * gnome-keyboard-properties.c (dialog_response) : support help.

14
capplets/keyboard/gnome-keyboard-properties.c
View file

@ -101,13 +101,13 @@ delay_to_widget (GConfPropertyEditor *peditor, const GConfValue *value)
new_value = gconf_value_new (GCONF_VALUE_INT); new_value = gconf_value_new (GCONF_VALUE_INT);
if (delay >= (1000 + 700) / 2) if (delay >= (1000 + 700) / 2)
gconf_value_set_int (new_value, 0);
else if (delay >= (700 + 300) / 2)
gconf_value_set_int (new_value, 1);
else if (delay >= (300) / 2)
gconf_value_set_int (new_value, 2);
else
gconf_value_set_int (new_value, 3); gconf_value_set_int (new_value, 3);
else if (delay >= (700 + 300) / 2)
gconf_value_set_int (new_value, 2);
else if (delay >= (300 + 150) / 2)
gconf_value_set_int (new_value, 1);
else
gconf_value_set_int (new_value, 0);
return new_value; return new_value;
} }
@ -116,7 +116,7 @@ static GConfValue *
delay_from_widget (GConfPropertyEditor *peditor, GConfValue *value) delay_from_widget (GConfPropertyEditor *peditor, GConfValue *value)
{ {
static int delays[] = { static int delays[] = {
1000, 700, 300, 0 150, 300, 700, 1000
}; };
GConfValue *new_value; GConfValue *new_value;

217
capplets/keyboard/gnome-keyboard-properties.glade
View file

@ -5,7 +5,7 @@
<requires lib="gnome"/> <requires lib="gnome"/>
<widget class="GtkDialog" id="keyboard_dialog"> <widget class="GtkDialog" id="keyboard_dialog">
<property name="title" translatable="yes">Keyboard Properties</property> <property name="title" translatable="yes">Keyboard Preferences</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property> <property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property> <property name="modal">False</property>
@ -81,8 +81,8 @@
<child> <child>
<widget class="GtkFrame" id="frame3"> <widget class="GtkFrame" id="frame3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Repeat Rate</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child> <child>
@ -166,6 +166,7 @@
<property name="yalign">0.5</property> <property name="yalign">0.5</property>
<property name="xpad">0</property> <property name="xpad">0</property>
<property name="ypad">0</property> <property name="ypad">0</property>
<property name="mnemonic_widget">repeat_delay_omenu</property>
</widget> </widget>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
@ -190,6 +191,7 @@
<property name="yalign">0.5</property> <property name="yalign">0.5</property>
<property name="xpad">0</property> <property name="xpad">0</property>
<property name="ypad">0</property> <property name="ypad">0</property>
<property name="mnemonic_widget">repeat_speed_omenu</property>
</widget> </widget>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
@ -205,7 +207,7 @@
<widget class="GtkOptionMenu" id="repeat_delay_omenu"> <widget class="GtkOptionMenu" id="repeat_delay_omenu">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="history">-1</property> <property name="history">0</property>
<child internal-child="menu"> <child internal-child="menu">
<widget class="GtkMenu" id="convertwidget1"> <widget class="GtkMenu" id="convertwidget1">
@ -214,61 +216,33 @@
<child> <child>
<widget class="GtkMenuItem" id="convertwidget2"> <widget class="GtkMenuItem" id="convertwidget2">
<property name="visible">True</property> <property name="visible">True</property>
<child> <property name="label" translatable="yes">Very Short</property>
<widget class="GtkAccelLabel" id="convertwidget6"> <property name="use_underline">True</property>
<property name="label" translatable="yes">Very long</property> </widget>
<property name="xalign">0.0</property>
<property name="accel-widget">convertwidget2</property>
<property name="use-underline">yes</property>
<property name="visible">yes</property>
</widget>
</child>
</widget>
</child> </child>
<child> <child>
<widget class="GtkMenuItem" id="convertwidget3"> <widget class="GtkMenuItem" id="convertwidget3">
<property name="visible">True</property> <property name="visible">True</property>
<child> <property name="label" translatable="yes">Short</property>
<widget class="GtkAccelLabel" id="convertwidget7"> <property name="use_underline">True</property>
<property name="label" translatable="yes">Long</property> </widget>
<property name="xalign">0.0</property>
<property name="accel-widget">convertwidget3</property>
<property name="use-underline">yes</property>
<property name="visible">yes</property>
</widget>
</child>
</widget>
</child> </child>
<child> <child>
<widget class="GtkMenuItem" id="convertwidget4"> <widget class="GtkMenuItem" id="convertwidget4">
<property name="visible">True</property> <property name="visible">True</property>
<child> <property name="label" translatable="yes">Medium</property>
<widget class="GtkAccelLabel" id="convertwidget8"> <property name="use_underline">True</property>
<property name="label" translatable="yes">Medium</property> </widget>
<property name="xalign">0.0</property>
<property name="accel-widget">convertwidget4</property>
<property name="use-underline">yes</property>
<property name="visible">yes</property>
</widget>
</child>
</widget>
</child> </child>
<child> <child>
<widget class="GtkMenuItem" id="convertwidget5"> <widget class="GtkMenuItem" id="convertwidget5">
<property name="visible">True</property> <property name="visible">True</property>
<child> <property name="label" translatable="yes">Long</property>
<widget class="GtkAccelLabel" id="convertwidget9"> <property name="use_underline">True</property>
<property name="label" translatable="yes">Short</property> </widget>
<property name="xalign">0.0</property>
<property name="accel-widget">convertwidget5</property>
<property name="use-underline">yes</property>
<property name="visible">yes</property>
</widget>
</child>
</widget>
</child> </child>
</widget> </widget>
</child> </child>
@ -286,7 +260,7 @@
<widget class="GtkOptionMenu" id="repeat_speed_omenu"> <widget class="GtkOptionMenu" id="repeat_speed_omenu">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="history">-1</property> <property name="history">0</property>
<child internal-child="menu"> <child internal-child="menu">
<widget class="GtkMenu" id="convertwidget10"> <widget class="GtkMenu" id="convertwidget10">
@ -295,60 +269,32 @@
<child> <child>
<widget class="GtkMenuItem" id="convertwidget11"> <widget class="GtkMenuItem" id="convertwidget11">
<property name="visible">True</property> <property name="visible">True</property>
<child> <property name="label" translatable="yes">Very Fast</property>
<widget class="GtkAccelLabel" id="convertwidget15"> <property name="use_underline">True</property>
<property name="label" translatable="yes">Very fast</property>
<property name="xalign">0.0</property>
<property name="accel-widget">convertwidget11</property>
<property name="use-underline">yes</property>
<property name="visible">yes</property>
</widget>
</child>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkMenuItem" id="convertwidget12"> <widget class="GtkMenuItem" id="convertwidget12">
<property name="visible">True</property> <property name="visible">True</property>
<child> <property name="label" translatable="yes">Fast</property>
<widget class="GtkAccelLabel" id="convertwidget16"> <property name="use_underline">True</property>
<property name="label" translatable="yes">Fast</property>
<property name="xalign">0.0</property>
<property name="accel-widget">convertwidget12</property>
<property name="use-underline">yes</property>
<property name="visible">yes</property>
</widget>
</child>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkMenuItem" id="convertwidget13"> <widget class="GtkMenuItem" id="convertwidget13">
<property name="visible">True</property> <property name="visible">True</property>
<child> <property name="label" translatable="yes">Medium</property>
<widget class="GtkAccelLabel" id="convertwidget17"> <property name="use_underline">True</property>
<property name="label" translatable="yes">Medium</property>
<property name="xalign">0.0</property>
<property name="accel-widget">convertwidget13</property>
<property name="use-underline">yes</property>
<property name="visible">yes</property>
</widget>
</child>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkMenuItem" id="convertwidget14"> <widget class="GtkMenuItem" id="convertwidget14">
<property name="visible">True</property> <property name="visible">True</property>
<child> <property name="label" translatable="yes">Slow</property>
<widget class="GtkAccelLabel" id="convertwidget18"> <property name="use_underline">True</property>
<property name="label" translatable="yes">Slow</property>
<property name="xalign">0.0</property>
<property name="accel-widget">convertwidget14</property>
<property name="use-underline">yes</property>
<property name="visible">yes</property>
</widget>
</child>
</widget> </widget>
</child> </child>
</widget> </widget>
@ -379,6 +325,25 @@
</child> </child>
</widget> </widget>
</child> </child>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">Repeat Rate</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
@ -390,8 +355,8 @@
<child> <child>
<widget class="GtkFrame" id="frame4"> <widget class="GtkFrame" id="frame4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Cursor</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child> <child>
@ -604,6 +569,25 @@
</child> </child>
</widget> </widget>
</child> </child>
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="label" translatable="yes">Cursor</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
@ -615,8 +599,8 @@
<child> <child>
<widget class="GtkFrame" id="frame5"> <widget class="GtkFrame" id="frame5">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Accessibility</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child> <child>
@ -690,6 +674,25 @@
</child> </child>
</widget> </widget>
</child> </child>
<child>
<widget class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="label" translatable="yes">Accessibility</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
@ -707,8 +710,8 @@
<child> <child>
<widget class="GtkLabel" id="label1"> <widget class="GtkLabel" id="label1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_Keyboard</property> <property name="label" translatable="yes">Keyboard</property>
<property name="use_underline">True</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property> <property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property> <property name="wrap">False</property>
@ -733,8 +736,8 @@
<child> <child>
<widget class="GtkFrame" id="frame1"> <widget class="GtkFrame" id="frame1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Keyclick Volume</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child> <child>
@ -935,6 +938,25 @@
</child> </child>
</widget> </widget>
</child> </child>
<child>
<widget class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="label" translatable="yes">Keyclick Volume</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
@ -946,8 +968,8 @@
<child> <child>
<widget class="GtkFrame" id="frame2"> <widget class="GtkFrame" id="frame2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Keyboard Bell</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child> <child>
@ -1131,6 +1153,25 @@
</child> </child>
</widget> </widget>
</child> </child>
<child>
<widget class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="label" translatable="yes">Keyboard Bell</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
@ -1148,8 +1189,8 @@
<child> <child>
<widget class="GtkLabel" id="label2"> <widget class="GtkLabel" id="label2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_Sound</property> <property name="label" translatable="yes">Sound</property>
<property name="use_underline">True</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property> <property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property> <property name="wrap">False</property>