22 files changed, 93 insertions, 127 deletions
diff --git a/noncore/settings/packagemanager/ChangeLog b/noncore/settings/packagemanager/ChangeLog
index d53a2b3..c9e33c4 100644
--- a/noncore/settings/packagemanager/ChangeLog
+++ b/noncore/settings/packagemanager/ChangeLog
@@ -1,24 +1,33 @@
+2004-04-21 Dan Williams <drw@handhelds.org>
+    * Released version 0.4.0
+    * Added saving of ipkg configuration information
+    * Re-initialize ipkg when configuration information changes
+    * Added QWhatsThis for all UI controls
+    * Remove Location from OConfItem as it is not used/needed
+    * Re-ordered includes to follow Opie standards
 2004-02-13 Dan Williams <drw@handhelds.org>
    * Released version 0.3.0
    * Fix handling of filtering options in View menu
    * Do proper version string comparison
    * Fix string alignment code in PromptDlg to eliminate QT warning messages
 2004-02-12 Dan Williams <drw@handhelds.org>
    * Package information dialog implemented
    * What's This app icon enabled
    * Changed all QDialog::exec() occurences to QPEApplication::execDialog()
 2004-01-23 Dan Williams <drw@handhelds.org>
    * Added package download functionality
    * Have Opie update links after install/removal so that apps
      will display properly in Launcher
 2004-01-20 Dan Williams <drw@handhelds.org>
    * Released version 0.2.0
    * Converted to use libipkg in place of spawning ipkg process
diff --git a/noncore/settings/packagemanager/README b/noncore/settings/packagemanager/README
index 9324f9c..bf93c98 100644
--- a/noncore/settings/packagemanager/README
+++ b/noncore/settings/packagemanager/README
@@ -1,29 +1,29 @@
 /************************************************************************
 /*
 /*                       Opie - Package Manager
 /*                      ========================
-/*                           Version 0.3.0
+/*                           Version 0.4.0
 /*
 /*                A package management client for Opie
 /*
 /************************************************************************
 -------------------------------------------------------
 Release Notes for Opie-PackageManager - January, 2004
 -------------------------------------------------------
 ======================
 =       To-do        =
 ======================
 - See $OPIEDIR/noncore/settings/packagemanager/TODO for more info.
 ======================
 =        Build       =
 ======================
 In order to build opie-packagemanager, libipkg needs to be present on
 the build system along with the appropriate headers.
 - libipkg source (best to use version 109 or greater):
  - Familiar CVS directory: familiar/dist/ipkg/C (e.g. 'cvs co familiar/dist/ipkg/C')
diff --git a/noncore/settings/packagemanager/TODO b/noncore/settings/packagemanager/TODO
index 448ade3..633c589 100644
--- a/noncore/settings/packagemanager/TODO
+++ b/noncore/settings/packagemanager/TODO
@@ -1,28 +1,27 @@
 /************************************************************************
 /*
 /*                       Opie - Package Manager
 /*                      ========================
-/*                           Version 0.3.0
+/*                           Version 0.4.0
 /*
 /*                A package management client for Opie
 /*
 /************************************************************************
 ---------------------------------------------
 To-do for Opie-PackageManager - April, 2004
 ---------------------------------------------
 ======================
 =  Current release   =
 ======================
-1. Save configuration information (i.e. /etc/ipkg.conf)
+1. Link non-root destination apps
-2. Link non-root destination apps
+2. Implement QCOP interface for installing, removing, etc.
-3. Implement QCOP interface for installing, removing, etc.
+3. Redesign configuration dialog
-4. Redesign configuration dialog
 ======================
 =   Future releases  =
 ======================
 1. ???
 \ No newline at end of file
diff --git a/noncore/settings/packagemanager/entrydlg.cpp b/noncore/settings/packagemanager/entrydlg.cpp
index 663abd2..fd275e1 100644
--- a/noncore/settings/packagemanager/entrydlg.cpp
+++ b/noncore/settings/packagemanager/entrydlg.cpp
@@ -8,55 +8,55 @@
 .> <`_, � > �. � <=          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 "entrydlg.h"
+#include <qpe/qpeapplication.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
-#include <qpe/qpeapplication.h>
 EntryDlg::EntryDlg( const QString &label, QWidget* parent, const char* name, bool modal )
    : QDialog( parent, name, modal )
 {
    QVBoxLayout *vbox = new QVBoxLayout( this, 6, 6 );
    QLabel *l = new QLabel( label, this );
    l->setAlignment( AlignLeft | AlignTop | WordBreak );
    vbox->addWidget( l );
    m_entry = new QLineEdit( this );
    vbox->addWidget( m_entry );
    connect( m_entry, SIGNAL(returnPressed()), this, SLOT(tryAccept()) );
 }
 void EntryDlg::setText( const QString &text )
 {
    m_entry->setText( text );
    m_entry->selectAll();
 }
 QString EntryDlg::getText()
 {
    return m_entry->text();
diff --git a/noncore/settings/packagemanager/filterdlg.h b/noncore/settings/packagemanager/filterdlg.h
index de9ea80..bd89b42 100644
--- a/noncore/settings/packagemanager/filterdlg.h
+++ b/noncore/settings/packagemanager/filterdlg.h
@@ -9,57 +9,57 @@
 :`=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.
 */
 #ifndef FILTERDLG_H
 #define FILTERDLG_H
