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

A Pile of pending changes

Browse source
This commit is contained in:
Jody Goldberg 2002-07-16 22:07:42 +00:00
parent 52d3daae86
commit b6e858deb7
13 changed files with 799 additions and 983 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
capplets/accessibility/keyboard/accessibility-keyboard.c
View file

@ -170,17 +170,6 @@ setup_simple_toggles (GladeXML *dialog, GConfChangeSet *changeset)
}
}
static GConfValue*
cb_to_widget (GConfPropertyEditor *peditor, const GConfValue *value)
{
return gconf_value_int_to_float (value);
}
static GConfValue*
cb_from_widget (GConfPropertyEditor *peditor, const GConfValue *value)
{
return gconf_value_float_to_int (value);
}
static void
setup_ranges (GladeXML *dialog, GConfChangeSet *changeset)
{
@ -211,8 +200,8 @@ setup_ranges (GladeXML *dialog, GConfChangeSet *changeset)
ranges [i].step_size, 0);
peditor = gconf_peditor_new_numeric_range (changeset,
(gchar *)ranges [i].gconf_key, slide,
"conv-to-widget-cb", cb_to_widget,
"conv-from-widget-cb", cb_from_widget,
"conv-to-widget-cb", gconf_value_int_to_float,
"conv-from-widget-cb", gconf_value_float_to_int,
NULL);
}
}

6
capplets/common/ChangeLog
View file

@ -1,3 +1,9 @@
2002-07-16 Jody Goldberg <jody@gnome.org>
* gconf-property-editor.c (gconf_value_int_to_float) : add a peditor
arg so that these can be used without wrappers.
(gconf_value_float_to_int) : ditto.
2002-07-10 Jody Goldberg <jody@gnome.org>
* capplet-util.c (capplet_set_icon) : look in more places.

4
capplets/common/gconf-property-editor.c
View file

@ -1175,7 +1175,7 @@ gconf_peditor_widget_set_guard (GConfPropertyEditor *peditor,
}
GConfValue *
gconf_value_int_to_float (const GConfValue *value)
gconf_value_int_to_float (GConfPropertyEditor *ignored, const GConfValue *value)
{
GConfValue *new_value;
@ -1185,7 +1185,7 @@ gconf_value_int_to_float (const GConfValue *value)
}
GConfValue *
gconf_value_float_to_int (const GConfValue *value)
gconf_value_float_to_int (GConfPropertyEditor *ignored, const GConfValue *value)
{
GConfValue *new_value;

5
capplets/common/gconf-property-editor.h
View file

@ -155,8 +155,9 @@ GObject *gconf_peditor_new_image (GConfChangeSet *changeset,
void gconf_peditor_widget_set_guard (GConfPropertyEditor *peditor,
GtkWidget *widget);
GConfValue *gconf_value_int_to_float (const GConfValue *value);
GConfValue *gconf_value_float_to_int (const GConfValue *value);
/* some convenience callbacks to map int <-> float */
GConfValue *gconf_value_int_to_float (GConfPropertyEditor *ignored, GConfValue const *value);
GConfValue *gconf_value_float_to_int (GConfPropertyEditor *ignored, GConfValue const *value);
G_END_DECLS

6
capplets/file-types/ChangeLog
View file

@ -1,3 +1,9 @@
2002-07-16 Jody Goldberg <jody@gnome.org>
* file-types-properties.glade (</) : rearrange the extensions area.
* mime-edit-dialog.c (mime_edit_dialog_init) : add when the entry is
activated.
2002-07-10 Jody Goldberg <jody@gnome.org>
* mime-edit-dialog.c (mime_edit_dialog_init) : set the icon here.

1128
capplets/file-types/file-types-properties.glade
View file

File diff suppressed because it is too large Load diff

2
capplets/file-types/mime-edit-dialog.c
View file

@ -199,7 +199,7 @@ mime_edit_dialog_init (MimeEditDialog *dialog, MimeEditDialogClass *class)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog->p->dialog_win)->vbox), WID ("edit_widget"), TRUE, TRUE, 0);
g_signal_connect_swapped (G_OBJECT (WID ("add_ext_button")), "clicked", (GCallback) add_ext_cb, dialog);
g_signal_connect_swapped (G_OBJECT (WID ("new_ext_entry")), "activate", (GCallback) add_ext_cb, dialog);
g_signal_connect_swapped (G_OBJECT (WID ("remove_ext_button")), "clicked", (GCallback) remove_ext_cb, dialog);
g_signal_connect_swapped (G_OBJECT (WID ("choose_button")), "clicked", (GCallback) choose_cat_cb, dialog);
g_signal_connect_swapped (G_OBJECT (WID ("default_action_select")), "changed", (GCallback) default_action_changed_cb, dialog);

