26 files changed, 45 insertions, 100 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 | |||
@@ -555,28 +555,24 @@ void Appearance::accept ( ) | |||
555 | fl |= ( it-> noFont ( ) ? 0x02 : 0 ); | 555 | fl |= ( it-> noFont ( ) ? 0x02 : 0 ); |
556 | fl |= ( it-> noDeco ( ) ? 0x04 : 0 ); | 556 | fl |= ( it-> noDeco ( ) ? 0x04 : 0 ); |
557 | exceptstr = QString::number ( fl, 32 ); | 557 | exceptstr = QString::number ( fl, 32 ); |
558 | exceptstr.append( it-> pattern ( )); | 558 | exceptstr.append( it-> pattern ( )); |
559 | sl << exceptstr; | 559 | sl << exceptstr; |
560 | } | 560 | } |
561 | config. writeEntry ( "NoStyle", sl, ';' ); | 561 | config. writeEntry ( "NoStyle", sl, ';' ); |
562 | config. writeEntry ( "ForceStyle", m_force-> isChecked ( )); | 562 | config. writeEntry ( "ForceStyle", m_force-> isChecked ( )); |
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 ) |
575 | { | 571 | { |
576 | QDialog::done ( r ); | 572 | QDialog::done ( r ); |
577 | close ( ); | 573 | close ( ); |
578 | } | 574 | } |
579 | 575 | ||
580 | 576 | ||
581 | void Appearance::styleClicked ( int index ) | 577 | void Appearance::styleClicked ( int index ) |
582 | { | 578 | { |
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 | |||
@@ -46,24 +46,25 @@ class SampleWindow; | |||
46 | class OFontSelector; | 46 | class OFontSelector; |
47 | class QListView; | 47 | class QListView; |
48 | class QListViewItem; | 48 | class QListViewItem; |
49 | class Config; | 49 | class Config; |
50 | 50 | ||
51 | class Appearance : public QDialog | 51 | class Appearance : public QDialog |
52 | { | 52 | { |
53 | Q_OBJECT | 53 | Q_OBJECT |
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 ); |
67 | void fontClicked ( const QFont & ); | 68 | void fontClicked ( const QFont & ); |
68 | void colorClicked ( int ); | 69 | void colorClicked ( int ); |
69 | 70 | ||
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,33 +1,31 @@ | |||
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 \ |
17 | ../../../i18n/es/appearance.ts \ | 16 | ../../../i18n/es/appearance.ts \ |
18 | ../../../i18n/fr/appearance.ts \ | 17 | ../../../i18n/fr/appearance.ts \ |
19 | ../../../i18n/hu/appearance.ts \ | 18 | ../../../i18n/hu/appearance.ts \ |
20 | ../../../i18n/ja/appearance.ts \ | 19 | ../../../i18n/ja/appearance.ts \ |
21 | ../../../i18n/ko/appearance.ts \ | 20 | ../../../i18n/ko/appearance.ts \ |
22 | ../../../i18n/no/appearance.ts \ | 21 | ../../../i18n/no/appearance.ts \ |
23 | ../../../i18n/pl/appearance.ts \ | 22 | ../../../i18n/pl/appearance.ts \ |
24 | ../../../i18n/pt/appearance.ts \ | 23 | ../../../i18n/pt/appearance.ts \ |
25 | ../../../i18n/pt_BR/appearance.ts \ | 24 | ../../../i18n/pt_BR/appearance.ts \ |
26 | ../../../i18n/sl/appearance.ts \ | 25 | ../../../i18n/sl/appearance.ts \ |
27 | ../../../i18n/zh_CN/appearance.ts \ | 26 | ../../../i18n/zh_CN/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 | |||
@@ -19,24 +19,16 @@ | |||
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., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
25 | 25 | ||
26 | */ | 26 | */ |
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,35 +1,30 @@ | |||
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 \ |
16 | ../../../i18n/en/backup.ts \ | 13 | ../../../i18n/en/backup.ts \ |
17 | ../../../i18n/es/backup.ts \ | 14 | ../../../i18n/es/backup.ts \ |
18 | ../../../i18n/fr/backup.ts \ | 15 | ../../../i18n/fr/backup.ts \ |
19 | ../../../i18n/hu/backup.ts \ | 16 | ../../../i18n/hu/backup.ts \ |
20 | ../../../i18n/ja/backup.ts \ | 17 | ../../../i18n/ja/backup.ts \ |
21 | ../../../i18n/ko/backup.ts \ | 18 | ../../../i18n/ko/backup.ts \ |
22 | ../../../i18n/no/backup.ts \ | 19 | ../../../i18n/no/backup.ts \ |
23 | ../../../i18n/pl/backup.ts \ | 20 | ../../../i18n/pl/backup.ts \ |
24 | ../../../i18n/pt/backup.ts \ | 21 | ../../../i18n/pt/backup.ts \ |
25 | ../../../i18n/pt_BR/backup.ts \ | 22 | ../../../i18n/pt_BR/backup.ts \ |
26 | ../../../i18n/sl/backup.ts \ | 23 | ../../../i18n/sl/backup.ts \ |
27 | ../../../i18n/zh_CN/backup.ts \ | 24 | ../../../i18n/zh_CN/backup.ts \ |
28 | ../../../i18n/zh_TW/backup.ts \ | 25 | ../../../i18n/zh_TW/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 | |||
@@ -28,26 +28,26 @@ | |||
28 | #include <sys/stat.h> | 28 | #include <sys/stat.h> |
29 | #include <dirent.h> | 29 | #include <dirent.h> |
30 | 30 | ||
31 | #define HEADER_NAME 0 | 31 | #define HEADER_NAME 0 |
32 | #define HEADER_BACKUP 1 | 32 | #define HEADER_BACKUP 1 |
33 | #define BACKUP_LOCATION 2 | 33 | #define BACKUP_LOCATION 2 |
34 | 34 | ||
35 | #define EXTENSION ".bck" | 35 | #define EXTENSION ".bck" |
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()), |
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 @@ | |||
5 | #include "backuprestorebase.h" | 5 | #include "backuprestorebase.h" |
6 | #include <qmap.h> | 6 | #include <qmap.h> |
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 | static QString appName() { return QString::fromLatin1("backup"); } | ||
20 | 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); |
25 | void sourceDirChanged(int); | 26 | void sourceDirChanged(int); |
26 | void rescanFolder(QString directory); | 27 | void rescanFolder(QString directory); |
27 | void fileListUpdate(); | 28 | void fileListUpdate(); |
28 | 29 | ||
29 | private: | 30 | private: |
30 | void scanForApplicationSettings(); | 31 | void scanForApplicationSettings(); |
31 | int getBackupFiles(QString &backupFiles, QListViewItem *parent); | 32 | 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 @@ | |||
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 | 6 | ||
8 | BackupAndRestore app(0, "mainwindow"); | 7 | OPIE_EXPORT_APP( OApplicationFactory<BackupAndRestore> ) |
9 | a.showMainWidget(&app); | ||
10 | return a.exec(); | ||
11 | } | ||
12 | |||
13 | // main.cpp | ||
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,15 +1,13 @@ | |||
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 |
8 | DEPENDPATH+= ../$(OPIEDIR)/include | 6 | DEPENDPATH+= ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 7 | LIBS += -lqpe |
10 | TARGET = language | 8 | TARGET = language |
11 | 9 | ||
12 | TRANSLATIONS = ../../../i18n/de/language.ts \ | 10 | TRANSLATIONS = ../../../i18n/de/language.ts \ |
13 | ../../../i18n/nl/language.ts \ | 11 | ../../../i18n/nl/language.ts \ |
14 | ../../../i18n/xx/language.ts \ | 12 | ../../../i18n/xx/language.ts \ |
15 | ../../../i18n/en/language.ts \ | 13 | ../../../i18n/en/language.ts \ |
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 | |||
@@ -12,25 +12,16 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
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 | |||
@@ -26,24 +26,26 @@ | |||
26 | #include "languagesettingsbase.h" | 26 | #include "languagesettingsbase.h" |
27 | 27 | ||
28 | class QPEDialogListener; | 28 | class QPEDialogListener; |
29 | 29 | ||
30 | class LanguageSettings : public LanguageSettingsBase | 30 | class LanguageSettings : public LanguageSettingsBase |
31 | { | 31 | { |
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | 33 | ||
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); |
42 | 44 | ||
43 | QStrList langAvail; | 45 | QStrList langAvail; |
44 | 46 | ||
45 | private slots: | 47 | private slots: |
46 | void applyLanguage(); | 48 | void applyLanguage(); |
47 | void reset(); | 49 | void reset(); |
48 | 50 | ||
49 | private: | 51 | private: |
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 | |||
@@ -1,17 +1,10 @@ | |||
1 | #include "mediumwidget.h" | 1 | #include "mediumwidget.h" |
2 | #include "mediumglobal.h" | 2 | #include "mediumglobal.h" |
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 | |||
@@ -8,24 +8,25 @@ | |||
8 | 8 | ||
9 | class QVBoxLayout; | 9 | class QVBoxLayout; |
10 | class QTabWidget; | 10 | class QTabWidget; |
11 | 11 | ||
12 | namespace MediumMountSetting { | 12 | namespace MediumMountSetting { |
13 | class MediumMountWidget; | 13 | class MediumMountWidget; |
14 | class MediumGlobalWidget; | 14 | class MediumGlobalWidget; |
15 | class MainWindow : public QDialog { | 15 | class MainWindow : public QDialog { |
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 ); |
24 | void accept(); | 25 | void accept(); |
25 | void done( int ); | 26 | void done( int ); |
26 | private: | 27 | private: |
27 | void init(); | 28 | void init(); |
28 | QTabWidget *m_tab; | 29 | QTabWidget *m_tab; |
29 | QVBoxLayout *m_lay; | 30 | QVBoxLayout *m_lay; |
30 | MediumGlobalWidget *m_global; | 31 | MediumGlobalWidget *m_global; |
31 | QList<MediumMountWidget> m_mediums; | 32 | QList<MediumMountWidget> m_mediums; |
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,16 +1,16 @@ | |||
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 |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | TARGET = mediummount | 10 | TARGET = mediummount |
11 | 11 | ||
12 | TRANSLATIONS = ../../../i18n/de/mediummount.ts \ | 12 | TRANSLATIONS = ../../../i18n/de/mediummount.ts \ |
13 | ../../../i18n/nl/mediummount.ts \ | 13 | ../../../i18n/nl/mediummount.ts \ |
14 | ../../../i18n/da/mediummount.ts \ | 14 | ../../../i18n/da/mediummount.ts \ |
15 | ../../../i18n/xx/mediummount.ts \ | 15 | ../../../i18n/xx/mediummount.ts \ |
16 | ../../../i18n/en/mediummount.ts \ | 16 | ../../../i18n/en/mediummount.ts \ |
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 | |||
@@ -18,24 +18,25 @@ class QGroupBox; | |||
18 | class QVBox; | 18 | class QVBox; |
19 | class QHBox; | 19 | class QHBox; |
20 | class QLineEdit; | 20 | class QLineEdit; |
21 | 21 | ||
22 | namespace MediumMountSetting { | 22 | namespace MediumMountSetting { |
23 | 23 | ||
24 | class MediumMountWidget : public QWidget { | 24 | class MediumMountWidget : public QWidget { |
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: |
33 | void slotAdd(); | 34 | void slotAdd(); |
34 | void slotStateChanged(); | 35 | void slotStateChanged(); |
35 | 36 | ||
36 | private: | 37 | private: |
37 | void readConfig(); | 38 | void readConfig(); |
38 | void initGUI(); | 39 | void initGUI(); |
39 | 40 | ||
40 | bool m_dirty : 1; | 41 | bool m_dirty : 1; |
41 | 42 | ||
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 | |||
@@ -20,22 +20,16 @@ | |||
20 | : = ...= . :.=- You should have received a copy of the GNU | 20 | : = ...= . :.=- You should have received a copy of the GNU |
21 | -. .:....=;==+<; General Public License along with this file; | 21 | -. .:....=;==+<; General Public License along with this file; |
22 | -_. . . )=. = see the file COPYING. If not, write to the | 22 | -_. . . )=. = see the file COPYING. If not, write to the |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
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 | |||
@@ -30,36 +30,37 @@ | |||
30 | #include "timetabwidget.h" | 30 | #include "timetabwidget.h" |
31 | #include "formattabwidget.h" | 31 | #include "formattabwidget.h" |
32 | #include "settingstabwidget.h" | 32 | #include "settingstabwidget.h" |
33 | #include "ntptabwidget.h" | 33 | #include "ntptabwidget.h" |
34 | #include "predicttabwidget.h" | 34 | #include "predicttabwidget.h" |
35 | 35 | ||
36 | #include <opie/oprocess.h> | 36 | #include <opie/oprocess.h> |
37 | #include <opie/otabwidget.h> | 37 | #include <opie/otabwidget.h> |
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 |
46 | 47 | ||
47 | #include <qlayout.h> | 48 | #include <qlayout.h> |
48 | #include <qmessagebox.h> | 49 | #include <qmessagebox.h> |
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 | ||
58 | QVBoxLayout *layout = new QVBoxLayout( this ); | 59 | QVBoxLayout *layout = new QVBoxLayout( this ); |
59 | layout->setMargin( 2 ); | 60 | layout->setMargin( 2 ); |
60 | layout->setSpacing( 4 ); | 61 | layout->setSpacing( 4 ); |
61 | 62 | ||
62 | // Create main tabbed control | 63 | // Create main tabbed control |
63 | mainWidget = new OTabWidget( this ); | 64 | mainWidget = new OTabWidget( this ); |
64 | 65 | ||
65 | // Default object pointers to null | 66 | // Default object pointers to null |
@@ -70,29 +71,28 @@ MainWindow::MainWindow() | |||
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" ) ); |
74 | Config config( "ntp" ); | 75 | Config config( "ntp" ); |
75 | config.setGroup( "settings" ); | 76 | config.setGroup( "settings" ); |
76 | slotDisplayNTPTab( config.readBoolEntry( "displayNtpTab", FALSE ) ); | 77 | slotDisplayNTPTab( config.readBoolEntry( "displayNtpTab", FALSE ) ); |
77 | slotDisplayPredictTab( config.readBoolEntry( "displayPredictTab", FALSE ) ); | 78 | slotDisplayPredictTab( config.readBoolEntry( "displayPredictTab", FALSE ) ); |
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 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), | ||
85 | this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) ); | 84 | this, SLOT(slotQCopReceive(const QCString&, const QByteArray&)) ); |
86 | 85 | ||
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)) ); |
90 | slotProbeNTPServer(); | 90 | slotProbeNTPServer(); |
91 | 91 | ||
92 | // Create timer for automatic time lookups | 92 | // Create timer for automatic time lookups |
93 | ntpTimer = new QTimer( this ); | 93 | ntpTimer = new QTimer( this ); |
94 | 94 | ||
95 | // Connect everything together | 95 | // Connect everything together |
96 | connect( timeTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) ); | 96 | connect( timeTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) ); |
97 | connect( timeTab, SIGNAL(tzChanged(const QString &)), predictTab, SLOT(slotTZChanged(const QString &)) ); | 97 | connect( timeTab, SIGNAL(tzChanged(const QString &)), predictTab, SLOT(slotTZChanged(const QString &)) ); |
98 | connect( timeTab, SIGNAL(getPredictedTime()), predictTab, SLOT(slotSetPredictedTime()) ); | 98 | connect( timeTab, SIGNAL(getPredictedTime()), predictTab, SLOT(slotSetPredictedTime()) ); |
@@ -101,25 +101,26 @@ MainWindow::MainWindow() | |||
101 | timeTab, SLOT(slotDateFormatChanged(const DateFormat &)) ); | 101 | timeTab, SLOT(slotDateFormatChanged(const DateFormat &)) ); |
102 | connect( formatTab, SIGNAL(weekStartChanged(int)), timeTab, SLOT(slotWeekStartChanged(int)) ); | 102 | connect( formatTab, SIGNAL(weekStartChanged(int)), timeTab, SLOT(slotWeekStartChanged(int)) ); |
103 | connect( settingsTab, SIGNAL(ntpDelayChanged(int)), this, SLOT(slotNTPDelayChanged(int)) ); | 103 | connect( settingsTab, SIGNAL(ntpDelayChanged(int)), this, SLOT(slotNTPDelayChanged(int)) ); |
104 | connect( settingsTab, SIGNAL(displayNTPTab(bool)), this, SLOT(slotDisplayNTPTab(bool)) ); | 104 | connect( settingsTab, SIGNAL(displayNTPTab(bool)), this, SLOT(slotDisplayNTPTab(bool)) ); |
105 | connect( settingsTab, SIGNAL(displayPredictTab(bool)), this, SLOT(slotDisplayPredictTab(bool)) ); | 105 | connect( settingsTab, SIGNAL(displayPredictTab(bool)), this, SLOT(slotDisplayPredictTab(bool)) ); |
106 | connect( predictTab, SIGNAL(setTime(const QDateTime &)), this, SLOT(slotSetTime(const QDateTime &)) ); | 106 | connect( predictTab, SIGNAL(setTime(const QDateTime &)), this, SLOT(slotSetTime(const QDateTime &)) ); |
107 | 107 | ||
108 | // Do initial time server check | 108 | // Do initial time server check |
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 | { |
118 | if ( ntpProcess ) | 119 | if ( ntpProcess ) |
119 | delete ntpProcess; | 120 | delete ntpProcess; |
120 | } | 121 | } |
121 | 122 | ||
122 | void MainWindow::accept() | 123 | void MainWindow::accept() |
123 | { | 124 | { |
124 | // Turn off the screensaver (Note: needs to be encased in { } so that it deconstructs and sends) | 125 | // Turn off the screensaver (Note: needs to be encased in { } so that it deconstructs and sends) |
125 | { | 126 | { |
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 | |||
@@ -39,26 +39,27 @@ class PredictTabWidget; | |||
39 | 39 | ||
40 | class OProcess; | 40 | class OProcess; |
41 | class OTabWidget; | 41 | class OTabWidget; |
42 | class QDateTime; | 42 | class QDateTime; |
43 | class QSocket; | 43 | class QSocket; |
44 | class QTimer; | 44 | class QTimer; |
45 | 45 | ||
46 | class MainWindow : public QDialog | 46 | 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(); |
57 | 58 | ||
58 | private: | 59 | private: |
59 | OTabWidget *mainWidget; | 60 | OTabWidget *mainWidget; |
60 | 61 | ||
61 | TimeTabWidget *timeTab; | 62 | TimeTabWidget *timeTab; |
62 | FormatTabWidget *formatTab; | 63 | FormatTabWidget *formatTab; |
63 | SettingsTabWidget *settingsTab; | 64 | SettingsTabWidget *settingsTab; |
64 | NTPTabWidget *ntpTab; | 65 | NTPTabWidget *ntpTab; |
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,33 +1,30 @@ | |||
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 \ |
8 | predicttabwidget.h \ | 6 | predicttabwidget.h \ |
9 | ntptabwidget.h | 7 | ntptabwidget.h |
10 | SOURCES = main.cpp \ | 8 | SOURCES = main.cpp \ |
11 | mainwindow.cpp \ | 9 | mainwindow.cpp \ |
12 | timetabwidget.cpp \ | 10 | timetabwidget.cpp \ |
13 | formattabwidget.cpp \ | 11 | formattabwidget.cpp \ |
14 | settingstabwidget.cpp \ | 12 | settingstabwidget.cpp \ |
15 | predicttabwidget.cpp \ | 13 | predicttabwidget.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 \ |
26 | ../../../i18n/da/systemtime.ts \ | 23 | ../../../i18n/da/systemtime.ts \ |
27 | ../../../i18n/xx/systemtime.ts \ | 24 | ../../../i18n/xx/systemtime.ts \ |
28 | ../../../i18n/en/systemtime.ts \ | 25 | ../../../i18n/en/systemtime.ts \ |
29 | ../../../i18n/es/systemtime.ts \ | 26 | ../../../i18n/es/systemtime.ts \ |
30 | ../../../i18n/fr/systemtime.ts \ | 27 | ../../../i18n/fr/systemtime.ts \ |
31 | ../../../i18n/hu/systemtime.ts \ | 28 | ../../../i18n/hu/systemtime.ts \ |
32 | ../../../i18n/ja/systemtime.ts \ | 29 | ../../../i18n/ja/systemtime.ts \ |
33 | ../../../i18n/ko/systemtime.ts \ | 30 | ../../../i18n/ko/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 | |||
@@ -12,22 +12,18 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
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,15 +1,13 @@ | |||
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 |
8 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe | 7 | LIBS += -lqpe |
10 | TARGET = sound | 8 | TARGET = sound |
11 | 9 | ||
12 | TRANSLATIONS = ../../../i18n/de/sound.ts \ | 10 | TRANSLATIONS = ../../../i18n/de/sound.ts \ |
13 | ../../../i18n/nl/sound.ts \ | 11 | ../../../i18n/nl/sound.ts \ |
14 | ../../../i18n/da/sound.ts \ | 12 | ../../../i18n/da/sound.ts \ |
15 | ../../../i18n/xx/sound.ts \ | 13 | ../../../i18n/xx/sound.ts \ |
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 | |||
@@ -20,24 +20,25 @@ | |||
20 | #ifndef SOUNDSETTINGS_H | 20 | #ifndef SOUNDSETTINGS_H |
21 | #define SOUNDSETTINGS_H | 21 | #define SOUNDSETTINGS_H |
22 | 22 | ||
23 | 23 | ||
24 | #include "soundsettingsbase.h" | 24 | #include "soundsettingsbase.h" |
25 | 25 | ||
26 | 26 | ||
27 | class SoundSettings : public SoundSettingsBase | 27 | 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; |
36 | /* void accept(); */ | 37 | /* void accept(); */ |
37 | /* void reject(); */ | 38 | /* void reject(); */ |
38 | void updateStorageCombo(); | 39 | void updateStorageCombo(); |
39 | void updateLocationCombo(); | 40 | void updateLocationCombo(); |
40 | 41 | ||
41 | private slots: | 42 | private slots: |
42 | void setKeyButton( int); | 43 | void setKeyButton( int); |
43 | void setSizeLimitButton(const QString &); | 44 | void setSizeLimitButton(const QString &); |
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,9 +1,9 @@ | |||
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 |
7 | Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass | 7 | Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass |
8 | Description: Utility for managing ssh-agent keys. | 8 | Description: Utility for managing ssh-agent keys. |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | Version: $QPE_VERSION$EXTRAVERSION |
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 | |||
@@ -1,19 +1,14 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * * | 2 | * * |
3 | * This program is free software; you can redistribute it and/or modify * | 3 | * This program is free software; you can redistribute it and/or modify * |
4 | * it under the terms of the GNU General Public License as published by * | 4 | * it under the terms of the GNU General Public License as published by * |
5 | * the Free Software Foundation; either version 2 of the License, or * | 5 | * the Free Software Foundation; either version 2 of the License, or * |
6 | * (at your option) any later version. * | 6 | * (at your option) any later version. * |
7 | * * | 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 | |||
@@ -18,24 +18,25 @@ | |||
18 | 18 | ||
19 | #include <qpe/qpetoolbar.h> | 19 | #include <qpe/qpetoolbar.h> |
20 | 20 | ||
21 | #include "userdialog.h" | 21 | #include "userdialog.h" |
22 | #include "groupdialog.h" | 22 | #include "groupdialog.h" |
23 | #include "passwd.h" | 23 | #include "passwd.h" |
24 | 24 | ||
25 | class UserConfig : public QMainWindow | 25 | 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: |
34 | QToolButton *adduserToolButton; | 35 | QToolButton *adduserToolButton; |
35 | QToolButton *edituserToolButton; | 36 | QToolButton *edituserToolButton; |
36 | QToolButton *deleteuserToolButton; | 37 | QToolButton *deleteuserToolButton; |
37 | QToolButton *addgroupToolButton; | 38 | QToolButton *addgroupToolButton; |
38 | QToolButton *editgroupToolButton; | 39 | QToolButton *editgroupToolButton; |
39 | QToolButton *deletegroupToolButton; | 40 | QToolButton *deletegroupToolButton; |
40 | QTabWidget *myTabWidget; | 41 | QTabWidget *myTabWidget; |
41 | QListView *usersIconView; | 42 | QListView *usersIconView; |
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,22 +1,20 @@ | |||
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 \ |
15 | ../../../i18n/en/usermanager.ts \ | 13 | ../../../i18n/en/usermanager.ts \ |
16 | ../../../i18n/es/usermanager.ts \ | 14 | ../../../i18n/es/usermanager.ts \ |
17 | ../../../i18n/fr/usermanager.ts \ | 15 | ../../../i18n/fr/usermanager.ts \ |
18 | ../../../i18n/hu/usermanager.ts \ | 16 | ../../../i18n/hu/usermanager.ts \ |
19 | ../../../i18n/ja/usermanager.ts \ | 17 | ../../../i18n/ja/usermanager.ts \ |
20 | ../../../i18n/ko/usermanager.ts \ | 18 | ../../../i18n/ko/usermanager.ts \ |
21 | ../../../i18n/no/usermanager.ts \ | 19 | ../../../i18n/no/usermanager.ts \ |
22 | ../../../i18n/pl/usermanager.ts \ | 20 | ../../../i18n/pl/usermanager.ts \ |