5 files changed, 135 insertions, 125 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index da21cef..e828595 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -1,477 +1,475 @@
 /*
-                             This file is part of the OPIE Project
+                     This file is part of the OPIE Project
               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
-             .=l.                                Dan Williams <drw@handhelds.org>
+      .=l.                                Dan Williams <drw@handhelds.org>
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This file is free software; you can
+_;:,   .>  :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
+.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
+  .i_,=:_.   -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
+..}^=.=    =    ;      Public License for more details.
-++=   -.     .`     .:
++=  -.   .`   .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
+:   = ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
+-.  .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
+ -_. . .  )=. =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+  --    :-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include <stdio.h>
 #include <opie2/ofiledialog.h>
+#include <opie2/oresource.h>
-#ifdef QWS
 #include <qpe/config.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 #include <qpe/storage.h>
-#endif
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdialog.h>
 #include <qfileinfo.h>
 #include <qgroupbox.h>
 #include <qmultilineedit.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include "datamgr.h"
 #include "destination.h"
 #include "instoptionsimpl.h"
 #include "installdlgimpl.h"
 #include "ipkg.h"
 #include "utils.h"
 #include "global.h"
 using namespace Opie::Ui;
 enum {
    MAXLINES = 100,
 };
 InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title )
    : QWidget( 0, 0, 0 )
 {
    setCaption( title );
    init( TRUE );
    pIpkg = 0;
    upgradePackages = false;
    dataMgr = dataManager;
    QString defaultDest = "root";
 #ifdef QWS
    Config cfg( "aqpkg" );
    cfg.setGroup( "settings" );
    defaultDest = cfg.readEntry( "dest", "root" );
    // Grab flags - Turn MAKE_LINKS on by default (if no flags found)
    flags = cfg.readNumEntry( "installFlags", 0 );
    infoLevel = cfg.readNumEntry( "infoLevel", 1 );
 #else
    flags = 0;
 #endif
    // Output text is read only
    output->setReadOnly( true );
 //    QFont f( "helvetica" );
 //    f.setPointSize( 10 );
 //    output->setFont( f );
    // setup destination data
    int defIndex = 0;
    int i;
    QListIterator<Destination> dit( dataMgr->getDestinationList() );
    for ( i = 0; dit.current(); ++dit, ++i )
    {
        destination->insertItem( dit.current()->getDestinationName() );
        if ( dit.current()->getDestinationName() == defaultDest )
            defIndex = i;
    }
    destination->setCurrentItem( defIndex );
    QListIterator<InstallData> it( packageList );
    // setup package data
    QString remove = tr( "Remove\n" );
    QString install = tr( "Install\n" );
    QString upgrade = tr( "Upgrade\n" );
    for ( ; it.current(); ++it )
    {
        InstallData *item = it.current();
        InstallData *newitem = new InstallData();
        newitem->option = item->option;
        newitem->packageName = item->packageName;
        newitem->destination = item->destination;
        newitem->recreateLinks = item->recreateLinks;
        packages.append( newitem );
        if ( item->option == "I" )
        {
            install.append( QString( "   %1\n" ).arg( item->packageName ) );
        }
        else if ( item->option == "D" )
        {
            remove.append( QString( "   %1\n" ).arg( item->packageName ) );
        }
        else if ( item->option == "U" || item->option == "R" )
        {
            QString type;
            if ( item->option == "R" )
                type = tr( "(ReInstall)" );
            else
                type = tr( "(Upgrade)" );
            upgrade.append( QString( "   %1 %2\n" ).arg( item->packageName ).arg( type ) );
        }
    }
    output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) );
    displayAvailableSpace( destination->currentText() );
 }
 InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title )
    : QWidget( 0, 0, 0 )
 {
    setCaption( title );
    init( FALSE );
    pIpkg = ipkg;
    output->setText( initialText );
 }
 InstallDlgImpl::~InstallDlgImpl()
 {
    if ( pIpkg )
        delete pIpkg;
 }
 void InstallDlgImpl :: init( bool displayextrainfo )
 {
    QGridLayout *layout = new QGridLayout( this );
    layout->setSpacing( 4 );
    layout->setMargin( 4 );
    if ( displayextrainfo )
    {
        QLabel *label = new QLabel( tr( "Destination" ), this );
        layout->addWidget( label, 0, 0 );
        destination = new QComboBox( FALSE, this );
        layout->addWidget( destination, 0, 1 );
        connect( destination, SIGNAL( highlighted(const QString&) ),
                this, SLOT( displayAvailableSpace(const QString&) ) );
        QLabel *label2 = new QLabel( tr( "Space Avail" ), this );
        layout->addWidget( label2, 1, 0 );
        txtAvailableSpace = new QLabel( "", this );
        layout->addWidget( txtAvailableSpace, 1, 1 );
    }
    else
    {
        destination = 0x0;
        txtAvailableSpace = 0x0;
    }
    QGroupBox *GroupBox2 = new QGroupBox( 0, Qt::Vertical, tr( "Output" ), this );
    GroupBox2->layout()->setSpacing( 0 );
    GroupBox2->layout()->setMargin( 4 );
    QVBoxLayout *GroupBox2Layout = new QVBoxLayout( GroupBox2->layout() );
    output = new QMultiLineEdit( GroupBox2 );
    GroupBox2Layout->addWidget( output );
    layout->addMultiCellWidget( GroupBox2, 2, 2, 0, 1 );
-    btnInstall = new QPushButton( Resource::loadPixmap( "aqpkg/apply" ), tr( "Start" ), this );
+    btnInstall = new QPushButton( Opie::Core::OResource::loadPixmap( "aqpkg/apply", Opie::Core::OResource::SmallIcon ), tr( "Start" ), this );
    layout->addWidget( btnInstall, 3, 0 );
    connect( btnInstall, SIGNAL( clicked() ), this, SLOT( installSelected() ) );
-    btnOptions = new QPushButton( Resource::loadPixmap( "SettingsIcon" ), tr( "Options" ), this );
+    btnOptions = new QPushButton( Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ), tr( "Options" ), this );
    layout->addWidget( btnOptions, 3, 1 );
    connect( btnOptions, SIGNAL( clicked() ), this, SLOT( optionsSelected() ) );
 }
 void InstallDlgImpl :: optionsSelected()
 {
    if ( btnOptions->text() == tr( "Options" ) )
    {
        InstallOptionsDlgImpl opt( flags, infoLevel, this, "Option", true );
        if ( opt.exec() == QDialog::Accepted )
        {
            // set options selected from dialog
            flags = opt.getFlags();
            infoLevel = opt.getInfoLevel();
 #ifdef QWS
            Config cfg( "aqpkg" );
            cfg.setGroup( "settings" );
            cfg.writeEntry( "installFlags", flags );
            cfg.writeEntry( "infoLevel", infoLevel );
 #endif
        }
    }
    else // Save output
    {
        QMap<QString, QStringList> map;
        map.insert( tr( "All" ), QStringList() );
        QStringList text;
        text << "text/*";
        map.insert(tr( "Text" ), text );
        text << "*";
        map.insert( tr( "All" ), text );
        QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
        if( !filename.isEmpty() )
        {
            QString currentFileName = QFileInfo( filename ).fileName();
            DocLnk doc;
            doc.setType( "text/plain" );
            doc.setFile( filename );
            doc.setName( currentFileName );
            FileManager fm;
            fm.saveFile( doc, output->text() );
        }
    }
 }
 void InstallDlgImpl :: installSelected()
 {
    if ( btnInstall->text() == tr( "Abort" ) )
    {
        if ( pIpkg )
        {
            displayText( tr( "\n**** User Clicked ABORT ***" ) );
            pIpkg->abort();
            displayText( tr( "**** Process Aborted ****" ) );
        }
        btnInstall->setText( tr( "Close" ) );
-        btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
+        btnInstall->setIconSet( Opie::Core::OResource::loadPixmap( "enter", Opie::Core::OResource::SmallIcon ) );
        return;
    }
    else if ( btnInstall->text() == tr( "Close" ) )
    {
        emit reloadData( this );
        return;
    }
    // Disable buttons
    btnOptions->setEnabled( false );
 //    btnInstall->setEnabled( false );
    btnInstall->setText( tr( "Abort" ) );
-    btnInstall->setIconSet( Resource::loadPixmap( "close" ) );
+    btnInstall->setIconSet( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) );
    if ( pIpkg )
    {
        output->setText( "" );
        connect( pIpkg, SIGNAL(outputText(const QString&)), this, SLOT(displayText(const QString&)));
        connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished()));
        pIpkg->runIpkg();
    }
    else
    {
        output->setText( "" );
        Destination *d = dataMgr->getDestination( destination->currentText() );
        QString dest = d->getDestinationName();
        QString destDir = d->getDestinationPath();
        int instFlags = flags;
        if ( d->linkToRoot() )
            instFlags |= MAKE_LINKS;
 #ifdef QWS
        // Save settings
        Config cfg( "aqpkg" );
        cfg.setGroup( "settings" );
        cfg.writeEntry( "dest", dest );
 #endif
        pIpkg = new Ipkg;
        connect( pIpkg, SIGNAL(outputText(const QString&)), this, SLOT(displayText(const QString&)));
        connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished()));
        firstPackage = TRUE;
        ipkgFinished();
        // First run through the remove list, then the install list then the upgrade list
 /*
        pIpkg->setOption( "remove" );
        QListIterator<InstallData> it( removeList );
        InstallData *idata;
        for ( ; it.current(); ++it )
        {
            idata = it.current();
            pIpkg->setDestination( idata->destination->getDestinationName() );
            pIpkg->setDestinationDir( idata->destination->getDestinationPath() );
            pIpkg->setPackage( idata->packageName );
            int tmpFlags = flags;
            if ( idata->destination->linkToRoot() )
                tmpFlags |= MAKE_LINKS;
            pIpkg->setFlags( tmpFlags, infoLevel );
            pIpkg->runIpkg();
        }
        pIpkg->setOption( "install" );
        pIpkg->setDestination( dest );
        pIpkg->setDestinationDir( destDir );
        pIpkg->setFlags( instFlags, infoLevel );
        QListIterator<InstallData> it2( installList );
        for ( ; it2.current(); ++it2 )
        {
            pIpkg->setPackage( it2.current()->packageName );
            pIpkg->runIpkg();
        }
        flags |= FORCE_REINSTALL;
        QListIterator<InstallData> it3( updateList );
        for ( ; it3.current() ; ++it3 )
        {
            idata = it3.current();
            if ( idata->option == "R" )
                pIpkg->setOption( "reinstall" );
            else
                pIpkg->setOption( "upgrade" );
            pIpkg->setDestination( idata->destination->getDestinationName() );
            pIpkg->setDestinationDir( idata->destination->getDestinationPath() );
            pIpkg->setPackage( idata->packageName );
            int tmpFlags = flags;
            if ( idata->destination->linkToRoot() && idata->recreateLinks )
                tmpFlags |= MAKE_LINKS;
            pIpkg->setFlags( tmpFlags, infoLevel );
            pIpkg->runIpkg();
        }
        delete pIpkg;
        pIpkg = 0;
 */
    }
 }
 void InstallDlgImpl :: displayText(const QString &text )
 {
    QString newtext = QString( "%1\n%2" ).arg( output->text() ).arg( text );
    /* Set a max line count for the QMultiLineEdit, as users have reported
     * performance issues when line count gets extreme.
     */
    if(output->numLines() >= MAXLINES)
        output->removeLine(0);
    output->setText( newtext );
    output->setCursorPosition( output->numLines(), 0 );
 }
 void InstallDlgImpl :: displayAvailableSpace( const QString &text )
 {
    Destination *d = dataMgr->getDestination( text );
    QString destDir = d->getDestinationPath();
    long blockSize = 0;
    long totalBlocks = 0;
    long availBlocks = 0;
    QString space;
    if ( Utils::getStorageSpace( (const char *)destDir, &blockSize, &totalBlocks, &availBlocks ) )
    {
        long mult = blockSize / 1024;
        long div = 1024 / blockSize;
        if ( !mult ) mult = 1;
        if ( !div ) div = 1;
        long avail = availBlocks * mult / div;
        space = tr( "%1 Kb" ).arg( avail );
    }
    else
        space = tr( "Unknown" );
    if ( txtAvailableSpace )
        txtAvailableSpace->setText( space );
 }
 void InstallDlgImpl :: ipkgFinished()
 {
    InstallData *item;
    if ( firstPackage )
        item = packages.first();
    else
    {
        // Create symlinks if necessary before moving on to next package
        pIpkg->createSymLinks();
        item = packages.next();
    }
    firstPackage = FALSE;
    if ( item )
    {
        pIpkg->setPackage( item->packageName );
        int tmpFlags = flags;
        if ( item->option == "I" )
        {
            pIpkg->setOption( "install" );
            Destination *d = dataMgr->getDestination( destination->currentText() );
            pIpkg->setDestination( d->getDestinationName() );
            pIpkg->setDestinationDir( d->getDestinationPath() );
            if ( d->linkToRoot() )
                tmpFlags |= MAKE_LINKS;
        }
        else if ( item->option == "D" )
        {
            pIpkg->setOption( "remove" );
            pIpkg->setDestination( item->destination->getDestinationName() );
            pIpkg->setDestinationDir( item->destination->getDestinationPath() );
            if ( item->destination->linkToRoot() )
                tmpFlags |= MAKE_LINKS;
        }
        else
        {
            if ( item->option == "R" )
                pIpkg->setOption( "reinstall" );
            else
                pIpkg->setOption( "upgrade" );
            pIpkg->setDestination( item->destination->getDestinationName() );
            pIpkg->setDestinationDir( item->destination->getDestinationPath() );
            pIpkg->setPackage( item->packageName );
            tmpFlags |= FORCE_REINSTALL;
            if ( item->destination->linkToRoot() && item->recreateLinks )
                tmpFlags |= MAKE_LINKS;
        }
        pIpkg->setFlags( tmpFlags, infoLevel );
        pIpkg->runIpkg();
    }
    else
    {
        btnOptions->setEnabled( true );
        btnInstall->setText( tr( "Close" ) );
-        btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
+        btnInstall->setIconSet( Opie::Core::OResource::loadPixmap( "enter", Opie::Core::OResource::SmallIcon ) );
        btnOptions->setText( tr( "Save output" ) );
-        btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
+        btnOptions->setIconSet( Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ) );
        if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
            displayAvailableSpace( destination->currentText() );
    }
 }
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 6b31cd1..e07d8a0 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -1,1244 +1,1255 @@
 /*
-                             This file is part of the OPIE Project
+                     This file is part of the OPIE Project
 
               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
-             .=l.                                Dan Williams <drw@handhelds.org>
+      .=l.                                Dan Williams <drw@handhelds.org>
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This file is free software; you can
+_;:,   .>  :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
+.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
+  .i_,=:_.   -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
+..}^=.=    =    ;      Public License for more details.
-++=   -.     .`     .:
++=  -.   .`   .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
+:   = ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
+-.  .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
+ -_. . .  )=. =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+  --    :-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "categoryfilterimpl.h"
 #include "datamgr.h"
 #include "global.h"
 #include "inputdlg.h"
 #include "ipkg.h"
 #include "installdlgimpl.h"
 #include "letterpushbutton.h"
 #include "mainwin.h"
 #include "packagewin.h"
 #include "settingsimpl.h"
 #include "utils.h"
 /* OPIE */
