| -rw-r--r-- | core/settings/security/multiauthconfig.cpp | 16 | ||||
| -rw-r--r-- | core/settings/security/security.cpp | 18 |
2 files changed, 17 insertions, 17 deletions
diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp index 535352a..ff11e49 100644 --- a/core/settings/security/multiauthconfig.cpp +++ b/core/settings/security/multiauthconfig.cpp @@ -519,39 +519,39 @@ void MultiauthConfig::deleteListEntry() { m_syncWidget->syncnet->removeItem(m_syncWidget->syncnet->currentItem()); } void MultiauthConfig::restoreDefaults() { QMessageBox unrecbox( tr("Attention"), - tr( "<p>All user-defined net ranges will be lost."), + "<p>" + tr("All user-defined net ranges will be lost.") + "</p>", 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) { m_syncWidget->syncnet->clear(); insertDefaultRanges(); } m_syncWidget->syncModeCombo->setCurrentItem( 2 ); } void MultiauthConfig::insertDefaultRanges() { - m_syncWidget->syncnet->insertItem( tr( "192.168.129.0/24" ) ); - m_syncWidget->syncnet->insertItem( tr( "192.168.1.0/24" ) ); - m_syncWidget->syncnet->insertItem( tr( "192.168.0.0/16" ) ); - m_syncWidget->syncnet->insertItem( tr( "172.16.0.0/12" ) ); - m_syncWidget->syncnet->insertItem( tr( "10.0.0.0/8" ) ); - m_syncWidget->syncnet->insertItem( tr( "1.0.0.0/8" ) ); + m_syncWidget->syncnet->insertItem( "192.168.129.0/24" ); + m_syncWidget->syncnet->insertItem( "192.168.1.0/24" ); + m_syncWidget->syncnet->insertItem( "192.168.0.0/16" ); + m_syncWidget->syncnet->insertItem( "172.16.0.0/12" ); + m_syncWidget->syncnet->insertItem( "10.0.0.0/8" ); + m_syncWidget->syncnet->insertItem( "1.0.0.0/8" ); m_syncWidget->syncnet->insertItem( tr( "Any" ) ); m_syncWidget->syncnet->insertItem( tr( "None" ) ); } void MultiauthConfig::updateGUI() { m_loginWidget->autologinToggle->setChecked(autoLogin); m_loginWidget->userlist->setEnabled(autoLogin); @@ -595,17 +595,17 @@ void MultiauthConfig::selectNet(int auth_peer,int auth_peer_bits, bool update) if (! netrange.isEmpty()){ //make sure we have no "twin" entries for (int i=0; i<m_syncWidget->syncnet->count(); i++) { if ( m_syncWidget->syncnet->text(i) == netrange ) { already_there=TRUE; } } if (! already_there) { - m_syncWidget->syncnet->insertItem( tr( netrange ) ); + m_syncWidget->syncnet->insertItem( netrange ); } else { already_there=FALSE; } } } } } diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index b917aea..122dfae 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp @@ -119,39 +119,39 @@ void Security::deleteListEntry() { syncnet->removeItem(syncnet->currentItem()); } void Security::restoreDefaults() { QMessageBox unrecbox( tr("Attention"), - tr( "<p>All user-defined net ranges will be lost."), + "<p>" + tr("All user-defined net ranges will be lost.") + "</p>", 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(); } 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" ) ); - syncnet->insertItem( tr( "10.0.0.0/8" ) ); - syncnet->insertItem( tr( "1.0.0.0/8" ) ); + syncnet->insertItem( "192.168.129.0/24" ); + syncnet->insertItem( "192.168.1.0/24" ); + syncnet->insertItem( "192.168.0.0/16" ); + syncnet->insertItem( "172.16.0.0/12" ); + syncnet->insertItem( "10.0.0.0/8" ); + syncnet->insertItem( "1.0.0.0/8" ); syncnet->insertItem( tr( "Any" ) ); syncnet->insertItem( tr( "None" ) ); } void Security::updateGUI() { bool empty = passcode.isEmpty(); @@ -218,17 +218,17 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) + QString::number((auth_peer>>8)&0xff) + "." + QString::number((auth_peer>>0)&0xff) + "/" + QString::number(auth_peer_bits); } //insert user-defined list of netranges upon start if (update) { //User selected/active netrange first - syncnet->insertItem( tr( sn ) ); + syncnet->insertItem( 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(); @@ -243,17 +243,17 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) 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 ) ); + syncnet->insertItem( netrange ); } else { already_there=FALSE; } } } } } |