2 files changed, 142 insertions, 169 deletions

diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index d028379..8928cda 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,346 +1,345 @@
 /*
                              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/odevice.h>
 #include <opie2/ostorageinfo.h>
 #include <opie2/ofiledialog.h>
 #include <opie2/owait.h>
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
 /* QT */
 #include <qapplication.h>
 #include <qmultilineedit.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qheader.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qlist.h>
 #include <qregexp.h>
 #include <qtextstream.h>
 #include <qtextview.h>
 #include <qlineedit.h>
 #include <qstringlist.h>
 
 /* STD */
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 
 #define HEADER_NAME 0
 #define HEADER_BACKUP 1
 #define BACKUP_LOCATION 2
 
 #define EXTENSION ".bck"
 
 const QString tempFileName = "/tmp/backup.err";
 
 BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags fl)
         : BackupAndRestoreBase(parent, name,  fl)
 {
     backupList->header()->hide();
     restoreList->header()->hide();
     locationList->header()->hide();
     connect( backupButton, SIGNAL( clicked() ), this, SLOT( backup() ) );
     connect( restoreButton, SIGNAL( clicked() ), this, SLOT( restore() ) );
     connect( backupList, SIGNAL( clicked( QListViewItem* ) ), this, SLOT( selectItem( QListViewItem* ) ) );
     connect( restoreSource, SIGNAL( activated( int ) ), this, SLOT( sourceDirChanged( int ) ) );
     connect( addLocationButton, SIGNAL( clicked() ), this, SLOT( addLocation() ) );
     connect( removeLocationButton, SIGNAL( clicked() ), this, SLOT( removeLocation() ) );
-    connect( saveLocationsButton, SIGNAL( clicked() ), this, SLOT( saveLocations() ) );
     connect( selectLocationButton, SIGNAL( clicked() ), this, SLOT( selectLocation() ) );
 
     //add directorys for backing up
     applicationSettings = new QListViewItem(backupList, "Application Settings", "", "Settings/");
     selectItem(applicationSettings);
     applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/");
     selectItem(applicationSettings);
     documents= new QListViewItem(backupList, "Documents", "", "Documents/");
     selectItem(documents);
 
     scanForApplicationSettings();
     refreshLocations();
     refreshBackupLocations();
 
     // Read the list of items to ignore.
     QList<QString> dontBackupList;
     dontBackupList.setAutoDelete(true);
     Config config("BackupAndRestore");
     config.setGroup("DontBackup");
     int total = config.readNumEntry("Total", 0);
     for(int i = 0; i < total; i++)
     {
         dontBackupList.append(new QString(config.readEntry(QString("%1").arg(i), "")));
     }
 
     QList<QListViewItem> list;
     getAllItems(backupList->firstChild(), list);
 
     for(uint i = 0; i < list.count(); i++)
     {
         QString text = list.at(i)->text(HEADER_NAME);
         for(uint i2 = 0;  i2 < dontBackupList.count(); i2++)
         {
             if(*dontBackupList.at(i2) == text)
             {
                 selectItem(list.at(i));
                 break;
             }
         }
     }
     QPEApplication::showWidget( this );
 }
 
 BackupAndRestore::~BackupAndRestore()
 {
     QList<QListViewItem> list;
     getAllItems(backupList->firstChild(), list);
 
     Config config("BackupAndRestore");
     config.setGroup("DontBackup");
     config.clearGroup();
 
     int count = 0;
     for(uint i = 0; i < list.count(); i++)
     {
         if(list.at(i)->text(HEADER_BACKUP) == "")
         {
             config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME));
             count++;
         }
     }
     config.writeEntry("Total", count);
 
     // Remove Temp File
     if ( QFile::exists( tempFileName ) )
         QFile::remove( tempFileName );
 }
 
 void BackupAndRestore::refreshBackupLocations()
 {
     backupLocations.clear();
     // Add cards
     Opie::Core::OStorageInfo storage;
     backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" );
     if ( storage.hasCf() )
     {
         backupLocations.insert( "CF", storage.cfPath() );
         odebug << "Cf Path: " + storage.cfPath() << oendl;
     }
     if ( storage.hasSd() )
     {
         backupLocations.insert( "SD", storage.sdPath() );
         odebug << " Sd Path: " + storage.sdPath() << oendl;
     }
     if ( storage.hasMmc() )
     {
         backupLocations.insert( "MMC", storage.mmcPath() );
         odebug << "Mmc Path: " + storage.mmcPath() << oendl;
     }
 
     for ( QListViewItemIterator it( locationList ); it.current(); ++it )
     {
         backupLocations.insert( it.current()->text( 0 ), it.current()->text( 0 ) );
     }
 
     //update QComboBox
     storeToLocation->clear();
     restoreSource->clear();
 
     //read last locations
     Config config("BackupAndRestore");
     config.setGroup("LastLocation");
     QString lastStoreLocation   = config.readEntry( "LastStoreLocation", "" );
     QString lastRestoreLocation = config.readEntry( "LastRestoreLocation", "" );
     int locationIndex    = 0;
 
     //fill QComboBox
     QMap<QString, QString>::Iterator it;
     for( it = backupLocations.begin(); it != backupLocations.end(); ++it )
     {
         storeToLocation->insertItem(it.key());
         restoreSource->insertItem(it.key());
 
         //check for last locations
         if ( it.key() == lastStoreLocation )
             storeToLocation->setCurrentItem( locationIndex );
         if ( it.key() == lastRestoreLocation )
             restoreSource->setCurrentItem( locationIndex );
         locationIndex++;
     }
 }
 
 QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list)
 {
     while(item)
     {
         if(item->childCount() > 0)
             getAllItems(item->firstChild(), list);
         list.append(item);
         item = item->nextSibling();
     }
     return list;
 }
 
 /**
  * Selects and unselects the item by setting the HEADER_BACKUP to B or !.
  * and changing the icon to match
  * @param currentItem the item to swich the selection choice.
  */
 void BackupAndRestore::selectItem(QListViewItem *currentItem)
 {
     if(!currentItem)
         return;
 
     if(currentItem->text(HEADER_BACKUP) == "B")
     {
         currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/null"));
         currentItem->setText(HEADER_BACKUP, "");
     }
     else
     {
         currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/check"));
         currentItem->setText(HEADER_BACKUP, "B");
     }
 }
 
 void BackupAndRestore::scanForApplicationSettings()
 {
     QDir d( QDir::homeDirPath() + "/" + QString( applicationSettings->text(BACKUP_LOCATION) ) );
     d.setFilter( QDir::Dirs | QDir::Files | QDir::NoSymLinks );
     const QFileInfoList *list = d.entryInfoList();
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
     while ( (fi=it.current()) )
     {
         //odebug << (d.path()+"/"+fi->fileName()).latin1() << oendl;
         if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) )
         {
             QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName());
             selectItem(newItem);
         }
         ++it;
     }
 }
 
 /**
  * The "Backup" button has been pressed.  Get a list of all of the files that
  * should be backed up.  If there are no files, emit and error and exit.
  * Determine the file name to store the backup in.  Backup the file(s) using
  * tar and gzip  --best.  Report failure or success
  */
 void BackupAndRestore::backup()
 {
     if ( cb_type_userdata->isChecked() )
         backupUserData();
     else
         backupRootFs();
 }
 
 
 void BackupAndRestore::backupRootFs()
 {
     if ( ( ODevice::inst()->model() != Model_Zaurus_SL5000 ) && ( ODevice::inst()->model() != Model_Zaurus_SL5500 ) )
     {
         QMessageBox::critical( this, "Not yet implemented!", "<qt>Sorry, support for this model is not yet done.</qt>", "Ok" );
         return;
     }
 
     if ( !QFile::exists( "/usr/bin/mkfs.jffs2" ) && !QFile::exists( "/usr/sbin/mkfs.jffs2" ) )
     {
         QMessageBox::critical( this, "Can't find utility!", "<qt>Can't find mkfs.jffs2 - Install mtd-utils.</qt>", "Ok" );
         return;
     }
 
     // call 'mount' and parse its output to gather the device on which the root partition is mounted
     FILE* mountp = popen( "mount", "r" );
     QString device;
     QString mountpoint;
     {
         QTextStream mounto( mountp, IO_ReadOnly );
         QString on;
         QString type;
         QString filesystem;
         QString options;
         while ( !mounto.atEnd() )
         {
             mounto >> device >> on >> mountpoint >> type >> filesystem >> options;
             if ( mountpoint == "/" ) break;
         }
         odebug << device << " is formatted w/ '" << filesystem << "' and mounted on '" << mountpoint << "'" << oendl;
 
         if ( !device.startsWith( "/dev/mtdblock" ) )
         {
             QMessageBox::critical( this, "Can't backup!", QString( "<qt>unsupported root device '%1' - needs to be /dev/mtdblockN</qt>").arg( device ), "Ok" );
             return;
         }
     } // at this point, the QTextStream has been destroy and we can close the FILE*
     pclose( mountp );
 
 #if 1
     int rootmtd = device.right( 1 ).toInt();
 #else
     int rootmtd = 0;
 #endif
     odebug << "root mtdblock seems to be '" << rootmtd << "'" << oendl;
 
     // scan /proc/mtd to gather the size and erasesize of the root mtdblock
     QFile procmtdf( "/proc/mtd" );
     if ( !procmtdf.open( IO_ReadOnly ) )
     {
         QMessageBox::critical( this, "Can't backup!", "<qt>Can't open /proc/mtd</qt>", "Ok" );
         return;
     }
 
     QTextStream procmtd( &procmtdf );
     for ( int i = 0; i <= rootmtd; ++i ) procmtd.readLine(); // skip uninteresting things
     QString dev;
     QString size;
     QString erasesize;
     QString devname;
     procmtd >> dev >> size >> erasesize >> devname;
 
     odebug << "device " << dev << " size = " << size << ", erase size = " << erasesize << ", name = " << devname << "\"" << oendl;
 
     // compute pad
     QString pad = "--pad";
@@ -474,293 +473,295 @@ void BackupAndRestore::backupUserData()
         return;
     }
     else
     {
         QMessageBox::information(this, tr( "Message" ), tr( "Backup Successful." ), QString(tr( "Ok" ) ) );
     }
 
     //write store-location
     Config config( "BackupAndRestore" );
     config.setGroup( "LastLocation" );
     config.writeEntry( "LastStoreLocation", storeToLocation->currentText() );
 
     setCaption(tr("Backup and Restore"));
 }
 
 /***
  * Get a list of all of the files to backup.
  */
 int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent)
 {
     QListViewItem * currentItem;
     QString currentHome;
     if(!parent)
         currentItem = backupList->firstChild();
     else
     {
         currentItem = parent->firstChild();
         currentHome = parent->text(BACKUP_LOCATION);
     }
 
     uint count = 0;
     while( currentItem != 0 )
     {
         if(currentItem->text(HEADER_BACKUP) == "B" )
         {
             if(currentItem->childCount() == 0 )
             {
                 if(parent == NULL)
                     backupFiles += currentItem->text(BACKUP_LOCATION);
                 else
                     backupFiles += currentHome + currentItem->text(HEADER_NAME);
                 backupFiles += " ";
                 count++;
             }
             else
             {
                 count += getBackupFiles(backupFiles, currentItem);
             }
         }
         currentItem = currentItem->nextSibling();
     }
     return count;
 }
 
 void BackupAndRestore::sourceDirChanged(int selection)
 {
     restoreList->clear();
     rescanFolder(backupLocations[restoreSource->text(selection)]);
 }
 
 void BackupAndRestore::fileListUpdate()
 {
     owarn << "void BackupAndRestore::fileListUpdate()" << oendl;
     restoreList->clear();
     rescanFolder( backupLocations[restoreSource->currentText()] );
 }
 
 /**
  * Scans directory for any backup files.  Will recursivly go down,
  * but will not follow symlinks.
  * @param directory - the directory to look in.
  */
 void BackupAndRestore::rescanFolder(QString directory)
 {
     //odebug << QString("rescanFolder: ") + directory.latin1() << oendl;
     QDir d(directory);
     if(!d.exists())
         return;
 
     d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs);
     const QFileInfoList *list = d.entryInfoList();
     QFileInfoListIterator it( *list );
     QFileInfo *file;
     while ( (file=it.current()) )
     {  // for each file...
         // If it is a dir and not .. or . then add it as a tab and go down.
         if(file->isDir())
         {
             if(file->fileName() != ".." && file->fileName() != ".")
             {
                 rescanFolder(directory + "/" + file->fileName());
             }
         }
         else
         {
             // If it is a backup file add to list.
             if(file->fileName().contains(EXTENSION))
                 (void)new QListViewItem(restoreList, file->fileName());
         }
         ++it;
     }
 }
 
 /**
  * Restore a backup file.
  * Report errors or success
  */
 void BackupAndRestore::restore()
 {
     QListViewItem *restoreItem = restoreList->currentItem();
     if(!restoreItem)
     {
         QMessageBox::critical(this, tr( "Message" ),
                               tr( "Please select something to restore." ),QString( tr( "Ok") ) );
         return;
     }
 
     OWait *owait = new OWait();
     Global::statusMessage( tr( "Restore Backup..." ) );
     owait->show();
     qApp->processEvents();
 
     QString restoreFile = backupLocations[restoreSource->currentText()];
 
     restoreFile += "/" + restoreItem->text(0);
 
     odebug << restoreFile << oendl;
 
     //check if backup file come from opie 1.0.x
 
     QString commandLine = QString( "tar -tzf %1 | grep Applications/backup/exclude" ).arg( restoreFile.latin1() );
 
     int r = system( commandLine );
 
     QString startDir;
 
     if( r != 0 ) //Applications/backup/exclude not found - old backup file
     {
         startDir = QString( "/" );
     } else
     {
         startDir = QDir::homeDirPath();
     }
 
     //unpack backup file
     commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( startDir )
                   .arg( restoreFile.latin1() )
                   .arg( tempFileName.latin1() );
 
     odebug << commandLine << oendl;
 
     r = system( commandLine );
 
     owait->hide();
     delete owait;
 
     //error handling
     if(r != 0)
     {
         QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno );
         switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n"
                                       + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) )
         {
         case 1:
             owarn << "Details pressed !" << oendl;
             ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true );
             QFile errorFile( tempFileName );
             if ( errorFile.open(IO_ReadOnly) )
             {
                 QTextStream t( &errorFile );
                 QString s;
                 while ( !t.eof() )
                 {        // until end of file...
                     s += t.readLine();       // line of text excluding '\n'
                 }
                 errorFile.close();
 
                 pErrDialog->m_textarea->setText( s );
             }
             else
             {
                 pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) );
             }
             QPEApplication::execDialog( pErrDialog );
             delete pErrDialog;
 
             setCaption(tr("Backup and Restore.. Failed !!"));
             return;
 
             break;
 
         }
     }
     else
     {
         QMessageBox::information(this, tr( "Message" ), tr( "Restore Successful." ), QString( tr( "Ok") ) );
     }
 
     //write restore-location
     Config config( "BackupAndRestore" );
     config.setGroup( "LastLocation" );
     config.writeEntry( "LastRestoreLocation", restoreSource->currentText() );
 
     setCaption(tr("Backup and Restore"));
 }
 
 /**
  * Check for exclude in Applications/backup
  * If it does not exist, the function will create the file with *.bck as content
  * The exclude_files is read by tar and will provide to exclude special files out from backup.
  * e.g. alle *.bck files (backup-files) will not be backed up by default
  */
 
 QString BackupAndRestore::getExcludeFile()
 {
     QString excludeFileName = Global::applicationFileName( "backup", "exclude" );
     if ( !QFile::exists( excludeFileName ) )
     {
         QFile excludeFile( excludeFileName);
         if ( excludeFile.open( IO_WriteOnly ) == true )
         {
             QTextStream writeStream( &excludeFile );
             writeStream << "*.bck" << "\n";
             excludeFile.close();
         }
         else
         {
             return QString::null;
         }
     }
 
     return excludeFileName;
 }
 
 void BackupAndRestore::refreshLocations()
 {
     locationList->clear();
 
     //todo: implement add locations
     Config config( "BackupAndRestore" );
     config.setGroup( "Locations" );
 
     QStringList locations( config.readListEntry( "locations", '|' ) );
 
     for ( QStringList::Iterator it = locations.begin(); it != locations.end(); ++it ) {
          (void) new QListViewItem( locationList, *it );
     }
 }
 
 void BackupAndRestore::addLocation()
 {
     if ( ( !locationEdit->text().isEmpty() ) &&
          ( QDir( locationEdit->text() ).exists() ) )
     {
         (void) new QListViewItem( locationList, locationEdit->text() );
         locationEdit->setText( "" );
+        saveLocations();
     }
 }
 
 void BackupAndRestore::removeLocation()
 {
     if ( locationList->selectedItem() )
     {
         delete( locationList->selectedItem() );
+        saveLocations();
     }
 }
 
 void BackupAndRestore::saveLocations()
 {
     Config config("BackupAndRestore");
     config.setGroup("Locations");
 
     QStringList locations;
     for ( QListViewItemIterator it( locationList ); it.current(); ++it )
     {
         locations.append( it.current()->text( 0 ) );
     }
     config.writeEntry( "locations", locations, '|' );
 
     refreshBackupLocations();
 }
 
 void BackupAndRestore::selectLocation()
 {
     QString location = OFileDialog::getDirectory( OFileSelector::DIRECTORYSELECTOR );
     if ( !location.isEmpty() )
     {
         locationEdit->setText( location );
     }
 }
 
 // backuprestore.cpp
 