6
capplets/keyboard/ChangeLog
View file

@ -1,4 +1,8 @@
2002-06-13 Jody Goldberg <jody@gnome.org>
2002-07-16 Jody Goldberg <jody@gnome.org>
* gnome-keyboard-properties.c (setup_dialog) : use the gconf_value_int_to_float
convenience routines directly and convert the repeat speed and delay
to use sliders.
* gnome-keyboard-properties.c (accessibility_button_clicked) : produce
a better warning for failure to launch the keyboard accessibility

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

@ -53,79 +53,6 @@ create_dialog (void)
return dialog;
}
static GConfValue *
rate_to_widget (GConfPropertyEditor *peditor, const GConfValue *value)
{
GConfValue *new_value;
int rate;
rate = gconf_value_get_int (value);
new_value = gconf_value_new (GCONF_VALUE_INT);
if (rate >= (255 + 192) / 2)
gconf_value_set_int (new_value, 0);
else if (rate >= (192 + 64) / 2)
gconf_value_set_int (new_value, 1);
else if (rate >= (64 + 1) / 2)
gconf_value_set_int (new_value, 2);
else
gconf_value_set_int (new_value, 3);
return new_value;
}
static GConfValue *
rate_from_widget (GConfPropertyEditor *peditor, const GConfValue *value)
{
static int rates[] = {
255, 192, 64, 1
};
GConfValue *new_value;
new_value = gconf_value_new (GCONF_VALUE_INT);
gconf_value_set_int (new_value, rates[gconf_value_get_int (value)]);
return new_value;
}
static GConfValue *
delay_to_widget (GConfPropertyEditor *peditor, const GConfValue *value)
{
GConfValue *new_value;
int delay;
delay = gconf_value_get_int (value);
new_value = gconf_value_new (GCONF_VALUE_INT);
if (delay >= (1000 + 700) / 2)
gconf_value_set_int (new_value, 3);
else if (delay >= (700 + 300) / 2)
gconf_value_set_int (new_value, 2);
else if (delay >= (300 + 150) / 2)
gconf_value_set_int (new_value, 1);
else
gconf_value_set_int (new_value, 0);
return new_value;
}
static GConfValue *
delay_from_widget (GConfPropertyEditor *peditor, GConfValue *value)
{
static int delays[] = {
150, 300, 700, 1000
};
GConfValue *new_value;
new_value = gconf_value_new (GCONF_VALUE_INT);
gconf_value_set_int (new_value, delays[gconf_value_get_int (value)]);
return new_value;
}
static GConfEnumStringPair bell_enums[] = {
{ 0, "off" },
{ 1, "on" },
@ -189,17 +116,6 @@ blink_to_widget (GConfPropertyEditor *peditor, const GConfValue *value)
return new_value;
}
static GConfValue *
volume_to_widget (GConfPropertyEditor *peditor, const GConfValue *value)
{
return gconf_value_int_to_float (value);
}
static GConfValue *
volume_from_widget (GConfPropertyEditor *peditor, const GConfValue *value)
{
return gconf_value_float_to_int (value);
}
static void
bell_guard (GtkWidget *toggle,
GladeXML *dialog)
@ -217,6 +133,16 @@ mnemonic_activate (GtkWidget *toggle,
return FALSE;
}
static void
accessibility_button_clicked (GtkWidget *widget,
gpointer data)
{
GError *err = NULL;
if (!g_spawn_command_line_async ("gnome-accessibility-keyboard-properties", NULL))
capplet_error_dialog (GTK_WINDOW (gtk_widget_get_toplevel (widget)),
_("There was an error launching the keyboard capplet : %s"),
err);
}
static void
dialog_response (GtkWidget *widget,
@ -227,21 +153,12 @@ dialog_response (GtkWidget *widget,
capplet_help (GTK_WINDOW (widget),
"wgoscustdesk.xml",
"goscustperiph-2");
else if (response_id == 0)
accessibility_button_clicked (NULL, NULL);
else
gtk_main_quit ();
}
static void
accessibility_button_clicked (GtkWidget *widget,
gpointer data)
{
GError *err = NULL;
if (!g_spawn_command_line_async ("gnome-accessibility-keyboard-properties", NULL))
capplet_error_dialog (GTK_WINDOW (gtk_widget_get_toplevel (widget)),
_("There was an error launching the keyboard capplet : %s"),
err);
}
static void
setup_dialog (GladeXML *dialog,
GConfChangeSet *changeset)
@ -269,16 +186,16 @@ setup_dialog (GladeXML *dialog,
(changeset, "/desktop/gnome/peripherals/keyboard/repeat", WID ("repeat_toggle"), NULL);
gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("repeat_table"));
gconf_peditor_new_select_menu
(changeset, "/desktop/gnome/peripherals/keyboard/delay", WID ("repeat_delay_omenu"),
"conv-to-widget-cb", delay_to_widget,
"conv-from-widget-cb", delay_from_widget,
gconf_peditor_new_numeric_range
(changeset, "/desktop/gnome/peripherals/keyboard/delay", WID ("repeat_delay_scale"),
"conv-to-widget-cb", gconf_value_int_to_float,
"conv-from-widget-cb", gconf_value_float_to_int,
NULL);
gconf_peditor_new_select_menu
(changeset, "/desktop/gnome/peripherals/keyboard/rate", WID ("repeat_speed_omenu"),
"conv-to-widget-cb", rate_to_widget,
"conv-from-widget-cb", rate_from_widget,
gconf_peditor_new_numeric_range
(changeset, "/desktop/gnome/peripherals/keyboard/rate", WID ("repeat_speed_scale"),
"conv-to-widget-cb", gconf_value_int_to_float,
"conv-from-widget-cb", gconf_value_float_to_int,
NULL);
peditor = gconf_peditor_new_boolean
@ -290,14 +207,13 @@ setup_dialog (GladeXML *dialog,
"conv-from-widget-cb", blink_from_widget,
NULL);
peditor = gconf_peditor_new_boolean
(changeset, "/desktop/gnome/peripherals/keyboard/click", WID ("volume_toggle"), NULL);
gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("volume_hbox"));
gconf_peditor_new_numeric_range
(changeset, "/desktop/gnome/peripherals/keyboard/click_volume", WID ("volume_scale"),
"conv-to-widget-cb", volume_to_widget,
"conv-from-widget-cb", volume_from_widget,
"conv-to-widget-cb", gconf_value_int_to_float,
"conv-from-widget-cb", gconf_value_float_to_int,
NULL);
g_signal_connect (G_OBJECT (WID ("bell_custom_radio")), "toggled", (GCallback) bell_guard, dialog);
@ -309,8 +225,6 @@ setup_dialog (GladeXML *dialog,
NULL);
g_signal_connect (G_OBJECT (WID ("bell_custom_radio")), "mnemonic_activate", (GCallback) mnemonic_activate, WID ("bell_custom_entry"));
g_signal_connect (G_OBJECT (WID ("keyboard_dialog")), "response", (GCallback) dialog_response, changeset);
g_signal_connect (G_OBJECT (WID ("accessibility_button")), "clicked", (GCallback) accessibility_button_clicked, NULL);
}
static void
@ -385,9 +299,8 @@ main (int argc, char **argv)
changeset = NULL;
dialog = create_dialog ();
setup_dialog (dialog, changeset);
#if 0
setup_accessibility (dialog, changeset);
#endif
capplet_set_icon (WID ("keyboard_dialog"),
"keyboard-capplet.png");
gtk_widget_show (WID ("keyboard_dialog"));
gtk_main ();
}

