- prepare for backing up root file systems (aka clone)

- add file headers - add version to .pro
author: mickeyl <mickeyl> 2004-11-04 15:12:01 (UTC)
committer: mickeyl <mickeyl> 2004-11-04 15:12:01 (UTC)
commit: 5f56ab623c99c12ce246f775e065632fbfbbfc1f (patch) (unidiff)
tree: 0035922070d36de69226bfcefc4d959b5a453f61
parent: 18684ddb43d4d79304dee6b20ab62513ee50b883 (diff)
download: opie-5f56ab623c99c12ce246f775e065632fbfbbfc1f.zip
opie-5f56ab623c99c12ce246f775e065632fbfbbfc1f.tar.gz
opie-5f56ab623c99c12ce246f775e065632fbfbbfc1f.tar.bz2
4 files changed, 167 insertions, 19 deletions
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro
index 390c599..e964c3a 100644
--- a/noncore/settings/backup/backup.pro
+++ b/noncore/settings/backup/backup.pro
@@ -6,5 +6,5 @@ DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2
        INTERFACES= backuprestorebase.ui errordialog.ui
        TARGET  = backup
+VERSION     = 0.8.1
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 1748e8d..c944c6d 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,20 +1,45 @@
+/*
+                             This file is part of the Opie Project
+               =.
+             .=l.            Copyright (c) 2002-2004 The Opie Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This file is distributed in the hope that
+     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+..}^=.=       =       ;      Public License for more details.
++=   -.     .`     .:
+ :     =  ...= . :.=-        You should have received a copy of the GNU
+ -.   .:....=;==+<;          General Public License along with this file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #include "backuprestore.h"
 #include "errordialog.h"
 /* OPIE */
+#include <qpe/qpeapplication.h>
+#include <qpe/resource.h>
+#include <qpe/config.h>
 #include <opie2/odebug.h>
 #include <opie2/ostorageinfo.h>
-using namespace Opie::Core;
 #include <opie2/ofiledialog.h>
 #include <opie2/owait.h>
+using namespace Opie::Core;
 using namespace Opie::Ui;
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
 /* QT */
 #include <qapplication.h>
 #include <qmultilineedit.h>
@@ -23,6 +48,7 @@ using namespace Opie::Ui;
 #include <qfileinfo.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
+#include <qradiobutton.h>
 #include <qheader.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
