# HG changeset patch
# User nhjm449
# Date 1145237699 25200
# Node ID 8cfe13fcd0c792be143000de069dfa00616fecd0
# Parent  6b3750ab5eab1e9b7ea78403a26d93ed5dd01d0f
[svn] - Forgot a few things regarding titlestrings!

diff -r 6b3750ab5eab -r 8cfe13fcd0c7 audacious/glade/prefswin.glade
--- a/audacious/glade/prefswin.glade	Sun Apr 16 17:51:07 2006 -0700
+++ b/audacious/glade/prefswin.glade	Sun Apr 16 18:34:59 2006 -0700
@@ -2584,6 +2584,8 @@
 					  <property name="items" translatable="yes">TITLE
 ARTIST - TITLE
 ARTIST - ALBUM - TITLE
+ARTIST - ALBUM - TRACK. TITLE
+ARTIST [ ALBUM ] - TRACK. TITLE
 ALBUM - TITLE
 Custom</property>
 					  <property name="add_tearoffs">False</property>
diff -r 6b3750ab5eab -r 8cfe13fcd0c7 audacious/main.c
--- a/audacious/main.c	Sun Apr 16 17:51:07 2006 -0700
+++ b/audacious/main.c	Sun Apr 16 18:34:59 2006 -0700
@@ -188,7 +188,7 @@
     FALSE,                      /* show window decorations */
     8,                          /* mouse wheel scroll step */
     FALSE,                      /* playlist transparent */
-    2,                          /* 2nd preset (ARTIST - TITLE) */
+    4,                          /* 5th preset (ARTIST [ ALBUM ] - TRACK. TITLE) */
     NULL,                       /* title format */
     FALSE,                      /* software volume control enabled */
     TRUE,                       /* UNUSED (XMMS compatibility mode) */
@@ -216,12 +216,11 @@
 
 const gchar *bmp_titlestring_presets[] = {
     "%t",
-    "%p - %t",
-    "%p - %a - %t",
-    "%p - %{a:%a - %}%t",
+    "%{p:%p - %}%t",
+    "%{p:%p - %}%{a:%a - %}%t",
     "%{p:%p - %}%{a:%a - %}%{n:%n. %}%t",
     "%{p:%p %}%{a:[ %a ] %}%{p:- %}%{n:%n. %}%{t:%t%}",
-    "%a - %t"
+    "%{a:%a - %}%t"
 };
 
 const guint n_titlestring_presets = G_N_ELEMENTS(bmp_titlestring_presets);
diff -r 6b3750ab5eab -r 8cfe13fcd0c7 audacious/prefswin.c
--- a/audacious/prefswin.c	Sun Apr 16 17:51:07 2006 -0700
+++ b/audacious/prefswin.c	Sun Apr 16 18:34:59 2006 -0700
@@ -847,7 +847,7 @@
     gint position = gtk_combo_box_get_active(GTK_COMBO_BOX(cbox));
     
     cfg.titlestring_preset = position;
-    gtk_widget_set_sensitive(GTK_WIDGET(data), (position == 4));
+    gtk_widget_set_sensitive(GTK_WIDGET(data), (position == 6));
 }
 
 static void