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

- add file headers
- add version to .pro

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
@@ -7,4 +7,4 @@ 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,19 +1,44 @@
+/*
+                             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>
@@ -24,4 +49,5 @@ using namespace Opie::Ui;
 #include <qlistview.h>
 #include <qpushbutton.h>
+#include <qradiobutton.h>
 #include <qheader.h>
 #include <qmessagebox.h>
@@ -245,4 +271,18 @@ 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,2 +1,30 @@
+/*
+                             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
@@ -44,4 +72,7 @@ private:
     void refreshLocations();
 
+    void backupUserData();
+    void backupRootFs();
+
     QListViewItem *systemSettings;
     QListViewItem *applicationSettings;
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
@@ -12,6 +12,6 @@
             <x>0</x>
             <y>0</y>
-            <width>282</width>
-            <height>243</height>
+            <width>278</width>
+            <height>298</height>
         </rect>
     </property>
@@ -64,18 +64,22 @@
                     <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>
-                            <string>Save To</string>
+                                <name>margin</name>
+                                <number>0</number>
                         </property>
-                    </widget>
-                    <widget row="0"  column="1" >
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget row="1"  column="1" >
                         <class>QComboBox</class>
                         <property stdset="1">
@@ -83,6 +87,24 @@
                             <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">
@@ -95,5 +117,58 @@
                         </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>
@@ -126,4 +201,6 @@
                 </grid>
             </widget>
+                </grid>
+            </widget>
             <widget>
                 <class>QWidget</class>