diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index f251ed6d0..d241eeb95 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,9 @@ +2003-07-17 Dennis Cranston + + * gnome-keyboard-properties.glade, + gnome-keyboard-properties.c: Fixes for ui-review + bug report #99531 and fixes for duplicate mnemonics. + 2003-07-07 Jody Goldberg * Release 2.3.4 diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c index 02d3bca80..5b9f46402 100644 --- a/capplets/keyboard/gnome-keyboard-properties.c +++ b/capplets/keyboard/gnome-keyboard-properties.c @@ -131,8 +131,6 @@ setup_dialog (GladeXML *dialog, program = gnome_program_get (); capplet_init_stock_icons (); - gtk_image_set_from_stock (GTK_IMAGE (WID ("repeat_image")), KEYBOARD_REPEAT, keyboard_capplet_icon_get_size()); - gtk_image_set_from_stock (GTK_IMAGE (WID ("cursor_image")), KEYBOARD_CURSOR, keyboard_capplet_icon_get_size()); peditor = gconf_peditor_new_boolean (changeset, "/desktop/gnome/peripherals/keyboard/repeat", WID ("repeat_toggle"), NULL); diff --git a/capplets/keyboard/gnome-keyboard-properties.glade b/capplets/keyboard/gnome-keyboard-properties.glade index 9e20d12cc..dbf69ff8a 100644 --- a/capplets/keyboard/gnome-keyboard-properties.glade +++ b/capplets/keyboard/gnome-keyboard-properties.glade @@ -4,11 +4,12 @@ + 5 Keyboard Preferences GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - True + False False False @@ -140,46 +141,59 @@ 12 True False - 12 + 18 - + True - 0 - 0.5 - GTK_SHADOW_NONE + False + 6 - + + True + <b>Repeat Keys</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True False - 8 + 0 - + True - False - 0 - - - - True - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 False - True + False @@ -187,7 +201,7 @@ True False - 4 + 6 @@ -208,197 +222,224 @@ - + True - 4 - 3 False - 4 - 4 + 12 - + True - True - False - GTK_POS_TOP - 1 - GTK_UPDATE_CONTINUOUS - False - 500 100 1510 10 10 0 + False + 6 + + + + True + _Delay: + True + True + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + repeat_delay_scale + + + 0 + True + True + + + + + + True + _Speed: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + repeat_speed_scale + + + 0 + True + True + + - 1 - 2 - 1 - 2 - fill + 0 + False + False - + True - _Delay: - True - True - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - repeat_delay_scale + False + 6 + + + + True + <small><i>Short</i></small> + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 10 + 0 + + + 0 + True + True + + + + + + True + <small><i>Slow</i></small> + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 10 + 0 + + + 0 + True + True + + - 0 - 3 - 0 - 1 - fill - + 0 + False + False - + True - _Speed: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - repeat_speed_scale + False + 6 + + + + True + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + False + 500 100 1510 10 10 0 + + + 0 + True + True + + + + + + True + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + False + 30 10 110 10 10 0 + + + 0 + True + True + + - 0 - 3 - 2 - 3 - fill - + 0 + True + True - + True - <small><i>Short</i></small> - False - True - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 10 - 0 - - - 0 - 1 - 1 - 2 - fill - - - + False + 6 - - - True - <small><i>Long</i></small> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 2 - 3 - 1 - 2 - fill - - - + + + True + <small><i>Long</i></small> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + True + True + + - - - True - <small><i>Fast</i></small> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 + + + True + <small><i>Fast</i></small> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + True + True + + - 2 - 3 - 3 - 4 - fill - - - - - - - True - <small><i>Slow</i></small> - False - True - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 10 - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - True - False - GTK_POS_TOP - 1 - GTK_UPDATE_CONTINUOUS - False - 30 10 110 10 10 0 - - - 1 - 2 - 3 - 4 - fill + 0 + False + False @@ -416,24 +457,10 @@ - - - - - True - <b>Repeat Keys</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True @@ -445,31 +472,75 @@ - + True - 0 - 0.5 - GTK_SHADOW_NONE + False + 6 - + + True + <b>Cursor Blinking</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True False - 8 + 0 - + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True False - 0 + 6 - + True - 0.5 - 0.5 - 0 - 0 + True + Cursor _blinks in text boxes and fields + True + GTK_RELIEF_NORMAL + False + False + True 0 @@ -477,36 +548,27 @@ False - - - 0 - False - True - - - - - - True - False - 8 - + True False - 4 + 12 - + True - True - _Cursor blinks in text boxes and fields + S_peed: True - GTK_RELIEF_NORMAL - False - False - True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + cursor_blink_time_scale 0 @@ -516,38 +578,10 @@ - + True - 2 - 3 False - 0 - 0 - - - - True - S_peed: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - cursor_blink_time_scale - - - 0 - 3 - 0 - 1 - fill - - - + 6 @@ -564,12 +598,27 @@ 0 - 0 - 1 - 1 - 2 - fill - + 0 + False + False + + + + + + True + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_DISCONTINUOUS + False + 1000 100 2500 200 200 0 + + + 0 + True + True @@ -588,32 +637,9 @@ 0 - 2 - 3 - 1 - 2 - fill - - - - - - - True - True - False - GTK_POS_TOP - 1 - GTK_UPDATE_DISCONTINUOUS - False - 1000 100 2500 200 200 0 - - - 1 - 2 - 1 - 2 - fill + 0 + False + False @@ -626,8 +652,8 @@ 0 - False - False + True + True @@ -638,14 +664,32 @@ + + 0 + True + True + + + + 0 + True + True + + + + + + True + False + 12 - + True - <b>Cursor Blinks</b> - False - True + _Type to test settings: + True + False GTK_JUSTIFY_LEFT False False @@ -653,9 +697,31 @@ 0.5 0 0 + test_entry - label_item + 0 + False + False + + + + + + True + True + True + True + 256 + + True + * + False + + + 0 + True + True @@ -702,236 +768,13 @@ 12 True False - 12 + 18 - + True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - False - 0 - - - - 24 - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - - - - 0 - False - True - - - - - - 3 - True - False - 3 - - - - True - 3 - 3 - False - 3 - 12 - - - - True - Duration of work before forcing a break - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 100000 1 10 10 - - - 1 - 2 - 0 - 1 - - - - - - - - True - minutes - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 2 - 3 - 0 - 1 - - - - - - - True - _Work interval lasts - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - break_enabled_spin - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - _Break interval lasts - True - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - break_interval_spin - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Duration of the break when typing is disallowed - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 1 100000 1 10 10 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - minutes - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - Check if breaks are allowed to be postponed - True - _Allow postponing of breaks - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - 3 - 2 - 3 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - + False + 6 @@ -961,7 +804,266 @@ - label_item + 0 + False + False + + + + + + True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 6 + + + + True + False + 12 + + + + True + False + 6 + + + + True + _Work interval lasts: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + break_enabled_spin + + + 0 + True + True + + + + + + True + _Break interval lasts: + True + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + break_interval_spin + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 6 + + + + True + False + 6 + + + + True + Duration of work before forcing a break + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 1 100000 1 10 10 + + + 0 + True + True + + + + + + True + Duration of the break when typing is disallowed + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 1 100000 1 10 10 + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + False + 6 + + + + True + minutes + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + + True + minutes + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + Check if breaks are allowed to be postponed + True + All_ow postponing of breaks + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + False + False