#Patch for classical display in MythMusic

Index: mythmusic/databasebox.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythplugins/mythmusic/mythmusic/databasebox.cpp,v
retrieving revision 1.42
diff -u -r1.42 databasebox.cpp
--- mythmusic/databasebox.cpp	6 Feb 2005 18:27:45 -0000	1.42
+++ mythmusic/databasebox.cpp	17 Apr 2005 14:58:23 -0000
@@ -641,11 +641,11 @@
             tmpstr = tr("Compilation Artist:\t") + mdata->CompilationArtist();
             m_lines.at(line++)->SetText(tmpstr);
         }
-        tmpstr = tr("Artist:\t") + mdata->Artist();
+        tmpstr = tr("Composer:\t") + mdata->Artist();
         m_lines.at(line++)->SetText(tmpstr);
-        tmpstr = tr("Album:\t") + mdata->Album();
+        tmpstr = tr("Work:\t") + mdata->Album();
         m_lines.at(line++)->SetText(tmpstr);
-        tmpstr = tr("Title:\t") + mdata->Title();
+        tmpstr = tr("Performers:\t") + mdata->Title();
         m_lines.at(line++)->SetText(tmpstr);
         
         if (m_lines.at(line))
Index: mythmusic/music-ui.xml
===================================================================
RCS file: /var/lib/mythcvs/mythplugins/mythmusic/mythmusic/music-ui.xml,v
retrieving revision 1.21
diff -u -r1.21 music-ui.xml
--- mythmusic/music-ui.xml	10 Feb 2005 07:20:39 -0000	1.21
+++ mythmusic/music-ui.xml	17 Apr 2005 14:58:24 -0000
@@ -11,13 +11,13 @@
     <window name="music_select">
       <font name="active" face="Arial">
          <color>#ffffff</color>
-         <size>18</size>
+         <size>14</size>
          <bold>yes</bold>
       </font>
 
       <font name="inactive" face="Arial">
         <color>#9999cc</color>
-        <size>18</size>
+        <size>14</size>
         <bold>yes</bold>
       </font>
 
@@ -96,43 +96,43 @@
         -->
         <font name="active" face="Arial">
             <color>#ffffff</color>
-            <size>18</size>
+            <size>14</size>
             <bold>yes</bold>
         </font>
 
         <font name="inactive" face="Arial">
             <color>#9999cc</color>
-            <size>18</size>
+            <size>14</size>
             <bold>yes</bold>
         </font>
   
         <font name="selected" face="Arial">
             <color>#ffff00</color>
-            <size>18</size>
+            <size>14</size>
             <bold>yes</bold>
         </font>
 
         <font name="currenttitle" face="Arial">
             <color>#ffffff</color>
-            <size>20</size>
+            <size>14</size>
             <bold>yes</bold>
         </font>
 
         <font name="currentartist" face="Arial">
             <color>#ffffff</color>
-            <size>16</size>
+            <size>14</size>
             <bold>yes</bold>
         </font>
 
         <font name="infotext" face="Arial">
             <color>#ffffff</color>
-            <size>12</size>
+            <size>10</size>
             <bold>yes</bold>
         </font>
 
         <font name="buttons" face="Arial">
             <color>#ffffff</color>
-            <size>12</size>
+            <size>10</size>
             <bold>yes</bold>
         </font>
 
@@ -256,21 +256,21 @@
         <container name="trackinfo">
             <area>0,315,680,160</area>
 
-            <textarea name="title_text" draworder="1" align="left">
-                <font>currenttitle</font>
-                <area>270,15,415,34</area>
-                <cutdown>yes</cutdown>
-            </textarea>
-
             <textarea name="artist_text" draworder="1" align="left">
                 <font>currentartist</font>
-                <area>270,50,415,25</area>
+                <area>270,15,415,30</area>
                 <cutdown>yes</cutdown>
             </textarea>
 
             <textarea name="album_text" draworder="1" align="left">
                 <font>currentartist</font>
-                <area>270,73,415,25</area>
+                <area>270,45,415,25</area>
+                <cutdown>yes</cutdown>
+            </textarea>
+
+            <textarea name="title_text" draworder="1" align="left">
+                <font>currenttitle</font>
+                <area>270,70,415,25</area>
                 <cutdown>yes</cutdown>
             </textarea>
 
@@ -281,7 +281,7 @@
             </repeatedimage>
 
             <textarea name="current_visualization_text" draworder="1" align="right">
-                <font>currentartist</font>
+                <font>infotext</font>
                 <area>470,100,200,25</area>
                 <cutdown>no</cutdown>
             </textarea>
@@ -413,7 +413,7 @@
      <font name="title" face="Arial">
          <color>#ffff00</color>
          <dropcolor>#000000</dropcolor>
-         <size>24</size>
+         <size>16</size>
          <shadow>3,3</shadow>
          <bold>yes</bold>
      </font>
@@ -421,7 +421,7 @@
      <font name="labels" face="Arial">
          <color>#ffff00</color>
          <dropcolor>#000000</dropcolor>
-         <size>18</size>
+         <size>16</size>
          <shadow>3,3</shadow>
          <bold>yes</bold>
      </font>
@@ -429,7 +429,7 @@
      <font name="display" face="Arial">
          <color>#ffffff</color>
          <dropcolor>#000000</dropcolor>