+#include <opie2/oresource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
-#include <qpe/resource.h>
 /* QT */
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qaction.h>
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qprogressbar.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 #include <qwidgetstack.h>
 /* STD */
 #include <linux/limits.h>
 #include <unistd.h>
 extern int compareVersions( const char *v1, const char *v2 );
 MainWindow :: MainWindow( QWidget* parent, const char* name, WFlags fl )
                :QMainWindow( parent, name, fl || WStyle_ContextHelp )
 {
    // Disable suspend mode
    QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
    LOCAL_SERVER = QObject::tr( "Installed packages" );
    LOCAL_IPKGS = QObject::tr( "Local packages" );
    setCaption( tr( "AQPkg - Package Manager" ) );
    // Create UI widgets
    initMainWidget();
    initProgressWidget();
    // Build menu and tool bars
    setToolBarsMovable( FALSE );
    QToolBar *bar = new QToolBar( this );
    bar->setHorizontalStretchable( TRUE );
    QMenuBar *mb = new QMenuBar( bar );
    mb->setMargin( 0 );
    bar = new QToolBar( this );
    // Find toolbar
    findBar = new QToolBar( this );
    addToolBar( findBar, QMainWindow::Top, true );
    findBar->setHorizontalStretchable( true );
    findEdit = new QLineEdit( findBar );
    QWhatsThis::add( findEdit, tr( "Type the text to search for here." ) );
    findBar->setStretchableWidget( findEdit );
    connect( findEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( findPackage(const QString&) ) );
    // Quick jump toolbar
    jumpBar = new QToolBar( this );
    addToolBar( jumpBar, QMainWindow::Top, true );
    jumpBar->setHorizontalStretchable( true );
    QWidget *w = new QWidget( jumpBar );
    jumpBar->setStretchableWidget( w );
    QGridLayout *layout = new QGridLayout( w );
    char text[2];
    text[1] = '\0';
    for ( int i = 0 ; i < 26 ; ++i )
    {
        text[0] = 'A' + i;
        LetterPushButton *b = new LetterPushButton( text, w );
        connect( b, SIGNAL( released(QString) ), this, SLOT( letterPushed(QString) ) );
        layout->addWidget( b, i / 13, i % 13);
    }
-    QAction *a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, w, 0 );
+    QAction *a = new QAction( QString::null, Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
+                              QString::null, 0, w, 0 );
    a->setWhatsThis( tr( "Click here to hide the Quick Jump toolbar." ) );
    connect( a, SIGNAL( activated() ), this, SLOT( hideJumpBar() ) );
    a->addTo( jumpBar );
    jumpBar->hide();
    // Packages menu
    QPopupMenu *popup = new QPopupMenu( this );
-    a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "aqpkg/update" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Update lists" ), Opie::Core::OResource::loadPixmap( "aqpkg/update", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Click here to update package lists from servers." ) );
    connect( a, SIGNAL( activated() ), this, SLOT( updateServer() ) );
    a->addTo( popup );
    a->addTo( bar );
-    actionUpgrade = new QAction( tr( "Upgrade" ), Resource::loadPixmap( "aqpkg/upgrade" ), QString::null, 0, this, 0 );
+    actionUpgrade = new QAction( tr( "Upgrade" ), Opie::Core::OResource::loadPixmap( "aqpkg/upgrade", Opie::Core::OResource::SmallIcon ),
+                                 QString::null, 0, this, 0 );
    actionUpgrade->setWhatsThis( tr( "Click here to upgrade all installed packages if a newer version is available." ) );
    connect( actionUpgrade, SIGNAL( activated() ), this, SLOT( upgradePackages() ) );
    actionUpgrade->addTo( popup );
    actionUpgrade->addTo( bar );
-    iconDownload = Resource::loadPixmap( "aqpkg/download" );
+    iconDownload = Opie::Core::OResource::loadPixmap( "aqpkg/download", Opie::Core::OResource::SmallIcon );
-    iconRemove = Resource::loadPixmap( "aqpkg/remove" );
+    iconRemove = Opie::Core::OResource::loadPixmap( "aqpkg/remove", Opie::Core::OResource::SmallIcon );
    actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 );
    actionDownload->setWhatsThis( tr( "Click here to download the currently selected package(s)." ) );
    connect( actionDownload, SIGNAL( activated() ), this, SLOT( downloadPackage() ) );
    actionDownload->addTo( popup );
    actionDownload->addTo( bar );
-    a = new QAction( tr( "Apply changes" ), Resource::loadPixmap( "aqpkg/apply" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Apply changes" ), Opie::Core::OResource::loadPixmap( "aqpkg/apply", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Click here to install, remove or upgrade currently selected package(s)." ) );
    connect( a, SIGNAL( activated() ), this, SLOT( applyChanges() ) );
    a->addTo( popup );
    a->addTo( bar );
    popup->insertSeparator();
-    a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Configure" ), Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Click here to configure this application." ) );
    connect( a, SIGNAL( activated() ), this, SLOT( displaySettings() ) );
    a->addTo( popup );
    mb->insertItem( tr( "Actions" ), popup );
    // View menu
    popup = new QPopupMenu( this );
    actionUninstalled = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 );
    actionUninstalled->setToggleAction( TRUE );
    actionUninstalled->setWhatsThis( tr( "Click here to show packages available which have not been installed." ) );
    connect( actionUninstalled, SIGNAL( activated() ), this, SLOT( filterUninstalledPackages() ) );
    actionUninstalled->addTo( popup );
    actionInstalled = new QAction( tr( "Show installed packages" ), QString::null, 0, this, 0 );
    actionInstalled->setToggleAction( TRUE );
    actionInstalled->setWhatsThis( tr( "Click here to show packages currently installed on this device." ) );
    connect( actionInstalled, SIGNAL( activated() ), this, SLOT( filterInstalledPackages() ) );
    actionInstalled->addTo( popup );
    actionUpdated = new QAction( tr( "Show updated packages" ), QString::null, 0, this, 0 );
    actionUpdated->setToggleAction( TRUE );
    actionUpdated->setWhatsThis( tr( "Click here to show packages currently installed on this device which have a newer version available." ) );
    connect( actionUpdated, SIGNAL( activated() ), this, SLOT( filterUpgradedPackages() ) );
    actionUpdated->addTo( popup );
    popup->insertSeparator();
-    actionFilter = new QAction( tr( "Filter by category" ), Resource::loadPixmap( "aqpkg/filter" ),  QString::null, 0, this, 0 );
+    actionFilter = new QAction( tr( "Filter by category" ), Opie::Core::OResource::loadPixmap( "aqpkg/filter",
+                                Opie::Core::OResource::SmallIcon ),  QString::null, 0, this, 0 );
    actionFilter->setToggleAction( TRUE );
    actionFilter->setWhatsThis( tr( "Click here to list packages belonging to one category." ) );
    connect( actionFilter, SIGNAL( activated() ), this, SLOT( filterCategory() ) );
    actionFilter->addTo( popup );
    a = new QAction( tr( "Set filter category" ),  QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Click here to change package category to used filter." ) );
    connect( a, SIGNAL( activated() ), this, SLOT( setFilterCategory() ) );
    a->addTo( popup );
    popup->insertSeparator();
-    a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Find" ), Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Click here to search for text in package names." ) );
    connect( a, SIGNAL( activated() ), this, SLOT( displayFindBar() ) );
    a->addTo( popup );
-    actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 );
+    actionFindNext = new QAction( tr( "Find next" ), Opie::Core::OResource::loadPixmap( "next", Opie::Core::OResource::SmallIcon ),
+                                  QString::null, 0, this, 0 );
    actionFindNext->setEnabled( FALSE );
    actionFindNext->setWhatsThis( tr( "Click here to find the next package name containing the text you are searching for." ) );
    connect( actionFindNext, SIGNAL( activated() ), this, SLOT( repeatFind() ) );
    actionFindNext->addTo( popup );
    actionFindNext->addTo( findBar );
    popup->insertSeparator();
