summaryrefslogtreecommitdiff
authoreilers <eilers>2003-07-04 15:18:38 (UTC)
committer eilers <eilers>2003-07-04 15:18:38 (UTC)
commit51cb7e4cd9a7ec7f1bf864884928c61b9f2db3b0 (patch) (side-by-side diff)
tree3afddd69a47a0dc040df163f7796364e9fc2e5f1
parentb3dabf7c01cd586408c2d80125076484283e6236 (diff)
downloadopie-51cb7e4cd9a7ec7f1bf864884928c61b9f2db3b0.zip
opie-51cb7e4cd9a7ec7f1bf864884928c61b9f2db3b0.tar.gz
opie-51cb7e4cd9a7ec7f1bf864884928c61b9f2db3b0.tar.bz2
Merged all changes of opie-backup into HEAD to be able to work on
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/backup/backup.pro2
-rw-r--r--noncore/settings/backup/backuprestore.cpp117
-rw-r--r--noncore/settings/backup/backuprestore.h2
-rw-r--r--noncore/settings/backup/backuprestorebase.ui46
-rw-r--r--noncore/settings/backup/errordialog.ui154
-rw-r--r--noncore/settings/backup/opie-backup.control2
6 files changed, 290 insertions, 33 deletions
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro
index 78842b9..cadb381 100644
--- a/noncore/settings/backup/backup.pro
+++ b/noncore/settings/backup/backup.pro
@@ -6,7 +6,7 @@ SOURCES = main.cpp backuprestore.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
-INTERFACES = backuprestorebase.ui
+INTERFACES = backuprestorebase.ui errordialog.ui
TARGET = backup
DESTDIR = $(OPIEDIR)/bin
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 59e15a2..4ff6be1 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,6 +1,7 @@
#include "backuprestore.h"
//#include "output.h"
+#include "errordialog.h"
#include <qapplication.h>
#include <qmultilineedit.h>
@@ -18,6 +19,8 @@
#include <qlist.h>
#include <stdlib.h>
#include <qregexp.h>
+#include <qtextstream.h>
+#include <qtextview.h>
#include <errno.h>
#include <stdlib.h>
@@ -31,6 +34,9 @@
#define EXTENSION ".bck"
+const QString tempFileName = "/tmp/backup.err";
+
+
BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
: BackupAndRestoreBase(parent, name){
this->showMaximized();
@@ -44,6 +50,8 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
this, SLOT(selectItem(QListViewItem*)));
connect(restoreSource, SIGNAL(activated( int )),
this, SLOT(sourceDirChanged(int)));
+ connect(updateList, SIGNAL(clicked()),
+ this, SLOT( fileListUpdate()));
applicationSettings = new QListViewItem(backupList, "Application Settings", "",
QDir::homeDirPath() + "/Settings/");
@@ -127,6 +135,10 @@ BackupAndRestore::~BackupAndRestore(){
}
}
config.writeEntry("Total", count);
+
+ // Remove Temp File
+ if ( QFile::exists( tempFileName ) )
+ QFile::remove( tempFileName );
}
QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list){
@@ -191,8 +203,10 @@ void BackupAndRestore::backupPressed(){
setCaption(tr("Backup and Restore... working..."));
QString outputFile = backupLocations[storeToLocation->currentText()];
- QDateTime time = QDateTime::currentDateTime();
- QString dateString = time.date().toString().replace(QRegExp(" "), "");
+ QDateTime datetime = QDateTime::currentDateTime();
+ QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') +
+ QString::number( datetime.date().day() ).rightJustify(2, '0');
+
outputFile += "/" + dateString;
QString t = outputFile;
@@ -202,22 +216,56 @@ void BackupAndRestore::backupPressed(){
c++;
}
- qDebug(QString("system(\"tar -c %1 | gzip > %2\")").arg(backupFiles).arg(outputFile).latin1());
+ // We execute tar and compressing its output with gzip..
+ // The error output will be written into a temp-file which could be provided
+ // for debugging..
+ qDebug( "Storing file: %s", outputFile.latin1() );
outputFile += EXTENSION;
- int r = system( QString("tar -c %1 | gzip > %2").arg(backupFiles).arg(outputFile).latin1() );
+ qWarning( QString("(tar -c %1 | gzip > %2 ) 2> %3")
+ .arg( backupFiles )
+ .arg( outputFile.latin1() )
+ .arg( tempFileName.latin1() ) );
+ int r = system( QString("(tar -c %1 | gzip > %2 ) 2> %3")
+ .arg( backupFiles )
+ .arg( outputFile.latin1() )
+ .arg( tempFileName.latin1() ) );
if(r != 0){
perror("Error: ");
- QString errorMsg="Error\n"+(QString)strerror(errno);
-
- QMessageBox::critical(this, "Message", "Backup Failed.\n"+errorMsg, QString("Ok") );
+ QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno );
+
+ switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n"
+ + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ){
+
+ case 1:
+ qWarning("Details pressed !");
+ 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( "Unable to open File: /tmp/backup.er" );
+ }
+ pErrDialog->showMaximized();
+ pErrDialog->exec();
+ delete pErrDialog;
+ break;
+ }
+ setCaption(tr("Backup and Restore.. Failed !!"));
return;
}
else{
- QMessageBox::information(this, "Message", "Backup Successfull.",QString("Ok") );
+ QMessageBox::information(this, tr( "Message" ), tr( "Backup Successfull." ), QString(tr( "Ok" ) ) );
}
setCaption(tr("Backup and Restore"));
@@ -261,6 +309,13 @@ void BackupAndRestore::sourceDirChanged(int selection){
rescanFolder(backupLocations[restoreSource->text(selection)]);
}
+void BackupAndRestore::fileListUpdate()
+{
+ qWarning("void BackupAndRestore::fileListUpdate()");
+ restoreList->clear();
+ rescanFolder( backupLocations[restoreSource->currentText()] );
+}
+
/**
* Scans directory for any backup files. Will recursivly go down,
* but will not follow symlinks.
@@ -299,23 +354,55 @@ void BackupAndRestore::rescanFolder(QString directory){
void BackupAndRestore::restore(){
QListViewItem *restoreItem = restoreList->currentItem();
if(!restoreItem){
- QMessageBox::critical(this, "Message",
- "Please select something to restore.",QString("Ok") );
+ QMessageBox::critical(this, tr( "Message" ),
+ tr( "Please select something to restore." ),QString( tr( "Ok") ) );
return;
}
+ setCaption(tr("Backup and Restore... working..."));
+
QString restoreFile = backupLocations[restoreSource->currentText()];
restoreFile += "/" + restoreItem->text(0);
- int r = system(QString("tar -C / -zxf %1").arg(restoreFile).latin1());
+ int r = system(QString("tar -C / -zxf %1 2> %3")
+ .arg( restoreFile.latin1() )
+ .arg( tempFileName.latin1() ) );
if(r != 0){
- QMessageBox::critical(this, "Message",
- "Restore Failed.",QString("Ok") );
+ 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:
+ qWarning("Details pressed !");
+ 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" ) );
+ }
+ pErrDialog->showMaximized();
+ pErrDialog->exec();
+ delete pErrDialog;
+
+ setCaption(tr("Backup and Restore.. Failed !!"));
+ return;
+
+ break;
+
+ }
}
else{
- QMessageBox::critical(this, "Message",
- "Restore Successfull.",QString("Ok") );
+ QMessageBox::critical(this, tr( "Message" ),
+ tr( "Restore Successfull." ), QString( tr( "Ok") ) );
}
+ setCaption(tr("Backup and Restore"));
}
// backuprestore.cpp
diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h
index b0cf4cd..8c733e3 100644
--- a/noncore/settings/backup/backuprestore.h
+++ b/noncore/settings/backup/backuprestore.h
@@ -13,6 +13,7 @@ class BackupAndRestore : public BackupAndRestoreBase {
Q_OBJECT
public:
+
BackupAndRestore( QWidget* parent = 0, const char* name = 0);
~BackupAndRestore();
@@ -23,6 +24,7 @@ private slots:
void selectItem(QListViewItem *currentItem);
void sourceDirChanged(int);
void rescanFolder(QString directory);
+ void fileListUpdate();
private:
void scanForApplicationSettings();
diff --git a/noncore/settings/backup/backuprestorebase.ui b/noncore/settings/backup/backuprestorebase.ui
index 92e37ee..05dc8a9 100644
--- a/noncore/settings/backup/backuprestorebase.ui
+++ b/noncore/settings/backup/backuprestorebase.ui
@@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>234</width>
- <height>216</height>
+ <width>235</width>
+ <height>275</height>
</rect>
</property>
<property stdset="1">
@@ -37,6 +37,9 @@
<name>name</name>
<cstring>tabWidget</cstring>
</property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
<widget>
<class>QWidget</class>
<property stdset="1">
@@ -150,7 +153,7 @@
<grid>
<property stdset="1">
<name>margin</name>
- <number>11</number>
+ <number>4</number>
</property>
<property stdset="1">
<name>spacing</name>
@@ -163,18 +166,7 @@
<cstring>restoreSource</cstring>
</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" >
+ <widget row="2" column="0" rowspan="1" colspan="2" >
<class>QListView</class>
<column>
<property>
@@ -202,7 +194,7 @@
</size>
</property>
</widget>
- <widget row="2" column="0" rowspan="1" colspan="2" >
+ <widget row="3" column="0" rowspan="1" colspan="2" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
@@ -213,6 +205,28 @@
<string>&amp;Restore</string>
</property>
</widget>
+ <widget row="1" column="0" rowspan="1" colspan="2" >
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>updateList</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Update Filelist</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>
</grid>
</widget>
</widget>
diff --git a/noncore/settings/backup/errordialog.ui b/noncore/settings/backup/errordialog.ui
new file mode 100644
index 0000000..b68b3c2
--- a/dev/null
+++ b/noncore/settings/backup/errordialog.ui
@@ -0,0 +1,154 @@
+<!DOCTYPE UI><UI>
+<class>ErrorDialog</class>
+<widget>
+ <class>QDialog</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>ErrorDialog</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>153</width>
+ <height>223</height>
+ </rect>
+ </property>
+ <property stdset="1">
+ <name>caption</name>
+ <string>Error Info</string>
+ </property>
+ <property stdset="1">
+ <name>sizeGripEnabled</name>
+ <bool>true</bool>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>2</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>2</number>
+ </property>
+ <widget>
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>GroupBox1</cstring>
+ </property>
+ <property stdset="1">
+ <name>midLineWidth</name>
+ <number>2</number>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>Error Message:</string>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>4</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="0" column="0" >
+ <class>QMultiLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>m_textarea</cstring>
+ </property>
+ <property stdset="1">
+ <name>wordWrap</name>
+ <enum>WidgetWidth</enum>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ <widget>
+ <class>QFrame</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Frame3</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>4</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>frameShape</name>
+ <enum>StyledPanel</enum>
+ </property>
+ <property stdset="1">
+ <name>frameShadow</name>
+ <enum>Sunken</enum>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>2</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>2</number>
+ </property>
+ <widget row="0" column="0" >
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>m_buttonOk</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>4</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>&amp;OK</string>
+ </property>
+ <property stdset="1">
+ <name>autoDefault</name>
+ <bool>true</bool>
+ </property>
+ <property stdset="1">
+ <name>default</name>
+ <bool>true</bool>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ </vbox>
+</widget>
+<connections>
+ <connection>
+ <sender>m_buttonOk</sender>
+ <signal>clicked()</signal>
+ <receiver>ErrorDialog</receiver>
+ <slot>accept()</slot>
+ </connection>
+</connections>
+</UI>
diff --git a/noncore/settings/backup/opie-backup.control b/noncore/settings/backup/opie-backup.control
index 3f2be85..ebe2ff1 100644
--- a/noncore/settings/backup/opie-backup.control
+++ b/noncore/settings/backup/opie-backup.control
@@ -4,6 +4,6 @@ Priority: optional
Version: $QPE_VERSION-$SUB_VERSION
Depends: task-opie-minimal
Architecture: arm
-Maintainer: Benjamin Meyer <meyerb@sharpsec.com>
+Maintainer: Stefan Eilers <Eilers.Stefan@epost.de>
Section: opie/Settings
Description: Backup and Restore utility.