summaryrefslogtreecommitdiff
path: root/core
authorzecke <zecke>2003-09-20 18:23:58 (UTC)
committer zecke <zecke>2003-09-20 18:23:58 (UTC)
commit2fbd2230957098e5601d9d5c4b04a4af220afbce (patch) (side-by-side diff)
treed187f0e8b61f97f36764591f6daa81d5bc2cda41 /core
parenta986ab57229fa7a0d039d320001dc48018951bf1 (diff)
downloadopie-2fbd2230957098e5601d9d5c4b04a4af220afbce.zip
opie-2fbd2230957098e5601d9d5c4b04a4af220afbce.tar.gz
opie-2fbd2230957098e5601d9d5c4b04a4af220afbce.tar.bz2
Thanks to treke for tweaking the ui file
Allow the user to set how the QCOP bridge should response Either in Qtopia1.7 mode or the one found prior including Opie1.0 or respond in both ways We still need to check what sync utilities can cope with 'both'
Diffstat (limited to 'core') (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
@@ -23,6 +23,7 @@
#include <qpe/config.h>
#include <qpe/password.h>
#include <qpe/qpedialog.h>
+#include <qpe/qcopenvelope_qws.h>
#include <qcheckbox.h>
#include <qpushbutton.h>
@@ -72,6 +73,9 @@
autoLogin=true;
}
+ 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)));
connect(userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int)));
@@ -132,6 +136,7 @@ void Security::accept()
{
applySecurity();
QDialog::accept();
+ QCopEnvelope env("QPE/System", "securityChanged()" );
}
void Security::done(int r)
@@ -185,14 +190,14 @@ 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());
// Hide disabled accounts
@@ -200,7 +205,7 @@ 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);
}
}
@@ -212,7 +217,7 @@ void Security::toggleAutoLogin(bool val)
{
autoLogin=val;
userlist->setEnabled(val);
- if (!autoLogin)
+ if (!autoLogin)
autoLoginName=userlist->currentText();
}
void Security::setSyncNet(const QString& sn)
@@ -255,6 +260,8 @@ void Security::applySecurity()
loginCfg.removeEntry("AutoLogin");
}
+ 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
@@ -11,7 +11,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>329</width>
+ <width>339</width>
<height>483</height>
</rect>
</property>
@@ -381,6 +381,31 @@
<bool>true</bool>
</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>
<spacer>