summaryrefslogtreecommitdiff
path: root/noncore/settings/backup/backuprestore.cpp
Unidiff
Diffstat (limited to 'noncore/settings/backup/backuprestore.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/backup/backuprestore.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index a00193d..977c283 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,14 +1,17 @@
1 1
2#include "backuprestore.h" 2#include "backuprestore.h"
3//#include "output.h"
4#include "errordialog.h" 3#include "errordialog.h"
5 4
5/* OPIE */
6#include <opie2/ostorageinfo.h>
7#include <qpe/qpeapplication.h>
8
9/* QT */
6#include <qapplication.h> 10#include <qapplication.h>
7#include <qmultilineedit.h> 11#include <qmultilineedit.h>
8
9#include <qdir.h> 12#include <qdir.h>
10#include <qfile.h> 13#include <qfile.h>
11#include <qfileinfo.h> 14#include <qfileinfo.h>
12#include <qlistview.h> 15#include <qlistview.h>
13#include <qpushbutton.h> 16#include <qpushbutton.h>
14#include <qheader.h> 17#include <qheader.h>
@@ -18,14 +21,14 @@
18#include <qcombobox.h> 21#include <qcombobox.h>
19#include <qlist.h> 22#include <qlist.h>
20#include <stdlib.h> 23#include <stdlib.h>
21#include <qregexp.h> 24#include <qregexp.h>
22#include <qtextstream.h> 25#include <qtextstream.h>
23#include <qtextview.h> 26#include <qtextview.h>
24#include <opie2/ostorageinfo.h>
25 27
28/* STD */
26#include <errno.h> 29#include <errno.h>
27#include <stdlib.h> 30#include <stdlib.h>
28#include <unistd.h> 31#include <unistd.h>
29#include <sys/stat.h> 32#include <sys/stat.h>
30#include <dirent.h> 33#include <dirent.h>
31 34
@@ -38,13 +41,12 @@
38const QString tempFileName = "/tmp/backup.err"; 41const QString tempFileName = "/tmp/backup.err";
39 42
40 43
41BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl) 44BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl)
42 : BackupAndRestoreBase(parent, name, fl) 45 : BackupAndRestoreBase(parent, name, fl)
43{ 46{
44 this->showMaximized();
45 backupList->header()->hide(); 47 backupList->header()->hide();
46 restoreList->header()->hide(); 48 restoreList->header()->hide();
47 connect(backupButton, SIGNAL(clicked()), 49 connect(backupButton, SIGNAL(clicked()),
48 this, SLOT(backup())); 50 this, SLOT(backup()));
49 connect(restoreButton, SIGNAL(clicked()), 51 connect(restoreButton, SIGNAL(clicked()),
50 this, SLOT(restore())); 52 this, SLOT(restore()));
@@ -127,12 +129,13 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f
127 { 129 {
128 selectItem(list.at(i)); 130 selectItem(list.at(i));
129 break; 131 break;
130 } 132 }
131 } 133 }
132 } 134 }
135 QPEApplication::showWidget( this );
133} 136}
134 137
135BackupAndRestore::~BackupAndRestore() 138BackupAndRestore::~BackupAndRestore()
136{ 139{
137 QList<QListViewItem> list; 140 QList<QListViewItem> list;
138 getAllItems(backupList->firstChild(), list); 141 getAllItems(backupList->firstChild(), list);
@@ -284,14 +287,13 @@ void BackupAndRestore::backup()
284 pErrDialog->m_textarea->setText( s ); 287 pErrDialog->m_textarea->setText( s );
285 } 288 }
286 else 289 else
287 { 290 {
288 pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" ); 291 pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" );
289 } 292 }
290 pErrDialog->showMaximized(); 293 QPEApplication::execDialog( pErrDialog );
291 pErrDialog->exec();
292 delete pErrDialog; 294 delete pErrDialog;
293 break; 295 break;
294 } 296 }
295 setCaption(tr("Backup and Restore.. Failed !!")); 297 setCaption(tr("Backup and Restore.. Failed !!"));
296 return; 298 return;
297 } 299 }
@@ -449,14 +451,13 @@ void BackupAndRestore::restore()
449 pErrDialog->m_textarea->setText( s ); 451 pErrDialog->m_textarea->setText( s );
450 } 452 }
451 else 453 else
452 { 454 {
453 pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) ); 455 pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) );
454 } 456 }
455 pErrDialog->showMaximized(); 457 QPEApplication::execDialog( pErrDialog );
456 pErrDialog->exec();
457 delete pErrDialog; 458 delete pErrDialog;
458 459
459 setCaption(tr("Backup and Restore.. Failed !!")); 460 setCaption(tr("Backup and Restore.. Failed !!"));
460 return; 461 return;
461 462
462 break; 463 break;