Diffstat (limited to 'core/settings/security/security.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | core/settings/security/security.cpp | 98 |
1 files changed, 93 insertions, 5 deletions
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index 1b90121..d7871b3 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp @@ -36,3 +36,3 @@ Security::Security( QWidget* parent, const char* name, WFlags fl ) -: SecurityBase( parent, name, TRUE, fl ) +: SecurityBase( parent, name, TRUE, WStyle_ContextHelp ) { @@ -46,3 +46,4 @@ int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24); - selectNet(auth_peer,auth_peer_bits); + selectNet(auth_peer,auth_peer_bits,TRUE); + connect(syncnet, SIGNAL(textChanged(const QString&)), @@ -53,3 +54,2 @@ - //There must be a better way to do that... for (int i=0; i<syncapp->count(); i++) { @@ -89,2 +89,6 @@ + //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))); @@ -94,2 +98,4 @@ connect(syncapp,SIGNAL(activated(int)), this, SLOT(changeSyncApp())); + connect(restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults())); + connect(deleteentry,SIGNAL(clicked()), this, SLOT(deleteListEntry())); @@ -106,2 +112,36 @@ Security::~Security() +void Security::deleteListEntry() +{ + syncnet->removeItem(syncnet->currentItem()); +} + +void Security::restoreDefaults() +{ + QMessageBox unrecbox( + tr("Attention"), + tr( "<p>All user-defined net ranges will be lost."), + QMessageBox::Warning, + QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton, + 0, QString::null, TRUE, WStyle_StaysOnTop); + unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel")); + unrecbox.setButtonText(QMessageBox::Yes, tr("Ok")); + + if ( unrecbox.exec() == QMessageBox::Yes) + { + syncnet->clear(); + insertDefaultRanges(); + } +} + +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" ) ); + syncnet->insertItem( tr( "10.0.0.0/8" ) ); + syncnet->insertItem( tr( "1.0.0.0/8" ) ); + syncnet->insertItem( tr( "Any" ) ); + syncnet->insertItem( tr( "None" ) ); +} @@ -160,3 +200,3 @@ void Security::done(int r) -void Security::selectNet(int auth_peer,int auth_peer_bits) +void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) { @@ -175,2 +215,40 @@ void Security::selectNet(int auth_peer,int auth_peer_bits) } + + //insert user-defined list of netranges upon start + if (update) { + //User selected/active netrange first + syncnet->insertItem( tr( sn ) ); + + Config cfg("Security"); + cfg.setGroup("Sync"); + + //set up defaults if needed, if someone manually deletes net0 he'll get a suprise hehe + QString test = cfg.readEntry("net0",""); + if (test.isEmpty()) { + insertDefaultRanges(); + } else { + // 10 ought to be enough for everybody... :) + // If you need more, don't forget to edit applySecurity() as well + bool already_there=FALSE; + for (int i=0; i<10; i++) { + QString target, netrange; + target.sprintf("net%d", i); + netrange = cfg.readEntry(target,""); + if (! netrange.isEmpty()){ + //make sure we have no "twin" entries + for (int i=0; i<syncnet->count(); i++) { + if ( syncnet->text(i) == netrange ) { + already_there=TRUE; + } + } + if (! already_there) { + syncnet->insertItem( tr( netrange ) ); + } else { + already_there=FALSE; + } + } + } + } + } + for (int i=0; i<syncnet->count(); i++) { @@ -244,3 +322,3 @@ void Security::setSyncNet(const QString& sn) parseNet(sn,auth_peer,auth_peer_bits); - selectNet(auth_peer,auth_peer_bits); + selectNet(auth_peer,auth_peer_bits,FALSE); } @@ -259,4 +337,14 @@ void Security::applySecurity() parseNet(sn,auth_peer,auth_peer_bits); + + //this is the *selected* (active) net range cfg.writeEntry("auth_peer",auth_peer); cfg.writeEntry("auth_peer_bits",auth_peer_bits); + + //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()); |