updated status icon plugin, fixed build

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

1 files changed, 46 insertions, 18 deletions

diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.h b/src/plugins/General/statusicon/statusiconpopupwidget.h
index 183074155..bcef0cc87 100644
--- a/src/plugins/General/statusicon/statusiconpopupwidget.h
+++ b/src/plugins/General/statusicon/statusiconpopupwidget.h
@@ -1,14 +1,40 @@
+/***************************************************************************
+ *   Copyright (C) 2009 by Artur Guzik                                     *
+ *   a.guzik88@gmail.com
+ *
+ *   Copyright (C) 2009 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
 #ifndef STATUSICONPOPUPWIDGET_H
 #define STATUSICONPOPUPWIDGET_H
 
 #include <QFrame>
 #include <QWidget>
-#include <QGridLayout>
-#include "plugins/General/covermanager/coverwidget.h"
+#include <QProgressBar>
 
 class QLabel;
 class QTimer;
-
+class QHBoxLayout;
+class QVBoxLayout;
+class QSpacerItem;
+class TimeBar;
+class CoverWidget;
 
 class StatusIconPopupWidget : public QFrame
 {
@@ -21,32 +47,34 @@ public:
     void showInfo(int x, int y, int delay, bool splitFileName); //x,y are tray icon position
 
 protected:
-
     virtual void mousePressEvent(QMouseEvent *);
 
-private:
+private slots:
+    void updatePosition(int trayx, int trayy);
+    void updateMetaData();
+    void updateTime(qint64 elapsed);
 
-    QString totalTimeString();
-    QLabel *m_lblTitle;
-    QLabel *m_lblArtist;
-    QLabel *m_lblAlbum;
-    QLabel *m_lblTime;
-    QGridLayout * gLayout;
+private:
+    QLabel *m_textLabel;
+    QHBoxLayout *m_hLayout;
+    QVBoxLayout *m_vLayout;
     QTimer *m_timer;
     CoverWidget * m_cover;
     QString m_totalTime;
     QSpacerItem *m_spacer;
-
+    QProgressBar *m_bar;
     int m_lastTrayX;
     int m_lastTrayY;
     int m_splitFileName;
+};
 
-private slots:
-
-    void updatePosition(int trayx, int trayy);
-    void updateMetaData();
-    void updateTime(qint64 elapsed);
-
+class TimeBar : public QProgressBar
+{
+    Q_OBJECT
+public:
+    TimeBar(QWidget *parent = 0);
+    virtual QString text() const;
 };
 
+
 #endif // STATUSICONPOPUPWIDGET_H