- begin implementation of custom backup- and restore-locations

3 files changed, 192 insertions, 50 deletions

diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 2eccdfe..3889744 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,119 +1,102 @@
 #include "backuprestore.h"
 #include "errordialog.h"
 
+
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/ostorageinfo.h>
-#include <qpe/qpeapplication.h>
 using namespace Opie::Core;
 
+#include <qpe/qpeapplication.h>
+#include <qpe/resource.h>
+#include <qpe/config.h>
+
 /* QT */
 #include <qapplication.h>
 #include <qmultilineedit.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qheader.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qlist.h>
-#include <stdlib.h>
 #include <qregexp.h>
 #include <qtextstream.h>
 #include <qtextview.h>
+#include <qlineedit.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();
-    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(updateList, SIGNAL(clicked()),
-            this, SLOT( fileListUpdate()));
+    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() ) );
 
     //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();
-
-    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; 
-    }
+    refreshBackupLocations();
+    refreshLocations();
 
     Config config("BackupAndRestore");
     //read last locations
     config.setGroup("LastLocation");
     QString lastStoreLocation   = config.readEntry( "LastStoreLocation", "" );
     QString lastRestoreLocation = config.readEntry( "LastRestoreLocation", "" );
     int locationIndex    = 0;
 
     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++;
     }
 
     // Read the list of items to ignore.
     QList<QString> dontBackupList;
     dontBackupList.setAutoDelete(true);
     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), "")));
     }
 
@@ -131,64 +114,90 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags f
                 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;
+    }
+
+    // Add own locations from locationList
+    // todo implementation
+}
+
 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");
     }
@@ -495,34 +504,66 @@ void BackupAndRestore::restore()
 
     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
+    odebug << "not implemented yet" << oendl;
+}
+
+void BackupAndRestore::addLocation()
+{
+    if ( ( !locationEdit->text().isEmpty() ) &&
+         ( QDir( locationEdit->text() ).exists() ) )
+    {
+        (void) new QListViewItem( locationList, locationEdit->text() );
+        locationEdit->setText( "" );
+    }
+}
+
+void BackupAndRestore::removeLocation()
+{
+    if ( locationList->selectedItem() )
+    {
+        delete( locationList->selectedItem() );
+    }
+}
+
+void BackupAndRestore::saveLocation()
+{
+    //todo: implement
+    odebug << "not implemented yet" << oendl;
+}
+
+
 // backuprestore.cpp
 
diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h
index 0d88f8d..527b3cf 100644
--- a/noncore/settings/backup/backuprestore.h
+++ b/noncore/settings/backup/backuprestore.h
@@ -1,47 +1,53 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
 #include <qmainwindow.h>
 #include "backuprestorebase.h"
 #include <qmap.h>
 #include <qlist.h>
 
 class QListViewItem;
 
 class BackupAndRestore : public BackupAndRestoreBase
 {
 
     Q_OBJECT
 
 public:
 
     BackupAndRestore( QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
     ~BackupAndRestore();
 
     static QString appName() { return QString::fromLatin1("backup"); }
 
 private slots:
     void backup();
     void restore();
     void selectItem(QListViewItem *currentItem);
     void sourceDirChanged(int);
     void rescanFolder(QString directory);
     void fileListUpdate();
 
+    void addLocation();
+    void removeLocation();
+    void saveLocation();
+
 private:
     void scanForApplicationSettings();
     int getBackupFiles(QString &backupFiles, QListViewItem *parent);
     QString getExcludeFile();
     QMap<QString, QString> backupLocations;
     QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list);
+    void refreshBackupLocations();
+    void refreshLocations();
 
     QListViewItem *systemSettings;
     QListViewItem *applicationSettings;
     QListViewItem *documents;
 
 };
 
 #endif
 
 // backuprestore.h
 
diff --git a/noncore/settings/backup/backuprestorebase.ui b/noncore/settings/backup/backuprestorebase.ui
index a52b42d..b4624bb 100644
--- a/noncore/settings/backup/backuprestorebase.ui
+++ b/noncore/settings/backup/backuprestorebase.ui
@@ -1,92 +1,98 @@
 <!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>231</width>
-            <height>275</height>
+            <width>290</width>
+            <height>243</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>
         <property stdset="1">
             <name>margin</name>
             <number>0</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>6</number>
+            <number>0</number>
         </property>
         <widget>
             <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>11</number>
+                        <number>4</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>6</number>
+                        <number>4</number>
                     </property>
                     <widget row="0"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel1</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Save To</string>
                         </property>
                     </widget>
                     <widget row="0"  column="1" >
                         <class>QComboBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>storeToLocation</cstring>
                         </property>
                     </widget>
                     <widget row="2"  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="1"  column="0"  rowspan="1"  colspan="2" >
                         <class>QListView</class>
@@ -103,112 +109,201 @@
                                 <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>
                             <bool>true</bool>
                         </property>
                     </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>11</number>
+                        <number>4</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>6</number>
+                        <number>4</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>
+                        </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>
-                    <widget row="3"  column="0"  rowspan="1"  colspan="2" >
+                </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>
+                    </property>
+                    <widget row="0"  column="0"  rowspan="1"  colspan="3" >
+                        <class>QLineEdit</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>locationEdit</cstring>
+                        </property>
+                    </widget>
+                    <widget row="0"  column="3" >
+                        <class>QToolButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>locationSelectBtn</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>maximumSize</name>
+                            <size>
+                                <width>20</width>
+                                <height>30</height>
+                            </size>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>...</string>
+                        </property>
+                    </widget>
+                    <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>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>locationList</cstring>
+                        </property>
+                    </widget>
+                    <widget row="2"  column="0" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>restoreButton</cstring>
+                            <cstring>addLocationButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>&amp;Restore</string>
+                            <string>Add</string>
                         </property>
                     </widget>
-                    <widget row="0"  column="0" >
-                        <class>QLabel</class>
+                    <widget row="2"  column="1" >
+                        <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>TextLabel1_2</cstring>
+                            <cstring>removeLocationButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>Select Source</string>
+                            <string>Remove</string>
                         </property>
                     </widget>
-                    <widget row="1"  column="0"  rowspan="1"  colspan="2" >
+                    <widget row="2"  column="2"  rowspan="1"  colspan="2" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>updateList</cstring>
+                            <cstring>saveLocationsButton</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>Update Filelist</string>
+                            <string>Save</string>
                         </property>
                     </widget>
                 </grid>
             </widget>
         </widget>
     </vbox>
 </widget>
 </UI>