457
capplets/keyboard/gnome-keyboard-properties.glade
View file

@ -40,14 +40,83 @@
</child>
<child>
<widget class="GtkButton" id="closebutton1">
<widget class="GtkButton" id="button3">
<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">0</property>
<signal name="clicked" handler="accessibility_button_clicked" last_modification_time="Tue, 02 Jul 2002 06:58:29 GMT"/>
<child>
<widget class="GtkAlignment" id="alignment1">
<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="hbox7">
<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-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="label19">
<property name="visible">True</property>
<property name="label" translatable="yes">_Accessibility...</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="button4">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="response_id">2</property>
<property name="response_id">-7</property>
</widget>
</child>
</widget>
@ -148,7 +217,7 @@
<widget class="GtkTable" id="repeat_table">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="n_columns">3</property>
<property name="homogeneous">False</property>
<property name="row_spacing">4</property>
<property name="column_spacing">4</property>
@ -156,7 +225,7 @@
<child>
<widget class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="label" translatable="yes">_Delay before repeating:</property>
<property name="label" translatable="yes">_Delay:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@ -166,7 +235,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">repeat_delay_omenu</property>
<property name="mnemonic_widget">repeat_delay_scale</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -181,7 +250,7 @@
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="label" translatable="yes">Repeat s_peed:</property>
<property name="label" translatable="yes">_Speed:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@ -191,7 +260,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">repeat_speed_omenu</property>
<property name="mnemonic_widget">repeat_speed_scale</property>
</widget>
<packing>
<property name="left_attach">0</property>
@ -204,101 +273,35 @@
</child>
<child>
<widget class="GtkOptionMenu" id="repeat_delay_omenu">
<widget class="GtkHScale" id="repeat_delay_scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="history">0</property>
<child internal-child="menu">
<widget class="GtkMenu" id="convertwidget1">
<property name="visible">True</property>
<child>
<widget class="GtkMenuItem" id="convertwidget2">
<property name="visible">True</property>
<property name="label" translatable="yes">Very Short</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="convertwidget3">
<property name="visible">True</property>
<property name="label" translatable="yes">Short</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="convertwidget4">
<property name="visible">True</property>
<property name="label" translatable="yes">Medium</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="convertwidget5">
<property name="visible">True</property>
<property name="label" translatable="yes">Long</property>
<property name="use_underline">True</property>
</widget>
</child>
</widget>
</child>
<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">0</property>
<property name="bottom_attach">1</property>
<property name="y_options">expand</property>
<property name="y_options">fill</property>
</packing>
</child>
<child>
<widget class="GtkOptionMenu" id="repeat_speed_omenu">
<widget class="GtkHScale" id="repeat_speed_scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="history">0</property>
<child internal-child="menu">
<widget class="GtkMenu" id="convertwidget10">
<property name="visible">True</property>
<child>
<widget class="GtkMenuItem" id="convertwidget11">
<property name="visible">True</property>
<property name="label" translatable="yes">Very Fast</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="convertwidget12">
<property name="visible">True</property>
<property name="label" translatable="yes">Fast</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="convertwidget13">
<property name="visible">True</property>
<property name="label" translatable="yes">Medium</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="convertwidget14">
<property name="visible">True</property>
<property name="label" translatable="yes">Slow</property>
<property name="use_underline">True</property>
</widget>
</child>
</widget>
</child>
<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">90 10 210 10 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@ -306,6 +309,54 @@
<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="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>
@ -329,7 +380,7 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">Repeat Rate</property>
<property name="label" translatable="yes">Repeat Keys</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -410,7 +461,7 @@
<widget class="GtkCheckButton" id="cursor_toggle">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Cursor _blinks in text fields</property>
<property name="label" translatable="yes">_Blinks in text boxes and fields</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@ -433,7 +484,7 @@
<child>
<widget class="GtkLabel" id="cursor_label">
<property name="visible">True</property>
<property name="label" translatable="yes">_Blink speed:</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_CENTER</property>
@ -443,30 +494,7 @@
<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="slow_label">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;i&gt;slow&lt;/i&gt;</property>
<property name="use_underline">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>
<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>
<property name="mnemonic_widget">cursor_blink_time_scale</property>
</widget>
<packing>
<property name="padding">0</property>
@ -486,10 +514,8 @@
<property name="inverted">False</property>
<property name="adjustment">1000 100 2500 200 200 0</property>
<accessibility>
<atkrelation target="slow_label" type="labelled-by"/>
<atkrelation target="set_cursor_label" type="labelled-by"/>
<atkrelation target="fast_label" type="labelled-by"/>
<atkrelation target="cursor_label" type="labelled-by"/>
<atkrelation target="fast_label" type="labelled-by"/>
</accessibility>
</widget>
<packing>
@ -502,9 +528,9 @@
<child>
<widget class="GtkLabel" id="fast_label">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;i&gt;fast&lt;/i&gt;</property>
<property name="label" translatable="yes">faster</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@ -536,30 +562,6 @@
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="set_cursor_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Set the speed the cursor blinks in text fields.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</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>
<accessibility>
<atkrelation target="cursor_blink_time_scale" type="label-for"/>
</accessibility>
</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>
@ -573,112 +575,7 @@
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="label" translatable="yes">Cursor</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="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</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="GtkHBox" id="hbox7">
<property name="border_width">8</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">8</property>
<child>
<widget class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
<property name="icon_size">6</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">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="label" translatable="yes">You can configure the keyboards accessibility features by bringing up the 'Accessibility Settings' property dialog, or pressing the button on the right.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<widget class="GtkButton" id="accessibility_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Accessibility...</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
</widget>
</child>
</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="label6">
<property name="visible">True</property>
<property name="label" translatable="yes">Accessibility</property>
<property name="label" translatable="yes">Cursor Blinks</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -790,7 +687,7 @@
<widget class="GtkCheckButton" id="volume_toggle">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Key_press makes sound</property>
<property name="label" translatable="yes">Clic_k on keypress</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@ -837,9 +734,9 @@
<child>
<widget class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;i&gt;quiet&lt;/i&gt;</property>
<property name="label" translatable="yes">quiet</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@ -876,9 +773,9 @@
<child>
<widget class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;i&gt;loud&lt;/i&gt;</property>
<property name="label" translatable="yes">loud</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@ -907,27 +804,6 @@
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="label" translatable="yes">Set the volume of the clicking sound made when pressing a key</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</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="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
@ -941,7 +817,7 @@
<child>
<widget class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="label" translatable="yes">Keyclick Volume</property>
<property name="label" translatable="yes">Keypress Click</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -1022,7 +898,7 @@
<widget class="GtkRadioButton" id="bell_disabled_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Keyboard bell _off</property>
<property name="label" translatable="yes">_Off</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@ -1040,7 +916,7 @@
<widget class="GtkRadioButton" id="bell_enabled_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Keyboard bell _enabled</property>
<property name="label" translatable="yes">Bee_p</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@ -1064,7 +940,7 @@
<widget class="GtkRadioButton" id="bell_custom_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Custom keyboard bell:</property>
<property name="label" translatable="yes">C_ustom:</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@ -1121,27 +997,6 @@
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="label" translatable="yes">The keyboard bell is the &lt;i&gt;beep&lt;/i&gt; sound heard when the system wants to get your attention.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</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="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>

