-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 @@ -15,24 +15,18 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include <qpe/qpeapplication.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/global.h> #include "security.h" +#include <opie/oapplicationfactory.h> -int main(int argc, char** argv) -{ - QPEApplication a(argc,argv); +OPIE_EXPORT_APP( OApplicationFactory<Security> ) - Security dlg; - a.showMainWidget(&dlg); - - return a.exec(); -} 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 @@ -111,25 +111,24 @@ void Security::updateGUI() void Security::show() { //valid=FALSE; setEnabled(FALSE); SecurityBase::show(); if ( passcode.isEmpty() ) { // could insist... //changePassCode(); //if ( passcode.isEmpty() ) //reject(); } else { - if (!valid) // security passcode was not asked yet, so ask now { QString pc = enterPassCode(tr("Enter passcode")); if ( pc != passcode ) { QMessageBox::critical(this, tr("Passcode incorrect"), tr("The passcode entered is incorrect.\nAccess denied")); reject(); return; } } } setEnabled(TRUE); @@ -230,25 +229,24 @@ void Security::toggleAutoLogin(bool val) void Security::setSyncNet(const QString& sn) { int auth_peer,auth_peer_bits; parseNet(sn,auth_peer,auth_peer_bits); selectNet(auth_peer,auth_peer_bits); } void Security::applySecurity() { if ( valid ) { - Config cfg("Security"); cfg.setGroup("Passcode"); cfg.writeEntry("passcode",passcode); cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked()); cfg.setGroup("Sync"); int auth_peer=0; int auth_peer_bits; QString sn = syncnet->currentText(); parseNet(sn,auth_peer,auth_peer_bits); cfg.writeEntry("auth_peer",auth_peer); cfg.writeEntry("auth_peer_bits",auth_peer_bits); /* @@ -261,27 +259,24 @@ void Security::applySecurity() */ QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; Config loginCfg(configFile,Config::File); loginCfg.setGroup("General"); if (autoLogin) { loginCfg.writeEntry("AutoLogin",autoLoginName); } else { loginCfg.removeEntry("AutoLogin"); } - cfg.setGroup("SyncMode"); - cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); - } } void Security::changeLoginName( int idx ) { autoLoginName = userlist->text(idx);; updateGUI(); } void Security::changePassCode() { QString new1; 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 @@ -20,24 +20,25 @@ #ifndef SECURITY_H #define SECURITY_H #include "securitybase.h" class QPEDialogListener; class Security : public SecurityBase { Q_OBJECT public: + static QString appName() { return QString::fromLatin1("security"); } Security( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~Security(); void show(); protected: void accept(); void applySecurity(); void done(int); private slots: void changePassCode(); 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,15 +1,13 @@ -TEMPLATE = app -CONFIG += qt warn_on release -DESTDIR = $(OPIEDIR)/bin +CONFIG += qt warn_on release quick-app HEADERS = security.h SOURCES = security.cpp main.cpp INTERFACES = securitybase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = security TRANSLATIONS = ../../../i18n/de/security.ts \ ../../../i18n/nl/security.ts \ ../../../i18n/xx/security.ts \ ../../../i18n/en/security.ts \ 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 @@ -2,25 +2,25 @@ <class>SecurityBase</class> <widget> <class>QDialog</class> <property stdset="1"> <name>name</name> <cstring>SecurityBase</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>339</width> + <width>329</width> <height>483</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>Security Settings</string> </property> <property> <name>layoutMargin</name> </property> <property> <name>layoutSpacing</name> |