summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/settings/security/security.cpp62
-rw-r--r--core/settings/security/security.h1
-rw-r--r--core/settings/security/securitybase.ui39
3 files changed, 42 insertions, 60 deletions
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index 34f7e50..4eddb55 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -43,24 +43,17 @@
cfg.setGroup("Sync");
int auth_peer = cfg.readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24
int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24);
selectNet(auth_peer,auth_peer_bits,TRUE);
connect(syncnet, SIGNAL(textChanged(const QString&)),
this, SLOT(setSyncNet(const QString&)));
- cfg.setGroup("Sync");
- QString sa = cfg.readEntry("syncapp","Qtopia");
- for (int i=0; i<syncapp->count(); i++) {
- if ( syncapp->text(i) == sa ) {
- syncapp->setCurrentItem(i);
- }
- }
/*
cfg.setGroup("Remote");
if ( telnetAvailable() )
telnet->setChecked(cfg.readEntry("allow_telnet"));
else
telnet->hide();
@@ -79,27 +72,34 @@
if (autoLoginName.stripWhiteSpace().isEmpty()) {
autoLogin=false;
} else {
autoLogin=true;
}
cfg.setGroup("SyncMode");
int mode = cfg.readNumEntry("Mode",2); // Default to Sharp
- syncModeCombo->setCurrentItem( mode - 1 );
+ switch( mode ) {
+ case 0x01:
+ syncModeCombo->setCurrentItem( 0 );
+ break;
+ case 0x02:
+ default:
+ syncModeCombo->setCurrentItem( 1 );
+ break;
+ case 0x04:
+ syncModeCombo->setCurrentItem( 2 );
+ break;
+ }
- //since nobody knows what this is and it doesn't do anything, i'll hide it # CoreDump
- // is this work-in-progress or can it be removed?
- syncModeCombo->hide();
connect(autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool)));
connect(userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int)));
connect(changepasscode,SIGNAL(clicked()), this, SLOT(changePassCode()));
connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode()));
- connect(syncapp,SIGNAL(activated(int)), this, SLOT(changeSyncApp()));
connect(restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults()));
connect(deleteentry,SIGNAL(clicked()), this, SLOT(deleteListEntry()));
loadUsers();
updateGUI();
dl = new QPEDialogListener(this);
QPEApplication::showDialog( this );
@@ -125,16 +125,17 @@ void Security::restoreDefaults()
unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel"));
unrecbox.setButtonText(QMessageBox::Yes, tr("Ok"));
if ( unrecbox.exec() == QMessageBox::Yes)
{
syncnet->clear();
insertDefaultRanges();
}
+ syncModeCombo->setCurrentItem( 2 );
}
void Security::insertDefaultRanges()
{
syncnet->insertItem( tr( "192.168.129.0/24" ) );
syncnet->insertItem( tr( "192.168.1.0/24" ) );
syncnet->insertItem( tr( "192.168.0.0/16" ) );
syncnet->insertItem( tr( "172.16.0.0/12" ) );
@@ -341,17 +342,34 @@ void Security::applySecurity()
//write back all other net ranges in *cleartext*
for (int i=0; i<10; i++) {
QString target;
target.sprintf("net%d", i);
cfg.writeEntry(target,syncnet->text(i));
}
- cfg.writeEntry("syncapp",syncapp->currentText());
+#ifdef ODP
+ #error "Use 0,1,2 and use Launcher"
+#endif
+ /* keep the old code so we don't use currentItem directly */
+ int value = 0x02;
+ switch( syncModeCombo->currentItem() ) {
+ case 0:
+ value = 0x01;
+ break;
+ case 1:
+ value = 0x02;
+ break;
+ case 2:
+ value = 0x04;
+ break;
+ }
+ cfg.setGroup("SyncMode");
+ cfg.writeEntry( "Mode", value );
/*
cfg.setGroup("Remote");
if ( telnetAvailable() )
cfg.writeEntry("allow_telnet",telnet->isChecked());
if ( sshAvailable() )
cfg.writeEntry("allow_ssh",ssh->isChecked());
// ### write ssh/telnet sys config files
@@ -364,33 +382,17 @@ void Security::applySecurity()
if (autoLogin) {
loginCfg.writeEntry("AutoLogin",autoLoginName);
} else {
loginCfg.removeEntry("AutoLogin");
}
}
}
-void Security::changeSyncApp()
-{
- // Don't say i didn't tell ya
- if (syncapp->currentText() == "IntelliSync") {
- QMessageBox attn(
- tr("WARNING"),
- tr("<p>Selecting IntelliSync here will disable the FTP password."
- "<p>Every machine in your netrange will be able to sync with "
- "your Zaurus!"),
- QMessageBox::Warning,
- QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
- 0, QString::null, TRUE, WStyle_StaysOnTop);
- attn.setButtonText(QMessageBox::Cancel, tr("Ok"));
- attn.exec();
- }
- updateGUI();
-}
+
void Security::changeLoginName( int idx )
{
autoLoginName = userlist->text(idx);;
updateGUI();
}
diff --git a/core/settings/security/security.h b/core/settings/security/security.h
index 72aa352..ed25ce1 100644
--- a/core/settings/security/security.h
+++ b/core/settings/security/security.h
@@ -41,17 +41,16 @@ protected:
void done(int);
private slots:
void changePassCode();
void clearPassCode();
void setSyncNet(const QString&);
void changeLoginName(int);
void toggleAutoLogin(bool);
- void changeSyncApp();
void restoreDefaults();
void insertDefaultRanges();
void deleteListEntry();
private:
void loadUsers(void);
bool telnetAvailable() const;
bool sshAvailable() const;
diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui
index 1769ae1..dcf1d6b 100644
--- a/core/settings/security/securitybase.ui
+++ b/core/settings/security/securitybase.ui
@@ -6,17 +6,17 @@
<name>name</name>
<cstring>SecurityBase</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>309</width>
+ <width>327</width>
<height>483</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Security Settings</string>
</property>
<property>
@@ -461,62 +461,43 @@ Beware that all manually entered net ranges will be lost!</string>
<string>Select your sync software</string>
</property>
</widget>
<widget>
<class>QComboBox</class>
<item>
<property>
<name>text</name>
- <string>QTopia</string>
- </property>
- </item>
- <item>
- <property>
- <name>text</name>
- <string>IntelliSync</string>
- </property>
- </item>
- <property stdset="1">
- <name>name</name>
- <cstring>syncapp</cstring>
- </property>
- <property>
- <name>whatsThis</name>
- <string>This option changes the login behaviour of the internal FTP server.
-
-If you have problems syncing, try the "IntelliSync" setting, which will accept any password you throw at the sync (FTP) port.
-
-The default is Qtopia. It will let you log in with username "root" and password "Qtopia". The password is CaSeSeNsItIvE.</string>
- </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>
+ <string>IntelliSync</string>
</property>
</item>
<property stdset="1">
<name>name</name>
<cstring>syncModeCombo</cstring>
</property>
+ <property>
+ <name>whatsThis</name>
+ <string>Alter the Sync Protocol to tweak for the different devices.
+ IntelliSync will disable the password check but you'll be prompted to accept the connection.
+ Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
+ Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
+ </string>
+ </property>
</widget>
</vbox>
</widget>
</grid>
</widget>
</widget>
</vbox>
</widget>