-    a = new QAction( tr( "Quick Jump keypad" ), Resource::loadPixmap( "aqpkg/keyboard" ),  QString::null, 0, this, 0 );
+    a = new QAction( tr( "Quick Jump keypad" ), Opie::Core::OResource::loadPixmap( "aqpkg/keyboard", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Click here to display/hide keypad to allow quick movement through the package list." ) );
    connect( a, SIGNAL( activated() ), this, SLOT( displayJumpBar() ) );
    a->addTo( popup );
    mb->insertItem( tr( "View" ), popup );
    // Finish find toolbar creation
-    a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
+    a = new QAction( QString::null, Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Click here to hide the find toolbar." ) );
    connect( a, SIGNAL( activated() ), this, SLOT( hideFindBar() ) );
    a->addTo( findBar );
    findBar->hide();
    // Create widget stack and add UI widgets
    stack = new QWidgetStack( this );
    stack->addWidget( progressWindow, 2 );
    stack->addWidget( networkPkgWindow, 1 );
    setCentralWidget( stack );
    stack->raiseWidget( progressWindow );
    // Delayed call to finish initialization
    QTimer::singleShot( 100, this, SLOT( init() ) );
 }
 MainWindow :: ~MainWindow()
 {
    delete mgr;
    // Reenable suspend mode
    QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
 }
 void MainWindow :: initMainWidget()
 {
    networkPkgWindow = new QWidget( this );
    QLabel *l = new QLabel( tr( "Servers:" ), networkPkgWindow );
    serversList = new QComboBox( networkPkgWindow );
    connect( serversList, SIGNAL(activated(int)), this, SLOT(serverSelected(int)) );
    QWhatsThis::add( serversList, tr( "Click here to select a package feed." ) );
-    installedIcon = Resource::loadPixmap( "installed" );
+    installedIcon = Opie::Core::OResource::loadPixmap( "installed" );
-    updatedIcon = Resource::loadPixmap( "aqpkg/updated" );
+    updatedIcon = Opie::Core::OResource::loadPixmap( "aqpkg/updated" );
    packagesList = new QListView( networkPkgWindow );
    packagesList->addColumn( tr( "Packages" ), 225 );
    QWhatsThis::add( packagesList, tr( "This is a listing of all packages for the server feed selected above.\n\nA blue dot next to the package name indicates that the package is currently installed.\n\nA blue dot with a star indicates that a newer version of the package is available from the server feed.\n\nClick inside the box at the left to select a package." ) );
    QPEApplication::setStylusOperation( packagesList->viewport(), QPEApplication::RightOnHold );
    connect( packagesList, SIGNAL(rightButtonPressed(QListViewItem*,const QPoint&,int)),
             this, SLOT(slotDisplayPackage(QListViewItem*)) );
    QVBoxLayout *vbox = new QVBoxLayout( networkPkgWindow, 0, -1 );
    QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 );
    hbox1->addWidget( l );
    hbox1->addWidget( serversList );
    vbox->addWidget( packagesList );
    downloadEnabled = TRUE;
 }
 void MainWindow :: initProgressWidget()
 {
    progressWindow = new QWidget( this );
    QVBoxLayout *layout = new QVBoxLayout( progressWindow, 4, 4 );
    m_status = new QLabel( progressWindow );
    m_status->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
    layout->addWidget( m_status );
    m_progress = new QProgressBar( progressWindow );
    layout->addWidget( m_progress );
 }
 void MainWindow :: init()
 {
 #ifdef QWS
    // read download directory from config file
    Config cfg( "aqpkg" );
    cfg.setGroup( "settings" );
    currentlySelectedServer = cfg.readEntry( "selectedServer", "local" );
    //    showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" );
 #endif
    stack->raiseWidget( progressWindow );
    mgr = new DataManager();
    connect( mgr, SIGNAL( progressSetSteps(int) ), this, SLOT( setProgressSteps(int) ) );
    connect( mgr, SIGNAL( progressSetMessage(const QString&) ),
             this, SLOT( setProgressMessage(const QString&) ) );
    connect( mgr, SIGNAL( progressUpdate(int) ), this, SLOT( updateProgress(int) ) );
    mgr->loadServers();
    showUninstalledPkgs = false;
    showInstalledPkgs = false;
    showUpgradedPkgs = false;
    categoryFilterEnabled = false;
    updateData();
    stack->raiseWidget( networkPkgWindow );
 }
 void MainWindow :: setDocument( const QString &doc )
 {
    // Remove path from package
    QString package = Utils::getPackageNameFromIpkFilename( doc );
    // First select local server
    for ( int i = 0 ; i < serversList->count() ; ++i )
    {
        if ( serversList->text( i ) == LOCAL_IPKGS )
        {
            serversList->setCurrentItem( i );
            break;
        }
    }
    serverSelected( 0 );
    // Now set the check box of the selected package
    for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
            item != 0 ;
            item = (QCheckListItem *)item->nextSibling() )
    {
        if ( item->text().startsWith( package ) )
        {
            item->setOn( true );
            break;
        }
    }
 }
 void MainWindow :: displaySettings()
 {
    SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true );
    if ( dlg->showDlg() )
    {
        stack->raiseWidget( progressWindow );
        updateData();
        stack->raiseWidget( networkPkgWindow );
    }
    delete dlg;
 }
 void MainWindow :: closeEvent( QCloseEvent *e )
 {
    // If install dialog is visible, return to main view, otherwise close app
    QWidget *widget = stack->visibleWidget();
    if ( widget != networkPkgWindow && widget != progressWindow )
    {
        if ( widget ) delete widget;
        stack->raiseWidget( networkPkgWindow );
        e->ignore();
    }
    else
    {
        e->accept();
    }
 }
 void MainWindow :: displayFindBar()
 {
    findBar->show();
    findEdit->setFocus();
 }
 void MainWindow :: displayJumpBar()
 {
    jumpBar->show();
 }
 void MainWindow :: repeatFind()
 {
    searchForPackage( findEdit->text() );
 }
 void MainWindow :: findPackage( const QString &text )
 {
    actionFindNext->setEnabled( !text.isEmpty() );
    searchForPackage( text );
 }
 void MainWindow :: hideFindBar()
 {
    findBar->hide();
 }
 void MainWindow :: hideJumpBar()
 {
    jumpBar->hide();
 }
 void MainWindow :: filterUninstalledPackages()
 {
    showUninstalledPkgs = actionUninstalled->isOn();
    if ( showUninstalledPkgs )
    {
        showInstalledPkgs = FALSE;
        showUpgradedPkgs = FALSE;
    }
    serverSelected( -1 );
    actionInstalled->setOn( FALSE );
    actionUpdated->setOn( FALSE );
 }
 void MainWindow :: filterInstalledPackages()
 {
    showInstalledPkgs = actionInstalled->isOn();
    if ( showInstalledPkgs )
    {
        showUninstalledPkgs = FALSE;
        showUpgradedPkgs = FALSE;
    }
    serverSelected( -1 );
    actionUninstalled->setOn( FALSE );
    actionUpdated->setOn( FALSE );
 }
 void MainWindow :: filterUpgradedPackages()
 {
    showUpgradedPkgs = actionUpdated->isOn();
    if ( showUpgradedPkgs )
    {
        showUninstalledPkgs = FALSE;
        showInstalledPkgs = FALSE;
    }
    serverSelected( -1 );
    actionUninstalled->setOn( FALSE );
    actionInstalled->setOn( FALSE );
 }
 bool MainWindow :: setFilterCategory()
 {
    // Get categories;
    CategoryFilterImpl dlg( DataManager::getAvailableCategories(), categoryFilter, this );
    if ( dlg.exec() == QDialog::Accepted )
    {
        categoryFilter = dlg.getSelectedFilter();
        if ( categoryFilter == "" )
            return false;
        categoryFilterEnabled = true;
        serverSelected( -1 );
        actionFilter->setOn( TRUE );
        return true;
    }
    return false;
 }
 void MainWindow :: filterCategory()
 {
    if ( !actionFilter->isOn() )
    {
        filterByCategory( FALSE );
    }
    else
    {
        actionFilter->setOn( filterByCategory( TRUE ) );
    }
 }
 bool MainWindow :: filterByCategory( bool val )
 {
    if ( val )
    {
        if ( categoryFilter == "" )
        {
            if ( !setFilterCategory() )
                return false;
        }
        categoryFilterEnabled = true;
        serverSelected( -1 );
        return true;
    }
    else
    {
        // Turn off filter
        categoryFilterEnabled = false;
        serverSelected( -1 );
        return false;
    }
 }
 void MainWindow :: raiseMainWidget()
 {
    stack->raiseWidget( networkPkgWindow );
 }
 void MainWindow :: raiseProgressWidget()
 {
    stack->raiseWidget( progressWindow );
 }
 void MainWindow :: enableUpgrade( bool enabled )
 {
    actionUpgrade->setEnabled( enabled );
 }
 void MainWindow :: enableDownload( bool enabled )
 {
    if ( enabled )
    {
        actionDownload->setIconSet( iconDownload );
        actionDownload->setText( tr( "Download" ) );
        actionDownload->setWhatsThis( tr( "Click here to download the currently selected package(s)." ) );
    }
    else
    {
        actionDownload->setIconSet( iconRemove );
        actionDownload->setText( tr( "Remove" ) );
        actionDownload->setWhatsThis( tr( "Click here to uninstall the currently selected package(s)." ) );
    }
 }
 void MainWindow :: setProgressSteps( int numsteps )
 {
    m_progress->setTotalSteps( numsteps );
 }
 void MainWindow :: setProgressMessage( const QString &msg )
 {
    m_status->setText( msg );
 }
 void MainWindow :: updateProgress( int progress )
 {
    m_progress->setProgress( progress );
 }
 void MainWindow :: updateData()
 {
    m_progress->setTotalSteps( mgr->getServerList().count() );
    serversList->clear();
    packagesList->clear();
    int activeItem = -1;
    int i = 0;
    QString serverName;
    QListIterator<Server> it( mgr->getServerList() );
    Server *server;
    for ( ; it.current(); ++it, ++i )
    {
        server = it.current();
        serverName = server->getServerName();
        m_status->setText( tr( "Building server list:\n\t%1" ).arg( serverName ) );
        m_progress->setProgress( i );
        qApp->processEvents();
        if ( !server->isServerActive() )
        {
            i--;
            continue;
        }
        serversList->insertItem( serverName );
        if ( serverName == currentlySelectedServer )
            activeItem = i;
    }
    // set selected server to be active server
    if ( activeItem != -1 )
        serversList->setCurrentItem( activeItem );
    serverSelected( 0, FALSE );
 }
 void MainWindow :: serverSelected( int index )
 {
    serverSelected( index, TRUE );
 }
 void MainWindow :: serverSelected( int, bool raiseProgress )
 {
    QPixmap nullIcon( installedIcon.size() );
    nullIcon.fill( colorGroup().base() );
    // display packages
    QString serverName = serversList->currentText();
    currentlySelectedServer = serverName;
    Server *s = mgr->getServer( serverName );
    QList<Package> &list = s->getPackageList();
    QListIterator<Package> it( list );
    // Display progress widget while loading list
    bool doProgress = ( list.count() > 200 );
    if ( doProgress )
    {
        if ( raiseProgress )
        {
            stack->raiseWidget( progressWindow );
        }
        m_progress->setTotalSteps( list.count() );
        m_status->setText( tr( "Building package list for:\n\t%1" ).arg( serverName ) );
    }
    packagesList->clear();
 #ifdef QWS
    // read download directory from config file
    Config cfg( "aqpkg" );
    cfg.setGroup( "settings" );
    cfg.writeEntry( "selectedServer", currentlySelectedServer );
 #endif
    int i = 0;
    Package *package;
    for ( ; it.current(); ++it )
    {
        // Update progress after every 100th package (arbitrary value, seems to give good balance)
        i++;
        if ( ( i % 100 ) == 0 )
        {
            if ( doProgress )
            {
                m_progress->setProgress( i );
            }
            qApp->processEvents();
        }
        QString text = "";
        package = it.current();
        // Apply show only uninstalled packages filter
        if ( showUninstalledPkgs && package->isInstalled() )
            continue;
        // Apply show only installed packages filter
        if ( showInstalledPkgs && !package->isInstalled() )
            continue;
        // Apply show only new installed packages filter
        if ( showUpgradedPkgs )
        {
            if ( !package->isInstalled() || !package->getNewVersionAvailable() )
                continue;
        }
        // Apply the section filter
        if ( categoryFilterEnabled && categoryFilter != "" )
        {
            if ( package->getSection() == "" || categoryFilter.find( package->getSection().lower() ) == -1 )
                continue;
        }
        // If the local server, only display installed packages
        if ( serverName == LOCAL_SERVER && !package->isInstalled() )
            continue;
        QCheckListItem *item = new QCheckListItem( packagesList, package->getPackageName(),
                               QCheckListItem::CheckBox );
        if ( package->isInstalled() )
        {
            // If a different version of package is available, show update available icon
            // Otherwise, show installed icon
            if ( package->getNewVersionAvailable())
            {
                item->setPixmap( 0, updatedIcon );
            }
            else
            {
                item->setPixmap( 0, installedIcon );
            }
        }
        else
        {
            item->setPixmap( 0, nullIcon );
        }
        packagesList->insertItem( item );
    }
    // If the local server or the local ipkgs server disable the download button
    if ( serverName == LOCAL_SERVER )
    {
        downloadEnabled = TRUE;
        actionUpgrade->setEnabled( FALSE );
    }
    else if ( serverName == LOCAL_IPKGS )
    {
        downloadEnabled = FALSE;
        actionUpgrade->setEnabled( FALSE );
    }
    else
    {
        downloadEnabled = TRUE;
        actionUpgrade->setEnabled( TRUE );
    }
    enableDownload( downloadEnabled );
    // Display this widget once everything is done
    if ( doProgress && raiseProgress )
    {
        stack->raiseWidget( networkPkgWindow );
    }
 }
 void MainWindow :: searchForPackage( const QString &text )
 {
    if ( !text.isEmpty() )
    {
        // look through package list for text startng at current position
        QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
        if ( start == 0 )
            start = (QCheckListItem *)packagesList->firstChild();
        for ( QCheckListItem *item = start; item != 0 ;
                item = (QCheckListItem *)item->nextSibling() )
        {
            if ( item->text().lower().find( text ) != -1 )
            {
                packagesList->ensureItemVisible( item );
                packagesList->setCurrentItem( item );
                break;
            }
        }
    }
 }
 void MainWindow :: updateServer()
 {
    QString serverName = serversList->currentText();
    // Update the current server
    // Display dialog
    // Disable buttons to stop silly people clicking lots on them :)
    // First, write out ipkg_conf file so that ipkg can use it
    mgr->writeOutIpkgConf();
    Ipkg *ipkg = new Ipkg;
    ipkg->setOption( "update" );
    InstallDlgImpl *dlg = new InstallDlgImpl( ipkg, tr( "Refreshing server package lists" ),
                          tr( "Update lists" ) );
    connect( dlg, SIGNAL( reloadData(InstallDlgImpl*) ), this, SLOT( reloadData(InstallDlgImpl*) ) );
    reloadDocuments = FALSE;
    stack->addWidget( dlg, 3 );
    stack->raiseWidget( dlg );
    //  delete progDlg;
 }
 void MainWindow :: upgradePackages()
 {
    // We're gonna do an upgrade of all packages
    // First warn user that this isn't recommended
    // TODO - ODevice????
    QString text = tr( "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n" );
    QMessageBox warn( tr( "Warning" ), text, QMessageBox::Warning,
                      QMessageBox::Yes,
                      QMessageBox::No | QMessageBox::Escape | QMessageBox::Default ,
                      0, this );
    warn.adjustSize();
    if ( warn.exec() == QMessageBox::Yes )
    {
        // First, write out ipkg_conf file so that ipkg can use it
        mgr->writeOutIpkgConf();
        // Now run upgrade
        Ipkg *ipkg = new Ipkg;
        ipkg->setOption( "upgrade" );
        InstallDlgImpl *dlg = new InstallDlgImpl( ipkg, tr( "Upgrading installed packages" ),
                              tr ( "Upgrade" ) );
        connect( dlg, SIGNAL( reloadData(InstallDlgImpl*) ), this, SLOT( reloadData(InstallDlgImpl*) ) );
        reloadDocuments = TRUE;
        stack->addWidget( dlg, 3 );
        stack->raiseWidget( dlg );
    }
 }
 void MainWindow :: downloadPackage()
 {
    bool doUpdate = true;
    if ( downloadEnabled )
    {
        // See if any packages are selected
        bool found = false;
        if ( serversList->currentText() != LOCAL_SERVER )
        {
            for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
                    item != 0 && !found;
                    item = (QCheckListItem *)item->nextSibling() )
            {
                if ( item->isOn() )
                    found = true;
            }
        }
        // If user selected some packages then download the and store the locally
        // otherwise, display dialog asking user what package to download from an http server
        // and whether to install it
        if ( found )
            downloadSelectedPackages();
        else
            downloadRemotePackage();
    }
    else
    {
        doUpdate = false;
        for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
                item != 0 ;
                item = (QCheckListItem *)item->nextSibling() )
        {
            if ( item->isOn() )
            {
                QString name = item->text();
                int pos = name.find( "*" );
                name.truncate( pos );
                // if (there is a (installed), remove it
                pos = name.find( "(installed)" );
                if ( pos > 0 )
                    name.truncate( pos - 1 );
                Package *p = mgr->getServer( serversList->currentText() )->getPackage( name );
                QString msgtext;
                msgtext = tr( "Are you sure you wish to delete\n%1?" ).arg( (const char *)p->getPackageName() );
                if ( QMessageBox::information( this, tr( "Are you sure?" ),
                                               msgtext, tr( "No" ), tr( "Yes" ) ) == 1 )
                {
                    doUpdate = true;
                    QFile f( p->getFilename() );
                    f.remove();
                }
            }
        }
    }
    if ( doUpdate )
    {
        reloadData( 0x0 );
    }
 }
 void MainWindow :: downloadSelectedPackages()
 {
    // First, write out ipkg_conf file so that ipkg can use it
    mgr->writeOutIpkgConf();
    // Display dialog to user asking where to download the files to
    bool ok = FALSE;
    QString dir = "";
 #ifdef QWS
    // read download directory from config file
    Config cfg( "aqpkg" );
    cfg.setGroup( "settings" );
    dir = cfg.readEntry( "downloadDir", "/home/root/Documents/application/ipkg" );
 #endif
    QString text = InputDialog::getText( tr( "Download to where" ), tr( "Enter path to download to" ), dir, &ok, this );
    if ( ok && !text.isEmpty() )
        dir = text;   // user entered something and pressed ok
    else
        return; // user entered nothing or pressed cancel
 #ifdef QWS
    // Store download directory in config file
    cfg.writeEntry( "downloadDir", dir );
 #endif
    // Get starting directory
    char initDir[PATH_MAX];
    getcwd( initDir, PATH_MAX );
    // Download each package
    Ipkg ipkg;
    connect( &ipkg, SIGNAL(outputText(const QString&)), this, SLOT(displayText(const QString&)));
    ipkg.setOption( "download" );
    ipkg.setRuntimeDirectory( dir );
    for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
            item != 0 ;
            item = (QCheckListItem *)item->nextSibling() )
    {
        if ( item->isOn() )
        {
            ipkg.setPackage( item->text() );
            ipkg.runIpkg( );
        }
    }
 }
 void MainWindow :: downloadRemotePackage()
 {
    // Display dialog
    bool ok;
    QString package = InputDialog::getText( tr( "Install Remote Package" ), tr( "Enter package location" ), "http://", &ok, this );
    if ( !ok || package.isEmpty() )
        return;
    //    DownloadRemoteDlgImpl dlg( this, "Install", true );
    //    if ( dlg.exec() == QDialog::Rejected )
    //        return;
    // grab details from dialog
    //    QString package = dlg.getPackageLocation();
    InstallData *item = new InstallData();
    item->option = "I";
    item->packageName = package;
    QList<InstallData> workingPackages;
    workingPackages.setAutoDelete( TRUE );
    workingPackages.append( item );
    InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Download" ) );
    connect( dlg, SIGNAL( reloadData(InstallDlgImpl*) ), this, SLOT( reloadData(InstallDlgImpl*) ) );
    reloadDocuments = TRUE;
    stack->addWidget( dlg, 3 );
    stack->raiseWidget( dlg );
 }
 void MainWindow :: applyChanges()
 {
    stickyOption = "";
    // First, write out ipkg_conf file so that ipkg can use it
    mgr->writeOutIpkgConf();
    // Now for each selected item
    // deal with it
    QList<InstallData> workingPackages;
    workingPackages.setAutoDelete( TRUE );
    for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
            item != 0 ;
            item = (QCheckListItem *)item->nextSibling() )
    {
        if ( item->isOn() )
        {
            InstallData *instdata = dealWithItem( item );
            if ( instdata )
                workingPackages.append( instdata );
            else
                return;
        }
    }
    if ( workingPackages.count() == 0 )
    {
        // Nothing to do
        QMessageBox::information( this, tr( "Nothing to do" ),
                                  tr( "No packages selected" ), tr( "OK" ) );
        return;
    }
    // do the stuff
    InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Apply changes" ) );
    connect( dlg, SIGNAL( reloadData(InstallDlgImpl*) ), this, SLOT( reloadData(InstallDlgImpl*) ) );
    reloadDocuments = TRUE;
    stack->addWidget( dlg, 3 );
    stack->raiseWidget( dlg );
 }
 // decide what to do - either remove, upgrade or install
 // Current rules:
 //    If not installed - install
 //    If installed and different version available - upgrade
 //    If installed and version up to date - remove
 InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
 {
    QString name = item->text();
    // Get package
    Server *s = mgr->getServer( serversList->currentText() );
    Package *p = s->getPackage( name );
    // If the package has a filename then it is a local file
    if ( p->isPackageStoredLocally() )
        name = p->getFilename();
    QString option;
    QString dest = "root";
    if ( !p->isInstalled() )
    {
        InstallData *newitem = new InstallData();
        newitem->option = "I";
        newitem->packageName = name;
        return newitem;
    }
    else
    {
        InstallData *newitem = new InstallData();
        newitem->option = "D";
        // If local file, remove using package name, not filename
        if ( p->isPackageStoredLocally() )
            name = item->text();
        if ( !p->isPackageStoredLocally() )
            newitem->packageName = p->getInstalledPackageName();
        else
            newitem->packageName = name;
        if ( p->getInstalledTo() )
        {
            newitem->destination = p->getInstalledTo();
        }
        else
        {
            newitem->destination = p->getLocalPackage()->getInstalledTo();
        }
        // Now see if version is newer or not
        int val = compareVersions( p->getInstalledVersion(), p->getVersion() );
        // If the version requested is older and user selected a local ipk file, then reinstall the file
        if ( p->isPackageStoredLocally() && val == -1 )
            val = 0;
        if ( val == -2 )
        {
            // Error - should handle
        }
        else if ( val == -1 )
        {
            // Version available is older - remove only
            newitem->option = "D";
            // If local file, remove using package name, not filename
            if ( p->isPackageStoredLocally() )
                name = item->text();
        }
        else
        {
            QString caption;
            QString text;
            QString secondButton;
            QString secondOption;
            if ( val == 0 )
            {
                // Version available is the same - option to remove or reinstall
                caption = tr( "Do you wish to remove or reinstall\n%1?" );
                text = tr( "Remove or ReInstall" );
                secondButton = tr( "ReInstall" );
                secondOption = "R"; // Internal action code, do not translate
            }
            else if ( val == 1 )
            {
                // Version available is newer - option to remove or upgrade
                caption = tr( "Do you wish to remove or upgrade\n%1?" );
                text = tr( "Remove or Upgrade" );
                secondButton = tr( "Upgrade" );
                secondOption = "U"; // Internal action code, do not translate
            }
            // Sticky option not implemented yet, but will eventually allow
            // the user to say something like 'remove all'
            if ( stickyOption == "" )
            {
                QString msgtext;
                msgtext = caption.arg( ( const char * )name );
                QuestionDlg dlg( text, msgtext, secondButton );
                switch( dlg.exec() )
                {
                case 0: // Cancel
                    delete newitem;
                    return 0x0;
                    break;
                case 1: // Remove
                    newitem->option = "D";
                    // If local file, remove using package name, not filename
                    if ( p->isPackageStoredLocally() )
                        name = item->text();
                    break;
                case 2: // Reinstall or Upgrade
                    newitem->option = secondOption;
                    break;
                }
            }
            else
            {
                //                newitem->option = stickyOption;
            }
        }
        // Check if we are reinstalling the same version
        if ( newitem->option != "R" )
            newitem->recreateLinks = true;
        else
            newitem->recreateLinks = false;
        // User hit cancel (on dlg - assume remove)
        return newitem;
    }
 }
 void MainWindow :: reloadData( InstallDlgImpl *dlg )
 {
    stack->raiseWidget( progressWindow );
    if ( dlg )
    {
        dlg->close();
        delete dlg;
    }
    mgr->reloadServerData();
    serverSelected( -1, FALSE );
 #ifdef QWS
    if ( reloadDocuments )
    {
        m_status->setText( tr( "Updating Launcher..." ) );
        // Finally let the main system update itself
        QCopEnvelope e("QPE/System", "linkChanged(QString)");
        QString lf = QString::null;
        e << lf;
    }
 #endif
    stack->raiseWidget( networkPkgWindow );
 }
 void MainWindow :: letterPushed( QString t )
 {
    QCheckListItem *top = (QCheckListItem *)packagesList->firstChild();
    QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
    if ( packagesList->firstChild() == 0 )
        return;
    QCheckListItem *item;
    if ( start == 0 )
    {
        item = (QCheckListItem *)packagesList->firstChild();
        start = top;
    }
    else
        item = (QCheckListItem *)start->nextSibling();
    if ( item == 0 )
        item = (QCheckListItem *)packagesList->firstChild();
    do
    {
        if ( item->text().lower().startsWith( t.lower() ) )
        {
            packagesList->setSelected( item, true );
            packagesList->ensureItemVisible( item );
            break;
        }
        item = (QCheckListItem *)item->nextSibling();
        if ( !item )
            item = (QCheckListItem *)packagesList->firstChild();
    }
    while ( item != start);
 }
 void MainWindow :: slotDisplayPackage( QListViewItem *item )
 {
    QString itemstr( ((QCheckListItem*)item)->text() );
    PackageWindow *p = new PackageWindow( mgr->getServer( serversList->currentText() )->getPackage( itemstr ) );
    QPEApplication::showWidget( p );
 }
 QuestionDlg::QuestionDlg( const QString &caption, const QString &text, const QString &secondbtn )
        : QWidget( 0x0, 0x0, WType_Modal | WType_TopLevel | WStyle_Dialog )
 {
    setCaption( caption );
    resize( 175, 100 );
    QGridLayout *layout = new QGridLayout( this );
    QLabel *l = new QLabel( text, this );
    l->setAlignment( AlignCenter | WordBreak );
    layout->addMultiCellWidget( l, 0, 0, 0, 1 );
    btn1 = new QPushButton( tr( "Remove" ), this );
    connect( btn1, SIGNAL(clicked()), this, SLOT(slotButtonPressed()) );
    layout->addWidget( btn1, 1, 0 );
    btn2 = new QPushButton( secondbtn, this );
    connect( btn2, SIGNAL(clicked()), this, SLOT(slotButtonPressed()) );
    layout->addWidget( btn2, 1, 1 );
    executing = FALSE;
 }
 int QuestionDlg::exec()
 {
    show();
    if ( !executing )
    {
        executing = TRUE;
        qApp->enter_loop();
    }
    return buttonpressed;
 }
 void QuestionDlg::slotButtonPressed()
 {
    if ( sender() == btn1 )
        buttonpressed = 1;
    else if ( sender() == btn2 )
        buttonpressed = 2;
    else
        buttonpressed = 0;
    qApp->exit_loop();
 }
