Updated Monkey's Audio binary to v4.11 (2013-01-20), including STDERR flush fix.

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

diff --git a/src/Dialog_Update.h b/src/Dialog_Update.h
index 51c4e53..eae3e0d 100644 (file)
--- a/src/Dialog_Update.h
+++ b/src/Dialog_Update.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2013 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
@@ -21,14 +21,19 @@
 
 #pragma once
 
-#include "..\tmp\UIC_UpdateDialog.h"
-
 #include <QDialog>
 
 class UpdateInfo;
 class SettingsModel;
+class QMovie;
+
+//UIC forward declartion
+namespace Ui {
+       class UpdateDialog;
+}
 
-class UpdateDialog : public QDialog, private Ui::UpdateDialog
+//UpdateDialog class
+class UpdateDialog : public QDialog
 {
        Q_OBJECT
 
@@ -45,27 +50,38 @@ private slots:
        void linkActivated(const QString &link);
        void applyUpdate(void);
        void logButtonClicked(void);
+       void progressBarValueChanged(int value);
 
 protected:
-       void showEvent(QShowEvent *event);
-       void closeEvent(QCloseEvent *event);
-       void keyPressEvent(QKeyEvent *e);
+       virtual void showEvent(QShowEvent *event);
+       virtual void closeEvent(QCloseEvent *event);
+       virtual void keyPressEvent(QKeyEvent *e);
+       virtual bool winEvent(MSG *message, long *result);
+       virtual bool event(QEvent *e);
+
+       const bool m_betaUpdates;
 
 private:
+       Ui::UpdateDialog *ui; //for Qt UIC
+
        bool tryUpdateMirror(UpdateInfo *updateInfo, const QString &url);
-       bool getFile(const QString &url, const QString &outFile);
+       bool getFile(const QString &url, const QString &outFile, unsigned int maxRedir = 5, bool *httpOk = NULL);
        bool checkSignature(const QString &file, const QString &signature);
        bool parseVersionInfo(const QString &file, UpdateInfo *updateInfo);
+       void testKnownWebSites(void);
 
        UpdateInfo *m_updateInfo;
        QStringList *m_logFile;
        SettingsModel *m_settings;
+       QMovie *m_animator;
        
        const QString m_binaryWGet;
        const QString m_binaryGnuPG;
        const QString m_binaryUpdater;
        const QString m_binaryKeys;
+       unsigned long m_updaterProcess;
 
        bool m_success;
        bool m_updateReadyToInstall;
+       bool m_firstShow;
 };