From 9b20171e567bb04cb34b5f2f4af28f0fef42070c Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sun, 1 Mar 2015 12:07:14 +0000
Subject: added PlayListTrack::formattedTitles() function

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4751 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Ui/skinned/listwidget.cpp       |  2 +-
 src/plugins/Ui/skinned/listwidgetdrawer.cpp | 18 +++++++++---------
 src/plugins/Ui/skinned/listwidgetdrawer.h   |  3 ++-
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'src/plugins/Ui')

diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index 2d9913599..6dbdafc90 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -329,7 +329,7 @@ void ListWidget::updateList(int flags)
             continue;
 
         row->rect = QRect(5, i * m_drawer.rowHeight(), width() - 10, m_drawer.rowHeight() - 1);
-        row->title = items[i]->formattedTitle(0);
+        row->titles = items[i]->formattedTitles();
 
         (m_first + i) == m_model->currentIndex() ? row->flags |= ListWidgetRow::CURRENT :
                 row->flags &= ~ListWidgetRow::CURRENT;
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
index 044aba899..07de62cfa 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
@@ -97,13 +97,13 @@ void ListWidgetDrawer::prepareRow(ListWidgetRow *row)
 {
     if(row->flags & ListWidgetRow::GROUP)
     {
-        row->title = m_metrics->elidedText (row->title, Qt::ElideRight,
+        row->titles[0] = m_metrics->elidedText (row->titles[0], Qt::ElideRight,
                                             row->rect.width() - m_number_width - 12 - 70);
         return;
     }
 
     if(m_show_number && !m_align_numbres)
-        row->title.prepend(QString("%1").arg(row->number)+". ");
+        row->titles[0].prepend(QString("%1").arg(row->number)+". ");
 
     row->x[ListWidgetRow::NUMBER] = row->x[ListWidgetRow::TITLE] = row->rect.left() + PADDING;
 
@@ -128,7 +128,7 @@ void ListWidgetDrawer::prepareRow(ListWidgetRow *row)
     //elide title
     int title_width = row->x[ListWidgetRow::EXTRA_STRING] - row->x[ListWidgetRow::TITLE] -
             m_metrics->width("9");
-    row->title = m_metrics->elidedText (row->title, Qt::ElideRight, title_width);
+    row->titles[0] = m_metrics->elidedText (row->titles[0], Qt::ElideRight, title_width);
 }
 
 void ListWidgetDrawer::fillBackground(QPainter *painter, int width, int height)
@@ -168,22 +168,22 @@ void ListWidgetDrawer::drawSeparator(QPainter *painter, ListWidgetRow *row, bool
     if(m_number_width)
         sx += m_number_width + m_metrics->width("9");
     if(rtl)
-        sx = row->rect.right() - sx - m_metrics->width(row->title);
+        sx = row->rect.right() - sx - m_metrics->width(row->titles[0]);
 
-    painter->drawText(sx, sy, row->title);
+    painter->drawText(sx, sy, row->titles[0]);
 
     sy = sy - m_metrics->lineSpacing()/2 + 2;
 
     if(rtl)
     {
         painter->drawLine(10, sy, sx - 5, sy);
-        painter->drawLine(sx + m_metrics->width(row->title) + 5, sy,
-                          sx + m_metrics->width(row->title) + 35, sy);
+        painter->drawLine(sx + m_metrics->width(row->titles[0]) + 5, sy,
+                          sx + m_metrics->width(row->titles[0]) + 35, sy);
     }
     else
     {
         painter->drawLine(sx - 45, sy, sx - 5, sy);
-        painter->drawLine(sx + m_metrics->width(row->title) + 5, sy,
+        painter->drawLine(sx + m_metrics->width(row->titles[0]) + 5, sy,
                           row->rect.width(), sy);
     }
 }
@@ -200,7 +200,7 @@ void ListWidgetDrawer::drawTrack(QPainter *painter, ListWidgetRow *row)
         QString number = QString("%1").arg(row->number);
         painter->drawText(row->x[ListWidgetRow::NUMBER], sy, number);
     }
-    painter->drawText(row->x[ListWidgetRow::TITLE], sy, row->title);
+    painter->drawText(row->x[ListWidgetRow::TITLE], sy, row->titles[0]);
 
     QString extra_string = row->extraString;
 
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.h b/src/plugins/Ui/skinned/listwidgetdrawer.h
index 420247f9e..537becc22 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.h
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.h
@@ -22,6 +22,7 @@
 #define LISTWIDGETDRAWER_H
 
 #include <QString>
+#include <QStringList>
 #include <QColor>
 #include <QRect>
 #include <QFontMetrics>
@@ -35,7 +36,7 @@ struct ListWidgetRow
     {
         flags = NO_FLAGS;
     }
-    QString title;
+    QStringList titles;
     QString length;
     QString extraString;
     int number;
-- 
cgit v1.2.3-13-gbd6f