1 files changed, 66 insertions, 68 deletions
diff --git a/rbutil/rbutilqt/installzipwindow.h b/rbutil/rbutilqt/installzipwindow.h
index 7208ff9ffb..1eb96b745f 100644
--- a/rbutil/rbutilqt/installzipwindow.h
+++ b/rbutil/rbutilqt/installzipwindow.h
@@ -1,68 +1,66 @@
-/***************************************************************************
+/***************************************************************************
- *             __________               __   ___.
+ *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
+ *                     \/            \/     \/    \/            \/
- *
+ *
- *   Copyright (C) 2007 by Dominik Wenger
+ *   Copyright (C) 2007 by Dominik Wenger
- *   $Id: installzipwindow.h 14027 2007-07-27 17:42:49Z domonoky $
+ *   $Id: installzipwindow.h 14027 2007-07-27 17:42:49Z domonoky $
- *
+ *
- * All files in this archive are subject to the GNU General Public License.
+ * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
+ * See the file COPYING in the source tree root for full license agreement.
- *
+ *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
+ * KIND, either express or implied.
- *
+ *
- ****************************************************************************/
+ ****************************************************************************/
-#ifndef INSTALLZIPWINDOW_H
+#ifndef INSTALLZIPWINDOW_H
-#define INSTALLZIPWINDOW_H
+#define INSTALLZIPWINDOW_H
-#include <QtGui>
+#include <QtGui>
-#include <QSettings>
+#include <QSettings>
-#include "ui_installzipfrm.h"
+#include "ui_installzipfrm.h"
-#include "ui_installprogressfrm.h"
+#include "installzip.h"
-#include "installzip.h"
+#include "progressloggergui.h"
+class InstallZipWindow : public QDialog
-class InstallZipWindow : public QDialog
+{
-{
+    Q_OBJECT
-    Q_OBJECT
+    public:
-    public:
+        InstallZipWindow(QWidget *parent = 0);
-        InstallZipWindow(QWidget *parent = 0);
+        void setProxy(QUrl);
-        void setProxy(QUrl);
+        void setMountPoint(QString);
-        void setMountPoint(QString);
+        void setUrl(QString);
-        void setUrl(QString);
+        void setLogSection(QString name){logsection = name; }
-        void setLogSection(QString name){logsection = name; }
+        void setUserSettings(QSettings*);
-        void setUserSettings(QSettings*);
+        void setDeviceSettings(QSettings*);
-        void setDeviceSettings(QSettings*);
+    public slots:
-    public slots:
+        void accept(void);
-        void accept(void);
+    private:
-    private:
+        Ui::InstallZipFrm ui;
-        Ui::InstallZipFrm ui;
+        QUrl proxy;
-        Ui::InstallProgressFrm dp;
+        QSettings *devices;
-        QUrl proxy;
+        QSettings *userSettings;
-        QSettings *devices;
+        ProgressLoggerGui* logger;
-        QSettings *userSettings;
+        QString file;
-        QDialog *downloadProgress;
+        QString fileName;
-        QString file;
+        QString mountPoint;
-        QString fileName;
+        QString url;
-        QString mountPoint;
+        QString logsection;
-        QString url;
+        ZipInstaller* installer;
-        QString logsection;
-        ZipInstaller* installer;
+    private slots:
+        void browseFolder(void);
-    private slots:
+        void done(bool);
-        void browseFolder(void);
+        
-        void done(bool);
+};
-        
-};
+#endif
-#endif

