-rw-r--r-- | core/settings/security/main.cpp | 10 | ||||
-rw-r--r-- | core/settings/security/security.cpp | 5 | ||||
-rw-r--r-- | core/settings/security/security.h | 1 | ||||
-rw-r--r-- | core/settings/security/security.pro | 4 | ||||
-rw-r--r-- | core/settings/security/securitybase.ui | 2 |
5 files changed, 5 insertions, 17 deletions
diff --git a/core/settings/security/main.cpp b/core/settings/security/main.cpp index c15bb31..3141fb8 100644 --- a/core/settings/security/main.cpp +++ b/core/settings/security/main.cpp | |||
@@ -23,16 +23,10 @@ | |||
23 | #include <qpe/global.h> | 23 | #include <qpe/global.h> |
24 | 24 | ||
25 | #include "security.h" | 25 | #include "security.h" |
26 | 26 | ||
27 | #include <opie/oapplicationfactory.h> | ||
27 | 28 | ||
28 | int main(int argc, char** argv) | 29 | OPIE_EXPORT_APP( OApplicationFactory<Security> ) |
29 | { | ||
30 | QPEApplication a(argc,argv); | ||
31 | 30 | ||
32 | Security dlg; | ||
33 | 31 | ||
34 | a.showMainWidget(&dlg); | ||
35 | |||
36 | return a.exec(); | ||
37 | } | ||
38 | 32 | ||
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index 42a39c2..81363d2 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp | |||
@@ -119,9 +119,8 @@ void Security::show() | |||
119 | //changePassCode(); | 119 | //changePassCode(); |
120 | //if ( passcode.isEmpty() ) | 120 | //if ( passcode.isEmpty() ) |
121 | //reject(); | 121 | //reject(); |
122 | } else { | 122 | } else { |
123 | |||
124 | if (!valid) // security passcode was not asked yet, so ask now | 123 | if (!valid) // security passcode was not asked yet, so ask now |
125 | { | 124 | { |
126 | QString pc = enterPassCode(tr("Enter passcode")); | 125 | QString pc = enterPassCode(tr("Enter passcode")); |
127 | if ( pc != passcode ) { | 126 | if ( pc != passcode ) { |
@@ -238,9 +237,8 @@ void Security::setSyncNet(const QString& sn) | |||
238 | 237 | ||
239 | void Security::applySecurity() | 238 | void Security::applySecurity() |
240 | { | 239 | { |
241 | if ( valid ) { | 240 | if ( valid ) { |
242 | |||
243 | Config cfg("Security"); | 241 | Config cfg("Security"); |
244 | cfg.setGroup("Passcode"); | 242 | cfg.setGroup("Passcode"); |
245 | cfg.writeEntry("passcode",passcode); | 243 | cfg.writeEntry("passcode",passcode); |
246 | cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked()); | 244 | cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked()); |
@@ -269,11 +267,8 @@ void Security::applySecurity() | |||
269 | } else { | 267 | } else { |
270 | loginCfg.removeEntry("AutoLogin"); | 268 | loginCfg.removeEntry("AutoLogin"); |
271 | } | 269 | } |
272 | 270 | ||
273 | cfg.setGroup("SyncMode"); | ||
274 | cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); | ||
275 | |||
276 | } | 271 | } |
277 | } | 272 | } |
278 | 273 | ||
279 | void Security::changeLoginName( int idx ) | 274 | void Security::changeLoginName( int idx ) |
diff --git a/core/settings/security/security.h b/core/settings/security/security.h index 2f18f91..52d56de 100644 --- a/core/settings/security/security.h +++ b/core/settings/security/security.h | |||
@@ -28,8 +28,9 @@ class Security : public SecurityBase | |||
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | 30 | ||
31 | public: | 31 | public: |
32 | static QString appName() { return QString::fromLatin1("security"); } | ||
32 | Security( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 33 | Security( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
33 | ~Security(); | 34 | ~Security(); |
34 | 35 | ||
35 | void show(); | 36 | void show(); |
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro index c359537..67995d4 100644 --- a/core/settings/security/security.pro +++ b/core/settings/security/security.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 = security.h | 2 | HEADERS = security.h |
5 | SOURCES = security.cpp main.cpp | 3 | SOURCES = security.cpp main.cpp |
6 | INTERFACES= securitybase.ui | 4 | INTERFACES= securitybase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui index 73290e5..9fb63a8 100644 --- a/core/settings/security/securitybase.ui +++ b/core/settings/security/securitybase.ui | |||
@@ -10,9 +10,9 @@ | |||
10 | <name>geometry</name> | 10 | <name>geometry</name> |
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>339</width> | 14 | <width>329</width> |
15 | <height>483</height> | 15 | <height>483</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
18 | <property stdset="1"> | 18 | <property stdset="1"> |