diff --git a/noncore/settings/aqpkg/packagewin.cpp b/noncore/settings/aqpkg/packagewin.cpp
index 499d647..5f0ae20 100644
--- a/noncore/settings/aqpkg/packagewin.cpp
+++ b/noncore/settings/aqpkg/packagewin.cpp
@@ -1,119 +1,119 @@
 /*
-                             This file is part of the OPIE Project
+                     This file is part of the OPIE Project
                             
               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
-             .=l.                                Dan Williams <drw@handhelds.org>
+      .=l.                                Dan Williams <drw@handhelds.org>
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This file is free software; you can
+_;:,   .>  :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
+.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
+  .i_,=:_.   -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
+..}^=.=    =    ;      Public License for more details.
-++=   -.     .`     .:
++=  -.   .`   .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
+:   = ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
+-.  .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
+ -_. . .  )=. =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+  --    :-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "packagewin.h"
 #include "package.h"
 #include "datamgr.h"
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qstring.h>
 #include <qtextview.h>
 PackageWindow::PackageWindow( Package *package, const QString &server )
        : QWidget( 0, 0, 0 )
 {
        QString str;
        if ( package )
        {
        Package *local = package->getLocalPackage();
                setCaption( package->getPackageName() );
                QString destName;
                if ( local )
                {
                        if ( local->getInstalledTo() )
                                destName = package->getLocalPackage()->getInstalledTo()->getDestinationName();
                }
                else
                {
                        if ( package->getInstalledTo() )
                                destName = package->getInstalledTo()->getDestinationName();
                }
                if ( !package->isPackageStoredLocally() )
                {
                        str.append( tr( "<b>Description</b> - " ) );
                        str.append( package->getDescription() );
                        if ( !destName.isNull() )
                        {
                                str.append( tr( "<p><b>Installed To</b> - " ) );
                                str.append( destName );
                        }
                        str.append( tr( "<p><b>Size</b> - " ) );
                        str.append( package->getPackageSize() );
                        str.append( tr( "<p><b>Section</b> - " ) );
                        str.append( package->getSection() );
                }
                else
                {
                        str.append( tr( "<p><b>Filename</b> - " ) );
                        str.append( package->getFilename() );
                }
                if ( server == LOCAL_SERVER )
                {
                        str.append( tr( "<p><b>Version Installed</b> - " ) );
                        str.append( package->getVersion() );
                }
                else
                {
                        str.append( tr( "<p><b>Version Available</b> - " ) );
                        str.append( package->getVersion() );
                        if ( local )
                        {
                                if ( package->isInstalled() )
                                {
                                        str.append( tr( "<p><b>Version Installed</b> - " ) );
                                        str.append( package->getInstalledVersion() );
                                }
                        }
                }
        }
        else
        {
                setCaption( tr( "Package Information" ) );
                str = tr( "Package information is unavailable" );
        }
        QVBoxLayout *layout = new QVBoxLayout( this, 4, 4 );
        QTextView *l = new QTextView( str, QString::null, this );
        layout->addWidget( l );
-        QPushButton *btn = new QPushButton( Resource::loadPixmap( "enter" ), tr( "Close" ), this );
+        QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "enter", Opie::Core::OResource::SmallIcon ), tr( "Close" ), this );
        layout->addWidget( btn );
        connect( btn, SIGNAL( clicked() ), this, SLOT( close() ) );
 }
 PackageWindow::~PackageWindow()
 {
 }
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 9c8ec7a..7ffa1d6 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -1,491 +1,490 @@
 /*
-                             This file is part of the OPIE Project
+                     This file is part of the OPIE Project
               =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
-             .=l.                                Dan Williams <drw@handhelds.org>
+      .=l.                                Dan Williams <drw@handhelds.org>
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This file is free software; you can
+_;:,   .>  :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
+.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
+  .i_,=:_.   -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
+..}^=.=    =    ;      Public License for more details.
-++=   -.     .`     .:
++=  -.   .`   .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
+:   = ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
+-.  .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
+ -_. . .  )=. =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+  --    :-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "settingsimpl.h"
 #include "global.h"
 /* OPIE */
 #include <opie2/otabwidget.h>