diff --git a/noncore/settings/backup/backuprestorebase.ui b/noncore/settings/backup/backuprestorebase.ui
index 6186d68..cca3dee 100644
--- a/noncore/settings/backup/backuprestorebase.ui
+++ b/noncore/settings/backup/backuprestorebase.ui
@@ -1,393 +1,365 @@
 <!DOCTYPE UI><UI>
 <class>BackupAndRestoreBase</class>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
         <cstring>BackupAndRestoreBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>278</width>
-            <height>298</height>
+            <width>246</width>
+            <height>338</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Backup And Restore</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
-    <vbox>
+    <grid>
         <property stdset="1">
             <name>margin</name>
-            <number>0</number>
+            <number>2</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>0</number>
+            <number>2</number>
         </property>
-        <widget>
+        <widget row="0"  column="0" >
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>tabWidget</cstring>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>Widget2</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Backup</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>4</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>2</number>
                     </property>
-                    <widget row="0"  column="0" >
-                        <class>QLayoutWidget</class>
+                    <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="1"  column="0" >
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>labelDestination</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>
+                            <cstring>backupButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>&amp;Backup</string>
+                        </property>
+                    </widget>
+                    <widget row="2"  column="0"  rowspan="1"  colspan="2" >
+                        <class>QListView</class>
+                        <column>
+                            <property>
+                                <name>text</name>
+                                <string>Applications</string>
+                            </property>
+                            <property>
+                                <name>clickable</name>
+                                <bool>true</bool>
+                            </property>
+                            <property>
+                                <name>resizeable</name>
+                                <bool>true</bool>
+                            </property>
+                        </column>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout1</cstring>
+                            <cstring>backupList</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>allColumnsShowFocus</name>
+                            <bool>true</bool>
+                        </property>
+                        <property stdset="1">
+                            <name>rootIsDecorated</name>
+                            <bool>true</bool>
+                        </property>
+                    </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>0</number>
+                                <number>6</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
-                                <number>6</number>
+                                <number>2</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="1"  column="0" >
-                                <class>QLabel</class>
+                                <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>TextLabel1</cstring>
+                                    <cstring>cb_type_fullbackup</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Destination</string>
+                                    <string>Full Backup (Root File System)</string>
                                 </property>
                             </widget>
