diff options
Diffstat (limited to 'capplets')
25 files changed, 1870 insertions, 1110 deletions
diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog index c26cc719c..de3b78c3e 100644 --- a/capplets/accessibility/keyboard/ChangeLog +++ b/capplets/accessibility/keyboard/ChangeLog @@ -1,3 +1,12 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + +2002-11-02 Jody Goldberg <jody@gnome.org> + + * accessibility-keyboard.c : Merge in Calum's new layout + * gnome-accessibility-keyboard-properties.glade : ditto. + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.c b/capplets/accessibility/keyboard/accessibility-keyboard.c index de7b661cc..544a48ec0 100644 --- a/capplets/accessibility/keyboard/accessibility-keyboard.c +++ b/capplets/accessibility/keyboard/accessibility-keyboard.c @@ -45,28 +45,32 @@ static struct { char const * const image_file; char const * const gconf_key; char const * const content [3]; + gboolean always_enabled; } const features [] = { + { "repeatkeys_enable", "repeatkeys_image", IDIR "keyboard-repeat.png", + "/desktop/gnome/peripherals/keyboard/repeat", + { "repeatkeys_table", NULL, NULL }, TRUE }, { "bouncekeys_enable", "bouncekeys_image", IDIR "accessibility-keyboard-bouncekey.png", CONFIG_ROOT "/bouncekeys_enable", - { "bouncekey_table", NULL, NULL } }, + { "bouncekey_table", NULL, NULL }, FALSE }, { "slowkeys_enable", "slowkeys_image", IDIR "accessibility-keyboard-slowkey.png", CONFIG_ROOT "/slowkeys_enable", - { "slowkeys_table", NULL, NULL } }, + { "slowkeys_table", NULL, NULL }, FALSE }, { "mousekeys_enable", "mousekeys_image", IDIR "accessibility-keyboard-mousekey.png", CONFIG_ROOT "/mousekeys_enable", - { "mousekeys_table", NULL, NULL } }, + { "mousekeys_table", NULL, NULL }, FALSE }, { "stickykeys_enable", "stickykeys_image", IDIR "accessibility-keyboard-stickykey.png", CONFIG_ROOT "/stickykeys_enable", - { "stickeykeys_table", NULL, NULL } }, + { "stickeykeys_table", NULL, NULL }, FALSE }, { "togglekeys_enable", "togglekeys_image", IDIR "accessibility-keyboard-togglekey.png", CONFIG_ROOT "/togglekeys_enable", - { NULL, NULL, NULL } }, + { NULL, NULL, NULL }, FALSE }, { "timeout_enable", NULL, NULL, CONFIG_ROOT "/timeout_enable", - { "timeout_slide", "timeout_spin", "timeout_label" } }, + { "timeout_slide", "timeout_spin", "timeout_label" }, FALSE }, { "feature_state_change_beep", NULL, NULL, CONFIG_ROOT "/feature_state_change_beep", - { NULL, NULL, NULL } } + { NULL, NULL, NULL }, FALSE } }; static struct { @@ -78,6 +82,10 @@ static struct { int step_size; char const * const gconf_key; } const ranges [] = { + { "repeatkeys_delay_slide", "repeatkeys_delay_spin", 500, 100, 1500, 10, + "/desktop/gnome/peripherals/keyboard/delay" }, + { "repeatkeys_rate_slide", "repeatkeys_rate_spin", 90, 10, 210, 10, + "/desktop/gnome/peripherals/keyboard/rate" }, { "bouncekeys_delay_slide", "bouncekeys_delay_spin", 300, 10, 900, 10, CONFIG_ROOT "/bouncekeys_delay" }, { "slowkeys_delay_slide", "slowkeys_delay_spin", 300, 10, 500, 10, @@ -221,12 +229,12 @@ setup_images (GladeXML *dialog) } static void -cb_launch_keyboard_capplet (GtkButton *button, GtkWidget *dialog) +cb_launch_mouse_capplet (GtkButton *button, GtkWidget *dialog) { GError *err = NULL; - if (!g_spawn_command_line_async ("gnome-keyboard-properties", &err)) + if (!g_spawn_command_line_async ("gnome-mouse-properties", &err)) capplet_error_dialog (GTK_WINDOW (gtk_widget_get_toplevel (dialog)), - _("There was an error launching the keyboard capplet : %s"), + _("There was an error launching the mouse preferences dialog: %s"), err); } @@ -238,9 +246,11 @@ cb_master_enable_toggle (GtkToggleButton *btn, GladeXML *dialog) GtkWidget *w; while (i-- > 0) { - w = WID (features [i].checkbox); - gtk_widget_set_sensitive (w, flag); - cb_feature_toggled (GTK_TOGGLE_BUTTON (w), GINT_TO_POINTER (i)); + if (!features [i].always_enabled) { + w = WID (features [i].checkbox); + gtk_widget_set_sensitive (w, flag); + cb_feature_toggled (GTK_TOGGLE_BUTTON (w), GINT_TO_POINTER (i)); + } } } @@ -493,9 +503,9 @@ setup_accessX_dialog (GConfChangeSet *changeset) g_signal_connect (G_OBJECT (WID ("load_CDE_file")), "clicked", G_CALLBACK (cb_load_CDE_file), toplevel); - g_signal_connect (G_OBJECT (WID ("launch_keyboard_capplet")), + g_signal_connect (G_OBJECT (WID ("launch_mouse_capplet")), "clicked", - G_CALLBACK (cb_launch_keyboard_capplet), toplevel); + G_CALLBACK (cb_launch_mouse_capplet), toplevel); return toplevel; } diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade index de2859775..cdbcd8864 100644 --- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade +++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade @@ -36,72 +36,6 @@ </child> <child> - <widget class="GtkButton" id="load_CDE_file"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="response_id">1</property> - - <child> - <widget class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - - <child> - <widget class="GtkHBox" id="hbox4"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-revert-to-saved</property> - <property name="icon_size">4</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="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label35"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Import CDE AccessX file...</property> - <property name="use_underline">True</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="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> <widget class="GtkButton" id="close_button"> <property name="visible">True</property> <property name="can_default">True</property> @@ -122,632 +56,1562 @@ </child> <child> - <widget class="GtkTable" id="table1"> - <property name="border_width">5</property> + <widget class="GtkVBox" id="vbox1"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">5</property> - <property name="column_spacing">5</property> + <property name="spacing">3</property> <child> - <widget class="GtkFrame" id="frame1"> + <widget class="GtkCheckButton" id="master_enable"> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="border_width">4</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTextView" id="textview1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="justification">GTK_JUSTIFY_LEFT</property> - <property name="wrap_mode">GTK_WRAP_CHAR</property> - <property name="cursor_visible">True</property> - <property name="pixels_above_lines">0</property> - <property name="pixels_below_lines">0</property> - <property name="pixels_inside_wrap">0</property> - <property name="left_margin">0</property> - <property name="right_margin">0</property> - <property name="indent">0</property> - <property name="text" translatable="yes"></property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label36"> - <property name="visible">True</property> - <property name="label" translatable="yes">Testing Area</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> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Enable keyboard accessibility features</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkNotebook" id="notebook1"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="show_tabs">True</property> + <property name="show_border">True</property> + <property name="tab_pos">GTK_POS_TOP</property> + <property name="scrollable">False</property> + <property name="enable_popup">False</property> <child> - <widget class="GtkFrame" id="frame2"> + <widget class="GtkVBox" id="vbox8"> <property name="visible">True</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="homogeneous">False</property> + <property name="spacing">0</property> <child> - <widget class="GtkTable" id="table3"> - <property name="border_width">3</property> + <widget class="GtkTable" id="table4"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> + <property name="n_rows">3</property> + <property name="n_columns">1</property> <property name="homogeneous">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">3</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <widget class="GtkImage" id="togglekeys_image"> + <widget class="GtkFrame" id="frame9"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + + <child> + <widget class="GtkVBox" id="vbox6"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkHBox" id="timeout_box"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkCheckButton" id="timeout_enable"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Disable if unused for:</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHScale" id="timeout_slide"> + <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">1</property> + <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> + <property name="inverted">False</property> + <property name="adjustment">0 0 0 0 0 0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="timeout_spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">False</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">0 0 100 1 10 10</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="timeout_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">seconds</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">5</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="feature_state_change_beep"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Beep when a _feature is turned on or off</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox10"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="load_CDE_file"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + + <child> + <widget class="GtkAlignment" id="alignment4"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + + <child> + <widget class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-revert-to-saved</property> + <property name="icon_size">4</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="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label35"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Import Feature Settings...</property> + <property name="use_underline">True</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="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label61"> + <property name="visible">True</property> + <property name="label" translatable="yes">Features</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> <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> <property name="top_attach">0</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> + <property name="bottom_attach">1</property> <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="togglekeys_enable"> + <widget class="GtkFrame" id="frame10"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Beep when an LED is turned on and two beeps when one is turned off.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">E_nable Toggle Keys</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + + <child> + <widget class="GtkTable" id="repeatkeys_table"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="n_rows">4</property> + <property name="n_columns">4</property> + <property name="homogeneous">False</property> + <property name="row_spacing">0</property> + <property name="column_spacing">3</property> + + <child> + <widget class="GtkImage" id="repeatkeys_image"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label78"> + <property name="visible">True</property> + <property name="label" translatable="yes">Del_ay:</property> + <property name="use_underline">True</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</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">4</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label77"> + <property name="visible">True</property> + <property name="label" translatable="yes">S_peed:</property> + <property name="use_underline">True</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</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkHScale" id="repeatkeys_delay_slide"> + <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">1</property> + <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> + <property name="inverted">False</property> + <property name="adjustment">0 0 0 0 0 0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkHScale" id="repeatkeys_rate_slide"> + <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">1</property> + <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> + <property name="inverted">False</property> + <property name="adjustment">0 0 0 0 0 0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="repeatkeys_rate_spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">False</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">0 0 100 1 10 10</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="repeatkeys_delay_spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">False</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">0 0 100 1 10 10</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label79"> + <property name="visible">True</property> + <property name="label" translatable="yes">milliseconds</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</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label80"> + <property name="visible">True</property> + <property name="label" translatable="yes">characters/second</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</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + </child> + + <child> + <widget class="GtkCheckButton" id="repeatkeys_enable"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Repeat Keys</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkButton" id="launch_keyboard_capplet"> + <widget class="GtkFrame" id="frame3"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Repeat Key Pre_ferences...</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + + <child> + <widget class="GtkTable" id="stickeykeys_table"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + + <child> + <widget class="GtkImage" id="stickykeys_image"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="stickykeys_modifier_beep"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Beep when _modifier is pressed</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="stickykeys_two_key_off"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Disa_ble if two keys pressed together</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + </child> + + <child> + <widget class="GtkCheckButton" id="stickykeys_enable"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Perform multiple simultaneous key press operations by pressing modifier keys in sequence.</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Enable _Sticky Keys</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">0</property> + <property name="right_attach">1</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="y_options">fill</property> </packing> </child> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> </child> <child> - <widget class="GtkLabel" id="label37"> + <widget class="GtkHBox" id="hbox11"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="label" translatable="yes">Toggle and Repeat Keys</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> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkLabel" id="label70"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Type to test settings:</property> + <property name="use_underline">True</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> + <property name="mnemonic_widget">basic_test_entry</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkViewport" id="viewport1"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkEntry" id="basic_test_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char" translatable="yes">*</property> + <property name="activates_default">False</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label55"> + <property name="visible">True</property> + <property name="label" translatable="yes">Basic</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">tab</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame3"> + <widget class="GtkVBox" id="vbox9"> <property name="visible">True</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="homogeneous">False</property> + <property name="spacing">0</property> <child> - <widget class="GtkTable" id="stickeykeys_table"> + <widget class="GtkTable" id="table1"> <property name="visible">True</property> - <property name="n_rows">2</property> + <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">0</property> - <property name="column_spacing">0</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> - <widget class="GtkCheckButton" id="stickykeys_modifier_beep"> + <widget class="GtkFrame" id="frame4"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Beep when modifier is pressed</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + + <child> + <widget class="GtkTable" id="slowkeys_table"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="n_rows">3</property> + <property name="n_columns">4</property> + <property name="homogeneous">False</property> + <property name="row_spacing">0</property> + <property name="column_spacing">6</property> + + <child> + <widget class="GtkLabel" id="slowkeys_title"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Only accept keys held for:</property> + <property name="use_underline">True</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</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">slowkeys_delay_spin</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">4</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkHScale" id="slowkeys_delay_slide"> + <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">1</property> + <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> + <property name="inverted">False</property> + <property name="adjustment">0 0 0 0 0 0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkImage" id="slowkeys_image"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkTable" id="table6"> + <property name="visible">True</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">0</property> + <property name="column_spacing">6</property> + + <child> + <widget class="GtkCheckButton" id="slowkeys_beep_press"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_pressed</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="slowkeys_beep_accept"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_accepted</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="slowkeys_beep_reject"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_rejected</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label14"> + <property name="visible">True</property> + <property name="label" translatable="yes">Beep when key is:</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</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="slowkeys_delay_spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">True</property> + <property name="wrap">False</property> + <property name="adjustment">1 0 100 1 10 10</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="slowkeys_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">milliseconds</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">2</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + </child> + + <child> + <widget class="GtkCheckButton" id="slowkeys_enable"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Only accept keys after they have been pressed and held for a user adjustable amount of time.</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Enable Slo_w Keys</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> </widget> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="right_attach">2</property> <property name="top_attach">0</property> <property name="bottom_attach">1</property> <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="stickykeys_two_key_off"> + <widget class="GtkFrame" id="frame5"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Turn off Sticky Keys when -two keys pressed simultaneously</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + + <child> + <widget class="GtkTable" id="bouncekey_table"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="n_rows">3</property> + <property name="n_columns">4</property> + <property name="homogeneous">False</property> + <property name="row_spacing">0</property> + <property name="column_spacing">6</property> + + <child> + <widget class="GtkImage" id="bouncekeys_image"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="bouncekeys_title"> + <property name="visible">True</property> + <property name="label" translatable="yes">I_gnore duplicate keypresses within:</property> + <property name="use_underline">True</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</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">bouncekeys_delay_spin</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">4</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkHScale" id="bouncekeys_delay_slide"> + <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">1</property> + <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> + <property name="inverted">False</property> + <property name="adjustment">0 0 0 0 0 0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="bouncekeys_delay_spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">False</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">0 0 100 1 10 10</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="bouncekeys_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">milliseconds</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</property> + <property name="yalign">0.5</property> + <property name="xpad">2</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="bouncekeys_beep_reject"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Beep if key is re_jected</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_padding">6</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + </child> + + <child> + <widget class="GtkCheckButton" id="bouncekeys_enable"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Ignore all subsequent presses of the SAME key if they happen within a user selectable period of time.</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Enable Bo_unce Keys</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> </widget> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkImage" id="stickykeys_image"> + <widget class="GtkFrame" id="frame8"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + + <child> + <widget class="GtkHBox" id="hbox8"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkImage" id="togglekeys_image"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="togglekeys_enable"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Beep when an LED is turned on and two beeps when one is turned off.</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">E_nable Toggle Keys</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label37"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toggle Keys</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> <packing> <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options">fill</property> </packing> </child> </widget> - </child> - - <child> - <widget class="GtkCheckButton" id="stickykeys_enable"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Perform multiple simultaneous key press operations by pressing modifier keys in sequence.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Enable _Sticky Keys</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame4"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <child> - <widget class="GtkTable" id="slowkeys_table"> + <widget class="GtkHBox" id="hbox12"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">0</property> - <property name="column_spacing">0</property> + <property name="spacing">0</property> <child> - <widget class="GtkImage" id="slowkeys_image"> + <widget class="GtkLabel" id="label71"> <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="slowkeys_title"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Only accept keypress after:</property> + <property name="label" translatable="yes">_Type to test settings:</property> <property name="use_underline">True</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</property> + <property name="xalign">0.5</property> <property name="yalign">0.5</property> - <property name="xpad">9</property> + <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">slowkeys_delay_spin</property> + <property name="mnemonic_widget">filters_test_entry</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkHBox" id="slowkeys_delay"> + <widget class="GtkViewport" id="viewport2"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkHScale" id="slowkeys_delay_slide"> + <widget class="GtkEntry" id="filters_test_entry"> <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">1</property> - <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> - <property name="inverted">False</property> - <property name="adjustment">0 0 0 0 0 0</property> - <accessibility> - <atkrelation target="slowkeys_delay_spin" type="controller-for"/> - </accessibility> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char" translatable="yes">*</property> + <property name="activates_default">False</property> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label54"> + <property name="visible">True</property> + <property name="label" translatable="yes">Filters</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">tab</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox5"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkFrame" id="frame6"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + + <child> + <widget class="GtkTable" id="mousekeys_table"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="n_rows">6</property> + <property name="n_columns">4</property> + <property name="homogeneous">False</property> + <property name="row_spacing">3</property> + <property name="column_spacing">6</property> <child> - <widget class="GtkSpinButton" id="slowkeys_delay_spin"> + <widget class="GtkLabel" id="mousekeys_max_speed_title"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">True</property> + <property name="label" translatable="yes">Ma_ximum pointer speed:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> - <property name="adjustment">1 0 100 1 10 10</property> - <accessibility> - <atkrelation target="slowkeys_title" type="labelled-by"/> - <atkrelation target="slowkeys_label" type="labelled-by"/> - <atkrelation target="slowkeys_delay_slide" type="controlled-by"/> - </accessibility> + <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="mnemonic_widget">mousekeys_max_speed_spin</property> </widget> <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> + <property name="left_attach">1</property> + <property name="right_attach">4</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="slowkeys_label"> + <widget class="GtkLabel" id="mousekeys_init_delay_title"> <property name="visible">True</property> - <property name="label" translatable="yes">msecs</property> - <property name="use_underline">False</property> + <property name="label" translatable="yes">Delay between keypress and pointer mo_vement:</property> + <property name="use_underline">True</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="xalign">0</property> <property name="yalign">0.5</property> - <property name="xpad">2</property> + <property name="xpad">0</property> <property name="ypad">0</property> - <accessibility> - <atkrelation target="slowkeys_delay_spin" type="label-for"/> - </accessibility> + <property name="mnemonic_widget">mousekeys_init_delay_spin</property> </widget> <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="left_attach">1</property> + <property name="right_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + <property name="y_options"></property> </packing> </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkTable" id="slowkeys_table2"> - <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">0</property> - <property name="column_spacing">0</property> <child> - <widget class="GtkLabel" id="label14"> + <widget class="GtkLabel" id="mousekeys_accel_time_title"> <property name="visible">True</property> - <property name="label" translatable="yes">Beep when:</property> - <property name="use_underline">False</property> + <property name="label" translatable="yes">Time to acce_lerate to maximum speed:</property> + <property name="use_underline">True</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</property> - <property name="yalign">0.5</property> + <property name="yalign">0</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="mnemonic_widget">mousekeys_accel_time_spin</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkImage" id="mousekeys_image"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> </widget> <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="bottom_attach">6</property> <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="slowkeys_beep_press"> + <widget class="GtkSpinButton" id="mousekeys_max_speed_spin"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">key is _pressed</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">True</property> + <property name="wrap">False</property> + <property name="adjustment">100 0 1000 1 10 10</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkCheckButton" id="slowkeys_beep_accept"> + <widget class="GtkHScale" id="mousekeys_max_speed_slide"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">key is _accepted</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="draw_value">False</property> + <property name="value_pos">GTK_POS_TOP</property> + <property name="digits">1</property> + <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> + <property name="inverted">False</property> + <property name="adjustment">0 0 0 0 0 0</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkCheckButton" id="slowkeys_beep_reject"> + <widget class="GtkHScale" id="mousekeys_accel_time_slide"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">key is _rejected</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="draw_value">False</property> + <property name="value_pos">GTK_POS_TOP</property> + <property name="digits">1</property> + <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> + <property name="inverted">False</property> + <property name="adjustment">0 0 0 0 0 0</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - </widget> - </child> - - <child> - <widget class="GtkCheckButton" id="slowkeys_enable"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Only accept keys after they have been pressed and held for a user adjustable amount of time.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Enable Slo_w Keys</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame5"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> - - <child> - <widget class="GtkTable" id="bouncekey_table"> - <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">0</property> - <property name="column_spacing">0</property> - - <child> - <widget class="GtkImage" id="bouncekeys_image"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="bouncekeys_title"> - <property name="visible">True</property> - <property name="label" translatable="yes">I_gnore keypresses within:</property> - <property name="use_underline">True</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</property> - <property name="yalign">0.5</property> - <property name="xpad">10</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">bouncekeys_delay_spin</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox13"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> <child> - <widget class="GtkHScale" id="bouncekeys_delay_slide"> + <widget class="GtkHScale" id="mousekeys_init_delay_slide"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="draw_value">False</property> @@ -756,45 +1620,112 @@ two keys pressed simultaneously</property> <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> <property name="inverted">False</property> <property name="adjustment">0 0 0 0 0 0</property> - <accessibility> - <atkrelation target="bouncekeys_delay_spin" type="controller-for"/> - </accessibility> </widget> <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="mousekeys_accel_time_spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">True</property> + <property name="wrap">False</property> + <property name="adjustment">100 0 1000 1 10 10</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options"></property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkSpinButton" id="bouncekeys_delay_spin"> + <widget class="GtkSpinButton" id="mousekeys_init_delay_spin"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="climb_rate">1</property> <property name="digits">0</property> - <property name="numeric">False</property> + <property name="numeric">True</property> <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> + <property name="snap_to_ticks">True</property> + <property name="wrap">False</property> + <property name="adjustment">1000 0 1000 1 10 10</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="mousekeys_max_speed_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">pixels/second</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</property> + <property name="yalign">0.5</property> + <property name="xpad">2</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="mousekeys_accel_time_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">milliseconds</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="adjustment">1 0 100 1 10 10</property> - <accessibility> - <atkrelation target="bouncekeys_title" type="labelled-by"/> - <atkrelation target="bouncekeys_label" type="labelled-by"/> - <atkrelation target="bouncekeys_delay_slide" type="controlled-by"/> - </accessibility> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">2</property> + <property name="ypad">0</property> </widget> <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="bouncekeys_label"> + <widget class="GtkLabel" id="mousekeys_init_delay_label"> <property name="visible">True</property> - <property name="label" translatable="yes">msecs</property> + <property name="label" translatable="yes">milliseconds</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -804,619 +1735,226 @@ two keys pressed simultaneously</property> <property name="yalign">0.5</property> <property name="xpad">2</property> <property name="ypad">0</property> - <accessibility> - <atkrelation target="bouncekeys_delay_spin" type="label-for"/> - </accessibility> + <property name="mnemonic_widget">mousekeys_init_delay_spin</property> </widget> <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">fill</property> + <property name="y_options"></property> </packing> </child> </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> </child> <child> - <widget class="GtkCheckButton" id="bouncekeys_beep_reject"> + <widget class="GtkCheckButton" id="mousekeys_enable"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Turn the numeric keypad into a mouse control pad.</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Beep when key is re_jected</property> + <property name="label" translatable="yes">Enable _Mouse Keys</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> + <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="type">label_item</property> </packing> </child> </widget> - </child> - - <child> - <widget class="GtkCheckButton" id="bouncekeys_enable"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Ignore all subsequent presses of the SAME key if they happen within a user selectable period of time.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Enable Bo_unce Keys</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> </packing> </child> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame6"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <child> - <widget class="GtkTable" id="mousekeys_table"> + <widget class="GtkFrame" id="frame11"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="n_rows">6</property> - <property name="n_columns">4</property> - <property name="homogeneous">False</property> - <property name="row_spacing">0</property> - <property name="column_spacing">0</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> <child> - <widget class="GtkLabel" id="mousekeys_max_speed_title"> + <widget class="GtkTable" id="table7"> + <property name="border_width">6</property> <property name="visible">True</property> - <property name="label" translatable="yes">Ma_ximum pointer speed:</property> - <property name="use_underline">True</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</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">mousekeys_max_speed_spin</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <property name="n_rows">1</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">0</property> + <property name="column_spacing">3</property> - <child> - <widget class="GtkLabel" id="mousekeys_init_delay_title"> - <property name="visible">True</property> - <property name="label" translatable="yes">Start mo_ving this long after keypress:</property> - <property name="use_underline">True</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</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">mousekeys_init_delay_spin</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkImage" id="mouse_capplet_image"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> - <child> - <widget class="GtkLabel" id="mousekeys_max_speed_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">pixels/sec</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</property> - <property name="yalign">0.5</property> - <property name="xpad">2</property> - <property name="ypad">0</property> - <accessibility> - <atkrelation target="mousekeys_max_speed_spin" type="label-for"/> - </accessibility> + <child> + <widget class="GtkHBox" id="hbox15"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkFixed" id="fixed3"> + <property name="visible">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="launch_mouse_capplet"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + + <child> + <widget class="GtkAlignment" id="alignment6"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + + <child> + <widget class="GtkHBox" id="hbox16"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + <property name="icon_size">4</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="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label73"> + <property name="visible">True</property> + <property name="label" translatable="yes">Mouse _Preferences...</property> + <property name="use_underline">True</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="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options"></property> + </packing> + </child> </widget> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> </child> <child> - <widget class="GtkLabel" id="mousekeys_accel_time_label"> + <widget class="GtkLabel" id="label74"> <property name="visible">True</property> - <property name="label" translatable="yes">msecs</property> + <property name="label" translatable="yes">Mouse</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</property> - <property name="yalign">0.5</property> - <property name="xpad">2</property> - <property name="ypad">0</property> - <accessibility> - <atkrelation target="mousekeys_accel_time_spin" type="label-for"/> - </accessibility> - </widget> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="mousekeys_max_speed_spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">True</property> - <property name="wrap">False</property> - <property name="adjustment">1 0 100 1 10 10</property> - <accessibility> - <atkrelation target="mousekeys_accel_time_slide" type="controlled-by"/> - <atkrelation target="mousekeys_max_speed_title" type="labelled-by"/> - <atkrelation target="mousekeys_max_speed_label" type="labelled-by"/> - </accessibility> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkHScale" id="mousekeys_max_speed_slide"> - <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">1</property> - <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> - <property name="inverted">False</property> - <property name="adjustment">0 0 0 0 0 0</property> - <accessibility> - <atkrelation target="mousekeys_max_speed_spin" type="controller-for"/> - </accessibility> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="mousekeys_accel_time_title"> - <property name="visible">True</property> - <property name="label" translatable="yes">Time to acce_lerate to max speed:</property> - <property name="use_underline">True</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</property> + <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">mousekeys_accel_time_spin</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="mousekeys_init_delay_spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">True</property> - <property name="wrap">False</property> - <property name="adjustment">1 0 100 1 10 10</property> - <accessibility> - <atkrelation target="mousekeys_init_delay_slide" type="controlled-by"/> - <atkrelation target="mousekeys_init_delay_title" type="labelled-by"/> - <atkrelation target="mousekeys_init_delay_label" type="labelled-by"/> - </accessibility> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="mousekeys_accel_time_spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">True</property> - <property name="wrap">False</property> - <property name="adjustment">1 0 100 1 10 10</property> - <accessibility> - <atkrelation target="mousekeys_max_speed_slide" type="controlled-by"/> - <atkrelation target="mousekeys_accel_time_title" type="labelled-by"/> - <atkrelation target="mousekeys_accel_time_label" type="labelled-by"/> - </accessibility> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkHScale" id="mousekeys_accel_time_slide"> - <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">1</property> - <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> - <property name="inverted">False</property> - <property name="adjustment">0 0 0 0 0 0</property> - <accessibility> - <atkrelation target="mousekeys_accel_time_spin" type="controller-for"/> - </accessibility> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkHScale" id="mousekeys_init_delay_slide"> - <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">1</property> - <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> - <property name="inverted">False</property> - <property name="adjustment">0 0 0 0 0 0</property> - <accessibility> - <atkrelation target="mousekeys_init_delay_spin" type="controller-for"/> - </accessibility> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="mousekeys_init_delay_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">msecs</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</property> - <property name="yalign">0.5</property> - <property name="xpad">2</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">mousekeys_init_delay_spin</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="type">label_item</property> </packing> </child> - - <child> - <widget class="GtkImage" id="mousekeys_image"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">6</property> - <property name="x_options">fill</property> - </packing> - </child> - </widget> - </child> - - <child> - <widget class="GtkCheckButton" id="mousekeys_enable"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Turn the numeric keypad into a mouse control pad.</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Enable _Mouse Keys</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> </packing> </child> <child> - <widget class="GtkFrame" id="frame7"> + <widget class="GtkLabel" id="label60"> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> - - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="border_width">15</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">10</property> - - <child> - <widget class="GtkCheckButton" id="master_enable"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Enable keyboard accessibility</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - - <child> - <widget class="GtkCheckButton" id="feature_state_change_beep"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Beep when enabling/disabling _keyboard accessibility features</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="timeout_box"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkCheckButton" id="timeout_enable"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Disable if unused for </property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHScale" id="timeout_slide"> - <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">1</property> - <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> - <property name="inverted">False</property> - <property name="adjustment">0 0 0 0 0 0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="timeout_spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">1 0 100 1 10 10</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="timeout_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">seconds</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">5</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label53"> - <property name="visible">True</property> - <property name="label" translatable="yes">General</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> + <property name="label" translatable="yes">Mouse</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="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> + <property name="type">tab</property> </packing> </child> </widget> diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index 4e6f52cfb..78f367999 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index b78ca5a95..c9fa9e65e 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + Fri Nov 1 11:03:34 2002 Jonathan Blandford <jrb@gnome.org> * gnome-theme-info.[ch]: Moved theme-common, and gave more diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog index e6027457c..d38176d40 100644 --- a/capplets/default-applications/ChangeLog +++ b/capplets/default-applications/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/desktop-links/ChangeLog b/capplets/desktop-links/ChangeLog index edd922209..c7614e4ee 100644 --- a/capplets/desktop-links/ChangeLog +++ b/capplets/desktop-links/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog index 35c15931d..03c3159d1 100644 --- a/capplets/file-types/ChangeLog +++ b/capplets/file-types/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog index 98837fcd9..5c8e650ca 100644 --- a/capplets/font/ChangeLog +++ b/capplets/font/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + Fri Nov 1 18:21:22 2002 Jonathan Blandford <jrb@gnome.org> * main.c: remove the duplicate #defined key. diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog index bc0a82678..ee22dc533 100644 --- a/capplets/keybindings/ChangeLog +++ b/capplets/keybindings/ChangeLog @@ -1,3 +1,13 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + +2002-09-27 Jody Goldberg <jody@gnome.org> + + * gnome-keybinding-properties.c (cb_check_for_uniqueness) : new. + (accel_edited_callback) : don't let a user enter duplicate + accelerators for different actions. + Fri Nov 1 17:46:06 2002 Jonathan Blandford <jrb@gnome.org> * gnome-keybinding-properties.c: move to use gnome-theme-info diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index ffb2e8265..485359d0c 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -523,6 +523,31 @@ key_theme_changed (GConfClient *client, } +static gboolean +cb_check_for_uniqueness (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + KeyEntry *key_entry; + KeyEntry *tmp_key_entry; + + key_entry = (KeyEntry *)user_data; + gtk_tree_model_get (key_entry->model, iter, + KEYENTRY_COLUMN, &tmp_key_entry, + -1); + + if (tmp_key_entry != NULL && + key_entry->keyval == tmp_key_entry->keyval && + key_entry->mask == tmp_key_entry->mask) + { + key_entry->editable = FALSE; + key_entry->gconf_key = tmp_key_entry->gconf_key; + return TRUE; + } + return FALSE; +} + static void accel_edited_callback (GtkCellRendererText *cell, const char *path_string, @@ -535,7 +560,7 @@ accel_edited_callback (GtkCellRendererText *cell, GtkTreeModel *model; GtkTreePath *path = gtk_tree_path_new_from_string (path_string); GtkTreeIter iter; - KeyEntry *key_entry; + KeyEntry *key_entry, tmp_key; GError *err = NULL; char *str; @@ -547,7 +572,34 @@ accel_edited_callback (GtkCellRendererText *cell, /* sanity check */ if (key_entry == NULL) + { + gtk_tree_path_free (path); + return; + } + + tmp_key.model = model; + tmp_key.keyval = keyval; + tmp_key.mask = mask; + tmp_key.editable = TRUE; /* kludge to stuff in a return flag */ + gtk_tree_model_foreach (model, cb_check_for_uniqueness, &tmp_key); + + /* flag to see if the new accelerator was in use by something */ + if (!tmp_key.editable) + { + GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))), + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + _("That accelerator key is already in use by: %s\n"), + key_entry->gconf_key); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + + egg_cell_renderer_keys_set_accelerator (EGG_CELL_RENDERER_KEYS (cell), + key_entry->keyval, key_entry->mask); + gtk_tree_path_free (path); return; + } str = binding_name (keyval, mask, FALSE); diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index eff0967d0..8b7da9c4f 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/mime-type/ChangeLog b/capplets/mime-type/ChangeLog index ea8545b20..17966c2a6 100644 --- a/capplets/mime-type/ChangeLog +++ b/capplets/mime-type/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog index 5a6315e8e..e7657741c 100644 --- a/capplets/mouse/ChangeLog +++ b/capplets/mouse/ChangeLog @@ -1,3 +1,13 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + +2002-10-25 Rajkumar Sivasamy <rajkumar.siva@wipro.com> + + * gnome-mouse-properties.c: Register mouse double click images + as stock icons, so that they are themable. + Fixes bug 96081 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index eb989266e..349978fb1 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -37,7 +37,20 @@ desktopdir = $(GNOMECC_DESKTOP_DIR) Desktop_in_files = mouse.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) +IMAGES = double-click-maybe.png double-click-off.png double-click-on.png + +VARIABLES=mouse_dblclck_maybe_data $(srcdir)/double-click-maybe.png \ + mouse_dblclck_on_data $(srcdir)/double-click-on.png \ + mouse_dblclck_off_data $(srcdir)/double-click-off.png + +BUILT_SOURCES = inlinepixbufs.h +CLEANFILES = inlinepixbufs.h + +inlinepixbufs.h: $(IMAGES) + $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h + +$(OBJECTS): inlinepixbufs.h + INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA) - +EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA) $(IMAGES) diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c index b065326be..1571f2a15 100644 --- a/capplets/mouse/gnome-mouse-properties.c +++ b/capplets/mouse/gnome-mouse-properties.c @@ -37,11 +37,23 @@ #include "capplet-util.h" #include "gconf-property-editor.h" #include "activate-settings-daemon.h" +#include "inlinepixbufs.h" #include <sys/types.h> #include <sys/stat.h> #include <dirent.h> +#define MOUSE_DBLCLCK_MAYBE "mouse-dblclck-maybe" +#define MOUSE_DBLCLCK_ON "mouse-dblclck-on" +#define MOUSE_DBLCLCK_OFF "mouse-dblclck-off" + +#define MOUSE_CAPPLET_DEFAULT_ICON_SIZE 100 + +static void mouse_init_stock_icons (void); +static void register_mouse_stock_icons (GtkIconFactory *factory); + +static GtkIconSize mouse_capplet_icon_size = 0; + /******************************************************************************/ /* A quick custom widget to ensure that the left handed toggle works no matter * which button is pressed. @@ -102,9 +114,6 @@ enum GdkPixbuf *left_handed_pixbuf; GdkPixbuf *right_handed_pixbuf; -GdkPixbuf *double_click_on_pixbuf; -GdkPixbuf *double_click_maybe_pixbuf; -GdkPixbuf *double_click_off_pixbuf; GConfClient *client; /* State in testing the double-click speed. Global for a great deal of * convenience @@ -262,7 +271,9 @@ static gboolean test_maybe_timeout (struct test_data_t *data) { double_click_state = DOUBLE_CLICK_TEST_OFF; - gtk_image_set_from_pixbuf (GTK_IMAGE (data->image), double_click_off_pixbuf); + + gtk_image_set_from_stock (GTK_IMAGE (data->image), + MOUSE_DBLCLCK_OFF, mouse_capplet_icon_size); *data->timeout_id = 0; @@ -282,9 +293,8 @@ event_box_button_press_event (GtkWidget *widget, static guint test_on_timeout_id = 0; static guint test_maybe_timeout_id = 0; static guint32 double_click_timestamp = 0; - GtkWidget *image; - GdkPixbuf *pixbuf = NULL; - + GtkWidget *image; + if (event->type != GDK_BUTTON_PRESS) return FALSE; @@ -324,18 +334,19 @@ event_box_button_press_event (GtkWidget *widget, switch (double_click_state) { case DOUBLE_CLICK_TEST_ON: - pixbuf = double_click_on_pixbuf; + gtk_image_set_from_stock (GTK_IMAGE (image), + MOUSE_DBLCLCK_ON, mouse_capplet_icon_size); break; case DOUBLE_CLICK_TEST_MAYBE: - pixbuf = double_click_maybe_pixbuf; + gtk_image_set_from_stock (GTK_IMAGE (image), + MOUSE_DBLCLCK_MAYBE, mouse_capplet_icon_size); break; case DOUBLE_CLICK_TEST_OFF: - pixbuf = double_click_off_pixbuf; + gtk_image_set_from_stock (GTK_IMAGE (image), + MOUSE_DBLCLCK_OFF, mouse_capplet_icon_size); break; } - gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); - return TRUE; } @@ -377,18 +388,6 @@ load_pixbufs (void) right_handed_pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); - filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "double-click-on.png", TRUE, NULL); - double_click_on_pixbuf = gdk_pixbuf_new_from_file (filename, NULL); - g_free (filename); - - filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "double-click-maybe.png", TRUE, NULL); - double_click_maybe_pixbuf = gdk_pixbuf_new_from_file (filename, NULL); - g_free (filename); - - filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "double-click-off.png", TRUE, NULL); - double_click_off_pixbuf = gdk_pixbuf_new_from_file (filename, NULL); - g_free (filename); - called = TRUE; } @@ -542,11 +541,11 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset) gconf_value_free (value); /* Double-click time */ - gtk_image_set_from_pixbuf (GTK_IMAGE (WID ("double_click_image")), double_click_off_pixbuf); + gtk_image_set_from_stock (GTK_IMAGE (WID ("double_click_image")), MOUSE_DBLCLCK_OFF, mouse_capplet_icon_size); g_object_set_data (G_OBJECT (WID ("double_click_eventbox")), "image", WID ("double_click_image")); g_signal_connect (WID ("double_click_eventbox"), "button_press_event", G_CALLBACK (event_box_button_press_event), changeset); - + /* Cursors page */ tree_view = WID ("cursor_tree"); cursor_font = read_cursor_font (); @@ -763,6 +762,8 @@ main (int argc, char **argv) GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR, NULL); + mouse_init_stock_icons (); + activate_settings_daemon (); client = gconf_client_get_default (); @@ -788,3 +789,51 @@ main (int argc, char **argv) return 0; } + +typedef struct +{ + char *stock_id; + const guint8 *icon_data; +} MouseStockIcon; + +static void +register_mouse_stock_icons (GtkIconFactory *factory) +{ + gint i; + MouseStockIcon items[] = + { + { MOUSE_DBLCLCK_MAYBE, mouse_dblclck_maybe_data }, + { MOUSE_DBLCLCK_ON, mouse_dblclck_on_data }, + { MOUSE_DBLCLCK_OFF, mouse_dblclck_off_data } + }; + + for (i = 0; i < G_N_ELEMENTS(items); ++i) { + GtkIconSet *icon_set; + GdkPixbuf *pixbuf; + pixbuf = gdk_pixbuf_new_from_inline (-1, items[i].icon_data, + FALSE, NULL); + + icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); + gtk_icon_factory_add (factory, items[i].stock_id, icon_set); + + gtk_icon_set_unref (icon_set); + g_object_unref (G_OBJECT (pixbuf)); + } +} + +static void +mouse_init_stock_icons (void) +{ + GtkIconFactory *factory; + + factory = gtk_icon_factory_new (); + gtk_icon_factory_add_default (factory); + + register_mouse_stock_icons (factory); + + mouse_capplet_icon_size = gtk_icon_size_register ("mouse-capplet-icon", + MOUSE_CAPPLET_DEFAULT_ICON_SIZE, + MOUSE_CAPPLET_DEFAULT_ICON_SIZE); + + g_object_unref (factory); +} diff --git a/capplets/network/ChangeLog b/capplets/network/ChangeLog index 4fe0a1b54..316e3ec7e 100644 --- a/capplets/network/ChangeLog +++ b/capplets/network/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/rollback/ChangeLog b/capplets/rollback/ChangeLog index 728116f51..04b94438b 100644 --- a/capplets/rollback/ChangeLog +++ b/capplets/rollback/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog index 918ccb37f..dd8ccfcec 100644 --- a/capplets/sound/ChangeLog +++ b/capplets/sound/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog index 33fc73850..d303248e9 100644 --- a/capplets/theme-switcher/ChangeLog +++ b/capplets/theme-switcher/ChangeLog @@ -1,3 +1,11 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Makefile.am : Add missing file + Fri Nov 1 11:01:16 2002 Jonathan Blandford <jrb@gnome.org> * gnome-theme-manager.c: Rewrote to handle metathemes and icon diff --git a/capplets/theme-switcher/Makefile.am b/capplets/theme-switcher/Makefile.am index 8df1db6dc..e17d6ffcf 100644 --- a/capplets/theme-switcher/Makefile.am +++ b/capplets/theme-switcher/Makefile.am @@ -6,7 +6,8 @@ gnome_theme_manager_LDADD = \ gnome_theme_manager_SOURCES = \ gnome-theme-manager.c \ - gnome-theme-installer.c + gnome-theme-installer.c \ + gnome-theme-installer.h gnome_theme_manager_LDFLAGS = -export-dynamic diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog index 3bd0a4b43..347651dc0 100644 --- a/capplets/ui-properties/ChangeLog +++ b/capplets/ui-properties/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/url-properties/ChangeLog b/capplets/url-properties/ChangeLog index f75be8d10..74b3b6e95 100644 --- a/capplets/url-properties/ChangeLog +++ b/capplets/url-properties/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog index 5b6d8ad05..653e9e004 100644 --- a/capplets/windows/ChangeLog +++ b/capplets/windows/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-26 Havoc Pennington <hp@pobox.com> * gnome-window-properties.c: rewrite diff --git a/capplets/wm-properties/ChangeLog b/capplets/wm-properties/ChangeLog index f1db92b1a..a1c53968c 100644 --- a/capplets/wm-properties/ChangeLog +++ b/capplets/wm-properties/ChangeLog @@ -1,3 +1,7 @@ +2002-11-02 Jody Goldberg <jody@gnome.org> + + * Release 2.1.2 + 2002-10-21 Jody Goldberg <jody@gnome.org> * Release 2.1.1 |