From 3247ef3194a233acdf5b2499c5ebe7fc7d4c45fe Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 21 Jun 2006 13:20:07 +0000 Subject: update the pref dialog a little to match the UIs of paman, pavucontrol, pavumeter git-svn-id: file:///home/lennart/svn/public/padevchooser/trunk@10 e4aeda27-4315-0410-ac56-b21855d76123 --- src/padevchooser.c | 7 +- src/padevchooser.glade | 423 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 281 insertions(+), 149 deletions(-) diff --git a/src/padevchooser.c b/src/padevchooser.c index df879f6..5b10c06 100644 --- a/src/padevchooser.c +++ b/src/padevchooser.c @@ -339,8 +339,13 @@ static void start_vumeter_record_cb(void) { } static void show_preferences(void) { - GtkWidget *w; + GtkWidget *w, *eb; + GdkColor white; + eb = glade_xml_get_widget(glade_xml, "titleEventBox"); + gdk_color_white(gtk_widget_get_colormap(eb), &white); + gtk_widget_modify_bg(eb, GTK_STATE_NORMAL, &white); + w = glade_xml_get_widget(glade_xml, "preferencesDialog"); gtk_widget_show_all(w); gtk_window_present(GTK_WINDOW(w)); diff --git a/src/padevchooser.glade b/src/padevchooser.glade index 88d4e24..52872de 100644 --- a/src/padevchooser.glade +++ b/src/padevchooser.glade @@ -4,7 +4,6 @@ - 6 PulseAudio Applet Preferences GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -34,6 +33,7 @@ + 6 True True True @@ -54,216 +54,343 @@ - + True False 0 - - 6 + True - 0 - 0.5 - GTK_SHADOW_NONE + True + False - + + 12 True - 0.5 - 0.5 - 1 - 1 - 6 - 0 - 12 - 0 + False + 12 - + True - True - 6 - - - - True - True - Show notifications for discovered _servers - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - + 6 + audio-card + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - True - True - Show notifications for discovered s_inks - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - + + + True + False + 0 - + True - True - Show notifications for discovered s_ources - True - GTK_RELIEF_NORMAL - True - False - False - True + <span size="18000" color="black"><b>PulseAudio Device Chooser</b></span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 1 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 - False - False + True + True - + True - True - Do_n't show notifications on startup - True - GTK_RELIEF_NORMAL - True - False - False - True + Quick access to the PulseAudio sound server + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 - False - False + True + True + + 0 + True + True + + + + 0 + False + False + + - - - True - <b>Notifications</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - + + + True 0 - True - True + False + False - + 6 True - 0 - 0.5 - GTK_SHADOW_NONE + False + 0 - + + 6 True - 0.5 - 0.5 - 1 - 1 - 6 - 0 - 12 - 0 + 0 + 0.5 + GTK_SHADOW_NONE - + True - True - 6 + 0.5 + 0.5 + 1 + 1 + 6 + 0 + 12 + 0 - + True - True - Start applet on session _login - True - GTK_RELIEF_NORMAL - True - False - False - True + True + 6 + + + + True + True + Show notifications for discovered _servers + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Show notifications for discovered s_inks + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Show notifications for discovered s_ources + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Do_n't show notifications during startup + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + - - 0 - False - False - + + + + True + <b>Notifications</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + 0 + False + False + - + + 6 True - <b>Startup</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 6 + 0 + 12 + 0 + + + + True + True + 6 + + + + True + True + Start applet on session _login + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + + + + True + <b>Startup</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + - label_item + 0 + False + False -- cgit