From 3b1c8cb1cdd364d90964b9ec6bb48246f74e5e6c Mon Sep 17 00:00:00 2001 From: Jody Goldberg Date: Thu, 15 Aug 2002 17:54:10 +0000 Subject: [PATCH] fix missed capitalization for the ui-review. 2002-08-10 Jody Goldberg * file-types-properties.glade : fix missed capitalization for the ui-review. 2002-08-15 Jody Goldberg * gnome-keyboard-properties.glade : fix label and make consistent with mouse capplet. * gnome-keyboard-properties.c (create_dialog) : use size groups. 2002-08-15 Jody Goldberg http://bugzilla.gnome.org/show_bug.cgi?id=90778 * gnome-settings-accessibility-keyboard.c (set_gconf_from_server) : Add a heuristic so that we do not disable features in gconf just because they are disabled in the X server. If the master switch is already disabled in gconf we can guess that most of the time it means that people want to keep their flags. 2002-08-07 Jody Goldberg * po/POTFILES.in : remove bogus file. --- ChangeLog | 4 + capplets/file-types/ChangeLog | 5 + capplets/file-types/Makefile.am | 2 +- capplets/file-types/category-names.h | 27 -- .../file-types/file-types-properties.glade | 4 +- capplets/keyboard/ChangeLog | 6 + capplets/keyboard/gnome-keyboard-properties.c | 16 + .../keyboard/gnome-keyboard-properties.glade | 285 +++++++++++------- gnome-settings-daemon/ChangeLog | 14 + .../gnome-settings-accessibility-keyboard.c | 47 +-- .../gnome-settings-default-editor.c | 2 + 11 files changed, 258 insertions(+), 154 deletions(-) delete mode 100644 capplets/file-types/category-names.h diff --git a/ChangeLog b/ChangeLog index bed704691..f61f45a27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-08-07 Jody Goldberg + + * po/POTFILES.in : remove bogus file. + 2002-08-09 Yanko Kaneti * capplets/common/capplet-util.h: handle different cases of diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog index 087445627..aaa1b3d63 100644 --- a/capplets/file-types/ChangeLog +++ b/capplets/file-types/ChangeLog @@ -1,3 +1,8 @@ +2002-08-10 Jody Goldberg + + * file-types-properties.glade : fix missed capitalization for the + ui-review. + 2002-08-07 Jody Goldberg * mime-edit-dialog.c (mime_edit_dialog_get_app) : Be extra anal, just diff --git a/capplets/file-types/Makefile.am b/capplets/file-types/Makefile.am index 7ebb26675..75e750614 100644 --- a/capplets/file-types/Makefile.am +++ b/capplets/file-types/Makefile.am @@ -25,4 +25,4 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(VFS_CAPPLET_CFLAGS) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) -EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) category-names.h +EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) diff --git a/capplets/file-types/category-names.h b/capplets/file-types/category-names.h deleted file mode 100644 index 32034ac0d..000000000 --- a/capplets/file-types/category-names.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Translatable strings file - * Add this file to your project's POTFILES.in. - * DO NOT compile it as part of your application. - */ - -gchar *s = N_("Documents"); -gchar *s = N_("Word Processor"); -gchar *s = N_("Published Materials"); -gchar *s = N_("Spreadsheet"); -gchar *s = N_("Presentation"); -gchar *s = N_("Diagram"); -gchar *s = N_("TeX"); -gchar *s = N_("Vector Graphics"); -gchar *s = N_("World Wide Web"); -gchar *s = N_("Plain Text"); -gchar *s = N_("Extended Markup Language (XML)"); -gchar *s = N_("Information"); -gchar *s = N_("Financial"); -gchar *s = N_("Calendar"); -gchar *s = N_("Contacts"); -gchar *s = N_("Packages"); -gchar *s = N_("Software Development"); -gchar *s = N_("Source Code"); -gchar *s = N_("Audio"); -gchar *s = N_("Images"); -gchar *s = N_("Video"); diff --git a/capplets/file-types/file-types-properties.glade b/capplets/file-types/file-types-properties.glade index 92c819894..79e2854bf 100644 --- a/capplets/file-types/file-types-properties.glade +++ b/capplets/file-types/file-types-properties.glade @@ -132,7 +132,7 @@ yes yes - Add _file type... + Add _File Type... yes GTK_RELIEF_NORMAL yes @@ -143,7 +143,7 @@ yes yes - Add _service... + Add _Service... yes GTK_RELIEF_NORMAL yes diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index 9e68a48e9..1a6927bf6 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,9 @@ +2002-08-15 Jody Goldberg + + * gnome-keyboard-properties.glade : fix label and make consistent with + mouse capplet. + * gnome-keyboard-properties.c (create_dialog) : use size groups. + 2002-08-08 Seth Nickell * gnome-keyboard-properties.glade: diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c index 3ee4777aa..cf195eccc 100644 --- a/capplets/keyboard/gnome-keyboard-properties.c +++ b/capplets/keyboard/gnome-keyboard-properties.c @@ -47,9 +47,25 @@ static GladeXML * create_dialog (void) { GladeXML *dialog; + GtkSizeGroup *size_group; dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-keyboard-properties.glade", "keyboard_dialog", NULL); + size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget (size_group, WID ("repeat_slow_label")); + gtk_size_group_add_widget (size_group, WID ("delay_short_label")); + gtk_size_group_add_widget (size_group, WID ("blink_slow_label")); + + size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget (size_group, WID ("repeat_fast_label")); + gtk_size_group_add_widget (size_group, WID ("delay_long_label")); + gtk_size_group_add_widget (size_group, WID ("blink_fast_label")); + + size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget (size_group, WID ("repeat_delay_scale")); + gtk_size_group_add_widget (size_group, WID ("repeat_speed_scale")); + gtk_size_group_add_widget (size_group, WID ("cursor_blink_time_scale")); + return dialog; } diff --git a/capplets/keyboard/gnome-keyboard-properties.glade b/capplets/keyboard/gnome-keyboard-properties.glade index dd9eafba4..075d1e399 100644 --- a/capplets/keyboard/gnome-keyboard-properties.glade +++ b/capplets/keyboard/gnome-keyboard-properties.glade @@ -21,10 +21,8 @@ - 5 True GTK_BUTTONBOX_END - 10 @@ -216,18 +214,38 @@ True - 2 + 4 3 False 4 4 + + + True + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + False + 500 50 1510 10 10 0 + + + 1 + 2 + 1 + 2 + fill + + + True _Delay: True - False + True GTK_JUSTIFY_CENTER False False @@ -239,7 +257,7 @@ 0 - 1 + 3 0 1 fill @@ -262,6 +280,30 @@ 0 repeat_speed_scale + + 0 + 3 + 2 + 3 + fill + + + + + + + True + <small><i>Short</i></small> + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 10 + 0 + 0 1 @@ -273,22 +315,74 @@ - + True - True - False - GTK_POS_TOP - 1 - GTK_UPDATE_CONTINUOUS - False - 500 50 1510 10 10 0 + <small><i>Long</i></small> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 - 1 - 2 - 0 - 1 - fill + 2 + 3 + 1 + 2 + fill + + + + + + + True + <small><i>Fast</i></small> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 3 + 3 + 4 + fill + + + + + + + True + <small><i>Slow</i></small> + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 10 + 0 + + + 0 + 1 + 3 + 4 + fill + @@ -306,60 +400,11 @@ 1 2 - 1 - 2 - fill + 3 + 4 fill - - - - True - faster - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - faster - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 2 - 3 - 1 - 2 - fill - - - 0 @@ -476,10 +521,13 @@ - + True + 2 + 3 False - 4 + 0 + 0 @@ -490,16 +538,67 @@ GTK_JUSTIFY_CENTER False False - 0.5 + 0 0.5 0 0 cursor_blink_time_scale - 0 - False - False + 0 + 3 + 0 + 1 + fill + + + + + + + True + <small><i>Slow</i></small> + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 10 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + <small><i>Fast</i></small> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 3 + 1 + 2 + fill + @@ -513,39 +612,13 @@ GTK_UPDATE_DISCONTINUOUS False 1000 100 2500 200 200 0 - - - - - 0 - True - True - - - - - - True - faster - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - - - - 0 - False - False + 1 + 2 + 1 + 2 + fill diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index 74751803f..47b2a8bd3 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,17 @@ +2002-08-15 Jody Goldberg + + http://bugzilla.gnome.org/show_bug.cgi?id=90778 + * gnome-settings-accessibility-keyboard.c (set_gconf_from_server) : + Add a heuristic so that we do not disable features in gconf just + because they are disabled in the X server. If the master switch is + already disabled in gconf we can guess that most of the time it + means that people want to keep their flags. + +2002-08-14 Jody Goldberg + + http://bugzilla.gnome.org/show_bug.cgi?id=90778 + * gnome-settings-default-editor.c (vfs_change_cb) : be more careful + 2002-08-07 Michael Meeks * gnome-settings-sound.c (stop_esd): flag that diff --git a/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c b/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c index ce54e03ac..1af93a8d4 100644 --- a/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c +++ b/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c @@ -111,14 +111,17 @@ set_int (GConfClient *client, char const *key, int val) } } -static void -set_bool (GConfClient *client, char const *key, int val) +static gboolean +set_bool (GConfClient *client, gboolean in_gconf, char const *key, int val) { GError *err; + if (!in_gconf && !val) + return FALSE; if (!gconf_client_set_bool (client, key, val ? TRUE : FALSE, &err)) { g_warning (err->message); g_error_free (err); } + return val; } static unsigned long @@ -271,10 +274,10 @@ set_server_from_gconf (GConfEntry *ignored) static void set_gconf_from_server (GConfEntry *ignored) { + gboolean in_gconf; GConfClient *client = gconf_client_get_default (); - XkbDescRec *desc; + XkbDescRec *desc = get_xkb_desc_rec (); - desc = get_xkb_desc_rec (); if (!desc) { d ("No XKB present\n"); return; @@ -291,23 +294,31 @@ set_gconf_from_server (GConfEntry *ignored) g_return_if_fail (!we_are_changing_xkb_state); we_are_changing_xkb_state = TRUE; - set_bool (client, CONFIG_ROOT "/enable", + /* always toggle this irrespective of the state */ + set_bool (client, TRUE, CONFIG_ROOT "/enable", desc->ctrls->enabled_ctrls & (XkbAccessXKeysMask | XkbAccessXFeedbackMask)); - set_bool (client, CONFIG_ROOT "/feature_state_change_beep", + + /* if master is disabled in gconf do not change gconf state of subordinates + * to match the server. However, we should enable the master if one of the subordinates + * get enabled. + */ + in_gconf = gconf_client_get_bool (client, CONFIG_ROOT "/enable", NULL); + + set_bool (client, in_gconf, CONFIG_ROOT "/feature_state_change_beep", desc->ctrls->ax_options & (XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask)); - set_bool (client, CONFIG_ROOT "/timeout_enable", + set_bool (client, in_gconf, CONFIG_ROOT "/timeout_enable", desc->ctrls->enabled_ctrls & XkbAccessXTimeoutMask); set_int (client, CONFIG_ROOT "/timeout", desc->ctrls->ax_timeout); - set_bool (client, CONFIG_ROOT "/bouncekeys_enable", + set_bool (client, in_gconf, CONFIG_ROOT "/bouncekeys_enable", desc->ctrls->enabled_ctrls & XkbBounceKeysMask); set_int (client, CONFIG_ROOT "/bouncekeys_delay", desc->ctrls->debounce_delay); - set_bool (client, CONFIG_ROOT "/bouncekeys_beep_reject", + set_bool (client, TRUE, CONFIG_ROOT "/bouncekeys_beep_reject", desc->ctrls->ax_options & XkbAX_BKRejectFBMask); - set_bool (client, CONFIG_ROOT "/mousekeys_enable", + set_bool (client, in_gconf, CONFIG_ROOT "/mousekeys_enable", desc->ctrls->enabled_ctrls & XkbMouseKeysMask); set_int (client, CONFIG_ROOT "/mousekeys_max_speed", desc->ctrls->mk_max_speed * (1000 / desc->ctrls->mk_interval)); @@ -317,25 +328,25 @@ set_gconf_from_server (GConfEntry *ignored) set_int (client, CONFIG_ROOT "/mousekeys_init_delay", desc->ctrls->mk_delay); - set_bool (client, CONFIG_ROOT "/slowkeys_enable", + set_bool (client, in_gconf, CONFIG_ROOT "/slowkeys_enable", desc->ctrls->enabled_ctrls & XkbSlowKeysMask); - set_bool (client, CONFIG_ROOT "/slowkeys_beep_press", + set_bool (client, TRUE, CONFIG_ROOT "/slowkeys_beep_press", desc->ctrls->ax_options & XkbAX_SKPressFBMask); - set_bool (client, CONFIG_ROOT "/slowkeys_beep_accept", + set_bool (client, TRUE, CONFIG_ROOT "/slowkeys_beep_accept", desc->ctrls->ax_options & XkbAX_SKAcceptFBMask); - set_bool (client, CONFIG_ROOT "/slowkeys_beep_reject", + set_bool (client, TRUE, CONFIG_ROOT "/slowkeys_beep_reject", desc->ctrls->ax_options & XkbAX_SKRejectFBMask); set_int (client, CONFIG_ROOT "/slowkeys_delay", desc->ctrls->slow_keys_delay); - set_bool (client, CONFIG_ROOT "/stickykeys_enable", + set_bool (client, in_gconf, CONFIG_ROOT "/stickykeys_enable", desc->ctrls->enabled_ctrls & XkbStickyKeysMask); - set_bool (client, CONFIG_ROOT "/stickykeys_two_key_off", + set_bool (client, TRUE, CONFIG_ROOT "/stickykeys_two_key_off", desc->ctrls->ax_options & XkbAX_TwoKeysMask); - set_bool (client, CONFIG_ROOT "/stickykeys_modifier_beep", + set_bool (client, TRUE, CONFIG_ROOT "/stickykeys_modifier_beep", desc->ctrls->ax_options & XkbAX_StickyKeysFBMask); - set_bool (client, CONFIG_ROOT "/togglekeys_enable", + set_bool (client, in_gconf, CONFIG_ROOT "/togglekeys_enable", desc->ctrls->ax_options & XkbAX_IndicatorFBMask); we_are_changing_xkb_state = FALSE; diff --git a/gnome-settings-daemon/gnome-settings-default-editor.c b/gnome-settings-daemon/gnome-settings-default-editor.c index 190b37a6c..89b9b957d 100644 --- a/gnome-settings-daemon/gnome-settings-default-editor.c +++ b/gnome-settings-daemon/gnome-settings-default-editor.c @@ -92,6 +92,8 @@ vfs_change_cb (GnomeVFSMIMEMonitor *monitor, GConfClient *client) star_app = gnome_vfs_mime_get_default_application ("text/*"); plain_app = gnome_vfs_mime_get_default_application ("text/plain"); + if (star_app == NULL || plain_app == NULL) + return; if (!strcmp (star_app->id, plain_app->id)) return;