summaryrefslogtreecommitdiff
authorzecke <zecke>2004-02-21 13:08:34 (UTC)
committer zecke <zecke>2004-02-21 13:08:34 (UTC)
commitaa11789fc4d735a04fac09063851753d8a57027b (patch) (side-by-side diff)
tree45a4de1ff38a8a5df0838bc5ebb021e297d669d8
parent6155f1be5c19fc51a4929c9e173f9e5a24d193e6 (diff)
downloadopie-aa11789fc4d735a04fac09063851753d8a57027b.zip
opie-aa11789fc4d735a04fac09063851753d8a57027b.tar.gz
opie-aa11789fc4d735a04fac09063851753d8a57027b.tar.bz2
Yeah baby yeah remove IntelliSync support
and add it to the SyncMode... as it should have been done Keep compatible with the old ored meaning... Now we can have IntelliSync plain text transfer, ask for pw less on connect Opie 1.0 plain text transfer, need pw and allow for syncing Qtopia 1.7 base64 transter , need pw and allow for syncing
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
@@ -48,14 +48,7 @@
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");
@@ -84,17 +77,24 @@
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()));
@@ -130,6 +130,7 @@ void Security::restoreDefaults()
syncnet->clear();
insertDefaultRanges();
}
+ syncModeCombo->setCurrentItem( 2 );
}
void Security::insertDefaultRanges()
@@ -346,7 +347,24 @@ void Security::applySecurity()
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");
@@ -369,23 +387,7 @@ void Security::applySecurity()
}
}
-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();
-}
+
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
@@ -46,7 +46,6 @@ private slots:
void setSyncNet(const QString&);
void changeLoginName(int);
void toggleAutoLogin(bool);
- void changeSyncApp();
void restoreDefaults();
void insertDefaultRanges();
void deleteListEntry();
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
@@ -11,7 +11,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>309</width>
+ <width>327</width>
<height>483</height>
</rect>
</property>
@@ -466,33 +466,6 @@ Beware that all manually entered net ranges will be lost!</string>
<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>
@@ -505,13 +478,21 @@ The default is Qtopia. It will let you log in with username "root" and password
<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>