2
capplets/ui-properties/behavior.desktop.in
View file

@ -1,5 +1,5 @@
[Desktop Entry]
_Name=Toolbars & Menus
_Name=Menus & Toolbars
_Comment=Customize the appearance of toolbars and menubars in applications
Exec=gnome-ui-properties
Icon=behavior-capplet.png

2
capplets/ui-properties/gnome-ui-properties.c
View file

@ -272,6 +272,7 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
g_free (toolbar_style);
gtk_window_set_resizable (GTK_WINDOW (widget), FALSE);
capplet_set_icon (widget, "behavior-capplet.png");
gtk_widget_show_all (widget);
}
@ -296,7 +297,6 @@ main (int argc, char **argv)
dialog = create_dialog ();
setup_dialog (dialog, changeset);
gtk_main ();
return 0;

14
capplets/ui-properties/gnome-ui-properties.glade
View file

@ -4,7 +4,7 @@
<glade-interface>
<widget class="GtkDialog" id="gnome_ui_properties_dialog">
<property name="title" translatable="yes">Toolbar and Menu Preferences</property>
<property name="title" translatable="yes">Menu and Toolbar Preferences</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@ -43,7 +43,9 @@
<widget class="GtkButton" id="closebutton1">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
@ -89,7 +91,7 @@
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="label" translatable="yes">_Toolbars have: </property>
<property name="label" translatable="yes">_Button Labels: </property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@ -250,7 +252,7 @@
<child>
<widget class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="label" translatable="yes">Sample Toolbar</property>
<property name="label" translatable="yes">Sample toolbar:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -269,7 +271,7 @@
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
@ -319,7 +321,7 @@
<widget class="GtkCheckButton" id="menu_icons_toggle">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Menu items can have _icons</property>
<property name="label" translatable="yes">_Show icons in menus</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">True</property>
@ -492,7 +494,7 @@
<child>
<widget class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="label" translatable="yes">Sample Menubar</property>
<property name="label" translatable="yes">Sample menubar:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>