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

don't show the typing break tab if the typing monitor is not available

Browse source 
2008-03-24  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keyboard-properties.c: (setup_dialog): don't show the typing
	break tab if the typing monitor is not available (bug #524034)

svn path=/trunk/; revision=8589
This commit is contained in:
Jens Granseuer 2008-03-24 17:48:00 +00:00 • committed by Jens Granseuer
parent 35c9969c4d
commit 0915e0fd05
2 changed files with 38 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/keyboard/ChangeLog
View file

@ -1,3 +1,8 @@
2008-03-24 Jens Granseuer <jensgr@gmx.net>
* gnome-keyboard-properties.c: (setup_dialog): don't show the typing
break tab if the typing monitor is not available (bug #524034)
2008-03-19 Jens Granseuer <jensgr@gmx.net> 2008-03-19 Jens Granseuer <jensgr@gmx.net>
* gnome-keyboard-properties-xkblt.c: * gnome-keyboard-properties-xkblt.c:

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

@ -130,6 +130,7 @@ static void
setup_dialog (GladeXML * dialog, GConfChangeSet * changeset) setup_dialog (GladeXML * dialog, GConfChangeSet * changeset)
{ {
GObject *peditor; GObject *peditor;
gchar *monitor;
peditor = gconf_peditor_new_boolean peditor = gconf_peditor_new_boolean
(changeset, "/desktop/gnome/peripherals/keyboard/repeat", (changeset, "/desktop/gnome/peripherals/keyboard/repeat",
@ -159,28 +160,39 @@ setup_dialog (GladeXML * dialog, GConfChangeSet * changeset)
blink_from_widget, NULL); blink_from_widget, NULL);
/* Ergonomics */ /* Ergonomics */
peditor = gconf_peditor_new_boolean monitor = g_find_program_in_path ("gnome-typing-monitor");
(changeset, "/desktop/gnome/typing_break/enabled", if (monitor != NULL) {
WID ("break_enabled_toggle"), NULL); g_free (monitor);
gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor),
WID ("break_details_table"));
gconf_peditor_new_numeric_range (changeset,
"/desktop/gnome/typing_break/type_time",
WID ("break_enabled_spin"), NULL);
gconf_peditor_new_numeric_range (changeset,
"/desktop/gnome/typing_break/break_time",
WID ("break_interval_spin"),
NULL);
gconf_peditor_new_boolean (changeset,
"/desktop/gnome/typing_break/allow_postpone",
WID ("break_postponement_toggle"),
NULL);
g_signal_connect (G_OBJECT (WID ("keyboard_dialog")), "response",
(GCallback) dialog_response, changeset);
gtk_label_set_use_markup (GTK_LABEL peditor = gconf_peditor_new_boolean
(GTK_BIN (WID ("break_enabled_toggle"))-> (changeset, "/desktop/gnome/typing_break/enabled",
child), TRUE); WID ("break_enabled_toggle"), NULL);
gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor),
WID ("break_details_table"));
gconf_peditor_new_numeric_range (changeset,
"/desktop/gnome/typing_break/type_time",
WID ("break_enabled_spin"), NULL);
gconf_peditor_new_numeric_range (changeset,
"/desktop/gnome/typing_break/break_time",
WID ("break_interval_spin"),
NULL);
gconf_peditor_new_boolean (changeset,
"/desktop/gnome/typing_break/allow_postpone",
WID ("break_postponement_toggle"),
NULL);
gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("break_enabled_toggle"))->child),
TRUE);
} else {
/* don't show the typing break tab if the daemon is not available */
GtkNotebook *nb = GTK_NOTEBOOK (WID ("keyboard_notebook"));
gint tb_page = gtk_notebook_page_num (nb, WID ("break_enabled_toggle"));
gtk_notebook_remove_page (nb, tb_page);
}
g_signal_connect (WID ("keyboard_dialog"), "response",
(GCallback) dialog_response, changeset);
setup_xkb_tabs (dialog, changeset); setup_xkb_tabs (dialog, changeset);
setup_a11y_tabs (dialog, changeset); setup_a11y_tabs (dialog, changeset);