Bump version.

[lamexp/LameXP.git] / src / Dialog_WorkingBanner.h

diff --git a/src/Dialog_WorkingBanner.h b/src/Dialog_WorkingBanner.h
index b2b20b6..4f54f00 100644 (file)
--- a/src/Dialog_WorkingBanner.h
+++ b/src/Dialog_WorkingBanner.h
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2020 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // 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
+// 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.
+// (at your option) any later version; always including the non-optional
+// LAMEXP GNU GENERAL PUBLIC LICENSE ADDENDUM. See "License.txt" file!
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,18 +22,30 @@
 
 #pragma once
 
-#include "../tmp/UIC_WorkingBanner.h"
+#include <QDialog>
+
+namespace Ui
+{
+       class WorkingBanner;
+}
+
+namespace MUtils
+{
+       class Taskbar7;
+}
+
+class QEventLoop;
 
 ////////////////////////////////////////////////////////////
 // Splash Frame
 ////////////////////////////////////////////////////////////
 
-class WorkingBanner: public QDialog, private Ui::WorkingBanner
+class WorkingBanner: public QDialog
 {
        Q_OBJECT
 
 public:
-       WorkingBanner(QWidget *parent = 0);
+       WorkingBanner(QWidget *parent);
        ~WorkingBanner(void);
        
        void show(const QString &text);
@@ -40,10 +53,15 @@ public:
        void show(const QString &text, QEventLoop *loop);
 
 private:
-       QMovie *m_working;
+       Ui::WorkingBanner *const ui;
+
+       QScopedPointer<MUtils::Taskbar7> m_taskbar;
+       QScopedPointer<QMovie> m_working;
+
        bool m_canClose;
 
 public slots:
+       void windowShown(void);
        void setText(const QString &text);
        void setProgressMax(unsigned int max);
        void setProgressVal(unsigned int val);
@@ -53,12 +71,12 @@ signals:
        void userAbort(void);
 
 protected:
-       void keyPressEvent(QKeyEvent *event);
-       void keyReleaseEvent(QKeyEvent *event);
-       void closeEvent(QCloseEvent *event);
-       bool winEvent(MSG *message, long *result);
+       virtual void keyPressEvent(QKeyEvent *event);
+       virtual void keyReleaseEvent(QKeyEvent *event);
+       virtual void closeEvent(QCloseEvent *event);
+       virtual void showEvent(QShowEvent *event);
+       virtual void hideEvent(QHideEvent *event);
 
-       QLabel *m_progress;
-       unsigned int m_progressMax;
-       unsigned int m_progressVal;
+       QScopedPointer<QFontMetrics> m_metrics;
+       QScopedPointer<QStyle> m_style;
 };