summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/security/security.cpp17
-rw-r--r--core/settings/security/securitybase.ui27
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
@@ -25,2 +25,3 @@
#include <qpe/qpedialog.h>
+#include <qpe/qcopenvelope_qws.h>
@@ -74,2 +75,5 @@
+ cfg.setGroup("SyncMode");
+ int mode = cfg.readNumEntry("Mode",2); // Default to Sharp
+ syncModeCombo->setCurrentItem( mode - 1 );
@@ -134,2 +138,3 @@ void Security::accept()
QDialog::accept();
+ QCopEnvelope env("QPE/System", "securityChanged()" );
}
@@ -187,3 +192,3 @@ void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits)
-void Security::loadUsers ( void )
+void Security::loadUsers ( void )
{
@@ -191,6 +196,6 @@ void Security::loadUsers ( void )
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());
@@ -202,3 +207,3 @@ void Security::loadUsers ( void )
// Highlight this item if it is set to autologinToggle
- if ( *account.at(0) == autoLoginName)
+ if ( *account.at(0) == autoLoginName)
userlist->setCurrentItem(userlist->count()-1);
@@ -214,3 +219,3 @@ void Security::toggleAutoLogin(bool val)
userlist->setEnabled(val);
- if (!autoLogin)
+ if (!autoLogin)
autoLoginName=userlist->currentText();
@@ -257,2 +262,4 @@ 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
@@ -13,3 +13,3 @@
<y>0</y>
- <width>329</width>
+ <width>339</width>
<height>483</height>
@@ -383,2 +383,27 @@
</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>