fix missed capitalization for the ui-review.

2002-08-10  Jody Goldberg <jody@gnome.org>

	* file-types-properties.glade : fix missed capitalization for the
	ui-review.

2002-08-15  Jody Goldberg <jody@gnome.org>

	* 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 <jody@gnome.org>

	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 <jody@gnome.org>

	* po/POTFILES.in : remove bogus file.
This commit is contained in:
Jody Goldberg 2002-08-15 17:54:10 +00:00 committed by Jody Goldberg
parent a5a97dcbc1
commit 3b1c8cb1cd
11 changed files with 258 additions and 154 deletions

View file

@ -1,3 +1,7 @@
2002-08-07 Jody Goldberg <jody@gnome.org>
* po/POTFILES.in : remove bogus file.
2002-08-09 Yanko Kaneti <yaneti@declera.com>
* capplets/common/capplet-util.h: handle different cases of

View file

@ -1,3 +1,8 @@
2002-08-10 Jody Goldberg <jody@gnome.org>
* file-types-properties.glade : fix missed capitalization for the
ui-review.
2002-08-07 Jody Goldberg <jody@gnome.org>
* mime-edit-dialog.c (mime_edit_dialog_get_app) : Be extra anal, just

View file

@ -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)

View file

@ -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");

View file

@ -132,7 +132,7 @@
<widget class="GtkButton" id="add_mime_button">
<property name="can_default">yes</property>
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Add _file type...</property>
<property name="label" translatable="yes">Add _File Type...</property>
<property name="use_underline">yes</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="visible">yes</property>
@ -143,7 +143,7 @@
<widget class="GtkButton" id="add_service_button">
<property name="can_default">yes</property>
<property name="can_focus">yes</property>
<property name="label" translatable="yes">Add _service...</property>
<property name="label" translatable="yes">Add _Service...</property>
<property name="use_underline">yes</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="visible">yes</property>

View file

@ -1,3 +1,9 @@
2002-08-15 Jody Goldberg <jody@gnome.org>
* 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 <snickell@stanford.edu>
* gnome-keyboard-properties.glade:

View file

@ -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;
}

View file

@ -21,10 +21,8 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="border_width">5</property>
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="spacing">10</property>
<child>
<widget class="GtkButton" id="helpbutton1">
@ -216,18 +214,38 @@
<child>
<widget class="GtkTable" id="repeat_table">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_rows">4</property>
<property name="n_columns">3</property>
<property name="homogeneous">False</property>
<property name="row_spacing">4</property>
<property name="column_spacing">4</property>
<child>
<widget class="GtkHScale" id="repeat_delay_scale">
<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">500 50 1510 10 10 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">fill</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="label" translatable="yes">_Delay:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@ -239,7 +257,7 @@
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="right_attach">3</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="x_options">fill</property>
@ -262,6 +280,30 @@
<property name="ypad">0</property>
<property name="mnemonic_widget">repeat_speed_scale</property>
</widget>
<packing>
<property name="left_attach">0</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"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="delay_short_label">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Short&lt;/i&gt;&lt;/small&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">1</property>
<property name="yalign">0.5</property>
<property name="xpad">10</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
@ -273,22 +315,74 @@
</child>
<child>
<widget class="GtkHScale" id="repeat_delay_scale">
<widget class="GtkLabel" id="delay_long_label">
<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">500 50 1510 10 10 0</property>
<property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Long&lt;/i&gt;&lt;/small&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</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">2</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="y_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">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="repeat_fast_label">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Fast&lt;/i&gt;&lt;/small&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</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">2</property>
<property name="right_attach">3</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="repeat_slow_label">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Slow&lt;/i&gt;&lt;/small&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">1</property>
<property name="yalign">0.5</property>
<property name="xpad">10</property>
<property name="ypad">0</property>
</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"></property>
</packing>
</child>
@ -306,60 +400,11 @@
<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="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="label" translatable="yes">faster</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">2</property>
<property name="right_attach">3</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="label21">
<property name="visible">True</property>
<property name="label" translatable="yes">faster</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">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"></property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
@ -476,10 +521,13 @@
</child>
<child>
<widget class="GtkHBox" id="cursor_hbox">
<widget class="GtkTable" id="cursor_hbox">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">3</property>
<property name="homogeneous">False</property>
<property name="spacing">4</property>
<property name="row_spacing">0</property>
<property name="column_spacing">0</property>
<child>
<widget class="GtkLabel" id="cursor_label">
@ -490,16 +538,67 @@
<property name="justify">GTK_JUSTIFY_CENTER</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">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">cursor_blink_time_scale</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="left_attach">0</property>
<property name="right_attach">3</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="blink_slow_label">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Slow&lt;/i&gt;&lt;/small&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">1</property>
<property name="yalign">0.5</property>
<property name="xpad">10</property>
<property name="ypad">0</property>
</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"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="blink_fast_label">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Fast&lt;/i&gt;&lt;/small&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</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">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"></property>
</packing>
</child>
@ -513,39 +612,13 @@
<property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
<property name="inverted">False</property>
<property name="adjustment">1000 100 2500 200 200 0</property>
<accessibility>
<atkrelation target="cursor_label" type="labelled-by"/>
<atkrelation target="fast_label" type="labelled-by"/>
</accessibility>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="fast_label">
<property name="visible">True</property>
<property name="label" translatable="yes">faster</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</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>
<accessibility>
<atkrelation target="cursor_blink_time_scale" type="label-for"/>
</accessibility>
</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">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options">fill</property>
</packing>
</child>
</widget>

View file

@ -1,3 +1,17 @@
2002-08-15 Jody Goldberg <jody@gnome.org>
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 <jody@gnome.org>
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 <michael@ximian.com>
* gnome-settings-sound.c (stop_esd): flag that

View file

@ -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;

View file

@ -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;