-                            <widget row="3"  column="0"  rowspan="1"  colspan="2" >
-                                <class>QPushButton</class>
+                            <widget row="0"  column="0" >
+                                <class>QRadioButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>backupButton</cstring>
+                                    <cstring>cb_type_userdata</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>&amp;Backup</string>
+                                    <string>User Data (Configuration + PIM)</string>
                                 </property>
-                            </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>
-                                <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>
-                                        <name>text</name>
-                                        <string>Applications</string>
-                                    </property>
-                                    <property>
-                                        <name>clickable</name>
-                                        <bool>true</bool>
-                                    </property>
-                                    <property>
-                                        <name>resizeable</name>
-                                        <bool>true</bool>
-                                    </property>
-                                </column>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>backupList</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>allColumnsShowFocus</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>rootIsDecorated</name>
+                                    <name>checked</name>
                                     <bool>true</bool>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>Widget3</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Restore</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>4</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>4</number>
+                        <number>2</number>
                     </property>
                     <widget row="0"  column="1" >
                         <class>QComboBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>restoreSource</cstring>
                         </property>
                     </widget>
                     <widget row="2"  column="0"  rowspan="1"  colspan="2" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>restoreButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>&amp;Restore</string>
                         </property>
                     </widget>
                     <widget row="0"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>TextLabel1_2</cstring>
