6 files changed, 116 insertions, 53 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index 76d0a80..896e370 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -1,402 +1,466 @@
 /***************************************************************************
                          installdlgimpl.cpp  -  description
                             -------------------
    begin                : Mon Aug 26 2002
    copyright            : (C) 2002 by Andy Qua
    email                : andy.qua@blueyonder.co.uk
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #include <stdio.h>
 #include <opie/ofiledialog.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"
 enum {
        MAXLINES = 100,
 };
-InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *dataManager, const char *title )
+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->option = item->option;
-        newitem->packageName = item->packageName;
+                newitem->packageName = item->packageName;
-        newitem->destination = item->destination;
+                newitem->destination = item->destination;
-        newitem->recreateLinks = item->recreateLinks;
+                newitem->recreateLinks = item->recreateLinks;
-        
+                packages.append( newitem );
-        if ( item->option == "I" )
+                if ( item->option == "I" )
                {
-                        installList.append( newitem );
                        install.append( QString( "   %1\n" ).arg( item->packageName ) );
                }
                else if ( item->option == "D" )
                {
-                        removeList.append( newitem );
                        remove.append( QString( "   %1\n" ).arg( item->packageName ) );
                }
                else if ( item->option == "U" || item->option == "R" )
                {
-            updateList.append( newitem );
+                        QString type;
-            QString type;
+                        if ( item->option == "R" )
-            if ( item->option == "R" )
+                                type = tr( "(ReInstall)" );
-                type = tr( "(ReInstall)" );
+                        else
-            else
+                                type = tr( "(Upgrade)" );
-                type = tr( "(Upgrade)" );
+                        upgrade.append( QString( "   %1 %2\n" ).arg( item->packageName ).arg( type ) );
-            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() );
+        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 );
    layout->addWidget( btnInstall, 3, 0 );
    connect( btnInstall, SIGNAL( clicked() ), this, SLOT( installSelected() ) );
    
    btnOptions = new QPushButton( Resource::loadPixmap( "SettingsIcon" ), 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" ) );
        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" ) );
    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" );
+/*        
+                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;
+*/
    }
