| -rw-r--r-- | core/settings/security/security.cpp | 17 | ||||
| -rw-r--r-- | core/settings/security/securitybase.ui | 27 |
2 files changed, 38 insertions, 6 deletions
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index 75a181b..c4726b3 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp @@ -24,4 +24,5 @@ #include <qpe/password.h> #include <qpe/qpedialog.h> +#include <qpe/qcopenvelope_qws.h> #include <qcheckbox.h> @@ -73,4 +74,7 @@ } + cfg.setGroup("SyncMode"); + int mode = cfg.readNumEntry("Mode",2); // Default to Sharp + syncModeCombo->setCurrentItem( mode - 1 ); connect(autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool))); @@ -133,4 +137,5 @@ void Security::accept() applySecurity(); QDialog::accept(); + QCopEnvelope env("QPE/System", "securityChanged()" ); } @@ -186,12 +191,12 @@ void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits) } -void Security::loadUsers ( void ) +void Security::loadUsers ( void ) { QFile passwd("/etc/passwd"); if ( passwd.open(IO_ReadOnly) ) { - QTextStream t( &passwd ); + QTextStream t( &passwd ); QString s; QStringList account; - while ( !t.eof() ) { + while ( !t.eof() ) { account = QStringList::split(':',t.readLine()); @@ -201,5 +206,5 @@ void Security::loadUsers ( void ) userlist->insertItem(*account.at(0)); // Highlight this item if it is set to autologinToggle - if ( *account.at(0) == autoLoginName) + if ( *account.at(0) == autoLoginName) userlist->setCurrentItem(userlist->count()-1); } @@ -213,5 +218,5 @@ void Security::toggleAutoLogin(bool val) autoLogin=val; userlist->setEnabled(val); - if (!autoLogin) + if (!autoLogin) autoLoginName=userlist->currentText(); } @@ -256,4 +261,6 @@ void Security::applySecurity() } + cfg.setGroup("SyncMode"); + cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); } } diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui index da25f39..73290e5 100644 --- a/core/settings/security/securitybase.ui +++ b/core/settings/security/securitybase.ui @@ -12,5 +12,5 @@ <x>0</x> <y>0</y> - <width>329</width> + <width>339</width> <height>483</height> </rect> @@ -382,4 +382,29 @@ </property> </widget> + <widget> + <class>QComboBox</class> + <item> + <property> + <name>text</name> + <string>Qtopia 1.7</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>Opie 1.0</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>Both</string> + </property> + </item> + <property stdset="1"> + <name>name</name> + <cstring>syncModeCombo</cstring> + </property> + </widget> </vbox> </widget> |