+                            <cstring>destinationLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Select Source</string>
                         </property>
                     </widget>
                     <widget row="1"  column="0"  rowspan="1"  colspan="2" >
                         <class>QListView</class>
                         <column>
                             <property>
                                 <name>text</name>
                                 <string>Column 1</string>
                             </property>
                             <property>
                                 <name>clickable</name>
                                 <bool>true</bool>
                             </property>
                             <property>
                                 <name>resizeable</name>
                                 <bool>true</bool>
                             </property>
                         </column>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>restoreList</cstring>
                         </property>
                         <property stdset="1">
                             <name>minimumSize</name>
                             <size>
                                 <width>0</width>
                                 <height>100</height>
                             </size>
                         </property>
                     </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Locations</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>4</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>4</number>
+                        <number>2</number>
                     </property>
-                    <widget row="1"  column="0"  rowspan="1"  colspan="4" >
-                        <class>QListView</class>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Locations</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
+                    <widget row="0"  column="2" >
+                        <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>locationList</cstring>
+                            <cstring>selectLocationButton</cstring>
                         </property>
-                    </widget>
-                    <widget row="2"  column="0" >
-                        <class>QPushButton</class>
                         <property stdset="1">
-                            <name>name</name>
-                            <cstring>addLocationButton</cstring>
+                            <name>sizePolicy</name>
+                            <sizepolicy>
+                                <hsizetype>0</hsizetype>
+                                <vsizetype>0</vsizetype>
+                            </sizepolicy>
+                        </property>
+                        <property stdset="1">
+                            <name>maximumSize</name>
+                            <size>
+                                <width>20</width>
+                                <height>30</height>
+                            </size>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>Add</string>
+                            <string>...</string>
                         </property>
                     </widget>