diff --git a/rbutil/rbutilqt/installzipwindow.h b/rbutil/rbutilqt/installzipwindow.h index 7208ff9ffb..1eb96b745f 100644 --- a/rbutil/rbutilqt/installzipwindow.h +++ b/rbutil/rbutilqt/installzipwindow.h
@@ -1,68 +1,66 @@
1	/***************************************************************************	1	/***************************************************************************
2	* __________ __ ___.	2	* __________ __ ___.
3	* Open \______ \ ____ ____ \| \| _\_ \|__ _______ ___	3	* Open \______ \ ____ ____ \| \| _\_ \|__ _______ ___
4	* Source \| _// _ \_/ ___\\| \|/ /\| __ \ / _ \ \/ /	4	* Source \| _// _ \_/ ___\\| \|/ /\| __ \ / _ \ \/ /
5	* Jukebox \| \| ( <_> ) \___\| < \| \_\ ( <_> > < <	5	* Jukebox \| \| ( <_> ) \___\| < \| \_\ ( <_> > < <
6	* Firmware \|____\|_ /\____/ \___ >__\|_ \\|___ /\____/__/\_ \	6	* Firmware \|____\|_ /\____/ \___ >__\|_ \\|___ /\____/__/\_ \
7	* \/ \/ \/ \/ \/	7	* \/ \/ \/ \/ \/
8	*	8	*
9	* Copyright (C) 2007 by Dominik Wenger	9	* Copyright (C) 2007 by Dominik Wenger
10	* $Id: installzipwindow.h 14027 2007-07-27 17:42:49Z domonoky $	10	* $Id: installzipwindow.h 14027 2007-07-27 17:42:49Z domonoky $
11	*	11	*
12	* All files in this archive are subject to the GNU General Public License.	12	* All files in this archive are subject to the GNU General Public License.
13	* See the file COPYING in the source tree root for full license agreement.	13	* See the file COPYING in the source tree root for full license agreement.
14	*	14	*
15	* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY	15	* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
16	* KIND, either express or implied.	16	* KIND, either express or implied.
17	*	17	*
18	****************************************************************************/	18	****************************************************************************/
19		19
20	#ifndef INSTALLZIPWINDOW_H	20	#ifndef INSTALLZIPWINDOW_H
21	#define INSTALLZIPWINDOW_H	21	#define INSTALLZIPWINDOW_H
22		22
23	#include <QtGui>	23	#include <QtGui>
24		24
25	#include <QSettings>	25	#include <QSettings>
26		26
27	#include "ui_installzipfrm.h"	27	#include "ui_installzipfrm.h"
28	#include "ui_installprogressfrm.h"	28	#include "installzip.h"
29	#include "installzip.h"	29	#include "progressloggergui.h"
30		30
31		31	class InstallZipWindow : public QDialog
32	class InstallZipWindow : public QDialog	32	{
33	{	33	Q_OBJECT
34	Q_OBJECT	34	public:
35	public:	35	InstallZipWindow(QWidget *parent = 0);
36	InstallZipWindow(QWidget *parent = 0);	36	void setProxy(QUrl);
37	void setProxy(QUrl);	37	void setMountPoint(QString);
38	void setMountPoint(QString);	38	void setUrl(QString);
39	void setUrl(QString);	39	void setLogSection(QString name){logsection = name; }
40	void setLogSection(QString name){logsection = name; }	40	void setUserSettings(QSettings*);
41	void setUserSettings(QSettings*);	41	void setDeviceSettings(QSettings*);
42	void setDeviceSettings(QSettings*);	42
43		43	public slots:
44	public slots:	44	void accept(void);
45	void accept(void);	45
46		46	private:
47	private:	47	Ui::InstallZipFrm ui;
48	Ui::InstallZipFrm ui;	48	QUrl proxy;
49	Ui::InstallProgressFrm dp;	49	QSettings *devices;
50	QUrl proxy;	50	QSettings *userSettings;
51	QSettings *devices;	51	ProgressLoggerGui* logger;
52	QSettings *userSettings;	52	QString file;
53	QDialog *downloadProgress;	53	QString fileName;
54	QString file;	54	QString mountPoint;
55	QString fileName;	55	QString url;
56	QString mountPoint;	56	QString logsection;
57	QString url;	57	ZipInstaller* installer;
58	QString logsection;	58
59	ZipInstaller* installer;	59	private slots:
60		60	void browseFolder(void);
61	private slots:	61	void done(bool);
62	void browseFolder(void);	62
63	void done(bool);	63	};
64		64
65	};	65
66		66	#endif
67
68	#endif