diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2015-06-17 12:42:10 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2015-06-17 12:42:10 +0000 |
| commit | d1fddb63eb74ee0dde005e4f81776d28cb0188f0 (patch) | |
| tree | 36bfa3617321eb555f28b0faf2facc2e830a717a /src/plugins | |
| parent | dd4abc389f1c24c7b383bee9818537adf4fc7bc5 (diff) | |
| download | qmmp-d1fddb63eb74ee0dde005e4f81776d28cb0188f0.tar.gz qmmp-d1fddb63eb74ee0dde005e4f81776d28cb0188f0.tar.bz2 qmmp-d1fddb63eb74ee0dde005e4f81776d28cb0188f0.zip | |
skinned: fixed playlist titlebar
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5173 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/Ui/skinned/playlisttitlebar.cpp | 13 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/playlisttitlebar.h | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp index 2151cfe1b..a11905d83 100644 --- a/src/plugins/Ui/skinned/playlisttitlebar.cpp +++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2013 by Ilya Kotov * + * Copyright (C) 2007-2015 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -29,12 +29,15 @@ #include "playlisttitlebar.h" #include "skin.h" +#define TITLE_FORMAT "%p%if(%p&%t, - ,)%t%if(%p,,%if(%t,,%f))%if(%l, %(%l%),)" + // TODO {shademode, updateskin} -> do we have the shaded cursor PlayListTitleBar::PlayListTitleBar(QWidget *parent) : PixmapWidget(parent) { m_active = false; m_resize = false; + m_formatter.setPattern(TITLE_FORMAT); m_shade2 = 0; m_model = 0; m_shaded = false; @@ -262,16 +265,14 @@ void PlayListTitleBar::showCurrent() { if (m_model) { - /*PlayListTrack* track = m_model->currentTrack(); + PlayListTrack* track = m_model->currentTrack(); if (track) { m_text = QString("%1. %2").arg(m_model->numberOfTrack(m_model->currentIndex())+1) - .arg(track->formattedTitle(0)); - if(track->length()) - m_text.append(QString(" (%1)").arg(track->formattedLength())); + .arg(m_formatter.format(track)); } else - m_text.clear();*/ + m_text.clear(); } QFontMetrics metrics(m_font); m_truncatedText = metrics.elidedText (m_text, Qt::ElideRight, width() - 35*m_ratio); diff --git a/src/plugins/Ui/skinned/playlisttitlebar.h b/src/plugins/Ui/skinned/playlisttitlebar.h index 45ec32421..b7e65844d 100644 --- a/src/plugins/Ui/skinned/playlisttitlebar.h +++ b/src/plugins/Ui/skinned/playlisttitlebar.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2009 by Ilya Kotov * + * Copyright (C) 2007-2015 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -20,12 +20,13 @@ #ifndef PLAYLISTTITLEBAR_H #define PLAYLISTTITLEBAR_H +#include <qmmpui/metadataformatter.h> #include "playlist.h" #include "pixmapwidget.h" #include "mainwindow.h" /** - @author Ilya Kotov <forkotov02@hotmail.ru> + @author Ilya Kotov <forkotov02@hotmail.ru> */ class Skin; class MainWindow; @@ -68,6 +69,7 @@ private: QString m_text; QString m_truncatedText; QFont m_font; + MetaDataFormatter m_formatter; protected: void resizeEvent(QResizeEvent*); |