From 716c68998f9f0465dc8b2b0dc03adc6c9b5e16e2 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Fri, 29 Jan 2010 21:43:54 +0100 Subject: convert preferences window from GtkWindow to GtkDialog --- plugins/gtkui/callbacks.c | 13 +- plugins/gtkui/deadbeef.glade | 3121 ++++++++++++++++++++---------------------- plugins/gtkui/gtkui.c | 2 +- plugins/gtkui/gtkui.h | 3 + plugins/gtkui/interface.c | 1573 +++++++++++---------- plugins/gtkui/interface.h | 2 +- 6 files changed, 2295 insertions(+), 2419 deletions(-) (limited to 'plugins') diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index 48fe25c3..33134c4d 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -1512,12 +1512,11 @@ on_plugin_active_toggled (GtkCellRendererToggle *cell_renderer, gchar *path, Gtk void preferences_fill_soundcards (void) { - GtkWidget *w = prefwin; if (!prefwin) { return; } const char *s = deadbeef->conf_get_str ("alsa_soundcard", "default"); - GtkComboBox *combobox = GTK_COMBO_BOX (lookup_widget (w, "pref_soundcard")); + GtkComboBox *combobox = GTK_COMBO_BOX (lookup_widget (prefwin, "pref_soundcard")); GtkTreeModel *mdl = gtk_combo_box_get_model (combobox); gtk_list_store_clear (GTK_LIST_STORE (mdl)); @@ -1540,10 +1539,13 @@ void on_preferences_activate (GtkMenuItem *menuitem, gpointer user_data) { + if (prefwin) { + return; + } GtkWidget *w = prefwin = create_prefwin (); gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (mainwin)); - GtkComboBox *combobox = NULL;; + GtkComboBox *combobox = NULL; // output plugin selection const char *outplugname = deadbeef->conf_get_str ("output_plugin", "ALSA output plugin"); @@ -1644,8 +1646,11 @@ on_preferences_activate (GtkMenuItem *menuitem, #endif gtk_tree_view_set_model (tree, GTK_TREE_MODEL (store)); - gtk_widget_show (w); gtk_widget_set_sensitive (lookup_widget (prefwin, "configure_plugin"), FALSE); +// gtk_widget_show (w); + gtk_dialog_run (GTK_DIALOG (prefwin)); + gtk_widget_destroy (prefwin); + prefwin = NULL; } diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade index ac8680a1..239398b9 100644 --- a/plugins/gtkui/deadbeef.glade +++ b/plugins/gtkui/deadbeef.glade @@ -1435,17 +1435,45 @@ - + + + + + True + Add column + True + + + + + + + True + Edit column + True + + + + + + + True + Remove column + True + + + + + + 12 - 642 - 372 True - Preferences + Add Location GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True True - False + True True True True @@ -1453,144 +1481,45 @@ GDK_GRAVITY_NORTH_WEST True False - - + - + True False 8 - + + 346 True True - True - True - GTK_POS_TOP - False - False - - - - 12 - True - False - 8 - - - - True - False - 8 - - - - True - Output plugin: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - True - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 8 - - - - True - Output device: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + True + True + 0 + + True + • + False + + + + 0 + False + False + + - - - True - False - True - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - + + + True + False + 0 - + True - Sound + False False GTK_JUSTIFY_LEFT @@ -1606,186 +1535,80 @@ 0 - tab + 0 + True + False - - 12 + + 83 True - False - 8 + OK + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + 2 + False + True + + + + + - - - True - True - Allow dynamic samplerate switching - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - + + True + Track Properties + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + True + True + True + True + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + - - - True - False - 8 - - - - True - Samplerate conversion quality: - False - False - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - sinc_best_quality -sinc_medium_quality -sinc_fastest -sinc_zero_order_hold -linear - False - True - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 8 - - - - True - Replaygain mode: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 337 - True - Disable -Track -Album - False - True - - - - 0 - True - True - - - - - 0 - False - False - - + + + 12 + True + False + 8 - - - True - True - Replaygain peak scale - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - False - True - - + + + True + False + 8 - + True - Sound (adv.) + Location: False False GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 @@ -1795,53 +1618,54 @@ Album 0 - tab + 0 + False + False - - 12 + True - False - 8 - - - - True - True - Close minimizes to tray - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - + True + False + True + 0 + + True + • + False - False - True + 0 + True + True + + + 0 + False + False + + + + + + True + False + 8 - + True - GUI + Title: False False GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 @@ -1851,227 +1675,111 @@ Album 0 - tab + 0 + False + False - - 12 + True - False - 8 + True + False + True + 0 + + True + • + False + + + 0 + True + True + + + + + 0 + False + False + + - - - True - True - Enable proxy server - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - False - 8 - - - - True - Proxy server address: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - • - False - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 8 - - - - True - Proxy server port: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - • - False - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 8 + + + True + False + 8 - - - True - Proxy type: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + True + Artist: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - - True - HTTP -HTTP_1_0 -SOCKS4 -SOCKS5 -SOCKS4A -SOCKS5_HOSTNAME - False - True - - - - 0 - True - True - - - - - 0 - False - False - - + + + True + True + False + True + 0 + + True + • + False - False - True + 0 + True + True + + + 0 + False + False + + + + + + True + False + 8 - + True - Network + Album: False False GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 @@ -2081,645 +1789,48 @@ SOCKS5_HOSTNAME 0 - tab + 0 + False + False - - 12 + True True - 0 - - - - 3 - 280 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - True - False - True - False - False - False - - - - - - False - False - - - - - - 12 - True - False - 8 - - - - True - False - 8 - - - - True - Description: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - False - True - 0 - - True - ● - False - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 8 - - - - True - Author(s): - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - False - True - 0 - - True - ● - False - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 8 - - - - True - Email: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - False - True - 0 - - True - ● - False - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 8 - - - - True - Website: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - False - True - 0 - - True - ● - False - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 0 - - - - True - True - Configure - True - GTK_RELIEF_NORMAL - True - - - - 0 - True - False - - - - - 0 - False - False - - - - - True - True - - - - - False - True - - - - - - True - Plugins - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - 76 - True - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-close - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Close - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - 0 - False - True - - - - - - - - - - - True - Add column - True - - - - - - - True - Edit column - True - - - - - - - True - Remove column - True - - - - - - - 12 - True - Add Location - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - True - True - True - True - True - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - True - False - 8 - - - - 346 - True - True - True - True - 0 - - True - • - False - - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + False + True + 0 + + True + • + False 0 True - False - - - - - - 83 - True - OK - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False + True - 2 + 0 False - True + False - - - - - - True - Track Properties - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - True - True - True - True - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - - 12 - True - False - 8 - + True False 8 - + True - Location: + Genre: False False GTK_JUSTIFY_LEFT @@ -2742,7 +1853,7 @@ SOCKS5_HOSTNAME - + True True False @@ -2768,18 +1879,49 @@ SOCKS5_HOSTNAME - + True + 2 + 2 False - 8 + 8 + 8 - + True - Title: + Year: False False GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Track: + False + True + GTK_JUSTIFY_LEFT False False 0 @@ -2792,14 +1934,17 @@ SOCKS5_HOSTNAME 0 - 0 - False - False + 1 + 2 + 0 + 1 + fill + - + True True False @@ -2811,9 +1956,32 @@ SOCKS5_HOSTNAME False - 0 - True - True + 0 + 1 + 1 + 2 + + + + + + + True + True + False + True + 0 + + True + • + False + + + 1 + 2 + 1 + 2 + @@ -2825,15 +1993,15 @@ SOCKS5_HOSTNAME - + True False 8 - + True - Artist: + Comment: False False GTK_JUSTIFY_LEFT @@ -2856,16 +2024,33 @@ SOCKS5_HOSTNAME - + True True - False - True - 0 - - True - • - False + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 + + + 0 @@ -2876,91 +2061,132 @@ SOCKS5_HOSTNAME 0 - False - False + True + True + + + - - + + 12 + True + dialog1 + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + True + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + True + + + + True + False + 0 + + + True - False - 8 + GTK_BUTTONBOX_END - + True - Album: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + True + True + _Cancel + True + GTK_RELIEF_NORMAL + True + -6 - - 0 - False - False - - + True + True True - False - True - 0 - - True - • - False + _OK + True + GTK_RELIEF_NORMAL + True + -5 - - 0 - True - True - 0 False - False + True + GTK_PACK_END - + True False 8 - + True - Genre: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + False + 8 + + + + True + Title: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + Enter new column title here + True + ● + True + + + 0 + True + True + + 0 @@ -2970,78 +2196,191 @@ SOCKS5_HOSTNAME - + True - True - False - True - 0 - - True - • - False + False + 8 + + + + True + Type: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + File number +Playing +Artist - Album +Artist +Album +Title +Length +Track +Custom + False + True + + + + 0 + True + True + + 0 - True - True + False + False - - - 0 - False - False - - - - - True - 2 - 2 - False - 8 - 8 + + + True + False + 8 + + + + True + Format: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + ● + True + + + 0 + True + True + + + + + 0 + False + False + + - + True - Year: - False - False - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + False + 8 + + + + True + Alignment: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + Left +Right + False + True + + + 0 + True + True + + - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - Track: + True + Format conversions (start with %): + [a]rtist, [t]itle, al[b]um, track[n]umber, + [l]ength, [y]ear, [g]enre, [c]omment, + copy[r]ight, [f]ilename +Example: %a - %t [%l] False True GTK_JUSTIFY_LEFT False - False - 0 + True + 0.10000000149 0.5 0 0 @@ -3051,80 +2390,211 @@ SOCKS5_HOSTNAME 0 - 1 - 2 - 0 - 1 - fill - + 0 + True + True + + + 0 + True + True + + + + + - - - True - True - False - True - 0 - - True - • - False - - - 0 - 1 - 1 - 2 - - - + + 12 + 630 + 400 + True + Preferences + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 630 + 400 + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + True + + + + True + False + 8 + + + + True + GTK_BUTTONBOX_END - + True + True True - False - True - 0 - - True - • - False + gtk-close + True + GTK_RELIEF_NORMAL + True + -7 - - 1 - 2 - 1 - 2 - - 0 False - False + True + GTK_PACK_END - + True - False - 8 + True + True + True + GTK_POS_TOP + False + False + + + + 12 + True + False + 8 + + + + True + False + 8 + + + + True + Output plugin: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + True + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 8 + + + + True + Output device: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + True + + + 0 + True + True + + + + + 0 + False + False + + + + + False + True + + - + True - Comment: + Sound False False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 @@ -3134,150 +2604,448 @@ SOCKS5_HOSTNAME 0 - 0 - False - False + tab - + + 12 True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + False + 8 - + True True - False - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - + Allow dynamic samplerate switching + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + True + False + 8 + + + + True + Samplerate conversion quality: + False + False + GTK_JUSTIFY_RIGHT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + sinc_best_quality +sinc_medium_quality +sinc_fastest +sinc_zero_order_hold +linear + False + True + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 8 + + + + True + Replaygain mode: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + 337 + True + Disable +Track +Album + False + True + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + True + Replaygain peak scale + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + - 0 - True - True + False + True - - - 0 - True - True - - - - - - - - 12 - True - dialog1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - + True - True - True - _Cancel - True - GTK_RELIEF_NORMAL - True - -6 + Sound (adv.) + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + 12 + True + False + 8 + + + + True + True + Close minimizes to tray + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + False + True + - + True - True - True - _OK - True - GTK_RELIEF_NORMAL - True - -5 + GUI + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + tab + - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 8 - + + 12 True False 8 - + True - Title: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + True + Enable proxy server + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + True + False + 8 + + + + True + Proxy server address: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + • + False + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 8 + + + + True + Proxy server port: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + • + False + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 8 + + + + True + Proxy type: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + HTTP +HTTP_1_0 +SOCKS4 +SOCKS5 +SOCKS4A +SOCKS5_HOSTNAME + False + True + + + + 0 + True + True + + 0 @@ -3285,219 +3053,362 @@ SOCKS5_HOSTNAME False + + + False + True + + - - - True - True - True - True - 0 - Enter new column title here - True - ● - True - - - 0 - True - True - - + + + True + Network + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 - False - False + tab - + + 12 True - False - 8 + True + 0 - + + 3 + 280 True - Type: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + True + False + True + False + False + False + + + - 0 - False - False + False + False - + + 12 True - File number -Playing -Artist - Album -Artist -Album -Title -Length -Track -Custom - False - True - - - - 0 - True - True - - - - - 0 - False - False - - + False + 8 + + + + True + False + 8 + + + + True + Description: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + False + True + 0 + + True + ● + False + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 8 + + + + True + Author(s): + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + False + True + 0 + + True + ● + False + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 8 - - - True - False - 8 + + + True + Email: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - - True - Format: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + True + True + False + True + 0 + + True + ● + False + + + 0 + True + True + + + + + 0 + False + False + + - - - True - True - True - True - 0 - - True - ● - True - - - 0 - True - True - - - - - 0 - False - False - - + + + True + False + 8 - - - True - False - 8 + + + True + Website: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - - True - Alignment: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + + + True + True + False + True + 0 + + True + ● + False + + + 0 + True + True + + + + + 0 + False + False + + - - - True - Left -Right - False - True + + + True + False + 0 + + + + True + True + Configure + True + GTK_RELIEF_NORMAL + True + + + + 0 + True + False + + + + + 0 + False + False + + - 0 - True - True + True + True - 0 - False - False + False + True - + True - True - Format conversions (start with %): - [a]rtist, [t]itle, al[b]um, track[n]umber, - [l]ength, [y]ear, [g]enre, [c]omment, - copy[r]ight, [f]ilename -Example: %a - %t [%l] + Plugins False - True + False GTK_JUSTIFY_LEFT False - True - 0.10000000149 + False + 0.5 0.5 0 0 @@ -3507,9 +3418,7 @@ Example: %a - %t [%l] 0 - 0 - True - True + tab diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index 73ca9670..c4aacb95 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -21,6 +21,7 @@ #include #include #include +#include "gtkui.h" #include "gtkplaylist.h" #include "search.h" #include "progress.h" @@ -345,7 +346,6 @@ gtkui_on_configchanged (DB_event_t *ev, uintptr_t data) { static gboolean outputchanged_cb (gpointer nothing) { - void preferences_fill_soundcards (void); preferences_fill_soundcards (); return FALSE; } diff --git a/plugins/gtkui/gtkui.h b/plugins/gtkui/gtkui.h index 7737c253..fd8e1166 100644 --- a/plugins/gtkui/gtkui.h +++ b/plugins/gtkui/gtkui.h @@ -42,4 +42,7 @@ gtkui_receive_fm_drop (char *mem, int length, int drop_y); void plugin_configure (GtkWidget *parentwin, DB_plugin_t *p); +void +preferences_fill_soundcards (void); + #endif diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c index 9caeaac0..797186a7 100644 --- a/plugins/gtkui/interface.c +++ b/plugins/gtkui/interface.c @@ -1258,950 +1258,909 @@ create_helpwindow (void) } GtkWidget* -create_prefwin (void) +create_headermenu (void) { - GtkWidget *prefwin; - GtkWidget *pref_vbox; - GtkWidget *notebook2; - GtkWidget *vbox10; - GtkWidget *hbox11; - GtkWidget *label23; - GtkWidget *pref_output_plugin; - GtkWidget *hbox12; - GtkWidget *label4; - GtkWidget *pref_soundcard; - GtkWidget *Sound; - GtkWidget *vbox8; - GtkWidget *pref_dynsamplerate; - GtkWidget *hbox9; - GtkWidget *label6; - GtkWidget *pref_src_quality; - GtkWidget *hbox10; - GtkWidget *label8; - GtkWidget *pref_replaygain_mode; - GtkWidget *pref_replaygain_scale; - GtkWidget *label39; - GtkWidget *vbox9; - GtkWidget *pref_close_send_to_tray; - GtkWidget *label2; - GtkWidget *vbox11; - GtkWidget *pref_network_enableproxy; - GtkWidget *hbox13; - GtkWidget *label18; - GtkWidget *pref_network_proxyaddress; - GtkWidget *hbox14; - GtkWidget *label19; - GtkWidget *pref_network_proxyport; - GtkWidget *hbox15; - GtkWidget *label20; - GtkWidget *pref_network_proxytype; - GtkWidget *label16; - GtkWidget *hpaned1; - GtkWidget *scrolledwindow2; - GtkWidget *pref_pluginlist; - GtkWidget *vbox12; - GtkWidget *hbox16; - GtkWidget *label11; - GtkWidget *pref_plugin_descr; - GtkWidget *hbox17; - GtkWidget *label12; - GtkWidget *pref_plugin_author; - GtkWidget *hbox18; - GtkWidget *label13; - GtkWidget *pref_plugin_email; - GtkWidget *hbox19; - GtkWidget *label14; - GtkWidget *pref_plugin_website; - GtkWidget *hbox20; - GtkWidget *configure_plugin; - GtkWidget *label3; - GtkWidget *hbox21; - GtkWidget *filler; - GtkWidget *pref_close; - GtkWidget *alignment1; - GtkWidget *hbox22; - GtkWidget *image321; - GtkWidget *label40; - - prefwin = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_widget_set_size_request (prefwin, 642, 372); - gtk_container_set_border_width (GTK_CONTAINER (prefwin), 12); - gtk_window_set_title (GTK_WINDOW (prefwin), "Preferences"); - gtk_window_set_modal (GTK_WINDOW (prefwin), TRUE); - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (prefwin), TRUE); - gtk_window_set_skip_pager_hint (GTK_WINDOW (prefwin), TRUE); - - pref_vbox = gtk_vbox_new (FALSE, 8); - gtk_widget_show (pref_vbox); - gtk_container_add (GTK_CONTAINER (prefwin), pref_vbox); + GtkWidget *headermenu; + GtkWidget *add_column; + GtkWidget *edit_column; + GtkWidget *remove_column; - notebook2 = gtk_notebook_new (); - gtk_widget_show (notebook2); - gtk_box_pack_start (GTK_BOX (pref_vbox), notebook2, TRUE, TRUE, 0); + headermenu = gtk_menu_new (); - vbox10 = gtk_vbox_new (FALSE, 8); - gtk_widget_show (vbox10); - gtk_container_add (GTK_CONTAINER (notebook2), vbox10); - gtk_container_set_border_width (GTK_CONTAINER (vbox10), 12); + add_column = gtk_menu_item_new_with_mnemonic ("Add column"); + gtk_widget_show (add_column); + gtk_container_add (GTK_CONTAINER (headermenu), add_column); - hbox11 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox11); - gtk_box_pack_start (GTK_BOX (vbox10), hbox11, FALSE, FALSE, 0); + edit_column = gtk_menu_item_new_with_mnemonic ("Edit column"); + gtk_widget_show (edit_column); + gtk_container_add (GTK_CONTAINER (headermenu), edit_column); - label23 = gtk_label_new ("Output plugin:"); - gtk_widget_show (label23); - gtk_box_pack_start (GTK_BOX (hbox11), label23, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label23), 0, 0.5); + remove_column = gtk_menu_item_new_with_mnemonic ("Remove column"); + gtk_widget_show (remove_column); + gtk_container_add (GTK_CONTAINER (headermenu), remove_column); - pref_output_plugin = gtk_combo_box_new_text (); - gtk_widget_show (pref_output_plugin); - gtk_box_pack_start (GTK_BOX (hbox11), pref_output_plugin, TRUE, TRUE, 0); + g_signal_connect ((gpointer) add_column, "activate", + G_CALLBACK (on_add_column_activate), + NULL); + g_signal_connect ((gpointer) edit_column, "activate", + G_CALLBACK (on_edit_column_activate), + NULL); + g_signal_connect ((gpointer) remove_column, "activate", + G_CALLBACK (on_remove_column_activate), + NULL); - hbox12 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox12); - gtk_box_pack_start (GTK_BOX (vbox10), hbox12, FALSE, FALSE, 0); + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF (headermenu, headermenu, "headermenu"); + GLADE_HOOKUP_OBJECT (headermenu, add_column, "add_column"); + GLADE_HOOKUP_OBJECT (headermenu, edit_column, "edit_column"); + GLADE_HOOKUP_OBJECT (headermenu, remove_column, "remove_column"); - label4 = gtk_label_new ("Output device:"); - gtk_widget_show (label4); - gtk_box_pack_start (GTK_BOX (hbox12), label4, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5); + return headermenu; +} - pref_soundcard = gtk_combo_box_new_text (); - gtk_widget_show (pref_soundcard); - gtk_box_pack_start (GTK_BOX (hbox12), pref_soundcard, TRUE, TRUE, 0); +GtkWidget* +create_addlocation (void) +{ + GtkWidget *addlocation; + GtkWidget *vbox7; + GtkWidget *addlocation_entry; + GtkWidget *hbox8; + GtkWidget *label21; + GtkWidget *addlocation_ok; - Sound = gtk_label_new ("Sound"); - gtk_widget_show (Sound); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 0), Sound); + addlocation = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_container_set_border_width (GTK_CONTAINER (addlocation), 12); + gtk_window_set_title (GTK_WINDOW (addlocation), "Add Location"); + gtk_window_set_modal (GTK_WINDOW (addlocation), TRUE); + gtk_window_set_destroy_with_parent (GTK_WINDOW (addlocation), TRUE); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (addlocation), TRUE); + gtk_window_set_skip_pager_hint (GTK_WINDOW (addlocation), TRUE); - vbox8 = gtk_vbox_new (FALSE, 8); - gtk_widget_show (vbox8); - gtk_container_add (GTK_CONTAINER (notebook2), vbox8); - gtk_container_set_border_width (GTK_CONTAINER (vbox8), 12); + vbox7 = gtk_vbox_new (FALSE, 8); + gtk_widget_show (vbox7); + gtk_container_add (GTK_CONTAINER (addlocation), vbox7); - pref_dynsamplerate = gtk_check_button_new_with_mnemonic ("Allow dynamic samplerate switching"); - gtk_widget_show (pref_dynsamplerate); - gtk_box_pack_start (GTK_BOX (vbox8), pref_dynsamplerate, FALSE, FALSE, 0); + addlocation_entry = gtk_entry_new (); + gtk_widget_show (addlocation_entry); + gtk_box_pack_start (GTK_BOX (vbox7), addlocation_entry, FALSE, FALSE, 0); + gtk_widget_set_size_request (addlocation_entry, 346, -1); + gtk_entry_set_invisible_char (GTK_ENTRY (addlocation_entry), 8226); - hbox9 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox9); - gtk_box_pack_start (GTK_BOX (vbox8), hbox9, FALSE, FALSE, 0); + hbox8 = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox8); + gtk_box_pack_start (GTK_BOX (vbox7), hbox8, FALSE, TRUE, 2); - label6 = gtk_label_new ("Samplerate conversion quality:"); - gtk_widget_show (label6); - gtk_box_pack_start (GTK_BOX (hbox9), label6, FALSE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (label6), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment (GTK_MISC (label6), 0, 0.5); + label21 = gtk_label_new (""); + gtk_widget_show (label21); + gtk_box_pack_start (GTK_BOX (hbox8), label21, TRUE, FALSE, 0); - pref_src_quality = gtk_combo_box_new_text (); - gtk_widget_show (pref_src_quality); - gtk_box_pack_start (GTK_BOX (hbox9), pref_src_quality, TRUE, TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_src_quality), "sinc_best_quality"); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_src_quality), "sinc_medium_quality"); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_src_quality), "sinc_fastest"); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_src_quality), "sinc_zero_order_hold"); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_src_quality), "linear"); + addlocation_ok = gtk_button_new_with_mnemonic ("OK"); + gtk_widget_show (addlocation_ok); + gtk_box_pack_start (GTK_BOX (hbox8), addlocation_ok, FALSE, FALSE, 0); + gtk_widget_set_size_request (addlocation_ok, 83, -1); + GTK_WIDGET_UNSET_FLAGS (addlocation_ok, GTK_CAN_FOCUS); - hbox10 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox10); - gtk_box_pack_start (GTK_BOX (vbox8), hbox10, FALSE, FALSE, 0); + g_signal_connect ((gpointer) addlocation, "key_press_event", + G_CALLBACK (on_addlocation_key_press_event), + NULL); + g_signal_connect ((gpointer) addlocation_entry, "activate", + G_CALLBACK (on_addlocation_entry_activate), + NULL); + g_signal_connect ((gpointer) addlocation_ok, "clicked", + G_CALLBACK (on_addlocation_ok_clicked), + NULL); - label8 = gtk_label_new ("Replaygain mode:"); - gtk_widget_show (label8); - gtk_box_pack_start (GTK_BOX (hbox10), label8, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label8), 0, 0.5); + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF (addlocation, addlocation, "addlocation"); + GLADE_HOOKUP_OBJECT (addlocation, vbox7, "vbox7"); + GLADE_HOOKUP_OBJECT (addlocation, addlocation_entry, "addlocation_entry"); + GLADE_HOOKUP_OBJECT (addlocation, hbox8, "hbox8"); + GLADE_HOOKUP_OBJECT (addlocation, label21, "label21"); + GLADE_HOOKUP_OBJECT (addlocation, addlocation_ok, "addlocation_ok"); - pref_replaygain_mode = gtk_combo_box_new_text (); - gtk_widget_show (pref_replaygain_mode); - gtk_box_pack_start (GTK_BOX (hbox10), pref_replaygain_mode, TRUE, TRUE, 0); - gtk_widget_set_size_request (pref_replaygain_mode, 337, -1); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_replaygain_mode), "Disable"); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_replaygain_mode), "Track"); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_replaygain_mode), "Album"); + return addlocation; +} - pref_replaygain_scale = gtk_check_button_new_with_mnemonic ("Replaygain peak scale"); - gtk_widget_show (pref_replaygain_scale); - gtk_box_pack_start (GTK_BOX (vbox8), pref_replaygain_scale, FALSE, FALSE, 0); +GtkWidget* +create_trackproperties (void) +{ + GtkWidget *trackproperties; + GtkWidget *vbox13; + GtkWidget *hbox23; + GtkWidget *label27; + GtkWidget *location; + GtkWidget *hbox24; + GtkWidget *label28; + GtkWidget *title; + GtkWidget *hbox25; + GtkWidget *label29; + GtkWidget *artist; + GtkWidget *hbox26; + GtkWidget *label30; + GtkWidget *album; + GtkWidget *hbox27; + GtkWidget *label35; + GtkWidget *genre; + GtkWidget *table8; + GtkWidget *label31; + GtkWidget *label33; + GtkWidget *year; + GtkWidget *track; + GtkWidget *hbox28; + GtkWidget *label36; + GtkWidget *scrolledwindow4; + GtkWidget *comment; - label39 = gtk_label_new ("Sound (adv.)"); - gtk_widget_show (label39); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 1), label39); + trackproperties = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_title (GTK_WINDOW (trackproperties), "Track Properties"); + gtk_window_set_destroy_with_parent (GTK_WINDOW (trackproperties), TRUE); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (trackproperties), TRUE); + gtk_window_set_skip_pager_hint (GTK_WINDOW (trackproperties), TRUE); - vbox9 = gtk_vbox_new (FALSE, 8); - gtk_widget_show (vbox9); - gtk_container_add (GTK_CONTAINER (notebook2), vbox9); - gtk_container_set_border_width (GTK_CONTAINER (vbox9), 12); + vbox13 = gtk_vbox_new (FALSE, 8); + gtk_widget_show (vbox13); + gtk_container_add (GTK_CONTAINER (trackproperties), vbox13); + gtk_container_set_border_width (GTK_CONTAINER (vbox13), 12); - pref_close_send_to_tray = gtk_check_button_new_with_mnemonic ("Close minimizes to tray"); - gtk_widget_show (pref_close_send_to_tray); - gtk_box_pack_start (GTK_BOX (vbox9), pref_close_send_to_tray, FALSE, FALSE, 0); - - label2 = gtk_label_new ("GUI"); - gtk_widget_show (label2); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 2), label2); + hbox23 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox23); + gtk_box_pack_start (GTK_BOX (vbox13), hbox23, FALSE, FALSE, 0); - vbox11 = gtk_vbox_new (FALSE, 8); - gtk_widget_show (vbox11); - gtk_container_add (GTK_CONTAINER (notebook2), vbox11); - gtk_container_set_border_width (GTK_CONTAINER (vbox11), 12); + label27 = gtk_label_new ("Location:"); + gtk_widget_show (label27); + gtk_box_pack_start (GTK_BOX (hbox23), label27, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label27), 0, 0.5); - pref_network_enableproxy = gtk_check_button_new_with_mnemonic ("Enable proxy server"); - gtk_widget_show (pref_network_enableproxy); - gtk_box_pack_start (GTK_BOX (vbox11), pref_network_enableproxy, FALSE, FALSE, 0); + location = gtk_entry_new (); + gtk_widget_show (location); + gtk_box_pack_start (GTK_BOX (hbox23), location, TRUE, TRUE, 0); + gtk_editable_set_editable (GTK_EDITABLE (location), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY (location), 8226); - hbox13 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox13); - gtk_box_pack_start (GTK_BOX (vbox11), hbox13, FALSE, FALSE, 0); + hbox24 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox24); + gtk_box_pack_start (GTK_BOX (vbox13), hbox24, FALSE, FALSE, 0); - label18 = gtk_label_new ("Proxy server address:"); - gtk_widget_show (label18); - gtk_box_pack_start (GTK_BOX (hbox13), label18, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label18), 0, 0.5); + label28 = gtk_label_new ("Title:"); + gtk_widget_show (label28); + gtk_box_pack_start (GTK_BOX (hbox24), label28, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label28), 0, 0.5); - pref_network_proxyaddress = gtk_entry_new (); - gtk_widget_show (pref_network_proxyaddress); - gtk_box_pack_start (GTK_BOX (hbox13), pref_network_proxyaddress, TRUE, TRUE, 0); - gtk_entry_set_invisible_char (GTK_ENTRY (pref_network_proxyaddress), 8226); + title = gtk_entry_new (); + gtk_widget_show (title); + gtk_box_pack_start (GTK_BOX (hbox24), title, TRUE, TRUE, 0); + gtk_editable_set_editable (GTK_EDITABLE (title), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY (title), 8226); - hbox14 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox14); - gtk_box_pack_start (GTK_BOX (vbox11), hbox14, FALSE, FALSE, 0); + hbox25 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox25); + gtk_box_pack_start (GTK_BOX (vbox13), hbox25, FALSE, FALSE, 0); - label19 = gtk_label_new ("Proxy server port:"); - gtk_widget_show (label19); - gtk_box_pack_start (GTK_BOX (hbox14), label19, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label19), 0, 0.5); + label29 = gtk_label_new ("Artist:"); + gtk_widget_show (label29); + gtk_box_pack_start (GTK_BOX (hbox25), label29, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label29), 0, 0.5); - pref_network_proxyport = gtk_entry_new (); - gtk_widget_show (pref_network_proxyport); - gtk_box_pack_start (GTK_BOX (hbox14), pref_network_proxyport, TRUE, TRUE, 0); - gtk_entry_set_invisible_char (GTK_ENTRY (pref_network_proxyport), 8226); + artist = gtk_entry_new (); + gtk_widget_show (artist); + gtk_box_pack_start (GTK_BOX (hbox25), artist, TRUE, TRUE, 0); + gtk_editable_set_editable (GTK_EDITABLE (artist), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY (artist), 8226); - hbox15 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox15); - gtk_box_pack_start (GTK_BOX (vbox11), hbox15, FALSE, FALSE, 0); + hbox26 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox26); + gtk_box_pack_start (GTK_BOX (vbox13), hbox26, FALSE, FALSE, 0); - label20 = gtk_label_new ("Proxy type:"); - gtk_widget_show (label20); - gtk_box_pack_start (GTK_BOX (hbox15), label20, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label20), 0, 0.5); + label30 = gtk_label_new ("Album:"); + gtk_widget_show (label30); + gtk_box_pack_start (GTK_BOX (hbox26), label30, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label30), 0, 0.5); - pref_network_proxytype = gtk_combo_box_new_text (); - gtk_widget_show (pref_network_proxytype); - gtk_box_pack_start (GTK_BOX (hbox15), pref_network_proxytype, TRUE, TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "HTTP"); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "HTTP_1_0"); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "SOCKS4"); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "SOCKS5"); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "SOCKS4A"); - gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "SOCKS5_HOSTNAME"); + album = gtk_entry_new (); + gtk_widget_show (album); + gtk_box_pack_start (GTK_BOX (hbox26), album, TRUE, TRUE, 0); + gtk_editable_set_editable (GTK_EDITABLE (album), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY (album), 8226); - label16 = gtk_label_new ("Network"); - gtk_widget_show (label16); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 3), label16); + hbox27 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox27); + gtk_box_pack_start (GTK_BOX (vbox13), hbox27, FALSE, FALSE, 0); - hpaned1 = gtk_hpaned_new (); - gtk_widget_show (hpaned1); - gtk_container_add (GTK_CONTAINER (notebook2), hpaned1); - gtk_container_set_border_width (GTK_CONTAINER (hpaned1), 12); - gtk_paned_set_position (GTK_PANED (hpaned1), 0); + label35 = gtk_label_new ("Genre:"); + gtk_widget_show (label35); + gtk_box_pack_start (GTK_BOX (hbox27), label35, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label35), 0, 0.5); - scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow2); - gtk_paned_pack1 (GTK_PANED (hpaned1), scrolledwindow2, FALSE, FALSE); - gtk_widget_set_size_request (scrolledwindow2, 280, -1); - gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow2), 3); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow2), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow2), GTK_SHADOW_IN); + genre = gtk_entry_new (); + gtk_widget_show (genre); + gtk_box_pack_start (GTK_BOX (hbox27), genre, TRUE, TRUE, 0); + gtk_editable_set_editable (GTK_EDITABLE (genre), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY (genre), 8226); - pref_pluginlist = gtk_tree_view_new (); - gtk_widget_show (pref_pluginlist); - gtk_container_add (GTK_CONTAINER (scrolledwindow2), pref_pluginlist); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (pref_pluginlist), TRUE); + table8 = gtk_table_new (2, 2, FALSE); + gtk_widget_show (table8); + gtk_box_pack_start (GTK_BOX (vbox13), table8, FALSE, FALSE, 0); + gtk_table_set_row_spacings (GTK_TABLE (table8), 8); + gtk_table_set_col_spacings (GTK_TABLE (table8), 8); - vbox12 = gtk_vbox_new (FALSE, 8); - gtk_widget_show (vbox12); - gtk_paned_pack2 (GTK_PANED (hpaned1), vbox12, TRUE, TRUE); - gtk_container_set_border_width (GTK_CONTAINER (vbox12), 12); + label31 = gtk_label_new ("Year:"); + gtk_widget_show (label31); + gtk_table_attach (GTK_TABLE (table8), label31, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_label_set_line_wrap (GTK_LABEL (label31), TRUE); + gtk_misc_set_alignment (GTK_MISC (label31), 0, 0.5); - hbox16 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox16); - gtk_box_pack_start (GTK_BOX (vbox12), hbox16, FALSE, FALSE, 0); + label33 = gtk_label_new ("Track:"); + gtk_widget_show (label33); + gtk_table_attach (GTK_TABLE (table8), label33, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_label_set_use_markup (GTK_LABEL (label33), TRUE); + gtk_misc_set_alignment (GTK_MISC (label33), 0, 0.5); - label11 = gtk_label_new ("Description:"); - gtk_widget_show (label11); - gtk_box_pack_start (GTK_BOX (hbox16), label11, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label11), 0, 0.5); + year = gtk_entry_new (); + gtk_widget_show (year); + gtk_table_attach (GTK_TABLE (table8), year, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_editable_set_editable (GTK_EDITABLE (year), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY (year), 8226); - pref_plugin_descr = gtk_entry_new (); - gtk_widget_show (pref_plugin_descr); - gtk_box_pack_start (GTK_BOX (hbox16), pref_plugin_descr, TRUE, TRUE, 0); - gtk_editable_set_editable (GTK_EDITABLE (pref_plugin_descr), FALSE); - gtk_entry_set_invisible_char (GTK_ENTRY (pref_plugin_descr), 9679); + track = gtk_entry_new (); + gtk_widget_show (track); + gtk_table_attach (GTK_TABLE (table8), track, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_editable_set_editable (GTK_EDITABLE (track), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY (track), 8226); - hbox17 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox17); - gtk_box_pack_start (GTK_BOX (vbox12), hbox17, FALSE, FALSE, 0); + hbox28 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox28); + gtk_box_pack_start (GTK_BOX (vbox13), hbox28, TRUE, TRUE, 0); - label12 = gtk_label_new ("Author(s):"); - gtk_widget_show (label12); - gtk_box_pack_start (GTK_BOX (hbox17), label12, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label12), 0, 0.5); + label36 = gtk_label_new ("Comment:"); + gtk_widget_show (label36); + gtk_box_pack_start (GTK_BOX (hbox28), label36, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label36), 0, 0.5); - pref_plugin_author = gtk_entry_new (); - gtk_widget_show (pref_plugin_author); - gtk_box_pack_start (GTK_BOX (hbox17), pref_plugin_author, TRUE, TRUE, 0); - gtk_editable_set_editable (GTK_EDITABLE (pref_plugin_author), FALSE); - gtk_entry_set_invisible_char (GTK_ENTRY (pref_plugin_author), 9679); + scrolledwindow4 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolledwindow4); + gtk_box_pack_start (GTK_BOX (hbox28), scrolledwindow4, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow4), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow4), GTK_SHADOW_IN); - hbox18 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox18); - gtk_box_pack_start (GTK_BOX (vbox12), hbox18, FALSE, FALSE, 0); + comment = gtk_text_view_new (); + gtk_widget_show (comment); + gtk_container_add (GTK_CONTAINER (scrolledwindow4), comment); + gtk_text_view_set_editable (GTK_TEXT_VIEW (comment), FALSE); - label13 = gtk_label_new ("Email:"); - gtk_widget_show (label13); - gtk_box_pack_start (GTK_BOX (hbox18), label13, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label13), 0, 0.5); + g_signal_connect ((gpointer) trackproperties, "key_press_event", + G_CALLBACK (on_trackproperties_key_press_event), + NULL); + g_signal_connect ((gpointer) trackproperties, "delete_event", + G_CALLBACK (on_trackproperties_delete_event), + NULL); - pref_plugin_email = gtk_entry_new (); - gtk_widget_show (pref_plugin_email); - gtk_box_pack_start (GTK_BOX (hbox18), pref_plugin_email, TRUE, TRUE, 0); - gtk_editable_set_editable (GTK_EDITABLE (pref_plugin_email), FALSE); - gtk_entry_set_invisible_char (GTK_ENTRY (pref_plugin_email), 9679); + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF (trackproperties, trackproperties, "trackproperties"); + GLADE_HOOKUP_OBJECT (trackproperties, vbox13, "vbox13"); + GLADE_HOOKUP_OBJECT (trackproperties, hbox23, "hbox23"); + GLADE_HOOKUP_OBJECT (trackproperties, label27, "label27"); + GLADE_HOOKUP_OBJECT (trackproperties, location, "location"); + GLADE_HOOKUP_OBJECT (trackproperties, hbox24, "hbox24"); + GLADE_HOOKUP_OBJECT (trackproperties, label28, "label28"); + GLADE_HOOKUP_OBJECT (trackproperties, title, "title"); + GLADE_HOOKUP_OBJECT (trackproperties, hbox25, "hbox25"); + GLADE_HOOKUP_OBJECT (trackproperties, label29, "label29"); + GLADE_HOOKUP_OBJECT (trackproperties, artist, "artist"); + GLADE_HOOKUP_OBJECT (trackproperties, hbox26, "hbox26"); + GLADE_HOOKUP_OBJECT (trackproperties, label30, "label30"); + GLADE_HOOKUP_OBJECT (trackproperties, album, "album"); + GLADE_HOOKUP_OBJECT (trackproperties, hbox27, "hbox27"); + GLADE_HOOKUP_OBJECT (trackproperties, label35, "label35"); + GLADE_HOOKUP_OBJECT (trackproperties, genre, "genre"); + GLADE_HOOKUP_OBJECT (trackproperties, table8, "table8"); + GLADE_HOOKUP_OBJECT (trackproperties, label31, "label31"); + GLADE_HOOKUP_OBJECT (trackproperties, label33, "label33"); + GLADE_HOOKUP_OBJECT (trackproperties, year, "year"); + GLADE_HOOKUP_OBJECT (trackproperties, track, "track"); + GLADE_HOOKUP_OBJECT (trackproperties, hbox28, "hbox28"); + GLADE_HOOKUP_OBJECT (trackproperties, label36, "label36"); + GLADE_HOOKUP_OBJECT (trackproperties, scrolledwindow4, "scrolledwindow4"); + GLADE_HOOKUP_OBJECT (trackproperties, comment, "comment"); - hbox19 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox19); - gtk_box_pack_start (GTK_BOX (vbox12), hbox19, FALSE, FALSE, 0); + return trackproperties; +} - label14 = gtk_label_new ("Website:"); - gtk_widget_show (label14); - gtk_box_pack_start (GTK_BOX (hbox19), label14, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label14), 0, 0.5); +GtkWidget* +create_editcolumndlg (void) +{ + GtkWidget *editcolumndlg; + GtkWidget *dialog_vbox1; + GtkWidget *vbox14; + GtkWidget *hbox29; + GtkWidget *label26; + GtkWidget *title; + GtkWidget *hbox30; + GtkWidget *label37; + GtkWidget *id; + GtkWidget *hbox31; + GtkWidget *fmtlabel; + GtkWidget *format; + GtkWidget *hbox32; + GtkWidget *label38; + GtkWidget *align; + GtkWidget *label25; + GtkWidget *dialog_action_area1; + GtkWidget *cancelbutton1; + GtkWidget *okbutton1; - pref_plugin_website = gtk_entry_new (); - gtk_widget_show (pref_plugin_website); - gtk_box_pack_start (GTK_BOX (hbox19), pref_plugin_website, TRUE, TRUE, 0); - gtk_editable_set_editable (GTK_EDITABLE (pref_plugin_website), FALSE); - gtk_entry_set_invisible_char (GTK_ENTRY (pref_plugin_website), 9679); + editcolumndlg = gtk_dialog_new (); + gtk_container_set_border_width (GTK_CONTAINER (editcolumndlg), 12); + gtk_window_set_title (GTK_WINDOW (editcolumndlg), "dialog1"); + gtk_window_set_modal (GTK_WINDOW (editcolumndlg), TRUE); + gtk_window_set_type_hint (GTK_WINDOW (editcolumndlg), GDK_WINDOW_TYPE_HINT_DIALOG); - hbox20 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox20); - gtk_box_pack_start (GTK_BOX (vbox12), hbox20, FALSE, FALSE, 0); + dialog_vbox1 = GTK_DIALOG (editcolumndlg)->vbox; + gtk_widget_show (dialog_vbox1); - configure_plugin = gtk_button_new_with_mnemonic ("Configure"); - gtk_widget_show (configure_plugin); - gtk_box_pack_start (GTK_BOX (hbox20), configure_plugin, TRUE, FALSE, 0); + vbox14 = gtk_vbox_new (FALSE, 8); + gtk_widget_show (vbox14); + gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox14, TRUE, TRUE, 0); - label3 = gtk_label_new ("Plugins"); - gtk_widget_show (label3); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 4), label3); + hbox29 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox29); + gtk_box_pack_start (GTK_BOX (vbox14), hbox29, FALSE, FALSE, 0); - hbox21 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox21); - gtk_box_pack_start (GTK_BOX (pref_vbox), hbox21, FALSE, TRUE, 0); + label26 = gtk_label_new ("Title:"); + gtk_widget_show (label26); + gtk_box_pack_start (GTK_BOX (hbox29), label26, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label26), 0, 0.5); - filler = gtk_label_new (""); - gtk_widget_show (filler); - gtk_box_pack_start (GTK_BOX (hbox21), filler, TRUE, TRUE, 0); + title = gtk_entry_new (); + gtk_widget_show (title); + gtk_box_pack_start (GTK_BOX (hbox29), title, TRUE, TRUE, 0); + gtk_entry_set_text (GTK_ENTRY (title), "Enter new column title here"); + gtk_entry_set_invisible_char (GTK_ENTRY (title), 9679); + gtk_entry_set_activates_default (GTK_ENTRY (title), TRUE); - pref_close = gtk_button_new (); - gtk_widget_show (pref_close); - gtk_box_pack_start (GTK_BOX (hbox21), pref_close, FALSE, FALSE, 0); - gtk_widget_set_size_request (pref_close, 76, -1); + hbox30 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox30); + gtk_box_pack_start (GTK_BOX (vbox14), hbox30, FALSE, FALSE, 0); - alignment1 = gtk_alignment_new (0.5, 0.5, 0, 0); - gtk_widget_show (alignment1); - gtk_container_add (GTK_CONTAINER (pref_close), alignment1); + label37 = gtk_label_new ("Type:"); + gtk_widget_show (label37); + gtk_box_pack_start (GTK_BOX (hbox30), label37, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label37), 0, 0.5); - hbox22 = gtk_hbox_new (FALSE, 2); - gtk_widget_show (hbox22); - gtk_container_add (GTK_CONTAINER (alignment1), hbox22); + id = gtk_combo_box_new_text (); + gtk_widget_show (id); + gtk_box_pack_start (GTK_BOX (hbox30), id, TRUE, TRUE, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (id), "File number"); + gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Playing"); + gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Artist - Album"); + gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Artist"); + gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Album"); + gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Title"); + gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Length"); + gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Track"); + gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Custom"); - image321 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image321); - gtk_box_pack_start (GTK_BOX (hbox22), image321, FALSE, FALSE, 0); + hbox31 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox31); + gtk_box_pack_start (GTK_BOX (vbox14), hbox31, FALSE, FALSE, 0); - label40 = gtk_label_new_with_mnemonic ("Close"); - gtk_widget_show (label40); - gtk_box_pack_start (GTK_BOX (hbox22), label40, FALSE, FALSE, 0); + fmtlabel = gtk_label_new ("Format:"); + gtk_widget_show (fmtlabel); + gtk_box_pack_start (GTK_BOX (hbox31), fmtlabel, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (fmtlabel), 0, 0.5); - g_signal_connect ((gpointer) prefwin, "key_press_event", - G_CALLBACK (on_prefwin_key_press_event), - NULL); - g_signal_connect ((gpointer) prefwin, "delete_event", - G_CALLBACK (on_prefwin_delete_event), - NULL); - g_signal_connect ((gpointer) pref_dynsamplerate, "clicked", - G_CALLBACK (on_pref_dynsamplerate_clicked), - NULL); - g_signal_connect ((gpointer) pref_src_quality, "changed", - G_CALLBACK (on_pref_src_quality_changed), - NULL); - g_signal_connect ((gpointer) pref_replaygain_mode, "changed", - G_CALLBACK (on_pref_replaygain_mode_changed), - NULL); - g_signal_connect ((gpointer) pref_replaygain_scale, "clicked", - G_CALLBACK (on_pref_replaygain_scale_clicked), - NULL); - g_signal_connect ((gpointer) pref_close_send_to_tray, "clicked", - G_CALLBACK (on_pref_close_send_to_tray_clicked), - NULL); - g_signal_connect ((gpointer) pref_network_enableproxy, "clicked", - G_CALLBACK (on_pref_network_enableproxy_clicked), - NULL); - g_signal_connect ((gpointer) pref_network_proxyaddress, "changed", - G_CALLBACK (on_pref_network_proxyaddress_changed), - NULL); - g_signal_connect ((gpointer) pref_network_proxyport, "changed", - G_CALLBACK (on_pref_network_proxyport_changed), - NULL); - g_signal_connect ((gpointer) pref_network_proxytype, "changed", - G_CALLBACK (on_pref_network_proxytype_changed), - NULL); - g_signal_connect ((gpointer) pref_pluginlist, "cursor_changed", - G_CALLBACK (on_pref_pluginlist_cursor_changed), - NULL); - g_signal_connect ((gpointer) configure_plugin, "clicked", - G_CALLBACK (on_configure_plugin_clicked), - NULL); - g_signal_connect ((gpointer) pref_close, "clicked", - G_CALLBACK (on_pref_close_clicked), - NULL); + format = gtk_entry_new (); + gtk_widget_show (format); + gtk_box_pack_start (GTK_BOX (hbox31), format, TRUE, TRUE, 0); + gtk_entry_set_invisible_char (GTK_ENTRY (format), 9679); + gtk_entry_set_activates_default (GTK_ENTRY (format), TRUE); - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (prefwin, prefwin, "prefwin"); - GLADE_HOOKUP_OBJECT (prefwin, pref_vbox, "pref_vbox"); - GLADE_HOOKUP_OBJECT (prefwin, notebook2, "notebook2"); - GLADE_HOOKUP_OBJECT (prefwin, vbox10, "vbox10"); - GLADE_HOOKUP_OBJECT (prefwin, hbox11, "hbox11"); - GLADE_HOOKUP_OBJECT (prefwin, label23, "label23"); - GLADE_HOOKUP_OBJECT (prefwin, pref_output_plugin, "pref_output_plugin"); - GLADE_HOOKUP_OBJECT (prefwin, hbox12, "hbox12"); - GLADE_HOOKUP_OBJECT (prefwin, label4, "label4"); - GLADE_HOOKUP_OBJECT (prefwin, pref_soundcard, "pref_soundcard"); - GLADE_HOOKUP_OBJECT (prefwin, Sound, "Sound"); - GLADE_HOOKUP_OBJECT (prefwin, vbox8, "vbox8"); - GLADE_HOOKUP_OBJECT (prefwin, pref_dynsamplerate, "pref_dynsamplerate"); - GLADE_HOOKUP_OBJECT (prefwin, hbox9, "hbox9"); - GLADE_HOOKUP_OBJECT (prefwin, label6, "label6"); - GLADE_HOOKUP_OBJECT (prefwin, pref_src_quality, "pref_src_quality"); - GLADE_HOOKUP_OBJECT (prefwin, hbox10, "hbox10"); - GLADE_HOOKUP_OBJECT (prefwin, label8, "label8"); - GLADE_HOOKUP_OBJECT (prefwin, pref_replaygain_mode, "pref_replaygain_mode"); - GLADE_HOOKUP_OBJECT (prefwin, pref_replaygain_scale, "pref_replaygain_scale"); - GLADE_HOOKUP_OBJECT (prefwin, label39, "label39"); - GLADE_HOOKUP_OBJECT (prefwin, vbox9, "vbox9"); - GLADE_HOOKUP_OBJECT (prefwin, pref_close_send_to_tray, "pref_close_send_to_tray"); - GLADE_HOOKUP_OBJECT (prefwin, label2, "label2"); - GLADE_HOOKUP_OBJECT (prefwin, vbox11, "vbox11"); - GLADE_HOOKUP_OBJECT (prefwin, pref_network_enableproxy, "pref_network_enableproxy"); - GLADE_HOOKUP_OBJECT (prefwin, hbox13, "hbox13"); - GLADE_HOOKUP_OBJECT (prefwin, label18, "label18"); - GLADE_HOOKUP_OBJECT (prefwin, pref_network_proxyaddress, "pref_network_proxyaddress"); - GLADE_HOOKUP_OBJECT (prefwin, hbox14, "hbox14"); - GLADE_HOOKUP_OBJECT (prefwin, label19, "label19"); - GLADE_HOOKUP_OBJECT (prefwin, pref_network_proxyport, "pref_network_proxyport"); - GLADE_HOOKUP_OBJECT (prefwin, hbox15, "hbox15"); - GLADE_HOOKUP_OBJECT (prefwin, label20, "label20"); - GLADE_HOOKUP_OBJECT (prefwin, pref_network_proxytype, "pref_network_proxytype"); - GLADE_HOOKUP_OBJECT (prefwin, label16, "label16"); - GLADE_HOOKUP_OBJECT (prefwin, hpaned1, "hpaned1"); - GLADE_HOOKUP_OBJECT (prefwin, scrolledwindow2, "scrolledwindow2"); - GLADE_HOOKUP_OBJECT (prefwin, pref_pluginlist, "pref_pluginlist"); - GLADE_HOOKUP_OBJECT (prefwin, vbox12, "vbox12"); - GLADE_HOOKUP_OBJECT (prefwin, hbox16, "hbox16"); - GLADE_HOOKUP_OBJECT (prefwin, label11, "label11"); - GLADE_HOOKUP_OBJECT (prefwin, pref_plugin_descr, "pref_plugin_descr"); - GLADE_HOOKUP_OBJECT (prefwin, hbox17, "hbox17"); - GLADE_HOOKUP_OBJECT (prefwin, label12, "label12"); - GLADE_HOOKUP_OBJECT (prefwin, pref_plugin_author, "pref_plugin_author"); - GLADE_HOOKUP_OBJECT (prefwin, hbox18, "hbox18"); - GLADE_HOOKUP_OBJECT (prefwin, label13, "label13"); - GLADE_HOOKUP_OBJECT (prefwin, pref_plugin_email, "pref_plugin_email"); - GLADE_HOOKUP_OBJECT (prefwin, hbox19, "hbox19"); - GLADE_HOOKUP_OBJECT (prefwin, label14, "label14"); - GLADE_HOOKUP_OBJECT (prefwin, pref_plugin_website, "pref_plugin_website"); - GLADE_HOOKUP_OBJECT (prefwin, hbox20, "hbox20"); - GLADE_HOOKUP_OBJECT (prefwin, configure_plugin, "configure_plugin"); - GLADE_HOOKUP_OBJECT (prefwin, label3, "label3"); - GLADE_HOOKUP_OBJECT (prefwin, hbox21, "hbox21"); - GLADE_HOOKUP_OBJECT (prefwin, filler, "filler"); - GLADE_HOOKUP_OBJECT (prefwin, pref_close, "pref_close"); - GLADE_HOOKUP_OBJECT (prefwin, alignment1, "alignment1"); - GLADE_HOOKUP_OBJECT (prefwin, hbox22, "hbox22"); - GLADE_HOOKUP_OBJECT (prefwin, image321, "image321"); - GLADE_HOOKUP_OBJECT (prefwin, label40, "label40"); + hbox32 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox32); + gtk_box_pack_start (GTK_BOX (vbox14), hbox32, FALSE, FALSE, 0); - return prefwin; -} + label38 = gtk_label_new ("Alignment:"); + gtk_widget_show (label38); + gtk_box_pack_start (GTK_BOX (hbox32), label38, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label38), 0, 0.5); -GtkWidget* -create_headermenu (void) -{ - GtkWidget *headermenu; - GtkWidget *add_column; - GtkWidget *edit_column; - GtkWidget *remove_column; + align = gtk_combo_box_new_text (); + gtk_widget_show (align); + gtk_box_pack_start (GTK_BOX (hbox32), align, TRUE, TRUE, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (align), "Left"); + gtk_combo_box_append_text (GTK_COMBO_BOX (align), "Right"); - headermenu = gtk_menu_new (); + label25 = gtk_label_new ("Format conversions (start with %):\n [a]rtist, [t]itle, al[b]um, track[n]umber,\n [l]ength, [y]ear, [g]enre, [c]omment,\n copy[r]ight, [f]ilename\nExample: %a - %t [%l]"); + gtk_widget_show (label25); + gtk_box_pack_start (GTK_BOX (vbox14), label25, TRUE, TRUE, 0); + GTK_WIDGET_SET_FLAGS (label25, GTK_CAN_FOCUS); + gtk_label_set_use_markup (GTK_LABEL (label25), TRUE); + gtk_label_set_selectable (GTK_LABEL (label25), TRUE); + gtk_misc_set_alignment (GTK_MISC (label25), 0.1, 0.5); - add_column = gtk_menu_item_new_with_mnemonic ("Add column"); - gtk_widget_show (add_column); - gtk_container_add (GTK_CONTAINER (headermenu), add_column); + dialog_action_area1 = GTK_DIALOG (editcolumndlg)->action_area; + gtk_widget_show (dialog_action_area1); + gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END); - edit_column = gtk_menu_item_new_with_mnemonic ("Edit column"); - gtk_widget_show (edit_column); - gtk_container_add (GTK_CONTAINER (headermenu), edit_column); + cancelbutton1 = gtk_button_new_with_mnemonic ("_Cancel"); + gtk_widget_show (cancelbutton1); + gtk_dialog_add_action_widget (GTK_DIALOG (editcolumndlg), cancelbutton1, GTK_RESPONSE_CANCEL); + GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_DEFAULT); - remove_column = gtk_menu_item_new_with_mnemonic ("Remove column"); - gtk_widget_show (remove_column); - gtk_container_add (GTK_CONTAINER (headermenu), remove_column); + okbutton1 = gtk_button_new_with_mnemonic ("_OK"); + gtk_widget_show (okbutton1); + gtk_dialog_add_action_widget (GTK_DIALOG (editcolumndlg), okbutton1, GTK_RESPONSE_OK); + GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT); - g_signal_connect ((gpointer) add_column, "activate", - G_CALLBACK (on_add_column_activate), - NULL); - g_signal_connect ((gpointer) edit_column, "activate", - G_CALLBACK (on_edit_column_activate), - NULL); - g_signal_connect ((gpointer) remove_column, "activate", - G_CALLBACK (on_remove_column_activate), + g_signal_connect ((gpointer) id, "changed", + G_CALLBACK (on_column_id_changed), NULL); /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (headermenu, headermenu, "headermenu"); - GLADE_HOOKUP_OBJECT (headermenu, add_column, "add_column"); - GLADE_HOOKUP_OBJECT (headermenu, edit_column, "edit_column"); - GLADE_HOOKUP_OBJECT (headermenu, remove_column, "remove_column"); + GLADE_HOOKUP_OBJECT_NO_REF (editcolumndlg, editcolumndlg, "editcolumndlg"); + GLADE_HOOKUP_OBJECT_NO_REF (editcolumndlg, dialog_vbox1, "dialog_vbox1"); + GLADE_HOOKUP_OBJECT (editcolumndlg, vbox14, "vbox14"); + GLADE_HOOKUP_OBJECT (editcolumndlg, hbox29, "hbox29"); + GLADE_HOOKUP_OBJECT (editcolumndlg, label26, "label26"); + GLADE_HOOKUP_OBJECT (editcolumndlg, title, "title"); + GLADE_HOOKUP_OBJECT (editcolumndlg, hbox30, "hbox30"); + GLADE_HOOKUP_OBJECT (editcolumndlg, label37, "label37"); + GLADE_HOOKUP_OBJECT (editcolumndlg, id, "id"); + GLADE_HOOKUP_OBJECT (editcolumndlg, hbox31, "hbox31"); + GLADE_HOOKUP_OBJECT (editcolumndlg, fmtlabel, "fmtlabel"); + GLADE_HOOKUP_OBJECT (editcolumndlg, format, "format"); + GLADE_HOOKUP_OBJECT (editcolumndlg, hbox32, "hbox32"); + GLADE_HOOKUP_OBJECT (editcolumndlg, label38, "label38"); + GLADE_HOOKUP_OBJECT (editcolumndlg, align, "align"); + GLADE_HOOKUP_OBJECT (editcolumndlg, label25, "label25"); + GLADE_HOOKUP_OBJECT_NO_REF (editcolumndlg, dialog_action_area1, "dialog_action_area1"); + GLADE_HOOKUP_OBJECT (editcolumndlg, cancelbutton1, "cancelbutton1"); + GLADE_HOOKUP_OBJECT (editcolumndlg, okbutton1, "okbutton1"); - return headermenu; + return editcolumndlg; } GtkWidget* -create_addlocation (void) +create_prefwin (void) { - GtkWidget *addlocation; - GtkWidget *vbox7; - GtkWidget *addlocation_entry; - GtkWidget *hbox8; - GtkWidget *label21; - GtkWidget *addlocation_ok; - - addlocation = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_container_set_border_width (GTK_CONTAINER (addlocation), 12); - gtk_window_set_title (GTK_WINDOW (addlocation), "Add Location"); - gtk_window_set_modal (GTK_WINDOW (addlocation), TRUE); - gtk_window_set_destroy_with_parent (GTK_WINDOW (addlocation), TRUE); - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (addlocation), TRUE); - gtk_window_set_skip_pager_hint (GTK_WINDOW (addlocation), TRUE); - - vbox7 = gtk_vbox_new (FALSE, 8); - gtk_widget_show (vbox7); - gtk_container_add (GTK_CONTAINER (addlocation), vbox7); - - addlocation_entry = gtk_entry_new (); - gtk_widget_show (addlocation_entry); - gtk_box_pack_start (GTK_BOX (vbox7), addlocation_entry, FALSE, FALSE, 0); - gtk_widget_set_size_request (addlocation_entry, 346, -1); - gtk_entry_set_invisible_char (GTK_ENTRY (addlocation_entry), 8226); + GtkWidget *prefwin; + GtkWidget *dialog_vbox2; + GtkWidget *notebook2; + GtkWidget *vbox10; + GtkWidget *hbox11; + GtkWidget *label23; + GtkWidget *pref_output_plugin; + GtkWidget *hbox12; + GtkWidget *label4; + GtkWidget *pref_soundcard; + GtkWidget *Sound; + GtkWidget *vbox8; + GtkWidget *pref_dynsamplerate; + GtkWidget *hbox9; + GtkWidget *label6; + GtkWidget *pref_src_quality; + GtkWidget *hbox10; + GtkWidget *label8; + GtkWidget *pref_replaygain_mode; + GtkWidget *pref_replaygain_scale; + GtkWidget *label39; + GtkWidget *vbox9; + GtkWidget *pref_close_send_to_tray; + GtkWidget *label2; + GtkWidget *vbox11; + GtkWidget *pref_network_enableproxy; + GtkWidget *hbox13; + GtkWidget *label18; + GtkWidget *pref_network_proxyaddress; + GtkWidget *hbox14; + GtkWidget *label19; + GtkWidget *pref_network_proxyport; + GtkWidget *hbox15; + GtkWidget *label20; + GtkWidget *pref_network_proxytype; + GtkWidget *label16; + GtkWidget *hpaned1; + GtkWidget *scrolledwindow2; + GtkWidget *pref_pluginlist; + GtkWidget *vbox12; + GtkWidget *hbox16; + GtkWidget *label11; + GtkWidget *pref_plugin_descr; + GtkWidget *hbox17; + GtkWidget *label12; + GtkWidget *pref_plugin_author; + GtkWidget *hbox18; + GtkWidget *label13; + GtkWidget *pref_plugin_email; + GtkWidget *hbox19; + GtkWidget *label14; + GtkWidget *pref_plugin_website; + GtkWidget *hbox20; + GtkWidget *configure_plugin; + GtkWidget *label3; + GtkWidget *dialog_action_area2; + GtkWidget *closebutton1; - hbox8 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox8); - gtk_box_pack_start (GTK_BOX (vbox7), hbox8, FALSE, TRUE, 2); + prefwin = gtk_dialog_new (); + gtk_widget_set_size_request (prefwin, 630, 400); + gtk_container_set_border_width (GTK_CONTAINER (prefwin), 12); + gtk_window_set_title (GTK_WINDOW (prefwin), "Preferences"); + gtk_window_set_default_size (GTK_WINDOW (prefwin), 630, 400); + gtk_window_set_type_hint (GTK_WINDOW (prefwin), GDK_WINDOW_TYPE_HINT_DIALOG); - label21 = gtk_label_new (""); - gtk_widget_show (label21); - gtk_box_pack_start (GTK_BOX (hbox8), label21, TRUE, FALSE, 0); + dialog_vbox2 = GTK_DIALOG (prefwin)->vbox; + gtk_widget_show (dialog_vbox2); - addlocation_ok = gtk_button_new_with_mnemonic ("OK"); - gtk_widget_show (addlocation_ok); - gtk_box_pack_start (GTK_BOX (hbox8), addlocation_ok, FALSE, FALSE, 0); - gtk_widget_set_size_request (addlocation_ok, 83, -1); - GTK_WIDGET_UNSET_FLAGS (addlocation_ok, GTK_CAN_FOCUS); + notebook2 = gtk_notebook_new (); + gtk_widget_show (notebook2); + gtk_box_pack_start (GTK_BOX (dialog_vbox2), notebook2, TRUE, TRUE, 0); - g_signal_connect ((gpointer) addlocation, "key_press_event", - G_CALLBACK (on_addlocation_key_press_event), - NULL); - g_signal_connect ((gpointer) addlocation_entry, "activate", - G_CALLBACK (on_addlocation_entry_activate), - NULL); - g_signal_connect ((gpointer) addlocation_ok, "clicked", - G_CALLBACK (on_addlocation_ok_clicked), - NULL); + vbox10 = gtk_vbox_new (FALSE, 8); + gtk_widget_show (vbox10); + gtk_container_add (GTK_CONTAINER (notebook2), vbox10); + gtk_container_set_border_width (GTK_CONTAINER (vbox10), 12); - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (addlocation, addlocation, "addlocation"); - GLADE_HOOKUP_OBJECT (addlocation, vbox7, "vbox7"); - GLADE_HOOKUP_OBJECT (addlocation, addlocation_entry, "addlocation_entry"); - GLADE_HOOKUP_OBJECT (addlocation, hbox8, "hbox8"); - GLADE_HOOKUP_OBJECT (addlocation, label21, "label21"); - GLADE_HOOKUP_OBJECT (addlocation, addlocation_ok, "addlocation_ok"); + hbox11 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox11); + gtk_box_pack_start (GTK_BOX (vbox10), hbox11, FALSE, FALSE, 0); - return addlocation; -} + label23 = gtk_label_new ("Output plugin:"); + gtk_widget_show (label23); + gtk_box_pack_start (GTK_BOX (hbox11), label23, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label23), 0, 0.5); -GtkWidget* -create_trackproperties (void) -{ - GtkWidget *trackproperties; - GtkWidget *vbox13; - GtkWidget *hbox23; - GtkWidget *label27; - GtkWidget *location; - GtkWidget *hbox24; - GtkWidget *label28; - GtkWidget *title; - GtkWidget *hbox25; - GtkWidget *label29; - GtkWidget *artist; - GtkWidget *hbox26; - GtkWidget *label30; - GtkWidget *album; - GtkWidget *hbox27; - GtkWidget *label35; - GtkWidget *genre; - GtkWidget *table8; - GtkWidget *label31; - GtkWidget *label33; - GtkWidget *year; - GtkWidget *track; - GtkWidget *hbox28; - GtkWidget *label36; - GtkWidget *scrolledwindow4; - GtkWidget *comment; + pref_output_plugin = gtk_combo_box_new_text (); + gtk_widget_show (pref_output_plugin); + gtk_box_pack_start (GTK_BOX (hbox11), pref_output_plugin, TRUE, TRUE, 0); - trackproperties = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (trackproperties), "Track Properties"); - gtk_window_set_destroy_with_parent (GTK_WINDOW (trackproperties), TRUE); - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (trackproperties), TRUE); - gtk_window_set_skip_pager_hint (GTK_WINDOW (trackproperties), TRUE); + hbox12 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox12); + gtk_box_pack_start (GTK_BOX (vbox10), hbox12, FALSE, FALSE, 0); - vbox13 = gtk_vbox_new (FALSE, 8); - gtk_widget_show (vbox13); - gtk_container_add (GTK_CONTAINER (trackproperties), vbox13); - gtk_container_set_border_width (GTK_CONTAINER (vbox13), 12); + label4 = gtk_label_new ("Output device:"); + gtk_widget_show (label4); + gtk_box_pack_start (GTK_BOX (hbox12), label4, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5); - hbox23 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox23); - gtk_box_pack_start (GTK_BOX (vbox13), hbox23, FALSE, FALSE, 0); + pref_soundcard = gtk_combo_box_new_text (); + gtk_widget_show (pref_soundcard); + gtk_box_pack_start (GTK_BOX (hbox12), pref_soundcard, TRUE, TRUE, 0); - label27 = gtk_label_new ("Location:"); - gtk_widget_show (label27); - gtk_box_pack_start (GTK_BOX (hbox23), label27, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label27), 0, 0.5); + Sound = gtk_label_new ("Sound"); + gtk_widget_show (Sound); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 0), Sound); - location = gtk_entry_new (); - gtk_widget_show (location); - gtk_box_pack_start (GTK_BOX (hbox23), location, TRUE, TRUE, 0); - gtk_editable_set_editable (GTK_EDITABLE (location), FALSE); - gtk_entry_set_invisible_char (GTK_ENTRY (location), 8226); + vbox8 = gtk_vbox_new (FALSE, 8); + gtk_widget_show (vbox8); + gtk_container_add (GTK_CONTAINER (notebook2), vbox8); + gtk_container_set_border_width (GTK_CONTAINER (vbox8), 12); - hbox24 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox24); - gtk_box_pack_start (GTK_BOX (vbox13), hbox24, FALSE, FALSE, 0); + pref_dynsamplerate = gtk_check_button_new_with_mnemonic ("Allow dynamic samplerate switching"); + gtk_widget_show (pref_dynsamplerate); + gtk_box_pack_start (GTK_BOX (vbox8), pref_dynsamplerate, FALSE, FALSE, 0); - label28 = gtk_label_new ("Title:"); - gtk_widget_show (label28); - gtk_box_pack_start (GTK_BOX (hbox24), label28, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label28), 0, 0.5); + hbox9 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox9); + gtk_box_pack_start (GTK_BOX (vbox8), hbox9, FALSE, FALSE, 0); - title = gtk_entry_new (); - gtk_widget_show (title); - gtk_box_pack_start (GTK_BOX (hbox24), title, TRUE, TRUE, 0); - gtk_editable_set_editable (GTK_EDITABLE (title), FALSE); - gtk_entry_set_invisible_char (GTK_ENTRY (title), 8226); + label6 = gtk_label_new ("Samplerate conversion quality:"); + gtk_widget_show (label6); + gtk_box_pack_start (GTK_BOX (hbox9), label6, FALSE, FALSE, 0); + gtk_label_set_justify (GTK_LABEL (label6), GTK_JUSTIFY_RIGHT); + gtk_misc_set_alignment (GTK_MISC (label6), 0, 0.5); - hbox25 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox25); - gtk_box_pack_start (GTK_BOX (vbox13), hbox25, FALSE, FALSE, 0); + pref_src_quality = gtk_combo_box_new_text (); + gtk_widget_show (pref_src_quality); + gtk_box_pack_start (GTK_BOX (hbox9), pref_src_quality, TRUE, TRUE, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_src_quality), "sinc_best_quality"); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_src_quality), "sinc_medium_quality"); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_src_quality), "sinc_fastest"); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_src_quality), "sinc_zero_order_hold"); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_src_quality), "linear"); - label29 = gtk_label_new ("Artist:"); - gtk_widget_show (label29); - gtk_box_pack_start (GTK_BOX (hbox25), label29, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label29), 0, 0.5); + hbox10 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox10); + gtk_box_pack_start (GTK_BOX (vbox8), hbox10, FALSE, FALSE, 0); - artist = gtk_entry_new (); - gtk_widget_show (artist); - gtk_box_pack_start (GTK_BOX (hbox25), artist, TRUE, TRUE, 0); - gtk_editable_set_editable (GTK_EDITABLE (artist), FALSE); - gtk_entry_set_invisible_char (GTK_ENTRY (artist), 8226); + label8 = gtk_label_new ("Replaygain mode:"); + gtk_widget_show (label8); + gtk_box_pack_start (GTK_BOX (hbox10), label8, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label8), 0, 0.5); - hbox26 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox26); - gtk_box_pack_start (GTK_BOX (vbox13), hbox26, FALSE, FALSE, 0); + pref_replaygain_mode = gtk_combo_box_new_text (); + gtk_widget_show (pref_replaygain_mode); + gtk_box_pack_start (GTK_BOX (hbox10), pref_replaygain_mode, TRUE, TRUE, 0); + gtk_widget_set_size_request (pref_replaygain_mode, 337, -1); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_replaygain_mode), "Disable"); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_replaygain_mode), "Track"); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_replaygain_mode), "Album"); - label30 = gtk_label_new ("Album:"); - gtk_widget_show (label30); - gtk_box_pack_start (GTK_BOX (hbox26), label30, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label30), 0, 0.5); + pref_replaygain_scale = gtk_check_button_new_with_mnemonic ("Replaygain peak scale"); + gtk_widget_show (pref_replaygain_scale); + gtk_box_pack_start (GTK_BOX (vbox8), pref_replaygain_scale, FALSE, FALSE, 0); - album = gtk_entry_new (); - gtk_widget_show (album); - gtk_box_pack_start (GTK_BOX (hbox26), album, TRUE, TRUE, 0); - gtk_editable_set_editable (GTK_EDITABLE (album), FALSE); - gtk_entry_set_invisible_char (GTK_ENTRY (album), 8226); + label39 = gtk_label_new ("Sound (adv.)"); + gtk_widget_show (label39); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 1), label39); - hbox27 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox27); - gtk_box_pack_start (GTK_BOX (vbox13), hbox27, FALSE, FALSE, 0); + vbox9 = gtk_vbox_new (FALSE, 8); + gtk_widget_show (vbox9); + gtk_container_add (GTK_CONTAINER (notebook2), vbox9); + gtk_container_set_border_width (GTK_CONTAINER (vbox9), 12); - label35 = gtk_label_new ("Genre:"); - gtk_widget_show (label35); - gtk_box_pack_start (GTK_BOX (hbox27), label35, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label35), 0, 0.5); + pref_close_send_to_tray = gtk_check_button_new_with_mnemonic ("Close minimizes to tray"); + gtk_widget_show (pref_close_send_to_tray); + gtk_box_pack_start (GTK_BOX (vbox9), pref_close_send_to_tray, FALSE, FALSE, 0); - genre = gtk_entry_new (); - gtk_widget_show (genre); - gtk_box_pack_start (GTK_BOX (hbox27), genre, TRUE, TRUE, 0); - gtk_editable_set_editable (GTK_EDITABLE (genre), FALSE); - gtk_entry_set_invisible_char (GTK_ENTRY (genre), 8226); + label2 = gtk_label_new ("GUI"); + gtk_widget_show (label2); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 2), label2); - table8 = gtk_table_new (2, 2, FALSE); - gtk_widget_show (table8); - gtk_box_pack_start (GTK_BOX (vbox13), table8, FALSE, FALSE, 0); - gtk_table_set_row_spacings (GTK_TABLE (table8), 8); - gtk_table_set_col_spacings (GTK_TABLE (table8), 8); + vbox11 = gtk_vbox_new (FALSE, 8); + gtk_widget_show (vbox11); + gtk_container_add (GTK_CONTAINER (notebook2), vbox11); + gtk_container_set_border_width (GTK_CONTAINER (vbox11), 12); - label31 = gtk_label_new ("Year:"); - gtk_widget_show (label31); - gtk_table_attach (GTK_TABLE (table8), label31, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_line_wrap (GTK_LABEL (label31), TRUE); - gtk_misc_set_alignment (GTK_MISC (label31), 0, 0.5); + pref_network_enableproxy = gtk_check_button_new_with_mnemonic ("Enable proxy server"); + gtk_widget_show (pref_network_enableproxy); + gtk_box_pack_start (GTK_BOX (vbox11), pref_network_enableproxy, FALSE, FALSE, 0); - label33 = gtk_label_new ("Track:"); - gtk_widget_show (label33); - gtk_table_attach (GTK_TABLE (table8), label33, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup (GTK_LABEL (label33), TRUE); - gtk_misc_set_alignment (GTK_MISC (label33), 0, 0.5); + hbox13 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox13); + gtk_box_pack_start (GTK_BOX (vbox11), hbox13, FALSE, FALSE, 0); - year = gtk_entry_new (); - gtk_widget_show (year); - gtk_table_attach (GTK_TABLE (table8), year, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_editable_set_editable (GTK_EDITABLE (year), FALSE); - gtk_entry_set_invisible_char (GTK_ENTRY (year), 8226); + label18 = gtk_label_new ("Proxy server address:"); + gtk_widget_show (label18); + gtk_box_pack_start (GTK_BOX (hbox13), label18, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label18), 0, 0.5); - track = gtk_entry_new (); - gtk_widget_show (track); - gtk_table_attach (GTK_TABLE (table8), track, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_editable_set_editable (GTK_EDITABLE (track), FALSE); - gtk_entry_set_invisible_char (GTK_ENTRY (track), 8226); + pref_network_proxyaddress = gtk_entry_new (); + gtk_widget_show (pref_network_proxyaddress); + gtk_box_pack_start (GTK_BOX (hbox13), pref_network_proxyaddress, TRUE, TRUE, 0); + gtk_entry_set_invisible_char (GTK_ENTRY (pref_network_proxyaddress), 8226); - hbox28 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox28); - gtk_box_pack_start (GTK_BOX (vbox13), hbox28, TRUE, TRUE, 0); + hbox14 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox14); + gtk_box_pack_start (GTK_BOX (vbox11), hbox14, FALSE, FALSE, 0); - label36 = gtk_label_new ("Comment:"); - gtk_widget_show (label36); - gtk_box_pack_start (GTK_BOX (hbox28), label36, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label36), 0, 0.5); + label19 = gtk_label_new ("Proxy server port:"); + gtk_widget_show (label19); + gtk_box_pack_start (GTK_BOX (hbox14), label19, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label19), 0, 0.5); - scrolledwindow4 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow4); - gtk_box_pack_start (GTK_BOX (hbox28), scrolledwindow4, TRUE, TRUE, 0); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow4), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow4), GTK_SHADOW_IN); + pref_network_proxyport = gtk_entry_new (); + gtk_widget_show (pref_network_proxyport); + gtk_box_pack_start (GTK_BOX (hbox14), pref_network_proxyport, TRUE, TRUE, 0); + gtk_entry_set_invisible_char (GTK_ENTRY (pref_network_proxyport), 8226); - comment = gtk_text_view_new (); - gtk_widget_show (comment); - gtk_container_add (GTK_CONTAINER (scrolledwindow4), comment); - gtk_text_view_set_editable (GTK_TEXT_VIEW (comment), FALSE); + hbox15 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox15); + gtk_box_pack_start (GTK_BOX (vbox11), hbox15, FALSE, FALSE, 0); - g_signal_connect ((gpointer) trackproperties, "key_press_event", - G_CALLBACK (on_trackproperties_key_press_event), - NULL); - g_signal_connect ((gpointer) trackproperties, "delete_event", - G_CALLBACK (on_trackproperties_delete_event), - NULL); + label20 = gtk_label_new ("Proxy type:"); + gtk_widget_show (label20); + gtk_box_pack_start (GTK_BOX (hbox15), label20, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label20), 0, 0.5); - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (trackproperties, trackproperties, "trackproperties"); - GLADE_HOOKUP_OBJECT (trackproperties, vbox13, "vbox13"); - GLADE_HOOKUP_OBJECT (trackproperties, hbox23, "hbox23"); - GLADE_HOOKUP_OBJECT (trackproperties, label27, "label27"); - GLADE_HOOKUP_OBJECT (trackproperties, location, "location"); - GLADE_HOOKUP_OBJECT (trackproperties, hbox24, "hbox24"); - GLADE_HOOKUP_OBJECT (trackproperties, label28, "label28"); - GLADE_HOOKUP_OBJECT (trackproperties, title, "title"); - GLADE_HOOKUP_OBJECT (trackproperties, hbox25, "hbox25"); - GLADE_HOOKUP_OBJECT (trackproperties, label29, "label29"); - GLADE_HOOKUP_OBJECT (trackproperties, artist, "artist"); - GLADE_HOOKUP_OBJECT (trackproperties, hbox26, "hbox26"); - GLADE_HOOKUP_OBJECT (trackproperties, label30, "label30"); - GLADE_HOOKUP_OBJECT (trackproperties, album, "album"); - GLADE_HOOKUP_OBJECT (trackproperties, hbox27, "hbox27"); - GLADE_HOOKUP_OBJECT (trackproperties, label35, "label35"); - GLADE_HOOKUP_OBJECT (trackproperties, genre, "genre"); - GLADE_HOOKUP_OBJECT (trackproperties, table8, "table8"); - GLADE_HOOKUP_OBJECT (trackproperties, label31, "label31"); - GLADE_HOOKUP_OBJECT (trackproperties, label33, "label33"); - GLADE_HOOKUP_OBJECT (trackproperties, year, "year"); - GLADE_HOOKUP_OBJECT (trackproperties, track, "track"); - GLADE_HOOKUP_OBJECT (trackproperties, hbox28, "hbox28"); - GLADE_HOOKUP_OBJECT (trackproperties, label36, "label36"); - GLADE_HOOKUP_OBJECT (trackproperties, scrolledwindow4, "scrolledwindow4"); - GLADE_HOOKUP_OBJECT (trackproperties, comment, "comment"); + pref_network_proxytype = gtk_combo_box_new_text (); + gtk_widget_show (pref_network_proxytype); + gtk_box_pack_start (GTK_BOX (hbox15), pref_network_proxytype, TRUE, TRUE, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "HTTP"); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "HTTP_1_0"); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "SOCKS4"); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "SOCKS5"); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "SOCKS4A"); + gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "SOCKS5_HOSTNAME"); - return trackproperties; -} + label16 = gtk_label_new ("Network"); + gtk_widget_show (label16); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 3), label16); -GtkWidget* -create_editcolumndlg (void) -{ - GtkWidget *editcolumndlg; - GtkWidget *dialog_vbox1; - GtkWidget *vbox14; - GtkWidget *hbox29; - GtkWidget *label26; - GtkWidget *title; - GtkWidget *hbox30; - GtkWidget *label37; - GtkWidget *id; - GtkWidget *hbox31; - GtkWidget *fmtlabel; - GtkWidget *format; - GtkWidget *hbox32; - GtkWidget *label38; - GtkWidget *align; - GtkWidget *label25; - GtkWidget *dialog_action_area1; - GtkWidget *cancelbutton1; - GtkWidget *okbutton1; + hpaned1 = gtk_hpaned_new (); + gtk_widget_show (hpaned1); + gtk_container_add (GTK_CONTAINER (notebook2), hpaned1); + gtk_container_set_border_width (GTK_CONTAINER (hpaned1), 12); + gtk_paned_set_position (GTK_PANED (hpaned1), 0); - editcolumndlg = gtk_dialog_new (); - gtk_container_set_border_width (GTK_CONTAINER (editcolumndlg), 12); - gtk_window_set_title (GTK_WINDOW (editcolumndlg), "dialog1"); - gtk_window_set_modal (GTK_WINDOW (editcolumndlg), TRUE); - gtk_window_set_type_hint (GTK_WINDOW (editcolumndlg), GDK_WINDOW_TYPE_HINT_DIALOG); + scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolledwindow2); + gtk_paned_pack1 (GTK_PANED (hpaned1), scrolledwindow2, FALSE, FALSE); + gtk_widget_set_size_request (scrolledwindow2, 280, -1); + gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow2), 3); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow2), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow2), GTK_SHADOW_IN); - dialog_vbox1 = GTK_DIALOG (editcolumndlg)->vbox; - gtk_widget_show (dialog_vbox1); + pref_pluginlist = gtk_tree_view_new (); + gtk_widget_show (pref_pluginlist); + gtk_container_add (GTK_CONTAINER (scrolledwindow2), pref_pluginlist); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (pref_pluginlist), TRUE); - vbox14 = gtk_vbox_new (FALSE, 8); - gtk_widget_show (vbox14); - gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox14, TRUE, TRUE, 0); + vbox12 = gtk_vbox_new (FALSE, 8); + gtk_widget_show (vbox12); + gtk_paned_pack2 (GTK_PANED (hpaned1), vbox12, TRUE, TRUE); + gtk_container_set_border_width (GTK_CONTAINER (vbox12), 12); - hbox29 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox29); - gtk_box_pack_start (GTK_BOX (vbox14), hbox29, FALSE, FALSE, 0); + hbox16 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox16); + gtk_box_pack_start (GTK_BOX (vbox12), hbox16, FALSE, FALSE, 0); - label26 = gtk_label_new ("Title:"); - gtk_widget_show (label26); - gtk_box_pack_start (GTK_BOX (hbox29), label26, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label26), 0, 0.5); + label11 = gtk_label_new ("Description:"); + gtk_widget_show (label11); + gtk_box_pack_start (GTK_BOX (hbox16), label11, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label11), 0, 0.5); - title = gtk_entry_new (); - gtk_widget_show (title); - gtk_box_pack_start (GTK_BOX (hbox29), title, TRUE, TRUE, 0); - gtk_entry_set_text (GTK_ENTRY (title), "Enter new column title here"); - gtk_entry_set_invisible_char (GTK_ENTRY (title), 9679); - gtk_entry_set_activates_default (GTK_ENTRY (title), TRUE); + pref_plugin_descr = gtk_entry_new (); + gtk_widget_show (pref_plugin_descr); + gtk_box_pack_start (GTK_BOX (hbox16), pref_plugin_descr, TRUE, TRUE, 0); + gtk_editable_set_editable (GTK_EDITABLE (pref_plugin_descr), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY (pref_plugin_descr), 9679); - hbox30 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox30); - gtk_box_pack_start (GTK_BOX (vbox14), hbox30, FALSE, FALSE, 0); + hbox17 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox17); + gtk_box_pack_start (GTK_BOX (vbox12), hbox17, FALSE, FALSE, 0); - label37 = gtk_label_new ("Type:"); - gtk_widget_show (label37); - gtk_box_pack_start (GTK_BOX (hbox30), label37, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label37), 0, 0.5); + label12 = gtk_label_new ("Author(s):"); + gtk_widget_show (label12); + gtk_box_pack_start (GTK_BOX (hbox17), label12, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label12), 0, 0.5); - id = gtk_combo_box_new_text (); - gtk_widget_show (id); - gtk_box_pack_start (GTK_BOX (hbox30), id, TRUE, TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (id), "File number"); - gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Playing"); - gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Artist - Album"); - gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Artist"); - gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Album"); - gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Title"); - gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Length"); - gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Track"); - gtk_combo_box_append_text (GTK_COMBO_BOX (id), "Custom"); + pref_plugin_author = gtk_entry_new (); + gtk_widget_show (pref_plugin_author); + gtk_box_pack_start (GTK_BOX (hbox17), pref_plugin_author, TRUE, TRUE, 0); + gtk_editable_set_editable (GTK_EDITABLE (pref_plugin_author), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY (pref_plugin_author), 9679); - hbox31 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox31); - gtk_box_pack_start (GTK_BOX (vbox14), hbox31, FALSE, FALSE, 0); + hbox18 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox18); + gtk_box_pack_start (GTK_BOX (vbox12), hbox18, FALSE, FALSE, 0); - fmtlabel = gtk_label_new ("Format:"); - gtk_widget_show (fmtlabel); - gtk_box_pack_start (GTK_BOX (hbox31), fmtlabel, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (fmtlabel), 0, 0.5); + label13 = gtk_label_new ("Email:"); + gtk_widget_show (label13); + gtk_box_pack_start (GTK_BOX (hbox18), label13, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label13), 0, 0.5); - format = gtk_entry_new (); - gtk_widget_show (format); - gtk_box_pack_start (GTK_BOX (hbox31), format, TRUE, TRUE, 0); - gtk_entry_set_invisible_char (GTK_ENTRY (format), 9679); - gtk_entry_set_activates_default (GTK_ENTRY (format), TRUE); + pref_plugin_email = gtk_entry_new (); + gtk_widget_show (pref_plugin_email); + gtk_box_pack_start (GTK_BOX (hbox18), pref_plugin_email, TRUE, TRUE, 0); + gtk_editable_set_editable (GTK_EDITABLE (pref_plugin_email), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY (pref_plugin_email), 9679); - hbox32 = gtk_hbox_new (FALSE, 8); - gtk_widget_show (hbox32); - gtk_box_pack_start (GTK_BOX (vbox14), hbox32, FALSE, FALSE, 0); + hbox19 = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox19); + gtk_box_pack_start (GTK_BOX (vbox12), hbox19, FALSE, FALSE, 0); - label38 = gtk_label_new ("Alignment:"); - gtk_widget_show (label38); - gtk_box_pack_start (GTK_BOX (hbox32), label38, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label38), 0, 0.5); + label14 = gtk_label_new ("Website:"); + gtk_widget_show (label14); + gtk_box_pack_start (GTK_BOX (hbox19), label14, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label14), 0, 0.5); - align = gtk_combo_box_new_text (); - gtk_widget_show (align); - gtk_box_pack_start (GTK_BOX (hbox32), align, TRUE, TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (align), "Left"); - gtk_combo_box_append_text (GTK_COMBO_BOX (align), "Right"); + pref_plugin_website = gtk_entry_new (); + gtk_widget_show (pref_plugin_website); + gtk_box_pack_start (GTK_BOX (hbox19), pref_plugin_website, TRUE, TRUE, 0); + gtk_editable_set_editable (GTK_EDITABLE (pref_plugin_website), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY (pref_plugin_website), 9679); - label25 = gtk_label_new ("Format conversions (start with %):\n [a]rtist, [t]itle, al[b]um, track[n]umber,\n [l]ength, [y]ear, [g]enre, [c]omment,\n copy[r]ight, [f]ilename\nExample: %a - %t [%l]"); - gtk_widget_show (label25); - gtk_box_pack_start (GTK_BOX (vbox14), label25, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS (label25, GTK_CAN_FOCUS); - gtk_label_set_use_markup (GTK_LABEL (label25), TRUE); - gtk_label_set_selectable (GTK_LABEL (label25), TRUE); - gtk_misc_set_alignment (GTK_MISC (label25), 0.1, 0.5); + hbox20 = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox20); + gtk_box_pack_start (GTK_BOX (vbox12), hbox20, FALSE, FALSE, 0); - dialog_action_area1 = GTK_DIALOG (editcolumndlg)->action_area; - gtk_widget_show (dialog_action_area1); - gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END); + configure_plugin = gtk_button_new_with_mnemonic ("Configure"); + gtk_widget_show (configure_plugin); + gtk_box_pack_start (GTK_BOX (hbox20), configure_plugin, TRUE, FALSE, 0); - cancelbutton1 = gtk_button_new_with_mnemonic ("_Cancel"); - gtk_widget_show (cancelbutton1); - gtk_dialog_add_action_widget (GTK_DIALOG (editcolumndlg), cancelbutton1, GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_DEFAULT); + label3 = gtk_label_new ("Plugins"); + gtk_widget_show (label3); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 4), label3); - okbutton1 = gtk_button_new_with_mnemonic ("_OK"); - gtk_widget_show (okbutton1); - gtk_dialog_add_action_widget (GTK_DIALOG (editcolumndlg), okbutton1, GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT); + dialog_action_area2 = GTK_DIALOG (prefwin)->action_area; + gtk_widget_show (dialog_action_area2); + gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area2), GTK_BUTTONBOX_END); - g_signal_connect ((gpointer) id, "changed", - G_CALLBACK (on_column_id_changed), + closebutton1 = gtk_button_new_from_stock ("gtk-close"); + gtk_widget_show (closebutton1); + gtk_dialog_add_action_widget (GTK_DIALOG (prefwin), closebutton1, GTK_RESPONSE_CLOSE); + GTK_WIDGET_SET_FLAGS (closebutton1, GTK_CAN_DEFAULT); + + g_signal_connect ((gpointer) pref_dynsamplerate, "clicked", + G_CALLBACK (on_pref_dynsamplerate_clicked), + NULL); + g_signal_connect ((gpointer) pref_src_quality, "changed", + G_CALLBACK (on_pref_src_quality_changed), + NULL); + g_signal_connect ((gpointer) pref_replaygain_mode, "changed", + G_CALLBACK (on_pref_replaygain_mode_changed), + NULL); + g_signal_connect ((gpointer) pref_replaygain_scale, "clicked", + G_CALLBACK (on_pref_replaygain_scale_clicked), + NULL); + g_signal_connect ((gpointer) pref_close_send_to_tray, "clicked", + G_CALLBACK (on_pref_close_send_to_tray_clicked), + NULL); + g_signal_connect ((gpointer) pref_network_enableproxy, "clicked", + G_CALLBACK (on_pref_network_enableproxy_clicked), + NULL); + g_signal_connect ((gpointer) pref_network_proxyaddress, "changed", + G_CALLBACK (on_pref_network_proxyaddress_changed), + NULL); + g_signal_connect ((gpointer) pref_network_proxyport, "changed", + G_CALLBACK (on_pref_network_proxyport_changed), + NULL); + g_signal_connect ((gpointer) pref_network_proxytype, "changed", + G_CALLBACK (on_pref_network_proxytype_changed), + NULL); + g_signal_connect ((gpointer) pref_pluginlist, "cursor_changed", + G_CALLBACK (on_pref_pluginlist_cursor_changed), + NULL); + g_signal_connect ((gpointer) configure_plugin, "clicked", + G_CALLBACK (on_configure_plugin_clicked), NULL); /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (editcolumndlg, editcolumndlg, "editcolumndlg"); - GLADE_HOOKUP_OBJECT_NO_REF (editcolumndlg, dialog_vbox1, "dialog_vbox1"); - GLADE_HOOKUP_OBJECT (editcolumndlg, vbox14, "vbox14"); - GLADE_HOOKUP_OBJECT (editcolumndlg, hbox29, "hbox29"); - GLADE_HOOKUP_OBJECT (editcolumndlg, label26, "label26"); - GLADE_HOOKUP_OBJECT (editcolumndlg, title, "title"); - GLADE_HOOKUP_OBJECT (editcolumndlg, hbox30, "hbox30"); - GLADE_HOOKUP_OBJECT (editcolumndlg, label37, "label37"); - GLADE_HOOKUP_OBJECT (editcolumndlg, id, "id"); - GLADE_HOOKUP_OBJECT (editcolumndlg, hbox31, "hbox31"); - GLADE_HOOKUP_OBJECT (editcolumndlg, fmtlabel, "fmtlabel"); - GLADE_HOOKUP_OBJECT (editcolumndlg, format, "format"); - GLADE_HOOKUP_OBJECT (editcolumndlg, hbox32, "hbox32"); - GLADE_HOOKUP_OBJECT (editcolumndlg, label38, "label38"); - GLADE_HOOKUP_OBJECT (editcolumndlg, align, "align"); - GLADE_HOOKUP_OBJECT (editcolumndlg, label25, "label25"); - GLADE_HOOKUP_OBJECT_NO_REF (editcolumndlg, dialog_action_area1, "dialog_action_area1"); - GLADE_HOOKUP_OBJECT (editcolumndlg, cancelbutton1, "cancelbutton1"); - GLADE_HOOKUP_OBJECT (editcolumndlg, okbutton1, "okbutton1"); + GLADE_HOOKUP_OBJECT_NO_REF (prefwin, prefwin, "prefwin"); + GLADE_HOOKUP_OBJECT_NO_REF (prefwin, dialog_vbox2, "dialog_vbox2"); + GLADE_HOOKUP_OBJECT (prefwin, notebook2, "notebook2"); + GLADE_HOOKUP_OBJECT (prefwin, vbox10, "vbox10"); + GLADE_HOOKUP_OBJECT (prefwin, hbox11, "hbox11"); + GLADE_HOOKUP_OBJECT (prefwin, label23, "label23"); + GLADE_HOOKUP_OBJECT (prefwin, pref_output_plugin, "pref_output_plugin"); + GLADE_HOOKUP_OBJECT (prefwin, hbox12, "hbox12"); + GLADE_HOOKUP_OBJECT (prefwin, label4, "label4"); + GLADE_HOOKUP_OBJECT (prefwin, pref_soundcard, "pref_soundcard"); + GLADE_HOOKUP_OBJECT (prefwin, Sound, "Sound"); + GLADE_HOOKUP_OBJECT (prefwin, vbox8, "vbox8"); + GLADE_HOOKUP_OBJECT (prefwin, pref_dynsamplerate, "pref_dynsamplerate"); + GLADE_HOOKUP_OBJECT (prefwin, hbox9, "hbox9"); + GLADE_HOOKUP_OBJECT (prefwin, label6, "label6"); + GLADE_HOOKUP_OBJECT (prefwin, pref_src_quality, "pref_src_quality"); + GLADE_HOOKUP_OBJECT (prefwin, hbox10, "hbox10"); + GLADE_HOOKUP_OBJECT (prefwin, label8, "label8"); + GLADE_HOOKUP_OBJECT (prefwin, pref_replaygain_mode, "pref_replaygain_mode"); + GLADE_HOOKUP_OBJECT (prefwin, pref_replaygain_scale, "pref_replaygain_scale"); + GLADE_HOOKUP_OBJECT (prefwin, label39, "label39"); + GLADE_HOOKUP_OBJECT (prefwin, vbox9, "vbox9"); + GLADE_HOOKUP_OBJECT (prefwin, pref_close_send_to_tray, "pref_close_send_to_tray"); + GLADE_HOOKUP_OBJECT (prefwin, label2, "label2"); + GLADE_HOOKUP_OBJECT (prefwin, vbox11, "vbox11"); + GLADE_HOOKUP_OBJECT (prefwin, pref_network_enableproxy, "pref_network_enableproxy"); + GLADE_HOOKUP_OBJECT (prefwin, hbox13, "hbox13"); + GLADE_HOOKUP_OBJECT (prefwin, label18, "label18"); + GLADE_HOOKUP_OBJECT (prefwin, pref_network_proxyaddress, "pref_network_proxyaddress"); + GLADE_HOOKUP_OBJECT (prefwin, hbox14, "hbox14"); + GLADE_HOOKUP_OBJECT (prefwin, label19, "label19"); + GLADE_HOOKUP_OBJECT (prefwin, pref_network_proxyport, "pref_network_proxyport"); + GLADE_HOOKUP_OBJECT (prefwin, hbox15, "hbox15"); + GLADE_HOOKUP_OBJECT (prefwin, label20, "label20"); + GLADE_HOOKUP_OBJECT (prefwin, pref_network_proxytype, "pref_network_proxytype"); + GLADE_HOOKUP_OBJECT (prefwin, label16, "label16"); + GLADE_HOOKUP_OBJECT (prefwin, hpaned1, "hpaned1"); + GLADE_HOOKUP_OBJECT (prefwin, scrolledwindow2, "scrolledwindow2"); + GLADE_HOOKUP_OBJECT (prefwin, pref_pluginlist, "pref_pluginlist"); + GLADE_HOOKUP_OBJECT (prefwin, vbox12, "vbox12"); + GLADE_HOOKUP_OBJECT (prefwin, hbox16, "hbox16"); + GLADE_HOOKUP_OBJECT (prefwin, label11, "label11"); + GLADE_HOOKUP_OBJECT (prefwin, pref_plugin_descr, "pref_plugin_descr"); + GLADE_HOOKUP_OBJECT (prefwin, hbox17, "hbox17"); + GLADE_HOOKUP_OBJECT (prefwin, label12, "label12"); + GLADE_HOOKUP_OBJECT (prefwin, pref_plugin_author, "pref_plugin_author"); + GLADE_HOOKUP_OBJECT (prefwin, hbox18, "hbox18"); + GLADE_HOOKUP_OBJECT (prefwin, label13, "label13"); + GLADE_HOOKUP_OBJECT (prefwin, pref_plugin_email, "pref_plugin_email"); + GLADE_HOOKUP_OBJECT (prefwin, hbox19, "hbox19"); + GLADE_HOOKUP_OBJECT (prefwin, label14, "label14"); + GLADE_HOOKUP_OBJECT (prefwin, pref_plugin_website, "pref_plugin_website"); + GLADE_HOOKUP_OBJECT (prefwin, hbox20, "hbox20"); + GLADE_HOOKUP_OBJECT (prefwin, configure_plugin, "configure_plugin"); + GLADE_HOOKUP_OBJECT (prefwin, label3, "label3"); + GLADE_HOOKUP_OBJECT_NO_REF (prefwin, dialog_action_area2, "dialog_action_area2"); + GLADE_HOOKUP_OBJECT (prefwin, closebutton1, "closebutton1"); - return editcolumndlg; + return prefwin; } diff --git a/plugins/gtkui/interface.h b/plugins/gtkui/interface.h index 931f74bd..0cac3e09 100644 --- a/plugins/gtkui/interface.h +++ b/plugins/gtkui/interface.h @@ -7,8 +7,8 @@ GtkWidget* create_searchwin (void); GtkWidget* create_traymenu (void); GtkWidget* create_addprogress (void); GtkWidget* create_helpwindow (void); -GtkWidget* create_prefwin (void); GtkWidget* create_headermenu (void); GtkWidget* create_addlocation (void); GtkWidget* create_trackproperties (void); GtkWidget* create_editcolumndlg (void); +GtkWidget* create_prefwin (void); -- cgit v1.2.3