fixed window title

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4794 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 12 insertions, 8 deletions

diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index 8a4a6e76b..48b70e73b 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -63,6 +63,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
                    Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint);
     setWindowTitle("Qmmp");
 
+    m_titleFormatter.setPattern("%if(%p,%p - %t,%t)");
+
     new ActionManager(this);
 
     m_player = MediaPlayer::instance();
@@ -176,21 +178,21 @@ void MainWindow::showState(Qmmp::State state)
         break;
     case Qmmp::Stopped:
         m_playlist->setTime(-1);
-        /*if (m_pl_manager->currentPlayList()->currentTrack())
-            setWindowTitle(m_pl_manager->currentPlayList()->currentTrack()->formattedTitle());
+        if (m_pl_manager->currentPlayList()->currentTrack())
+            setWindowTitle(m_titleFormatter.format(m_pl_manager->currentPlayList()->currentTrack()));
         else
-            setWindowTitle("Qmmp");*/
+            setWindowTitle("Qmmp");
         break;
     }
 }
 
 void MainWindow::showMetaData()
 {
-    /*PlayListTrack *track = m_pl_manager->currentPlayList()->currentTrack();
+    PlayListTrack *track = m_pl_manager->currentPlayList()->currentTrack();
     if (track && track->url() == m_core->metaData().value(Qmmp::URL))
     {
-        setWindowTitle(track->formattedTitle());
-    }*/
+        setWindowTitle(m_titleFormatter.format(track));
+    }
 }
 
 void MainWindow::closeEvent (QCloseEvent *)
diff --git a/src/plugins/Ui/skinned/mainwindow.h b/src/plugins/Ui/skinned/mainwindow.h
index da5e704f1..1bb31800e 100644
--- a/src/plugins/Ui/skinned/mainwindow.h
+++ b/src/plugins/Ui/skinned/mainwindow.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2014 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,6 +26,7 @@
 #include <qmmp/decoder.h>
 #include <qmmp/decoderfactory.h>
 #include <qmmpui/playlistitem.h>
+#include <qmmpui/metadataformatter.h>
 #include "display.h"
 #include "titlebar.h"
 
@@ -110,6 +111,7 @@ private:
     UiHelper *m_uiHelper;
     QmmpUiSettings *m_ui_settings;
     MediaPlayer *m_player;
+    MetaDataFormatter m_titleFormatter;
 };
 
 #endif