-                    <widget row="2"  column="1" >
-                        <class>QPushButton</class>
+                    <widget row="0"  column="0"  rowspan="1"  colspan="2" >
+                        <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>removeLocationButton</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Remove</string>
+                            <cstring>locationEdit</cstring>
                         </property>
                     </widget>
-                    <widget row="2"  column="2"  rowspan="1"  colspan="2" >
+                    <widget row="2"  column="0" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>saveLocationsButton</cstring>
+                            <cstring>addLocationButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>Save</string>
+                            <string>Add</string>
                         </property>
                     </widget>
-                    <widget row="0"  column="3" >
+                    <widget row="2"  column="1"  rowspan="1"  colspan="2" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>selectLocationButton</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>sizePolicy</name>
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                            </sizepolicy>
-                        </property>
-                        <property stdset="1">
-                            <name>maximumSize</name>
-                            <size>
-                                <width>20</width>
-                                <height>30</height>
-                            </size>
+                            <cstring>removeLocationButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>...</string>
+                            <string>Remove</string>
                         </property>
                     </widget>
-                    <widget row="0"  column="0"  rowspan="1"  colspan="3" >
-                        <class>QLineEdit</class>
+                    <widget row="1"  column="0"  rowspan="1"  colspan="3" >
+                        <class>QListView</class>
+                        <column>
+                            <property>
+                                <name>text</name>
+                                <string>Locations</string>
+                            </property>
+                            <property>
+                                <name>clickable</name>
+                                <bool>true</bool>
+                            </property>
+                            <property>
+                                <name>resizeable</name>
+                                <bool>true</bool>
+                            </property>
+                        </column>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>locationEdit</cstring>
+                            <cstring>locationList</cstring>
                         </property>
                     </widget>
                 </grid>
             </widget>
         </widget>
-    </vbox>
+    </grid>
 </widget>
 </UI>