-#ifdef QWS
+#include <opie2/oresource.h>
 #include <qpe/config.h>
-#include <qpe/resource.h>
-#endif
 #include <qpe/qpeapplication.h>
 /* QT */
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 using namespace Opie::Ui;
 using namespace Opie::Ui;
 SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
        : QDialog( parent, name, modal, fl )
 {
    setCaption( tr( "Configuration" ) );
    // Setup layout to make everything pretty
    QVBoxLayout *layout = new QVBoxLayout( this );
    layout->setMargin( 2 );
    layout->setSpacing( 4 );
    // Setup tabs for all info
    OTabWidget *tabwidget = new OTabWidget( this );
    layout->addWidget( tabwidget );
    tabwidget->addTab( initServerTab(), "aqpkg/servertab", tr( "Servers" ) );
    tabwidget->addTab( initDestinationTab(), "aqpkg/desttab", tr( "Destinations" ) );
    tabwidget->addTab( initProxyTab(), "aqpkg/proxytab", tr( "Proxies" ) );
    tabwidget->setCurrentTab( tr( "Servers" ) );
    dataMgr = dataManager;
    setupData();
    changed = false;
    newserver = false;
    newdestination = false;
 }
 SettingsImpl :: ~SettingsImpl()
 {
 }
 bool SettingsImpl :: showDlg()
 {
    QPEApplication::execDialog( this );
    if ( changed )
        dataMgr->writeOutIpkgConf();
    return changed;
 }
 QWidget *SettingsImpl :: initServerTab()
 {
    QWidget *control = new QWidget( this );
    QVBoxLayout *vb = new QVBoxLayout( control );
    QScrollView *sv = new QScrollView( control );
    vb->addWidget( sv, 0, 0 );
    sv->setResizePolicy( QScrollView::AutoOneFit );
    sv->setFrameStyle( QFrame::NoFrame );
    QWidget *container = new QWidget( sv->viewport() );
    sv->addChild( container );
    QGridLayout *layout = new QGridLayout( container );
    layout->setSpacing( 2 );
    layout->setMargin( 4 );
    servers = new QListBox( container );
    servers->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
    connect( servers, SIGNAL( highlighted(int) ), this, SLOT( editServer(int) ) );
    layout->addMultiCellWidget( servers, 0, 0, 0, 1 );
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ),
+                                        tr( "New" ), container );
    connect( btn, SIGNAL( clicked() ), this, SLOT( newServer() ) );
    layout->addWidget( btn, 1, 0 );
