Spawn the accessibility tab of the keyboard capplet instead of

2008-01-02  Denis Washington  <denisw@svn.gnome.org>

	* accessibility/at-properties/main.c: (cb_keyboard_preferences): 
        Spawn the accessibility tab of the keyboard capplet instead of 
        at-properties.

	* capplets/keyboard/gnome-keyboard-properties.c: Add --a11y 
	command-line option to show the Accessibility tab when started.


svn path=/trunk/; revision=8365
This commit is contained in:
Denis Washington 2008-01-02 19:03:10 +00:00 committed by Denis Washington
parent 7d7bef7786
commit d528e9f4e2
4 changed files with 26 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2008-01-02 Denis Washington <denisw@svn.gnome.org>
* main.c: (cb_keyboard_preferences): Spawn the accessibility
tab of the keyboard capplet instead of at-properties.
2007-11-26 Sebastien Bacher <seb128@ubuntu.com> 2007-11-26 Sebastien Bacher <seb128@ubuntu.com>
* main.c: (at_enable_update): enable the preferred applications button, * main.c: (at_enable_update): enable the preferred applications button,

View file

@ -53,7 +53,7 @@ cb_at_preferences (GtkDialog *dialog, gint response_id)
static void static void
cb_keyboard_preferences (GtkDialog *dialog, gint response_id) cb_keyboard_preferences (GtkDialog *dialog, gint response_id)
{ {
g_spawn_command_line_async("gnome-accessibility-keyboard-properties", NULL); g_spawn_command_line_async("gnome-keyboard-properties --a11y", NULL);
} }
static void static void

View file

@ -1,3 +1,8 @@
2008-01-02 Denis Washington <denisw@svn.gnome.org>
* gnome-keyboard-properties.c: Add --a11y command-line option to
show the Accessibility tab when started.
2008-01-02 Denis Washington <denisw@svn.gnome.org> 2008-01-02 Denis Washington <denisw@svn.gnome.org>
Merge all keyboard accessibility options into the keyboard capplet. Merge all keyboard accessibility options into the keyboard capplet.

View file

@ -236,6 +236,7 @@ main (int argc, char **argv)
static gboolean apply_only = FALSE; static gboolean apply_only = FALSE;
static gboolean get_legacy = FALSE; static gboolean get_legacy = FALSE;
static gboolean switch_to_typing_break_page = FALSE; static gboolean switch_to_typing_break_page = FALSE;
static gboolean switch_to_a11y_page = FALSE;
static GOptionEntry cap_options[] = { static GOptionEntry cap_options[] = {
{"apply", 0, 0, G_OPTION_ARG_NONE, &apply_only, {"apply", 0, 0, G_OPTION_ARG_NONE, &apply_only,
@ -254,6 +255,11 @@ main (int argc, char **argv)
N_ N_
("Start the page with the typing break settings showing"), ("Start the page with the typing break settings showing"),
NULL}, NULL},
{"a11y", 0, 0, G_OPTION_ARG_NONE,
&switch_to_a11y_page,
N_
("Start the page with the accessibility settings showing"),
NULL},
{NULL} {NULL}
}; };
@ -291,8 +297,16 @@ main (int argc, char **argv)
gtk_notebook_set_current_page (GTK_NOTEBOOK gtk_notebook_set_current_page (GTK_NOTEBOOK
(WID (WID
("keyboard_notebook")), ("keyboard_notebook")),
3); 4);
} }
else if (switch_to_a11y_page) {
gtk_notebook_set_current_page (GTK_NOTEBOOK
(WID
("keyboard_notebook")),
2);
}
capplet_set_icon (WID ("keyboard_dialog"), capplet_set_icon (WID ("keyboard_dialog"),
"gnome-dev-keyboard"); "gnome-dev-keyboard");
gtk_widget_show (WID ("keyboard_dialog")); gtk_widget_show (WID ("keyboard_dialog"));