Recapture some of the more subtle interactions of "Seth's UI". Change
2002-03-21 Seth Nickell <snickell@stanford.edu> * background-properties-capplet.c: (string_to_orientation), (update_color_widget_labels_and_visibility), (peditor_value_changed), (setup_dialog), (create_dialog): * background-properties.glade: Recapture some of the more subtle interactions of "Seth's UI". Change colour labels when the gradient orientation changes, and use mnemonics so the capplet is accessible. Pad and space as designed. There are still at least two things wrong: 1) Havoc & Jonathan convinced me that the large button with label was wrong. This should instead look like: http://beauty.stanford.edu/bg_button.png The new format should be right for all image selectors, the old mechanism had serious usability problems. 2) "No Picture" should be the first toggle
This commit is contained in:
Seth Nickell
Seth Nickell
parent
77d0b55d53
commit
c05f4f18a3
3 changed files with 92 additions and 21 deletions
|
|
@ -1,3 +1,24 @@
|
|||
2002-03-21 Seth Nickell <snickell@stanford.edu>
|
||||
|
||||
* background-properties-capplet.c: (string_to_orientation),
|
||||
(update_color_widget_labels_and_visibility),
|
||||
(peditor_value_changed), (setup_dialog), (create_dialog):
|
||||
* background-properties.glade:
|
||||
|
||||
Recapture some of the more subtle interactions of "Seth's UI".
|
||||
Change colour labels when the gradient orientation changes,
|
||||
and use mnemonics so the capplet is accessible. Pad and space
|
||||
as designed.
|
||||
|
||||
There are still at least two things wrong:
|
||||
|
||||
1) Havoc & Jonathan convinced me that the large button with
|
||||
label was wrong. This should instead look like:
|
||||
http://beauty.stanford.edu/bg_button.png
|
||||
The new format should be right for all image selectors, the
|
||||
old mechanism had serious usability problems.
|
||||
2) "No Picture" should be the first toggle
|
||||
|
||||
2002-03-19 Richard Hestilow <hestilow@ximian.com>
|
||||
|
||||
* background-properties-capplet.c:
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
*
|
||||
* Written by: Bradford Hovinen <hovinen@ximian.com>,
|
||||
* Richard Hestilow <hestilow@ximian.com>
|
||||
* Seth Nickell <snickell@stanford.edu>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -187,23 +188,67 @@ get_legacy_settings (void)
|
|||
gnome_config_pop_prefix ();
|
||||
}
|
||||
|
||||
/* Show/hide the secondary color options if needed */
|
||||
static orientation_t
|
||||
string_to_orientation (const gchar *string)
|
||||
{
|
||||
orientation_t type = ORIENTATION_SOLID;
|
||||
|
||||
if (string) {
|
||||
if (!strncmp (string, "vertical-gradient", sizeof ("vertical-gradient"))) {
|
||||
type = ORIENTATION_VERT;
|
||||
} else if (!strncmp (string, "horizontal-gradient", sizeof ("horizontal-gradient"))) {
|
||||
type = ORIENTATION_HORIZ;
|
||||
}
|
||||
}
|
||||
|
||||
return type;
|
||||
}
|
||||
|
||||
static void
|
||||
update_secondary_color_visibility (ApplierSet *set, const gchar *value_str)
|
||||
update_color_widget_labels_and_visibility (ApplierSet *set, const gchar *value_str)
|
||||
{
|
||||
gboolean enable;
|
||||
GtkWidget *color_frame;
|
||||
gboolean two_colors = TRUE;
|
||||
char *color1_string = NULL;
|
||||
char *color2_string = NULL;
|
||||
|
||||
g_return_if_fail (set != NULL);
|
||||
g_return_if_fail (value_str != NULL);
|
||||
GtkWidget *color1_label;
|
||||
GtkWidget *color2_label;
|
||||
GtkWidget *color2_box;
|
||||
|
||||
enable = strcmp (value_str, "solid");
|
||||
color_frame = g_object_get_data (G_OBJECT (set->prefs), "color2-box");
|
||||
if (enable)
|
||||
gtk_widget_show (color_frame);
|
||||
else
|
||||
gtk_widget_hide (color_frame);
|
||||
orientation_t orientation = string_to_orientation (value_str);
|
||||
|
||||
switch (orientation) {
|
||||
case ORIENTATION_SOLID: /* solid */
|
||||
color1_string = _("C_olor");
|
||||
two_colors = FALSE;
|
||||
break;
|
||||
case ORIENTATION_HORIZ: /* horiz */
|
||||
color1_string = _("_Left Color");
|
||||
color2_string = _("_Right Color");
|
||||
break;
|
||||
case ORIENTATION_VERT: /* vert */
|
||||
color1_string = _("_Top Color");
|
||||
color2_string = _("_Bottom Color");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
color1_label = g_object_get_data (G_OBJECT (set->prefs), "color1-label");
|
||||
color2_label = g_object_get_data (G_OBJECT (set->prefs), "color2-label");
|
||||
color2_box = g_object_get_data (G_OBJECT (set->prefs), "color2-box");
|
||||
|
||||
g_assert (color1_label);
|
||||
gtk_label_set_text_with_mnemonic (GTK_LABEL(color1_label), color1_string);
|
||||
|
||||
if (two_colors) {
|
||||
gtk_widget_show (color2_box);
|
||||
|
||||
g_assert (color2_label);
|
||||
gtk_label_set_text_with_mnemonic (GTK_LABEL(color2_label), color2_string);
|
||||
} else {
|
||||
gtk_widget_hide (color2_box);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -276,7 +321,7 @@ peditor_value_changed (GConfPropertyEditor *peditor, const gchar *key, const GCo
|
|||
}
|
||||
else if (!strcmp (key, BG_PREFERENCES_COLOR_SHADING_TYPE))
|
||||
{
|
||||
update_secondary_color_visibility (set, gconf_value_get_string (value));
|
||||
update_color_widget_labels_and_visibility (set, gconf_value_get_string (value));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -299,6 +344,8 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset, ApplierSet *set)
|
|||
callbacks */
|
||||
g_object_set_data (G_OBJECT (set->prefs), "color-frame", WID ("color_vbox"));
|
||||
g_object_set_data (G_OBJECT (set->prefs), "color2-box", WID ("color2_box"));
|
||||
g_object_set_data (G_OBJECT (set->prefs), "color1-label", WID("color1_label"));
|
||||
g_object_set_data (G_OBJECT (set->prefs), "color2-label", WID("color2_label"));
|
||||
|
||||
peditor = gconf_peditor_new_select_menu_with_enum
|
||||
(changeset, BG_PREFERENCES_COLOR_SHADING_TYPE, WID ("border_shading"), bg_preferences_orientation_get_type (), NULL);
|
||||
|
|
@ -329,7 +376,7 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset, ApplierSet *set)
|
|||
color_option = gconf_client_get_string (gconf_client_get_default (),
|
||||
BG_PREFERENCES_COLOR_SHADING_TYPE,
|
||||
NULL);
|
||||
update_secondary_color_visibility (set, color_option);
|
||||
update_color_widget_labels_and_visibility (set, color_option);
|
||||
g_free (color_option);
|
||||
}
|
||||
|
||||
|
|
@ -342,7 +389,7 @@ create_dialog (ApplierSet *set)
|
|||
GladeXML *dialog;
|
||||
GSList *group;
|
||||
int i;
|
||||
const gchar *labels[] = { N_("Wallpaper"), N_("Centered"), N_("Scaled"), N_("Stretched"), N_("No Picture") };
|
||||
const gchar *labels[] = { N_("_Wallpaper"), N_("C_entered"), N_("_Scaled"), N_("S_tretched"), N_("_No Picture") };
|
||||
|
||||
/* FIXME: What the hell is domain? */
|
||||
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/background-properties.glade", "prefs_widget", NULL);
|
||||
|
|
@ -358,9 +405,9 @@ create_dialog (ApplierSet *set)
|
|||
for (i = 0; group && i < n_enum_vals; i++, group = group->next)
|
||||
{
|
||||
GtkWidget *w = GTK_WIDGET (group->data);
|
||||
GtkWidget *vbox = gtk_vbox_new (FALSE, 4);
|
||||
GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
|
||||
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
|
||||
|
||||
gtk_widget_destroy (GTK_BIN (w)->child);
|
||||
gtk_container_add (GTK_CONTAINER (w), vbox);
|
||||
|
|
@ -369,7 +416,7 @@ create_dialog (ApplierSet *set)
|
|||
bg_applier_get_preview_widget (set->appliers[i]),
|
||||
TRUE, TRUE, 0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox),
|
||||
gtk_label_new (gettext (labels[i])),
|
||||
gtk_label_new_with_mnemonic (gettext (labels[i])),
|
||||
FALSE, FALSE, 0);
|
||||
gtk_widget_show_all (vbox);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Picture:</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
|
||||
<property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="background_image_button">
|
||||
|
|
@ -245,7 +245,7 @@ background picture.</property>
|
|||
<widget class="GtkOptionMenu" id="border_shading">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="history">-1</property>
|
||||
<property name="history">0</property>
|
||||
|
||||
<child internal-child="menu">
|
||||
<widget class="GtkMenu" id="convertwidget1">
|
||||
|
|
@ -255,6 +255,7 @@ background picture.</property>
|
|||
<widget class="GtkMenuItem" id="convertwidget2">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Solid color</property>
|
||||
<property name="use_underline">True</property>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
|
|
@ -262,6 +263,7 @@ background picture.</property>
|
|||
<widget class="GtkMenuItem" id="convertwidget3">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Horizontal gradient</property>
|
||||
<property name="use_underline">True</property>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
|
|
@ -269,6 +271,7 @@ background picture.</property>
|
|||
<widget class="GtkMenuItem" id="convertwidget4">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Vertical gradient</property>
|
||||
<property name="use_underline">True</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
|
|
@ -441,7 +444,7 @@ background picture.</property>
|
|||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Picture Options:</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
|
||||
<property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vbox14">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue