From 88a926e79c031826e88465884f99a92689c2bd9f Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Mon, 18 Aug 2014 01:55:40 +1000
Subject: [PATCH] Created progress dialog class

---
 sleepyhead/SleepLib/machine.cpp        | 43 ++------------------------
 sleepyhead/SleepLib/progressdialog.cpp | 34 ++++++++++++++++++++
 sleepyhead/SleepLib/progressdialog.h   | 35 +++++++++++++++++++++
 sleepyhead/mainwindow.cpp              |  1 +
 sleepyhead/sleepyhead.pro              |  6 ++--
 5 files changed, 76 insertions(+), 43 deletions(-)
 create mode 100644 sleepyhead/SleepLib/progressdialog.cpp
 create mode 100644 sleepyhead/SleepLib/progressdialog.h

diff --git a/sleepyhead/SleepLib/machine.cpp b/sleepyhead/SleepLib/machine.cpp
index d17446e6..872e69f0 100644
--- a/sleepyhead/SleepLib/machine.cpp
+++ b/sleepyhead/SleepLib/machine.cpp
@@ -17,9 +17,10 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QLabel>
-#include <QProgressBar>
 #include "mainwindow.h"
 
+#include "progressdialog.h"
+
 #include <time.h>
 
 #include "machine.h"
@@ -393,46 +394,6 @@ const QString Machine::getBackupPath()
     return p_profile->Get("{" + STR_GEN_DataFolder + "}/" + info.loadername + "_" + (info.serial.isEmpty() ? hexid() : info.serial)  + "/Backup/");
 }
 
-class ProgressDialog:public QDialog {
-public:
-    explicit ProgressDialog(QWidget * parent);
-    virtual ~ProgressDialog();
-
-    void setMessage(QString msg) { waitmsg->setText(msg); }
-    void setPixmap(QPixmap &pixmap) { imglabel->setPixmap(pixmap); }
-    QProgressBar * progress;
-
-protected:
-    QLabel * waitmsg;
-    QHBoxLayout *hlayout;
-    QLabel * imglabel;
-    QVBoxLayout * vlayout;
-
-};
-ProgressDialog::ProgressDialog(QWidget * parent):
-    QDialog(parent, Qt::SplashScreen)
-{
-    waitmsg = new QLabel(QObject::tr("PLease Wait..."));
-    hlayout = new QHBoxLayout;
-
-    imglabel = new QLabel(this);
-
-    vlayout = new QVBoxLayout;
-    progress = new QProgressBar(this);
-    this->setLayout(vlayout);
-    vlayout->addLayout(hlayout);
-    hlayout->addWidget(imglabel);
-    hlayout->addWidget(waitmsg,1,Qt::AlignCenter);
-    vlayout->addWidget(progress,1);
-    progress->setMaximum(100);
-
-
-}
-ProgressDialog::~ProgressDialog()
-{
-}
-
-
 bool Machine::Load()
 {
     QString path = getDataPath();
diff --git a/sleepyhead/SleepLib/progressdialog.cpp b/sleepyhead/SleepLib/progressdialog.cpp
new file mode 100644
index 00000000..39cc0e49
--- /dev/null
+++ b/sleepyhead/SleepLib/progressdialog.cpp
@@ -0,0 +1,34 @@
+/* SleepLib Progress Dialog Header
+ *
+ * Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of the Linux
+ * distribution for more details. */
+
+#include "progressdialog.h"
+
+ProgressDialog::ProgressDialog(QWidget * parent):
+    QDialog(parent, Qt::SplashScreen)
+{
+    waitmsg = new QLabel(QObject::tr("PLease Wait..."));
+    hlayout = new QHBoxLayout;
+
+    imglabel = new QLabel(this);
+
+    vlayout = new QVBoxLayout;
+    progress = new QProgressBar(this);
+    this->setLayout(vlayout);
+    vlayout->addLayout(hlayout);
+    hlayout->addWidget(imglabel);
+    hlayout->addWidget(waitmsg,1,Qt::AlignCenter);
+    vlayout->addWidget(progress,1);
+    progress->setMaximum(100);
+
+
+}
+
+ProgressDialog::~ProgressDialog()
+{
+}
+
diff --git a/sleepyhead/SleepLib/progressdialog.h b/sleepyhead/SleepLib/progressdialog.h
new file mode 100644
index 00000000..24b813f0
--- /dev/null
+++ b/sleepyhead/SleepLib/progressdialog.h
@@ -0,0 +1,35 @@
+/* SleepLib Progress Dialog Header
+ *
+ * Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of the Linux
+ * distribution for more details. */
+
+#ifndef PROGRESSDIALOG_H
+#define PROGRESSDIALOG_H
+
+#include <QDialog>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QProgressBar>
+
+class ProgressDialog:public QDialog {
+public:
+    explicit ProgressDialog(QWidget * parent);
+    virtual ~ProgressDialog();
+
+    void setMessage(QString msg) { waitmsg->setText(msg); }
+    void setPixmap(QPixmap &pixmap) { imglabel->setPixmap(pixmap); }
+    QProgressBar * progress;
+
+protected:
+    QLabel * waitmsg;
+    QHBoxLayout *hlayout;
+    QLabel * imglabel;
+    QVBoxLayout * vlayout;
+
+};
+
+#endif // PROGRESSDIALOG_H
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index db098d30..52fa26cc 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -54,6 +54,7 @@
 #include "Graphs/glcommon.h"
 #include "UpdaterWindow.h"
 #include "SleepLib/calcs.h"
+#include "SleepLib/progressdialog.h"
 #include "version.h"
 
 #include "reports.h"
diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro
index 467fe4cf..dc9c3ed5 100644
--- a/sleepyhead/sleepyhead.pro
+++ b/sleepyhead/sleepyhead.pro
@@ -181,7 +181,8 @@ SOURCES += \
     SleepLib/loader_plugins/weinmann_loader.cpp \
     Graphs/gdailysummary.cpp \
     Graphs/MinutesAtPressure.cpp \
-    SleepLib/journal.cpp
+    SleepLib/journal.cpp \
+    SleepLib/progressdialog.cpp
 
 HEADERS  += \
     common_gui.h \
@@ -240,7 +241,8 @@ HEADERS  += \
     SleepLib/loader_plugins/weinmann_loader.h \
     Graphs/gdailysummary.h \
     Graphs/MinutesAtPressure.h \
-    SleepLib/journal.h
+    SleepLib/journal.h \
+    SleepLib/progressdialog.h
 
 FORMS += \
     daily.ui \