23 files changed, 544 insertions, 542 deletions
diff --git a/noncore/settings/packagemanager/entrydlg.cpp b/noncore/settings/packagemanager/entrydlg.cpp
index 3b794b4..5d61342 100644
--- a/noncore/settings/packagemanager/entrydlg.cpp
+++ b/noncore/settings/packagemanager/entrydlg.cpp
@@ -1,107 +1,108 @@
 /*
-                    This file is part of the OPIE Project
+                             This file is part of the Opie Project
-               =.            Copyright (c)  2004 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-      .=l.
+              =.
-     .>+-=
+            .=l.
-_;:,   .>  :=|.         This file is free software; you can
+           .>+-=
-.> <`_,  > .  <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i,   .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-  ._= =}    :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  .%`+i>    _;_.
+     ._= =}       :          or (at your option) any later version.
-  .i_,=:_.   -<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  : ..  .:,   . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.=    =    ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++=  -.   .`   .:
+..}^=.=       =       ;      Library General Public License for more
-:   = ...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-.  .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
- -_. . .  )=. =           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-  --    :-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 "entrydlg.h"
 #include <opie2/ofiledialog.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 EntryDlg::EntryDlg( const QString &label, QWidget* parent, const char* name, bool modal )
    : QDialog( parent, name, modal )
 {
    QGridLayout *layout = new QGridLayout( this, 3, 2, 2, 4 );
    QLabel *l = new QLabel( label, this );
    l->setAlignment( AlignLeft | AlignTop | WordBreak );
    layout->addMultiCellWidget( l, 0, 0, 0, 1 );
    m_entry = new QLineEdit( this );
    layout->addWidget( m_entry, 1, 0 );
    connect( m_entry, SIGNAL(returnPressed()), this, SLOT(slotTryAccept()) );
    QPixmap pic;
    pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    QPushButton *btn = new QPushButton( pic, QString::null, this );
    btn->setMaximumWidth( btn->height() );
    connect( btn, SIGNAL(clicked()), this, SLOT(slotSelectPath()) );
    layout->addWidget( btn, 1, 1 );
    layout->setRowStretch( 2, 10 );
    resize( width(), l->height() + btn->height() + 8 );
 }
 void EntryDlg::setText( const QString &text )
 {
    m_entry->setText( text );
    m_entry->selectAll();
 }
 QString EntryDlg::getText()
 {
    return m_entry->text();
 }
 QString EntryDlg::getText( const QString &caption, const QString &label, const QString &text, bool *ok,
                           QWidget *parent, const char *name )
 {
    EntryDlg *dlg = new EntryDlg( label, parent, name, true );
    dlg->setCaption( caption );
    dlg->setText( text );
    QString result;
    *ok = ( QPEApplication::execDialog( dlg ) == QDialog::Accepted );
    if ( *ok )
        result = dlg->getText();
    delete dlg;
    return result;
 }
 void EntryDlg::slotTryAccept()
 {
    if ( !m_entry->text().isEmpty() )
        accept();
 }
 void EntryDlg::slotSelectPath()
 {
    QString path = Opie::Ui::OFileDialog::getDirectory( 0, m_entry->text() );
    if ( path.at( path.length() - 1 ) == '/' )
        path.truncate( path.length() - 1 );
    if ( !path.isNull() )
        m_entry->setText( path );
 }
diff --git a/noncore/settings/packagemanager/entrydlg.h b/noncore/settings/packagemanager/entrydlg.h
index 012589b..3f897ae 100644
--- a/noncore/settings/packagemanager/entrydlg.h
+++ b/noncore/settings/packagemanager/entrydlg.h
@@ -1,58 +1,59 @@
 /*
-                    This file is part of the OPIE Project
+                             This file is part of the Opie Project
-               =.            Copyright (c)  2004 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-      .=l.
+              =.
-     .>+-=
+            .=l.
-_;:,   .>  :=|.         This file is free software; you can
+           .>+-=
-.> <`_,  > .  <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i,   .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-  ._= =}    :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  .%`+i>    _;_.
+     ._= =}       :          or (at your option) any later version.
-  .i_,=:_.   -<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  : ..  .:,   . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.=    =    ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++=  -.   .`   .:
+..}^=.=       =       ;      Library General Public License for more
-:   = ...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-.  .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
- -_. . .  )=. =           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-  --    :-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 ENTRYDLG_H
 #define ENTRYDLG_H
 #include <qdialog.h>
 class QLineEdit;
 class EntryDlg : public QDialog
 {
    Q_OBJECT
 public:
    static QString getText( const QString &caption, const QString &label, const QString &text = QString::null,
                            bool *ok = 0, QWidget *parent = 0, const char *name = 0 );
    EntryDlg( const QString &label, QWidget* parent = 0, const char* name = 0, bool modal = true );
    void setText( const QString &text );
    QString getText();
 private slots:
    void slotTryAccept();
    void slotSelectPath();
 private:
    QLineEdit   *m_entry;
 };
 #endif // EntryDlg_H
diff --git a/noncore/settings/packagemanager/filterdlg.cpp b/noncore/settings/packagemanager/filterdlg.cpp
index e69b6eb..4924972 100644
--- a/noncore/settings/packagemanager/filterdlg.cpp
+++ b/noncore/settings/packagemanager/filterdlg.cpp
@@ -1,194 +1,195 @@
 /*
-                    This file is part of the OPIE Project
+                             This file is part of the Opie Project
-               =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-      .=l.
+              =.
-     .>+-=
+            .=l.
-_;:,   .>  :=|.         This file is free software; you can
+           .>+-=
-.> <`_,  > .  <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i,   .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-  ._= =}    :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  .%`+i>    _;_.
+     ._= =}       :          or (at your option) any later version.
-  .i_,=:_.   -<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  : ..  .:,   . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.=    =    ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++=  -.   .`   .:
+..}^=.=       =       ;      Library General Public License for more
-:   = ...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-.  .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
- -_. . .  )=. =           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-  --    :-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 "filterdlg.h"
 #include <qwhatsthis.h>
 FilterDlg::FilterDlg( QWidget *parent, OPackageManager *pm, const QString &name,
               const QString &server, const QString &destination,
               OPackageManager::Status status, const QString &category )
    : QDialog( parent, QString::null, true, WStyle_ContextHelp )
 {
    setCaption( tr( "Filter packages" ) );
    QVBoxLayout *layout = new QVBoxLayout( this );
    QScrollView *sv = new QScrollView( this );
    layout->addWidget( sv, 0, 0 );
    sv->setResizePolicy( QScrollView::AutoOneFit );
    sv->setFrameStyle( QFrame::NoFrame );
    QWidget *container = new QWidget( sv->viewport() );
    sv->addChild( container );
    layout = new QVBoxLayout( container, 4, 4 );
    // Category
    m_categoryCB = new QCheckBox( tr( "Category:" ), container );
    QWhatsThis::add( m_categoryCB, tr( "Tap here to filter package list by application category." ) );
    connect( m_categoryCB, SIGNAL(toggled(bool)), this, SLOT(slotCategorySelected(bool)) );
    m_category = new QComboBox( container );
    QWhatsThis::add( m_category, tr( "Select the application category to filter by here." ) );
    m_category->insertStringList( pm->categories() );
    initItem( m_category, m_categoryCB, category );
    layout->addWidget( m_categoryCB );
    layout->addWidget( m_category );
    // Package name
    m_nameCB = new QCheckBox( tr( "Names containing:" ), container );
    QWhatsThis::add( m_nameCB, tr( "Tap here to filter package list by package name." ) );
    connect( m_nameCB, SIGNAL(toggled(bool)), this, SLOT(slotNameSelected(bool)) );
    m_name = new QLineEdit( name, container );
    QWhatsThis::add( m_name, tr( "Enter the package name to filter by here." ) );
    if ( !name.isNull() )
        m_nameCB->setChecked( true );
    m_name->setEnabled( !name.isNull() );
    layout->addWidget( m_nameCB );
    layout->addWidget( m_name );
    // Status
    m_statusCB = new QCheckBox( tr( "With the status:" ), container );
    QWhatsThis::add( m_statusCB, tr( "Tap here to filter package list by the package status." ) );
    connect( m_statusCB, SIGNAL(toggled(bool)), this, SLOT(slotStatusSelected(bool)) );
    m_status = new QComboBox( container );
    QWhatsThis::add( m_status, tr( "Select the package status to filter by here." ) );
    connect( m_status, SIGNAL(activated(const QString&)), this, SLOT(slotStatusChanged(const QString&)) );
    QString currStatus;
    switch ( status )
    {
        case OPackageManager::All : currStatus = tr( "All" );
            break;
        case OPackageManager::Installed : currStatus = tr( "Installed" );
            break;
        case OPackageManager::NotInstalled : currStatus = tr( "Not installed" );
            break;
        case OPackageManager::Updated : currStatus = tr( "Updated" );
            break;
        default : currStatus = QString::null;
    };
    m_status->insertItem( tr( "All" ) );
    m_status->insertItem( tr( "Installed" ) );
    m_status->insertItem( tr( "Not installed" ) );
    m_status->insertItem( tr( "Updated" ) );
    initItem( m_status, m_statusCB, currStatus );
    layout->addWidget( m_statusCB );
    layout->addWidget( m_status );
    // Server
    m_serverCB = new QCheckBox( tr( "Available from the following server:" ), container );
    QWhatsThis::add( m_serverCB, tr( "Tap here to filter package list by source server." ) );
    connect( m_serverCB, SIGNAL(toggled(bool)), this, SLOT(slotServerSelected(bool)) );
    m_server = new QComboBox( container );
    QWhatsThis::add( m_server, tr( "Select the source server to filter by here." ) );
    m_server->insertStringList( pm->servers() );
    initItem( m_server, m_serverCB, server );
    layout->addWidget( m_serverCB );
    layout->addWidget( m_server );
    // Destination
    m_destCB = new QCheckBox( tr( "Installed on device at:" ), container );
    QWhatsThis::add( m_destCB, tr( "Tap here to filter package list by destination where the package is installed to on this device." ) );
    connect( m_destCB, SIGNAL(toggled(bool)), this, SLOT(slotDestSelected(bool)) );
    m_destination = new QComboBox( container );
    QWhatsThis::add( m_destination, tr( "Select the destination location to filter by here." ) );
    m_destination->insertStringList( pm->destinations() );
    initItem( m_destination, m_destCB, destination );
    layout->addWidget( m_destCB );
    layout->addWidget( m_destination );
 }
 void FilterDlg::initItem( QComboBox *comboBox, QCheckBox *checkBox, const QString &selection )
 {
    if ( !selection.isNull() )
    {
        checkBox->setChecked( true );
        for ( int i = 0; i < comboBox->count(); i++ )
        {
            if ( comboBox->text( i ) == selection )
            {
                comboBox->setCurrentItem( i );
                return;
            }
        }
    }
    comboBox->setEnabled( !selection.isNull() );
 }
 void FilterDlg::slotNameSelected( bool selected )
 {
    m_name->setEnabled( selected );
    m_name->setFocus();
 }
 void FilterDlg::slotServerSelected( bool selected )
 {
    m_server->setEnabled( selected );
    m_server->setFocus();
 }
 void FilterDlg::slotDestSelected( bool selected )
 {
    m_destination->setEnabled( selected );
    m_destination->setFocus();
 }
 void FilterDlg::slotStatusSelected( bool selected )
 {
    m_status->setEnabled( selected );
    m_status->setFocus();
    if ( !selected && !m_destCB->isEnabled() )
    {
        // If status check box has been deselected and destination option was previously deselected
        // (because status == "Not installed"), re-enable destination option
        m_destCB->setEnabled( true );
        m_destination->setEnabled( true );
    }
    else if ( selected && m_destCB->isEnabled() && m_status->currentText() == tr( "Not installed" ) )
    {
        // If status check box has been selected and status == "Not installed", disable destination option
        m_destCB->setEnabled( false );
        m_destCB->setChecked( false );
        m_destination->setEnabled( false );
    }
 }
 void FilterDlg::slotStatusChanged( const QString &category )
 {
    bool notInstalled = ( category == tr( "Not installed" ) );
    m_destCB->setEnabled( !notInstalled );
    m_destination->setEnabled( !notInstalled );
    if ( notInstalled )
        m_destCB->setChecked( false );
 }
 void FilterDlg::slotCategorySelected( bool selected )
 {
    m_category->setEnabled( selected );
    m_category->setFocus();
 }
diff --git a/noncore/settings/packagemanager/filterdlg.h b/noncore/settings/packagemanager/filterdlg.h
index bd89b42..6f39464 100644
--- a/noncore/settings/packagemanager/filterdlg.h
+++ b/noncore/settings/packagemanager/filterdlg.h
@@ -1,101 +1,102 @@
 /*
-� � � � � � � �             This file is part of the OPIE Project
+ �� �� �� �� �� �� �� ��             This file is part of the Opie Project
-               =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-� � � � � � �.=l.
+              =.
-� � � � � �.>+-=
+            .=l.
-�_;:, � � .> � �:=|.         This file is free software; you can
+           .>+-=
-.> <`_, � > �. � <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i, � � .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-� � �._= =} � � � :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � .%`+i> � � � _;_.
+     ._= =}       :          or (at your option) any later version.
-� � .i_,=:_. � � �-<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-� � �+ �. �-:. � � � =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� � : .. � �.:, � � . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.= � � � = � � � ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++= � -. � � .` � � .:
+..}^=.=       =       ;      Library General Public License for more
-�: � � = �...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-�-. � .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
-� -_. . . � )=. �=           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-� � -- � � � �:-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 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>
 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;
                else if ( m_status->currentText() == tr( "Not installed" ) )
                    return OPackageManager::NotInstalled;
                else if ( m_status->currentText() == tr( "Updated" ) )
                    return OPackageManager::Updated;
            }
            return OPackageManager::NotDefined;
        };
    QString category()
        { return m_categoryCB->isChecked() ? m_category->currentText() : QString::null; };
 private:
    QCheckBox *m_nameCB;
    QCheckBox *m_serverCB;
    QCheckBox *m_destCB;
    QCheckBox *m_statusCB;
    QCheckBox *m_categoryCB;
    QLineEdit *m_name;
    QComboBox *m_server;
    QComboBox *m_destination;
    QComboBox *m_status;
    QComboBox *m_category;
    void initItem( QComboBox *comboBox, QCheckBox *checkBox, const QString &selection );
 private slots:
    void slotNameSelected( bool );
    void slotServerSelected( bool );
    void slotDestSelected( bool );
    void slotStatusSelected( bool );
    void slotStatusChanged( const QString & );
    void slotCategorySelected( bool );
 };
 #endif
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index 8aed10d..205d7ed 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -1,323 +1,324 @@
 /*
-                    This file is part of the OPIE Project
+                             This file is part of the Opie Project
-               =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-      .=l.
+              =.
-     .>+-=
+            .=l.
-_;:,   .>  :=|.         This file is free software; you can
+           .>+-=
-.> <`_,  > .  <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i,   .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-  ._= =}    :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  .%`+i>    _;_.
+     ._= =}       :          or (at your option) any later version.
-  .i_,=:_.   -<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  : ..  .:,   . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.=    =    ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++=  -.   .`   .:
+..}^=.=       =       ;      Library General Public License for more
-:   = ...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-.  .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
- -_. . .  )=. =           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-  --    :-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 "installdlg.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 <sys/vfs.h>
 #include "opackagemanager.h"
 InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption,
                        OPackage::Command command1, const QStringList &packages1,
                        OPackage::Command command2, const QStringList &packages2,
                        OPackage::Command command3, const QStringList &packages3 )
    : QWidget( 0l )
    , m_packman( pm )
    , m_installFound( false )
    , m_numCommands( 0 )
    , m_currCommand( 0 )
    , m_destItem( 0l )
 {
    // Save command/package list information
    if ( command1 != OPackage::NotDefined )
    {
        m_command[ m_numCommands ] = command1;
        m_packages[ m_numCommands ] = packages1;
        ++m_numCommands;
        if ( command1 == OPackage::Install )
            m_installFound = true;
    }
    if ( command2 != OPackage::NotDefined )
    {
        m_command[ m_numCommands ] = command2;
        m_packages[ m_numCommands ] = packages2;
        ++m_numCommands;
        if ( command2 == OPackage::Install )
            m_installFound = true;
    }
    if ( command3 != OPackage::NotDefined )
    {
        m_command[ m_numCommands ] = command3;
        m_packages[ m_numCommands ] = packages3;
        ++m_numCommands;
        if ( command3 == OPackage::Install )
            m_installFound = true;
    }
    // Initialize UI
    if ( parent )
        parent->setCaption( caption );
    QGridLayout *layout = new QGridLayout( this, 4, 2, 2, 4 );
    if ( m_installFound )
    {
        QLabel *label = new QLabel( tr( "Destination" ), this );
        layout->addWidget( label, 0, 0 );
        m_destination = new QComboBox( this );
        m_destination->insertStringList( m_packman->destinations() );
        layout->addWidget( m_destination, 0, 1 );
        connect( m_destination, SIGNAL(highlighted(const QString&)),
                this, SLOT(slotDisplayAvailSpace(const QString&)) );
        label = new QLabel( tr( "Space Avail" ), this );
        layout->addWidget( label, 1, 0 );
        m_availSpace = new QLabel( this );
        layout->addWidget( m_availSpace, 1, 1 );
        // TODO - select correct destination
        slotDisplayAvailSpace( m_destination->currentText() );
    }
    else
    {
        m_destination = 0l;
        m_availSpace = 0l;
    }
    QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, tr( "Output" ), this );
    groupBox->layout()->setSpacing( 0 );
    groupBox->layout()->setMargin( 4 );
    QVBoxLayout *groupBoxLayout = new QVBoxLayout( groupBox->layout() );
    m_output = new QMultiLineEdit( groupBox );
    m_output->setReadOnly( true );
    groupBoxLayout->addWidget( m_output );
    layout->addMultiCellWidget( groupBox, 2, 2, 0, 1 );
    QPixmap pic;
    pic.convertFromImage( Resource::loadImage( "packagemanager/apply" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    m_btnStart = new QPushButton( pic, tr( "Start" ), this );
    m_btnStart->setMinimumHeight( AppLnk::smallIconSize() );
    layout->addWidget( m_btnStart, 3, 0 );
    connect( m_btnStart, SIGNAL(clicked()), this, SLOT(slotBtnStart()) );
    pic.convertFromImage( Resource::loadImage( "SettingsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    m_btnOptions = new QPushButton( pic, tr( "Options" ), this );
    m_btnOptions->setMinimumHeight( AppLnk::smallIconSize() );
    layout->addWidget( m_btnOptions, 3, 1 );
    connect( m_btnOptions, SIGNAL( clicked() ), this, SLOT(slotBtnOptions()) );
    // Display packages being acted upon in output widget
    for( int i = 0; i < m_numCommands; i++ )
    {
        if ( !m_packages[ i ].isEmpty() )
        {
            QString lineStr = tr( "Packages to " );
            switch( m_command[ i ] )
            {
                case OPackage::Install : lineStr.append( tr( "install" ) );
                    break;
                case OPackage::Remove : lineStr.append( tr( "remove" ) );
                    break;
                case OPackage::Upgrade : lineStr.append( tr( "upgrade" ) );
                    break;
                case OPackage::Download : lineStr.append( tr( "download" ) );
                    break;
                default :
                    break;
            };
            lineStr.append( ":\n" );
            QStringList tmpPackage = m_packages[ i ];
            for ( QStringList::Iterator it = tmpPackage.begin(); it != tmpPackage.end(); ++it )
            {
                lineStr.append( QString( "\t%1\n" ).arg( ( *it ) ) );
            }
            m_output->append( lineStr );
        }
    }
    m_output->append( tr( "Press the start button to begin.\n" ) );
    m_output->setCursorPosition( m_output->numLines(), 0 );
 }
 void InstallDlg::slotDisplayAvailSpace( const QString &destination )
 {
    // If available space is not displayed, exit
    if ( !m_availSpace )
        return;
    QString space = tr( "Unknown" );
    // Get destination
    if ( !destination.isNull() )
        m_destItem = m_packman->findConfItem( OConfItem::Destination, destination );
    if ( m_destItem )
    {
        // Calculate available space
        struct statfs fs;
        if ( !statfs( m_destItem->value(), &fs ) )
        {
            long mult = fs.f_bsize / 1024;
            long div = 1024 / fs.f_bsize;
            if ( !mult ) mult = 1;
            if ( !div ) div = 1;
            long avail = fs.f_bavail * mult / div;
            space = tr( "%1 Kb" ).arg( avail );
        }
    }
    // Display available space
    m_availSpace->setText( space );
 }
 void InstallDlg::slotBtnStart()
 {
    QString btnText = m_btnStart->text();
    if ( btnText == tr( "Abort" ) )
    {
        // Prevent unexecuted commands from executing
        m_currCommand = 999;
        // Allow user to close dialog
        m_btnStart->setText( tr( "Close" ) );
        QPixmap pic;
        pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
        m_btnStart->setIconSet( pic );
        return;
    }
    else if ( btnText == tr( "Close" ) )
    {
        // TODO - force reload of package data
        emit closeInstallDlg();
        return;
    }
    // Start was clicked, start executing
    QString dest;
    if ( m_installFound )
    {
        dest = m_destination->currentText();
        m_destination->setEnabled( false );
    }
    m_btnOptions->setEnabled( false );
    if ( m_numCommands > 1 )
    {
        m_btnStart->setText( tr( "Abort" ) );
        QPixmap pic;
        pic.convertFromImage( Resource::loadImage( "reset" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
        m_btnStart->setIconSet( pic );
    }
    else
    {
        m_btnStart->setEnabled( false );
    }
    for ( m_currCommand = 0; m_currCommand < m_numCommands; m_currCommand++ )
    {
        // Execute next command
        m_packman->executeCommand( m_command[ m_currCommand ], m_packages[ m_currCommand ], dest,
                                   this, SLOT(slotOutput(const QString &)), true );
    }
    // All commands executed, allow user to close dialog
    m_btnStart->setEnabled( true );
    m_btnStart->setText( tr( "Close" ) );
    QPixmap pic;
    pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    m_btnStart->setIconSet( pic );
    m_btnOptions->setEnabled( true );
    m_btnOptions->setText( tr( "Save output" ) );
    pic.convertFromImage( Resource::loadImage( "save" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    m_btnOptions->setIconSet( pic );
 }
 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 = 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( const QString &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 );
    // Update available space
    slotDisplayAvailSpace( QString::null );
 }
diff --git a/noncore/settings/packagemanager/installdlg.h b/noncore/settings/packagemanager/installdlg.h
index e633809..a41a38f 100644
--- a/noncore/settings/packagemanager/installdlg.h
+++ b/noncore/settings/packagemanager/installdlg.h
@@ -1,92 +1,93 @@
 /*
-                    This file is part of the OPIE Project
+                             This file is part of the Opie Project
-               =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-      .=l.
+              =.
-     .>+-=
+            .=l.
-_;:,   .>  :=|.         This file is free software; you can
+           .>+-=
-.> <`_,  > .  <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i,   .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-  ._= =}    :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  .%`+i>    _;_.
+     ._= =}       :          or (at your option) any later version.
-  .i_,=:_.   -<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  : ..  .:,   . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.=    =    ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++=  -.   .`   .:
+..}^=.=       =       ;      Library General Public License for more
-:   = ...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-.  .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
- -_. . .  )=. =           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-  --    :-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 INSTALLDLG_H
 #define INSTALLDLG_H
 #include <qwidget.h>
 #include "opackage.h"
 class QComboBox;
 class QLabel;
 class QMultiLineEdit;
 class QPushButton;
 class OConfItem;
 class OPackageManager;
 class InstallDlg : public QWidget
 {
    Q_OBJECT
 public:
    InstallDlg( QWidget *parent = 0l, OPackageManager *pm = 0l,
                const QString &caption = QString::null,
                OPackage::Command command1 = OPackage::NotDefined,
                const QStringList &packages1 = QStringList(),
                OPackage::Command command2 = OPackage::NotDefined,
                const QStringList &packages2 = QStringList(),
                OPackage::Command command3 = OPackage::NotDefined,
                const QStringList &packages3 = QStringList() );
 private:
    OPackageManager *m_packman;     // Pointer to application instance of package manager
    
    bool m_installFound; // Indicates if an install is being done, controls display of
                         // destination selection, available space
    // UI controls
    QComboBox       *m_destination; // Destination selection list
    QLabel          *m_availSpace;  // Text label to display available space on selected destination
    QMultiLineEdit  *m_output;      // Multi-line edit to display status
    QPushButton     *m_btnStart;    // Start/abort/close button
    QPushButton     *m_btnOptions;  // Installation options button
    // Commands and packages to execute
    int               m_numCommands; // Number of commands to be executed
    int               m_currCommand; // Number of currently executing command
    OPackage::Command m_command[3];  // List of commands to be executed
    QStringList       m_packages[3]; // Lists of package names associated to commands (m_command[])
    OConfItem        *m_destItem;    // Pointer to destination for package installation
 private slots:
    // UI control slots
    void slotDisplayAvailSpace( const QString &destination );
    void slotBtnStart();
    void slotBtnOptions();
    
    // Execution slots
    void slotOutput( const QString &msg );
 signals:
    void closeInstallDlg();
 };
 #endif
diff --git a/noncore/settings/packagemanager/main.cpp b/noncore/settings/packagemanager/main.cpp
index 3792881..5863662 100644
--- a/noncore/settings/packagemanager/main.cpp
+++ b/noncore/settings/packagemanager/main.cpp
@@ -1,34 +1,35 @@
 /*
-� � � � � � � �             This file is part of the OPIE Project
+ �� �� �� �� �� �� �� ��             This file is part of the Opie Project
-               =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-� � � � � � �.=l.
+              =.
-� � � � � �.>+-=
+            .=l.
-�_;:, � � .> � �:=|.         This file is free software; you can
+           .>+-=
-.> <`_, � > �. � <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i, � � .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-� � �._= =} � � � :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � .%`+i> � � � _;_.
+     ._= =}       :          or (at your option) any later version.
-� � .i_,=:_. � � �-<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-� � �+ �. �-:. � � � =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� � : .. � �.:, � � . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.= � � � = � � � ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++= � -. � � .` � � .:
+..}^=.=       =       ;      Library General Public License for more
-�: � � = �...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-�-. � .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
-� -_. . . � )=. �=           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-� � -- � � � �:-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 "mainwindow.h"
 #include <opie2/oapplicationfactory.h>
 OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/packagemanager/mainwindow.cpp b/noncore/settings/packagemanager/mainwindow.cpp
index 8a5b90c..0e40c01 100644
--- a/noncore/settings/packagemanager/mainwindow.cpp
+++ b/noncore/settings/packagemanager/mainwindow.cpp
@@ -1,762 +1,763 @@
 /*
-                    This file is part of the OPIE Project
+                             This file is part of the Opie Project
-               =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-      .=l.
+              =.
-     .>+-=
+            .=l.
-_;:,   .>  :=|.         This file is free software; you can
+           .>+-=
-.> <`_,  > .  <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i,   .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-  ._= =}    :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  .%`+i>    _;_.
+     ._= =}       :          or (at your option) any later version.
-  .i_,=:_.   -<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  : ..  .:,   . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.=    =    ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++=  -.   .`   .:
+..}^=.=       =       ;      Library General Public License for more
-:   = ...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-.  .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
- -_. . .  )=. =           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-  --    :-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 "mainwindow.h"
 #include "installdlg.h"
 #include "filterdlg.h"
 #include "promptdlg.h"
 #include "entrydlg.h"
 #include "packageinfodlg.h"
 #include <opie2/ofiledialog.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>
 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" ) );
    m_iconNull.fill( colorGroup().base() );
    connect( &m_widgetStack, SIGNAL(aboutToShow(QWidget*)), this, SLOT(slotWidgetStackShow(QWidget*)) );
    // Initialize widget stack, package list and status widget
    initStatusWidget();
    initPackageList();
    m_widgetStack.addWidget( &m_statusWidget, 2 );
    m_widgetStack.addWidget( &m_packageList, 1 );
    setCentralWidget( &m_widgetStack );
    // Initialize remaining user interface items
    initUI();
    // Initialize package information
    QTimer::singleShot( -1, this, SLOT( initPackageInfo() ) );
 }
 void MainWindow::closeEvent( QCloseEvent *event )
 {
    // Close app only if either the package or status widgets are currently active
    bool close = m_widgetStack.visibleWidget() == &m_packageList ||
                 m_widgetStack.visibleWidget() == &m_statusWidget;
    if ( close )
    {
        // TODO - write out application configuration settings
        // Write out package manager configuration settings
        m_packman.saveSettings();
        event->accept();
    }
    else
    {
        delete m_widgetStack.visibleWidget();
        m_widgetStack.raiseWidget( &m_packageList );
        event->ignore();
    }
 }
 void MainWindow::initPackageList()
 {
    m_packageList.addColumn( tr( "Packages" ) );
    QWhatsThis::add( &m_packageList, tr( "This is a listing of all packages.\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\nTap inside the box at the left to select a package.  Tap and hold to view package details." ) );
    QPEApplication::setStylusOperation( m_packageList.viewport(), QPEApplication::RightOnHold );
    connect( &m_packageList, SIGNAL(rightButtonPressed(QListViewItem*,const QPoint&,int)),
             this, SLOT(slotDisplayPackageInfo(QListViewItem*)) );
 }
 void MainWindow::initStatusWidget()
 {
    QVBoxLayout *layout = new QVBoxLayout( &m_statusWidget, 4, 4 );
    m_statusText.setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
    layout->addWidget( &m_statusText );
    connect( &m_packman, SIGNAL(initStatus(int)), this, SLOT(slotInitStatusBar(int)) );
    connect( &m_packman, SIGNAL(statusText(const QString&)), this, SLOT(slotStatusText(const QString&)) );
    connect( &m_packman, SIGNAL(statusBar(int)), this, SLOT(slotStatusBar(int)) );
    layout->addWidget( &m_statusBar );
 }
 void MainWindow::initUI()
 {
    // Build menu and tool bars
    setToolBarsMovable( false );
    m_menuBar.setHorizontalStretchable( true );
    QMenuBar *mb = new QMenuBar( &m_menuBar );
    mb->setMargin( 0 );
    // Find toolbar
    addToolBar( &m_findBar, QMainWindow::Top, true );
    m_findBar.setHorizontalStretchable( true );
    m_findEdit = new QLineEdit( &m_findBar );
    QWhatsThis::add( m_findEdit, tr( "Type the text to search for here." ) );
    m_findBar.setStretchableWidget( m_findEdit );
    connect( m_findEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotFindChanged(const QString&)) );
    // Packages menu
    QPopupMenu *popup = new QPopupMenu( this );
    QAction *a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "packagemanager/update" ), QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Tap here to update package lists from servers." ) );
    connect( a, SIGNAL(activated()), this, SLOT(slotUpdate()) );
    a->addTo( popup );
    a->addTo( &m_toolBar );
    QAction *actionUpgrade = new QAction( tr( "Upgrade" ), Resource::loadPixmap( "packagemanager/upgrade" ), QString::null, 0, this, 0 );
    actionUpgrade->setWhatsThis( tr( "Tap here to upgrade all installed packages if a newer version is available." ) );
    connect( actionUpgrade, SIGNAL(activated()), this, SLOT(slotUpgrade()) );
    actionUpgrade->addTo( popup );
    actionUpgrade->addTo( &m_toolBar );
    QPixmap iconDownload = Resource::loadPixmap( "packagemanager/download" );
    QPixmap iconRemove = Resource::loadPixmap( "packagemanager/remove" );
    QAction *actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 );
    actionDownload->setWhatsThis( tr( "Tap here to download the currently selected package(s)." ) );
    connect( actionDownload, SIGNAL(activated()), this, SLOT(slotDownload()) );
    actionDownload->addTo( popup );
    actionDownload->addTo( &m_toolBar );
    a = new QAction( tr( "Apply changes" ), Resource::loadPixmap( "packagemanager/apply" ), QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Tap here to install, remove or upgrade currently selected package(s)." ) );
    connect( a, SIGNAL(activated()), this, SLOT(slotApply()) );
    a->addTo( popup );
    a->addTo( &m_toolBar );
    a = new QAction( tr( "Install local package" ), Resource::loadPixmap( "folder" ), QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Tap here to install a package file located on device." ) );
    connect( a, SIGNAL(activated()), this, SLOT(slotInstallLocal()) );
    a->addTo( popup );
    //a->addTo( &m_toolBar );
    popup->insertSeparator();
    a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Tap here to configure this application." ) );
    connect( a, SIGNAL(activated()), this, SLOT(slotConfigure()) );
    a->addTo( popup );
    mb->insertItem( tr( "Actions" ), popup );
    // View menu
    popup = new QPopupMenu( this );
    m_actionShowNotInstalled = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 );
    m_actionShowNotInstalled->setToggleAction( true );
    m_actionShowNotInstalled->setWhatsThis( tr( "Tap here to show packages available which have not been installed." ) );
    connect( m_actionShowNotInstalled, SIGNAL(activated()), this, SLOT(slotShowNotInstalled()) );
    m_actionShowNotInstalled->addTo( popup );
    m_actionShowInstalled = new QAction( tr( "Show installed packages" ), QString::null, 0, this, 0 );
    m_actionShowInstalled->setToggleAction( true );
    m_actionShowInstalled->setWhatsThis( tr( "Tap here to show packages currently installed on this device." ) );
    connect( m_actionShowInstalled, SIGNAL(activated()), this, SLOT(slotShowInstalled()) );
    m_actionShowInstalled->addTo( popup );
    m_actionShowUpdated = new QAction( tr( "Show updated packages" ), QString::null, 0, this, 0 );
    m_actionShowUpdated->setToggleAction( true );
    m_actionShowUpdated->setWhatsThis( tr( "Tap here to show packages currently installed on this device which have a newer version available." ) );
    connect( m_actionShowUpdated, SIGNAL(activated()), this, SLOT(slotShowUpdated()) );
    m_actionShowUpdated->addTo( popup );
    popup->insertSeparator();
    m_actionFilter = new QAction( tr( "Filter" ), Resource::loadPixmap( "packagemanager/filter" ),
                                         QString::null, 0, this, 0 );
    m_actionFilter->setToggleAction( true );
    m_actionFilter->setWhatsThis( tr( "Tap here to apply current filter." ) );
    connect( m_actionFilter, SIGNAL(toggled(bool)), this, SLOT(slotFilter(bool)) );
    m_actionFilter->addTo( popup );
    a = new QAction( tr( "Filter settings" ),  QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Tap here to change the package filter criteria." ) );
    connect( a, SIGNAL(activated()), this, SLOT(slotFilterChange()) );
    a->addTo( popup );
    popup->insertSeparator();
    a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Tap here to search for text in package names." ) );
    connect( a, SIGNAL(activated()), this, SLOT(slotFindShowToolbar()) );
    a->addTo( popup );
    m_actionFindNext = new QAction( tr( "Find next" ), Resource::loadIconSet( "next" ), QString::null, 0, this, 0 );
    m_actionFindNext->setEnabled( false );
    m_actionFindNext->setWhatsThis( tr( "Tap here to find the next package name containing the text you are searching for." ) );
    connect( m_actionFindNext, SIGNAL(activated()), this, SLOT(slotFindNext()) );
    m_actionFindNext->addTo( popup );
    m_actionFindNext->addTo( &m_findBar );
    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( "Tap here to hide the find toolbar." ) );
    connect( a, SIGNAL(activated()), this, SLOT(slotFindHideToolbar()) );
    a->addTo( &m_findBar );
    m_findBar.hide();
 }
 void MainWindow::loadPackageList( OPackageList *packages, bool clearList )
 {
    if ( clearList )
        m_packageList.clear();
    if ( packages )
    {
        for ( OPackageListIterator packageIt( *packages ); packageIt.current(); ++packageIt )
        {
            OPackage *package = packageIt.current();
            QCheckListItem *item = new QCheckListItem( &m_packageList, package->name(),
                                                    QCheckListItem::CheckBox );
            m_packageList.insertItem( item );
            // If a different version of package is available, show update available icon
            // Otherwise, show installed icon
            if ( !package->versionInstalled().isNull() )
            {
                if ( m_packman.compareVersions( package->version(), package->versionInstalled() ) == 1 )
                    item->setPixmap( 0, m_iconUpdated );
                else
                    item->setPixmap( 0, m_iconInstalled );
            }
            else
                item->setPixmap( 0, m_iconNull );
        }
    }
 }
 void MainWindow::searchForPackage( const QString &text )
 {
    if ( !text.isEmpty() )
    {
        // look through package list for text startng at current position
        QCheckListItem *start = static_cast<QCheckListItem *>(m_packageList.currentItem());
        if ( start == 0 )
            start = static_cast<QCheckListItem *>(m_packageList.firstChild());
 //        for ( QCheckListItem *item = static_cast<QCheckListItem *>(start->nextSibling()); item != 0 ;
        for ( QCheckListItem *item = static_cast<QCheckListItem *>(start); item != 0 ;
              item = static_cast<QCheckListItem *>(item->nextSibling()) )
        {
            if ( item->text().lower().find( text ) != -1 )
            {
                m_packageList.ensureItemVisible( item );
                m_packageList.setCurrentItem( item );
                break;
            }
        }
    }
 }
 void MainWindow::installLocalPackage( const QString &ipkFile )
 {
    // Install selected file
    InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Install local package" ),
                                      OPackage::Install, ipkFile );
    connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
    // Display widget
    m_widgetStack.addWidget( dlg, 3 );
    m_widgetStack.raiseWidget( dlg );
 }
 void MainWindow::setDocument( const QString &ipkFile )
 {
    QString file = ipkFile;
    DocLnk lnk( ipkFile );
    if ( lnk.isValid() )
        file = lnk.file();
    
    installLocalPackage( file );
 }
 void MainWindow::initPackageInfo()
 {
    m_widgetStack.raiseWidget( &m_statusWidget );
    // Load package list
    m_packman.loadAvailablePackages();
    m_packman.loadInstalledPackages();
    OPackageList *packageList = m_packman.packages();
    if ( packageList )
    {
        loadPackageList( packageList, true );
        delete packageList;
    }
    QWidget *widget = m_widgetStack.widget( 3 );
    if ( !widget )
        widget = &m_packageList;
    m_widgetStack.raiseWidget( widget );
 }
 void MainWindow::slotWidgetStackShow( QWidget *widget )
 {
    if ( widget == &m_packageList )
    {
        setCaption( tr( "Package Manager" ) );
        m_menuBar.show();
        m_toolBar.show();
    }
    else
    {
        m_menuBar.hide();
        m_toolBar.hide();
    }
 }
 void MainWindow::slotInitStatusBar( int numSteps )
 {
    m_statusBar.setTotalSteps( numSteps );
 }
 void MainWindow::slotStatusText( const QString &status )
 {
    m_statusText.setText( status );
 }
 void MainWindow::slotStatusBar( int currStep )
 {
    m_statusBar.setProgress( currStep );
 }
 void MainWindow::slotUpdate()
 {
    // Create package manager output widget
    InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Update package information" ),
                                      OPackage::Update );
    connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
    // Display widget
    m_widgetStack.addWidget( dlg, 3 );
    m_widgetStack.raiseWidget( dlg );
 }
 void MainWindow::slotUpgrade()
 {
    // Create package manager output widget
    InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Upgrade installed packages" ),
                                      OPackage::Upgrade );
    connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
    // Display widget
    m_widgetStack.addWidget( dlg, 3 );
    m_widgetStack.raiseWidget( dlg );
 }
 void MainWindow::slotDownload()
 {
    // Retrieve list of packages selected for download (if any)
    QStringList workingPackages;
    for ( QCheckListItem *item = static_cast<QCheckListItem *>(m_packageList.firstChild());
          item != 0 ;
          item = static_cast<QCheckListItem *>(item->nextSibling()) )
    {
        if ( item->isOn() )
            workingPackages.append( item->text() );
    }
    if ( workingPackages.isEmpty() )
    {
        QMessageBox::information( this, tr( "Nothing to do" ), tr( "No packages selected" ), tr( "OK" ) );
        return;
    }
    else
    {
        // Download selected packages
        m_config.setGroup( "settings" );
        QString workingDir = m_config.readEntry( "DownloadDir", "/tmp" );
        bool ok = false;
        QString text = EntryDlg::getText( tr( "Download" ), tr( "Enter path to download package to:" ), workingDir, &ok, this );
        if ( ok && !text.isEmpty() )
            workingDir = text;   // user entered something and pressed ok
        else
            return; // user entered nothing or pressed cancel
        // Store download directory in config file
        m_config.writeEntry( "DownloadDir", workingDir );
        // Get starting directory
        QDir::setCurrent( workingDir );
        // Create package manager output widget
        InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Download packages" ),
                                          OPackage::Download, workingPackages );
        connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
        // Display widget
        m_widgetStack.addWidget( dlg, 3 );
        m_widgetStack.raiseWidget( dlg );
    }
 }
 void MainWindow::slotApply()
 {
    QStringList removeList;
    QStringList installList;
    QStringList upgradeList;
    for ( QCheckListItem *item = static_cast<QCheckListItem *>(m_packageList.firstChild());
          item != 0 ;
          item = static_cast<QCheckListItem *>(item->nextSibling()) )
    {
        if ( item->isOn() )
        {
            OPackage *package = m_packman.findPackage( item->text() );
            if ( package )
            {
                if ( !package->versionInstalled().isNull() )
                {
                    if ( m_packman.compareVersions( package->version(), package->versionInstalled() ) == 1 )
                    {
                        // Remove/upgrade package
                        int answer =  PromptDlg::ask( tr( "Remove or upgrade" ),
                                      tr( QString( "Do you wish to remove or upgrade\n%1?" ).arg( item->text() ) ),
                                      tr( "Remove" ), tr( "Upgrade" ), this );
                        if ( answer == 1 )  // Remove
                        {
                            removeList.append( item->text() );
                        }
                        else if ( answer == 2 )  // Upgrade
                        {
                            upgradeList.append( item->text() );
                        }
                    }
                    else
                    {
                        // Remove/reinstall package
                        int answer =  PromptDlg::ask( tr( "Remove or reinstall" ),
                                      tr( QString( "Do you wish to remove or reinstall\n%1?" ).arg( item->text() ) ),
                                      tr( "Remove" ), tr( "Reinstall" ), this );
                        if ( answer == 1 )  // Remove
                        {
                            removeList.append( item->text() );
                        }
                        else if ( answer == 2 )  // Reinstall
                        {
                            installList.append( item->text() );
                        }
                    }
                }
                else
                {
                    // Install package
                    installList.append( item->text() );
                }
            }
        }
    }
    // If nothing is selected, display message and exit
    if ( removeList.isEmpty() && installList.isEmpty() && upgradeList.isEmpty() )
    {
        QMessageBox::information( this, tr( "Nothing to do" ), tr( "No packages selected" ), tr( "OK" ) );
        return;
    }
    // Send command only if there are packages to process
    OPackage::Command removeCmd = !removeList.isEmpty() ? OPackage::Remove
                                                        : OPackage::NotDefined;
    OPackage::Command installCmd = !installList.isEmpty() ? OPackage::Install
                                                          : OPackage::NotDefined;
    OPackage::Command upgradeCmd = !upgradeList.isEmpty() ? OPackage::Upgrade
                                                          : OPackage::NotDefined;
    // Create package manager output widget
    InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Apply changes" ),
                                      removeCmd, removeList,
                                      installCmd, installList,
                                      upgradeCmd, upgradeList );
    connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
    // Display widget
    m_widgetStack.addWidget( dlg, 3 );
    m_widgetStack.raiseWidget( dlg );
 }
 void MainWindow::slotInstallLocal()
 {
    // Display file open dialog with only package files
    MimeTypes type;
    QStringList packages;
    packages << "application/ipkg";
    type.insert( tr( "Application Packages" ), packages );
    QString package = Opie::Ui::OFileDialog::getOpenFileName( Opie::Ui::OFileSelector::NORMAL,
                                                              "/", QString::null, type );
    if ( !package.isNull() )
        installLocalPackage( package );
 }
 void MainWindow::slotCloseDlg()
 {
    // Close install dialog
    delete m_widgetStack.visibleWidget();
    // Reload package list
    initPackageInfo();
    // Update Opie launcher links
    QCopEnvelope e("QPE/System", "linkChanged(QString)");
    QString lf = QString::null;
    e << lf;
    
    // Reapply any filters previously set
    if ( m_actionShowNotInstalled->isOn() )
        slotShowNotInstalled();
    else if ( m_actionShowInstalled->isOn() )
        slotShowInstalled();
    else if ( m_actionShowUpdated->isOn() )
        slotShowUpdated();
    else if ( m_actionFilter->isOn() )
        slotFilter( true );
 }
 void MainWindow::slotConfigure()
 {
    if ( m_packman.configureDlg( false ) )
    {
        if ( PromptDlg::ask( tr( "Config updated" ),
             tr( "The configuration has been updated.  Do you want to update server and package information now?" ),
             tr( "Yes" ), tr( "No" ), this ) == 1 )
        {
            // Update package list and reload package info
            slotUpdate();
        }
    }
 }
 void MainWindow::slotShowNotInstalled()
 {
    OPackageList *packageList;
    if ( m_actionShowNotInstalled->isOn() )
    {
        m_actionShowInstalled->setOn( false );
        m_actionShowUpdated->setOn( false );
        m_actionFilter->setOn( false );
        packageList = m_packman.filterPackages( QString::null, QString::null, QString::null,
                                                OPackageManager::NotInstalled, QString::null );
    }
    else
        packageList = m_packman.packages();
    if ( packageList )
    {
        loadPackageList( packageList, true );
        delete packageList;
    }
 }
 void MainWindow::slotShowInstalled()
 {
    OPackageList *packageList;
    if ( m_actionShowInstalled->isOn() )
    {
        m_actionShowNotInstalled->setOn( false );
        m_actionShowUpdated->setOn( false );
        m_actionFilter->setOn( false );
        packageList = m_packman.filterPackages( QString::null, QString::null, QString::null,
                                                OPackageManager::Installed, QString::null );
    }
    else
        packageList = m_packman.packages();
    if ( packageList )
    {
        loadPackageList( packageList, true );
        delete packageList;
    }
 }
 void MainWindow::slotShowUpdated()
 {
    OPackageList *packageList;
    if ( m_actionShowUpdated->isOn() )
    {
        m_actionShowInstalled->setOn( false );
        m_actionShowNotInstalled->setOn( false );
        m_actionFilter->setOn( false );
        packageList = m_packman.filterPackages( QString::null, QString::null, QString::null,
                                                OPackageManager::Updated, QString::null );
    }
    else
        packageList = m_packman.packages();
    if ( packageList )
    {
        loadPackageList( packageList, true );
        delete packageList;
    }
 }
 void MainWindow::slotFilterChange()
 {
    FilterDlg dlg( this, &m_packman, m_filterName, m_filterServer, m_filterDest, m_filterStatus,
                   m_filterCategory );
    if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted )
    {
        m_filterName = dlg.name();
        m_filterServer = dlg.server();
        m_filterDest = dlg.destination();
        m_filterStatus = dlg.status();
        m_filterCategory = dlg.category();
        m_actionFilter->setOn( true );
        slotFilter( true );
    }
    else
    {
        m_actionFilter->setOn( false );
        slotFilter( false );
    }
 }
 void MainWindow::slotFilter( bool isOn )
 {
    OPackageList *packageList;
    if ( isOn )
    {
        // Turn off other filtering options
        m_actionShowNotInstalled->setOn( false );
        m_actionShowInstalled->setOn( false );
        m_actionShowUpdated->setOn( false );
        // If the filter settings have not been set yet, display filter dialog
        if ( m_filterName.isNull() && m_filterServer.isNull() && m_filterDest.isNull() &&
             m_filterStatus == OPackageManager::NotDefined && m_filterCategory.isNull() )
        {
            FilterDlg dlg( this, &m_packman, m_filterName, m_filterServer, m_filterDest, m_filterStatus,
                        m_filterCategory );
            if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted )
            {
                m_filterName = dlg.name();
                m_filterServer = dlg.server();
                m_filterDest = dlg.destination();
                m_filterStatus = dlg.status();
                m_filterCategory = dlg.category();
                m_actionFilter->setOn( true );
                packageList = m_packman.filterPackages( m_filterName, m_filterServer, m_filterDest,
                                                        m_filterStatus, m_filterCategory );
            }
            else
            {
                m_actionFilter->setOn( false );
                packageList = m_packman.packages();
            }
        }
        else
        {
            m_actionFilter->setOn( true );
            packageList = m_packman.filterPackages( m_filterName, m_filterServer, m_filterDest,
                                                    m_filterStatus, m_filterCategory );
        }
    }
    else
        packageList = m_packman.packages();
    if ( packageList )
    {
        loadPackageList( packageList, true );
        delete packageList;
    }
 }
 void MainWindow::slotFindShowToolbar()
 {
    m_findBar.show();
    m_findEdit->setFocus();
 }
 void MainWindow::slotFindHideToolbar()
 {
    m_findBar.hide();
 }
 void MainWindow::slotFindChanged( const QString &findText )
 {
    m_actionFindNext->setEnabled( !findText.isEmpty() );
    searchForPackage( findText );
 }
 void MainWindow::slotFindNext()
 {
    searchForPackage( m_findEdit->text() );
 }
 void MainWindow::slotDisplayPackageInfo( QListViewItem *packageItem )
 {
    QString packageName( ( static_cast<QCheckListItem*>( packageItem ) )->text() );
    // Create package manager output widget
    PackageInfoDlg *dlg = new PackageInfoDlg( this, &m_packman, packageName );
    // Display widget
    m_widgetStack.addWidget( dlg, 3 );
    m_widgetStack.raiseWidget( dlg );
 }
diff --git a/noncore/settings/packagemanager/mainwindow.h b/noncore/settings/packagemanager/mainwindow.h
index f00e344..e7003e4 100644
--- a/noncore/settings/packagemanager/mainwindow.h
+++ b/noncore/settings/packagemanager/mainwindow.h
@@ -1,143 +1,144 @@
 /*
-                    This file is part of the OPIE Project
+                             This file is part of the Opie Project
-               =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-      .=l.
+              =.
-     .>+-=
+            .=l.
-_;:,   .>  :=|.         This file is free software; you can
+           .>+-=
-.> <`_,  > .  <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i,   .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-  ._= =}    :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  .%`+i>    _;_.
+     ._= =}       :          or (at your option) any later version.
-  .i_,=:_.   -<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  : ..  .:,   . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.=    =    ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++=  -.   .`   .:
+..}^=.=       =       ;      Library General Public License for more
-:   = ...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-.  .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
- -_. . .  )=. =           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-  --    :-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 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>
 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( QUICKAPP_NAME ); };
 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
    QWidgetStack m_widgetStack;   // Main widget stack which contains m_packageList & m_statusWidget
    QListView    m_packageList;   // Main list view of all packages
    QLineEdit   *m_findEdit;      // Line edit box used for find toolbar
    // Status widget controls
    QWidget      m_statusWidget;  // Widget to display status during long operations
    QLabel       m_statusText;    // Text status message
    QProgressBar m_statusBar;     // Progress bar showing % completed
    // Icon pixmaps
    QPixmap m_iconUpdated;   // Cached icon which shows when package can be updated
    QPixmap m_iconInstalled; // Cached icon which shows when package is installed
    QPixmap m_iconNull;      // Cached icon which shows when package is not installed
    // Menu/tool bar actions
    QAction *m_actionShowNotInstalled; // Action to show pakages not currently installed
    QAction *m_actionShowInstalled;    // Action to show pakages currently installed
    QAction *m_actionShowUpdated;      // Action to show pakages currently installed with update available
    QAction *m_actionFilter;           // Action to filter packages
    QAction *m_actionFindNext;         // Action to find next match
    // Cached filter settings
    QString                 m_filterName;     // Cached name filter value
    QString                 m_filterServer;   // Cached server name filter value
    QString                 m_filterDest;     // Cached destination name filter value
    OPackageManager::Status m_filterStatus;   // Cached status filter value
    QString                 m_filterCategory; // Cached category filter value
    void initPackageList();
    void initStatusWidget();
    void initUI();
    void loadPackageList( OPackageList *packages = 0x0, bool clearList = true );
    void searchForPackage( const QString &text );
    void installLocalPackage( const QString &ipkFile );
 private slots:
    void setDocument( const QString &ipkFile );
    
    void initPackageInfo();
    void slotWidgetStackShow( QWidget *widget );
    // Status widget slots
    void slotInitStatusBar( int numSteps );
    void slotStatusText( const QString &status );
    void slotStatusBar( int currStep );
    // Actions menu action slots
    void slotUpdate();
    void slotUpgrade();
    void slotDownload();
    void slotApply();
    void slotInstallLocal();
    void slotCloseDlg();
    void slotConfigure();
    // View menu action slots
    void slotShowNotInstalled();
    void slotShowInstalled();
    void slotShowUpdated();
    void slotFilterChange();
    void slotFilter( bool isOn );
    // Find action slots
    void slotFindShowToolbar();
    void slotFindHideToolbar();
    void slotFindChanged( const QString &findText );
    void slotFindNext();
    // Other slots
    void slotDisplayPackageInfo( QListViewItem * );
 };
 #endif
diff --git a/noncore/settings/packagemanager/oconfitem.cpp b/noncore/settings/packagemanager/oconfitem.cpp
index ffa936e..76c8c65 100644
--- a/noncore/settings/packagemanager/oconfitem.cpp
+++ b/noncore/settings/packagemanager/oconfitem.cpp
@@ -1,42 +1,41 @@
 /*
-                    This file is part of the Opie Project
+                             This file is part of the Opie Project
-                      Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
              =.
            .=l.
-     .>+-=
+           .>+-=
-_;:,   .>  :=|.         This program is free software; you can
+ _;:,     .>    :=|.         This program is free software; you can
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,   .._         License as published by the Free Software
+.="- .-=="i,     .._         License as published by the Free Software
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
+     ._= =}       :          or (at your option) any later version.
-  .%`+i>    _;_.
+    .%`+i>       _;_.
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  : ..  .:,   . . .    without even the implied warranty of
+    : ..    .:,     . . .    without even the implied warranty of
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=    =    ;      Library General Public License for more
+..}^=.=       =       ;      Library General Public License for more
-++=  -.   .`   .:       details.
++=   -.     .`     .:       details.
-:   = ...= . :.=-
+:     =  ...= . :.=-
-.  .:....=;==+<;          You should have received a copy of the GNU
+ -.   .:....=;==+<;          You should have received a copy of the GNU
- -_. . .  )=. =           Library General Public License along with
+  -_. . .   )=.  =           Library General Public License along with
-  --    :-=`           this library; see the file COPYING.LIB.
+    --        :-=`           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( Type type, const QString &name, const QString &value,
                      const QString &features, bool active )
    : m_type( type )
    , m_name( name )
    , m_value( value )
    , m_features( features )
    , m_active( active )
 {
 }
diff --git a/noncore/settings/packagemanager/oconfitem.h b/noncore/settings/packagemanager/oconfitem.h
index b306e93..c95039e 100644
--- a/noncore/settings/packagemanager/oconfitem.h
+++ b/noncore/settings/packagemanager/oconfitem.h
@@ -1,96 +1,95 @@
 /*
-                    This file is part of the Opie Project
+                             This file is part of the Opie Project
-                      Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
              =.
            .=l.
-     .>+-=
+           .>+-=
-_;:,   .>  :=|.         This program is free software; you can
+ _;:,     .>    :=|.         This program is free software; you can
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,   .._         License as published by the Free Software
+.="- .-=="i,     .._         License as published by the Free Software
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
+     ._= =}       :          or (at your option) any later version.
-  .%`+i>    _;_.
+    .%`+i>       _;_.
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  : ..  .:,   . . .    without even the implied warranty of
+    : ..    .:,     . . .    without even the implied warranty of
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=    =    ;      Library General Public License for more
+..}^=.=       =       ;      Library General Public License for more
-++=  -.   .`   .:       details.
++=   -.     .`     .:       details.
-:   = ...= . :.=-
+:     =  ...= . :.=-
-.  .:....=;==+<;          You should have received a copy of the GNU
+ -.   .:....=;==+<;          You should have received a copy of the GNU
- -_. . .  )=. =           Library General Public License along with
+  -_. . .   )=.  =           Library General Public License along with
-  --    :-=`           this library; see the file COPYING.LIB.
+    --        :-=`           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, Other, NotDefined };
    OConfItem( Type type = NotDefined, const QString &name = QString::null,
               const QString &value = QString::null, const QString &features = QString::null,
               bool active = true );
    Type           type()     { return m_type; }
    const QString &name()     { return m_name; }
    const QString &value()    { return m_value; }
    const QString &features() { return m_features; }
    bool           active()   { return m_active; }
    void setType( Type type )                   { m_type = type; }
    void setName( const QString &name )         { m_name = name; }
    void setValue( const QString &value )       { m_value = value; }
    void setFeatures( const QString &features ) { m_features = features; }
    void setActive( bool active )               { m_active = active; }
 private:
    Type    m_type;     // Type of configuration item
    QString m_name;     // Name of item
    QString m_value;    // Value of item
    QString m_features; // Comma-deliminated list of features this item supports
    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
        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 ( name1 > name2 )*/
                return 1;
        }
        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 7bc2040..ffb3687 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -1,818 +1,817 @@
 /*
-                    This file is part of the Opie Project
+                             This file is part of the Opie Project
-                      Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
              =.
            .=l.
-     .>+-=
+           .>+-=
-_;:,   .>  :=|.         This program is free software; you can
+ _;:,     .>    :=|.         This program is free software; you can
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,   .._         License as published by the Free Software
+.="- .-=="i,     .._         License as published by the Free Software
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
+     ._= =}       :          or (at your option) any later version.
-  .%`+i>    _;_.
+    .%`+i>       _;_.
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  : ..  .:,   . . .    without even the implied warranty of
+    : ..    .:,     . . .    without even the implied warranty of
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=    =    ;      Library General Public License for more
+..}^=.=       =       ;      Library General Public License for more
-++=  -.   .`   .:       details.
++=   -.     .`     .:       details.
-:   = ...= . :.=-
+:     =  ...= . :.=-
-.  .:....=;==+<;          You should have received a copy of the GNU
+ -.   .:....=;==+<;          You should have received a copy of the GNU
- -_. . .  )=. =           Library General Public License along with
+  -_. . .   )=.  =           Library General Public License along with
-  --    :-=`           this library; see the file COPYING.LIB.
+    --        :-=`           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 <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <stdlib.h>
 #include <unistd.h>
 extern "C" {
 #include <libipkg.h>
 };
 args_t m_ipkgArgs; // libipkg configuration arguments
 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
 const QString IPKG_INFO_PATH   = "usr/lib/ipkg/info";   // Package file lists location
 OIpkg *oipkg;
 // Ipkg callback functions
 int fsignalIpkgMessage( ipkg_conf_t *conf, message_level_t level, char *msg )
 {
    // Display message only if it is below the message level threshold
    if ( conf && ( conf->verbosity < level ) )
        return 0;
    else
        oipkg->ipkgMessage( msg );
    return 0;
 }
 char *fIpkgResponse( char */*question*/ )
 {
    return 0l;
 }
 int fIpkgStatus( char */*name*/, int /*status*/, char *desc, void */*userdata*/ )
 {
    oipkg->ipkgStatus( desc );
    return 0;
 }
 int fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/,
                void */*userdata*/ )
 {
    oipkg->ipkgList( desc );
    return 0;
 }
 OIpkg::OIpkg( Config *config, QObject *parent, const char *name )
    : QObject( parent, name )
    , m_config( config )
    , m_confInfo( NULL )
    , m_ipkgExecOptions( 0 )
    , m_ipkgExecVerbosity( 1 )
 {
    // Keep pointer to self for the Ipkg callback functions
    oipkg = this;
    // Initialize libipkg
    ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs );
    // Default ipkg run-time arguments
    m_ipkgArgs.noaction = false;
    m_ipkgArgs.force_defaults = true;
 }
 OIpkg::~OIpkg()
 {
    // Upon destruction, ensure that items in config list are deleted with list
    if ( m_confInfo )
        m_confInfo->setAutoDelete( true );
    // Free up libipkg resources
    ipkg_deinit( &m_ipkgArgs );
 }
 OConfItemList *OIpkg::configItems()
 {
    // Retrieve all configuration items
    return filterConfItems();
 }
 OConfItemList *OIpkg::servers()
 {
    // Retrieve only servers
    return filterConfItems( OConfItem::Source );
 }
 OConfItemList *OIpkg::destinations()
 {
    // Retrieve only destinations
    return filterConfItems( OConfItem::Destination );
 }
 OConfItemList *OIpkg::options()
 {
    // Retrieve only destinations
    return filterConfItems( OConfItem::Option );
 }
 void OIpkg::setConfigItems( OConfItemList *configList )
 {
    if ( m_confInfo )
        delete m_confInfo;
    m_confInfo = configList;
    // Write out new /etc/ipkg.conf
    QFile confFile( IPKG_CONF );
    if ( confFile.open( IO_WriteOnly ) )
    {
        QTextStream confStream( &confFile );
        confStream << "# Generated by Opie Package Manager\n\n";
        OConfItemListIterator it( *m_confInfo );
        for ( ; it.current(); ++it )
        {
            OConfItem *item = it.current();
            // Only write out valid conf items
            if ( item->type() != OConfItem::NotDefined )
            {
                QString confLine;
                QString name = item->name();
                if ( !item->active() )
                    confLine = "#";
                switch ( item->type() )
                {
                    case OConfItem::Source :
                    {
                        if ( item->features().contains( "Compressed" ) )
                            confLine.append( "src/gz" );
                        else
                            confLine.append( "src" );
                    }
                    break;
                    case OConfItem::Destination : confLine.append( "dest" ); break;
                    case OConfItem::Option : confLine.append( "option" ); break;
                    case OConfItem::Arch : confLine.append( "arch" ); break;
                    case OConfItem::Other :
                    {
                        // For options w/type = Other, the mapping is as follows:
                        //    name = typeStr (e.g. "lists_dir")
                        //    value = value
                        //    features = name (from configuration file)
                        confLine.append( item->name() );
                        name = item->features();
                    }
                    break;
                    default : break;
                };
                confStream << confLine << " " << name << " " << item->value() << "\n";
            }
        }
        confFile.close();
    }
    else
    {
        // Problem writing to /etc/ipkg.conf, exit before removing other conf files
        return;
    }
    // Delete /etc/ipkg/*.conf files (/etc/ipkg.conf should now have all settings
    QStringList confFiles;
    QDir confDir( IPKG_CONF_DIR );
    if ( confDir.exists() )
    {
        confDir.setNameFilter( "*.conf" );
        confDir.setFilter( QDir::Files );
        confFiles = confDir.entryList( "*.conf", QDir::Files );
        QStringList::Iterator lastFile = confFiles.end();
        for ( QStringList::Iterator it = confFiles.begin(); it != lastFile; ++it )
        {
            // Create absolute file path if necessary
            QString absFile = (*it);
            if ( !absFile.startsWith( "/" ) )
                absFile.prepend( QString( IPKG_CONF_DIR ) + "/" );
            // Delete file
            QFile::remove( absFile );
        }
    }
    // Reinitialize libipkg to pick up new configuration
    ipkg_deinit( &m_ipkgArgs );
    ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs );
    m_ipkgArgs.noaction = false;
    m_ipkgArgs.force_defaults = true;
 }
 void OIpkg::saveSettings()
 {
    // Save Ipkg execution options to application configuration file
    if ( m_config )
    {
        m_config->setGroup( "Ipkg" );
        m_config->writeEntry( "ExecOptions", m_ipkgExecOptions );
        m_config->writeEntry( "Verbosity", m_ipkgExecVerbosity );
    }
 }
 OPackageList *OIpkg::availablePackages( const QString &server )
 {
    // Load Ipkg configuration info if not already cached
    if ( !m_confInfo )
        loadConfiguration();
    // Build new server list (caller is responsible for deleting)
    OPackageList *pl = new OPackageList;
    // Get directory where server lists are located
    QString listsDir;
    OConfItem *confItem = findConfItem( OConfItem::Other, "lists_dir" );
    if ( confItem )
        listsDir = confItem->value();
    else
        listsDir = IPKG_PKG_PATH;
    // Open package list file
    QFile f( listsDir + "/" + server );
    if ( !f.open( IO_ReadOnly ) )
        return NULL;
    QTextStream t( &f );
    // Process all information in package list file
    OPackage *package = NULL;
    QString line = t.readLine();
    while ( !t.eof() )
    {
        // Determine key/value pair
        int pos = line.find( ':', 0 );
        QString key;
        if ( pos > -1 )
            key = line.mid( 0, pos );
        else
            key = QString::null;
        QString value = line.mid( pos+2, line.length()-pos );
        // Allocate new package and insert into list
        if ( package == NULL  && !key.isEmpty() )
        {
            package = new OPackage( value );
            package->setSource( server );
            pl->append( package );
        }
        // Update package data
        if ( key == "Package" )
                package->setName( value );
        else if ( key == "Version" )
            package->setVersion( value );
        else if ( key == "Section" )
            package->setCategory( value );
            //DataManager::setAvailableCategories( value );
        else if ( key.isEmpty() && value.isEmpty() )
            package = NULL;
        // Skip past all description lines
        if ( key == "Description" )
        {
            line = t.readLine();
            while ( !line.isEmpty() && line.find( ':', 0 ) == -1 && !t.eof() )
                line = t.readLine();
        }
        else
            line = t.readLine();
    }
    f.close();
    return pl;
 }
 OPackageList *OIpkg::installedPackages( const QString &destName, const QString &destPath )
 {
    // Load Ipkg configuration info if not already cached
    if ( !m_confInfo )
        loadConfiguration();
    // Build new server list (caller is responsible for deleting)
    OPackageList *pl = new OPackageList;
    // Open status file
    QString path = destPath;
    if ( path.right( 1 ) != "/" )
        path.append( "/" );
    path.append( IPKG_STATUS_PATH );
    QFile f( path );
    if ( !f.open( IO_ReadOnly ) )
        return NULL;
    QTextStream t( &f );
    // Process all information in status file
    bool newPackage = false;
    QString line = t.readLine();
    QString name;
    QString version;
    QString status;
    while ( !t.eof() )
    {
        // Determine key/value pair
        int pos = line.find( ':', 0 );
        QString key;
        if ( pos > -1 )
            key = line.mid( 0, pos );
        else
            key = QString::null;
        QString value = line.mid( pos+2, line.length()-pos );
        // Allocate new package and insert into list
        if ( newPackage  && !key.isEmpty() )
        {
            // Add to list only if it has a valid name and is installed
            if ( !name.isNull() && status.contains( " installed" ) )
            {
                pl->append( new OPackage( name, QString::null, version, QString::null, destName ) );
                name = QString::null;
                version = QString::null;
                status = QString::null;
                newPackage = false;
            }
        }
        // Update package data
        if ( key == "Package" )
            name = value;
        else if ( key == "Version" )
            version = value;
        else if ( key == "Status" )
            status = value;
        else if ( key.isEmpty() && value.isEmpty() )
            newPackage = true;
        // Skip past all description lines
        if ( key == "Description" )
        {
            line = t.readLine();
            while ( !line.isEmpty() && line.find( ':', 0 ) == -1 && !t.eof() )
                line = t.readLine();
        }
        else
            line = t.readLine();
    }
    f.close();
    // Make sure to add to list last entry
    if ( !name.isNull() && status.contains( " installed" ) )
        pl->append( new OPackage( name, QString::null, version, QString::null, destName ) );
    return pl;
 }
 OConfItem *OIpkg::findConfItem( OConfItem::Type type, const QString &name )
 {
    // Find configuration item in list
    OConfItemListIterator configIt( *m_confInfo );
    OConfItem *config = 0l;
    for ( ; configIt.current(); ++configIt )
    {
        config = configIt.current();
        if ( config->type() == type && config->name() == name )
            break;
    }
    if ( config && config->type() == type && config->name() == name )
        return config;
    return 0l;
 }
 bool OIpkg::executeCommand( OPackage::Command command, const QStringList &parameters, const QString &destination,
                            const QObject *receiver, const char *slotOutput, bool rawOutput )
 {
    if ( command == OPackage::NotDefined )
        return false;
    // Set ipkg run-time options/arguments
    m_ipkgArgs.force_depends = ( m_ipkgExecOptions & FORCE_DEPENDS );
    m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL );
    // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE );
    m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE );
    m_ipkgArgs.verbosity = m_ipkgExecVerbosity;
    if ( m_ipkgArgs.dest )
        free( m_ipkgArgs.dest );
    if ( !destination.isNull() )
    {
        int len = destination.length() + 1;
        m_ipkgArgs.dest = (char *)malloc( len );
        strncpy( m_ipkgArgs.dest, destination, destination.length() );
        m_ipkgArgs.dest[ len - 1 ] = '\0';
    }
    else
        m_ipkgArgs.dest = 0l;
    // Connect output signal to widget
    if ( !rawOutput )
    {
        // TODO - connect to local slot and parse output before emitting signalIpkgMessage
    }
    switch( command )
    {
        case OPackage::Update : {
                connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput );
                ipkg_lists_update( &m_ipkgArgs );
                disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 );
            };
            break;
        case OPackage::Upgrade : {
                connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput );
                ipkg_packages_upgrade( &m_ipkgArgs );
                // Re-link non-root destinations to make sure everything is in sync
                OConfItemList *destList = destinations();
                OConfItemListIterator it( *destList );
                for ( ; it.current(); ++it )
                {
                    OConfItem *dest = it.current();
                    if ( dest->name() != "root" )
                        linkPackageDir( dest->name() );
                }
                delete destList;
                disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 );
            };
            break;
        case OPackage::Install : {
                connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput );
                for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it )
                {
                    ipkg_packages_install( &m_ipkgArgs, (*it) );
                }
                if ( destination != "root" )
                    linkPackageDir( destination );
                disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 );
            };
            break;
        case OPackage::Remove : {
                connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput );
                // Get list of destinations for unlinking of packages not installed to root
                OConfItemList *destList = destinations();
                for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it )
                {
                    unlinkPackage( (*it), destList );
                    ipkg_packages_remove( &m_ipkgArgs, (*it), true );
                }
                delete destList;
                disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 );
            };
            break;
        case OPackage::Download : {
                connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput );
                for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it )
                {
                    ipkg_packages_download( &m_ipkgArgs, (*it) );
                }
                disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 );
            };
            break;
        case OPackage::Info : {
                connect( this, SIGNAL(signalIpkgStatus(const QString &)), receiver, slotOutput );
                ipkg_packages_info( &m_ipkgArgs, (*parameters.begin()), &fIpkgStatus, 0l );
                disconnect( this, SIGNAL(signalIpkgStatus(const QString &)), 0, 0 );
            };
            break;
        case OPackage::Files : {
                connect( this, SIGNAL(signalIpkgList(const QString &)), receiver, slotOutput );
                ipkg_package_files( &m_ipkgArgs, (*parameters.begin()), &fIpkgFiles, 0l );
                disconnect( this, SIGNAL(signalIpkgList(const QString &)), 0, 0 );
            };
            break;
        default : break;
    };
    return true;
 }
 void OIpkg::ipkgMessage( char *msg )
 {
    emit signalIpkgMessage( msg );
 }
 void OIpkg::ipkgStatus( char *status )
 {
    emit signalIpkgStatus( status );
 }
 void OIpkg::ipkgList( char *filelist )
 {
    emit signalIpkgList( filelist );
 }
 void OIpkg::loadConfiguration()
 {
    if ( m_confInfo )
        delete m_confInfo;
    // Load configuration item list
    m_confInfo = new OConfItemList();
    QStringList confFiles;
    QDir confDir( IPKG_CONF_DIR );
    if ( confDir.exists() )
    {
        confDir.setNameFilter( "*.conf" );
        confDir.setFilter( QDir::Files );
        confFiles = confDir.entryList( "*.conf", QDir::Files );
    }
    confFiles << IPKG_CONF;
    QStringList::Iterator lastFile = confFiles.end();
    for ( QStringList::Iterator it = confFiles.begin(); it != lastFile; ++it )
    {
        // Create absolute file path if necessary
        QString absFile = (*it);
        if ( !absFile.startsWith( "/" ) )
            absFile.prepend( QString( IPKG_CONF_DIR ) + "/" );
        // Read in file
        QFile f( absFile );
        if ( f.open( IO_ReadOnly ) )
        {
            QTextStream s( &f );
            while ( !s.eof() )
            {
                QString line = s.readLine().simplifyWhiteSpace();
                // Parse line and save info to the conf options list
                if ( !line.isEmpty() )
                {
                    // Strip leading comment marker if exists
                    bool comment = false;
                    if ( line.startsWith( "#" ) )
                    {
                        line.remove( 0, 1 );
                        line = line.simplifyWhiteSpace();
                        comment = true;
                    }
                    bool recognizedOption = true;
                    int pos = line.find( ' ', 1 )  + 1;
                    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 = !comment;
                    // Type
                    // For options w/type = Other, the mapping is as follows:
                    //    name = typeStr (e.g. "lists_dir")
                    //    value = value
                    //    features = name (from configuration file)
                    QString typeStr = line.left( pos - 1 );
                    OConfItem::Type type;
                    QString features;
                    if ( typeStr == "src" )
                        type = OConfItem::Source;
                    else if ( typeStr == "src/gz" )
                    {
                        type = OConfItem::Source;
                        features = "Compressed";
                    }
                    else if ( typeStr == "dest" )
                        type = OConfItem::Destination;
                    else if ( typeStr == "option" )
                        type = OConfItem::Option;
                    else if ( typeStr == "arch" )
                        type = OConfItem::Arch;
                    else if ( typeStr == "lists_dir" )
                    {
                        type = OConfItem::Other;
                        features = name;
                        name = typeStr;
                        // Default value when not defined
                        if ( value == QString::null || value == "" )
                            value = IPKG_PKG_PATH;
                    }
                    else
                        recognizedOption = false;
                    // Add to list
                    if ( recognizedOption )
                        m_confInfo->append( new OConfItem( type, name, value, features, 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();
    // Build new server list (caller is responsible for deleting)
    OConfItemList *sl = new OConfItemList;
    // If typefilter is empty, retrieve all items
    bool retrieveAll = ( typefilter == OConfItem::NotDefined );
    // Parse configuration info for servers
    OConfItemListIterator it( *m_confInfo );
    for ( ; it.current(); ++it )
    {
        OConfItem *item = it.current();
        if ( retrieveAll || item->type() == typefilter )
        {
            sl->append( item );
        }
    }
    return sl;
 }
 const QString &OIpkg::rootPath()
 {
    if ( m_rootPath.isEmpty() )
    {
        OConfItem *rootDest = findConfItem( OConfItem::Destination, "root" );
        rootDest ? m_rootPath = rootDest->value()
                 : m_rootPath = '/';
        if ( m_rootPath.right( 1 ) == '/' )
            m_rootPath.truncate( m_rootPath.length() - 1 );
    }
    return m_rootPath;
 }
 void OIpkg::linkPackageDir( const QString &dest )
 {
    if ( !dest.isNull() )
    {
        OConfItem *destConfItem = findConfItem( OConfItem::Destination, dest );
        emit signalIpkgMessage( tr( "Linking packages installed in: %1" ).arg( dest ) );
        // Set package destination directory
        QString destDir = destConfItem->value();
        QString destInfoDir = destDir;
        if ( destInfoDir.right( 1 ) != '/' )
            destInfoDir.append( '/' );
        destInfoDir.append( IPKG_INFO_PATH );
        // Get list of installed packages in destination
        QDir packageDir( destInfoDir );
        QStringList packageFiles;
        if ( packageDir.exists() )
        {
            packageDir.setNameFilter( "*.list" );
            packageDir.setFilter( QDir::Files );
            packageFiles = packageDir.entryList( "*.list", QDir::Files );
        }
        // Link all files for every package installed in desination
        QStringList::Iterator lastFile = packageFiles.end();
        for ( QStringList::Iterator it = packageFiles.begin(); it != lastFile; ++it )
        {
            //emit signalIpkgMessage( QString( "Processing: %1/%2" ).arg( destInfoDir ).arg (*it) );
            QString packageFileName = destInfoDir;
            packageFileName.append( '/' );
            packageFileName.append( (*it) );
            QFile packageFile( packageFileName );
            if ( packageFile.open( IO_ReadOnly ) )
            {
                QTextStream t( &packageFile );
                QString linkFile;
                while ( !t.eof() )
                {
                    // Get the name of the file to link and build the sym link filename
                    linkFile = t.readLine();
                    QString linkDest( linkFile.right( linkFile.length() - destDir.length() ) );
                    linkDest.prepend( rootPath() );
                    // If file installed file is actually symbolic link, use actual file for linking
                    QFileInfo fileInfo( linkFile );
                    if ( fileInfo.isSymLink() && !fileInfo.readLink().isEmpty() )
                        linkFile = fileInfo.readLink();
                    // See if directory exists in 'root', if not, create
                    fileInfo.setFile( linkDest );
                    QString linkDestDirName = fileInfo.dirPath( true );
                    QDir linkDestDir( linkDestDirName );
                    if ( !linkDestDir.exists() )
                    {
                        linkDestDir.mkdir( linkDestDirName );
                    }
                    else
                    {
                        // Remove any previous link to make sure we will be pointing to the current version
                        if ( QFile::exists( linkDest ) )
                            QFile::remove( linkDest );
                    }
                    // Link the file
                    //emit signalIpkgMessage( QString( "Linking '%1' to '%2'" ).arg( linkFile ).arg( linkDest ) );
                    if ( symlink( linkFile, linkDest ) == -1 )
                        emit signalIpkgMessage( tr( "Error linkling '%1' to '%2'" )
                                                .arg( linkFile )
                                                .arg( linkDest ) );
                }
                packageFile.close();
            }
        }
    }
 }
 void OIpkg::unlinkPackage( const QString &package, OConfItemList *destList )
 {
    if ( !package.isNull() )
    {
        // Find destination package is installed in
        if ( destList )
        {
            OConfItemListIterator it( *destList );
            for ( ; it.current(); ++it )
            {
                OConfItem *dest = it.current();
                QString destInfoFileName = QString( "%1/%2/%3.list" ).arg( dest->value() )
                                                                     .arg( IPKG_INFO_PATH )
                                                                     .arg( package );
                //emit signalIpkgMessage( QString( "Looking for '%1'" ).arg ( destInfoFileName ) );
                // If found and destination is not 'root', remove symbolic links
                if ( QFile::exists( destInfoFileName ) && dest->name() != "root" )
                {
                    QFile destInfoFile( destInfoFileName );
                    if ( destInfoFile.open( IO_ReadOnly ) )
                    {
                        QTextStream t( &destInfoFile );
                        QString linkFile;
                        while ( !t.eof() )
                        {
                            // Get the name of the file to link and build the sym link filename
                            linkFile = t.readLine();
                            QString linkDest( linkFile.right( linkFile.length() -
                                                              dest->value().length() ) );
                            linkDest.prepend( rootPath() );
                            //emit signalIpkgMessage( QString( "Deleting: '%1'" ).arg( linkDest ) );
                            QFile::remove( linkDest );
                        }
                        destInfoFile.close();
                    }
                    emit signalIpkgMessage( tr( "Links removed for: %1" ).arg( package ) );
                    return;
                }
            }
        }
    }
 }
diff --git a/noncore/settings/packagemanager/oipkg.h b/noncore/settings/packagemanager/oipkg.h
index 4e390fa..9a7802c 100644
--- a/noncore/settings/packagemanager/oipkg.h
+++ b/noncore/settings/packagemanager/oipkg.h
@@ -1,111 +1,110 @@
 /*
-                    This file is part of the Opie Project
+                             This file is part of the Opie Project
-                      Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
              =.
            .=l.
-     .>+-=
+           .>+-=
-_;:,   .>  :=|.         This program is free software; you can
+ _;:,     .>    :=|.         This program is free software; you can
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,   .._         License as published by the Free Software
+.="- .-=="i,     .._         License as published by the Free Software
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
+     ._= =}       :          or (at your option) any later version.
-  .%`+i>    _;_.
+    .%`+i>       _;_.
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  : ..  .:,   . . .    without even the implied warranty of
+    : ..    .:,     . . .    without even the implied warranty of
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=    =    ;      Library General Public License for more
+..}^=.=       =       ;      Library General Public License for more
-++=  -.   .`   .:       details.
++=   -.     .`     .:       details.
-:   = ...= . :.=-
+:     =  ...= . :.=-
-.  .:....=;==+<;          You should have received a copy of the GNU
+ -.   .:....=;==+<;          You should have received a copy of the GNU
- -_. . .  )=. =           Library General Public License along with
+  -_. . .   )=.  =           Library General Public License along with
-  --    :-=`           this library; see the file COPYING.LIB.
+    --        :-=`           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
 #include "oconfitem.h"
 #include "opackage.h"
 #include <qpe/config.h>
 #include <qobject.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 = 0l, QObject *parent = 0l, const char *name = 0l );
    ~OIpkg();
    OConfItemList *configItems();
    OConfItemList *servers();
    OConfItemList *destinations();
    OConfItemList *options();
    int  ipkgExecOptions() { return m_ipkgExecOptions; }
    int  ipkgExecVerbosity() { return m_ipkgExecVerbosity; }
    void setConfigItems( OConfItemList *configList );
    void setIpkgExecOptions( int options ) { m_ipkgExecOptions = options; }
    void setIpkgExecVerbosity( int verbosity ) { m_ipkgExecVerbosity = verbosity; }
    void saveSettings();
    OPackageList *availablePackages( const QString &server = QString::null );
    OPackageList *installedPackages( const QString &destName = QString::null,
                                     const QString &destPath = QString::null );
    OConfItem    *findConfItem( OConfItem::Type type = OConfItem::NotDefined,
                                const QString &name = QString::null );
    bool executeCommand( OPackage::Command command = OPackage::NotDefined,
                         const QStringList &parameters = QStringList(),
                         const QString &destination = QString::null,
                         const QObject *receiver = 0l,
                         const char *slotOutput = 0l,
                         bool rawOutput = true );
    void abortCommand();
    void ipkgMessage( char *msg );
    void ipkgStatus( char *status );
    void ipkgList( char *filelist );
 private:
    Config        *m_config;            // Pointer to application configuration file
    OConfItemList *m_confInfo;          // Contains info from all Ipkg configuration files
    int            m_ipkgExecOptions;   // Bit-mapped flags for Ipkg execution options
    int            m_ipkgExecVerbosity; // Ipkg execution verbosity level
    QString        m_rootPath;          // Directory path where the 'root' destination is located
    void           loadConfiguration();
    OConfItemList *filterConfItems( OConfItem::Type typefilter = OConfItem::NotDefined );
    const QString &rootPath();
    void           linkPackageDir( const QString &dest = QString::null );
    void           unlinkPackage( const QString &package = QString::null,
                                  OConfItemList *destList = 0l );
 signals:
    void signalIpkgMessage( const QString &msg );
    void signalIpkgStatus( const QString &status );
    void signalIpkgList( const QString &filelist );
 };
 #endif
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index 0ad1c82..945571f 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -1,703 +1,702 @@
 /*
-                    This file is part of the Opie Project
+                             This file is part of the Opie Project
-                      Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
              =.
            .=l.
-     .>+-=
+           .>+-=
-_;:,   .>  :=|.         This program is free software; you can
+ _;:,     .>    :=|.         This program is free software; you can
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,   .._         License as published by the Free Software
+.="- .-=="i,     .._         License as published by the Free Software
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
+     ._= =}       :          or (at your option) any later version.
-  .%`+i>    _;_.
+    .%`+i>       _;_.
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  : ..  .:,   . . .    without even the implied warranty of
+    : ..    .:,     . . .    without even the implied warranty of
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=    =    ;      Library General Public License for more
+..}^=.=       =       ;      Library General Public License for more
-++=  -.   .`   .:       details.
++=   -.     .`     .:       details.
-:   = ...= . :.=-
+:     =  ...= . :.=-
-.  .:....=;==+<;          You should have received a copy of the GNU
+ -.   .:....=;==+<;          You should have received a copy of the GNU
- -_. . .  )=. =           Library General Public License along with
+  -_. . .   )=.  =           Library General Public License along with
-  --    :-=`           this library; see the file COPYING.LIB.
+    --        :-=`           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 <opie2/ofiledialog.h>
 #include <qpe/qpeapplication.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>
 OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent )
    : QDialog( parent, QString::null, true, WStyle_ContextHelp )
    , m_ipkg( ipkg )
    , m_configs( 0l )
    , m_installOptions( installOptions )
    , m_serverCurrent( -1 )
    , 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
    initData();
    // Setup tabs for all info
    m_layout.addWidget( &m_tabWidget );
    if ( !m_installOptions )
    {
        m_tabWidget.addTab( m_serverWidget, "packagemanager/servertab", tr( "Servers" ) );
        m_tabWidget.addTab( m_destWidget, "packagemanager/desttab", tr( "Destinations" ) );
        m_tabWidget.addTab( m_proxyWidget, "packagemanager/proxytab", tr( "Proxies" ) );
        m_tabWidget.addTab( m_optionsWidget, "exec", tr( "Options" ) );
        m_tabWidget.setCurrentTab( tr( "Servers" ) );
    }
    else
    {
        m_tabWidget.addTab( m_optionsWidget, "exec", tr( "Options" ) );
    }
 }
 void OIpkgConfigDlg::accept()
 {
    // Save server, destination and proxy configuration
    if ( !m_installOptions )
    {
        // Update proxy information before saving settings
        OConfItem *confItem = m_ipkg->findConfItem( OConfItem::Option, "http_proxy" );
        if ( confItem )
        {
            confItem->setValue( m_proxyHttpServer->text() );
            confItem->setActive( m_proxyHttpActive->isChecked() );
        }
        else
            m_configs->append( new OConfItem( OConfItem::Option, "http_proxy",
                               m_proxyHttpServer->text(), QString::null,
                               m_proxyHttpActive->isChecked() ) );
        confItem = m_ipkg->findConfItem( OConfItem::Option, "ftp_proxy" );
        if ( confItem )
        {
            confItem->setValue( m_proxyFtpServer->text() );
            confItem->setActive( m_proxyFtpActive->isChecked() );
        }
        else
            m_configs->append( new OConfItem( OConfItem::Option, "ftp_proxy",
                               m_proxyFtpServer->text(), QString::null,
                               m_proxyFtpActive->isChecked() ) );
        confItem = m_ipkg->findConfItem( OConfItem::Option, "proxy_username" );
        if ( confItem )
            confItem->setValue( m_proxyUsername->text() );
        else
            m_configs->append( new OConfItem( OConfItem::Option, "proxy_username",
                               m_proxyUsername->text() ) );
        confItem = m_ipkg->findConfItem( OConfItem::Option, "proxy_password" );
        if ( confItem )
            confItem->setValue( m_proxyPassword->text() );
        else
            m_configs->append( new OConfItem( OConfItem::Option, "proxy_password",
                               m_proxyPassword->text() ) );
        QString listsDir = m_optSourceLists->text();
        if ( listsDir == QString::null || listsDir == "" )
            listsDir = "/usr/lib/ipkg/lists"; // TODO - use proper libipkg define
        confItem = m_ipkg->findConfItem( OConfItem::Other, "lists_dir" );
        if ( confItem )
            confItem->setValue( listsDir );
        else
            m_configs->append( new OConfItem( OConfItem::Other, "lists_dir",
                               listsDir, "name" ) );
        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 )
        delete m_configs;
 }
 void OIpkgConfigDlg::initServerWidget()
 {
    m_serverWidget = new QWidget( this );
    // Initialize UI
    QVBoxLayout *vb = new QVBoxLayout( m_serverWidget );
    QScrollView *sv = new QScrollView( m_serverWidget );
    vb->addWidget( sv, 0, 0 );
    sv->setResizePolicy( QScrollView::AutoOneFit );
    sv->setFrameStyle( QFrame::NoFrame );
    QWidget *container = new QWidget( sv->viewport() );
    sv->addChild( container );
    QGridLayout *layout = new QGridLayout( container, 2, 3, 2, 4 );
    m_serverList = new QListBox( container );
    QWhatsThis::add( m_serverList, tr( "This is a list of all servers configured.  Select one here to edit or delete, or add a new one below." ) );
    m_serverList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
    connect( m_serverList, SIGNAL(highlighted(int)), this, SLOT(slotServerSelected(int)) );
    layout->addMultiCellWidget( m_serverList, 0, 0, 0, 2 );
    QPixmap pic;
    pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    QPushButton *btn = new QPushButton( pic, tr( "New" ), container );
    btn->setMinimumHeight( AppLnk::smallIconSize() );
    QWhatsThis::add( btn, tr( "Tap here to create a new entry.  Fill in the fields below and then tap on Update." ) );
    connect( btn, SIGNAL(clicked()), this, SLOT(slotServerNew()) );
    layout->addWidget( btn, 1, 0 );
    pic.convertFromImage( Resource::loadImage( "edit" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    m_serverEditBtn = new QPushButton( pic, tr( "Edit" ), container );
    m_serverEditBtn->setMinimumHeight( AppLnk::smallIconSize() );
    m_serverEditBtn->setEnabled( false );
    QWhatsThis::add( m_serverEditBtn, tr( "Tap here to edit the entry selected above." ) );
    connect( m_serverEditBtn, SIGNAL(clicked()), this, SLOT(slotServerEdit()) );
    layout->addWidget( m_serverEditBtn, 1, 1 );
    pic.convertFromImage( Resource::loadImage( "trash" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    m_serverDeleteBtn = new QPushButton( pic, tr( "Delete" ), container );
    m_serverDeleteBtn->setMinimumHeight( AppLnk::smallIconSize() );
    m_serverDeleteBtn->setEnabled( false );
    QWhatsThis::add( m_serverDeleteBtn, tr( "Tap here to delete the entry selected above." ) );
    connect( m_serverDeleteBtn, SIGNAL(clicked()), this, SLOT(slotServerDelete()) );
    layout->addWidget( m_serverDeleteBtn, 1, 2 );
 }
 void OIpkgConfigDlg::initDestinationWidget()
 {
    m_destWidget = new QWidget( this );
    // Initialize UI
    QVBoxLayout *vb = new QVBoxLayout( m_destWidget );
    QScrollView *sv = new QScrollView( m_destWidget );
    vb->addWidget( sv, 0, 0 );
    sv->setResizePolicy( QScrollView::AutoOneFit );
    sv->setFrameStyle( QFrame::NoFrame );
    QWidget *container = new QWidget( sv->viewport() );
    sv->addChild( container );
    QGridLayout *layout = new QGridLayout( container, 2, 3, 2, 4 );
    m_destList = new QListBox( container );
    QWhatsThis::add( m_destList, tr( "This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below." ) );
    m_destList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
    connect( m_destList, SIGNAL(highlighted(int)), this, SLOT(slotDestSelected(int)) );
    layout->addMultiCellWidget( m_destList, 0, 0, 0, 2 );
    QPixmap pic;
    pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    QPushButton *btn = new QPushButton( pic, tr( "New" ), container );
    btn->setMinimumHeight( AppLnk::smallIconSize() );
    QWhatsThis::add( btn, tr( "Tap here to create a new entry.  Fill in the fields below and then tap on Update." ) );
    connect( btn, SIGNAL(clicked()), this, SLOT(slotDestNew()) );
    layout->addWidget( btn, 1, 0 );
    pic.convertFromImage( Resource::loadImage( "edit" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    m_destEditBtn = new QPushButton( pic, tr( "Edit" ), container );
    m_destEditBtn->setMinimumHeight( AppLnk::smallIconSize() );
    m_destEditBtn->setEnabled( false );
    QWhatsThis::add( m_destEditBtn, tr( "Tap here to edit the entry selected above." ) );
    connect( m_destEditBtn, SIGNAL(clicked()), this, SLOT(slotDestEdit()) );
    layout->addWidget( m_destEditBtn, 1, 1 );
    pic.convertFromImage( Resource::loadImage( "trash" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    m_destDeleteBtn = new QPushButton( pic, tr( "Delete" ), container );
    m_destDeleteBtn->setMinimumHeight( AppLnk::smallIconSize() );
    m_destDeleteBtn->setEnabled( false );
    QWhatsThis::add( m_destDeleteBtn, tr( "Tap here to delete the entry selected above." ) );
    connect( m_destDeleteBtn, SIGNAL(clicked()), this, SLOT(slotDestDelete()) );
    layout->addWidget( m_destDeleteBtn, 1, 2 );
 }
 void OIpkgConfigDlg::initProxyWidget()
 {
    m_proxyWidget = new QWidget( this );
    // Initialize UI
    QVBoxLayout *vb = new QVBoxLayout( m_proxyWidget );
    QScrollView *sv = new QScrollView( m_proxyWidget );
    vb->addWidget( sv, 0, 0 );
    sv->setResizePolicy( QScrollView::AutoOneFit );
    sv->setFrameStyle( QFrame::NoFrame );
    QWidget *container = new QWidget( sv->viewport() );
    sv->addChild( container );
    QGridLayout *layout = new QGridLayout( container, 4, 2, 2, 4 );
    // HTTP proxy server configuration
    QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "HTTP Proxy" ), container );
    grpbox->layout()->setSpacing( 2 );
    grpbox->layout()->setMargin( 4 );
    layout->addMultiCellWidget( grpbox, 0, 0, 0, 1 );
    QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() );
    m_proxyHttpServer = new QLineEdit( grpbox );
    QWhatsThis::add( m_proxyHttpServer, tr( "Enter the URL address of the HTTP proxy server here." ) );
    grplayout->addWidget( m_proxyHttpServer );
    m_proxyHttpActive = new QCheckBox( tr( "Enabled" ), grpbox );
    QWhatsThis::add( m_proxyHttpActive, tr( "Tap here to enable or disable the HTTP proxy server." ) );
    grplayout->addWidget( m_proxyHttpActive );
    // FTP proxy server configuration
    grpbox = new QGroupBox( 0, Qt::Vertical, tr( "FTP Proxy" ), container );
    grpbox->layout()->setSpacing( 2 );
    grpbox->layout()->setMargin( 4 );
    layout->addMultiCellWidget( grpbox, 1, 1, 0, 1 );
    grplayout = new QVBoxLayout( grpbox->layout() );
    m_proxyFtpServer = new QLineEdit( grpbox );
    QWhatsThis::add( m_proxyFtpServer, tr( "Enter the URL address of the FTP proxy server here." ) );
    grplayout->addWidget( m_proxyFtpServer );
    m_proxyFtpActive = new QCheckBox( tr( "Enabled" ), grpbox );
    QWhatsThis::add( m_proxyFtpActive, tr( "Tap here to enable or disable the FTP proxy server." ) );
    grplayout->addWidget( m_proxyFtpActive );
    // Proxy server username and password configuration
    QLabel *label = new QLabel( tr( "Username:" ), container );
    QWhatsThis::add( label, tr( "Enter the username for the proxy servers here." ) );
    layout->addWidget( label, 2, 0 );
    m_proxyUsername = new QLineEdit( container );
    QWhatsThis::add( m_proxyUsername, tr( "Enter the username for the proxy servers here." ) );
    layout->addWidget( m_proxyUsername, 2, 1 );
    label = new QLabel( tr( "Password:" ), container );
    QWhatsThis::add( label, tr( "Enter the password for the proxy servers here." ) );
    layout->addWidget( label, 3, 0 );
    m_proxyPassword = new QLineEdit( container );
    QWhatsThis::add( m_proxyPassword, tr( "Enter the password for the proxy servers here." ) );
    layout->addWidget( m_proxyPassword, 3, 1 );
 }
 void OIpkgConfigDlg::initOptionsWidget()
 {
    m_optionsWidget = new QWidget( this );
    // Initialize UI
    QVBoxLayout *vb = new QVBoxLayout( m_optionsWidget );
    QScrollView *sv = new QScrollView( m_optionsWidget );
    vb->addWidget( sv, 0, 0 );
    sv->setResizePolicy( QScrollView::AutoOneFit );
    sv->setFrameStyle( QFrame::NoFrame );
    QWidget *container = new QWidget( sv->viewport() );
    sv->addChild( container );
    QGridLayout *layout = new QGridLayout( container, 8, 2, 2, 4 );
    m_optForceDepends = new QCheckBox( tr( "Force Depends" ), container );
    QWhatsThis::add( m_optForceDepends, tr( "Tap here to enable or disable the '-force-depends' option for Ipkg." ) );
    layout->addMultiCellWidget( m_optForceDepends, 0, 0, 0, 1 );
    m_optForceReinstall = new QCheckBox( tr( "Force Reinstall" ), container );
    QWhatsThis::add( m_optForceReinstall, tr( "Tap here to enable or disable the '-force-reinstall' option for Ipkg." ) );
    layout->addMultiCellWidget( m_optForceReinstall, 1, 1, 0, 1 );
    m_optForceRemove = new QCheckBox( tr( "Force Remove" ), container );
    QWhatsThis::add( m_optForceRemove, tr( "Tap here to enable or disable the '-force-removal-of-dependent-packages' option for Ipkg." ) );
    layout->addMultiCellWidget( m_optForceRemove, 2, 2, 0, 1 );
    m_optForceOverwrite = new QCheckBox( tr( "Force Overwrite" ), container );
    QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) );
    layout->addMultiCellWidget( m_optForceOverwrite, 3, 3, 0, 1 );
    QLabel *l = new QLabel( tr( "Information level:" ), container );
    QWhatsThis::add( l, tr( "Select information level for Ipkg." ) );
    layout->addMultiCellWidget( l, 4, 4, 0, 1 );
    m_optVerboseIpkg = new QComboBox( container );
    QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) );
    m_optVerboseIpkg->insertItem( tr( "Errors only" ) );
    m_optVerboseIpkg->insertItem( tr( "Normal messages" ) );
    m_optVerboseIpkg->insertItem( tr( "Informative messages" ) );
    m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) );
    layout->addMultiCellWidget( m_optVerboseIpkg, 5, 5, 0, 1 );
    l = new QLabel( tr( "Package source lists directory:" ), container );
    QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) );
    layout->addMultiCellWidget( l, 6, 6, 0, 1 );
    m_optSourceLists = new QLineEdit( container );
    QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) );
    layout->addWidget( m_optSourceLists, 7, 0 );
    QPixmap pic;
    pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    QPushButton *btn = new QPushButton( pic, QString::null, container );
    btn->setMaximumWidth( btn->height() );
    QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) );
    connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) );
    layout->addWidget( btn, 7, 1 );
    layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 }
 void OIpkgConfigDlg::initData()
 {
    // Read ipkg configuration (server/destination/proxy) information
    if ( m_ipkg && !m_installOptions )
    {
        m_configs = m_ipkg->configItems();
        if ( m_configs )
        {
            for ( OConfItemListIterator configIt( *m_configs ); configIt.current(); ++configIt )
            {
                OConfItem *config = configIt.current();
                // Add configuration item to the appropriate dialog controls
                if ( config )
                {
                    switch ( config->type() )
                    {
                        case OConfItem::Source :  m_serverList->insertItem( config->name() ); break;
                        case OConfItem::Destination : m_destList->insertItem( config->name() ); break;
                        case OConfItem::Option :
                            {
                                if ( config->name() == "http_proxy" )
                                {
                                    m_proxyHttpServer->setText( config->value() );
                                    m_proxyHttpActive->setChecked( config->active() );
                                }
                                else if ( config->name() == "ftp_proxy" )
                                {
                                    m_proxyFtpServer->setText( config->value() );
                                    m_proxyFtpActive->setChecked( config->active() );
                                }
                                else if ( config->name() == "proxy_username" )
                                {
                                    m_proxyUsername->setText( config->value() );
                                }
                                else if ( config->name() == "proxy_password" )
                                {
                                    m_proxyPassword->setText( config->value() );
                                }
                            }
                            break;
                        case OConfItem::Other :
                            {
                                if ( config->name() == "lists_dir" )
                                    m_optSourceLists->setText( config->value() );
                                else // TODO - use proper libipkg define
                                    m_optSourceLists->setText( "/usr/lib/ipkg/lists" );
                            }
                            break;
                        default : break;
                    };
                }
            }
        }
    }
    // Get Ipkg execution options
    int options = m_ipkg->ipkgExecOptions();
    if ( options & FORCE_DEPENDS )
        m_optForceDepends->setChecked( true );
    if ( options & FORCE_REINSTALL )
        m_optForceReinstall->setChecked( true );
    if ( options & FORCE_REMOVE )
        m_optForceRemove->setChecked( true );
    if ( options & FORCE_OVERWRITE )
        m_optForceOverwrite->setChecked( true );
    m_optVerboseIpkg->setCurrentItem( m_ipkg->ipkgExecVerbosity() );
 }
 void OIpkgConfigDlg::slotServerSelected( int index )
 {
    m_serverCurrent = index;
    // Enable Edit and Delete buttons
    m_serverEditBtn->setEnabled( true );
    m_serverDeleteBtn->setEnabled( true );
 }
 void OIpkgConfigDlg::slotServerNew()
 {
    OConfItem *server = new OConfItem( OConfItem::Source );
    OIpkgServerDlg dlg( server, this );
    if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted )
    {
        // Add to configuration option list
        m_configs->append( server );
        m_configs->sort();
        // Add to server list
        m_serverList->insertItem( server->name() );
        m_serverList->setCurrentItem( m_serverList->count() );
    }
    else
        delete server;
 }
 void OIpkgConfigDlg::slotServerEdit()
 {
    // Find selected server in list
    OConfItem *server = m_ipkg->findConfItem( OConfItem::Source, m_serverList->currentText() );
    // Edit server
    if ( server )
    {
        QString origName = server->name();
        OIpkgServerDlg dlg( server, this );
        if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted )
        {
            // Check to see if name has changed, if so update the server list
            if ( server->name() != origName )
                m_serverList->changeItem( server->name(), m_serverCurrent );
        }
    }
 }
 void OIpkgConfigDlg::slotServerDelete()
 {
    // Find selected server in list
    OConfItem *server = m_ipkg->findConfItem( OConfItem::Source, m_serverList->currentText() );
    // Delete server
    if ( server )
    {
        m_configs->removeRef( server );
        m_serverList->removeItem( m_serverCurrent );
    }
 }
 void OIpkgConfigDlg::slotDestSelected( int index )
 {
    m_destCurrent = index;
    // Enable Edit and Delete buttons
    m_destEditBtn->setEnabled( true );
    m_destDeleteBtn->setEnabled( true );
 }
 void OIpkgConfigDlg::slotDestNew()
 {
    OConfItem *dest = new OConfItem( OConfItem::Destination );
    OIpkgDestDlg dlg( dest, this );
    if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted )
    {
        // Add to configuration option list
        m_configs->append( dest );
        m_configs->sort();
        // Add to destination list
        m_destList->insertItem( dest->name() );
        m_destList->setCurrentItem( m_destList->count() );
    }
    else
        delete dest;
 }
 void OIpkgConfigDlg::slotDestEdit()
 {
    // Find selected destination in list
    OConfItem *dest = m_ipkg->findConfItem( OConfItem::Destination, m_destList->currentText() );
    // Edit destination
    if ( dest )
    {
        QString origName = dest->name();
        OIpkgDestDlg dlg( dest, this );
        if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted )
        {
            // Check to see if name has changed, if so update the dest list
            if ( dest->name() != origName )
                m_destList->changeItem( dest->name(), m_destCurrent );
        }
    }
 }
 void OIpkgConfigDlg::slotDestDelete()
 {
    // Find selected destination in list
    OConfItem *destination = m_ipkg->findConfItem( OConfItem::Destination, m_destList->currentText() );
    // Delete destination
    if ( destination )
    {
        m_configs->removeRef( destination );
        m_destList->removeItem( m_destCurrent );
    }
 }
 void OIpkgConfigDlg::slotOptSelectSourceListsPath()
 {
    QString path = Opie::Ui::OFileDialog::getDirectory( 0, m_optSourceLists->text() );
    if ( path.at( path.length() - 1 ) == '/' )
        path.truncate( path.length() - 1 );
    if ( !path.isNull() )
        m_optSourceLists->setText( path );
 }
 OIpkgServerDlg::OIpkgServerDlg( OConfItem *server, QWidget *parent )
    : QDialog( parent, QString::null, true, WStyle_ContextHelp )
    , m_server( server )
 {
    setCaption( tr( "Edit Server" ) );
    // Initialize UI
    QVBoxLayout *layout = new QVBoxLayout( this, 2, 4 );
    m_active = new QCheckBox( tr( "Active" ), this );
    QWhatsThis::add( m_active, tr( "Tap here to indicate whether this entry is active or not." ) );
    layout->addWidget( m_active );
    layout->addStretch();
    QLabel *label = new QLabel( tr( "Name:" ), this );
    QWhatsThis::add( label, tr( "Enter the name of this entry here." ) );
    layout->addWidget( label );
    m_name = new QLineEdit( this );
    QWhatsThis::add( m_name, tr( "Enter the name of this entry here." ) );
    layout->addWidget( m_name );
    layout->addStretch();
    label = new QLabel( tr( "Address:" ), this );
    QWhatsThis::add( label, tr( "Enter the URL address of this entry here." ) );
    layout->addWidget( label );
    m_location = new QLineEdit( this );
    QWhatsThis::add( m_location, tr( "Enter the URL address of this entry here." ) );
    layout->addWidget( m_location );
    layout->addStretch();
    m_compressed = new QCheckBox( tr( "Compressed server feed" ), this );
    QWhatsThis::add( m_compressed, tr( "Tap here to indicate whether the server support compressed archives or not." ) );
    layout->addWidget( m_compressed );
    // Populate initial information
    if ( m_server )
    {
        m_name->setText( m_server->name() );
        m_location->setText( m_server->value() );
        m_compressed->setChecked( m_server->features().contains( "Compressed" ) );
        m_active->setChecked( m_server->active() );
    }
 }
 void OIpkgServerDlg::accept()
 {
    // Save information entered
    QString name = m_name->text();
    name.replace( QRegExp( " " ), "_" );
    m_server->setName( name );
    m_server->setValue( m_location->text() );
    m_compressed->isChecked() ? m_server->setFeatures( "Compressed" )
                              : m_server->setFeatures( QString::null );
    m_server->setActive( m_active->isChecked() );
    QDialog::accept();
 }
 OIpkgDestDlg::OIpkgDestDlg( OConfItem *dest, QWidget *parent )
    : QDialog( parent, QString::null, true, WStyle_ContextHelp )
    , m_dest( dest )
 {
    setCaption( tr( "Edit Destination" ) );
    // Initialize UI
    QVBoxLayout *layout = new QVBoxLayout( this, 2, 4 );
    m_active = new QCheckBox( tr( "Active" ), this );
    QWhatsThis::add( m_active, tr( "Tap here to indicate whether this entry is active or not." ) );
    layout->addWidget( m_active );
    layout->addStretch();
    QLabel *label = new QLabel( tr( "Name:" ), this );
    QWhatsThis::add( label, tr( "Enter the name of this entry here." ) );
    layout->addWidget( label );
    m_name = new QLineEdit( this );
    QWhatsThis::add( m_name, tr( "Enter the name of this entry here." ) );
    layout->addWidget( m_name );
    layout->addStretch();
    label = new QLabel( tr( "Location:" ), this );
    QWhatsThis::add( label, tr( "Enter the absolute directory path of this entry here." ) );
    layout->addWidget( label );
    QHBoxLayout *layout2 = new QHBoxLayout( this, 2, 4 );
    layout->addLayout( layout2 );
    m_location = new QLineEdit( this );
    QWhatsThis::add( m_location, tr( "Enter the absolute directory path of this entry here." ) );
    layout2->addWidget( m_location );
    QPixmap pic;
    pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
    QPushButton *btn = new QPushButton( pic, QString::null, this );
    btn->setMaximumWidth( btn->height() );
    QWhatsThis::add( btn, tr( "Tap here to select the desired location." ) );
    connect( btn, SIGNAL(clicked()), this, SLOT(slotSelectPath()) );
    layout2->addWidget( btn );
    // Populate initial information
    if ( m_dest )
    {
        m_name->setText( m_dest->name() );
        m_location->setText( m_dest->value() );
        m_active->setChecked( m_dest->active() );
    }
 }
 void OIpkgDestDlg::accept()
 {
    // Save information entered
    QString name = m_name->text();
    name.replace( QRegExp( " " ), "_" );
    m_dest->setName( name );
    m_dest->setValue( m_location->text() );
    m_dest->setActive( m_active->isChecked() );
    QDialog::accept();
 }
 void OIpkgDestDlg::slotSelectPath()
 {
    QString path = Opie::Ui::OFileDialog::getDirectory( 0, m_location->text() );
    if ( path.at( path.length() - 1 ) == '/' )
        path.truncate( path.length() - 1 );
    if ( !path.isNull() )
        m_location->setText( path );
 }
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.h b/noncore/settings/packagemanager/oipkgconfigdlg.h
index 9e23b62..88381ab 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.h
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.h
@@ -1,167 +1,165 @@
 /*
-                    This file is part of the Opie Project
+                             This file is part of the Opie Project
-                      Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
              =.
            .=l.
-     .>+-=
+           .>+-=
-_;:,   .>  :=|.         This program is free software; you can
+ _;:,     .>    :=|.         This program is free software; you can
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,   .._         License as published by the Free Software
+.="- .-=="i,     .._         License as published by the Free Software
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
+     ._= =}       :          or (at your option) any later version.
-  .%`+i>    _;_.
+    .%`+i>       _;_.
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  : ..  .:,   . . .    without even the implied warranty of
+    : ..    .:,     . . .    without even the implied warranty of
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=    =    ;      Library General Public License for more
+..}^=.=       =       ;      Library General Public License for more
-++=  -.   .`   .:       details.
++=   -.     .`     .:       details.
-:   = ...= . :.=-
+:     =  ...= . :.=-
-.  .:....=;==+<;          You should have received a copy of the GNU
+ -.   .:....=;==+<;          You should have received a copy of the GNU
- -_. . .  )=. =           Library General Public License along with
+  -_. . .   )=.  =           Library General Public License along with
-  --    :-=`           this library; see the file COPYING.LIB.
+    --        :-=`           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 "oipkg.h"
 class QCheckBox;
 class QComboBox;
 class QLineEdit;
 class QListBox;
 class QPushButton;
 class OIpkgConfigDlg : public QDialog
 {
    Q_OBJECT
 public:
    OIpkgConfigDlg( OIpkg *ipkg = 0l, bool installOptions = false, QWidget *parent = 0l );
 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
    // Server/Destination cached information
    int m_serverCurrent; // Index of currently selected server in m_serverList
    int m_destCurrent;   // Index of currently selected destination in m_destList
    // UI controls
    QVBoxLayout           m_layout;        // Main dialog layout control
    Opie::Ui::OTabWidget  m_tabWidget;     // Main tab widget control
    QWidget              *m_serverWidget;  // Widget containing server configuration controls
    QWidget              *m_destWidget;    // Widget containing destination configuration controls
    QWidget              *m_proxyWidget;   // Widget containing proxy configuration controls
    QWidget              *m_optionsWidget; // Widget containing ipkg execution configuration controls
    // Server configuration UI controls
    QListBox    *m_serverList;      // Server list selection
    QPushButton *m_serverEditBtn;   // Server edit button
    QPushButton *m_serverDeleteBtn; // Server edit button
    // Destination configuration UI controls
    QListBox    *m_destList;      // Destination list selection
    QPushButton *m_destEditBtn;   // Destination edit button
    QPushButton *m_destDeleteBtn; // Destination edit button
    // Proxy server configuration UI controls
    QLineEdit *m_proxyHttpServer;  // HTTP proxy server URL edit box
    QCheckBox *m_proxyHttpActive;  // Activate HTTP proxy check box
    QLineEdit *m_proxyFtpServer;   // FTP proxy server edit box
    QCheckBox *m_proxyFtpActive;   // Activate FTP proxy check box
    QLineEdit *m_proxyUsername;    // Proxy server username edit box
    QLineEdit *m_proxyPassword;    // Proxy server password edit box
    // Options configuration UI controls
    QCheckBox *m_optForceDepends;   // Force depends ipkg option checkbox
    QCheckBox *m_optForceReinstall; // Force reinstall ipkg option checkbox
    QCheckBox *m_optForceRemove;    // Force remove ipkg option checkbox
    QCheckBox *m_optForceOverwrite; // Force overwrite ipkg option checkbox
    QComboBox *m_optVerboseIpkg;    // Ipkg verbosity option selection
    QLineEdit *m_optSourceLists;    // Ipkg source lists destination directory
    void initServerWidget();
    void initDestinationWidget();
    void initProxyWidget();
    void initOptionsWidget();
    void initData();
 private slots:
    void slotServerSelected( int index );
    void slotServerNew();
    void slotServerEdit();
    void slotServerDelete();
    void slotDestSelected( int index );
    void slotDestNew();
    void slotDestEdit();
    void slotDestDelete();
    void slotOptSelectSourceListsPath();
 };
 class OIpkgServerDlg : public QDialog
 {
    Q_OBJECT
 public:
    OIpkgServerDlg( OConfItem *server = 0l, QWidget *parent = 0l );
 protected slots:
    void accept();
 private:
    OConfItem *m_server;
    // UI controls
    QLineEdit *m_name;       // Server name edit box
    QLineEdit *m_location;   // Server location URL edit box
    QCheckBox *m_compressed; // Indicates whether the server is a 'src/gz' feed
    QCheckBox *m_active;     // Indicates whether the server is activated
 };
 class OIpkgDestDlg : public QDialog
 {
    Q_OBJECT
 public:
    OIpkgDestDlg( OConfItem *dest = 0l, QWidget *parent = 0l );
 protected slots:
    void accept();
 private:
    OConfItem *m_dest;
    // UI controls
    QLineEdit *m_name;       // Destination name edit box
    QLineEdit *m_location;   // Destination location URL edit box
    QCheckBox *m_active;     // Indicates whether the destination is activated
 private slots:
    void slotSelectPath();
 };
 #endif
diff --git a/noncore/settings/packagemanager/opackage.cpp b/noncore/settings/packagemanager/opackage.cpp
index 37963fa..f3c2024 100644
--- a/noncore/settings/packagemanager/opackage.cpp
+++ b/noncore/settings/packagemanager/opackage.cpp
@@ -1,46 +1,45 @@
 /*
-� � � � � � � �             This file is part of the Opie Project
+ �� �� �� �� �� �� �� ��             This file is part of the Opie Project
-� � � � � � �                Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
              =.
            .=l.
-� � � � � �.>+-=
+�� �� �� �� �� ��.>+-=
-�_;:, � � .> � �:=|.         This program is free software; you can
+��_;:, �� �� .> �� ��:=|.         This program is free software; you can
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+.> <`_, �� > ��. �� <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.-- � :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.-- �� :           the terms of the GNU Library General Public
-.="- .-=="i, � � .._         License as published by the Free Software
+.="- .-=="i, �� �� .._         License as published by the Free Software
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+��- . �� .-<_> �� �� .<>         Foundation; either version 2 of the License,
-� � �._= =} � � � :          or (at your option) any later version.
+�� �� ��._= =} �� �� �� :          or (at your option) any later version.
-� � .%`+i> � � � _;_.
+�� �� .%`+i> �� �� �� _;_.
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+�� �� .i_,=:_. �� �� ��-<s.       This program is distributed in the hope that
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+�� �� ��+ ��. ��-:. �� �� �� =       it will be useful,  but WITHOUT ANY WARRANTY;
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    : .. �� ��.:, �� �� . . .    without even the implied warranty of
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+�� �� =_ �� �� �� ��+ �� �� =;=|`    MERCHANTABILITY or FITNESS FOR A
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+�� _.=:. �� �� �� : �� ��:=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.= � � � = � � � ;      Library General Public License for more
+..}^=.= �� �� �� = �� �� �� ;      Library General Public License for more
-++= � -. � � .` � � .:       details.
++= �� -. �� �� .` �� �� .:       details.
-�: � � = �...= . :.=-
+: �� �� = ��...= . :.=-
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+��-. �� .:....=;==+<;          You should have received a copy of the GNU
-� -_. . . � )=. �=           Library General Public License along with
+�� -_. . . �� )=. ��=           Library General Public License along with
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+�� �� -- �� �� �� ��:-=`           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 "opackage.h"
 OPackage::OPackage( const QString &name, const QString &version, const QString &versionInstalled,
                    const QString &source, const QString &destination, const QString &category,
                    const QString &information, const QString &files )
    : m_name( name )
    , m_version( version )
    , m_versionInstalled( versionInstalled )
    , m_source( source )
    , m_destination( destination )
    , m_category( category )
    , m_information( information )
    , m_files( files )
 {
 }
diff --git a/noncore/settings/packagemanager/opackage.h b/noncore/settings/packagemanager/opackage.h
index fbd9ec0..4da5a2b 100644
--- a/noncore/settings/packagemanager/opackage.h
+++ b/noncore/settings/packagemanager/opackage.h
@@ -1,81 +1,80 @@
 /*
-� � � � � � � �             This file is part of the Opie Project
+ �� �� �� �� �� �� �� ��             This file is part of the Opie Project
-� � � � � � �                Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
              =.
            .=l.
-� � � � � �.>+-=
+�� �� �� �� �� ��.>+-=
-�_;:, � � .> � �:=|.         This program is free software; you can
+��_;:, �� �� .> �� ��:=|.         This program is free software; you can
-.> <`_, � > �. � <=          redistribute it and/or  modify it under
+.> <`_, �� > ��. �� <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.-- � :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.-- �� :           the terms of the GNU Library General Public
-.="- .-=="i, � � .._         License as published by the Free Software
+.="- .-=="i, �� �� .._         License as published by the Free Software
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+��- . �� .-<_> �� �� .<>         Foundation; either version 2 of the License,
-� � �._= =} � � � :          or (at your option) any later version.
+�� �� ��._= =} �� �� �� :          or (at your option) any later version.
-� � .%`+i> � � � _;_.
+�� �� .%`+i> �� �� �� _;_.
-� � .i_,=:_. � � �-<s.       This program is distributed in the hope that
+�� �� .i_,=:_. �� �� ��-<s.       This program is distributed in the hope that
-� � �+ �. �-:. � � � =       it will be useful,  but WITHOUT ANY WARRANTY;
+�� �� ��+ ��. ��-:. �� �� �� =       it will be useful,  but WITHOUT ANY WARRANTY;
-� � : .. � �.:, � � . . .    without even the implied warranty of
+    : .. �� ��.:, �� �� . . .    without even the implied warranty of
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+�� �� =_ �� �� �� ��+ �� �� =;=|`    MERCHANTABILITY or FITNESS FOR A
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU
+�� _.=:. �� �� �� : �� ��:=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.= � � � = � � � ;      Library General Public License for more
+..}^=.= �� �� �� = �� �� �� ;      Library General Public License for more
-++= � -. � � .` � � .:       details.
++= �� -. �� �� .` �� �� .:       details.
-�: � � = �...= . :.=-
+: �� �� = ��...= . :.=-
-�-. � .:....=;==+<;          You should have received a copy of the GNU
+��-. �� .:....=;==+<;          You should have received a copy of the GNU
-� -_. . . � )=. �=           Library General Public License along with
+�� -_. . . �� )=. ��=           Library General Public License along with
-� � -- � � � �:-=`           this library; see the file COPYING.LIB.
+�� �� -- �� �� �� ��:-=`           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 OPACKAGE_H
 #define OPACKAGE_H
 #include <qlist.h>
 #include <qstring.h>
 class OPackage
 {
 public:
    enum Command { Install, Remove, Update, Upgrade, Download, Info, Files, Version, NotDefined };
    OPackage( const QString &name= QString::null,
              const QString &version= QString::null, const QString &versionInstalled= QString::null,
              const QString &source= QString::null, const QString &destination= QString::null,
              const QString &category = "misc", const QString &information = QString::null,
              const QString &files = QString::null );
    const QString &name()             { return m_name; }
    const QString &version()          { return m_version; }
    const QString &versionInstalled() { return m_versionInstalled; }
    const QString &source()           { return m_source; }
    const QString &destination()      { return m_destination; }
    const QString &category()         { return m_category; }
    const QString &information()      { return m_information; }
    const QString &files()            { return m_files; }
    void setName( const QString &name )                { m_name = name; }
    void setVersion( const QString &version )          { m_version = version; }
    void setVersionInstalled( const QString &version ) { m_versionInstalled = version; }
    void setSource( const QString &source )            { m_source = source; }
    void setDestination( const QString &destination )  { m_destination = destination; }
    void setCategory( const QString &category )        { m_category = category; }
    void setInformation( const QString &information )  { m_information = information; }
    void setFiles( const QString &files )              { m_files = files; }
 private:
    QString m_name;             // Name of item
    QString m_version;          // Available version number of item
    QString m_versionInstalled; // Installed version number of item, null if not installed
    QString m_source;           // Source feed of available version
    QString m_destination;      // Location item is installed to, null if not installed
    QString m_category;         // Item category
    QString m_information;      // Package information
    QString m_files;            // File list information
 };
 typedef QList<OPackage>         OPackageList;
 typedef QListIterator<OPackage> OPackageListIterator;
 #endif
diff --git a/noncore/settings/packagemanager/opackagemanager.cpp b/noncore/settings/packagemanager/opackagemanager.cpp
index c9fdec1..abd8852 100644
--- a/noncore/settings/packagemanager/opackagemanager.cpp
+++ b/noncore/settings/packagemanager/opackagemanager.cpp
@@ -1,394 +1,393 @@
 /*
-                    This file is part of the Opie Project
+                             This file is part of the Opie Project
-                      Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
              =.
            .=l.
-     .>+-=
+           .>+-=
-_;:,   .>  :=|.         This program is free software; you can
+ _;:,     .>    :=|.         This program is free software; you can
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,   .._         License as published by the Free Software
+.="- .-=="i,     .._         License as published by the Free Software
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
+     ._= =}       :          or (at your option) any later version.
-  .%`+i>    _;_.
+    .%`+i>       _;_.
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  : ..  .:,   . . .    without even the implied warranty of
+    : ..    .:,     . . .    without even the implied warranty of
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=    =    ;      Library General Public License for more
+..}^=.=       =       ;      Library General Public License for more
-++=  -.   .`   .:       details.
++=   -.     .`     .:       details.
-:   = ...= . :.=-
+:     =  ...= . :.=-
-.  .:....=;==+<;          You should have received a copy of the GNU
+ -.   .:....=;==+<;          You should have received a copy of the GNU
- -_. . .  )=. =           Library General Public License along with
+  -_. . .   )=.  =           Library General Public License along with
-  --    :-=`           this library; see the file COPYING.LIB.
+    --        :-=`           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 "opackagemanager.h"
 #include "oipkgconfigdlg.h"
 #include <qpe/qpeapplication.h>
 #include <ctype.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;
        for ( OConfItemListIterator serverIt( *serverList ); serverIt.current(); ++serverIt )
        {
            OConfItem *server = serverIt.current();
            // Process server only if it is active
            if ( server->active() )
            {
                // Update status
                QString status = tr( "Reading available packages:\n\t" );
                status.append( server->name() );
                emit statusText( status );
                ++serverCount;
                emit statusBar( serverCount );
                qApp->processEvents();
                OPackageList *packageList = m_ipkg.availablePackages( server->name() );
                if ( packageList )
                {
                    for ( OPackageListIterator packageIt( *packageList ); packageIt.current(); ++packageIt )
                    {
                        OPackage *package = packageIt.current();
                        // Load package info
                        if ( !m_packages.find( package->name() ) )
                            m_packages.insert( package->name(), package );
                        else
                        {
                            // If new package is newer version, replace existing package
                            OPackage *currPackage = m_packages[package->name()];
                            if ( compareVersions( package->version(), currPackage->version() ) == 1 )
                                m_packages.replace( package->name(), package );
                        }
                        // Add category to list if it doesn't already exist
                        if ( m_categories.grep( package->category() ).isEmpty() )
                        {
                            m_categories << package->category();
                            categoryAdded = true;
                        }
                    }
                }
            }
        }
        delete serverList;
        // Sort category list if categories were added
        if ( categoryAdded )
            m_categories.sort();
    }
 }
 void OPackageManager::loadInstalledPackages()
 {
    OConfItemList *destList = m_ipkg.destinations();
    if ( destList )
    {
        // Initialize status messaging
        emit initStatus( destList->count() );
        int destCount = 0;
        bool categoryAdded = false;
        for ( OConfItemListIterator destIt( *destList ); destIt.current(); ++destIt )
        {
            OConfItem *destination = destIt.current();
            // Process destination only if it is active
            if ( destination->active() )
            {
                // Update status
                QString status = tr( "Reading installed packages:\n\t" );
                status.append( destination->name() );
                emit statusText( status );
                ++destCount;
                emit statusBar( destCount );
                qApp->processEvents();
                OPackageList *packageList = m_ipkg.installedPackages( destination->name(),
                                                                      destination->value() );
                if ( packageList )
                {
                    for ( OPackageListIterator packageIt( *packageList ); packageIt.current(); ++packageIt )
                    {
                        OPackage *package = packageIt.current();
                        OPackage *currPackage = m_packages[package->name()];
                        if ( currPackage )
                        {
                            // Package is in a current feed, update installed version, destination
                            currPackage->setVersionInstalled( package->versionInstalled() );
                            currPackage->setDestination( package->destination() );
                            delete package;
                        }
                        else
                        {
                            // Package isn't in a current feed, add to list
                            m_packages.insert( package->name(), package );
                            // Add category to list if it doesn't already exist
                            if ( m_categories.grep( package->category() ).isEmpty() )
                            {
                                m_categories << package->category();
                                categoryAdded = true;
                            }
                        }
                    }
                }
            }
        }
        delete destList;
        // Sort category list if categories were added
        if ( categoryAdded )
            m_categories.sort();
    }
 }
 OPackageList *OPackageManager::packages()
 {
    // TODO - look to see if list is loaded, if not, load available & installed
    OPackageList *pl = new OPackageList;
    for ( QDictIterator<OPackage> packageIt( m_packages ); packageIt.current(); ++packageIt )
        pl->append( packageIt.current() );
    return pl;
 }
 OPackageList *OPackageManager::filterPackages( const QString &name,const QString &server,
                                  const QString &destination, Status status, const QString &category )
 {
    // TODO - look to see if list is loaded, if not, load available & installed
    OPackageList *pl = new OPackageList;
    for ( QDictIterator<OPackage> packageIt( m_packages ); packageIt.current(); ++packageIt )
    {
        OPackage *package = packageIt.current();
        bool nameMatch = ( name.isNull() || package->name().contains( name ) );
        bool serverMatch = ( server.isNull() || package->source() == server );
        bool destinationMatch = ( destination.isNull() || package->destination() == destination );
        bool statusMatch;
        switch ( status )
        {
            case All : statusMatch = true;
                break;
            case NotInstalled : statusMatch = package->versionInstalled().isNull();
                break;
            case Installed : statusMatch = !package->versionInstalled().isNull();
                break;
            case Updated : statusMatch = ( !package->versionInstalled().isNull() &&
                                  compareVersions( package->version(), package->versionInstalled() ) == 1 );
                break;
            default : statusMatch = true;
                break;
        };
        bool categoryMatch = ( category.isNull() || package->category() == category );
        if ( nameMatch && serverMatch && destinationMatch && statusMatch && categoryMatch )
            pl->append( packageIt.current() );
    }
    return pl;
 }
 QStringList OPackageManager::servers()
 {
    QStringList sl;
    OConfItemList *serverList = m_ipkg.servers();
    if ( serverList )
    {
        for ( OConfItemListIterator serverIt( *serverList ); serverIt.current(); ++serverIt )
        {
            OConfItem *server = serverIt.current();
            // Add only active servers
            if ( server->active() )
                sl << server->name();
        }
    }
    return sl;
 }
 QStringList OPackageManager::destinations()
 {
    QStringList dl;
    OConfItemList *destList = m_ipkg.destinations();
    if ( destList )
    {
        for ( OConfItemListIterator destIt( *destList ); destIt.current(); ++destIt )
        {
            OConfItem *destination = destIt.current();
            // Add only active destinations
            if ( destination->active() )
                dl << destination->name();
        }
    }
    return dl;
 }
 OConfItem *OPackageManager::findConfItem( OConfItem::Type type, const QString &name )
 {
    return m_ipkg.findConfItem( type, name );
 }
 OPackage *OPackageManager::findPackage( const QString &name )
 {
    return m_packages[ name ];
 }
 int OPackageManager::compareVersions( const QString &ver1, const QString &ver2 )
 {
    // TODO - should this be in OIpkg???
    int epoch1, epoch2;
    QString version1, revision1;
    QString version2, revision2;
    parseVersion( ver1, &epoch1, &version1, &revision1 );
    parseVersion( ver2, &epoch2, &version2, &revision2 );
    if ( epoch1 > epoch2 )
        return 1;
    else if ( epoch1 < epoch2 )
        return -1;
    int r = verrevcmp( version1.latin1(), version2.latin1() );
    if (r)
        return r;
    r = verrevcmp( revision1.latin1(), revision2.latin1() );
    return r;
 }
 bool OPackageManager::configureDlg( bool installOptions )
 {
    OIpkgConfigDlg dlg( &m_ipkg, installOptions, static_cast<QWidget *>(parent()) );
    return ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted );
 }
 void OPackageManager::saveSettings()
 {
    m_ipkg.saveSettings();
 }
 bool OPackageManager::executeCommand( OPackage::Command command, const QStringList &packages,
                                      const QString &destination, const QObject *receiver,
                                      const char *slotOutput, bool rawOutput )
 {
    return m_ipkg.executeCommand( command, packages, destination, receiver, slotOutput, rawOutput );
 }
 void OPackageManager::parseVersion( const QString &verstr, int *epoch, QString *version,
                                    QString *revision )
 {
    *epoch = 0;
    *revision = QString::null;
    // Version string is in the format "ee:vv-rv", where ee=epoch, vv=version, rv=revision
    // Get epoch
    int colonpos = verstr.find( ':' );
    if ( colonpos > -1 )
    {
        *epoch = verstr.left( colonpos ).toInt();
    }
    // Get version and revision
    int hyphenpos = verstr.find( '-', colonpos + 1 );
    int verlen = verstr.length();
    if ( hyphenpos > -1 )
    {
        *version = verstr.mid( colonpos + 1, hyphenpos - colonpos - 1 );
        *revision = verstr.right( verlen - hyphenpos - 1 );
    }
    else
    {
       *version = verstr.right( verlen - colonpos );
    }
 }
 /*
 * libdpkg - Debian packaging suite library routines
 * vercmp.c - comparison of version numbers
 *
 * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
 */
 int OPackageManager::verrevcmp( const char *val, const char *ref )
 {
     int vc, rc;
     long vl, rl;
     const char *vp, *rp;
     const char *vsep, *rsep;
     if (!val) val= "";
     if (!ref) ref= "";
     for (;;) {
      vp= val;  while (*vp && !isdigit(*vp)) vp++;
      rp= ref;  while (*rp && !isdigit(*rp)) rp++;
      for (;;) {
           vc= (val == vp) ? 0 : *val++;
           rc= (ref == rp) ? 0 : *ref++;
           if (!rc && !vc) break;
           if (vc && !isalpha(vc)) vc += 256; /* assumes ASCII character set */
           if (rc && !isalpha(rc)) rc += 256;
           if (vc != rc) return vc - rc;
      }
      val= vp;
      ref= rp;
      vl=0;  if (isdigit(*vp)) vl= strtol(val,(char**)&val,10);
      rl=0;  if (isdigit(*rp)) rl= strtol(ref,(char**)&ref,10);
      if (vl != rl) return vl - rl;
      vc = *val;
      rc = *ref;
      vsep = strchr(".-", vc);
      rsep = strchr(".-", rc);
      if (vsep && !rsep) return -1;
      if (!vsep && rsep) return +1;
      if (!*val && !*ref) return 0;
      if (!*val) return -1;
      if (!*ref) return +1;
     }
 }
diff --git a/noncore/settings/packagemanager/opackagemanager.h b/noncore/settings/packagemanager/opackagemanager.h
index bc394e8..60c1643 100644
--- a/noncore/settings/packagemanager/opackagemanager.h
+++ b/noncore/settings/packagemanager/opackagemanager.h
@@ -1,95 +1,94 @@
 /*
-                    This file is part of the Opie Project
+                             This file is part of the Opie Project
-                      Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
              =.
            .=l.
-     .>+-=
+           .>+-=
-_;:,   .>  :=|.         This program is free software; you can
+ _;:,     .>    :=|.         This program is free software; you can
-.> <`_,  > .  <=          redistribute it and/or  modify it under
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,   .._         License as published by the Free Software
+.="- .-=="i,     .._         License as published by the Free Software
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  ._= =}    :          or (at your option) any later version.
+     ._= =}       :          or (at your option) any later version.
-  .%`+i>    _;_.
+    .%`+i>       _;_.
-  .i_,=:_.   -<s.       This program is distributed in the hope that
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  : ..  .:,   . . .    without even the implied warranty of
+    : ..    .:,     . . .    without even the implied warranty of
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=    =    ;      Library General Public License for more
+..}^=.=       =       ;      Library General Public License for more
-++=  -.   .`   .:       details.
++=   -.     .`     .:       details.
-:   = ...= . :.=-
+:     =  ...= . :.=-
-.  .:....=;==+<;          You should have received a copy of the GNU
+ -.   .:....=;==+<;          You should have received a copy of the GNU
- -_. . .  )=. =           Library General Public License along with
+  -_. . .   )=.  =           Library General Public License along with
-  --    :-=`           this library; see the file COPYING.LIB.
+    --        :-=`           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 "oipkg.h"
 #include <qpe/config.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 = QString::null,
                                  const QString &server = QString::null,
                                  const QString &destination = QString::null,
                                  Status status = NotDefined,
                                  const QString &category = QString::null );
    const QStringList &categories() { return m_categories; }
    QStringList        servers();
    QStringList        destinations();
    int compareVersions( const QString &version1, const QString &version2 );
    OConfItem *findConfItem( OConfItem::Type type = OConfItem::NotDefined,
                             const QString &name = QString::null );
    OPackage  *findPackage( const QString &name = QString::null );
    bool configureDlg( bool installOptions = false );
    void saveSettings();
    bool executeCommand( OPackage::Command command = OPackage::NotDefined,
                         const QStringList &parameters = QStringList(),
                         const QString &destination = QString::null, const QObject *receiver = 0x0,
                         const char *slotOutput = 0x0, bool rawOutput = true );
 private:
    Config         *m_config;     // Pointer to application configuration file
    OIpkg           m_ipkg;       // OIpkg object to retrieve package/configuration information
    QDict<OPackage> m_packages;   // Global list of available packages
    QStringList     m_categories; // List of all categories
    void parseVersion( const QString &verstr, int *epoch, QString *version, QString *revision );
    int verrevcmp( const char *val, const char *ref );
 signals:
    void initStatus( int numSteps );
    void statusText( const QString &status );
    void statusBar( int currStep );
 };
 #endif
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp
index 3eef939..e034f34 100644
--- a/noncore/settings/packagemanager/packageinfodlg.cpp
+++ b/noncore/settings/packagemanager/packageinfodlg.cpp
@@ -1,153 +1,154 @@
 /*
-                    This file is part of the OPIE Project
+                             This file is part of the Opie Project
-               =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-      .=l.
+              =.
-     .>+-=
+            .=l.
-_;:,   .>  :=|.         This file is free software; you can
+           .>+-=
-.> <`_,  > .  <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i,   .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-  ._= =}    :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  .%`+i>    _;_.
+     ._= =}       :          or (at your option) any later version.
-  .i_,=:_.   -<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  : ..  .:,   . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.=    =    ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++=  -.   .`   .:
+..}^=.=       =       ;      Library General Public License for more
-:   = ...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-.  .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
- -_. . .  )=. =           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-  --    :-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 "packageinfodlg.h"
 #include "opackage.h"
 #include "opackagemanager.h"
 #include <opie2/otabwidget.h>
 #include <qpe/resource.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
 PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
    : QWidget( 0l )
    , m_packman( pm )
    , m_information( this )
    , m_files( this )
    , m_retrieveFiles( 0l )
 {
    // Initialize UI
    if ( parent )
        parent->setCaption( package );
    QVBoxLayout *layout = new QVBoxLayout( this, 4, 2 );
    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(const QString &)), 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 );
        // If file list is already cached, display
        if ( !m_package->files().isNull() )
            m_files.setText( m_package->files() );
        else
        {
            m_retrieveFiles = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ),
                                            tr( "Retrieve file list" ), filesWidget );
            QWhatsThis::add( m_retrieveFiles, tr( "Tap here to retrieve list of files contained in this package." ) );
            filesLayout->addWidget( m_retrieveFiles );
            connect( m_retrieveFiles, SIGNAL(clicked()), this, SLOT(slotBtnFileScan()) );
        }
        tabWidget->addTab( filesWidget, "binary", tr( "File list" ) );
        tabWidget->setCurrentTab( tr( "Information" ) );
    }
    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
    if ( !m_files.text().isEmpty() )
        m_package->setFiles( m_files.text() );
 }
 void PackageInfoDlg::slotBtnFileScan()
 {
    m_files.clear();
    QStringList list( m_package->name() );
    m_packman->executeCommand( OPackage::Files, list, QString::null,
                               this, SLOT(slotFiles(const QString &)), true );
    if ( m_retrieveFiles )
        m_retrieveFiles->hide();
 }
 void PackageInfoDlg::slotInfo( const QString &info )
 {
    m_information.append( info );
 }
 void PackageInfoDlg::slotFiles( const QString &filelist )
 {
    QString str = filelist;
    // Skip first line of output ("Package xxx is installed...")
    if ( str.startsWith( "Package " ) )
        str = str.right( str.length() - str.find( '\n' ) - 1 );
    m_files.append( str );
 }
diff --git a/noncore/settings/packagemanager/packageinfodlg.h b/noncore/settings/packagemanager/packageinfodlg.h
index 2962f9a..e4c6bba 100644
--- a/noncore/settings/packagemanager/packageinfodlg.h
+++ b/noncore/settings/packagemanager/packageinfodlg.h
@@ -1,66 +1,67 @@
 /*
-                    This file is part of the OPIE Project
+                             This file is part of the Opie Project
-               =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-      .=l.
+              =.
-     .>+-=
+            .=l.
-_;:,   .>  :=|.         This file is free software; you can
+           .>+-=
-.> <`_,  > .  <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i,   .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-  ._= =}    :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  .%`+i>    _;_.
+     ._= =}       :          or (at your option) any later version.
-  .i_,=:_.   -<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  : ..  .:,   . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.=    =    ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++=  -.   .`   .:
+..}^=.=       =       ;      Library General Public License for more
-:   = ...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-.  .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
- -_. . .  )=. =           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-  --    :-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 PACKAGEINFODLG_H
 #define PACKAGEINFODLG_H
 #include "opackage.h"
 #include <qmultilineedit.h>
 #include <qwidget.h>
 class QPushButton;
 class OPackage;
 class OPackageManager;
 class PackageInfoDlg : public QWidget
 {
    Q_OBJECT
 public:
    PackageInfoDlg( QWidget *parent = 0l, OPackageManager *pm = 0l, 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
    QPushButton     *m_retrieveFiles; // Push button to retrieve file list
 private slots:
    void slotBtnFileScan();
    void slotInfo( const QString &info );
    void slotFiles( const QString &filelist );
 };
 #endif
diff --git a/noncore/settings/packagemanager/promptdlg.cpp b/noncore/settings/packagemanager/promptdlg.cpp
index 841b98e..5053caa 100644
--- a/noncore/settings/packagemanager/promptdlg.cpp
+++ b/noncore/settings/packagemanager/promptdlg.cpp
@@ -1,140 +1,141 @@
 /*
-� � � � � � � �             This file is part of the OPIE Project
+                             This file is part of the Opie Project
-               =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-� � � � � � �.=l.
+              =.
-� � � � � �.>+-=
+            .=l.
-�_;:, � � .> � �:=|.         This file is free software; you can
+           .>+-=
-.> <`_, � > �. � <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.-- � :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i, � � .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-�- . � .-<_> � � .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-� � �._= =} � � � :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-� � .%`+i> � � � _;_.
+     ._= =}       :          or (at your option) any later version.
-� � .i_,=:_. � � �-<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-� � �+ �. �-:. � � � =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-� � : .. � �.:, � � . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-� � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
-� _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.= � � � = � � � ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++= � -. � � .` � � .:
+..}^=.=       =       ;      Library General Public License for more
-�: � � = �...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-�-. � .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
-� -_. . . � )=. �=           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-� � -- � � � �:-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 "promptdlg.h"
 #include <qpe/qpeapplication.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qwidgetlist.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.
    QWidget *w = parentWidget();
    QPoint p( 0, 0 );
    int extraw = 0, extrah = 0;
    QWidget * desk = QApplication::desktop();
    if ( w )
        w = w->topLevelWidget();
    QWidgetList  *list = QApplication::topLevelWidgets();
    QWidgetListIt it( *list );
    while ( (extraw == 0 || extrah == 0) && it.current() != 0 )
    {
        int w, h;
        QWidget * current = it.current();
        ++it;
        w = current->geometry().x() - current->x();
        h = current->geometry().y() - current->y();
        extraw = QMAX( extraw, w );
        extrah = QMAX( extrah, h );
    }
    delete list;
    // sanity check for decoration frames. With embedding, we
    // might get extraordinary values
    if ( extraw >= 10 || extrah >= 40 )
        extraw = extrah = 0;
    if ( w )
    {
        // Use mapToGlobal rather than geometry() in case w might
        // be embedded in another application
        QPoint pp = w->mapToGlobal( QPoint(0,0) );
        p = QPoint( pp.x() + w->width()/2, pp.y() + w->height()/ 2 );
    }
    else
        p = QPoint( desk->width()/2, desk->height()/2 );
    p = QPoint( p.x()-width()/2 - extraw, p.y()-height()/2 - extrah );
    if ( p.x() + extraw + width() > desk->width() )
        p.setX( desk->width() - width() - extraw );
    if ( p.x() < 0 )
        p.setX( 0 );
    if ( p.y() + extrah + height() > desk->height() )
        p.setY( desk->height() - height() - extrah );
    if ( p.y() < 0 )
        p.setY( 0 );
    move( p );
    show();
    // Enter event loop for modality
    qApp->enter_loop();
    return m_btnClicked;
 }
 int PromptDlg::ask( const QString &caption, const QString &text, const QString &btn1, const QString &btn2,
                    QWidget *parent )
 {
    PromptDlg *dlg = new PromptDlg( caption, text, btn1, btn2, parent );
    int rc = dlg->display();
    delete dlg;
    return rc;
 }
 void PromptDlg::slotBtn1Clicked()
 {
    m_btnClicked = 1;
    qApp->exit_loop();
 }
 void PromptDlg::slotBtn2Clicked()
 {
    m_btnClicked = 2;
    qApp->exit_loop();
 }
diff --git a/noncore/settings/packagemanager/promptdlg.h b/noncore/settings/packagemanager/promptdlg.h
index f7bc0c0..9f870fa 100644
--- a/noncore/settings/packagemanager/promptdlg.h
+++ b/noncore/settings/packagemanager/promptdlg.h
@@ -1,59 +1,60 @@
 /*
-                    This file is part of the OPIE Project
+                             This file is part of the Opie Project
-               =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
+                             Copyright (C)2004, 2005 Dan Williams <drw@handhelds.org>
-      .=l.
+              =.
-     .>+-=
+            .=l.
-_;:,   .>  :=|.         This file is free software; you can
+           .>+-=
-.> <`_,  > .  <=          redistribute it and/or modify it under
+ _;:,     .>    :=|.         This program is free software; you can
-:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
-.="- .-=="i,   .._         License as published by the Free Software
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
- .  .-<_>   .<>         Foundation; either version 2 of the License,
+.="- .-=="i,     .._         License as published by the Free Software
-  ._= =}    :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
-  .%`+i>    _;_.
+     ._= =}       :          or (at your option) any later version.
-  .i_,=:_.   -<s.       This file is distributed in the hope that
+    .%`+i>       _;_.
-  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
+    .i_,=:_.      -<s.       This program is distributed in the hope that
-  : ..  .:,   . . .    without even the implied warranty of
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+    : ..    .:,     . . .    without even the implied warranty of
- _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-..}^=.=    =    ;      Public License for more details.
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-++=  -.   .`   .:
+..}^=.=       =       ;      Library General Public License for more
-:   = ...= . :.=-        You should have received a copy of the GNU
++=   -.     .`     .:       details.
-.  .:....=;==+<;          General Public License along with this file;
+:     =  ...= . :.=-
- -_. . .  )=. =           see the file COPYING. If not, write to the
+ -.   .:....=;==+<;          You should have received a copy of the GNU
-  --    :-=`           Free Software Foundation, Inc.,
+  -_. . .   )=.  =           Library General Public License along with
-                             59 Temple Place - Suite 330,
+    --        :-=`           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 PROMPTDLG_H
 #define PROMPTDLG_H
 #include <qwidget.h>
 class PromptDlg : public QWidget
 {
    Q_OBJECT
 public:
    PromptDlg( const QString &caption = QString::null, const QString &text = QString::null,
               const QString &btn1 = QString::null, const QString &btn2 = QString::null,
               QWidget *parent = 0x0 );
    int display();
    int btnPressed() { return m_btnClicked; }
    static int ask( const QString &caption = QString::null, const QString &text = QString::null,
                    const QString &btn1 = QString::null, const QString &btn2 = QString::null,
                    QWidget *parent = 0x0 );
 private:
    int m_btnClicked; // Indicator for which button was pressed
 private slots:
    void slotBtn1Clicked();
    void slotBtn2Clicked();
 };
 #endif