From 1ab4ca95e4d2cf24d32b38c9031cb6076351e730 Mon Sep 17 00:00:00 2001 From: kergoth Date: Sat, 09 Aug 2003 17:42:14 +0000 Subject: Merge from BRANCH_1_0 --- (limited to 'core/settings') diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index 5f68010..de99a09 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp @@ -91,9 +91,9 @@ public: calculateGrid ( Bottom ); - new SampleItem ( this, tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" )); - new SampleItem ( this, tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" )); - new SampleItem ( this, tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" )); + new SampleItem ( this, QObject::tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" )); + new SampleItem ( this, QObject::tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" )); + new SampleItem ( this, QObject::tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" )); setBackgroundType ( TabConfig::Ruled, QString::null ); diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index 4701506..75a181b 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp @@ -1,24 +1,25 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. -** -** This file is part of Qtopia Environment. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact info@trolltech.com if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ + ** Copyright (C) 2000 Trolltech AS. All rights reserved. + ** + ** This file is part of Qtopia Environment. + ** + ** This file may be distributed and/or modified under the terms of the + ** GNU General Public License version 2 as published by the Free Software + ** Foundation and appearing in the file LICENSE.GPL included in the + ** packaging of this file. + ** + ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + ** + ** See http://www.trolltech.com/gpl/ for GPL licensing information. + ** + ** Contact info@trolltech.com if any conditions of this licensing are + ** not clear to you. + ** + **********************************************************************/ #include "security.h" +#include #include #include #include @@ -27,9 +28,12 @@ #include #include #include +#include +#include +#include -Security::Security( QWidget* parent, const char* name, WFlags fl ) - : SecurityBase( parent, name, TRUE, fl ) + Security::Security( QWidget* parent, const char* name, WFlags fl ) +: SecurityBase( parent, name, TRUE, fl ) { valid=FALSE; Config cfg("Security"); @@ -41,23 +45,40 @@ Security::Security( QWidget* parent, const char* name, WFlags fl ) int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24); selectNet(auth_peer,auth_peer_bits); connect(syncnet, SIGNAL(textChanged(const QString&)), - this, SLOT(setSyncNet(const QString&))); + this, SLOT(setSyncNet(const QString&))); /* - cfg.setGroup("Remote"); - if ( telnetAvailable() ) - telnet->setChecked(cfg.readEntry("allow_telnet")); - else - telnet->hide(); - - if ( sshAvailable() ) - ssh->setChecked(cfg.readEntry("allow_ssh")); - else - ssh->hide(); - */ + cfg.setGroup("Remote"); + if ( telnetAvailable() ) + telnet->setChecked(cfg.readEntry("allow_telnet")); + else + telnet->hide(); + if ( sshAvailable() ) + ssh->setChecked(cfg.readEntry("allow_ssh")); + else + ssh->hide(); + */ + + QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; + Config loginCfg(configFile,Config::File); + + loginCfg.setGroup("General"); + autoLoginName=loginCfg.readEntry("AutoLogin",""); + + if (autoLoginName.stripWhiteSpace().isEmpty()) { + autoLogin=false; + } else { + autoLogin=true; + } + + + 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())); + + loadUsers(); updateGUI(); dl = new QPEDialogListener(this); @@ -74,9 +95,13 @@ void Security::updateGUI() bool empty = passcode.isEmpty(); changepasscode->setText( empty ? tr("Set passcode" ) - : tr("Change passcode" ) ); + : tr("Change passcode" ) ); passcode_poweron->setEnabled( !empty ); clearpasscode->setEnabled( !empty ); + + autologinToggle->setChecked(autoLogin); + userlist->setEnabled(autoLogin); + } @@ -86,18 +111,18 @@ void Security::show() setEnabled(FALSE); SecurityBase::show(); if ( passcode.isEmpty() ) { - // could insist... - //changePassCode(); - //if ( passcode.isEmpty() ) - //reject(); + // could insist... + //changePassCode(); + //if ( passcode.isEmpty() ) + //reject(); } else { - QString pc = enterPassCode(tr("Enter passcode")); - if ( pc != passcode ) { - QMessageBox::critical(this, tr("Passcode incorrect"), - tr("The passcode entered is incorrect.\nAccess denied")); - reject(); - return; - } + QString pc = enterPassCode(tr("Enter passcode")); + if ( pc != passcode ) { + QMessageBox::critical(this, tr("Passcode incorrect"), + tr("The passcode entered is incorrect.\nAccess denied")); + reject(); + return; + } } setEnabled(TRUE); valid=TRUE; @@ -119,22 +144,22 @@ void Security::selectNet(int auth_peer,int auth_peer_bits) { QString sn; if ( auth_peer_bits == 0 && auth_peer == 0 ) { - sn = tr("Any"); + sn = tr("Any"); } else if ( auth_peer_bits == 32 && auth_peer == 0 ) { - sn = tr("None"); + 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); + 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); } for (int i=0; icount(); i++) { - if ( syncnet->text(i).left(sn.length()) == sn ) { - syncnet->setCurrentItem(i); - return; - } + if ( syncnet->text(i).left(sn.length()) == sn ) { + syncnet->setCurrentItem(i); + return; + } } qDebug("No match for \"%s\"",sn.latin1()); } @@ -143,23 +168,53 @@ 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; + auth_peer = 0; + auth_peer_bits = 0; } else if ( sn == tr("None") ) { - auth_peer = 0; - auth_peer_bits = 32; + 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; - } - uint n = (uint)sn.find(' ',x)-x; - auth_peer_bits = sn.mid(x,n).toInt(); + 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; + } + uint n = (uint)sn.find(' ',x)-x; + auth_peer_bits = sn.mid(x,n).toInt(); } } +void Security::loadUsers ( void ) +{ + QFile passwd("/etc/passwd"); + if ( passwd.open(IO_ReadOnly) ) { + QTextStream t( &passwd ); + QString s; + QStringList account; + while ( !t.eof() ) { + account = QStringList::split(':',t.readLine()); + + // Hide disabled accounts + if (*account.at(1)!="*") { + + userlist->insertItem(*account.at(0)); + // Highlight this item if it is set to autologinToggle + if ( *account.at(0) == autoLoginName) + userlist->setCurrentItem(userlist->count()-1); + } + } + passwd.close(); + } + +} +void Security::toggleAutoLogin(bool val) +{ + autoLogin=val; + userlist->setEnabled(val); + if (!autoLogin) + autoLoginName=userlist->currentText(); +} void Security::setSyncNet(const QString& sn) { int auth_peer,auth_peer_bits; @@ -170,40 +225,57 @@ void Security::setSyncNet(const QString& sn) void Security::applySecurity() { if ( valid ) { - Config cfg("Security"); - cfg.setGroup("Passcode"); - cfg.writeEntry("passcode",passcode); - cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked()); - cfg.setGroup("Sync"); - int auth_peer=0; - int auth_peer_bits; - QString sn = syncnet->currentText(); - parseNet(sn,auth_peer,auth_peer_bits); - cfg.writeEntry("auth_peer",auth_peer); - cfg.writeEntry("auth_peer_bits",auth_peer_bits); - /* - 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 - */ + Config cfg("Security"); + cfg.setGroup("Passcode"); + cfg.writeEntry("passcode",passcode); + cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked()); + cfg.setGroup("Sync"); + int auth_peer=0; + int auth_peer_bits; + QString sn = syncnet->currentText(); + parseNet(sn,auth_peer,auth_peer_bits); + cfg.writeEntry("auth_peer",auth_peer); + cfg.writeEntry("auth_peer_bits",auth_peer_bits); + /* + 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 + */ + + QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; + Config loginCfg(configFile,Config::File); + loginCfg.setGroup("General"); + + if (autoLogin) { + loginCfg.writeEntry("AutoLogin",autoLoginName); + } else { + loginCfg.removeEntry("AutoLogin"); + } + } } +void Security::changeLoginName( int idx ) +{ + autoLoginName = userlist->text(idx);; + updateGUI(); +} + void Security::changePassCode() { QString new1; QString new2; do { - new1 = enterPassCode(tr("Enter new passcode")); - if ( new1.isNull() ) - return; - new2 = enterPassCode(tr("Re-enter new passcode")); - if ( new2.isNull() ) - return; + new1 = enterPassCode(tr("Enter new passcode")); + if ( new1.isNull() ) + return; + new2 = enterPassCode(tr("Re-enter new passcode")); + if ( new2.isNull() ) + return; } while (new1 != new2); passcode = new1; diff --git a/core/settings/security/security.h b/core/settings/security/security.h index efc83a2..2f18f91 100644 --- a/core/settings/security/security.h +++ b/core/settings/security/security.h @@ -43,8 +43,12 @@ private slots: void changePassCode(); void clearPassCode(); void setSyncNet(const QString&); + void changeLoginName(int); + void toggleAutoLogin(bool); + private: + void loadUsers(void); bool telnetAvailable() const; bool sshAvailable() const; void updateGUI(); @@ -55,6 +59,8 @@ private: QString enterPassCode(const QString&); QString passcode; bool valid; + bool autoLogin; + QString autoLoginName; QPEDialogListener *dl; }; diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui index c2a8953..da25f39 100644 --- a/core/settings/security/securitybase.ui +++ b/core/settings/security/securitybase.ui @@ -11,8 +11,8 @@ 0 0 - 277 - 328 + 329 + 483 @@ -25,74 +25,250 @@ layoutSpacing - + margin - 3 + 0 spacing - 3 + 0 - - QLayoutWidget + + QTabWidget name - Layout1 + TabWidget2 - layoutSpacing + layoutMargin - - - margin - 0 - + + QWidget - spacing - -1 + name + tab - - QPushButton + + title + Passcode + + - name - changepasscode + margin + 6 - text - Change passcode + spacing + 6 - - - QPushButton + + QGroupBox + + name + GroupBox4 + + + title + Passcode + + + + margin + 11 + + + spacing + 6 + + + QLayoutWidget + + name + Layout1 + + + layoutSpacing + + + + margin + 0 + + + spacing + -1 + + + QPushButton + + name + changepasscode + + + text + Change passcode + + + + QPushButton + + name + clearpasscode + + + text + Clear passcode + + + + + + QCheckBox + + name + passcode_poweron + + + text + Require pass code at power-on + + + + QLabel + + name + TextLabel1 + + + sizePolicy + + 5 + 7 + + + + text + <P>Pass code protection provides a minimal level of protection from casual access to this device. + + + textFormat + RichText + + + alignment + AlignTop|AlignLeft + + + vAlign + + + + + + + name + Spacer3 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + + QWidget + + name + tab + + + title + Login + + - name - clearpasscode + margin + 6 - text - Clear passcode + spacing + 6 - - - - - QCheckBox - - name - passcode_poweron - - - text - Require pass code at power-on - - - - QTabWidget - - name - TabWidget2 - + + QGroupBox + + name + GroupBox3 + + + title + Login + + + + margin + 11 + + + spacing + 6 + + + QCheckBox + + name + autologinToggle + + + text + Login Automatically + + + + QComboBox + + name + userlist + + + + + + + name + Spacer2 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QWidget @@ -106,110 +282,131 @@ margin - 11 + 6 spacing 6 - QLabel + QGroupBox name - TextLabel1_2 + GroupBox2 - text - Accept sync from network: + title + Sync - - - QComboBox - - - text - 192.168.129.0/24 (default) - - - - - text - 192.168.1.0/24 - - - - - text - 192.168.0.0/16 - - - - - text - 172.16.0.0/12 - - - - - text - 10.0.0.0/8 - - - - - text - 1.0.0.0/8 + + + margin + 11 - - - - text - Any + + spacing + 6 - - - - text - None - - - + + QLabel + + name + TextLabel1_2 + + + text + Accept sync from network: + + + textFormat + RichText + + + + QComboBox + + + text + 192.168.129.0/24 (default) + + + + + text + 192.168.1.0/24 + + + + + text + 192.168.0.0/16 + + + + + text + 172.16.0.0/12 + + + + + text + 10.0.0.0/8 + + + + + text + 1.0.0.0/8 + + + + + text + Any + + + + + text + None + + + + name + syncnet + + + editable + true + + + + + + name - syncnet + Spacer1 - editable - true + orientation + Vertical - + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + - - QLabel - - name - TextLabel1 - - - sizePolicy - - 5 - 7 - - - - text - <P>Pass code protection provides a minimal level of protection from casual access to this device. - - - alignment - AlignTop|AlignLeft - - - vAlign - - - + -- cgit v0.9.0.2