OTHER: show playlist and selection playtimes in playlistwindow

src/Skin.cpp

@@ -375,6 +375,7 @@ Skin::BuildLetterMap (void)
 	/* special characters */
 	m_letterMap['"'] = letters[0][27];
 	m_letterMap['@'] = letters[0][28];
+	m_letterMap[':'] = letters[1][12];
 	m_letterMap['('] = letters[1][13];
 	m_letterMap[')'] = letters[1][14];
 	m_letterMap['-'] = letters[1][15];

src/Skin.h

@@ -47,6 +47,7 @@ class Skin : public QObject
 			{ return m_backgrounds.value(item); };
 		const PixmapMap getNumbers () const { return m_numbers; }
 		const PixmapMap getSmallNumbers () const { return m_smallNumbers; }
+		const PixmapMap getPixmapFont () const { return m_letterMap; }
 
 		const QPixmap getItem (uint part) const { return m_items.value (part); }
 		const QPixmap getPls (uint part) const
@@ -87,7 +88,7 @@ class Skin : public QObject
 		QMap<int, QPixmap> m_numbers;
 		QMap<int, QPixmap> m_smallNumbers;
 		QMap<uint, QPixmap> m_items;
-		QMap<uint, QPixmap> m_letterMap;
+		QMap<int, QPixmap> m_letterMap;
 		QMap<uint, QPixmap> m_playlist;
 
 		QMap<QByteArray, QByteArray> m_pledit_txt;

src/playlist/playlistcontrols.cpp

@@ -17,6 +17,24 @@
 #include "pixmapbutton.h"
 #include "timedisplay.h"
 
+#include <QPainter>
+
+QString secondsToString (uint32_t seconds)
+{
+	int h, m, s;
+	s = seconds % 60;
+	seconds /= 60;
+	m = seconds % 60;
+	h = seconds / 60;
+
+	QString ret = QString ("%1%2%3")
+		.arg (h ? QString ("%1:").arg(h) : "")
+		.arg (m ? QString ("%1:").arg(m) : "")
+		.arg (s);
+	return ret;
+}
+
+
 PlaylistControls::PlaylistControls (QWidget *parent) : QWidget (parent)
 {
 	setFixedSize (100, 38);
@@ -63,7 +81,30 @@ PlaylistControls::PlaylistControls (QWidget *parent) : QWidget (parent)
 	connect (this, SIGNAL (setDisplayTime (int)),
 	         m_timedisplay, SLOT (setTime (int)));
 
-	//TODO:  playtimes
+	m_selection_playtime = 0;
+	m_playlist_playtime = 0;
+	is_playlist_playtime_exact = true;
+}
+
+void
+PlaylistControls::paintEvent (QPaintEvent *event)
+{
+	if (m_font.isEmpty ()) return;
+
+	int x = 8, y = 10;
+	QString time = QString ("%1/%2%3")
+		.arg (secondsToString (m_selection_playtime))
+		.arg (secondsToString (m_playlist_playtime))
+		.arg (is_playlist_playtime_exact ? "" : "+");
+
+	QPainter paint;
+	paint.begin (this);
+	foreach (QChar c, time) {
+		paint.drawPixmap (x, y, m_font[c.toAscii()]);
+		x += 5;
+	}
+	paint.end ();
+
 }
 
 void
@@ -73,13 +114,23 @@ PlaylistControls::setNumbers (const PixmapMap &p)
 }
 
 void
-PlaylistControls::setSelectedLength (int lenght)
+PlaylistControls::setPixmapFont (const PixmapMap &p)
 {
-	//TODO
+	m_font = p;
+	update ();
 }
 
 void
-PlaylistControls::setPlaylistLength (int lenght)
+PlaylistControls::setSelectionPlaytime (uint32_t playtime)
 {
-	//TODO
+	m_selection_playtime = playtime;
+	update ();
+}
+
+void
+PlaylistControls::setPlaylistPlaytime (uint32_t playtime, bool isExact)
+{
+	m_playlist_playtime = playtime;
+	is_playlist_playtime_exact = isExact;
+	update ();
 }

src/playlist/playlistcontrols.h

@@ -20,6 +20,7 @@
 #include <QMap>
 
 class SmallTimeDisplay;