-         <size>18</size>
+         <size>16</size>
          <shadow>3,3</shadow>
          <bold>yes</bold>
      </font>
@@ -463,19 +463,19 @@
             <textarea name="artist_label" draworder="1" align="right">
                 <area>15,150,170,30</area>
                 <font>labels</font>
-                <value>Artist:</value>
+                <value>Composer (artist):</value>
             </textarea>
 
             <textarea name="album_label" draworder="1" align="right">
                 <area>15,190,170,30</area>
                 <font>labels</font>
-                <value>Album:</value>
+                <value>Piece (album):</value>
             </textarea>
 
             <textarea name="title_text" draworder="1" align="right">
                 <area>15,230,170,30</area>
                 <font>labels</font>
-                <value>Title:</value>
+                <value>Performers (title):</value>
             </textarea>
 
             <textarea name="genre_label" draworder="1" align="right">
Index: mythmusic/playbackbox.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythplugins/mythmusic/mythmusic/playbackbox.cpp,v
retrieving revision 1.85
diff -u -r1.85 playbackbox.cpp
--- mythmusic/playbackbox.cpp	11 Apr 2005 01:49:27 -0000	1.85
+++ mythmusic/playbackbox.cpp	17 Apr 2005 14:58:26 -0000
@@ -438,10 +438,12 @@
                               SLOT(allTracks()));
     if (curMeta)
     {
-        playlist_popup->addButton(tr("Tracks by current Artist"), this,
+        playlist_popup->addButton(tr("Tracks by current Composer"), this,
                                   SLOT(byArtist()));
-        playlist_popup->addButton(tr("Tracks from current Album"), this,
+        playlist_popup->addButton(tr("Tracks with current Work"), this,
                                   SLOT(byAlbum()));
+        playlist_popup->addButton(tr("Tracks with current Performers"), this,
+                                  SLOT(byTitle()));
         playlist_popup->addButton(tr("Tracks from current Genre"), this,
                                   SLOT(byGenre()));
         playlist_popup->addButton(tr("Tracks from current Year"), this,
@@ -504,6 +506,17 @@
     closePlaylistPopup();
 }
 
+void PlaybackBoxMusic::byTitle()
+{
+    if (!playlist_popup || !curMeta)
+        return;
+    
+    QString value = formattedFieldValue(curMeta->Title().utf8());
+    QString whereClause = "WHERE title = " + value + " ORDER BY artist";
+    closePlaylistPopup();
+    updatePlaylistFromQuickPlaylist(whereClause);
+}	
+
 void PlaybackBoxMusic::byAlbum()
 {
     if (!playlist_popup || !curMeta)
@@ -511,7 +524,7 @@
 
     QString value = formattedFieldValue(curMeta->Album().utf8());
     QString whereClause = "WHERE album = " + value + 
-                          " ORDER BY tracknum";
+                          " ORDER BY artist, title";
     closePlaylistPopup();
     updatePlaylistFromQuickPlaylist(whereClause);
 }
Index: mythmusic/playbackbox.h
===================================================================
RCS file: /var/lib/mythcvs/mythplugins/mythmusic/mythmusic/playbackbox.h,v
retrieving revision 1.35
diff -u -r1.35 playbackbox.h
--- mythmusic/playbackbox.h	6 Feb 2005 06:53:58 -0000	1.35
+++ mythmusic/playbackbox.h	17 Apr 2005 14:58:26 -0000
@@ -80,6 +80,7 @@
     void byAlbum();
     void byGenre();
     void byYear();    
+    void byTitle();
     void showSmartPlaylistDialog();
     
   signals:
Index: mythmusic/playlist.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythplugins/mythmusic/mythmusic/playlist.cpp,v
retrieving revision 1.27
diff -u -r1.27 playlist.cpp
--- mythmusic/playlist.cpp	23 Feb 2005 20:41:08 -0000	1.27
+++ mythmusic/playlist.cpp	17 Apr 2005 14:58:27 -0000
@@ -808,7 +808,7 @@
                 Metadata *tmpdata = all_available_music->getMetadata(it->getValue());
                 if (tmpdata)
                 {
-                    QString a_string = QString(QObject::tr("%1 ~ %2")).arg(tmpdata->FormatArtist()).arg(tmpdata->FormatTitle());
+                    QString a_string = QString(QObject::tr("%1 ~ %2 ~ %3")).arg(tmpdata->FormatArtist()).arg(tmpdata->Album()).arg(tmpdata->FormatTitle());
                     GenericTree *added_node = tree_to_write_to->addNode(a_string, it->getValue(), true);
                     ++a_counter;
                     added_node->setAttribute(0, 1);
@@ -854,8 +854,8 @@
             Metadata *tmpdata = all_available_music->getMetadata(it->getValue());
             if (tmpdata)
             {
-                QString a_string = QString(QObject::tr("CD: %1 ~ %2 - %3"))
-                  .arg(tmpdata->FormatArtist()).arg(tmpdata->Track()).arg(tmpdata->FormatTitle());
+                QString a_string = QString(QObject::tr("CD: %1 ~ %2 ~ %3 - %4"))
+                  .arg(tmpdata->FormatArtist()).arg(tmpdata->Album()).arg(tmpdata->Track()).arg(tmpdata->FormatTitle());
 
                 if(tmpdata->FormatArtist().length() < 1 ||
                    tmpdata->FormatTitle().length() < 1)