author | mickeyl <mickeyl> | 2003-10-29 17:22:08 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-29 17:22:08 (UTC) |
commit | 35615947e11575a61456c8483e7f6d67fe59d5ed (patch) (side-by-side diff) | |
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 | 4 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestore.h | 3 | ||||
-rw-r--r-- | noncore/settings/backup/main.cpp | 10 |
4 files changed, 7 insertions, 17 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,35 +1,30 @@ -TEMPLATE = app -#CONFIG = qt warn_on debug -CONFIG = qt warn_on release +CONFIG = qt warn_on release quick-app HEADERS = backuprestore.h SOURCES = main.cpp backuprestore.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = backuprestorebase.ui errordialog.ui TARGET = backup -DESTDIR = $(OPIEDIR)/bin TRANSLATIONS = ../../../i18n/de/backup.ts \ ../../../i18n/nl/backup.ts \ ../../../i18n/xx/backup.ts \ ../../../i18n/en/backup.ts \ ../../../i18n/es/backup.ts \ ../../../i18n/fr/backup.ts \ ../../../i18n/hu/backup.ts \ ../../../i18n/ja/backup.ts \ ../../../i18n/ko/backup.ts \ ../../../i18n/no/backup.ts \ ../../../i18n/pl/backup.ts \ ../../../i18n/pt/backup.ts \ ../../../i18n/pt_BR/backup.ts \ ../../../i18n/sl/backup.ts \ ../../../i18n/zh_CN/backup.ts \ ../../../i18n/zh_TW/backup.ts \ ../../../i18n/it/backup.ts \ ../../../i18n/da/backup.ts - - 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 @@ -28,26 +28,26 @@ #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) - : BackupAndRestoreBase(parent, name){ +BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl) + : BackupAndRestoreBase(parent, name, fl){ this->showMaximized(); backupList->header()->hide(); restoreList->header()->hide(); connect(backupButton, SIGNAL(clicked()), this, SLOT(backupPressed())); 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()), 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 @@ -5,27 +5,28 @@ #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); + BackupAndRestore( QWidget* parent = 0, const char* name = 0, WFlags fl = 0); ~BackupAndRestore(); + static QString appName() { return QString::fromLatin1("backup"); } private slots: void backupPressed(); void restore(); void selectItem(QListViewItem *currentItem); void sourceDirChanged(int); void rescanFolder(QString directory); void fileListUpdate(); private: void scanForApplicationSettings(); int getBackupFiles(QString &backupFiles, QListViewItem *parent); 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 @@ -1,14 +1,8 @@ #include "backuprestore.h" #include "qnetworkprotocol.h" #include <qpe/qpeapplication.h> +#include <opie/oapplicationfactory.h> -int main(int argc, char *argv[]) { - QPEApplication a( argc, argv ); - BackupAndRestore app(0, "mainwindow"); - a.showMainWidget(&app); - return a.exec(); -} - -// main.cpp +OPIE_EXPORT_APP( OApplicationFactory<BackupAndRestore> ) |