Updated mpg123 decoder binary to v1.22.0 (2015-02-24), compiled with GCC 4.9.2.

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

diff --git a/src/Dialog_About.h b/src/Dialog_About.h
index 8aa1424..c7b3b79 100644 (file)
--- a/src/Dialog_About.h
+++ b/src/Dialog_About.h
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2015 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
 // the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// (at your option) any later version, but always including the *additional*
+// restrictions defined in the "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,11 +22,22 @@
 
 #pragma once
 
-#include "../tmp/UIC_AboutDialog.h"
+#include <QDialog>
 
+//UIC forward declartion
+namespace Ui {
+       class AboutDialog;
+}
+
+//Class declarations
+class QLabel;
+class QPixmap;
+class QTimer;
+class QElapsedTimer;
 class SettingsModel;
 
-class AboutDialog : public QDialog, private Ui::AboutDialog
+//AboutDialog class
+class AboutDialog : public QDialog
 {
        Q_OBJECT
 
@@ -42,8 +54,9 @@ public slots:
        void gotoLicenseTab(void);
        void showAboutQt(void);
        void moveDisque(void);
-       void tabChanged(int index);
+       void tabChanged(int index, const bool silent = false);
        void adjustSize(void);
+       void geometryUpdated(void);
 
 protected:
        virtual void showEvent(QShowEvent *e);
@@ -51,6 +64,8 @@ protected:
        bool eventFilter(QObject *obj, QEvent *event);
 
 private:
+       Ui::AboutDialog *ui; //for Qt UIC
+
        bool m_firstShow;
        SettingsModel *m_settings;
        QMap<QWidget*,bool> *m_initFlags;
@@ -59,9 +74,12 @@ private:
        QLabel *m_disque;
        QTimer * m_disqueTimer;
        bool m_disqueFlags[2];
+       QPoint m_disquePos;
+       QRect m_disqueBound;
+       double m_discOpacity;
        QPixmap *m_cartoon[4];
        bool m_rotateNext;
-       __int64 m_disqueDelay;
+       QScopedPointer<QElapsedTimer> m_disqueDelay;
 
        void initInformationTab(void);
        void initContributorsTab(void);
@@ -69,5 +87,4 @@ private:
        void initLicenseTab(void);
 
        QString makeToolText(const QString &toolName, const QString &toolBin, const QString &toolVerFmt, const QString &toolLicense, const QString &toolWebsite, const QString &extraInfo = QString());
-       bool playResoureSound(const QString &library, const unsigned long soundId, const bool async);
 };