author | mickeyl <mickeyl> | 2003-10-29 17:22:08 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-29 17:22:08 (UTC) |
commit | 35615947e11575a61456c8483e7f6d67fe59d5ed (patch) (unidiff) | |
tree | 89f834a50b5070767ca0f9c8a90d044f075a9131 /noncore/settings/appearance2 | |
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)
Diffstat (limited to 'noncore/settings/appearance2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/appearance2/appearance.h | 3 | ||||
-rw-r--r-- | noncore/settings/appearance2/appearance2.pro | 8 | ||||
-rw-r--r-- | noncore/settings/appearance2/main.cpp | 14 |
4 files changed, 8 insertions, 21 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 | |||
@@ -564,10 +564,6 @@ void Appearance::accept ( ) | |||
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 | ||
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 | |||
@@ -55,11 +55,12 @@ class Appearance : public QDialog | |||
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 ( ); |
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,15 +1,14 @@ | |||
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 \ |
@@ -29,5 +28,4 @@ TRANSLATIONS = ../../../i18n/de/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 | |||
@@ -15,7 +15,7 @@ | |||
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 |
@@ -28,15 +28,7 @@ | |||
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 | |||