summaryrefslogtreecommitdiff
path: root/noncore/settings/appearance2
Unidiff
Diffstat (limited to 'noncore/settings/appearance2') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/appearance2/appearance.cpp4
-rw-r--r--noncore/settings/appearance2/appearance.h1
-rw-r--r--noncore/settings/appearance2/appearance2.pro8
-rw-r--r--noncore/settings/appearance2/main.cpp12
4 files changed, 6 insertions, 19 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,6 +55,7 @@ class Appearance : public QDialog
55public: 55public:
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
59protected: 60protected:
60 virtual void accept ( ); 61 virtual void accept ( );
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 @@
1TEMPLATE = app 1CONFIG = qt warn_on release quick-app
2CONFIG = qt warn_on release
3DESTDIR = $(OPIEDIR)/bin
4HEADERS = appearance.h editScheme.h sample.h 2HEADERS = appearance.h editScheme.h sample.h
5SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp 3SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp
6INCLUDEPATH += $(OPIEDIR)/include 4INCLUDEPATH += $(OPIEDIR)/include
7DEPENDPATH += ../$(OPIEDIR)/include 5DEPENDPATH += ../$(OPIEDIR)/include
8LIBS += -lqpe -lopie 6LIBS += -lqpe -lopie
9TARGET = appearance
10INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
11DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
12 9
10 TARGET = appearance
11
13TRANSLATIONS = ../../../i18n/de/appearance.ts \ 12TRANSLATIONS = ../../../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
33include ( $(OPIEDIR)/include.pro ) 31include ( $(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
@@ -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
33int main ( int argc, char **argv ) 34OPIE_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