+class QPaintEvent;
 class QPixmap;
 
 typedef QMap<int, QPixmap> PixmapMap;
@@ -31,10 +32,11 @@ class PlaylistControls : public QWidget {
 		PlaylistControls (QWidget *parent);
 
 		void setNumbers (const PixmapMap &p);
+		void setPixmapFont (const PixmapMap &p);
 
 	public slots:
-		void setSelectedLength (int);
-		void setPlaylistLength (int);
+		void setSelectionPlaytime (uint32_t);
+		void setPlaylistPlaytime (uint32_t, bool isExact);
 
 	signals:
 		// emitted when buttons are clicked
@@ -49,9 +51,14 @@ class PlaylistControls : public QWidget {
 		//connected to internal timedisplay
 		void setDisplayTime (int);
 
+	private slots:
+		void paintEvent (QPaintEvent *event);
+
 	private:
-		int m_playlist_length;
-		int m_selected_length;
+		uint32_t m_playlist_playtime;
+		bool is_playlist_playtime_exact;
+		uint32_t m_selection_playtime;
+		PixmapMap m_font;
 
 		SmallTimeDisplay *m_timedisplay;
 };

src/playlist/playlistview.cpp

@@ -144,7 +144,21 @@ PlaylistView::PlaylistView (QWidget *parent) : QListView (parent)
 }
 
 void
-PlaylistView::invertSelection () {
+PlaylistView::selectionChanged (const QItemSelection &selected,
+                                const QItemSelection &deselected)
+{
+	/* selectedIndexes () is used here because selected only contains newly
+	 * seleted indexes and will give a wrong result if pressing CONTROL to
+	 * modify a selection */
+	uint32_t playtime = qobject_cast<PlaylistModel *> (model ())->getPlaytimeForSelection (selectedIndexes ());
+	emit selectionPlaytimeChanged (playtime);
+
+	QListView::selectionChanged (selected, deselected);
+}
+
+void
+PlaylistView::invertSelection ()
+{
 	QItemSelection selection = QItemSelection (model ()->index (0, 0),
 	                           model ()->index (model ()->rowCount ()-1, 0));
 	selectionModel ()->select (selection, QItemSelectionModel::Toggle |

src/playlist/playlistview.h

@@ -55,6 +55,9 @@ class PlaylistView : public QListView {
 			{qWarning ("Trying to set wrong model in PlaylistView"); return;};
 		void setModel (PlaylistModel *model);
 
+	signals:
+		void selectionPlaytimeChanged (uint32_t playtime);
+
 	public slots:
 		void contextMenuEvent (QContextMenuEvent *e);
 
@@ -66,9 +69,13 @@ class PlaylistView : public QListView {
 		void settingsChanged (void);
 		void setPixmaps (Skin *skin);
 		void currentPosChanged (QModelIndex);
+
 	protected:
 		void mouseDoubleClickEvent (QMouseEvent *event);
 
+	protected slots:
+		void selectionChanged (const QItemSelection &, const QItemSelection &);
+
 	private:
 		Xmms::Playback::Status m_status;
 		QFont *m_font;

src/playlist/playlistwidget.cpp

@@ -238,6 +238,14 @@ PlaylistWidget::PlaylistWidget (PlaylistWindow *parent) : QWidget (parent)
 	connect (parent, SIGNAL (setDisplayTime (int)),
 	         m_controls, SIGNAL (setDisplayTime (int)));
 
+
+	connect (App->client ()->active_playlist (),
+	         SIGNAL (totalPlaytime(uint32_t, bool)),
+	         m_controls, SLOT (setPlaylistPlaytime (uint32_t, bool)));
+
+	connect (m_view, SIGNAL (selectionPlaytimeChanged(uint32_t)),
+	         m_controls, SLOT (setSelectionPlaytime (uint32_t)));
+
 	setMinimumSize (275, 116);
 //	resize (275, 300);
 }
@@ -448,6 +456,7 @@ PlaylistWidget::setPixmaps (Skin *skin)
 	m_shadebtn->setIcon (skin->getIcon (Skin::BUTTON_PLS_SHADE));
 
 	m_controls->setNumbers (skin->getSmallNumbers ());
+	m_controls->setPixmapFont (skin->getPixmapFont ());
 
 	setActive (m_active);