-    btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ), tr( "Delete" ), container );
    connect( btn, SIGNAL( clicked() ), this, SLOT( removeServer() ) );
    layout->addWidget( btn, 1, 1 );
    QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Server" ), container );
    grpbox->layout()->setSpacing( 2 );
    grpbox->layout()->setMargin( 4 );
    layout->addMultiCellWidget( grpbox, 2, 2, 0, 1 );
    QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
    QLabel *label = new QLabel( tr( "Name:" ), grpbox );
    grplayout->addWidget( label, 0, 0 );
    servername = new QLineEdit( grpbox );
    grplayout->addWidget( servername, 0, 1 );
    label = new QLabel( tr( "Address:" ), grpbox );
    grplayout->addWidget( label, 1, 0 );
    serverurl = new QLineEdit( grpbox );
    grplayout->addWidget( serverurl, 1, 1 );
    active = new QCheckBox( tr( "Active Server" ), grpbox );
    grplayout->addMultiCellWidget( active, 2, 2, 0, 1 );
-    btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ), tr( "Update" ), grpbox );
    connect( btn, SIGNAL( clicked() ), this, SLOT( changeServerDetails() ) );
    grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
    return control;
 }
 QWidget *SettingsImpl :: initDestinationTab()
 {
    QWidget *control = new QWidget( this );
    QVBoxLayout *vb = new QVBoxLayout( control );
    QScrollView *sv = new QScrollView( control );
    vb->addWidget( sv, 0, 0 );
    sv->setResizePolicy( QScrollView::AutoOneFit );
    sv->setFrameStyle( QFrame::NoFrame );
    QWidget *container = new QWidget( sv->viewport() );
    sv->addChild( container );
    QGridLayout *layout = new QGridLayout( container );
    layout->setSpacing( 2 );
    layout->setMargin( 4 );
    destinations = new QListBox( container );
    destinations->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
    connect( destinations, SIGNAL( highlighted(int) ), this, SLOT( editDestination(int) ) );
    layout->addMultiCellWidget( destinations, 0, 0, 0, 1 );
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ), tr( "New" ), container );
    connect( btn, SIGNAL( clicked() ), this, SLOT( newDestination() ) );
    layout->addWidget( btn, 1, 0 );
-    btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "trash", Opie::Core::OResource::SmallIcon ), tr( "Delete" ), container );
    connect( btn, SIGNAL( clicked() ), this, SLOT( removeDestination() ) );
    layout->addWidget( btn, 1, 1 );
    QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Destination" ), container );
    grpbox->layout()->setSpacing( 2 );
    grpbox->layout()->setMargin( 4 );
    layout->addMultiCellWidget( grpbox, 2, 2, 0, 1 );
    QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
    QLabel *label = new QLabel( tr( "Name:" ), grpbox );
    grplayout->addWidget( label, 0, 0 );
    destinationname = new QLineEdit( grpbox );
    grplayout->addWidget( destinationname, 0, 1 );
    label = new QLabel( tr( "Location:" ), grpbox );
    grplayout->addWidget( label, 1, 0 );
    destinationurl = new QLineEdit( grpbox );
    grplayout->addWidget( destinationurl, 1, 1 );
    linkToRoot = new QCheckBox( tr( "Link to root" ), grpbox );
    grplayout->addMultiCellWidget( linkToRoot, 2, 2, 0, 1 );
-    btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
+    btn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ), tr( "Update" ), grpbox );
    connect( btn, SIGNAL( clicked() ), this, SLOT( changeDestinationDetails() ) );
    grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
    return control;
 }
 QWidget *SettingsImpl :: initProxyTab()
 {
    QWidget *control = new QWidget( this );
    QVBoxLayout *vb = new QVBoxLayout( control );
    QScrollView *sv = new QScrollView( control );
    vb->addWidget( sv, 0, 0 );
    sv->setResizePolicy( QScrollView::AutoOneFit );
    sv->setFrameStyle( QFrame::NoFrame );
    QWidget *container = new QWidget( sv->viewport() );
    sv->addChild( container );
    QGridLayout *layout = new QGridLayout( container );
    layout->setSpacing( 2 );
    layout->setMargin( 4 );
    QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "HTTP Proxy" ), container );
    grpbox->layout()->setSpacing( 2 );
    grpbox->layout()->setMargin( 4 );
    layout->addMultiCellWidget( grpbox, 0, 0, 0, 1 );
    QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() );
    txtHttpProxy = new QLineEdit( grpbox );
    grplayout->addWidget( txtHttpProxy );
    chkHttpProxyEnabled = new QCheckBox( tr( "Enabled" ), grpbox );
    grplayout->addWidget( chkHttpProxyEnabled );
    grpbox = new QGroupBox( 0, Qt::Vertical, tr( "FTP Proxy" ), container );
    grpbox->layout()->setSpacing( 2 );
    grpbox->layout()->setMargin( 4 );
    layout->addMultiCellWidget( grpbox, 1, 1, 0, 1 );
    grplayout = new QVBoxLayout( grpbox->layout() );
    txtFtpProxy = new QLineEdit( grpbox );
    grplayout->addWidget( txtFtpProxy );
    chkFtpProxyEnabled = new QCheckBox( tr( "Enabled" ), grpbox );
    grplayout->addWidget( chkFtpProxyEnabled );
    QLabel *label = new QLabel( tr( "Username:" ), container );
    layout->addWidget( label, 2, 0 );
    txtUsername = new QLineEdit( container );
    layout->addWidget( txtUsername, 2, 1 );
    label = new QLabel( tr( "Password:" ), container );
    layout->addWidget( label, 3, 0 );
    txtPassword = new QLineEdit( container );
    layout->addWidget( txtPassword, 3, 1 );
-    QPushButton *btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), container );
+    QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "edit", Opie::Core::OResource::SmallIcon ), tr( "Update" ), container );
    connect( btn, SIGNAL( clicked() ), this, SLOT( proxyApplyChanges() ) );
    layout->addMultiCellWidget( btn, 4, 4, 0, 1 );
    return control;
 }
 void SettingsImpl :: setupData()
 {
    // add servers
    QString serverName;
    QListIterator<Server> it( dataMgr->getServerList() );
    for ( ; it.current(); ++it )
    {
        serverName = it.current()->getServerName();
        if ( serverName == LOCAL_SERVER || serverName == LOCAL_IPKGS )
            continue;
        servers->insertItem( serverName );
    }
    // add destinations
    QListIterator<Destination> it2( dataMgr->getDestinationList() );
    for ( ; it2.current(); ++it2 )
        destinations->insertItem( it2.current()->getDestinationName() );
    // setup proxy tab
    txtHttpProxy->setText( dataMgr->getHttpProxy() );
    txtFtpProxy->setText( dataMgr->getFtpProxy() );
    txtUsername->setText( dataMgr->getProxyUsername() );
    txtPassword->setText( dataMgr->getProxyPassword() );
    chkHttpProxyEnabled->setChecked( dataMgr->getHttpProxyEnabled() );
    chkFtpProxyEnabled->setChecked( dataMgr->getFtpProxyEnabled() );
 }
 //------------------ Servers tab ----------------------
 void SettingsImpl :: editServer( int sel )
 {
    currentSelectedServer = sel;
    Server *s = dataMgr->getServer( servers->currentText() );
    if ( s )
    {
        serverName = s->getServerName();
        servername->setText( s->getServerName() );
        serverurl->setText( s->getServerUrl() );
        active->setChecked( s->isServerActive() );
    }
    else
    {
        serverName = "";
        servername->setText( "" );
        serverurl->setText( "" );
        active->setChecked( false );
    }
 }
 void SettingsImpl :: newServer()
 {
    newserver = true;
    servername->setText( "" );
    serverurl->setText( "" );
    servername->setFocus();
    active->setChecked( true );
 }
 void SettingsImpl :: removeServer()
 {
    changed = true;
    Server *s = dataMgr->getServer( servers->currentText() );
    if ( s )
    {
        dataMgr->getServerList().removeRef( s );
        servers->removeItem( currentSelectedServer );
    }
 }
 void SettingsImpl :: changeServerDetails()
 {
    changed = true;
    QString newName = servername->text();
    // Convert any spaces to underscores
    char *tmpStr = new char[newName.length() + 1];
    for ( unsigned int i = 0 ; i < newName.length() ; ++i )
    {
        if ( newName[i] == ' ' )
            tmpStr[i] = '_';
        else
            tmpStr[i] = newName[i].latin1();
    }
    tmpStr[newName.length()] = '\0';
    newName = tmpStr;
    delete tmpStr;
    if ( !newserver )
    {
        Server *s = dataMgr->getServer( servers->currentText() );
        if ( s )
        {
            // Update url
            s->setServerUrl( serverurl->text() );
            s->setActive( active->isChecked() );
            // Check if server name has changed, if it has then we need to replace the key in the map
            if ( serverName != newName )
            {
                // Update server name
                s->setServerName( newName );
            }
            // Update list box
            servers->changeItem( newName, currentSelectedServer );
        }
    }
    else
    {
        Server s( newName, serverurl->text() );
        dataMgr->getServerList().append( new Server( newName, serverurl->text() ) );
        dataMgr->getServerList().last()->setActive( active->isChecked() );
        servers->insertItem( newName );
        servers->setCurrentItem( servers->count() );
        newserver = false;
    }
 }
 //------------------ Destinations tab ----------------------
 void SettingsImpl :: editDestination( int sel )
 {
    currentSelectedDestination = sel;
    Destination *d = dataMgr->getDestination( destinations->currentText() );
    if ( d )
    {
        destinationName = d->getDestinationName();
        destinationname->setText( d->getDestinationName() );
        destinationurl->setText( d->getDestinationPath() );
        linkToRoot->setChecked( d->linkToRoot() );
    }
    else
    {
        destinationName = "";
        destinationname->setText( "" );
        destinationurl->setText( "" );
        linkToRoot->setChecked( false );
    }
 }
 void SettingsImpl :: newDestination()
 {
    newdestination = true;
    destinationname->setText( "" );
    destinationurl->setText( "" );
    destinationname->setFocus();
    linkToRoot->setChecked( true );
 }
 void SettingsImpl :: removeDestination()
 {
    changed = true;
    Destination *d = dataMgr->getDestination( destinations->currentText() );
    if ( d )
    {
        dataMgr->getDestinationList().removeRef( d );
        destinations->removeItem( currentSelectedDestination );
    }
 }
 void SettingsImpl :: changeDestinationDetails()
 {
    changed = true;
 #ifdef QWS
    Config cfg( "aqpkg" );
    cfg.setGroup( "destinations" );
 #endif
    QString newName = destinationname->text();
    if ( !newdestination )
    {
        Destination *d = dataMgr->getDestination( destinations->currentText() );
        if ( d )
        {
            // Update url
            d->setDestinationPath( destinationurl->text() );
            d->linkToRoot( linkToRoot->isChecked() );
            // Check if server name has changed, if it has then we need to replace the key in the map
            if ( destinationName != newName )
            {
                // Update server name
                d->setDestinationName( newName );
                // Update list box
                destinations->changeItem( newName, currentSelectedDestination );
            }
 #ifdef QWS
            QString key = newName;
            key += "_linkToRoot";
            int val = d->linkToRoot();
            cfg.writeEntry( key, val );
 #endif
        }
    }
    else
    {
        dataMgr->getDestinationList().append( new Destination( newName, destinationurl->text() ) );
        destinations->insertItem( newName );
        destinations->setCurrentItem( destinations->count() );
        newdestination = false;
 #ifdef QWS
        QString key = newName;
        key += "_linkToRoot";
        cfg.writeEntry( key, true );
 #endif
    }
 }
 //------------------ Proxy tab ----------------------
 void SettingsImpl :: proxyApplyChanges()
 {
    changed = true;
    dataMgr->setHttpProxy( txtHttpProxy->text() );
    dataMgr->setFtpProxy( txtFtpProxy->text() );
    dataMgr->setProxyUsername( txtUsername->text() );
    dataMgr->setProxyPassword( txtPassword->text() );
    dataMgr->setHttpProxyEnabled( chkHttpProxyEnabled->isChecked() );
    dataMgr->setFtpProxyEnabled( chkFtpProxyEnabled->isChecked() );
 }
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 5a4e284..eadfb63 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -1,773 +1,775 @@
 /*
                     This file is part of the Opie Project
               =.
      .=l.            Copyright (c) 2002-2004 The Opie Team <opie-devel@handhelds.org>
     .>+-=
 _;:,   .>  :=|.         This file is free software; you can
 .> <`_,  > .  <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--  :           the terms of the GNU General Public
 .="- .-=="i,   .._         License as published by the Free Software
 - .  .-<_>   .<>         Foundation; either version 2 of the License,
  ._= =}    :          or (at your option) any later version.
  .%`+i>    _;_.
  .i_,=:_.   -<s.       This file is distributed in the hope that
  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
  : ..  .:,   . . .    without even the implied warranty of
  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
 _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=    =    ;      Public License for more details.
 ++=  -.   .`   .:
 :   = ...= . :.=-        You should have received a copy of the GNU
 -.  .:....=;==+<;          General Public License along with this file;
 -_. . .  )=. =           see the file COPYING. If not, write to the
  --    :-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "backuprestore.h"
 #include "errordialog.h"
 /* OPIE */
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
 #include <opie2/ostorageinfo.h>
 #include <opie2/ofiledialog.h>
