diff ui/createinstallerdialog.h @ 524:a097dd86cb4d

merged.
author Raimund Renkert <rrenkert@intevation.de>
date Tue, 29 Apr 2014 15:26:43 +0200
parents 3332db04c77d
children f6371e9c959a
line wrap: on
line diff
--- a/ui/createinstallerdialog.h	Tue Apr 29 15:26:02 2014 +0200
+++ b/ui/createinstallerdialog.h	Tue Apr 29 15:26:43 2014 +0200
@@ -11,6 +11,8 @@
 #include <QDialog>
 #include <QMainWindow>
 #include <QLineEdit>
+#include <QProcess>
+#include <QProgressDialog>
 /**
  * @file createinstallerdialog.h
  * @brief The dialog to show settings and create an installer.
@@ -31,14 +33,27 @@
     void setupGUI();
 
     QLineEdit *mCertFile;
-    QLineEdit *mArchiveFile;
+    QLineEdit *mBinaryFolder;
     QLineEdit *mSaveFile;
 
+    QProcess mNSISProc;
+    QProgressDialog mProgress;
+
+    /** @brief show an error message with QMessageBox
+     *
+     * @param [in] msg The message to show
+     */
+    void showErrorMessage(const QString &msg);
+
 private slots:
     void openCertificateSelect();
-    void openArchiveSelect();
+    void openFolderSelect();
     void openSaveLocation();
     void createInstaller();
+
+    /* Slots for the creator process */
+    void processError(QProcess::ProcessError error);
+    void processFinished(int exitCode, QProcess::ExitStatus exitStatus);
 };
 
 #endif // CREATEINSTALLERDIALOG_H

http://wald.intevation.org/projects/trustbridge/