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 | |
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)
26 files changed, 91 insertions, 146 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp index 00128d3..9e5eede 100644 --- a/noncore/settings/appearance2/appearance.cpp +++ b/noncore/settings/appearance2/appearance.cpp | |||
@@ -563,12 +563,8 @@ void Appearance::accept ( ) | |||
563 | 563 | ||
564 | config. write ( ); // need to flush the config info first | 564 | config. write ( ); // need to flush the config info first |
565 | Global::applyStyle ( ); | 565 | Global::applyStyle ( ); |
566 | 566 | ||
567 | if ( QMessageBox::warning ( this, tr( "Restart" ), tr( "Do you want to restart %1 now?" ). arg ( ODevice::inst ( )-> system ( ) == System_Zaurus ? "Qtopia" : "Opie" ), tr( "Yes" ), tr( "No" ), 0, 0, 1 ) == 0 ) { | ||
568 | QCopEnvelope e( "QPE/System", "restart()" ); | ||
569 | } | ||
570 | |||
571 | QDialog::accept ( ); | 567 | QDialog::accept ( ); |
572 | } | 568 | } |
573 | 569 | ||
574 | void Appearance::done ( int r ) | 570 | void Appearance::done ( int r ) |
diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h index da9e976..51e9636 100644 --- a/noncore/settings/appearance2/appearance.h +++ b/noncore/settings/appearance2/appearance.h | |||
@@ -54,13 +54,14 @@ class Appearance : public QDialog | |||
54 | 54 | ||
55 | public: | 55 | public: |
56 | Appearance( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 56 | Appearance( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
57 | ~Appearance(); | 57 | ~Appearance(); |
58 | static QString appName() { return QString::fromLatin1("appearance"); } | ||
58 | 59 | ||
59 | protected: | 60 | protected: |
60 | virtual void accept ( ); | 61 | virtual void accept ( ); |
61 | virtual void done ( int r ); | 62 | virtual void done ( int r ); |
62 | 63 | ||
63 | protected slots: | 64 | protected slots: |
64 | void styleClicked ( int ); | 65 | void styleClicked ( int ); |
65 | void styleSettingsClicked ( ); | 66 | void styleSettingsClicked ( ); |
66 | void decoClicked ( int ); | 67 | void decoClicked ( int ); |
diff --git a/noncore/settings/appearance2/appearance2.pro b/noncore/settings/appearance2/appearance2.pro index e37536d..145de2f 100644 --- a/noncore/settings/appearance2/appearance2.pro +++ b/noncore/settings/appearance2/appearance2.pro | |||
@@ -1,16 +1,15 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG = qt warn_on release quick-app |
2 | CONFIG = qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = appearance.h editScheme.h sample.h | 2 | HEADERS = appearance.h editScheme.h sample.h |
5 | SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp | 3 | SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp |
6 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
7 | DEPENDPATH += ../$(OPIEDIR)/include | 5 | DEPENDPATH += ../$(OPIEDIR)/include |
8 | LIBS += -lqpe -lopie | 6 | LIBS += -lqpe -lopie |
9 | TARGET = appearance | ||
10 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
11 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
12 | 9 | ||
10 | TARGET = appearance | ||
11 | |||
13 | TRANSLATIONS = ../../../i18n/de/appearance.ts \ | 12 | TRANSLATIONS = ../../../i18n/de/appearance.ts \ |
14 | ../../../i18n/nl/appearance.ts \ | 13 | ../../../i18n/nl/appearance.ts \ |
15 | ../../../i18n/xx/appearance.ts \ | 14 | ../../../i18n/xx/appearance.ts \ |
16 | ../../../i18n/en/appearance.ts \ | 15 | ../../../i18n/en/appearance.ts \ |
@@ -28,6 +27,5 @@ TRANSLATIONS = ../../../i18n/de/appearance.ts \ | |||
28 | ../../../i18n/zh_TW/appearance.ts \ | 27 | ../../../i18n/zh_TW/appearance.ts \ |
29 | ../../../i18n/da/appearance.ts | 28 | ../../../i18n/da/appearance.ts |
30 | 29 | ||
31 | 30 | ||
32 | |||
33 | include ( $(OPIEDIR)/include.pro ) | 31 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/settings/appearance2/main.cpp b/noncore/settings/appearance2/main.cpp index ad24cf3..5595429 100644 --- a/noncore/settings/appearance2/main.cpp +++ b/noncore/settings/appearance2/main.cpp | |||
@@ -14,9 +14,9 @@ | |||
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
17 | ..}^=.= = ; Public License for more details. | 17 | ..}^=.= = ; Public License for more details. |
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
@@ -27,16 +27,8 @@ | |||
27 | 27 | ||
28 | #include "appearance.h" | 28 | #include "appearance.h" |
29 | 29 | ||
30 | #include <qpe/qpeapplication.h> | 30 | #include <qpe/qpeapplication.h> |
31 | #include <opie/oapplicationfactory.h> | ||
31 | 32 | ||
32 | 33 | ||
33 | int main ( int argc, char **argv ) | 34 | OPIE_EXPORT_APP( OApplicationFactory<Appearance> ) |
34 | { | ||
35 | QPEApplication app ( argc, argv ); | ||
36 | |||
37 | Appearance m; | ||
38 | app. showMainDocumentWidget ( &m ); | ||
39 | |||
40 | return app. exec ( ); | ||
41 | } | ||
42 | |||
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,15 +1,12 @@ | |||
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 |
5 | SOURCES = main.cpp backuprestore.cpp | 3 | SOURCES = main.cpp backuprestore.cpp |
6 | INCLUDEPATH+= $(OPIEDIR)/include | 4 | INCLUDEPATH+= $(OPIEDIR)/include |
7 | DEPENDPATH+= $(OPIEDIR)/include | 5 | DEPENDPATH+= $(OPIEDIR)/include |
8 | LIBS += -lqpe | 6 | LIBS += -lqpe |
9 | INTERFACES= backuprestorebase.ui errordialog.ui | 7 | INTERFACES= backuprestorebase.ui errordialog.ui |
10 | TARGET = backup | 8 | TARGET = backup |
11 | DESTDIR = $(OPIEDIR)/bin | ||
12 | 9 | ||
13 | TRANSLATIONS = ../../../i18n/de/backup.ts \ | 10 | TRANSLATIONS = ../../../i18n/de/backup.ts \ |
14 | ../../../i18n/nl/backup.ts \ | 11 | ../../../i18n/nl/backup.ts \ |
15 | ../../../i18n/xx/backup.ts \ | 12 | ../../../i18n/xx/backup.ts \ |
@@ -29,7 +26,5 @@ TRANSLATIONS = ../../../i18n/de/backup.ts \ | |||
29 | ../../../i18n/it/backup.ts \ | 26 | ../../../i18n/it/backup.ts \ |
30 | ../../../i18n/da/backup.ts | 27 | ../../../i18n/da/backup.ts |
31 | 28 | ||
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 | |||
@@ -36,23 +36,23 @@ | |||
36 | 36 | ||
37 | const QString tempFileName = "/tmp/backup.err"; | 37 | const QString tempFileName = "/tmp/backup.err"; |
38 | 38 | ||
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(); |
43 | backupList->header()->hide(); | 43 | backupList->header()->hide(); |
44 | restoreList->header()->hide(); | 44 | restoreList->header()->hide(); |
45 | connect(backupButton, SIGNAL(clicked()), | 45 | connect(backupButton, SIGNAL(clicked()), |
46 | this, SLOT(backupPressed())); | 46 | this, SLOT(backupPressed())); |
47 | connect(restoreButton, SIGNAL(clicked()), | 47 | connect(restoreButton, SIGNAL(clicked()), |
48 | this, SLOT(restore())); | 48 | this, SLOT(restore())); |
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 | ||
56 | applicationSettings = new QListViewItem(backupList, "Application Settings", "", | 56 | applicationSettings = new QListViewItem(backupList, "Application Settings", "", |
57 | QDir::homeDirPath() + "/Settings/"); | 57 | QDir::homeDirPath() + "/Settings/"); |
58 | selectItem(applicationSettings); | 58 | selectItem(applicationSettings); |
@@ -61,15 +61,15 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) | |||
61 | selectItem(applicationSettings); | 61 | selectItem(applicationSettings); |
62 | documents= new QListViewItem(backupList, "Documents", "", | 62 | documents= new QListViewItem(backupList, "Documents", "", |
63 | QDir::homeDirPath() + "/Documents/"); | 63 | QDir::homeDirPath() + "/Documents/"); |
64 | selectItem(documents); | 64 | selectItem(documents); |
65 | 65 | ||
66 | scanForApplicationSettings(); | 66 | scanForApplicationSettings(); |
67 | 67 | ||
68 | Config config("BackupAndRestore"); | 68 | Config config("BackupAndRestore"); |
69 | config.setGroup("General"); | 69 | config.setGroup("General"); |
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 |
73 | if(totalLocations == 0){ | 73 | if(totalLocations == 0){ |
74 | backupLocations.insert("Documents", "/root/Documents"); | 74 | backupLocations.insert("Documents", "/root/Documents"); |
75 | backupLocations.insert("CF", "/mnt/cf"); | 75 | backupLocations.insert("CF", "/mnt/cf"); |
@@ -85,10 +85,10 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) | |||
85 | for( it = backupLocations.begin(); it != backupLocations.end(); ++it ){ | 85 | for( it = backupLocations.begin(); it != backupLocations.end(); ++it ){ |
86 | storeToLocation->insertItem(it.key()); | 86 | storeToLocation->insertItem(it.key()); |
87 | restoreSource->insertItem(it.key()); | 87 | restoreSource->insertItem(it.key()); |
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; |
92 | dontBackupList.setAutoDelete(true); | 92 | dontBackupList.setAutoDelete(true); |
93 | config.setGroup("DontBackup"); | 93 | config.setGroup("DontBackup"); |
94 | int total = config.readNumEntry("Total", 0); | 94 | int total = config.readNumEntry("Total", 0); |
@@ -97,9 +97,9 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) | |||
97 | } | 97 | } |
98 | 98 | ||
99 | QList<QListViewItem> list; | 99 | QList<QListViewItem> list; |
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++){ |
103 | QString text = list.at(i)->text(HEADER_NAME); | 103 | QString text = list.at(i)->text(HEADER_NAME); |
104 | for(uint i2 = 0; i2 < dontBackupList.count(); i2++){ | 104 | for(uint i2 = 0; i2 < dontBackupList.count(); i2++){ |
105 | if(*dontBackupList.at(i2) == text){ | 105 | if(*dontBackupList.at(i2) == text){ |
@@ -112,13 +112,13 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) | |||
112 | 112 | ||
113 | BackupAndRestore::~BackupAndRestore(){ | 113 | BackupAndRestore::~BackupAndRestore(){ |
114 | QList<QListViewItem> list; | 114 | QList<QListViewItem> list; |
115 | getAllItems(backupList->firstChild(), list); | 115 | getAllItems(backupList->firstChild(), list); |
116 | 116 | ||
117 | Config config("BackupAndRestore"); | 117 | Config config("BackupAndRestore"); |
118 | config.setGroup("DontBackup"); | 118 | config.setGroup("DontBackup"); |
119 | config.clearGroup(); | 119 | config.clearGroup(); |
120 | 120 | ||
121 | int count = 0; | 121 | int count = 0; |
122 | for(uint i = 0; i < list.count(); i++){ | 122 | for(uint i = 0; i < list.count(); i++){ |
123 | if(list.at(i)->text(HEADER_BACKUP) == ""){ | 123 | if(list.at(i)->text(HEADER_BACKUP) == ""){ |
124 | config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME)); | 124 | config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME)); |
@@ -134,9 +134,9 @@ BackupAndRestore::~BackupAndRestore(){ | |||
134 | 134 | ||
135 | QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list){ | 135 | QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list){ |
136 | while(item){ | 136 | while(item){ |
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); |
140 | item = item->nextSibling(); | 140 | item = item->nextSibling(); |
141 | } | 141 | } |
142 | return list; | 142 | return list; |
@@ -178,37 +178,37 @@ void BackupAndRestore::scanForApplicationSettings(){ | |||
178 | } | 178 | } |
179 | 179 | ||
180 | /** | 180 | /** |
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(){ |
187 | QString backupFiles; | 187 | QString backupFiles; |
188 | if(getBackupFiles(backupFiles, NULL) == 0){ | 188 | if(getBackupFiles(backupFiles, NULL) == 0){ |
189 | QMessageBox::critical(this, "Message", | 189 | QMessageBox::critical(this, "Message", |
190 | "No items selected.",QString("Ok") ); | 190 | "No items selected.",QString("Ok") ); |
191 | return; | 191 | return; |
192 | } | 192 | } |
193 | 193 | ||
194 | setCaption(tr("Backup and Restore... working...")); | 194 | setCaption(tr("Backup and Restore... working...")); |
195 | QString outputFile = backupLocations[storeToLocation->currentText()]; | 195 | QString outputFile = backupLocations[storeToLocation->currentText()]; |
196 | 196 | ||
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'); |
200 | 200 | ||
201 | outputFile += "/" + dateString; | 201 | outputFile += "/" + dateString; |
202 | 202 | ||
203 | QString t = outputFile; | 203 | QString t = outputFile; |
204 | int c = 1; | 204 | int c = 1; |
205 | while(QFile::exists(outputFile + EXTENSION)){ | 205 | while(QFile::exists(outputFile + EXTENSION)){ |
206 | outputFile = t + QString("%1").arg(c); | 206 | outputFile = t + QString("%1").arg(c); |
207 | c++; | 207 | c++; |
208 | } | 208 | } |
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 |
212 | // for debugging.. | 212 | // for debugging.. |
213 | qDebug( "Storing file: %s", outputFile.latin1() ); | 213 | qDebug( "Storing file: %s", outputFile.latin1() ); |
214 | outputFile += EXTENSION; | 214 | outputFile += EXTENSION; |
@@ -227,9 +227,9 @@ void BackupAndRestore::backupPressed(){ | |||
227 | if(r != 0){ | 227 | if(r != 0){ |
228 | perror("Error: "); | 228 | perror("Error: "); |
229 | QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); | 229 | QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); |
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" ) ) ) ){ |
233 | 233 | ||
234 | case 1: | 234 | case 1: |
235 | qWarning("Details pressed !"); | 235 | qWarning("Details pressed !"); |
@@ -241,9 +241,9 @@ void BackupAndRestore::backupPressed(){ | |||
241 | while ( !t.eof() ) { // until end of file... | 241 | while ( !t.eof() ) { // until end of file... |
242 | s += t.readLine(); // line of text excluding '\n' | 242 | s += t.readLine(); // line of text excluding '\n' |
243 | } | 243 | } |
244 | errorFile.close(); | 244 | errorFile.close(); |
245 | 245 | ||
246 | pErrDialog->m_textarea->setText( s ); | 246 | pErrDialog->m_textarea->setText( s ); |
247 | }else{ | 247 | }else{ |
248 | pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" ); | 248 | pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" ); |
249 | } | 249 | } |
@@ -252,20 +252,20 @@ void BackupAndRestore::backupPressed(){ | |||
252 | delete pErrDialog; | 252 | delete pErrDialog; |
253 | break; | 253 | break; |
254 | } | 254 | } |
255 | setCaption(tr("Backup and Restore.. Failed !!")); | 255 | setCaption(tr("Backup and Restore.. Failed !!")); |
256 | return; | 256 | return; |
257 | } | 257 | } |
258 | else{ | 258 | else{ |
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 | } |
262 | setCaption(tr("Backup and Restore")); | 262 | setCaption(tr("Backup and Restore")); |
263 | } | 263 | } |
264 | 264 | ||
265 | /*** | 265 | /*** |
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){ |
269 | QListViewItem * currentItem; | 269 | QListViewItem * currentItem; |
270 | QString currentHome; | 270 | QString currentHome; |
271 | if(!parent) | 271 | if(!parent) |
@@ -273,9 +273,9 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent | |||
273 | else{ | 273 | else{ |
274 | currentItem = parent->firstChild(); | 274 | currentItem = parent->firstChild(); |
275 | currentHome = parent->text(BACKUP_LOCATION); | 275 | currentHome = parent->text(BACKUP_LOCATION); |
276 | } | 276 | } |
277 | 277 | ||
278 | uint count = 0; | 278 | uint count = 0; |
279 | while( currentItem != 0 ){ | 279 | while( currentItem != 0 ){ |
280 | if(currentItem->text(HEADER_BACKUP) == "B" ){ | 280 | if(currentItem->text(HEADER_BACKUP) == "B" ){ |
281 | if(currentItem->childCount() == 0 ){ | 281 | if(currentItem->childCount() == 0 ){ |
@@ -316,9 +316,9 @@ void BackupAndRestore::rescanFolder(QString directory){ | |||
316 | //qDebug(QString("rescanFolder: ") + directory.latin1()); | 316 | //qDebug(QString("rescanFolder: ") + directory.latin1()); |
317 | QDir d(directory); | 317 | QDir d(directory); |
318 | if(!d.exists()) | 318 | if(!d.exists()) |
319 | return; | 319 | return; |
320 | 320 | ||
321 | d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); | 321 | d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); |
322 | const QFileInfoList *list = d.entryInfoList(); | 322 | const QFileInfoList *list = d.entryInfoList(); |
323 | QFileInfoListIterator it( *list ); | 323 | QFileInfoListIterator it( *list ); |
324 | QFileInfo *file; | 324 | QFileInfo *file; |
@@ -340,28 +340,28 @@ void BackupAndRestore::rescanFolder(QString directory){ | |||
340 | 340 | ||
341 | /** | 341 | /** |
342 | * Restore a backup file. | 342 | * Restore a backup file. |
343 | * Report errors or success | 343 | * Report errors or success |
344 | */ | 344 | */ |
345 | void BackupAndRestore::restore(){ | 345 | void BackupAndRestore::restore(){ |
346 | QListViewItem *restoreItem = restoreList->currentItem(); | 346 | QListViewItem *restoreItem = restoreList->currentItem(); |
347 | if(!restoreItem){ | 347 | if(!restoreItem){ |
348 | QMessageBox::critical(this, tr( "Message" ), | 348 | QMessageBox::critical(this, tr( "Message" ), |
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 | } |
352 | setCaption(tr("Backup and Restore... working...")); | 352 | setCaption(tr("Backup and Restore... working...")); |
353 | 353 | ||
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") |
359 | .arg( restoreFile.latin1() ) | 359 | .arg( restoreFile.latin1() ) |
360 | .arg( tempFileName.latin1() ) ); | 360 | .arg( tempFileName.latin1() ) ); |
361 | if(r != 0){ | 361 | if(r != 0){ |
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" ) ) ) ) { |
365 | case 1: | 365 | case 1: |
366 | qWarning("Details pressed !"); | 366 | qWarning("Details pressed !"); |
367 | ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); | 367 | ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); |
@@ -372,9 +372,9 @@ void BackupAndRestore::restore(){ | |||
372 | while ( !t.eof() ) { // until end of file... | 372 | while ( !t.eof() ) { // until end of file... |
373 | s += t.readLine(); // line of text excluding '\n' | 373 | s += t.readLine(); // line of text excluding '\n' |
374 | } | 374 | } |
375 | errorFile.close(); | 375 | errorFile.close(); |
376 | 376 | ||
377 | pErrDialog->m_textarea->setText( s ); | 377 | pErrDialog->m_textarea->setText( s ); |
378 | }else{ | 378 | }else{ |
379 | pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) ); | 379 | pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) ); |
380 | } | 380 | } |
@@ -382,9 +382,9 @@ void BackupAndRestore::restore(){ | |||
382 | pErrDialog->exec(); | 382 | pErrDialog->exec(); |
383 | delete pErrDialog; | 383 | delete pErrDialog; |
384 | 384 | ||
385 | setCaption(tr("Backup and Restore.. Failed !!")); | 385 | setCaption(tr("Backup and Restore.. Failed !!")); |
386 | return; | 386 | return; |
387 | 387 | ||
388 | break; | 388 | break; |
389 | 389 | ||
390 | } | 390 | } |
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,5 +1,5 @@ | |||
1 | #ifndef WINDOW_H | 1 | #ifndef WINDOW_H |
2 | #define WINDOW_H | 2 | #define WINDOW_H |
3 | 3 | ||
4 | #include <qmainwindow.h> | 4 | #include <qmainwindow.h> |
5 | #include "backuprestorebase.h" | 5 | #include "backuprestorebase.h" |
@@ -7,18 +7,19 @@ | |||
7 | #include <qlist.h> | 7 | #include <qlist.h> |
8 | 8 | ||
9 | class QListViewItem; | 9 | 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: |
22 | void backupPressed(); | 23 | void backupPressed(); |
23 | void restore(); | 24 | void restore(); |
24 | void selectItem(QListViewItem *currentItem); | 25 | void selectItem(QListViewItem *currentItem); |
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 @@ | |||
1 | #include "backuprestore.h" | 1 | #include "backuprestore.h" |
2 | #include "qnetworkprotocol.h" | 2 | #include "qnetworkprotocol.h" |
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 | ||
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro index eb9e0b9..f181f7e 100644 --- a/noncore/settings/language/language.pro +++ b/noncore/settings/language/language.pro | |||
@@ -1,7 +1,5 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = settings.h | 2 | HEADERS = settings.h |
5 | SOURCES = language.cpp main.cpp | 3 | SOURCES = language.cpp main.cpp |
6 | INTERFACES= languagesettingsbase.ui | 4 | INTERFACES= languagesettingsbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
diff --git a/noncore/settings/language/main.cpp b/noncore/settings/language/main.cpp index a760ff3..8bdf8a5 100644 --- a/noncore/settings/language/main.cpp +++ b/noncore/settings/language/main.cpp | |||
@@ -20,17 +20,8 @@ | |||
20 | 20 | ||
21 | #include "settings.h" | 21 | #include "settings.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
24 | 25 | ||
25 | 26 | ||
26 | int main(int argc, char** argv) | 27 | OPIE_EXPORT_APP( OApplicationFactory<LanguageSettings> ) |
27 | { | ||
28 | QPEApplication a(argc,argv); | ||
29 | |||
30 | LanguageSettings dlg; | ||
31 | |||
32 | a.showMainWidget(&dlg); | ||
33 | |||
34 | return a.exec(); | ||
35 | } | ||
36 | |||
diff --git a/noncore/settings/language/settings.h b/noncore/settings/language/settings.h index 22cc987..a157d26 100644 --- a/noncore/settings/language/settings.h +++ b/noncore/settings/language/settings.h | |||
@@ -34,8 +34,10 @@ class LanguageSettings : public LanguageSettingsBase | |||
34 | public: | 34 | public: |
35 | LanguageSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 35 | LanguageSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
36 | ~LanguageSettings(); | 36 | ~LanguageSettings(); |
37 | 37 | ||
38 | static QString appName() { return QString::fromLatin1("language"); } | ||
39 | |||
38 | protected: | 40 | protected: |
39 | void accept(); | 41 | void accept(); |
40 | void reject(); | 42 | void reject(); |
41 | void done(int); | 43 | void done(int); |
diff --git a/noncore/settings/mediummount/main.cpp b/noncore/settings/mediummount/main.cpp index 118a725..b8cdeaf 100644 --- a/noncore/settings/mediummount/main.cpp +++ b/noncore/settings/mediummount/main.cpp | |||
@@ -3,15 +3,8 @@ | |||
3 | #include "mainwindow.h" | 3 | #include "mainwindow.h" |
4 | 4 | ||
5 | #include <qpixmap.h> | 5 | #include <qpixmap.h> |
6 | #include <qpe/qpeapplication.h> | 6 | #include <qpe/qpeapplication.h> |
7 | #include <opie/oapplicationfactory.h> | ||
7 | 8 | ||
8 | int main( int argc, char ** argv ) | 9 | OPIE_EXPORT_APP( OApplicationFactory<MediumMountSetting::MainWindow> ) |
9 | { | ||
10 | QPEApplication a( argc, argv ); | ||
11 | 10 | ||
12 | MediumMountSetting::MainWindow mw; | ||
13 | a.showMainWidget( &mw ); | ||
14 | mw.showMaximized(); | ||
15 | |||
16 | return a.exec(); | ||
17 | } | ||
diff --git a/noncore/settings/mediummount/mainwindow.h b/noncore/settings/mediummount/mainwindow.h index 71dac79..9649863 100644 --- a/noncore/settings/mediummount/mainwindow.h +++ b/noncore/settings/mediummount/mainwindow.h | |||
@@ -16,8 +16,9 @@ namespace MediumMountSetting { | |||
16 | Q_OBJECT | 16 | Q_OBJECT |
17 | public: | 17 | public: |
18 | MainWindow(QWidget *parent = 0, const char *name = 0 , bool modal = FALSE, WFlags = 0); | 18 | MainWindow(QWidget *parent = 0, const char *name = 0 , bool modal = FALSE, WFlags = 0); |
19 | ~MainWindow(); | 19 | ~MainWindow(); |
20 | static QString appName() { return QString::fromLatin1("mediummount"); } | ||
20 | 21 | ||
21 | private slots: | 22 | private slots: |
22 | void slotGlobalChanged(int ); | 23 | void slotGlobalChanged(int ); |
23 | void slotCheckingChanged(int ); | 24 | void slotCheckingChanged(int ); |
diff --git a/noncore/settings/mediummount/mediummount.pro b/noncore/settings/mediummount/mediummount.pro index 97bbbaf..6e29fa5 100644 --- a/noncore/settings/mediummount/mediummount.pro +++ b/noncore/settings/mediummount/mediummount.pro | |||
@@ -1,8 +1,8 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | DESTDIR = $(OPIEDIR)/bin/ | 2 | DESTDIR = $(OPIEDIR)/bin/ |
3 | #CONFIG = qt warn_on debug | 3 | #CONFIG = qt warn_on debug |
4 | CONFIG = qt warn_on release | 4 | CONFIG = qt warn_on release quick-app |
5 | HEADERS = mediumwidget.h mediumglobal.h mainwindow.h | 5 | HEADERS = mediumwidget.h mediumglobal.h mainwindow.h |
6 | SOURCES = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc | 6 | SOURCES = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc |
7 | INCLUDEPATH+= $(OPIEDIR)/include | 7 | INCLUDEPATH+= $(OPIEDIR)/include |
8 | DEPENDPATH+= $(OPIEDIR)/include | 8 | DEPENDPATH+= $(OPIEDIR)/include |
diff --git a/noncore/settings/mediummount/mediumwidget.h b/noncore/settings/mediummount/mediumwidget.h index 7f7b755..0f27117 100644 --- a/noncore/settings/mediummount/mediumwidget.h +++ b/noncore/settings/mediummount/mediumwidget.h | |||
@@ -25,8 +25,9 @@ namespace MediumMountSetting { | |||
25 | Q_OBJECT | 25 | Q_OBJECT |
26 | public: | 26 | public: |
27 | MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 ); | 27 | MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 ); |
28 | ~MediumMountWidget(); | 28 | ~MediumMountWidget(); |
29 | |||
29 | 30 | ||
30 | void writeConfig(); | 31 | void writeConfig(); |
31 | 32 | ||
32 | private slots: | 33 | private slots: |
diff --git a/noncore/settings/netsystemtime/main.cpp b/noncore/settings/netsystemtime/main.cpp index 4b20a61..da98eee 100644 --- a/noncore/settings/netsystemtime/main.cpp +++ b/noncore/settings/netsystemtime/main.cpp | |||
@@ -28,14 +28,8 @@ | |||
28 | 28 | ||
29 | #include "mainwindow.h" | 29 | #include "mainwindow.h" |
30 | 30 | ||
31 | #include <qpe/qpeapplication.h> | 31 | #include <qpe/qpeapplication.h> |
32 | #include <opie/oapplicationfactory.h> | ||
32 | 33 | ||
33 | int main( int argc, char ** argv ) | ||
34 | { | ||
35 | QPEApplication a( argc, argv ); | ||
36 | 34 | ||
37 | MainWindow mw; | 35 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
38 | a.showMainWidget( &mw ); | ||
39 | |||
40 | return a.exec(); | ||
41 | } | ||
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp index 2d240ba..66e1ca3 100644 --- a/noncore/settings/netsystemtime/mainwindow.cpp +++ b/noncore/settings/netsystemtime/mainwindow.cpp | |||
@@ -38,8 +38,9 @@ | |||
38 | 38 | ||
39 | #include <qpe/config.h> | 39 | #include <qpe/config.h> |
40 | #include <qpe/datebookdb.h> | 40 | #include <qpe/datebookdb.h> |
41 | #include <qpe/qpeapplication.h> | 41 | #include <qpe/qpeapplication.h> |
42 | #include <qpe/qpedialog.h> | ||
42 | 43 | ||
43 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 44 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
44 | #include <qpe/qcopenvelope_qws.h> | 45 | #include <qpe/qcopenvelope_qws.h> |
45 | #endif | 46 | #endif |
@@ -49,9 +50,9 @@ | |||
49 | #include <qsocket.h> | 50 | #include <qsocket.h> |
50 | #include <qstring.h> | 51 | #include <qstring.h> |
51 | #include <qtimer.h> | 52 | #include <qtimer.h> |
52 | 53 | ||
53 | MainWindow::MainWindow() | 54 | MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f ) |
54 | : QDialog( 0x0, 0x0, TRUE, 0 ) | 55 | : QDialog( 0x0, 0x0, TRUE, 0 ) |
55 | { | 56 | { |
56 | setCaption( tr( "SystemTime" ) ); | 57 | setCaption( tr( "SystemTime" ) ); |
57 | 58 | ||
@@ -65,9 +66,9 @@ MainWindow::MainWindow() | |||
65 | // Default object pointers to null | 66 | // Default object pointers to null |
66 | ntpProcess = 0x0; | 67 | ntpProcess = 0x0; |
67 | ntpTab = 0x0; | 68 | ntpTab = 0x0; |
68 | 69 | ||
69 | // Add tab widgets | 70 | // Add tab widgets |
70 | mainWidget->addTab( timeTab = new TimeTabWidget( mainWidget ), "netsystemtime/DateTime", tr( "Time" ) ); | 71 | mainWidget->addTab( timeTab = new TimeTabWidget( mainWidget ), "netsystemtime/DateTime", tr( "Time" ) ); |
71 | mainWidget->addTab( formatTab = new FormatTabWidget( mainWidget ), "netsystemtime/formattab", tr( "Format" ) ); | 72 | mainWidget->addTab( formatTab = new FormatTabWidget( mainWidget ), "netsystemtime/formattab", tr( "Format" ) ); |
72 | mainWidget->addTab( settingsTab = new SettingsTabWidget( mainWidget ), "SettingsIcon", tr( "Settings" ) ); | 73 | mainWidget->addTab( settingsTab = new SettingsTabWidget( mainWidget ), "SettingsIcon", tr( "Settings" ) ); |
73 | mainWidget->addTab( predictTab = new PredictTabWidget( mainWidget ), "netsystemtime/predicttab", tr( "Predict" ) ); | 74 | mainWidget->addTab( predictTab = new PredictTabWidget( mainWidget ), "netsystemtime/predicttab", tr( "Predict" ) ); |
@@ -78,12 +79,11 @@ MainWindow::MainWindow() | |||
78 | 79 | ||
79 | mainWidget->setCurrentTab( tr( "Time" ) ); | 80 | mainWidget->setCurrentTab( tr( "Time" ) ); |
80 | layout->addWidget( mainWidget ); | 81 | layout->addWidget( mainWidget ); |
81 | 82 | ||
82 | // Create QCOP channel | 83 | connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)), |
83 | QCopChannel *channel = new QCopChannel( "QPE/Application/netsystemtime", this ); | 84 | this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) ); |
84 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), | 85 | |
85 | this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) ); | ||
86 | 86 | ||
87 | // Create NTP socket | 87 | // Create NTP socket |
88 | ntpSock = new QSocket( this ); | 88 | ntpSock = new QSocket( this ); |
89 | connect( ntpSock, SIGNAL(error(int)),SLOT(slotCheckNtp(int)) ); | 89 | connect( ntpSock, SIGNAL(error(int)),SLOT(slotCheckNtp(int)) ); |
@@ -109,9 +109,10 @@ MainWindow::MainWindow() | |||
109 | slotNTPDelayChanged( config.readNumEntry( "ntpRefreshFreq", 1440 ) ); | 109 | slotNTPDelayChanged( config.readNumEntry( "ntpRefreshFreq", 1440 ) ); |
110 | slotCheckNtp( -1 ); | 110 | slotCheckNtp( -1 ); |
111 | 111 | ||
112 | // Display app | 112 | // Display app |
113 | showMaximized(); | 113 | //showMaximized(); |
114 | (void)new QPEDialogListener(this); | ||
114 | } | 115 | } |
115 | 116 | ||
116 | MainWindow::~MainWindow() | 117 | MainWindow::~MainWindow() |
117 | { | 118 | { |
@@ -164,9 +165,9 @@ void MainWindow::runNTP() | |||
164 | { | 165 | { |
165 | if ( !ntpDelayElapsed() && ntpInteractive ) | 166 | if ( !ntpDelayElapsed() && ntpInteractive ) |
166 | { | 167 | { |
167 | QString msg = tr( "You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.<br>Continue?" ).arg( QString::number( ntpDelay ) ).arg( QString::number( _lookupDiff / 60 ) ); | 168 | QString msg = tr( "You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.<br>Continue?" ).arg( QString::number( ntpDelay ) ).arg( QString::number( _lookupDiff / 60 ) ); |
168 | 169 | ||
169 | switch ( | 170 | switch ( |
170 | QMessageBox::warning( this, tr( "Continue?" ), msg, QMessageBox::Yes, QMessageBox::No ) | 171 | QMessageBox::warning( this, tr( "Continue?" ), msg, QMessageBox::Yes, QMessageBox::No ) |
171 | ) | 172 | ) |
172 | { | 173 | { |
@@ -197,10 +198,10 @@ void MainWindow::runNTP() | |||
197 | } | 198 | } |
198 | 199 | ||
199 | else | 200 | else |
200 | ntpProcess->clearArguments(); | 201 | ntpProcess->clearArguments(); |
201 | 202 | ||
202 | *ntpProcess << "ntpdate" << srv; | 203 | *ntpProcess << "ntpdate" << srv; |
203 | bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput ); | 204 | bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput ); |
204 | if ( !ret ) | 205 | if ( !ret ) |
205 | { | 206 | { |
206 | QMessageBox::critical( this, tr( "Error" ), tr( "Error while getting time from network." ) ); | 207 | QMessageBox::critical( this, tr( "Error" ), tr( "Error while getting time from network." ) ); |
@@ -296,9 +297,9 @@ void MainWindow::slotNtpOutput( OProcess *, char *buffer, int buflen ) | |||
296 | void MainWindow::slotNtpFinished( OProcess *p ) | 297 | void MainWindow::slotNtpFinished( OProcess *p ) |
297 | { | 298 | { |
298 | QString output; | 299 | QString output; |
299 | QDateTime dt = QDateTime::currentDateTime(); | 300 | QDateTime dt = QDateTime::currentDateTime(); |
300 | 301 | ||
301 | // Verify run was successful | 302 | // Verify run was successful |
302 | if ( p->exitStatus() != 0 || !p->normalExit() ) | 303 | if ( p->exitStatus() != 0 || !p->normalExit() ) |
303 | { | 304 | { |
304 | if ( isVisible() && ntpInteractive ) | 305 | if ( isVisible() && ntpInteractive ) |
@@ -337,9 +338,9 @@ void MainWindow::slotNtpFinished( OProcess *p ) | |||
337 | if ( timeShift == 0.0 ) | 338 | if ( timeShift == 0.0 ) |
338 | return; | 339 | return; |
339 | int secsSinceLast = time - lastLookup; | 340 | int secsSinceLast = time - lastLookup; |
340 | output = tr( "%1 seconds").arg(QString::number( timeShift )); | 341 | output = tr( "%1 seconds").arg(QString::number( timeShift )); |
341 | 342 | ||
342 | // Display information on time server tab | 343 | // Display information on time server tab |
343 | if ( ntpTabEnabled ) | 344 | if ( ntpTabEnabled ) |
344 | { | 345 | { |
345 | ntpTab->setTimeShift( output ); | 346 | ntpTab->setTimeShift( output ); |
diff --git a/noncore/settings/netsystemtime/mainwindow.h b/noncore/settings/netsystemtime/mainwindow.h index fa94335..1cdbc1a 100644 --- a/noncore/settings/netsystemtime/mainwindow.h +++ b/noncore/settings/netsystemtime/mainwindow.h | |||
@@ -47,10 +47,11 @@ class MainWindow : public QDialog | |||
47 | { | 47 | { |
48 | Q_OBJECT | 48 | Q_OBJECT |
49 | 49 | ||
50 | public: | 50 | public: |
51 | MainWindow(); | 51 | MainWindow( QWidget *parent = 0, const char *name = 0, bool modal = FALSE,WFlags f = 0); |
52 | ~MainWindow(); | 52 | ~MainWindow(); |
53 | static QString appName() { return QString::fromLatin1("systemtime"); } | ||
53 | 54 | ||
54 | protected: | 55 | protected: |
55 | void accept(); | 56 | void accept(); |
56 | void reject(); | 57 | void reject(); |
diff --git a/noncore/settings/netsystemtime/netsystemtime.pro b/noncore/settings/netsystemtime/netsystemtime.pro index 7a12dd1..2140f2e 100644 --- a/noncore/settings/netsystemtime/netsystemtime.pro +++ b/noncore/settings/netsystemtime/netsystemtime.pro | |||
@@ -1,7 +1,5 @@ | |||
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 = mainwindow.h \ | 2 | HEADERS = mainwindow.h \ |
5 | timetabwidget.h \ | 3 | timetabwidget.h \ |
6 | formattabwidget.h \ | 4 | formattabwidget.h \ |
7 | settingstabwidget.h \ | 5 | settingstabwidget.h \ |
@@ -16,10 +14,9 @@ SOURCES = main.cpp \ | |||
16 | ntptabwidget.cpp | 14 | ntptabwidget.cpp |
17 | INCLUDEPATH+= $(OPIEDIR)/include | 15 | INCLUDEPATH+= $(OPIEDIR)/include |
18 | DEPENDPATH+= $(OPIEDIR)/include | 16 | DEPENDPATH+= $(OPIEDIR)/include |
19 | LIBS += -lqpe -lopie | 17 | LIBS += -lqpe -lopie |
20 | INTERFACES= | 18 | |
21 | DESTDIR = $(OPIEDIR)/bin | ||
22 | TARGET = systemtime | 19 | TARGET = systemtime |
23 | 20 | ||
24 | TRANSLATIONS = ../../../i18n/de/systemtime.ts \ | 21 | TRANSLATIONS = ../../../i18n/de/systemtime.ts \ |
25 | ../../../i18n/nl/systemtime.ts \ | 22 | ../../../i18n/nl/systemtime.ts \ |
diff --git a/noncore/settings/sound/main.cpp b/noncore/settings/sound/main.cpp index 33b0523..d919ce4 100644 --- a/noncore/settings/sound/main.cpp +++ b/noncore/settings/sound/main.cpp | |||
@@ -20,14 +20,10 @@ | |||
20 | 20 | ||
21 | #include "soundsettings.h" | 21 | #include "soundsettings.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
25 | |||
26 | OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> ) | ||
24 | 27 | ||
25 | 28 | ||
26 | int main(int argc, char** argv) | ||
27 | { | ||
28 | QPEApplication a(argc,argv); | ||
29 | SoundSettings dlg; | ||
30 | a.showMainWidget(&dlg); | ||
31 | return a.exec(); | ||
32 | } | ||
33 | 29 | ||
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index 48c612e..c0a1ed3 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro | |||
@@ -1,7 +1,5 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = soundsettings.h soundsettingsbase.h | 2 | HEADERS = soundsettings.h soundsettingsbase.h |
5 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp | 3 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp |
6 | #INTERFACES = soundsettingsbase.ui | 4 | #INTERFACES = soundsettingsbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h index 71ce6f5..57a360f 100644 --- a/noncore/settings/sound/soundsettings.h +++ b/noncore/settings/sound/soundsettings.h | |||
@@ -28,8 +28,9 @@ class SoundSettings : public SoundSettingsBase | |||
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | 30 | ||
31 | public: | 31 | public: |
32 | static QString appName() { return QString::fromLatin1("sound"); } | ||
32 | SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 33 | SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
33 | 34 | ||
34 | protected: | 35 | protected: |
35 | bool noWarning; | 36 | bool noWarning; |
diff --git a/noncore/settings/sshkeys/opie-sshkeys.control b/noncore/settings/sshkeys/opie-sshkeys.control index d05858c..4deccf4 100644 --- a/noncore/settings/sshkeys/opie-sshkeys.control +++ b/noncore/settings/sshkeys/opie-sshkeys.control | |||
@@ -1,6 +1,6 @@ | |||
1 | Package: opie-sshkeys | 1 | Package: opie-sshkeys |
2 | Files: plugins/application/libsshkeys.so* bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png | 2 | Files: bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: David Woodhouse <dwmw2@infradead.org> | 5 | Maintainer: David Woodhouse <dwmw2@infradead.org> |
6 | Architecture: arm | 6 | Architecture: arm |
diff --git a/noncore/settings/usermanager/main.cpp b/noncore/settings/usermanager/main.cpp index aa78286..515ea9a 100644 --- a/noncore/settings/usermanager/main.cpp +++ b/noncore/settings/usermanager/main.cpp | |||
@@ -8,12 +8,7 @@ | |||
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | 9 | ||
10 | #include "usermanager.h" | 10 | #include "usermanager.h" |
11 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
12 | #include <opie/oapplicationfactory.h> | ||
12 | 13 | ||
13 | int main( int argc, char ** argv ) | 14 | OPIE_EXPORT_APP( OApplicationFactory<UserConfig> ) |
14 | { | ||
15 | QPEApplication a( argc, argv ); | ||
16 | UserConfig mw(0,0,0); | ||
17 | a.showMainWidget( &mw ); | ||
18 | return a.exec(); | ||
19 | } | ||
diff --git a/noncore/settings/usermanager/usermanager.h b/noncore/settings/usermanager/usermanager.h index 6782923..313646a 100644 --- a/noncore/settings/usermanager/usermanager.h +++ b/noncore/settings/usermanager/usermanager.h | |||
@@ -26,8 +26,9 @@ class UserConfig : public QMainWindow | |||
26 | { | 26 | { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | 28 | ||
29 | public: | 29 | public: |
30 | static QString appName() { return QString::fromLatin1("appname"); } | ||
30 | UserConfig( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 31 | UserConfig( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
31 | ~UserConfig(); | 32 | ~UserConfig(); |
32 | 33 | ||
33 | private: | 34 | private: |
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro index 576a233..f61fb63 100644 --- a/noncore/settings/usermanager/usermanager.pro +++ b/noncore/settings/usermanager/usermanager.pro | |||
@@ -1,14 +1,12 @@ | |||
1 | TEMPLATE= app | ||
2 | #CONFIG = qt warn_on debug | 1 | #CONFIG = qt warn_on debug |
3 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release quick-app |
4 | HEADERS = usermanager.h userdialog.h groupdialog.h passwd.h | 3 | HEADERS = usermanager.h userdialog.h groupdialog.h passwd.h |
5 | SOURCES = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp | 4 | SOURCES = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.cpp main.cpp |
6 | INCLUDEPATH+= $(OPIEDIR)/include | 5 | INCLUDEPATH+= $(OPIEDIR)/include |
7 | DEPENDPATH+= $(OPIEDIR)/include | 6 | DEPENDPATH+= $(OPIEDIR)/include |
8 | LIBS += -lqpe -lopie -lcrypt | 7 | LIBS += -lqpe -lopie -lcrypt |
9 | TARGET = usermanager | 8 | TARGET = usermanager |
10 | DESTDIR = $(OPIEDIR)/bin | ||
11 | 9 | ||
12 | TRANSLATIONS = ../../../i18n/de/usermanager.ts \ | 10 | TRANSLATIONS = ../../../i18n/de/usermanager.ts \ |
13 | ../../../i18n/nl/usermanager.ts \ | 11 | ../../../i18n/nl/usermanager.ts \ |
14 | ../../../i18n/xx/usermanager.ts \ | 12 | ../../../i18n/xx/usermanager.ts \ |