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 --- diff --git a/core/apps/.cvsignore b/core/apps/.cvsignore index faa68ae..6d678c6 100644 --- a/core/apps/.cvsignore +++ b/core/apps/.cvsignore @@ -1,2 +1 @@ -binconfig.in config.in diff --git a/core/apps/embeddedkonsole/MyPty.cpp b/core/apps/embeddedkonsole/MyPty.cpp index 9adc248..7e820ad 100644 --- a/core/apps/embeddedkonsole/MyPty.cpp +++ b/core/apps/embeddedkonsole/MyPty.cpp @@ -163,7 +163,8 @@ int MyPty::run(const char* cmd, QStrList &, const char*, int) ttmode.c_cc[VINTR] = 3; ttmode.c_cc[VERASE] = 8; tcsetattr( STDIN_FILENO, TCSANOW, &ttmode ); - setenv("TERM","vt100",1); + if(strlen(getenv("TERM"))<=0) + setenv("TERM","vt100",1); setenv("COLORTERM","0",1); if (getuid() == 0) { diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp index 48da7c6..531dbff 100644 --- a/core/apps/helpbrowser/helpbrowser.cpp +++ b/core/apps/helpbrowser/helpbrowser.cpp @@ -1,7 +1,7 @@ -#/********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +/********************************************************************** +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the 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 @@ -18,10 +18,14 @@ ** **********************************************************************/ +#define QTOPIA_INTERNAL_LANGLIST + #include "helpbrowser.h" #include #include +#include +#include #include #include @@ -30,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -48,8 +53,9 @@ #include #include -#include +#include +#include "magictextbrowser.h" HelpBrowser::HelpBrowser( QWidget* parent, const char *name, WFlags f ) : QMainWindow( parent, name, f ), @@ -58,11 +64,14 @@ HelpBrowser::HelpBrowser( QWidget* parent, const char *name, WFlags f ) init( "index.html" ); } + + void HelpBrowser::init( const QString& _home ) { - setIcon( Resource::loadPixmap( "help_icon" ) ); + setIcon( Resource::loadPixmap( "HelpBrowser" ) ); + setBackgroundMode( PaletteButton ); - browser = new QTextBrowser( this ); + browser = new MagicTextBrowser( this ); browser->setFrameStyle( QFrame::Panel | QFrame::Sunken ); connect( browser, SIGNAL( textChanged() ), this, SLOT( textChanged() ) ); @@ -80,12 +89,12 @@ void HelpBrowser::init( const QString& _home ) toolbar = new QPEToolBar( this ); // addToolBar( toolbar, "Toolbar"); - //QPopupMenu* go = new QPopupMenu( this ); + QPopupMenu* go = new QPopupMenu( this ); backAction = new QAction( tr( "Backward" ), Resource::loadIconSet( "back" ), QString::null, 0, this, 0 ); connect( backAction, SIGNAL( activated() ), browser, SLOT( backward() ) ); connect( browser, SIGNAL( backwardAvailable( bool ) ), backAction, SLOT( setEnabled( bool ) ) ); - //backAction->addTo( go ); + backAction->addTo( go ); backAction->addTo( toolbar ); backAction->setEnabled( FALSE ); @@ -93,14 +102,13 @@ void HelpBrowser::init( const QString& _home ) connect( forwardAction, SIGNAL( activated() ), browser, SLOT( forward() ) ); connect( browser, SIGNAL( forwardAvailable( bool ) ), forwardAction, SLOT( setEnabled( bool ) ) ); - //forwardAction->addTo( go ); + forwardAction->addTo( go ); forwardAction->addTo( toolbar ); forwardAction->setEnabled( FALSE ); - QAction *a = new QAction( tr( "Home" ), Resource::loadPixmap( -"home" ), QString::null, 0, this, 0 ); + QAction *a = new QAction( tr( "Home" ), Resource::loadIconSet( "home" ), QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), browser, SLOT( home() ) ); - //a->addTo( go ); + a->addTo( go ); a->addTo( toolbar ); bookm = new QPopupMenu( this ); @@ -112,11 +120,18 @@ void HelpBrowser::init( const QString& _home ) readBookmarks(); - //menu->insertItem( tr("Go"), go ); + menu->insertItem( tr("Go"), go ); menu->insertItem( tr( "Bookmarks" ), bookm ); resize( 240, 300 ); browser->setFocus(); + browser->setFrameStyle( QFrame::NoFrame ); + +#if !defined(QT_NO_COP) + QCopChannel *addressChannel = new QCopChannel("QPE/HelpBrowser" , this ); + connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)), + this, SLOT ( appMessage(const QCString &, const QByteArray &) ) ); +#endif connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)), this, SLOT(appMessage(const QCString&, const QByteArray&)) ); @@ -124,11 +139,18 @@ void HelpBrowser::init( const QString& _home ) void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data) { + qDebug("reached appMessage"); if ( msg == "showFile(QString)" ) { QDataStream ds(data,IO_ReadOnly); QString fn; ds >> fn; setDocument( fn ); + + QPEApplication::setKeepRunning(); + + showMaximized(); + setActiveWindow(); + raise(); } } diff --git a/core/apps/helpbrowser/helpbrowser.h b/core/apps/helpbrowser/helpbrowser.h index 2f7153a..5f7e6b6 100644 --- a/core/apps/helpbrowser/helpbrowser.h +++ b/core/apps/helpbrowser/helpbrowser.h @@ -1,7 +1,7 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the 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 diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro index 6bb43bd..3525b7e 100644 --- a/core/apps/helpbrowser/helpbrowser.pro +++ b/core/apps/helpbrowser/helpbrowser.pro @@ -1,8 +1,8 @@ TEMPLATE = app CONFIG = qt warn_on release DESTDIR = $(OPIEDIR)/bin -HEADERS = helpbrowser.h -SOURCES = helpbrowser.cpp \ +HEADERS = helpbrowser.h magictextbrowser.h +SOURCES = helpbrowser.cpp magictextbrowser.cpp \ main.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include diff --git a/core/apps/helpbrowser/magictextbrowser.cpp b/core/apps/helpbrowser/magictextbrowser.cpp new file mode 100644 index 0000000..8ce0325 --- a/dev/null +++ b/core/apps/helpbrowser/magictextbrowser.cpp @@ -0,0 +1,99 @@ +#include +#include +#include +#include + +/* need to get Global::helpPath() */ +#define QTOPIA_INTERNAL_LANGLIST + +#include +#include +#include + +#include "magictextbrowser.h" + + + +MagicTextBrowser::MagicTextBrowser(QWidget* parent) : + QTextBrowser(parent){ +} + +void MagicTextBrowser::setSource( const QString& source ) { + QTextBrowser::setSource(source); + if ( magicQpe(source,"applications") || magicQpe(source,"games") || magicQpe(source,"settings") || magicQpe(source, "1Pim") ) // No tr + return; + if ( magicOpe(source, "applets") || magicOpe(source, "input") ) + return; + // Just those are magic (for now). Could do CGI here, + // or in Qtopia's mime source factory. +} + +bool MagicTextBrowser::magicQpe(const QString& source, const QString& name) { + if ( name+".html" == source || "help/"+name+".html" == source) { + QString fn = mimeSourceFactory()->makeAbsolute( source, context() ); + const QMimeSource* m = mimeSourceFactory()->data( fn, context() ); + if ( m ) { + QString txt; + if ( QTextDrag::decode(m,txt) ) { + QRegExp re(".*"); + int start,len; + if ( (start=re.match(txt,0,&len))>=0 ) { + QString generated = generateQpe(name); + txt.replace(start,len,generated); + setText(txt); + return true; + } + } + } + } + return false; +} +bool MagicTextBrowser::magicOpe( const QString& source, const QString& name ) { + if ( name+".html" != source && "help/"+name+".html" != source) return false; + + QString fn = mimeSourceFactory()->makeAbsolute( source, context() ); + const QMimeSource* m = mimeSourceFactory()->data(fn, context() ); + if (!m) return false; + + QString txt; + if ( !QTextDrag::decode(m, txt ) ) return false; + + QRegExp re(".*"); + int start,len; + if ( (start=re.match(txt,0,&len))>=0 ) { + QString generated = generateOpe(name); + txt.replace(start,len,generated); + setText(txt); + return true; + } + return false; +} +QString MagicTextBrowser::generateOpe(const QString& name)const { + if ( name == QString::fromLatin1("applets") ) { + return QString::fromLatin1("

No Applets found

"); + }else if ( name == QString::fromLatin1("input") ) { + return QString::fromLatin1("

No input methods available

"); + }else + return QString::null; +} + +QString MagicTextBrowser::generateQpe(const QString& name) const { + QString dir = MimeType::appsFolderName()+"/"+name[0].upper()+name.mid(1); + AppLnkSet lnkset(dir); + AppLnk* lnk; + QString r; + for (QListIterator it(lnkset.children()); (lnk=it.current()); ++it) { + QString name = lnk->name(); + QString icon = lnk->icon(); + QString helpFile = lnk->exec()+".html"; + QStringList helpPath = Global::helpPath(); + bool helpExists = FALSE; + for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) + helpExists = QFile::exists( *it + "/" + helpFile ); + + if ( helpExists ) { + r += "

"+name+"

\n"; + } + } + return r; +} diff --git a/core/apps/helpbrowser/magictextbrowser.h b/core/apps/helpbrowser/magictextbrowser.h new file mode 100644 index 0000000..ff91e68 --- a/dev/null +++ b/core/apps/helpbrowser/magictextbrowser.h @@ -0,0 +1,42 @@ +/********************************************************************** +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. +** Copyright (C) 2003 zecke +** +** This file is part of the 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. +** +**********************************************************************/ +#ifndef HELP_BROWSER_MAGIC_TEXT_BROWSER_H +#define HELP_BROWSER_MAGIC_TEXT_BROWSER_H + +#include + +class MagicTextBrowser : public QTextBrowser { +public: + MagicTextBrowser(QWidget* parent); + + void setSource( const QString& source ); + + /** honor QPE Attributes */ + bool magicQpe(const QString& source, const QString& name); + /** honor OPIE Attributes */ + bool magicOpe(const QString& source, const QString& name ); +private: + + QString generateQpe(const QString& name) const; + QString generateOpe(const QString& name) const; +}; + +#endif diff --git a/core/apps/helpbrowser/main.cpp b/core/apps/helpbrowser/main.cpp index 1cb10b7..b1bea56 100644 --- a/core/apps/helpbrowser/main.cpp +++ b/core/apps/helpbrowser/main.cpp @@ -1,7 +1,7 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the 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 @@ -20,15 +20,14 @@ #include "helpbrowser.h" -#include +#include int main( int argc, char ** argv ) { QPEApplication a( argc, argv ); HelpBrowser mw; - mw.setCaption( HelpBrowser::tr("HelpBrowser") ); - a.showMainDocumentWidget( &mw ); + a.showMainWidget( &mw ); return a.exec(); } diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 6f96574..1c95a97 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -569,7 +569,6 @@ void TextEdit::fileNew() { void TextEdit::fileOpen() { Config cfg("TextEdit"); cfg. setGroup ( "View" ); - QString dir = cfg.readEntry("LastOpenDirectory", QPEApplication::documentDir()); QMap map; map.insert(tr("All"), QStringList() ); QStringList text; @@ -578,11 +577,10 @@ void TextEdit::fileOpen() { text << "*"; map.insert(tr("All"), text ); QString str = OFileDialog::getOpenFileName( 2, - dir , + QString::null , QString::null, map); if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() ) { - cfg.writeEntry("LastOpenDirectory", QFileInfo(str).dirPath(false)); openFile( str ); } else @@ -976,7 +974,7 @@ void TextEdit::updateCaption( const QString &name ) { } // if(s.left(1) == "/") // s = s.right(s.length()-1); - setCaption( s + " - " + tr("Text Editor") ); + setCaption( tr("%1 - Text Editor").arg( s ) ); } } @@ -1022,7 +1020,7 @@ void TextEdit::editDelete() { switch ( QMessageBox::warning(this,tr("Text Editor"), tr("Do you really want
to delete " "the current file\nfrom the disk?
This is " - "irreversable!!"), + "irreversable!"), tr("Yes"),tr("No"),0,0,1) ) { case 0: if(doc) { diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index d95a59b..7dcb5f6 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp @@ -54,6 +54,7 @@ #include #include #include +#include #include "loginapplication.h" #include "loginwindowimpl.h" @@ -74,6 +75,7 @@ static struct option long_options [] = { int main ( int argc, char **argv ) { + int userExited = 0; pid_t ppid = ::getpid ( ); if ( ::geteuid ( ) != 0 ) { @@ -137,11 +139,17 @@ int main ( int argc, char **argv ) } } int killedbysig = 0; + userExited=0; + if (WIFEXITED(status)!=0 ) { + if (WEXITSTATUS(status)==137) { + userExited=1; + } + } if ( WIFSIGNALED( status )) { switch ( WTERMSIG( status )) { - case SIGINT : case SIGTERM: + case SIGINT : case SIGKILL: break; @@ -162,7 +170,7 @@ int main ( int argc, char **argv ) const char *sig = ::strsignal ( killedbysig ); QLabel *l = new QLabel ( 0, "sig", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool ); - l-> setText ( LoginWindowImpl::tr( "OPIE was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig )); + l-> setText ( LoginWindowImpl::tr( "Opie was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig )); l-> setAlignment ( Qt::AlignCenter ); l-> move ( 0, 0 ); l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( )); @@ -175,7 +183,8 @@ int main ( int argc, char **argv ) } else { if ( !autolog ) { - Config cfg ( "opie-login" ); + QString confFile=QPEApplication::qpeDir() + "/etc/opie-login.conf"; + Config cfg ( confFile, Config::File ); cfg. setGroup ( "General" ); QString user = cfg. readEntry ( "AutoLogin" ); @@ -183,16 +192,23 @@ int main ( int argc, char **argv ) autolog = ::strdup ( user. latin1 ( )); } - if ( autolog ) { - LoginApplication::setLoginAs ( autolog ); + if ( autolog && !userExited ) { + + QWSServer::setDesktopBackground( QImage() ); + ODevice::inst ( )-> setDisplayStatus ( true ); + ODevice::inst ( )-> setSoftSuspend ( false ); + LoginApplication *app = new LoginApplication ( argc, argv, ppid ); + LoginApplication::setLoginAs ( autolog ); + if ( LoginApplication::changeIdentity ( )) ::exit ( LoginApplication::login ( )); else ::exit ( 0 ); } - else + else { ::exit ( login_main ( argc, argv, ppid )); + } } } return 0; @@ -355,7 +371,7 @@ int login_main ( int argc, char **argv, pid_t ppid ) // if login succeeds, it never comes back - QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not start OPIE." )); + QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not start Opie." )); rc = 1; } else { diff --git a/core/opie-login/opie-login.conffiles b/core/opie-login/opie-login.conffiles new file mode 100644 index 0000000..90645ee --- a/dev/null +++ b/core/opie-login/opie-login.conffiles @@ -0,0 +1 @@ +/opt/QtPalmtop/etc/opie-login.conf diff --git a/core/opiealarm/Makefile b/core/opiealarm/Makefile index 0c8467e..255083d 100644 --- a/core/opiealarm/Makefile +++ b/core/opiealarm/Makefile @@ -20,7 +20,3 @@ $(DESTDIR)/opiealarm: opiealarm.c clean: -rm -f *~ core -install: - cp $(DESTDIR)/opiealarm $(INSTALL_ROOT)/opt/QtPalmtop/bin - chown root $(INSTALL_ROOT)/opt/QtPalmtop/bin/opiealarm - chmod u+s $(INSTALL_ROOT)/opt/QtPalmtop/bin/opiealarm 2>/dev/null || echo -e "\nopiealarm must be owned by root to work correctly.\n" diff --git a/core/opiealarm/config.in b/core/opiealarm/config.in index 2be9bd4..f86d01c 100644 --- a/core/opiealarm/config.in +++ b/core/opiealarm/config.in @@ -1,4 +1,4 @@ config OPIEALARM - boolean "opie-opiealarm (Alarm daemon, sets RTC with wakeup time on suspend)" + boolean "Opiealarm (Alarm daemon, sets RTC with wakeup time on suspend)" depends ! TARGET_X86 default "y" diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c index 998cabd..90a743f 100644 --- a/core/opiealarm/opiealarm.c +++ b/core/opiealarm/opiealarm.c @@ -93,6 +93,7 @@ int fork_with_pidfile ( void ) perror ( "forking failed" ); return 0; } + // sleep( 60 ); // child process needs to react to SIGUSR2. This is sent when // a new opiealarm process is started. @@ -206,7 +207,7 @@ int main ( int argc, char **argv ) int suspend ( int fix_rtc ) { - FILE *fp; + FILE *fp = NULL; char buf [64]; time_t alrt, syst, rtct; struct tm alr, sys, rtc; @@ -258,7 +259,7 @@ int suspend ( int fix_rtc ) break; // ( 1, TIMEFILE ); fclose ( fp ); - fp = 0; + fp = NULL; alrt = atoi ( buf ); // get the alarm time @@ -371,7 +372,7 @@ int resume ( int resuspend ) remove_pidfile ( ); - // no need for system() since this process is no longer usefull anyway + // no need for system() since this process is no longer usefull anyway execv ( "/opt/QtPalmtop/bin/qcop", argv ); perror ( "exec for qcop failed" ); 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