@@ -244,6 +270,20 @@ void BackupAndRestore::scanForApplicationSettings()
 */
 void BackupAndRestore::backup()
 {
+    if ( cb_type_userdata->isChecked() )
+        backupUserData();
+    else
+        backupRootFs();
+}
+void BackupAndRestore::backupRootFs()
+{
+    QMessageBox::critical(this, "Message", "Not Yet Implemented", "Ok" );
+}
+void BackupAndRestore::backupUserData()
+{
    QString backupFiles;
    if(getBackupFiles(backupFiles, NULL) == 0)
    {
diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h
index 332123a..015f854 100644
--- a/noncore/settings/backup/backuprestore.h
+++ b/noncore/settings/backup/backuprestore.h
@@ -1,3 +1,31 @@
+/*
+                             This file is part of the Opie Project
+               =.
+             .=l.            Copyright (c) 2002-2004 The Opie Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         This file is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This file is distributed in the hope that
+     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+..}^=.=       =       ;      Public License for more details.
++=   -.     .`     .:
+ :     =  ...= . :.=-        You should have received a copy of the GNU
+ -.   .:....=;==+<;          General Public License along with this file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+*/
 #ifndef WINDOW_H
 #define WINDOW_H
@@ -43,6 +71,9 @@ private:
    void refreshBackupLocations();
    void refreshLocations();
+    void backupUserData();
+    void backupRootFs();
    QListViewItem *systemSettings;
    QListViewItem *applicationSettings;
    QListViewItem *documents;
diff --git a/noncore/settings/backup/backuprestorebase.ui b/noncore/settings/backup/backuprestorebase.ui
index b464556..6186d68 100644
--- a/noncore/settings/backup/backuprestorebase.ui
+++ b/noncore/settings/backup/backuprestorebase.ui
@@ -11,8 +11,8 @@
        <rect>
            <x>0</x>
            <y>0</y>
-            <width>282</width>
+            <width>278</width>
-            <height>243</height>
+            <height>298</height>
        </rect>
    </property>
    <property stdset="1">
@@ -63,27 +63,49 @@
                    </property>
                    <property stdset="1">
                        <name>spacing</name>
-                        <number>4</number>
+                        <number>2</number>
                    </property>
                    <widget row="0"  column="0" >
-                        <class>QLabel</class>
+                        <class>QLayoutWidget</class>
                        <property stdset="1">
                            <name>name</name>
-                            <cstring>TextLabel1</cstring>
+                            <cstring>Layout1</cstring>
                        </property>
+                        <grid>
                        <property stdset="1">
-                            <name>text</name>
+                                <name>margin</name>
-                            <string>Save To</string>
+                                <number>0</number>
                        </property>
-                    </widget>
+                            <property stdset="1">
-                    <widget row="0"  column="1" >
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget row="1"  column="1" >
                        <class>QComboBox</class>
                        <property stdset="1">
                            <name>name</name>
                            <cstring>storeToLocation</cstring>
                        </property>
+                                <property stdset="1">
+                                    <name>sizePolicy</name>
+                                    <sizepolicy>
+                                        <hsizetype>3</hsizetype>
+                                        <vsizetype>1</vsizetype>
+                                    </sizepolicy>
+                                </property>
                    </widget>
-                    <widget row="2"  column="0"  rowspan="1"  colspan="2" >
+                            <widget row="1"  column="0" >
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>TextLabel1</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Destination</string>
+                                </property>
+                            </widget>
+                            <widget row="3"  column="0"  rowspan="1"  colspan="2" >
                        <class>QPushButton</class>
                        <property stdset="1">
                            <name>name</name>
@@ -94,7 +116,60 @@
                            <string>&amp;Backup</string>
                        </property>
                    </widget>
-                    <widget row="1"  column="0"  rowspan="1"  colspan="2" >
+                            <widget row="0"  column="0"  rowspan="1"  colspan="2" >
+                                <class>QButtonGroup</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>frame_type</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>title</name>
+                                    <string>Type</string>
+                                </property>
+                                <property>
+                                    <name>layoutMargin</name>
+                                </property>
+                                <property>
+                                    <name>layoutSpacing</name>
+                                </property>
+                                <vbox>
+                                    <property stdset="1">
+                                        <name>margin</name>
+                                        <number>4</number>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>spacing</name>
+                                        <number>2</number>
+                                    </property>
+                                    <widget>
+                                        <class>QRadioButton</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>cb_type_userdata</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>User Data (Configuration + PIM)</string>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>checked</name>
+                                            <bool>true</bool>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QRadioButton</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>cb_type_fullbackup</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>Full Backup (Root File System)</string>
+                                        </property>
+                                    </widget>
+                                </vbox>
+                            </widget>
+                            <widget row="2"  column="0"  rowspan="1"  colspan="2" >
                        <class>QListView</class>
                        <column>
                            <property>
@@ -125,6 +200,8 @@
                    </widget>
                </grid>
            </widget>
+                </grid>
+            </widget>
            <widget>
                <class>QWidget</class>
                <property stdset="1">
author	mickeyl <mickeyl>	2004-11-04 15:12:01 (UTC)
committer	mickeyl <mickeyl>	2004-11-04 15:12:01 (UTC)
commit	5f56ab623c99c12ce246f775e065632fbfbbfc1f (patch) (unidiff)
tree	0035922070d36de69226bfcefc4d959b5a453f61
parent	18684ddb43d4d79304dee6b20ab62513ee50b883 (diff)
download	opie-5f56ab623c99c12ce246f775e065632fbfbbfc1f.zip opie-5f56ab623c99c12ce246f775e065632fbfbbfc1f.tar.gz opie-5f56ab623c99c12ce246f775e065632fbfbbfc1f.tar.bz2

diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro index 390c599..e964c3a 100644 --- a/noncore/settings/backup/backup.pro +++ b/noncore/settings/backup/backup.pro
@@ -6,5 +6,5 @@ DEPENDPATH += $(OPIEDIR)/include
6	LIBS += -lqpe -lopiecore2 -lopieui2	6	LIBS += -lqpe -lopiecore2 -lopieui2
7	INTERFACES= backuprestorebase.ui errordialog.ui	7	INTERFACES= backuprestorebase.ui errordialog.ui
8	TARGET = backup	8	TARGET = backup
9		9	VERSION = 0.8.1
10	include ( $(OPIEDIR)/include.pro )	10	include ( $(OPIEDIR)/include.pro )


diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 1748e8d..c944c6d 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,20 +1,45 @@
		1	/*
		2	This file is part of the Opie Project
		3	=.
		4	.=l. Copyright (c) 2002-2004 The Opie Team <opie-devel@handhelds.org>
		5	.>+-=
		6	_;:, .> :=\|. This file is free software; you can
		7	.> <`_, > . <= redistribute it and/or modify it under
		8	:`=1 )Y*s>-.-- : the terms of the GNU General Public
		9	.="- .-=="i, .._ License as published by the Free Software
		10	- . .-<_> .<> Foundation; either version 2 of the License,
		11	._= =} : or (at your option) any later version.
		12	.%`+i> _;_.
		13	.i_,=:_. -<s. This file is distributed in the hope that
		14	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
		15	: .. .:, . . . without even the implied warranty of
		16	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
		17	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
		18	..}^=.= = ; Public License for more details.
		19	++= -. .` .:
		20	: = ...= . :.=- You should have received a copy of the GNU
		21	-. .:....=;==+<; General Public License along with this file;
		22	-_. . . )=. = see the file COPYING. If not, write to the
		23	-- :-=` Free Software Foundation, Inc.,
		24	59 Temple Place - Suite 330,
		25	Boston, MA 02111-1307, USA.
		26
		27	*/
		28
1	#include "backuprestore.h"	29	#include "backuprestore.h"
2	#include "errordialog.h"	30	#include "errordialog.h"
3		31
4
5	/* OPIE */	32	/* OPIE */
		33	#include <qpe/qpeapplication.h>
		34	#include <qpe/resource.h>
		35	#include <qpe/config.h>
6	#include <opie2/odebug.h>	36	#include <opie2/odebug.h>
7	#include <opie2/ostorageinfo.h>	37	#include <opie2/ostorageinfo.h>
8	using namespace Opie::Core;
9
10	#include <opie2/ofiledialog.h>	38	#include <opie2/ofiledialog.h>
11	#include <opie2/owait.h>	39	#include <opie2/owait.h>
		40	using namespace Opie::Core;
12	using namespace Opie::Ui;	41	using namespace Opie::Ui;
13		42
14	#include <qpe/qpeapplication.h>
15	#include <qpe/resource.h>
16	#include <qpe/config.h>
17
18	/* QT */	43	/* QT */
19	#include <qapplication.h>	44	#include <qapplication.h>
20	#include <qmultilineedit.h>	45	#include <qmultilineedit.h>
@@ -23,6 +48,7 @@ using namespace Opie::Ui;
23	#include <qfileinfo.h>	48	#include <qfileinfo.h>
24	#include <qlistview.h>	49	#include <qlistview.h>
25	#include <qpushbutton.h>	50	#include <qpushbutton.h>
		51	#include <qradiobutton.h>
26	#include <qheader.h>	52	#include <qheader.h>
27	#include <qmessagebox.h>	53	#include <qmessagebox.h>
28	#include <qcombobox.h>	54	#include <qcombobox.h>
@@ -244,6 +270,20 @@ void BackupAndRestore::scanForApplicationSettings()
244	*/	270	*/
245	void BackupAndRestore::backup()	271	void BackupAndRestore::backup()
246	{	272	{
		273	if ( cb_type_userdata->isChecked() )
		274	backupUserData();
		275	else
		276	backupRootFs();
		277	}
		278
		279
		280	void BackupAndRestore::backupRootFs()
		281	{
		282	QMessageBox::critical(this, "Message", "Not Yet Implemented", "Ok" );
		283	}
		284
		285	void BackupAndRestore::backupUserData()
		286	{
247	QString backupFiles;	287	QString backupFiles;
248	if(getBackupFiles(backupFiles, NULL) == 0)	288	if(getBackupFiles(backupFiles, NULL) == 0)
249	{	289	{


diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h index 332123a..015f854 100644 --- a/noncore/settings/backup/backuprestore.h +++ b/noncore/settings/backup/backuprestore.h
@@ -1,3 +1,31 @@
		1	/*
		2	This file is part of the Opie Project
		3	=.
		4	.=l. Copyright (c) 2002-2004 The Opie Team <opie-devel@handhelds.org>
		5	.>+-=
		6	_;:, .> :=\|. This file is free software; you can
		7	.> <`_, > . <= redistribute it and/or modify it under
		8	:`=1 )Y*s>-.-- : the terms of the GNU General Public
		9	.="- .-=="i, .._ License as published by the Free Software
		10	- . .-<_> .<> Foundation; either version 2 of the License,
		11	._= =} : or (at your option) any later version.
		12	.%`+i> _;_.
		13	.i_,=:_. -<s. This file is distributed in the hope that
		14	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
		15	: .. .:, . . . without even the implied warranty of
		16	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
		17	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
		18	..}^=.= = ; Public License for more details.
		19	++= -. .` .:
		20	: = ...= . :.=- You should have received a copy of the GNU
		21	-. .:....=;==+<; General Public License along with this file;
		22	-_. . . )=. = see the file COPYING. If not, write to the
		23	-- :-=` Free Software Foundation, Inc.,
		24	59 Temple Place - Suite 330,
		25	Boston, MA 02111-1307, USA.
		26
		27	*/
		28
1	#ifndef WINDOW_H	29	#ifndef WINDOW_H
2	#define WINDOW_H	30	#define WINDOW_H
3		31
@@ -43,6 +71,9 @@ private:
43	void refreshBackupLocations();	71	void refreshBackupLocations();
44	void refreshLocations();	72	void refreshLocations();
45		73
		74	void backupUserData();
		75	void backupRootFs();
		76
46	QListViewItem *systemSettings;	77	QListViewItem *systemSettings;
47	QListViewItem *applicationSettings;	78	QListViewItem *applicationSettings;
48	QListViewItem *documents;	79	QListViewItem *documents;


diff --git a/noncore/settings/backup/backuprestorebase.ui b/noncore/settings/backup/backuprestorebase.ui index b464556..6186d68 100644 --- a/noncore/settings/backup/backuprestorebase.ui +++ b/noncore/settings/backup/backuprestorebase.ui
@@ -11,8 +11,8 @@
11	<rect>	11	<rect>
12	<x>0</x>	12	<x>0</x>
13	<y>0</y>	13	<y>0</y>
14	<width>282</width>	14	<width>278</width>
15	<height>243</height>	15	<height>298</height>
16	</rect>	16	</rect>
17	</property>	17	</property>
18	<property stdset="1">	18	<property stdset="1">
@@ -63,27 +63,49 @@
63	</property>	63	</property>
64	<property stdset="1">	64	<property stdset="1">
65	<name>spacing</name>	65	<name>spacing</name>
66	<number>4</number>	66	<number>2</number>
67	</property>	67	</property>
68	<widget row="0" column="0" >	68	<widget row="0" column="0" >
69	<class>QLabel</class>	69	<class>QLayoutWidget</class>
70	<property stdset="1">	70	<property stdset="1">
71	<name>name</name>	71	<name>name</name>
72	<cstring>TextLabel1</cstring>	72	<cstring>Layout1</cstring>
73	</property>	73	</property>
		74	<grid>
74	<property stdset="1">	75	<property stdset="1">
75	<name>text</name>	76	<name>margin</name>
76	<string>Save To</string>	77	<number>0</number>
77	</property>	78	</property>
78	</widget>	79	<property stdset="1">
79	<widget row="0" column="1" >	80	<name>spacing</name>
		81	<number>6</number>
		82	</property>
		83	<widget row="1" column="1" >
80	<class>QComboBox</class>	84	<class>QComboBox</class>
81	<property stdset="1">	85	<property stdset="1">
82	<name>name</name>	86	<name>name</name>
83	<cstring>storeToLocation</cstring>	87	<cstring>storeToLocation</cstring>
84	</property>	88	</property>
		89	<property stdset="1">
		90	<name>sizePolicy</name>
		91	<sizepolicy>
		92	<hsizetype>3</hsizetype>
		93	<vsizetype>1</vsizetype>
		94	</sizepolicy>
		95	</property>
85	</widget>	96	</widget>
86	<widget row="2" column="0" rowspan="1" colspan="2" >	97	<widget row="1" column="0" >
		98	<class>QLabel</class>
		99	<property stdset="1">
		100	<name>name</name>
		101	<cstring>TextLabel1</cstring>
		102	</property>
		103	<property stdset="1">
		104	<name>text</name>
		105	<string>Destination</string>
		106	</property>
		107	</widget>
		108	<widget row="3" column="0" rowspan="1" colspan="2" >
87	<class>QPushButton</class>	109	<class>QPushButton</class>
88	<property stdset="1">	110	<property stdset="1">
89	<name>name</name>	111	<name>name</name>
@@ -94,7 +116,60 @@
94	<string>&Backup</string>	116	<string>&Backup</string>
95	</property>	117	</property>
96	</widget>	118	</widget>
97	<widget row="1" column="0" rowspan="1" colspan="2" >	119	<widget row="0" column="0" rowspan="1" colspan="2" >
		120	<class>QButtonGroup</class>
		121	<property stdset="1">
		122	<name>name</name>
		123	<cstring>frame_type</cstring>
		124	</property>
		125	<property stdset="1">
		126	<name>title</name>
		127	<string>Type</string>
		128	</property>
		129	<property>
		130	<name>layoutMargin</name>
		131	</property>
		132	<property>
		133	<name>layoutSpacing</name>
		134	</property>
		135	<vbox>
		136	<property stdset="1">
		137	<name>margin</name>
		138	<number>4</number>
		139	</property>
		140	<property stdset="1">
		141	<name>spacing</name>
		142	<number>2</number>
		143	</property>
		144	<widget>
		145	<class>QRadioButton</class>
		146	<property stdset="1">
		147	<name>name</name>
		148	<cstring>cb_type_userdata</cstring>
		149	</property>
		150	<property stdset="1">
		151	<name>text</name>
		152	<string>User Data (Configuration + PIM)</string>
		153	</property>
		154	<property stdset="1">
		155	<name>checked</name>
		156	<bool>true</bool>
		157	</property>
		158	</widget>
		159	<widget>
		160	<class>QRadioButton</class>
		161	<property stdset="1">
		162	<name>name</name>
		163	<cstring>cb_type_fullbackup</cstring>
		164	</property>
		165	<property stdset="1">
		166	<name>text</name>
		167	<string>Full Backup (Root File System)</string>
		168	</property>
		169	</widget>
		170	</vbox>
		171	</widget>
		172	<widget row="2" column="0" rowspan="1" colspan="2" >
98	<class>QListView</class>	173	<class>QListView</class>
99	<column>	174	<column>
100	<property>	175	<property>
@@ -125,6 +200,8 @@
125	</widget>	200	</widget>
126	</grid>	201	</grid>
127	</widget>	202	</widget>
		203	</grid>
		204	</widget>
128	<widget>	205	<widget>
129	<class>QWidget</class>	206	<class>QWidget</class>
130	<property stdset="1">	207	<property stdset="1">