[gnome-media] Bug 590559 – [HIG] Massive infringements in Sound Preferences dialog
- From: Bastien Nocera <hadess src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-media] Bug 590559 – [HIG] Massive infringements in Sound Preferences dialog
- Date: Wed, 12 Aug 2009 22:34:51 +0000 (UTC)
commit 447d6c94868f7162483e80328365997ae07d1657
Author: Bastien Nocera <hadess hadess net>
Date: Wed Aug 12 23:24:35 2009 +0100
Bug 590559 â?? [HIG] Massive infringements in Sound Preferences dialog
- Add mnemonics, and mnemonic widgets
- Fix spacing and heading for the sound theme
gnome-volume-control/src/gvc-channel-bar.c | 10 +++--
gnome-volume-control/src/gvc-combo-box.c | 4 +-
gnome-volume-control/src/gvc-mixer-dialog.c | 45 ++++++++++++++++++++------
sound-theme/gvc-sound-theme-chooser.c | 22 ++++++++++---
4 files changed, 59 insertions(+), 22 deletions(-)
---
diff --git a/gnome-volume-control/src/gvc-channel-bar.c b/gnome-volume-control/src/gvc-channel-bar.c
index 9b3c131..d820703 100644
--- a/gnome-volume-control/src/gvc-channel-bar.c
+++ b/gnome-volume-control/src/gvc-channel-bar.c
@@ -198,12 +198,14 @@ update_image (GvcChannelBar *bar)
static void
update_label (GvcChannelBar *bar)
{
- gtk_label_set_text (GTK_LABEL (bar->priv->label),
- bar->priv->name);
-
if (bar->priv->name != NULL) {
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (bar->priv->label),
+ bar->priv->name);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (bar->priv->label),
+ bar->priv->scale);
gtk_widget_show (bar->priv->label);
} else {
+ gtk_label_set_text (GTK_LABEL (bar->priv->label), NULL);
gtk_widget_hide (bar->priv->label);
}
}
@@ -611,7 +613,7 @@ gvc_channel_bar_set_base_volume (GvcChannelBar *bar,
if (base_volume == 0) {
bar->priv->base_volume = ADJUSTMENT_MAX_NORMAL;
return;
- }
+ }
/* Note that you need to call _is_amplified() afterwards to update the marks */
bar->priv->base_volume = base_volume;
diff --git a/gnome-volume-control/src/gvc-combo-box.c b/gnome-volume-control/src/gvc-combo-box.c
index eb33706..6bfad69 100644
--- a/gnome-volume-control/src/gvc-combo-box.c
+++ b/gnome-volume-control/src/gvc-combo-box.c
@@ -104,7 +104,7 @@ gvc_combo_box_set_property (GObject *object,
switch (prop_id) {
case PROP_LABEL:
- gtk_label_set_text (GTK_LABEL (self->priv->label), g_value_get_string (value));
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (self->priv->label), g_value_get_string (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -145,7 +145,7 @@ gvc_combo_box_class_init (GvcComboBoxClass *klass)
g_param_spec_string ("label",
"label",
"The combo box labale",
- _("Profile:"),
+ _("_Profile:"),
G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
signals [CHANGED] =
g_signal_new ("changed",
diff --git a/gnome-volume-control/src/gvc-mixer-dialog.c b/gnome-volume-control/src/gvc-mixer-dialog.c
index 8e5cbc7..32399f6 100644
--- a/gnome-volume-control/src/gvc-mixer-dialog.c
+++ b/gnome-volume-control/src/gvc-mixer-dialog.c
@@ -265,7 +265,7 @@ update_output_settings (GvcMixerDialog *dialog)
GvcMixerStreamPort *port;
port = gvc_mixer_stream_get_port (stream);
- dialog->priv->output_port_combo = gvc_combo_box_new (_("Connector:"));
+ dialog->priv->output_port_combo = gvc_combo_box_new (_("Co_nnector:"));
gvc_combo_box_set_ports (GVC_COMBO_BOX (dialog->priv->output_port_combo),
ports);
gvc_combo_box_set_active (GVC_COMBO_BOX (dialog->priv->output_port_combo), port->port);
@@ -864,7 +864,7 @@ add_stream (GvcMixerDialog *dialog,
GvcMixerStreamPort *port;
port = gvc_mixer_stream_get_port (stream);
- dialog->priv->input_port_combo = gvc_combo_box_new (_("Connector:"));
+ dialog->priv->input_port_combo = gvc_combo_box_new (_("Co_nnector:"));
gvc_combo_box_set_ports (GVC_COMBO_BOX (dialog->priv->input_port_combo),
ports);
gvc_combo_box_set_active (GVC_COMBO_BOX (dialog->priv->input_port_combo), port->port);
@@ -888,9 +888,23 @@ add_stream (GvcMixerDialog *dialog,
&& !gvc_mixer_stream_is_virtual (stream)
&& g_strcmp0 (id, "org.gnome.VolumeControl") != 0
&& g_strcmp0 (id, "org.PulseAudio.pavucontrol") != 0) {
+ const char *name;
+
bar = create_bar (dialog, dialog->priv->apps_size_group, FALSE);
- gvc_channel_bar_set_name (GVC_CHANNEL_BAR (bar),
- gvc_mixer_stream_get_name (stream));
+
+ name = gvc_mixer_stream_get_name (stream);
+ if (name == NULL || strchr (name, '_') == NULL) {
+ gvc_channel_bar_set_name (GVC_CHANNEL_BAR (bar), name);
+ } else {
+ char **tokens, *escaped;
+
+ tokens = g_strsplit (name, "_", -1);
+ escaped = g_strjoinv ("__", tokens);
+ g_strfreev (tokens);
+ gvc_channel_bar_set_name (GVC_CHANNEL_BAR (bar), escaped);
+ g_free (escaped);
+ }
+
gvc_channel_bar_set_icon_name (GVC_CHANNEL_BAR (bar),
gvc_mixer_stream_get_icon_name (stream));
@@ -1360,7 +1374,7 @@ on_card_selection_changed (GtkTreeSelection *selection,
current_profile = gvc_mixer_card_get_profile (card);
profiles = gvc_mixer_card_get_profiles (card);
- dialog->priv->hw_profile_combo = gvc_combo_box_new (_("Profile:"));
+ dialog->priv->hw_profile_combo = gvc_combo_box_new (_("_Profile:"));
gvc_combo_box_set_profiles (GVC_COMBO_BOX (dialog->priv->hw_profile_combo), profiles);
gvc_combo_box_set_active (GVC_COMBO_BOX (dialog->priv->hw_profile_combo), current_profile->profile);
@@ -1512,7 +1526,7 @@ gvc_mixer_dialog_constructor (GType type,
FALSE, FALSE, 12);
self->priv->output_bar = create_bar (self, self->priv->size_group, TRUE);
gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->output_bar),
- _("Output Volume: "));
+ _("_Output volume: "));
gtk_widget_set_sensitive (self->priv->output_bar, FALSE);
gtk_box_pack_start (GTK_BOX (self->priv->output_stream_box),
self->priv->output_bar, TRUE, TRUE, 12);
@@ -1549,7 +1563,7 @@ gvc_mixer_dialog_constructor (GType type,
self->priv->effects_bar = create_bar (self, self->priv->size_group, TRUE);
gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->effects_bar),
- _("Alert Volume: "));
+ _("_Alert volume: "));
gtk_widget_set_sensitive (self->priv->effects_bar, FALSE);
gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box),
self->priv->effects_bar, FALSE, FALSE, 12);
@@ -1567,9 +1581,10 @@ gvc_mixer_dialog_constructor (GType type,
self->priv->hw_box,
label);
- box = gtk_frame_new (_("Choose a device to configure"));
+ box = gtk_frame_new (_("C_hoose a device to configure:"));
label = gtk_frame_get_label_widget (GTK_FRAME (box));
_gtk_label_make_bold (GTK_LABEL (label));
+ gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_NONE);
gtk_box_pack_start (GTK_BOX (self->priv->hw_box), box, TRUE, TRUE, 0);
@@ -1579,6 +1594,8 @@ gvc_mixer_dialog_constructor (GType type,
self->priv->hw_treeview = create_cards_treeview (self,
G_CALLBACK (on_card_selection_changed));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), self->priv->hw_treeview);
+
box = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box),
GTK_POLICY_NEVER,
@@ -1609,7 +1626,7 @@ gvc_mixer_dialog_constructor (GType type,
self->priv->input_bar = create_bar (self, self->priv->size_group, TRUE);
gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->input_bar),
- _("Input Volume: "));
+ _("_Input volume: "));
gvc_channel_bar_set_low_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar),
"audio-input-microphone-low");
gvc_channel_bar_set_high_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar),
@@ -1656,9 +1673,10 @@ gvc_mixer_dialog_constructor (GType type,
self->priv->input_settings_box,
FALSE, FALSE, 0);
- box = gtk_frame_new (_("Choose a device for sound input"));
+ box = gtk_frame_new (_("C_hoose a device for sound input:"));
label = gtk_frame_get_label_widget (GTK_FRAME (box));
_gtk_label_make_bold (GTK_LABEL (label));
+ gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_NONE);
gtk_box_pack_start (GTK_BOX (self->priv->input_box), box, TRUE, TRUE, 0);
@@ -1668,6 +1686,8 @@ gvc_mixer_dialog_constructor (GType type,
self->priv->input_treeview = create_stream_treeview (self,
G_CALLBACK (on_input_radio_toggled));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), self->priv->input_treeview);
+
box = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box),
GTK_POLICY_NEVER,
@@ -1688,9 +1708,10 @@ gvc_mixer_dialog_constructor (GType type,
self->priv->output_box,
label);
- box = gtk_frame_new (_("Choose a device for sound output"));
+ box = gtk_frame_new (_("C_hoose a device for sound output:"));
label = gtk_frame_get_label_widget (GTK_FRAME (box));
_gtk_label_make_bold (GTK_LABEL (label));
+ gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_NONE);
gtk_box_pack_start (GTK_BOX (self->priv->output_box), box, TRUE, TRUE, 0);
@@ -1700,6 +1721,8 @@ gvc_mixer_dialog_constructor (GType type,
self->priv->output_treeview = create_stream_treeview (self,
G_CALLBACK (on_output_radio_toggled));
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), self->priv->output_treeview);
+
box = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box),
GTK_POLICY_NEVER,
diff --git a/sound-theme/gvc-sound-theme-chooser.c b/sound-theme/gvc-sound-theme-chooser.c
index dfd9513..ff23638 100644
--- a/sound-theme/gvc-sound-theme-chooser.c
+++ b/sound-theme/gvc-sound-theme-chooser.c
@@ -1072,7 +1072,9 @@ gvc_sound_theme_chooser_init (GvcSoundThemeChooser *chooser)
GtkWidget *box;
GtkWidget *label;
GtkWidget *scrolled_window;
+ GtkWidget *alignment;
GConfClient *client;
+ char *str;
chooser->priv = GVC_SOUND_THEME_CHOOSER_GET_PRIVATE (chooser);
@@ -1080,20 +1082,30 @@ gvc_sound_theme_chooser_init (GvcSoundThemeChooser *chooser)
gtk_box_pack_start (GTK_BOX (chooser),
chooser->priv->theme_box, FALSE, FALSE, 0);
- label = gtk_label_new (_("Sound Theme:"));
+ label = gtk_label_new_with_mnemonic (_("Sound _theme:"));
gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), label, FALSE, FALSE, 6);
chooser->priv->combo_box = gtk_combo_box_new ();
gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), chooser->priv->combo_box, FALSE, FALSE, 0);
-
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser->priv->combo_box);
client = gconf_client_get_default ();
- chooser->priv->selection_box = box = gtk_frame_new (_("Choose an alert sound:"));
+ str = g_strdup_printf ("<b>%s</b>", _("C_hoose an alert sound:"));
+ chooser->priv->selection_box = box = gtk_frame_new (str);
+ g_free (str);
+ label = gtk_frame_get_label_widget (GTK_FRAME (box));
+ gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_NONE);
gtk_box_pack_start (GTK_BOX (chooser), box, TRUE, TRUE, 6);
+ alignment = gtk_alignment_new (0, 0, 1, 1);
+ gtk_container_add (GTK_CONTAINER (box), alignment);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 0, 0);
+
chooser->priv->treeview = create_alert_treeview (chooser);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser->priv->treeview);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
setup_list_size_constraint (scrolled_window, chooser->priv->treeview);
@@ -1104,9 +1116,9 @@ gvc_sound_theme_chooser_init (GvcSoundThemeChooser *chooser)
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_SHADOW_IN);
gtk_container_add (GTK_CONTAINER (scrolled_window), chooser->priv->treeview);
- gtk_container_add (GTK_CONTAINER (box), scrolled_window);
+ gtk_container_add (GTK_CONTAINER (alignment), scrolled_window);
- chooser->priv->click_feedback_button = gtk_check_button_new_with_mnemonic (_("Enable window and button sounds"));
+ chooser->priv->click_feedback_button = gtk_check_button_new_with_mnemonic (_("Enable _window and button sounds"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chooser->priv->click_feedback_button),
gconf_client_get_bool (client, INPUT_SOUNDS_KEY, NULL));
gtk_box_pack_start (GTK_BOX (chooser),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
