summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/security/multiauthconfig.cpp16
-rw-r--r--core/settings/security/security.cpp18
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
@@ -495,141 +495,141 @@ void MultiauthConfig::loadPlugins() {
pluginList.append( plugin );
}
} else {
delete lib;
}
} // end for
// put m_allPlugins tempPlugin objects into pluginList
if ( !m_allPlugins.isEmpty() ) {
MultiauthPlugin tempPlugin;
QStringList::Iterator stringit;
for( stringit = m_allPlugins.begin(); stringit != m_allPlugins.end(); ++stringit ) {
tempPlugin = ( sortList.find( *stringit ) ).data();
if ( !( (tempPlugin.name).isEmpty() ) ) {
pluginList.append( tempPlugin );
}
}
}
}
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);
}
void MultiauthConfig::selectNet(int auth_peer,int auth_peer_bits, bool update)
{
QString sn;
if ( auth_peer_bits == 0 && auth_peer == 0 ) {
sn = tr("Any");
} else if ( auth_peer_bits == 32 && auth_peer == 0 ) {
sn = tr("None");
} else {
sn =
QString::number((auth_peer>>24)&0xff) + "."
+ QString::number((auth_peer>>16)&0xff) + "."
+ 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
m_syncWidget->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<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;
}
}
}
}
}
for (int i=0; i<m_syncWidget->syncnet->count(); i++) {
if ( m_syncWidget->syncnet->text(i).left(sn.length()) == sn ) {
m_syncWidget->syncnet->setCurrentItem(i);
return;
}
}
odebug << "No match for \"" << sn << "\"" << oendl;
}
void MultiauthConfig::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits)
{
auth_peer=0;
if ( sn == tr("Any") ) {
auth_peer = 0;
auth_peer_bits = 0;
} else if ( sn == tr("None") ) {
auth_peer = 0;
auth_peer_bits = 32;
} else {
int x=0;
for (int i=0; i<4; i++) {
int nx = sn.find(QChar(i==3 ? '/' : '.'),x);
auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt();
x = nx+1;
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
@@ -95,87 +95,87 @@ using namespace Opie::Core;
syncModeCombo->setCurrentItem( 2 );
break;
}
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(restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults()));
connect(deleteentry,SIGNAL(clicked()), this, SLOT(deleteListEntry()));
loadUsers();
updateGUI();
dl = new QPEDialogListener(this);
QPEApplication::showDialog( this );
}
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."),
+ "<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();
changepasscode->setText( empty ? tr("Set passcode" )
: tr("Change passcode" ) );
passcode_poweron->setEnabled( !empty );
clearpasscode->setEnabled( !empty );
autologinToggle->setChecked(autoLogin);
userlist->setEnabled(autoLogin);
}
void Security::show()
{
//valid=FALSE;
setEnabled(FALSE);
SecurityBase::show();
if ( passcode.isEmpty() ) {
// could insist...
//changePassCode();
//if ( passcode.isEmpty() )
//reject();
} else {
if (!valid) // security passcode was not asked yet, so ask now
{
QString pc = enterPassCode(tr("Enter passcode"));
@@ -194,90 +194,90 @@ void Security::show()
void Security::accept()
{
applySecurity();
QDialog::accept();
QCopEnvelope env("QPE/System", "securityChanged()" );
}
void Security::done(int r)
{
QDialog::done(r);
close();
}
void Security::selectNet(int auth_peer,int auth_peer_bits, bool update)
{
QString sn;
if ( auth_peer_bits == 0 && auth_peer == 0 ) {
sn = tr("Any");
} else if ( auth_peer_bits == 32 && auth_peer == 0 ) {
sn = tr("None");
} else {
sn =
QString::number((auth_peer>>24)&0xff) + "."
+ QString::number((auth_peer>>16)&0xff) + "."
+ 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();
} 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 ) );
+ syncnet->insertItem( netrange );
} else {
already_there=FALSE;
}
}
}
}
}
for (int i=0; i<syncnet->count(); i++) {
if ( syncnet->text(i).left(sn.length()) == sn ) {
syncnet->setCurrentItem(i);
return;
}
}
odebug << "No match for \"" << sn << "\"" << oendl;
}
void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits)
{
auth_peer=0;
if ( sn == tr("Any") ) {
auth_peer = 0;
auth_peer_bits = 0;
} else if ( sn == tr("None") ) {
auth_peer = 0;
auth_peer_bits = 32;
} else {
int x=0;
for (int i=0; i<4; i++) {
int nx = sn.find(QChar(i==3 ? '/' : '.'),x);
auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt();
x = nx+1;