author | mickeyl <mickeyl> | 2003-10-29 17:22:08 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-29 17:22:08 (UTC) |
commit | 35615947e11575a61456c8483e7f6d67fe59d5ed (patch) (unidiff) | |
tree | 89f834a50b5070767ca0f9c8a90d044f075a9131 /noncore/settings/backup | |
parent | 80fc44ae81d88c4cee5ea160818881acb2422a62 (diff) | |
download | opie-35615947e11575a61456c8483e7f6d67fe59d5ed.zip opie-35615947e11575a61456c8483e7f6d67fe59d5ed.tar.gz opie-35615947e11575a61456c8483e7f6d67fe59d5ed.tar.bz2 |
merge noncore/settings/* except networksettings for which tille volunteered (thanks)
-rw-r--r-- | noncore/settings/backup/backup.pro | 7 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 68 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestore.h | 13 | ||||
-rw-r--r-- | noncore/settings/backup/main.cpp | 10 |
4 files changed, 44 insertions, 54 deletions
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro index cadb381..1e9af61 100644 --- a/noncore/settings/backup/backup.pro +++ b/noncore/settings/backup/backup.pro | |||
@@ -1,4 +1,2 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG = qt warn_on release quick-app |
2 | #CONFIG = qt warn_on debug | ||
3 | CONFIG = qt warn_on release | ||
4 | HEADERS = backuprestore.h | 2 | HEADERS = backuprestore.h |
@@ -10,3 +8,2 @@ INTERFACES = backuprestorebase.ui errordialog.ui | |||
10 | TARGET = backup | 8 | TARGET = backup |
11 | DESTDIR = $(OPIEDIR)/bin | ||
12 | 9 | ||
@@ -32,4 +29,2 @@ TRANSLATIONS = ../../../i18n/de/backup.ts \ | |||
32 | 29 | ||
33 | |||
34 | |||
35 | include ( $(OPIEDIR)/include.pro ) | 30 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 922523b..1c854d9 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp | |||
@@ -39,4 +39,4 @@ const QString tempFileName = "/tmp/backup.err"; | |||
39 | 39 | ||
40 | BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) | 40 | BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl) |
41 | : BackupAndRestoreBase(parent, name){ | 41 | : BackupAndRestoreBase(parent, name, fl){ |
42 | this->showMaximized(); | 42 | this->showMaximized(); |
@@ -49,7 +49,7 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) | |||
49 | connect(backupList, SIGNAL(clicked( QListViewItem * )), | 49 | connect(backupList, SIGNAL(clicked( QListViewItem * )), |
50 | this, SLOT(selectItem(QListViewItem*))); | 50 | this, SLOT(selectItem(QListViewItem*))); |
51 | connect(restoreSource, SIGNAL(activated( int )), | 51 | connect(restoreSource, SIGNAL(activated( int )), |
52 | this, SLOT(sourceDirChanged(int))); | 52 | this, SLOT(sourceDirChanged(int))); |
53 | connect(updateList, SIGNAL(clicked()), | 53 | connect(updateList, SIGNAL(clicked()), |
54 | this, SLOT( fileListUpdate())); | 54 | this, SLOT( fileListUpdate())); |
55 | 55 | ||
@@ -64,5 +64,5 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) | |||
64 | selectItem(documents); | 64 | selectItem(documents); |
65 | 65 | ||
66 | scanForApplicationSettings(); | 66 | scanForApplicationSettings(); |
67 | 67 | ||
68 | Config config("BackupAndRestore"); | 68 | Config config("BackupAndRestore"); |
@@ -70,3 +70,3 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) | |||
70 | int totalLocations = config.readNumEntry("totalLocations",0); | 70 | int totalLocations = config.readNumEntry("totalLocations",0); |
71 | 71 | ||
72 | //todo make less static here and use Storage class to get infos | 72 | //todo make less static here and use Storage class to get infos |
@@ -88,4 +88,4 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) | |||
88 | } | 88 | } |
89 | 89 | ||
90 | // Read the list of items to ignore. | 90 | // Read the list of items to ignore. |
91 | QList<QString> dontBackupList; | 91 | QList<QString> dontBackupList; |
@@ -100,3 +100,3 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) | |||
100 | getAllItems(backupList->firstChild(), list); | 100 | getAllItems(backupList->firstChild(), list); |
101 | 101 | ||
102 | for(uint i = 0; i < list.count(); i++){ | 102 | for(uint i = 0; i < list.count(); i++){ |
@@ -115,3 +115,3 @@ BackupAndRestore::~BackupAndRestore(){ | |||
115 | getAllItems(backupList->firstChild(), list); | 115 | getAllItems(backupList->firstChild(), list); |
116 | 116 | ||
117 | Config config("BackupAndRestore"); | 117 | Config config("BackupAndRestore"); |
@@ -119,3 +119,3 @@ BackupAndRestore::~BackupAndRestore(){ | |||
119 | config.clearGroup(); | 119 | config.clearGroup(); |
120 | 120 | ||
121 | int count = 0; | 121 | int count = 0; |
@@ -137,3 +137,3 @@ QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QL | |||
137 | if(item->childCount() > 0) | 137 | if(item->childCount() > 0) |
138 | getAllItems(item->firstChild(), list); | 138 | getAllItems(item->firstChild(), list); |
139 | list.append(item); | 139 | list.append(item); |
@@ -181,6 +181,6 @@ void BackupAndRestore::scanForApplicationSettings(){ | |||
181 | * The "Backup" button has been pressed. Get a list of all of the files that | 181 | * The "Backup" button has been pressed. Get a list of all of the files that |
182 | * should be backed up. If there are no files, emit and error and exit. | 182 | * should be backed up. If there are no files, emit and error and exit. |
183 | * Determine the file name to store the backup in. Backup the file(s) using | 183 | * Determine the file name to store the backup in. Backup the file(s) using |
184 | * tar and gzip --best. Report failure or success | 184 | * tar and gzip --best. Report failure or success |
185 | */ | 185 | */ |
186 | void BackupAndRestore::backupPressed(){ | 186 | void BackupAndRestore::backupPressed(){ |
@@ -190,3 +190,3 @@ void BackupAndRestore::backupPressed(){ | |||
190 | "No items selected.",QString("Ok") ); | 190 | "No items selected.",QString("Ok") ); |
191 | return; | 191 | return; |
192 | } | 192 | } |
@@ -197,3 +197,3 @@ void BackupAndRestore::backupPressed(){ | |||
197 | QDateTime datetime = QDateTime::currentDateTime(); | 197 | QDateTime datetime = QDateTime::currentDateTime(); |
198 | QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') + | 198 | QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') + |
199 | QString::number( datetime.date().day() ).rightJustify(2, '0'); | 199 | QString::number( datetime.date().day() ).rightJustify(2, '0'); |
@@ -201,3 +201,3 @@ void BackupAndRestore::backupPressed(){ | |||
201 | outputFile += "/" + dateString; | 201 | outputFile += "/" + dateString; |
202 | 202 | ||
203 | QString t = outputFile; | 203 | QString t = outputFile; |
@@ -209,3 +209,3 @@ void BackupAndRestore::backupPressed(){ | |||
209 | 209 | ||
210 | // We execute tar and compressing its output with gzip.. | 210 | // We execute tar and compressing its output with gzip.. |
211 | // The error output will be written into a temp-file which could be provided | 211 | // The error output will be written into a temp-file which could be provided |
@@ -230,3 +230,3 @@ void BackupAndRestore::backupPressed(){ | |||
230 | 230 | ||
231 | switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n" | 231 | switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n" |
232 | + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ){ | 232 | + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ){ |
@@ -244,3 +244,3 @@ void BackupAndRestore::backupPressed(){ | |||
244 | errorFile.close(); | 244 | errorFile.close(); |
245 | 245 | ||
246 | pErrDialog->m_textarea->setText( s ); | 246 | pErrDialog->m_textarea->setText( s ); |
@@ -255,3 +255,3 @@ void BackupAndRestore::backupPressed(){ | |||
255 | setCaption(tr("Backup and Restore.. Failed !!")); | 255 | setCaption(tr("Backup and Restore.. Failed !!")); |
256 | return; | 256 | return; |
257 | } | 257 | } |
@@ -259,3 +259,3 @@ void BackupAndRestore::backupPressed(){ | |||
259 | QMessageBox::information(this, tr( "Message" ), tr( "Backup Successfull." ), QString(tr( "Ok" ) ) ); | 259 | QMessageBox::information(this, tr( "Message" ), tr( "Backup Successfull." ), QString(tr( "Ok" ) ) ); |
260 | 260 | ||
261 | } | 261 | } |
@@ -266,3 +266,3 @@ void BackupAndRestore::backupPressed(){ | |||
266 | * Get a list of all of the files to backup. | 266 | * Get a list of all of the files to backup. |
267 | */ | 267 | */ |
268 | int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){ | 268 | int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){ |
@@ -276,3 +276,3 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent | |||
276 | } | 276 | } |
277 | 277 | ||
278 | uint count = 0; | 278 | uint count = 0; |
@@ -319,3 +319,3 @@ void BackupAndRestore::rescanFolder(QString directory){ | |||
319 | return; | 319 | return; |
320 | 320 | ||
321 | d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); | 321 | d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); |
@@ -343,3 +343,3 @@ void BackupAndRestore::rescanFolder(QString directory){ | |||
343 | * Report errors or success | 343 | * Report errors or success |
344 | */ | 344 | */ |
345 | void BackupAndRestore::restore(){ | 345 | void BackupAndRestore::restore(){ |
@@ -349,3 +349,3 @@ void BackupAndRestore::restore(){ | |||
349 | tr( "Please select something to restore." ),QString( tr( "Ok") ) ); | 349 | tr( "Please select something to restore." ),QString( tr( "Ok") ) ); |
350 | return; | 350 | return; |
351 | } | 351 | } |
@@ -354,5 +354,5 @@ void BackupAndRestore::restore(){ | |||
354 | QString restoreFile = backupLocations[restoreSource->currentText()]; | 354 | QString restoreFile = backupLocations[restoreSource->currentText()]; |
355 | 355 | ||
356 | restoreFile += "/" + restoreItem->text(0); | 356 | restoreFile += "/" + restoreItem->text(0); |
357 | 357 | ||
358 | int r = system(QString("tar -C / -zxf %1 2> %3") | 358 | int r = system(QString("tar -C / -zxf %1 2> %3") |
@@ -362,3 +362,3 @@ void BackupAndRestore::restore(){ | |||
362 | QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); | 362 | QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); |
363 | switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" | 363 | switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" |
364 | + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) { | 364 | + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) { |
@@ -375,3 +375,3 @@ void BackupAndRestore::restore(){ | |||
375 | errorFile.close(); | 375 | errorFile.close(); |
376 | 376 | ||
377 | pErrDialog->m_textarea->setText( s ); | 377 | pErrDialog->m_textarea->setText( s ); |
@@ -385,3 +385,3 @@ void BackupAndRestore::restore(){ | |||
385 | setCaption(tr("Backup and Restore.. Failed !!")); | 385 | setCaption(tr("Backup and Restore.. Failed !!")); |
386 | return; | 386 | return; |
387 | 387 | ||
diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h index 8c733e3..4bdc758 100644 --- a/noncore/settings/backup/backuprestore.h +++ b/noncore/settings/backup/backuprestore.h | |||
@@ -1,2 +1,2 @@ | |||
1 | #ifndef WINDOW_H | 1 | #ifndef WINDOW_H |
2 | #define WINDOW_H | 2 | #define WINDOW_H |
@@ -10,12 +10,13 @@ class QListViewItem; | |||
10 | 10 | ||
11 | class BackupAndRestore : public BackupAndRestoreBase { | 11 | class BackupAndRestore : public BackupAndRestoreBase { |
12 | 12 | ||
13 | Q_OBJECT | 13 | Q_OBJECT |
14 | 14 | ||
15 | public: | 15 | public: |
16 | 16 | ||
17 | BackupAndRestore( QWidget* parent = 0, const char* name = 0); | 17 | BackupAndRestore( QWidget* parent = 0, const char* name = 0, WFlags fl = 0); |
18 | ~BackupAndRestore(); | 18 | ~BackupAndRestore(); |
19 | 19 | ||
20 | 20 | static QString appName() { return QString::fromLatin1("backup"); } | |
21 | |||
21 | private slots: | 22 | private slots: |
diff --git a/noncore/settings/backup/main.cpp b/noncore/settings/backup/main.cpp index 676e1f0..b375a3b 100644 --- a/noncore/settings/backup/main.cpp +++ b/noncore/settings/backup/main.cpp | |||
@@ -3,12 +3,6 @@ | |||
3 | #include <qpe/qpeapplication.h> | 3 | #include <qpe/qpeapplication.h> |
4 | #include <opie/oapplicationfactory.h> | ||
4 | 5 | ||
5 | int main(int argc, char *argv[]) { | ||
6 | QPEApplication a( argc, argv ); | ||
7 | |||
8 | BackupAndRestore app(0, "mainwindow"); | ||
9 | a.showMainWidget(&app); | ||
10 | return a.exec(); | ||
11 | } | ||
12 | 6 | ||
13 | // main.cpp | 7 | OPIE_EXPORT_APP( OApplicationFactory<BackupAndRestore> ) |
14 | 8 | ||