+#include <opie2/oresource.h>
 #include <opie2/owait.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/config.h>
 using namespace Opie::Core;
 using namespace Opie::Ui;
 /* QT */
 #include <qapplication.h>
 #include <qmultilineedit.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qheader.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qlist.h>
 #include <qregexp.h>
 #include <qtextstream.h>
 #include <qtextview.h>
 #include <qlineedit.h>
 #include <qstringlist.h>
 /* STD */
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #define HEADER_NAME 0
 #define HEADER_BACKUP 1
 #define BACKUP_LOCATION 2
 #define EXTENSION ".bck"
 const QString tempFileName = "/tmp/backup.err";
 BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags fl)
        : BackupAndRestoreBase(parent, name,  fl)
 {
    backupList->header()->hide();
    restoreList->header()->hide();
    locationList->header()->hide();
    connect( backupButton, SIGNAL( clicked() ), this, SLOT( backup() ) );
    connect( restoreButton, SIGNAL( clicked() ), this, SLOT( restore() ) );
    connect( backupList, SIGNAL( clicked( QListViewItem* ) ), this, SLOT( selectItem( QListViewItem* ) ) );
    connect( restoreSource, SIGNAL( activated( int ) ), this, SLOT( sourceDirChanged( int ) ) );
    connect( addLocationButton, SIGNAL( clicked() ), this, SLOT( addLocation() ) );
    connect( removeLocationButton, SIGNAL( clicked() ), this, SLOT( removeLocation() ) );
    connect( selectLocationButton, SIGNAL( clicked() ), this, SLOT( selectLocation() ) );
    //add directorys for backing up
    applicationSettings = new QListViewItem(backupList, "Application Settings", "", "Settings/");
    selectItem(applicationSettings);
    applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/");
    selectItem(applicationSettings);
    documents= new QListViewItem(backupList, "Documents", "", "Documents/");
    selectItem(documents);
    scanForApplicationSettings();
    refreshLocations();
    refreshBackupLocations();
    // Read the list of items to ignore.
    QList<QString> dontBackupList;
    dontBackupList.setAutoDelete(true);
    Config config("BackupAndRestore");
    config.setGroup("DontBackup");
    int total = config.readNumEntry("Total", 0);
    for(int i = 0; i < total; i++)
    {
        dontBackupList.append(new QString(config.readEntry(QString("%1").arg(i), "")));
    }
    QList<QListViewItem> list;
    getAllItems(backupList->firstChild(), list);
    for(uint i = 0; i < list.count(); i++)
    {
        QString text = list.at(i)->text(HEADER_NAME);
        for(uint i2 = 0;  i2 < dontBackupList.count(); i2++)
        {
            if(*dontBackupList.at(i2) == text)
            {
                selectItem(list.at(i));
                break;
            }
        }
    }
    QPEApplication::showWidget( this );
 }
 BackupAndRestore::~BackupAndRestore()
 {
    QList<QListViewItem> list;
    getAllItems(backupList->firstChild(), list);
    Config config("BackupAndRestore");
    config.setGroup("DontBackup");
    config.clearGroup();
    int count = 0;
    for(uint i = 0; i < list.count(); i++)
    {
        if(list.at(i)->text(HEADER_BACKUP) == "")
        {
            config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME));
            count++;
        }
    }
    config.writeEntry("Total", count);
    // Remove Temp File
    if ( QFile::exists( tempFileName ) )
        QFile::remove( tempFileName );
 }
 void BackupAndRestore::refreshBackupLocations()
 {
    backupLocations.clear();
    // Add cards
    Opie::Core::OStorageInfo storage;
    backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" );
    if ( storage.hasCf() )
    {
        backupLocations.insert( "CF", storage.cfPath() );
        odebug << "Cf Path: " + storage.cfPath() << oendl;
    }
    if ( storage.hasSd() )
    {
        backupLocations.insert( "SD", storage.sdPath() );
        odebug << " Sd Path: " + storage.sdPath() << oendl;
    }
    if ( storage.hasMmc() )
    {
        backupLocations.insert( "MMC", storage.mmcPath() );
        odebug << "Mmc Path: " + storage.mmcPath() << oendl;
    }
    for ( QListViewItemIterator it( locationList ); it.current(); ++it )
    {
        backupLocations.insert( it.current()->text( 0 ), it.current()->text( 0 ) );
    }
    //update QComboBox
    storeToLocation->clear();
    restoreSource->clear();
    //read last locations
    Config config("BackupAndRestore");
    config.setGroup("LastLocation");
    QString lastStoreLocation   = config.readEntry( "LastStoreLocation", "" );
    QString lastRestoreLocation = config.readEntry( "LastRestoreLocation", "" );
    int locationIndex    = 0;
    //fill QComboBox
    QMap<QString, QString>::Iterator it;
    for( it = backupLocations.begin(); it != backupLocations.end(); ++it )
    {
        storeToLocation->insertItem(it.key());
        restoreSource->insertItem(it.key());
        //check for last locations
        if ( it.key() == lastStoreLocation )
            storeToLocation->setCurrentItem( locationIndex );
        if ( it.key() == lastRestoreLocation )
            restoreSource->setCurrentItem( locationIndex );
        locationIndex++;
    }
 }
 QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list)
 {
    while(item)
    {
        if(item->childCount() > 0)
            getAllItems(item->firstChild(), list);
        list.append(item);
        item = item->nextSibling();
    }
    return list;
 }
 /**
 * Selects and unselects the item by setting the HEADER_BACKUP to B or !.
 * and changing the icon to match
 * @param currentItem the item to swich the selection choice.
 */
 void BackupAndRestore::selectItem(QListViewItem *currentItem)
 {
    if(!currentItem)
        return;
    if(currentItem->text(HEADER_BACKUP) == "B")
    {
-        currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/null"));
+        currentItem->setPixmap(HEADER_NAME, Opie::Core::OResource::loadPixmap("backup/null"));
        currentItem->setText(HEADER_BACKUP, "");
    }
    else
    {
-        currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/check"));
+        currentItem->setPixmap(HEADER_NAME, Opie::Core::OResource::loadPixmap("backup/check"));
        currentItem->setText(HEADER_BACKUP, "B");
    }
 }
 void BackupAndRestore::scanForApplicationSettings()
 {
    QDir d( QDir::homeDirPath() + "/" + QString( applicationSettings->text(BACKUP_LOCATION) ) );
    d.setFilter( QDir::Dirs | QDir::Files | QDir::NoSymLinks );
    const QFileInfoList *list = d.entryInfoList();
    QFileInfoListIterator it( *list );
    QFileInfo *fi;
    while ( (fi=it.current()) )
    {
        //odebug << (d.path()+"/"+fi->fileName()).latin1() << oendl;
        if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) )
        {
            QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName());
            selectItem(newItem);
        }
        ++it;
    }
 }
 /**
 * The "Backup" button has been pressed.  Get a list of all of the files that
 * should be backed up.  If there are no files, emit and error and exit.
 * Determine the file name to store the backup in.  Backup the file(s) using
 * tar and gzip  --best.  Report failure or success
 */
 void BackupAndRestore::backup()
 {
    backupUserData();
 /*    if ( cb_type_userdata->isChecked() )
        backupUserData();
    else
        backupRootFs();*/
 }
 void BackupAndRestore::backupRootFs()
 {
    if ( ( ODevice::inst()->model() != Model_Zaurus_SL5000 ) && ( ODevice::inst()->model() != Model_Zaurus_SL5500 ) )
    {
        QMessageBox::critical( this, "Not yet implemented!", "<qt>Sorry, support for this model is not yet done.</qt>", "Ok" );
        return;
    }
    if ( !QFile::exists( "/usr/bin/mkfs.jffs2" ) && !QFile::exists( "/usr/sbin/mkfs.jffs2" ) )
    {
        QMessageBox::critical( this, "Can't find utility!", "<qt>Can't find mkfs.jffs2 - Install mtd-utils.</qt>", "Ok" );
        return;
    }
    // call 'mount' and parse its output to gather the device on which the root partition is mounted
    FILE* mountp = popen( "mount", "r" );
    QString device;
    QString mountpoint;
    {
        QTextStream mounto( mountp, IO_ReadOnly );
        QString on;
        QString type;
        QString filesystem;
        QString options;
        while ( !mounto.atEnd() )
        {
            mounto >> device >> on >> mountpoint >> type >> filesystem >> options;
            if ( mountpoint == "/" ) break;
        }
        odebug << device << " is formatted w/ '" << filesystem << "' and mounted on '" << mountpoint << "'" << oendl;
        if ( !device.startsWith( "/dev/mtdblock" ) )
        {
            QMessageBox::critical( this, "Can't backup!", QString( "<qt>unsupported root device '%1' - needs to be /dev/mtdblockN</qt>").arg( device ), "Ok" );
            return;
        }
    } // at this point, the QTextStream has been destroy and we can close the FILE*
    pclose( mountp );
 #if 1
    int rootmtd = device.right( 1 ).toInt();
 #else
    int rootmtd = 0;
 #endif
    odebug << "root mtdblock seems to be '" << rootmtd << "'" << oendl;
    // scan /proc/mtd to gather the size and erasesize of the root mtdblock
    QFile procmtdf( "/proc/mtd" );
    if ( !procmtdf.open( IO_ReadOnly ) )
    {
        QMessageBox::critical( this, "Can't backup!", "<qt>Can't open /proc/mtd</qt>", "Ok" );
        return;
    }
    QTextStream procmtd( &procmtdf );
    for ( int i = 0; i <= rootmtd; ++i ) procmtd.readLine(); // skip uninteresting things
    QString dev;
    QString size;
    QString erasesize;
    QString devname;
    procmtd >> dev >> size >> erasesize >> devname;
    odebug << "device " << dev << " size = " << size << ", erase size = " << erasesize << ", name = " << devname << "\"" << oendl;
    // compute pad
    QString pad = "--pad";
    switch ( ODevice::inst()->model() )
    {
        case Model_Zaurus_SL5000: pad = "--pad=14680064"; break;
        case Model_Zaurus_SL5500: pad = "--pad=14680064"; break;
        // FIXME: Add Beagle and SIMpad
    }
    // compute eraseblock
    QString eraseblock = "--eraseblock=0x" + erasesize;
    // compute output
    QString outputFile = "--output=" + backupLocations[storeToLocation->currentText()];
    QDateTime datetime = QDateTime::currentDateTime();
    QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') +
                         QString::number( datetime.date().day() ).rightJustify(2, '0');
    outputFile += "/initrd.bin-" + dateString;
    // call mkfs.jffs2 to create the backup
    QString cmdline = QString( "mkfs.jffs2 --faketime --root=/ %1 --little-endian %2 %3 -n" ).arg( outputFile ).arg( pad ).arg( eraseblock );
    cmdline.append( " --ignore=/tmp --ignore=/mnt --ignore=/var --ignore=/proc" );
    owarn << "Calling '" << cmdline << "'" << oendl;
    OWait *owait = new OWait();
    Global::statusMessage( tr( "Backing up..." ) );
    owait->show();
    qApp->processEvents();
    int r = ::system( cmdline );
    owait->hide();
    delete owait;
    if ( r != 0 )
    {
        perror("Error: ");
        QString errorMsg = QString( tr( "<qt>%1</qt>" ).arg( strerror( errno ) ) );
        QMessageBox::critical(this, tr( "Backup Failed!" ), errorMsg, QString( tr( "Ok" ) ) );
    }
    // FIXME: Add image postprocessing for C7x0 and C8x0, for Beagle, for SIMpad
 }
 void BackupAndRestore::backupUserData()
 {
    QString backupFiles;
    if(getBackupFiles(backupFiles, NULL) == 0)
    {
        QMessageBox::critical(this, "Message",
                              "No items selected.",QString("Ok") );
        return;
    }
    OWait *owait = new OWait();
    Global::statusMessage( tr( "Backing up..." ) );
    owait->show();
    qApp->processEvents();
    QString outputFile = backupLocations[storeToLocation->currentText()];
    QDateTime datetime = QDateTime::currentDateTime();
    QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') +
                         QString::number( datetime.date().day() ).rightJustify(2, '0');
    outputFile += "/" + dateString;
    QString t = outputFile;
    int c = 1;
    while(QFile::exists(outputFile + EXTENSION))
    {
        outputFile = t + QString("%1").arg(c);
        c++;
    }
    // We execute tar and compressing its output with gzip..
    // The error output will be written into a temp-file which could be provided
    // for debugging..
    odebug << "Storing file: " << outputFile.latin1() << "" << oendl;
    outputFile += EXTENSION;
    QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 Applications/backup/exclude -f %3 ) 2> %4" ).arg( QDir::homeDirPath() )
                          .arg( getExcludeFile() )
                          .arg( backupFiles )
                          .arg( outputFile.latin1() )
                          .arg( tempFileName.latin1() );
    odebug << commandLine << oendl;
    int r = system( commandLine );
    owait->hide();
    delete owait;
    //Error-Handling
    if(r != 0)
    {
        perror("Error: ");
        QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno );
        switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n"
                                      + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) )
        {
        case 1:
            owarn << "Details pressed !" << oendl;
            ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true );
            QFile errorFile( tempFileName );
            if ( errorFile.open(IO_ReadOnly) )
            {
                QTextStream t( &errorFile );
                QString s;
                while ( !t.eof() )
                {        // until end of file...
                    s += t.readLine();       // line of text excluding '\n'
                }
                errorFile.close();
                pErrDialog->m_textarea->setText( s );
            }
            else
            {
                pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" );
            }
            QPEApplication::execDialog( pErrDialog );
            delete pErrDialog;
            break;
        }
        setCaption(tr("Backup and Restore.. Failed !!"));
        return;
    }
    else
    {
        QMessageBox::information(this, tr( "Message" ), tr( "Backup Successful." ), QString(tr( "Ok" ) ) );
    }
    //write store-location
    Config config( "BackupAndRestore" );
    config.setGroup( "LastLocation" );
    config.writeEntry( "LastStoreLocation", storeToLocation->currentText() );
    setCaption(tr("Backup and Restore"));
 }
 /***
 * Get a list of all of the files to backup.
 */
 int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent)
 {
    QListViewItem * currentItem;
    QString currentHome;
    if(!parent)
        currentItem = backupList->firstChild();
    else
    {
        currentItem = parent->firstChild();
        currentHome = parent->text(BACKUP_LOCATION);
    }
    uint count = 0;
    while( currentItem != 0 )
    {
        if(currentItem->text(HEADER_BACKUP) == "B" )
        {
            if(currentItem->childCount() == 0 )
            {
                if(parent == NULL)
                    backupFiles += currentItem->text(BACKUP_LOCATION);
                else
                    backupFiles += currentHome + currentItem->text(HEADER_NAME);
                backupFiles += " ";
                count++;
            }
            else
            {
                count += getBackupFiles(backupFiles, currentItem);
            }
        }
        currentItem = currentItem->nextSibling();
    }
    return count;
 }
 void BackupAndRestore::sourceDirChanged(int selection)
 {
    restoreList->clear();
    rescanFolder(backupLocations[restoreSource->text(selection)]);
 }
 void BackupAndRestore::fileListUpdate()
 {
    owarn << "void BackupAndRestore::fileListUpdate()" << oendl;
    restoreList->clear();
    rescanFolder( backupLocations[restoreSource->currentText()] );
 }
 /**
 * Scans directory for any backup files.  Will recursivly go down,
 * but will not follow symlinks.
 * @param directory - the directory to look in.
 */
 void BackupAndRestore::rescanFolder(QString directory)
 {
    //odebug << QString("rescanFolder: ") + directory.latin1() << oendl;
    QDir d(directory);
    if(!d.exists())
        return;
    d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs);
    const QFileInfoList *list = d.entryInfoList();
    QFileInfoListIterator it( *list );
    QFileInfo *file;
    while ( (file=it.current()) )
    {  // for each file...
        // If it is a dir and not .. or . then add it as a tab and go down.
        if(file->isDir())
        {
            if(file->fileName() != ".." && file->fileName() != ".")
            {
                rescanFolder(directory + "/" + file->fileName());
            }
        }
        else
        {
            // If it is a backup file add to list.
            if(file->fileName().contains(EXTENSION))
                (void)new QListViewItem(restoreList, file->fileName());
        }
        ++it;
    }
 }
 /**
 * Restore a backup file.
 * Report errors or success
 */
 void BackupAndRestore::restore()
 {
    QListViewItem *restoreItem = restoreList->currentItem();
    if(!restoreItem)
    {
        QMessageBox::critical(this, tr( "Message" ),
                              tr( "Please select something to restore." ),QString( tr( "Ok") ) );
        return;
    }
    if ( QMessageBox::warning( this, tr( "Restore" ),
                                     tr( "Would you really overwrite your local data?" ),
                                     tr( "Yes" ), tr( "No" ), "", 1 ) == 1 )
        return;
    OWait *owait = new OWait();
    Global::statusMessage( tr( "Restore Backup..." ) );
    owait->show();
    qApp->processEvents();
    QString restoreFile = backupLocations[restoreSource->currentText()];
    restoreFile += "/" + restoreItem->text(0);
    odebug << restoreFile << oendl;
    //check if backup file come from opie 1.0.x
    QString commandLine = QString( "tar -tzf %1 | grep Applications/backup/exclude" ).arg( restoreFile.latin1() );
    int r = system( commandLine );
    QString startDir;
    if( r != 0 ) //Applications/backup/exclude not found - old backup file
    {
        startDir = QString( "/" );
    } else
    {
        startDir = QDir::homeDirPath();
    }
    //unpack backup file
    commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( startDir )
                  .arg( restoreFile.latin1() )
                  .arg( tempFileName.latin1() );
    odebug << commandLine << oendl;
    r = system( commandLine );
    owait->hide();
    delete owait;
    //error handling
    if(r != 0)
    {
        QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno );
        switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n"
                                      + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) )
        {
        case 1:
            owarn << "Details pressed !" << oendl;
            ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true );
            QFile errorFile( tempFileName );
            if ( errorFile.open(IO_ReadOnly) )
            {
                QTextStream t( &errorFile );
                QString s;
                while ( !t.eof() )
                {        // until end of file...
                    s += t.readLine();       // line of text excluding '\n'
                }
                errorFile.close();
                pErrDialog->m_textarea->setText( s );
            }
            else
            {
                pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) );
            }
            QPEApplication::execDialog( pErrDialog );
            delete pErrDialog;
            setCaption(tr("Backup and Restore.. Failed !!"));
            return;
            break;
        }
    }
    else
    {
        QMessageBox::information(this, tr( "Message" ), tr( "Restore Successful." ), QString( tr( "Ok") ) );
    }
    //write restore-location
    Config config( "BackupAndRestore" );
    config.setGroup( "LastLocation" );
    config.writeEntry( "LastRestoreLocation", restoreSource->currentText() );
    setCaption(tr("Backup and Restore"));
 }
 /**
 * Check for exclude in Applications/backup
 * If it does not exist, the function will create the file with *.bck as content
 * The exclude_files is read by tar and will provide to exclude special files out from backup.
 * e.g. alle *.bck files (backup-files) will not be backed up by default
 */
 QString BackupAndRestore::getExcludeFile()
 {
    QString excludeFileName = Global::applicationFileName( "backup", "exclude" );
    if ( !QFile::exists( excludeFileName ) )
    {
        QFile excludeFile( excludeFileName);
        if ( excludeFile.open( IO_WriteOnly ) == true )
        {
            QTextStream writeStream( &excludeFile );
            writeStream << "*.bck" << "\n";
            excludeFile.close();
        }
        else
        {
            return QString::null;
        }
    }
    return excludeFileName;
 }
 void BackupAndRestore::refreshLocations()
 {
    locationList->clear();
    //todo: implement add locations
    Config config( "BackupAndRestore" );
    config.setGroup( "Locations" );
    QStringList locations( config.readListEntry( "locations", '|' ) );
    for ( QStringList::Iterator it = locations.begin(); it != locations.end(); ++it ) {
         (void) new QListViewItem( locationList, *it );
    }
 }
 void BackupAndRestore::addLocation()
 {
    if ( ( !locationEdit->text().isEmpty() ) &&
         ( QDir( locationEdit->text() ).exists() ) )
    {
        (void) new QListViewItem( locationList, locationEdit->text() );
        locationEdit->setText( "" );
        saveLocations();
    }
 }
 void BackupAndRestore::removeLocation()
 {
    if ( locationList->selectedItem() )
    {
        delete( locationList->selectedItem() );
        saveLocations();
    }
 }
 void BackupAndRestore::saveLocations()
 {
    Config config("BackupAndRestore");
    config.setGroup("Locations");
    QStringList locations;
    for ( QListViewItemIterator it( locationList ); it.current(); ++it )
    {
        locations.append( it.current()->text( 0 ) );
    }
    config.writeEntry( "locations", locations, '|' );
    refreshBackupLocations();
 }
 void BackupAndRestore::selectLocation()
 {
    QString location = OFileDialog::getDirectory( OFileSelector::DIRECTORYSELECTOR );
    if ( !location.isEmpty() )
    {
        locationEdit->setText( location );
    }
 }
 // backuprestore.cpp