+#include "opackagemanager.h"
 #include <qcheckbox.h>
 #include <qdialog.h>
 #include <qcombobox.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qscrollview.h>
-#include "opackagemanager.h"
 class FilterDlg : public QDialog
 {
    Q_OBJECT
 public:
    FilterDlg( QWidget *parent = 0x0, OPackageManager *pm = 0x0, const QString &name = 0x0,
               const QString &server = 0x0, const QString &destination = 0x0,
               OPackageManager::Status status = OPackageManager::All,
               const QString &category = 0x0 );
    QString name()
        { return m_nameCB->isChecked() ? m_name->text() : QString::null; };
    QString server()
        { return m_serverCB->isChecked() ? m_server->currentText() : QString::null; };
    QString destination()
        { return m_destCB->isChecked() ? m_destination->currentText() : QString::null; };
    OPackageManager::Status status()
        {
            if ( m_statusCB->isChecked() )
            {
                if ( m_status->currentText() == tr( "All" ) )
                    return OPackageManager::All;
                else if ( m_status->currentText() == tr( "Installed" ) )
                    return OPackageManager::Installed;
diff --git a/noncore/settings/packagemanager/global.h b/noncore/settings/packagemanager/global.h
deleted file mode 100644
index 0fe5b85..0000000
--- a/noncore/settings/packagemanager/global.h
+++ b/dev/null
@@ -1,37 +0,0 @@
-/*
-� � � � � � � �             This file is part of the Opie Project
-� � � � � � �                Copyright (c)  2003 Dan Williams <drw@handhelds.org>
-              =.
-            .=l.
-� � � � � �.>+-=
-�_;:, � � .> � �:=|.         This program is free software; you can
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.-- � :           the terms of the GNU Library 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 program 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
-..}^=.= � � � = � � � ;      Library General Public License for more
-++= � -. � � .` � � .:       details.
-�: � � = �...= . :.=-
-�-. � .:....=;==+<;          You should have received a copy of the GNU
-� -_. . . � )=. �=           Library General Public License along with
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
-                             If not, write to the Free Software Foundation,
-                             Inc., 59 Temple Place - Suite 330,
-                             Boston, MA 02111-1307, USA.
-*/
-#ifndef GLOBAL_H
-#define GLOBAL_H
-#define VERSION "0.0.0"
-#endif
-\ No newline at end of file
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index 4a55c10..0cb30e2 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -8,69 +8,68 @@
 .> <`_, � > �. � <=          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 "installdlg.h"
-#include <sys/vfs.h>
+#include <opie2/ofiledialog.h>
+#include <qpe/fileselector.h>
+#include <qpe/resource.h>
+#include <qpe/storage.h>
 #include <qapplication.h>
 #include <qcombobox.h>
 #include <qfileinfo.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qmap.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
-#include <qpe/fileselector.h>
+#include <sys/vfs.h>
-#include <qpe/resource.h>
-#include <qpe/storage.h>
-#include <opie2/ofiledialog.h>
 #include "opackagemanager.h"
-using namespace Opie::Ui;
 InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo,
                        OPackage::Command command1, QStringList *packages1,
                        OPackage::Command command2, QStringList *packages2,
                        OPackage::Command command3, QStringList *packages3 )
    : QWidget( 0x0 )
    , m_packman( pm )
    , m_numCommands( 0 )
    , m_currCommand( 0 )
 {
    // Save command/package list information
    if ( command1 != OPackage::NotDefined )
    {
        m_command[ m_numCommands ] = command1;
        m_packages[ m_numCommands ] = packages1;
        ++m_numCommands;
    }
    if ( command2 != OPackage::NotDefined )
    {
        m_command[ m_numCommands ] = command2;
        m_packages[ m_numCommands ] = packages2;
        ++m_numCommands;
    }
    if ( command3 != OPackage::NotDefined )
    {
@@ -255,48 +254,48 @@ void InstallDlg::slotBtnStart()
    m_btnOptions->setEnabled( true );
    m_btnOptions->setText( tr( "Save output" ) );
    m_btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
 }
 void InstallDlg::slotBtnOptions()
 {
    QString btnText = m_btnOptions->text();
    if ( btnText == tr( "Options" ) )
    {
        // Display configuration dialog (only options tab is enabled)
        m_packman->configureDlg( true );
        return;
    }
    // Save output was clicked
    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 );
+    QString filename = Opie::Ui::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, m_output->text() );
    }
 }
 void InstallDlg::slotOutput( char *msg )
 {
    // Allow processing of other events
    qApp->processEvents();
    QString lineStr = msg;
    if ( lineStr[lineStr.length()-1] == '\n' )
        lineStr.truncate( lineStr.length() - 1 );
    m_output->append( lineStr );
    m_output->setCursorPosition( m_output->numLines(), 0 );
 }
diff --git a/noncore/settings/packagemanager/main.cpp b/noncore/settings/packagemanager/main.cpp
index c050e1a..3792881 100644
--- a/noncore/settings/packagemanager/main.cpp
+++ b/noncore/settings/packagemanager/main.cpp
@@ -10,26 +10,25 @@
 .="- .-=="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 "mainwindow.h"
 #include <opie2/oapplicationfactory.h>
-using namespace Opie::Core;
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MainWindow> )
-OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/packagemanager/mainwindow.cpp b/noncore/settings/packagemanager/mainwindow.cpp
index 810046f..991cc81 100644
--- a/noncore/settings/packagemanager/mainwindow.cpp
+++ b/noncore/settings/packagemanager/mainwindow.cpp
@@ -6,70 +6,70 @@
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         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 "mainwindow.h"
+#include "installdlg.h"
+#include "filterdlg.h"
+#include "promptdlg.h"
+#include "entrydlg.h"
+#include "packageinfodlg.h"
+#include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/resource.h>
 #include <qaction.h>
 #include <qdir.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qtimer.h>
 #include <qtoolbar.h>
 #include <qwhatsthis.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-#include "mainwindow.h"
-#include "installdlg.h"
-#include "filterdlg.h"
-#include "promptdlg.h"
-#include "entrydlg.h"
-#include "packageinfodlg.h"
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ )
    : QMainWindow( parent, name, WStyle_ContextHelp )
    , m_config( "packman" )
    , m_packman( &m_config, this )
    , m_menuBar( this )
    , m_toolBar( this )
    , m_findBar( this )
    , m_widgetStack( this )
    , m_packageList( this )
    , m_statusWidget( this )
    , m_statusText( &m_statusWidget )
    , m_statusBar( &m_statusWidget )
    , m_iconUpdated( Resource::loadPixmap( "packagemanager/updated" ) )
    , m_iconInstalled( Resource::loadPixmap( "installed" ) )
    , m_iconNull( m_iconUpdated.size() )
    , m_filterName( QString::null )
    , m_filterServer( QString::null )
    , m_filterDest( QString::null )
    , m_filterStatus( OPackageManager::NotDefined )
    , m_filterCategory( QString::null )
 {
 //    setCaption( tr( "Package Manager" ) );
diff --git a/noncore/settings/packagemanager/mainwindow.h b/noncore/settings/packagemanager/mainwindow.h
index fb555c5..632effb 100644
--- a/noncore/settings/packagemanager/mainwindow.h
+++ b/noncore/settings/packagemanager/mainwindow.h
@@ -9,60 +9,60 @@
 :`=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.
 */
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
+#include "opackagemanager.h"
+#include <qpe/config.h>
 #include <qlabel.h>
 #include <qlistview.h>
 #include <qmainwindow.h>
 #include <qpixmap.h>
 #include <qprogressbar.h>
 #include <qtoolbar.h>
 #include <qwidgetstack.h>
-#include <qpe/config.h>
-#include "opackagemanager.h"
 class QAction;
 class QLineEdit;
 class MainWindow :public  QMainWindow
 {
    Q_OBJECT
 public:
    MainWindow( QWidget *parent = 0x0, const char *name = 0x0, WFlags fl = 0 );
    static QString appName() { return QString::fromLatin1( "packagemanager" ); };
 protected:
    void closeEvent( QCloseEvent *event );
 private:
    Config          m_config;     // Configuration file
    OPackageManager m_packman;    // Package manager
    // Toolbars
    QToolBar     m_menuBar;       // Main toolbar containing menu
    QToolBar     m_toolBar;       // Main toolbar
    QToolBar     m_findBar;       // Find toolbar
diff --git a/noncore/settings/packagemanager/oconfitem.cpp b/noncore/settings/packagemanager/oconfitem.cpp
index 940a6de..a90730c 100644
--- a/noncore/settings/packagemanager/oconfitem.cpp
+++ b/noncore/settings/packagemanager/oconfitem.cpp
@@ -10,33 +10,32 @@
 :`=1 )Y*s>-.-- � :           the terms of the GNU Library 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 program 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
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "oconfitem.h"
-OConfItem::OConfItem( const QString &location, Type type, const QString &name,
+OConfItem::OConfItem( Type type, const QString &name,
                      const QString &value, bool active )
-    : m_location( location )
+    : m_type( type )
-    , m_type( type )
    , m_name( name )
    , m_value( value )
    , m_active( active )
 {
 }
diff --git a/noncore/settings/packagemanager/oconfitem.h b/noncore/settings/packagemanager/oconfitem.h
index aeee511..db77980 100644
--- a/noncore/settings/packagemanager/oconfitem.h
+++ b/noncore/settings/packagemanager/oconfitem.h
@@ -19,77 +19,74 @@
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef OCONFITEM_H
 #define OCONFITEM_H
 #include <qlist.h>
 #include <qstring.h>
 class OConfItem
 {
 public:
    enum Type { Source, Destination, Option, Arch, NotDefined };
-    OConfItem( const QString &location = 0x0, Type type = NotDefined, const QString &name = 0x0,
+    OConfItem( Type type = NotDefined, const QString &name = 0x0, const QString &value = 0x0,
-               const QString &value = 0x0, bool active = true );
+               bool active = true );
-    const QString &location() { return m_location; }
    Type           type()     { return m_type; }
    const QString &name()     { return m_name; }
    const QString &value()    { return m_value; }
    bool           active()   { return m_active; }
-    void setLocation( const QString &location ) { m_location = location; }
    void setType( Type type )                   { m_type = type; }
    void setName( const QString &name )         { m_name = name; }
    void setValue( const QString &value )       { m_value = value; }
    void setActive( bool active )               { m_active = active; }
 private:
-    QString m_location; // Configuration file where item is located
    Type    m_type;     // Type of configuration item
    QString m_name;     // Name of item
    QString m_value;    // Value of item
    bool    m_active;   // Indicates whether item is currently active
 };
 class OConfItemList : public QList<OConfItem>
 {
 private:
    int compareItems( QCollection::Item item1, QCollection::Item item2 )
    {
        // Sort by OConfItem location then by type
-        QString loc1 = reinterpret_cast<OConfItem*>(item1)->location();
-        QString loc2 = reinterpret_cast<OConfItem*>(item2)->location();
-        if ( loc1 < loc2 )
-            return -1;
-        else if ( loc1 == loc2 )
-        {
            OConfItem::Type type1 = reinterpret_cast<OConfItem*>(item1)->type();
            OConfItem::Type type2 = reinterpret_cast<OConfItem*>(item2)->type();
            if ( type1 < type2 )
                return -1;
            else if ( type1 == type2 )
+        {
+            QString name1 = reinterpret_cast<OConfItem*>(item1)->name();
+            QString name2 = reinterpret_cast<OConfItem*>(item2)->name();
+            if ( name1 < name2 )
+                return -1;
+            else if ( name1 == name2 )
                return 0;
-            else /*if ( type1 > type2 )*/
+            else /*if ( name1 > name2 )*/
                return 1;
        }
-        else /*if ( loc1 > loc2 )*/
+        else /*if ( type1 > type2 )*/
            return 1;
    }
 };
 typedef QListIterator<OConfItem> OConfItemListIterator;
 #endif
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp
index 696a64a..87a30bb 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -10,55 +10,54 @@
 :`=1 )Y*s>-.-- � :           the terms of the GNU Library 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 program 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
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "oipkg.h"
-#include <stdlib.h>
-#include <string.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
+#include <stdlib.h>
 const QString IPKG_CONF        = "/etc/ipkg.conf";      // Fully-qualified name of Ipkg primary configuration file
 const QString IPKG_CONF_DIR    = "/etc/ipkg";           // Directory of secondary Ipkg configuration files
 const QString IPKG_PKG_PATH    = "/usr/lib/ipkg/lists"; // Directory containing server package lists
 const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location
 OIpkg *oipkg;
 // Ipkg callback functions
 int fsignalIpkgMessage( ipkg_conf_t */*conf*/, message_level_t /*level*/, char *msg )
 {
    oipkg->ipkgMessage( msg );
    return 0;
 }
 char *fIpkgResponse( char */*question*/ )
 {
    return 0x0;
 }
 int fIpkgStatus( char */*name*/, int /*status*/, char *desc, void */*userdata*/ )
 {
    oipkg->ipkgStatus( desc );
    return 0;
@@ -508,49 +507,49 @@ void OIpkg::loadConfiguration()
                                type = OConfItem::Source;
                            else if ( typeStr == "dest" || typeStr == "#dest" )
                                type = OConfItem::Destination;
                            else if ( typeStr == "option" || typeStr == "#option" )
                                type = OConfItem::Option;
                            else if ( typeStr == "arch" || typeStr == "#arch" )
                                type = OConfItem::Arch;
                            else
                                type = OConfItem::NotDefined;
                            ++pos;
                            int endpos = line.find( ' ', pos );
                            // Name
                            QString name = line.mid( pos, endpos - pos );
                            // Value
                            QString value = "";
                            if ( endpos > -1 )
                                value = line.right( line.length() - endpos - 1 );
                            // Active
                            bool active = !line.startsWith( "#" );
                            // Add to list
-                            m_confInfo->append( new OConfItem( absFile, type, name, value, active ) );
+                            m_confInfo->append( new OConfItem( type, name, value, active ) );
                        }
                    }
                }
                f.close();
            }
        }
    }
    // Load Ipkg execution options from application configuration file
    if ( m_config )
    {
        m_config->setGroup( "Ipkg" );
        m_ipkgExecOptions = m_config->readNumEntry( "ExecOptions", m_ipkgExecOptions );
        m_ipkgExecVerbosity = m_config->readNumEntry( "Verbosity", m_ipkgExecVerbosity );
    }
 }
 OConfItemList *OIpkg::filterConfItems( OConfItem::Type typefilter )
 {
    // Load Ipkg configuration info if not already cached
    if ( !m_confInfo )
        loadConfiguration();
diff --git a/noncore/settings/packagemanager/oipkg.h b/noncore/settings/packagemanager/oipkg.h
index ea126cf..b8a859a 100644
--- a/noncore/settings/packagemanager/oipkg.h
+++ b/noncore/settings/packagemanager/oipkg.h
@@ -11,58 +11,58 @@
 .="- .-=="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 program 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
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef OIPKG_H
 #define OIPKG_H
-extern "C" {
+#include "oconfitem.h"
-#include <libipkg.h>
+#include "opackage.h"
-};
-#include <qobject.h>
 #include <qpe/config.h>
-#include "oconfitem.h"
+#include <qobject.h>
-#include "opackage.h"
+extern "C" {
+#include <libipkg.h>
+};
 // Ipkg execution options (m_ipkgExecOptions)
 #define FORCE_DEPENDS                           0x0001
 #define FORCE_REMOVE                            0x0002
 #define FORCE_REINSTALL                         0x0004
 #define FORCE_OVERWRITE                         0x0008
 class OConfItemList;
 class OIpkg : public QObject
 {
    Q_OBJECT
 public:
    OIpkg( Config *config = 0x0, QObject *parent = 0x0, const char *name = 0x0 );
    ~OIpkg();
    OConfItemList *configItems();
    OConfItemList *servers();
    OConfItemList *destinations();
    OConfItemList *options();
    int  ipkgExecOptions() { return m_ipkgExecOptions; }
    int  ipkgExecVerbosity() { return m_ipkgExecVerbosity; }
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index d134651..7941ab8 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -10,61 +10,60 @@
 :`=1 )Y*s>-.-- � :           the terms of the GNU Library 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 program 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
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "oipkgconfigdlg.h"
+#include <qpe/resource.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 #include <qscrollview.h>
 #include <qwhatsthis.h>
-#include <qpe/resource.h>
-using namespace Opie::Ui;
 OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent )
    : QDialog( parent, QString::null, true, WStyle_ContextHelp )
    , m_ipkg( ipkg )
    , m_configs( 0x0 )
    , m_installOptions( installOptions )
    , m_serverNew( false )
    , m_serverCurrent( -1 )
    , m_destNew( false )
    , m_destCurrent( -1 )
    , m_layout( this, 2, 4 )
    , m_tabWidget( this )
 {
    setCaption( tr( "Configuration" ) );
    // Initialize configuration widgets
    if ( !installOptions )
    {
        initServerWidget();
        initDestinationWidget();
        initProxyWidget();
    }
    initOptionsWidget();
    // Load configuration information
@@ -80,73 +79,73 @@ OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *paren
        m_tabWidget.addTab( m_optionsWidget, "exec", tr( "Options" ) );
        m_tabWidget.setCurrentTab( tr( "Servers" ) );
    }
    else
    {
        m_tabWidget.addTab( m_optionsWidget, "exec", tr( "Options" ) );
    }
    //showMaximized();
 }
 void OIpkgConfigDlg::accept()
 {
    // Save server, destination and proxy configuration
    if ( !m_installOptions )
    {
        // Update proxy information before saving settings
        OConfItem *confItem = findConfItem( OConfItem::Option, "http_proxy" );
        if ( confItem )
        {
            confItem->setValue( m_proxyHttpServer->text() );
            confItem->setActive( m_proxyHttpActive->isChecked() );
        }
        else
-            m_configs->append( new OConfItem( QString::null, OConfItem::Option, "http_proxy",
+            m_configs->append( new OConfItem( OConfItem::Option, "http_proxy",
                               m_proxyHttpServer->text(), m_proxyHttpActive->isChecked() ) );
        confItem = findConfItem( OConfItem::Option, "ftp_proxy" );
        if ( confItem )
        {
            confItem->setValue( m_proxyFtpServer->text() );
            confItem->setActive( m_proxyFtpActive->isChecked() );
        }
        else
-            m_configs->append( new OConfItem( QString::null, OConfItem::Option, "ftp_proxy",
+            m_configs->append( new OConfItem( OConfItem::Option, "ftp_proxy",
                               m_proxyFtpServer->text(), m_proxyFtpActive->isChecked() ) );
        confItem = findConfItem( OConfItem::Option, "proxy_username" );
        if ( confItem )
            confItem->setValue( m_proxyUsername->text() );
        else
-            m_configs->append( new OConfItem( QString::null, OConfItem::Option, "proxy_username",
+            m_configs->append( new OConfItem( OConfItem::Option, "proxy_username",
                               m_proxyUsername->text() ) );
        confItem = findConfItem( OConfItem::Option, "proxy_password" );
        if ( confItem )
            confItem->setValue( m_proxyPassword->text() );
        else
-            m_configs->append( new OConfItem( QString::null, OConfItem::Option, "proxy_password",
+            m_configs->append( new OConfItem( OConfItem::Option, "proxy_password",
                               m_proxyPassword->text() ) );
        m_ipkg->setConfigItems( m_configs );
    }
    // Save options configuration
    int options = 0;
    if ( m_optForceDepends->isChecked() )
        options |= FORCE_DEPENDS;
    if ( m_optForceReinstall->isChecked() )
        options |= FORCE_REINSTALL;
    if ( m_optForceRemove->isChecked() )
        options |= FORCE_REMOVE;
    if ( m_optForceOverwrite->isChecked() )
        options |= FORCE_OVERWRITE;
    m_ipkg->setIpkgExecOptions( options );
    m_ipkg->setIpkgExecVerbosity( m_optVerboseIpkg->currentItem() );
    QDialog::accept();
 }
 void OIpkgConfigDlg::reject()
 {
    if ( m_configs )
@@ -511,49 +510,49 @@ void OIpkgConfigDlg::slotServerUpdate()
        // Find selected server in list
        OConfItem *server = findConfItem( OConfItem::Source, m_serverCurrName );
        // Delete server
        if ( server )
        {
            // Update url
            server->setValue( m_serverLocation->text() );
            server->setActive( m_serverActive->isChecked() );
            // Check if server name has changed, if it has then we need to replace the key in the map
            if ( m_serverCurrName != newName )
            {
                // Update server name
                server->setName( newName );
                // Update list box
                m_serverList->changeItem( newName, m_serverCurrent );
            }
        }
    }
    else
    {
        // Add new destination to configuration list
-        m_configs->append( new OConfItem( QString::null, OConfItem::Source, newName,
+        m_configs->append( new OConfItem( OConfItem::Source, newName,
                           m_serverLocation->text(), m_serverActive->isChecked() ) );
        m_configs->sort();
        m_serverList->insertItem( newName );
        m_serverList->setCurrentItem( m_serverList->count() );
        m_serverNew = false;
        m_serverList->insertItem( newName );
    }
 }
 void OIpkgConfigDlg::slotDestEdit( int index )
 {
    m_destNew = false;
    m_destCurrent = index;
    // Find selected destination in list
    OConfItem *destination = findConfItem( OConfItem::Destination, m_destList->currentText() );
    // Display destination details
    if ( destination )
    {
        m_destCurrName = destination->name();
        m_destName->setText( destination->name() );
        m_destLocation->setText( destination->value() );
@@ -597,33 +596,33 @@ void OIpkgConfigDlg::slotDestUpdate()
        // Find selected destination in list
        OConfItem *destination = findConfItem( OConfItem::Destination, m_destCurrName );
        // Display destination details
        if ( destination )
        {
            // Update url
            destination->setValue( m_destLocation->text() );
            destination->setActive( m_destActive->isChecked() );
            // Check if destination name has changed, if it has then we need to replace the key in the map
            if ( m_destCurrName != newName )
            {
                // Update destination name
                destination->setName( newName );
                // Update list box
                m_destList->changeItem( newName, m_destCurrent );
            }
        }
    }
    else
    {
        // Add new destination to configuration list
-        m_configs->append( new OConfItem( QString::null, OConfItem::Destination, newName,
+        m_configs->append( new OConfItem( OConfItem::Destination, newName,
                           m_destLocation->text(), m_destActive->isChecked() ) );
        m_configs->sort();
        m_destList->insertItem( newName );
        m_destList->setCurrentItem( m_destList->count() );
        m_destNew = false;
    }
 }
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.h b/noncore/settings/packagemanager/oipkgconfigdlg.h
index 0aba898..800d94a 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.h
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.h
@@ -12,53 +12,53 @@
 �- . � .-<_> � � .<>         Foundation; either version 2 of the License,
 � � �._= =} � � � :          or (at your option) any later version.
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This program 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
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef OIPKGCONFIGDLG_H
 #define OIPKGCONFIGDLG_H
+#include <opie2/otabwidget.h>
 #include <qdialog.h>
 #include <qlayout.h>
-#include <opie2/otabwidget.h>
 #include "oipkg.h"
 class QCheckBox;
 class QComboBox;
 class QLineEdit;
 class QListBox;
 class OIpkgConfigDlg : public QDialog
 {
    Q_OBJECT
 public:
    OIpkgConfigDlg( OIpkg *ipkg = 0x0, bool installOptions = false, QWidget *parent = 0x0 );
 protected slots:
    void accept();
    void reject();
 private:
    OIpkg         *m_ipkg;    // Pointer to Ipkg class for retrieving/saving configuration options
    OConfItemList *m_configs; // Local list of configuration items
    bool           m_installOptions; // If true, will only display the Options tab
diff --git a/noncore/settings/packagemanager/opackagemanager.cpp b/noncore/settings/packagemanager/opackagemanager.cpp
index 3633e05..f75d3b3 100644
--- a/noncore/settings/packagemanager/opackagemanager.cpp
+++ b/noncore/settings/packagemanager/opackagemanager.cpp
@@ -8,54 +8,54 @@
 �_;:, � � .> � �:=|.         This program is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU Library 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 program 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
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
-#include <ctype.h>
+#include "opackagemanager.h"
+#include "oipkgconfigdlg.h"
 #include <qpe/qpeapplication.h>
-#include "opackagemanager.h"
+#include <ctype.h>
-#include "oipkgconfigdlg.h"
 OPackageManager::OPackageManager( Config *config, QObject *parent, const char *name )
    : QObject( parent, name )
    , m_config( config )
    , m_ipkg( m_config, this )
    , m_packages( 9973 )
    , m_categories()
 {
    m_packages.setAutoDelete( true );
 }
 void OPackageManager::loadAvailablePackages()
 {
    m_packages.clear();
    OConfItemList *serverList = m_ipkg.servers();
    if ( serverList )
    {
        // Initialize status messaging
        emit initStatus( serverList->count() );
        int serverCount = 0;
        bool categoryAdded = false;
diff --git a/noncore/settings/packagemanager/opackagemanager.h b/noncore/settings/packagemanager/opackagemanager.h
index b710a51..58e597b 100644
--- a/noncore/settings/packagemanager/opackagemanager.h
+++ b/noncore/settings/packagemanager/opackagemanager.h
@@ -11,55 +11,55 @@
 .="- .-=="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 program 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
 ..}^=.= � � � = � � � ;      Library General Public License for more
 ++= � -. � � .` � � .:       details.
 �: � � = �...= . :.=-
 �-. � .:....=;==+<;          You should have received a copy of the GNU
 � -_. . . � )=. �=           Library General Public License along with
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef OPACKAGEMANAGER_H
 #define OPACKAGEMANAGER_H
-#include <qdict.h>
+#include "oipkg.h"
-#include <qobject.h>
-#include <qstringlist.h>
 #include <qpe/config.h>
-#include "oipkg.h"
+#include <qdict.h>
+#include <qobject.h>
+#include <qstringlist.h>
 class OPackageManager : public QObject
 {
    Q_OBJECT
 public:
    OPackageManager( Config *config = 0x0, QObject *parent = 0x0, const char *name = 0x0 );
    void loadAvailablePackages();
    void loadInstalledPackages();
    enum Status { All, NotInstalled, Installed, Updated, NotDefined };
    OPackageList *packages();
    OPackageList *filterPackages( const QString &name = 0x0,const QString &server = 0x0,
                                  const QString &destination = 0x0, Status status = NotDefined,
                                  const QString &category = 0x0 );
    const QStringList &categories() { return m_categories; }
    QStringList       *servers();
    QStringList       *destinations();
    int compareVersions( const QString &version1, const QString &version2 );
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control
index aff8866..09bb18b 100644
--- a/noncore/settings/packagemanager/opie-packagemanager.control
+++ b/noncore/settings/packagemanager/opie-packagemanager.control
@@ -1,10 +1,10 @@
 Package: opie-packagemanager
 Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/packagemanager apps/Settings/packagemanager.desktop
 Priority: optional
 Section: opie/settings
 Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg
 Replaces: packagemanager
 Architecture: arm
 Maintainer: Dan Williams (drw@handhelds.org)
 Description: Opie package management client
-Version: 0.3.0$EXTRAVERSION
+Version: 0.4.0$EXTRAVERSION
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp
index 73d3de7..d27eacb 100644
--- a/noncore/settings/packagemanager/packageinfodlg.cpp
+++ b/noncore/settings/packagemanager/packageinfodlg.cpp
@@ -10,105 +10,108 @@
 .="- .-=="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 "packageinfodlg.h"
 #include "opackage.h"
 #include "opackagemanager.h"
-#include <qlayout.h>
+#include <opie2/otabwidget.h>
-#include <qpushbutton.h>
 #include <qpe/resource.h>
-#include <opie2/otabwidget.h>
+#include <qlayout.h>
+#include <qpushbutton.h>
+#include <qwhatsthis.h>
-using namespace Opie::Ui;
 PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
    : QWidget( 0x0 )
    , m_packman( pm )
    , m_information( this )
    , m_files( this )
 {
    // Initialize UI
    if ( parent )
        parent->setCaption( package );
    QVBoxLayout *layout = new QVBoxLayout( this, 4, 2 );
-    OTabWidget *tabWidget = new OTabWidget( this );
+    Opie::Ui::OTabWidget *tabWidget = new Opie::Ui::OTabWidget( this );
    layout->addWidget( tabWidget );
    // Information tab
+    QWhatsThis::add( &m_information, tr( "This area contains information about the package." ) );
    m_information.reparent( tabWidget, QPoint( 0, 0 ) );
    m_information.setReadOnly( true );
    tabWidget->addTab( &m_information, "UtilsIcon", tr( "Information" ) );
    // Retrive package information
    m_package = m_packman->findPackage( package );
    if ( !m_package )
    {
        m_information.setText( tr( "Unable to retrieve package information." ) );
        return;
    }
    // Display package information
    if ( !m_package->information().isNull() )
        m_information.setText( m_package->information() );
    else
    {
        // Package information is not cached, retrieve it
        QStringList list( package );
        m_packman->executeCommand( OPackage::Info, &list, QString::null, this, SLOT(slotInfo(char*)), true );
    }
    // Files tab (display only if package is installed)
    if ( !m_package->versionInstalled().isNull() )
    {
        QWidget *filesWidget = new QWidget( tabWidget );
        QVBoxLayout *filesLayout = new QVBoxLayout( filesWidget, 2, 2 );
+        QWhatsThis::add( &m_files, tr( "This area contains a list of files contained in this package." ) );
        m_files.reparent( filesWidget, QPoint( 0, 0 ) );
        m_files.setReadOnly( true );
        filesLayout->addWidget( &m_files );
        QPushButton *btn = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ),
                                            tr( "Retrieve file list" ), filesWidget );
+        QWhatsThis::add( btn, tr( "Tap here to retrieve list of files contained in this package." ) );
        filesLayout->addWidget( btn );
        connect( btn, SIGNAL(clicked()), this, SLOT(slotBtnFileScan()) );
        tabWidget->addTab( filesWidget, "binary", tr( "File list" ) );
        tabWidget->setCurrentTab( tr( "Information" ) );
        // If file list is already cached, display
        if ( !m_package->files().isNull() )
            m_files.setText( m_package->files() );
    }
    else
        m_files.hide();
 }
 PackageInfoDlg::~PackageInfoDlg()
 {
    if ( !m_package )
        return;
    // Cache package information
    if ( !m_information.text().isNull() )
        m_package->setInformation( m_information.text() );
    // Cache package file list
diff --git a/noncore/settings/packagemanager/packageinfodlg.h b/noncore/settings/packagemanager/packageinfodlg.h
index 7ed9f0a..ec031e1 100644
--- a/noncore/settings/packagemanager/packageinfodlg.h
+++ b/noncore/settings/packagemanager/packageinfodlg.h
@@ -9,53 +9,53 @@
 :`=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.
 */
 #ifndef PACKAGEINFODLG_H
 #define PACKAGEINFODLG_H
+#include "opackage.h"
 #include <qmultilineedit.h>
 #include <qwidget.h>
-#include "opackage.h"
 class QPushButton;
 class OPackage;
 class OPackageManager;
 class PackageInfoDlg : public QWidget
 {
    Q_OBJECT
 public:
    PackageInfoDlg( QWidget *parent = 0x0, OPackageManager *pm = 0x0, const QString &package = QString::null );
    ~PackageInfoDlg();
 private:
    OPackageManager *m_packman;     // Pointer to application instance of package manager
    OPackage        *m_package;     // Pointer to package to display information for
    // UI controls
    QMultiLineEdit   m_information; // Multi-line edit to display package information
    QMultiLineEdit   m_files;       // Multi-line edit to display package file list
 private slots:
    void slotBtnFileScan();
    void slotInfo( char *info );
diff --git a/noncore/settings/packagemanager/promptdlg.cpp b/noncore/settings/packagemanager/promptdlg.cpp
index 4e82ba9..841b98e 100644
--- a/noncore/settings/packagemanager/promptdlg.cpp
+++ b/noncore/settings/packagemanager/promptdlg.cpp
@@ -8,55 +8,55 @@
 .> <`_, � > �. � <=          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 "promptdlg.h"
+#include <qpe/qpeapplication.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qwidgetlist.h>
-#include <qpe/qpeapplication.h>
 PromptDlg::PromptDlg( const QString &caption, const QString &text, const QString &btn1, const QString &btn2,
                      QWidget *parent )
    : QWidget( parent, QString::null, WType_Modal | WType_TopLevel | WStyle_Dialog )
    , m_btnClicked( -1 )
 {
    setCaption( caption );
    QGridLayout *layout = new QGridLayout( this, 2, 2, 4, 2 );
    QLabel *label = new QLabel( text, this );
    label->setAlignment( AlignCenter | WordBreak );
    layout->addMultiCellWidget( label, 0, 0, 0, 1 );
    QPushButton *btn = new QPushButton( btn1, this );
    layout->addWidget( btn, 1, 0 );
    connect( btn, SIGNAL(clicked()), this, SLOT(slotBtn1Clicked()) );
    btn = new QPushButton( btn2, this );
    layout->addWidget( btn, 1, 1 );
    connect( btn, SIGNAL(clicked()), this, SLOT(slotBtn2Clicked()) );
 }
 int PromptDlg::display()
 {
    // Determine position of dialog.  Derived from QT's QDialog::show() method.