-    btnOptions->setEnabled( true );
-//    btnInstall->setEnabled( true );
-    btnInstall->setText( tr( "Close" ) );
-    btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
-    
-    btnOptions->setText( tr( "Save output" ) );
-    btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
-    if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
-        displayAvailableSpace( destination->currentText() );
 }
 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 total = totalBlocks * mult / div;
        long avail = availBlocks * mult / div;
 //        long used = total - avail;
        space.sprintf( "%ld Kb", 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" ) );
+                btnOptions->setText( tr( "Save output" ) );
+                btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
+                if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
+                        displayAvailableSpace( destination->currentText() );
+        }
+}
+\ No newline at end of file
diff --git a/noncore/settings/aqpkg/installdlgimpl.h b/noncore/settings/aqpkg/installdlgimpl.h
index 15cf427..9a7dbff 100644
--- a/noncore/settings/aqpkg/installdlgimpl.h
+++ b/noncore/settings/aqpkg/installdlgimpl.h
@@ -1,86 +1,86 @@
 /***************************************************************************
                          installdlgimpl.h  -  description
                             -------------------
    begin                : Mon Aug 26 2002
    copyright            : (C) 2002 by Andy Qua
    email                : andy.qua@blueyonder.co.uk
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #ifndef INSTALLDLGIMPL_H
 #define INSTALLDLGIMPL_H
 using namespace std;
 #include <qlist.h>
 #include <qstring.h>
 #include <qwidget.h>
 class QComboBox;
 class QLabel;
 class QMultiLineEdit;
 class QPushButton;
 class DataManager;
 class Destination;
 class Ipkg;
 class InstallData
 {
 public:
    QString option;            // I - install, D - delete, R- reinstall U - upgrade
    QString packageName;
    Destination *destination;
    bool recreateLinks;
 };
 class InstallDlgImpl : public QWidget
 {
    Q_OBJECT
 public:
-    InstallDlgImpl( QList<InstallData> &packageList, DataManager *dataManager, const char *title = 0 );
+    InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title = 0 );
    InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title = 0 );
    ~InstallDlgImpl();
        bool upgradeServer( QString &server );
 protected:
 private:
    DataManager *dataMgr;
-    QList<InstallData> installList;
+    QList<InstallData> packages;
-    QList<InstallData> removeList;
+        bool firstPackage;
-    QList<InstallData> updateList;
    int flags;
    int infoLevel;
    Ipkg *pIpkg;
    bool upgradePackages;
    
    QComboBox      *destination;
    QPushButton    *btnInstall;
    QPushButton    *btnOptions;
    QMultiLineEdit *output;
    QLabel         *txtAvailableSpace;
    void init( bool );
    
    bool runIpkg( QString &option, const QString& package, const QString& dest, int flags );
 signals:
    void reloadData( InstallDlgImpl * );
        
 public slots:
    void optionsSelected();
    void installSelected();
    void displayText(const QString &text );
    void displayAvailableSpace( const QString &text);
+        void ipkgFinished();
 };
 #endif
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index e906653..34999ad 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -1,578 +1,575 @@
 /***************************************************************************
                          ipkg.cpp  -  description
                             -------------------
    begin                : Sat Aug 31 2002
    copyright            : (C) 2002 by Andy Qua
    email                : andy.qua@blueyonder.co.uk
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #include <fstream>
 #include <iostream>
 #include <vector>
 using namespace std;
 #include <stdio.h>
 #include <unistd.h>
 #ifdef QWS
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #include <qdir.h>
 #include <qtextstream.h>
 #include <opie/oprocess.h>
 #include "utils.h"
 #include "ipkg.h"
 #include "global.h"
 Ipkg :: Ipkg()
 {
    proc = 0;
 }
 Ipkg :: ~Ipkg()
 {
 }
 // Option is what we are going to do - install, upgrade, download, reinstall
 // package is the package name to install - either a fully qualified path and ipk
 //   file (if stored locally) or just the name of the package (for a network package)
 // packageName is the package name - (for a network package this will be the same as
 //    package parameter)
 // dest is the destination alias (from ipk.conf)
 // destDir is the dir that the destination alias points to (used to link to root)
 // flags is the ipkg options flags
 // dir is the directory to run ipkg in (defaults to "")
-bool Ipkg :: runIpkg( )
+void Ipkg :: runIpkg()
 {
    error = false;
-    bool ret = false;
    QStringList commands;
    QDir::setCurrent( "/tmp" );
    if ( runtimeDir != "" )
    {
        commands << "cd ";
        commands << runtimeDir;
        commands << ";";
    }
    commands << "ipkg" << "-V" << QString::number( infoLevel ) << "-force-defaults";
    // only set the destination for an install operation
    if ( option == "install" )
        commands << "-dest" << destination;
    if ( option != "update" && option != "download" )
    {
        if ( flags & FORCE_DEPENDS )
            commands << "-force-depends";
        if ( flags & FORCE_REINSTALL  )
            commands << "-force-reinstall";
        if ( flags & FORCE_REMOVE )
            commands << "-force-removal-of-essential-packages";
        if ( flags & FORCE_OVERWRITE )
            commands << "-force-overwrite";
        if ( infoLevel == 3 )
            commands << "-verbose_wget";
        // Handle make links
        // Rules - If make links is switched on, create links to root
        // if destDir is NOT /
        if ( flags & MAKE_LINKS )
        {
            // If destDir == / turn off make links as package is being insalled
            // to root already.
            if ( destDir == "/" )
                flags ^= MAKE_LINKS;
        }
    }
    
 #ifdef X86
    commands << "-f";
    commands << IPKG_CONF;
 #endif
    if ( option == "reinstall" )
        commands << "install";
    else
        commands << option;
    if ( package != "" )
        commands << package;
    if ( package != "" )
        emit outputText( QString( "Dealing with package " ) + package );
    qApp->processEvents();
    // If we are removing, reinstalling or upgrading packages and make links option is selected
    // create the links
    if ( option == "remove" || option == "reinstall" || option == "upgrade" )
    {
        createLinks = false;
        if ( flags & MAKE_LINKS )
        {
            emit outputText( QString( "Removing symbolic links...\n" ) );
            linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
            emit outputText( QString( " " ) );
        }
    }
    
    // Execute command
    dependantPackages = new QList<QString>;
    dependantPackages->setAutoDelete( true );
-    ret = executeIpkgCommand( commands, option );
+    executeIpkgCommand( commands, option );
-    if ( aborted )
+}
-        return false;
+void Ipkg :: createSymLinks()
+{
    if ( option == "install" || option == "reinstall" || option == "upgrade" )
    {
        // If we are not removing packages and make links option is selected
        // create the links
        createLinks = true;
        if ( flags & MAKE_LINKS )
        {
            emit outputText( " " );
            emit outputText( QString( "Creating symbolic links for " )+ package );
            linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
            // link dependant packages that were installed with this release
            QString *pkg;
            for ( pkg = dependantPackages->first(); pkg != 0; pkg = dependantPackages->next() )
            {
                if ( *pkg == package )
                    continue;
                emit outputText( " " );
                emit outputText( QString( "Creating symbolic links for " )+ (*pkg) );
                linkPackage( Utils::getPackageNameFromIpkFilename( *pkg ), destination, destDir );
            }
        }
    }
    delete dependantPackages;
    emit outputText( "Finished" );
    emit outputText( "" );
-    return ret;
 }
 void Ipkg :: removeStatusEntry()
 {
    QString statusFile = destDir;
    if ( statusFile.right( 1 ) != "/" )
        statusFile.append( "/" );
    statusFile.append( "usr/lib/ipkg/status" );
    QString outStatusFile = statusFile;
    outStatusFile.append( ".tmp" );
    emit outputText( "" );
    emit outputText( "Removing status entry..." );
    QString tempstr = "status file - ";
    tempstr.append( statusFile );
    emit outputText( tempstr );
    tempstr = "package - ";
    tempstr.append( package );
    emit outputText( tempstr );
    
    ifstream in( statusFile );
    ofstream out( outStatusFile );
    if ( !in.is_open() )
    {
        tempstr = "Couldn't open status file - ";
        tempstr.append( statusFile );
        emit outputText( tempstr );
        return;
    }
    if ( !out.is_open() )
    {
        tempstr = "Couldn't create tempory status file - ";
        tempstr.append( outStatusFile );
        emit outputText( tempstr );
        return;
    }
    char line[1001];
    char k[21];
    char v[1001];
    QString key;
    QString value;
    vector<QString> lines;
    do
    {
        in.getline( line, 1000 );
        if ( in.eof() )
            continue;
        k[0] = '\0';
        v[0] = '\0';
        sscanf( line, "%[^:]: %[^\n]", k, v );
        key = k;
        value = v;
        key = key.stripWhiteSpace();
        value = value.stripWhiteSpace();
        if ( key == "Package" && value == package )
        {
            // Ignore all lines up to next empty
            do
            {
                in.getline( line, 1000 );
                if ( in.eof() || QString( line ).stripWhiteSpace() == "" )
                    continue;
            } while ( !in.eof() && QString( line ).stripWhiteSpace() != "" );
        }
        lines.push_back( QString( line ) );
        out << line << endl;
    } while ( !in.eof() );
    // Write lines out
    vector<QString>::iterator it;
    for ( it = lines.begin() ; it != lines.end() ; ++it )
    {
        out << (const char *)(*it) << endl;
    }
    
    in.close();
    out.close();
    // Remove old status file and put tmp stats file in its place
    remove( statusFile );
    rename( outStatusFile, statusFile );
 }
 int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
 {
    // If one is already running - should never be but just to be safe
    if ( proc )
    {
        delete proc;
        proc = 0;
    }
    
    // OK we're gonna use OProcess to run this thing
    proc = new OProcess();
    aborted = false;
    // Connect up our slots
    connect(proc, SIGNAL(processExited(OProcess *)),
            this, SLOT( processFinished()));
    connect(proc, SIGNAL(receivedStdout(OProcess *, char *, int)),
            this, SLOT(commandStdout(OProcess *, char *, int)));
    connect(proc, SIGNAL(receivedStderr(OProcess *, char *, int)),
            this, SLOT(commandStderr(OProcess *, char *, int)));
    
    for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it )
    {
         *proc << (*it).latin1();
    }
    // Start the process going
    finished = false;
    if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
    {
        emit outputText( QString( "Couldn't start ipkg process" ) );
    }
-    // Now wait for it to finish
-    while ( !finished )
-        qApp->processEvents();
 }
 void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
 {
    QString lineStr = buffer;
    if ( lineStr[buflen-1] == '\n' )
        buflen --;
    lineStr = lineStr.left( buflen );
    emit outputText( lineStr );
    // check if we are installing dependant packages
    if ( option == "install" || option == "reinstall" )
    {
        // Need to keep track of any dependant packages that get installed
        // so that we can create links to them as necessary
        if ( lineStr.startsWith( "Installing " ) )
        {
            int start = lineStr.find( " " ) + 1;
            int end = lineStr.find( " ", start );
            QString *package = new QString( lineStr.mid( start, end-start ) );
            dependantPackages->append( package );
        }
    }
    else if ( option == "remove" && !( flags & FORCE_DEPENDS ) &&
              lineStr.find( "is depended upon by packages:" ) != -1 )
    {
        // Ipkg should send this to STDERR, but doesn't - so trap here
        error = true;
    }
    
    buffer[0] = '\0';
 }
 void Ipkg::commandStderr(OProcess*, char *buffer, int buflen)
 {
    QString lineStr = buffer;
    if ( lineStr[buflen-1] == '\n' )
        buflen --;
    lineStr=lineStr.left( buflen );
    emit outputText( lineStr );
    buffer[0] = '\0';
    error = true;
 }
 void Ipkg::processFinished()
 {
    // Finally, if we are removing a package, remove its entry from the <destdir>/usr/lib/ipkg/status file
    // to workaround an ipkg bug which stops reinstall to a different location
    if ( !error && option == "remove" )
        removeStatusEntry();
    
    delete proc;
    proc = 0;
    finished = true;
+        emit ipkgFinished();
 }
 void Ipkg :: abort()
 {
    if ( proc )
    {
        proc->kill();
        aborted = true;
    }
 }
 /*
 int Ipkg :: executeIpkgCommand( QString &cmd, const QString option )
 {
    FILE *fp = NULL;
    char line[130];
    QString lineStr, lineStrOld;
    int ret = false;
    fp = popen( (const char *) cmd, "r");
    if ( fp == NULL )
    {
        QString text;
        text.sprintf( "Couldn't execute %s! See stdout for error code", (const char *)cmd );
        emit outputText( text );
    }
    else
    {
        while ( fgets( line, sizeof line, fp) != NULL )
        {
            lineStr = line;
            lineStr=lineStr.left( lineStr.length()-1 );
            if ( lineStr != lineStrOld )
            {
                //See if we're finished
                if ( option == "install" || option == "reinstall" )
                {
                    // Need to keep track of any dependant packages that get installed
                    // so that we can create links to them as necessary
                    if ( lineStr.startsWith( "Installing " ) )
                    {
                        int start = lineStr.find( " " ) + 1;
                        int end = lineStr.find( " ", start );
                        QString *package = new QString( lineStr.mid( start, end-start ) );
                        dependantPackages->append( package );
                    }
                }
                if ( option == "update" )
                {
                    if (lineStr.contains("Updated list"))
                        ret = true;
                }
                else if ( option == "download" )
                {
                    if (lineStr.contains("Downloaded"))
                        ret = true;
                }
                else
                {
                    if (lineStr.contains("Done"))
                        ret = true;
                }
                emit outputText( lineStr );
            }
            lineStrOld = lineStr;
            qApp->processEvents();
        }
        pclose(fp);
    }
    return ret;
 }
 */
 void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, const QString &destDir )
 {
    if ( dest == "root" || dest == "/" )
        return;
        
    qApp->processEvents();
    QStringList *fileList = getList( packFileName, destDir );
    qApp->processEvents();
    processFileList( fileList, destDir );
    delete fileList;
 }
 QStringList* Ipkg :: getList( const QString &packageFilename, const QString &destDir )
 {
    QString packageFileDir = destDir;
    packageFileDir.append( "/usr/lib/ipkg/info/" );
    packageFileDir.append( packageFilename );
    packageFileDir.append( ".list" );
    QFile f( packageFileDir );
    if ( !f.open(IO_ReadOnly) )
    {
        // Couldn't open from dest, try from /
        f.close();
        
        packageFileDir = "/usr/lib/ipkg/info/";
        packageFileDir.append( packageFilename );
        packageFileDir.append( ".list" );
        f.setName( packageFileDir );
        if ( ! f.open(IO_ReadOnly) )
        {
            QString tempstr = "Could not open :";
            tempstr.append( packageFileDir );
            emit outputText( tempstr );
            return (QStringList*)0;
        }
    }
    QStringList *fileList = new QStringList();
    QTextStream t( &f );
    while ( !t.eof() )
        *fileList += t.readLine();
    f.close();
    return fileList;
 }
 void Ipkg :: processFileList( const QStringList *fileList, const QString &destDir )
 {
    if ( !fileList || fileList->isEmpty() )
        return;
    QString baseDir = ROOT;
    if ( createLinks == true )
    {
        for ( uint i=0; i < fileList->count(); i++ )
        {
            processLinkDir( (*fileList)[i], baseDir, destDir );
            qApp->processEvents();
        }
    }
    else
    {
        for ( int i = fileList->count()-1; i >= 0 ; i-- )
        {
            processLinkDir( (*fileList)[i], baseDir, destDir );
            qApp->processEvents();
        }
    }
 }
 void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const QString &baseDir )
 {
    QString sourceFile = baseDir;
    sourceFile.append( file );
    
    QString linkFile = destDir;
    if ( file.startsWith( "/" ) && destDir.right( 1 ) == "/" )
    {
        linkFile.append( file.mid( 1 ) );
    }   
    else
    {
        linkFile.append( file );
    }
    QString text;
    if ( createLinks )
    {
        // If this file is a directory (ends with a /) and it doesn't exist,
        // we need to create it
        if ( file.right(1) == "/" )
        {
            QFileInfo f( linkFile );
            if ( !f.exists() )
            {
                QString tempstr = "Creating directory ";
                tempstr.append( linkFile );
                emit outputText( tempstr );
                QDir d;
                d.mkdir( linkFile, true );
            }
 //            else
 //                emit outputText( QString( "Directory " ) + linkFile + " already exists" );
            
        }
        else
        {
            int rc = symlink( sourceFile, linkFile );
            text = (rc == 0 ? "Linked " : "Failed to link ");
            text.append( sourceFile );
            text.append( " to " );
            text.append( linkFile );
            emit outputText( text );
        }
    }
    else
    {
        QFileInfo f( linkFile );
        if ( f.exists() )
        {
            if ( f.isFile() )
            {
                QFile f( linkFile );
                bool rc = f.remove();
                text = (rc ? "Removed " : "Failed to remove ");
                text.append( linkFile );
                emit outputText( text );
            }
            else if ( f.isDir() )
            {
                QDir d;
                bool rc = d.rmdir( linkFile, true );
                if ( rc )
                {
                    text = (rc ? "Removed " : "Failed to remove ");
                    text.append( linkFile );
                    emit outputText( text );
                }
            }
        }
    }
 }
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index 531bfc0..a0d38e3 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
@@ -1,90 +1,92 @@
 /***************************************************************************
                          ipkg.h  -  description
                             -------------------
    begin                : Sat Aug 31 2002
    copyright            : (C) 2002 by Andy Qua
    email                : andy.qua@blueyonder.co.uk
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #ifndef IPKG_H
 #define IPKG_H
 /**
  *@author Andy Qua
  */
 #include <qobject.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qlist.h>
 #define FORCE_DEPENDS                           0x0001
 #define FORCE_REMOVE                            0x0002
 #define FORCE_REINSTALL                         0x0004
 #define FORCE_OVERWRITE                         0x0008
 #define MAKE_LINKS                              0x0010
 #define VERBOSE_WGET                            0x0020
 class OProcess;
 class Ipkg : public QObject
 {
    Q_OBJECT
 public:
    Ipkg();
    ~Ipkg();
-    bool runIpkg( );
+        void runIpkg();
+        void createSymLinks();
    void setOption( const char *opt )               { option = opt; }
    void setPackage( const char *pkg )              { package = pkg; }
    void setDestination( const char *dest )         { destination = dest; }
    void setDestinationDir( const char *dir )       { destDir = dir; }
    void setFlags( int fl, int il )                 { flags = fl; infoLevel = il; }
    void setRuntimeDirectory( const char *dir )     { runtimeDir = dir; }
 signals:
    void outputText( const QString &text );
+        void ipkgFinished();
 public slots:
    void commandStdout(OProcess*, char *buffer, int buflen);
    void commandStderr(OProcess*, char *buffer, int buflen);
    void processFinished();
    void abort();
    
 private:
    bool createLinks;
    bool aborted;
    bool error;
    QString option;
    QString package;
    QString destination;
    QString destDir;
    QString runtimeDir;
    OProcess *proc;
    int flags;
    int infoLevel;
    bool finished;
    QList<QString> *dependantPackages;
    
    int executeIpkgCommand( QStringList &cmd, const QString option );
    void removeStatusEntry();
    void linkPackage( const QString &packFileName, const QString &dest, const QString &destDir );
    QStringList* getList( const QString &packageFilename, const QString &destDir );
    void processFileList( const QStringList *fileList, const QString &destDir );
    void processLinkDir( const QString &file, const QString &baseDir, const QString &destDir );
    
 };
 #endif
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 1aec6a8..58f6feb 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -1,1158 +1,1158 @@
 /***************************************************************************
                          mainwin.cpp  -  description
                             -------------------
    begin                : Mon Aug 26 13:32:30 BST 2002
    copyright            : (C) 2002 by Andy Qua
    email                : andy.qua@blueyonder.co.uk
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #include <linux/limits.h>
 #include <unistd.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qmenubar.h>
 #include <qpe/qpeapplication.h>
 #include <qtoolbar.h>
 #include <qpe/config.h>
 #include <qpe/resource.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>
 #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"
 extern int compareVersions( const char *v1, const char *v2 );
 MainWindow :: MainWindow()
                :QMainWindow( 0x0, 0x0, WStyle_ContextHelp )
 {
    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 );
    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->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->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" );
    iconRemove = Resource::loadPixmap( "aqpkg/remove" );
    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->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->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->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->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->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->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->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;
 }
 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" );
    updatedIcon = Resource::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 );
 //    std::cout << "Selecting package " << package << std::endl;
    // 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();
 //        cout << "Adding " << it->getServerName() << " to combobox" << endl;
        if ( !server->isServerActive() )
        {
 //            cout << serverName << " is not active" << endl;
            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() )
    {
 //        cout << "searching for " << text << endl;
        // look through package list for text startng at current position
 //        vector<InstallData> workingPackages;
        QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
 //        if ( start != 0 )
 //            start = (QCheckListItem *)start->nextSibling();
        if ( start == 0 )
            start = (QCheckListItem *)packagesList->firstChild();
        for ( QCheckListItem *item = start; item != 0 ;
              item = (QCheckListItem *)item->nextSibling() )
        {
 //            cout << "checking " << item->text().lower() << endl;
            if ( item->text().lower().find( text ) != -1 )
            {
 //                cout << "matched " << item->text() << endl;
                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 * ) ) );
    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 * ) ) );
        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 * ) ) );
    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() )
        {
            workingPackages.append( dealWithItem( item ) );
                }
    }
    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 * ) ) );
    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();;
+        InstallData *newitem = new InstallData();
        newitem->option = "I";
        newitem->packageName = name;
        return newitem;
    }
    else
    {
-        InstallData *newitem = new InstallData();;
+        InstallData *newitem = new InstallData();
        newitem->option = "D";
        if ( !p->isPackageStoredLocally() )
            newitem->packageName = p->getInstalledPackageName();
        else
            newitem->packageName = name;
        if ( p->getInstalledTo() )
        {
            newitem->destination = p->getInstalledTo();
 //            cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl;
 //            cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl;
        }
        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";
        }
        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 = tr( "R" );
            }
            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 = tr( "U" );
            }
            // 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 );
                switch( QMessageBox::information( this, text,
                                    msgtext, tr( "Remove" ), secondButton ) )
                {
                    case 0: // Try again or Enter
                        // option 0 = Remove
                        newitem->option = "D";
                        break;
                    case 1: // Quit or Escape
                        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
    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 ) );
    p->showMaximized();
 }
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index 0295519..c4548b1 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -1,141 +1,141 @@
 /***************************************************************************
                          mainwin.h  -  description
                             -------------------
    begin                : Mon Aug 26 13:32:30 BST 2002
    copyright            : (C) 2002 by Andy Qua
    email                : andy.qua@blueyonder.co.uk
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #ifndef MAINWIN_H
 #define MAINWIN_H
 #include <qmainwindow.h>
 #include <qpixmap.h>
 class DataManager;
 class InstallData;
 class InstallDlgImpl;
 class QAction;
 class QCheckListItem;
 class QComboBox;
 class QLabel;
 class QLineEdit;
 class QListView;
 class QListViewItem;
 class QToolBar;
 class QProgressBar;
 class QWidgetStack;
 class MainWindow :public  QMainWindow
 {
        Q_OBJECT
 public:
        MainWindow();
        ~MainWindow();
 protected:
    void closeEvent( QCloseEvent* e );
 private:
    DataManager *mgr;
    QWidgetStack *stack;
    
    QToolBar *findBar;
    QToolBar *jumpBar;
    QLineEdit  *findEdit;
    QAction    *actionFindNext;
    QAction    *actionFilter;
    QAction    *actionUpgrade;
    QAction    *actionDownload;
    QAction    *actionUninstalled;
    QAction    *actionInstalled;
    QAction    *actionUpdated;
    
    QPixmap iconDownload;
    QPixmap iconRemove;
    
    int mnuShowUninstalledPkgsId;
    int mnuShowInstalledPkgsId;
    int mnuShowUpgradedPkgsId;
    int mnuFilterByCategory;
    int mnuSetFilterCategory;
    // Main package list widget
    QWidget   *networkPkgWindow;
    QComboBox *serversList;
    QListView *packagesList;
    QPixmap    installedIcon;
    QPixmap    updatedIcon;
    QString    currentlySelectedServer;
    QString    categoryFilter;
    QString    stickyOption;
    bool categoryFilterEnabled;
    bool showJumpTo;
    bool showUninstalledPkgs;
    bool showInstalledPkgs;
    bool showUpgradedPkgs;
    bool downloadEnabled;
    void initMainWidget();
    void updateData();
    void serverSelected( int index, bool showProgress );
    void searchForPackage( const QString & );
    bool filterByCategory( bool val );
    void downloadSelectedPackages();
    void downloadRemotePackage();
    InstallData *dealWithItem( QCheckListItem *item );
    
    // Progress widget
    QWidget      *progressWindow;
    QLabel       *m_status;
    QProgressBar *m_progress;
    
    void initProgressWidget();
    
 public slots:
-//    void setDocument( const QString &doc );
+    void setDocument( const QString &doc );
    void displayFindBar();
    void displayJumpBar();
    void repeatFind();
    void findPackage( const QString & );
    void hideFindBar();
    void hideJumpBar();
    void displaySettings();
    void filterUninstalledPackages();
    void filterInstalledPackages();
    void filterUpgradedPackages();
    void filterCategory();
    bool setFilterCategory();
    void raiseMainWidget();
    void raiseProgressWidget();
    void enableUpgrade( bool );
    void enableDownload( bool );
    void reloadData( InstallDlgImpl * );
 private slots:
    void init();
    void setProgressSteps( int );
    void setProgressMessage( const QString & );
    void updateProgress( int );
    void serverSelected( int index );
    void updateServer();
    void upgradePackages();
    void downloadPackage();
    void applyChanges();
    void letterPushed( QString t );
    void slotDisplayPackage( QListViewItem * );
 };
 #endif