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

Fixes for ui-review bug report #98916 and duplicate mnemonic fixes.

Browse source 
2003-07-17  Dennis Cranston <dennis_cranston at yahoo com>

	* background-properties.glade,
	  background-properties-capplet.c:  Fixes for ui-review
	  bug report #98916 and duplicate mnemonic fixes.
This commit is contained in:
Dennis Cranston 2003-07-17 23:38:55 +00:00 • committed by Dennis Cranston
parent a2291c375c
commit 005dc9fff2
3 changed files with 221 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/background/ChangeLog
View file

@ -1,3 +1,9 @@
2003-07-17 Dennis Cranston <dennis_cranston at yahoo com>
* background-properties.glade,
background-properties-capplet.c: Fixes for ui-review
bug report #98916 and duplicate mnemonic fixes.
2003-07-07 Jody Goldberg <jody@gnome.org>
* Release 2.3.4

23
capplets/background/background-properties-capplet.c
View file

@ -225,16 +225,16 @@ update_color_widget_labels_and_visibility (ApplierSet *set, const gchar *value_s
switch (orientation) {
case ORIENTATION_SOLID: /* solid */
color1_string = _("C_olor:");
color1_string = _("Co_lor:");
two_colors = FALSE;
break;
case ORIENTATION_HORIZ: /* horiz */
color1_string = _("_Left Color:");
color2_string = _("_Right Color:");
color1_string = _("_Left color:");
color2_string = _("_Right color:");
break;
case ORIENTATION_VERT: /* vert */
color1_string = _("_Top Color:");
color2_string = _("_Bottom Color:");
color1_string = _("Top co_lor:");
color2_string = _("_Bottom color:");
break;
default:
break;
@ -395,8 +395,7 @@ create_dialog (ApplierSet *set)
GladeXML *dialog;
GSList *group;
int i;
const gchar *labels[] = { N_("_Wallpaper"), N_("C_entered"), N_("_Scaled"), N_("Stretc_hed"), N_("_No Picture") };
GtkWidget *label;
const gchar *labels[] = { N_("_Tile"), N_("C_enter"), N_("Sc_ale"), N_("_Stretch"), N_("_No Picture") };
/* FIXME: What the hell is domain? */
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/background-properties.glade", "prefs_widget", NULL);
@ -430,13 +429,6 @@ create_dialog (ApplierSet *set)
g_slist_free (group);
label = gtk_label_new_with_mnemonic (_("Select _picture:"));
gtk_frame_set_label_widget (GTK_FRAME (WID ("picture_frame")),
label);
gtk_label_set_mnemonic_widget (GTK_LABEL (label),
WID ("background_image_button"));
gtk_widget_show (label);
gtk_label_set_mnemonic_widget (GTK_LABEL (WID ("border_shading_label")),
WID ("border_shading"));
gtk_label_set_mnemonic_widget (GTK_LABEL (WID ("color1_label")),
@ -596,6 +588,9 @@ main (int argc, char **argv)
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog_win),
GTK_RESPONSE_CLOSE);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog_win), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (dialog_win), 5);
gtk_window_set_resizable (GTK_WINDOW (dialog_win), FALSE);
g_signal_connect (G_OBJECT (dialog_win),
"response",

217
capplets/background/background-properties.glade
View file

@ -9,7 +9,7 @@
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="resizable">False</property>
<property name="destroy_with_parent">False</property>
<child>
@ -20,19 +20,17 @@
<property name="show_border">True</property>
<property name="tab_pos">GTK_POS_TOP</property>
<property name="scrollable">False</property>
<property name="tab_hborder">2</property>
<property name="tab_vborder">2</property>
<property name="enable_popup">False</property>
<child>
<widget class="GtkVBox" id="prefs_widget">
<property name="border_width">8</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<property name="spacing">18</property>
<child>
<widget class="GtkVBox" id="vbox9">
<property name="border_width">10</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
@ -44,10 +42,32 @@
<property name="spacing">15</property>
<child>
<widget class="GtkFrame" id="picture_frame">
<widget class="GtkVBox" id="vbox26">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="label42">
<property name="visible">True</property>
<property name="label" translatable="yes">Select _picture:</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</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">background_image_button</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="background_image_button">
@ -55,15 +75,12 @@
<property name="tooltip" translatable="yes">To set the background picture, drop an image or click to browse.</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">Background Preview</atkproperty>
</accessibility>
<child>
<widget class="GtkVBox" id="vbox21">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<property name="spacing">6</property>
<child>
<widget class="GtkImage" id="background_image_preview">
@ -72,10 +89,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">Preview</atkproperty>
<atkproperty name="AtkObject::accessible_description" translatable="yes">A preview of the background picture.</atkproperty>
</accessibility>
</widget>
<packing>
<property name="padding">0</property>
@ -97,9 +110,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<accessibility>
<atkproperty name="AtkObject::accessible_description" translatable="yes">The background picture's file name.</atkproperty>
</accessibility>
</widget>
<packing>
<property name="padding">0</property>
@ -110,6 +120,11 @@
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
@ -172,13 +187,11 @@
<child>
<widget class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="label" translatable="yes">You can drag image files
into the window to set the
background picture.</property>
<property name="label" translatable="yes">You can drag image files into the window to set the background picture.</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="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@ -194,8 +207,8 @@ background picture.</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
@ -222,8 +235,8 @@ background picture.</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
@ -243,15 +256,14 @@ background picture.</property>
<child>
<widget class="GtkVBox" id="color_vbox">
<property name="border_width">10</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="border_shading_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Background _Style:</property>
<property name="label" translatable="yes">Bac_kground style:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@ -261,6 +273,7 @@ background picture.</property>
<property name="yalign">0.5</property>
<property name="xpad">3</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">border_shading</property>
</widget>
<packing>
<property name="padding">0</property>
@ -362,7 +375,7 @@ background picture.</property>
<widget class="GtkHBox" id="color1_box">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">3</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="color1_label">
@ -402,8 +415,8 @@ background picture.</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
@ -411,7 +424,7 @@ background picture.</property>
<widget class="GtkHBox" id="color2_box">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">3</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="color2_label">
@ -452,7 +465,7 @@ background picture.</property>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
@ -465,44 +478,64 @@ background picture.</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame5">
<property name="border_width">10</property>
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkVBox" id="vbox14">
<widget class="GtkVBox" id="vbox24">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<property name="spacing">0</property>
<child>
<widget class="GtkVBox" id="vbox25">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="label41">
<property name="visible">True</property>
<property name="label" translatable="yes">Picture _options:</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</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">radiobutton1</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox16">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<property name="spacing">5</property>
<property name="spacing">6</property>
<child>
<widget class="GtkRadioButton" id="radiobutton1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="no">radiobutton1</property>
<property name="label" translatable="yes">radiobutton1</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@ -511,8 +544,8 @@ background picture.</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
@ -520,7 +553,7 @@ background picture.</property>
<widget class="GtkRadioButton" id="radiobutton2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="no">radiobutton2</property>
<property name="label" translatable="yes">radiobutton2</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@ -530,8 +563,8 @@ background picture.</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
@ -539,7 +572,7 @@ background picture.</property>
<widget class="GtkRadioButton" id="radiobutton3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="no">radiobutton3</property>
<property name="label" translatable="yes">radiobutton3</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@ -549,8 +582,8 @@ background picture.</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
@ -558,7 +591,7 @@ background picture.</property>
<widget class="GtkRadioButton" id="radiobutton4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="no">radiobutton4</property>
<property name="label" translatable="yes">radiobutton4</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@ -568,8 +601,8 @@ background picture.</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
@ -577,7 +610,7 @@ background picture.</property>
<widget class="GtkRadioButton" id="radiobutton5">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="no">radiobutton5</property>
<property name="label" translatable="yes">radiobutton5</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@ -585,45 +618,31 @@ background picture.</property>
<property name="draw_indicator">False</property>
<property name="group">radiobutton1</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>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</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>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label41">
<property name="visible">True</property>
<property name="label" translatable="yes">Picture Options:</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>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
@ -637,7 +656,7 @@ background picture.</property>
<child>
<widget class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="label" translatable="no">E-Mail</property>
<property name="label" translatable="yes">E-Mail</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>