2 files changed, 26 insertions, 78 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 180980a..5a4e284 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,24 +1,24 @@
 /*
-                             This file is part of the Opie Project
+                     This file is part of the Opie Project
               =.
-             .=l.            Copyright (c) 2002-2004 The Opie Team <opie-devel@handhelds.org>
+      .=l.            Copyright (c) 2002-2004 The Opie Team <opie-devel@handhelds.org>
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This file is free software; you can
+_;:,   .>  :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
+.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
+  .i_,=:_.   -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
+..}^=.=    =    ;      Public License for more details.
-++=   -.     .`     .:
++=  -.   .`   .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
+:   = ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
+-.  .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
+ -_. . .  )=. =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+  --    :-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
@@ -272,6 +272,7 @@ void BackupAndRestore::backup()
 {
-    if ( cb_type_userdata->isChecked() )
+    backupUserData();
+/*    if ( cb_type_userdata->isChecked() )
        backupUserData();
    else
-        backupRootFs();
+        backupRootFs();*/
 }
@@ -589,4 +590,4 @@ void BackupAndRestore::restore()
-    if ( QMessageBox::warning( this, tr( "Restore" ), 
+    if ( QMessageBox::warning( this, tr( "Restore" ),
-                                     tr( "Would you really overwrite your local data?" ), 
+                                     tr( "Would you really overwrite your local data?" ),
                                     tr( "Yes" ), tr( "No" ), "", 1 ) == 1 )
diff --git a/noncore/settings/backup/backuprestorebase.ui b/noncore/settings/backup/backuprestorebase.ui
index c91f292..f2b7d75 100644
--- a/noncore/settings/backup/backuprestorebase.ui
+++ b/noncore/settings/backup/backuprestorebase.ui
@@ -132,55 +132,2 @@
                    </widget>
-                    <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>
-                        <grid>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>6</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>2</number>
-                            </property>
-                            <widget row="1"  column="0" >
-                                <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>
-                            <widget row="0"  column="0" >
-                                <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>
-                        </grid>
-                    </widget>
                </grid>

diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 180980a..5a4e284 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,24 +1,24 @@
1	/*	1	/*
2	This file is part of the Opie Project	2	This file is part of the Opie Project
3	=.	3	=.
4	.=l. Copyright (c) 2002-2004 The Opie Team <opie-devel@handhelds.org>	4	.=l. Copyright (c) 2002-2004 The Opie Team <opie-devel@handhelds.org>
5	.>+-=	5	.>+-=
6	_;:, .> :=\|. This file is free software; you can	6	_;:, .> :=\|. This file is free software; you can
7	.> <`_, > . <= redistribute it and/or modify it under	7	.> <`_, > . <= redistribute it and/or modify it under
8	:`=1 )Y*s>-.-- : the terms of the GNU General Public	8	:`=1 )Y*s>-.-- : the terms of the GNU General Public
9	.="- .-=="i, .._ License as published by the Free Software	9	.="- .-=="i, .._ License as published by the Free Software
10	- . .-<_> .<> Foundation; either version 2 of the License,	10	- . .-<_> .<> Foundation; either version 2 of the License,
11	._= =} : or (at your option) any later version.	11	._= =} : or (at your option) any later version.
12	.%`+i> _;_.	12	.%`+i> _;_.
13	.i_,=:_. -<s. This file is distributed in the hope that	13	.i_,=:_. -<s. This file is distributed in the hope that
14	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;	14	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
15	: .. .:, . . . without even the implied warranty of	15	: .. .:, . . . without even the implied warranty of
16	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A	16	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
17	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General	17	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
18	..}^=.= = ; Public License for more details.	18	..}^=.= = ; Public License for more details.
19	++= -. .` .:	19	++= -. .` .:
20	: = ...= . :.=- You should have received a copy of the GNU	20	: = ...= . :.=- You should have received a copy of the GNU
21	-. .:....=;==+<; General Public License along with this file;	21	-. .:....=;==+<; General Public License along with this file;
22	-_. . . )=. = see the file COPYING. If not, write to the	22	-_. . . )=. = see the file COPYING. If not, write to the
23	-- :-=` Free Software Foundation, Inc.,	23	-- :-=` Free Software Foundation, Inc.,
24	59 Temple Place - Suite 330,	24	59 Temple Place - Suite 330,
@@ -272,6 +272,7 @@ void BackupAndRestore::backup()
272	{	272	{
273	if ( cb_type_userdata->isChecked() )	273	backupUserData();
		274	/* if ( cb_type_userdata->isChecked() )
274	backupUserData();	275	backupUserData();
275	else	276	else
276	backupRootFs();	277	backupRootFs();*/
277	}	278	}
@@ -589,4 +590,4 @@ void BackupAndRestore::restore()
589		590
590	if ( QMessageBox::warning( this, tr( "Restore" ),	591	if ( QMessageBox::warning( this, tr( "Restore" ),
591	tr( "Would you really overwrite your local data?" ),	592	tr( "Would you really overwrite your local data?" ),
592	tr( "Yes" ), tr( "No" ), "", 1 ) == 1 )	593	tr( "Yes" ), tr( "No" ), "", 1 ) == 1 )


diff --git a/noncore/settings/backup/backuprestorebase.ui b/noncore/settings/backup/backuprestorebase.ui index c91f292..f2b7d75 100644 --- a/noncore/settings/backup/backuprestorebase.ui +++ b/noncore/settings/backup/backuprestorebase.ui
@@ -132,55 +132,2 @@
132	</widget>	132	</widget>
133	<widget row="0" column="0" rowspan="1" colspan="2" >
134	<class>QButtonGroup</class>
135	<property stdset="1">
136	<name>name</name>
137	<cstring>frame_type</cstring>
138	</property>
139	<property stdset="1">
140	<name>title</name>
141	<string>Type</string>
142	</property>
143	<property>
144	<name>layoutMargin</name>
145	</property>
146	<property>
147	<name>layoutSpacing</name>
148	</property>
149	<grid>
150	<property stdset="1">
151	<name>margin</name>
152	<number>6</number>
153	</property>
154	<property stdset="1">
155	<name>spacing</name>
156	<number>2</number>
157	</property>
158	<widget row="1" column="0" >
159	<class>QRadioButton</class>
160	<property stdset="1">
161	<name>name</name>
162	<cstring>cb_type_fullbackup</cstring>
163	</property>
164	<property stdset="1">
165	<name>text</name>
166	<string>Full Backup (Root File System)</string>
167	</property>
168	</widget>
169	<widget row="0" column="0" >
170	<class>QRadioButton</class>
171	<property stdset="1">
172	<name>name</name>
173	<cstring>cb_type_userdata</cstring>
174	</property>
175	<property stdset="1">
176	<name>text</name>
177	<string>User Data (Configuration + PIM)</string>
178	</property>
179	<property stdset="1">
180	<name>checked</name>
181	<bool>true</bool>
182	</property>
183	</widget>
184	</grid>
185	</widget>
186	</grid>	133	</grid>