Hide Retrive File List button once list is retrieved in Package Info dialog, bump version up to 0.6.0, update ChangeLog/Todo/etc.

6 files changed, 57 insertions, 49 deletions

diff --git a/noncore/settings/packagemanager/ChangeLog b/noncore/settings/packagemanager/ChangeLog
index 7799136..c776ce5 100644
--- a/noncore/settings/packagemanager/ChangeLog
+++ b/noncore/settings/packagemanager/ChangeLog
@@ -1,45 +1,53 @@
+2004-12-21 Dan Williams <drw@handhelds.org>
+
+    * Released version 0.6.0
+    * Added support for Ipkg 'src/gz' feeds
+    * Improve server and destination tabs UI's in configuration dialog
+    * Fix app linking to link all dependent packages as well as selected packages
+    * Hide 'Retrive File List' button once list is retrieved in Package Info dialog
+
 2004-11-18 Dan Williams <drw@handhelds.org>
 
     * Released version 0.5.0
     * All v1.0 functionality implemented
     * Implemented installation of local packages
     * Implemented linking of non-root apps (using ipkg-link)
     * Many UI tweaks for installation and filter dialogs
 
 2004-04-21 Dan Williams <drw@handhelds.org>
 
     * Released version 0.4.0
     * Added saving of ipkg configuration information
     * Re-initialize ipkg when configuration information changes
     * Added QWhatsThis for all UI controls
     * Remove Location from OConfItem as it is not used/needed
     * Re-ordered includes to follow Opie standards
 
 2004-02-13 Dan Williams <drw@handhelds.org>
 
     * Released version 0.3.0
     * Fix handling of filtering options in View menu
     * Do proper version string comparison
     * Fix string alignment code in PromptDlg to eliminate QT warning messages
 
 2004-02-12 Dan Williams <drw@handhelds.org>
 
     * Package information dialog implemented
     * What's This app icon enabled
     * Changed all QDialog::exec() occurences to QPEApplication::execDialog()
 
 2004-01-23 Dan Williams <drw@handhelds.org>
 
     * Added package download functionality
     * Have Opie update links after install/removal so that apps
       will display properly in Launcher
 
 2004-01-20 Dan Williams <drw@handhelds.org>
 
     * Released version 0.2.0
     * Converted to use libipkg in place of spawning ipkg process
 
 2004-01-13 Dan Williams <drw@handhelds.org>
 
     * Released version 0.1.0
     * Initial check-in of new package management client to eventually replace AQPkg
diff --git a/noncore/settings/packagemanager/README b/noncore/settings/packagemanager/README
index c34a6af..ff6d113 100644
--- a/noncore/settings/packagemanager/README
+++ b/noncore/settings/packagemanager/README
@@ -1,53 +1,53 @@
 /************************************************************************
 /*
 /*                       Opie - Package Manager
 /*                      ========================
-/*                           Version 0.5.0
+/*                           Version 0.6.0
 /*
 /*                A package management client for Opie
 /*
 /************************************************************************
 
 -------------------------------------------------------
  Release Notes for Opie-PackageManager - January, 2004
 -------------------------------------------------------
 
 ======================
 =       To-do        =
 ======================
 
 - See $OPIEDIR/noncore/settings/packagemanager/TODO for more info.
 
 ======================
 =        Build       =
 ======================
 
 In order to build opie-packagemanager, libipkg needs to be present on
 the build system along with the appropriate headers.
 
 - libipkg source (best to use version 109 or greater):
   - Familiar CVS directory: familiar/dist/ipkg/C (e.g. 'cvs co familiar/dist/ipkg/C')
   - FTP: ftp://handhelds.org/linux/packages/ipkg
 
 - before building opie-packagemanager, define the environmental variable
   IPKGDIR to point to the directory containing the ipkg source code
   - e.g. 'export IPKGDIR=$HOME/familiar/dist/ipkg/C'
 
 ======================
 =         Run        =
 ======================
 
 - In order to use opie-packagemanager, libipkg must be installed
   on the system.
 
 ======================
 =       Credits      =
 ======================
 
 - Opie-PackageManager is (C) 2003-2004 Dan Williams
 
 ======================
 =        Links       =
 ======================
 
 - Opie Project:             http://opie.handhelds.org
diff --git a/noncore/settings/packagemanager/TODO b/noncore/settings/packagemanager/TODO
index 265beda..744ad95 100644
--- a/noncore/settings/packagemanager/TODO
+++ b/noncore/settings/packagemanager/TODO
@@ -1,25 +1,17 @@
 /************************************************************************
 /*
 /*                       Opie - Package Manager
 /*                      ========================
-/*                           Version 0.5.0
+/*                           Version 0.6.0
 /*
 /*                A package management client for Opie
 /*
 /************************************************************************
 
 -----------------------------------------------
- To-do for Opie-PackageManager - November, 2004
+ To-do for Opie-PackageManager - December, 2004
 -----------------------------------------------
 
-======================
-=  Current release   =
-======================
-
-1. Re-work package download dialog
-
-======================
-=   Future releases  =
-======================
-
-1. Re-work server and destination tabs in configuration dialog
\ No newline at end of file
+1. Move ipkg-link code from InstallDlg to OIpkg
+2. Code ipkg-link logic directly in OIpkg
+3. Re-work package download dialog
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control
index aacd0ca..cdf419c 100644
--- a/noncore/settings/packagemanager/opie-packagemanager.control
+++ b/noncore/settings/packagemanager/opie-packagemanager.control
@@ -1,10 +1,10 @@
 Package: opie-packagemanager
 Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/packagemanager apps/Settings/packagemanager.desktop
 Priority: optional
 Section: opie/settings
 Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg (>=0.99.120), ipkg-link
 Replaces: packagemanager
 Architecture: arm
 Maintainer: Dan Williams (drw@handhelds.org)
 Description: Opie package management client
-Version: 0.5.0$EXTRAVERSION
+Version: 0.6.0$EXTRAVERSION
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp
index c5924fd..5f72a67 100644
--- a/noncore/settings/packagemanager/packageinfodlg.cpp
+++ b/noncore/settings/packagemanager/packageinfodlg.cpp
@@ -1,144 +1,151 @@
 /*
                     This file is part of the OPIE Project
 
                =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
       .=l.
      .>+-=
 _;:,   .>  :=|.         This file is free software; you can
 .> <`_,  > .  <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--  :           the terms of the GNU General Public
 .="- .-=="i,   .._         License as published by the Free Software
 - .  .-<_>   .<>         Foundation; either version 2 of the License,
   ._= =}    :          or (at your option) any later version.
   .%`+i>    _;_.
   .i_,=:_.   -<s.       This file is distributed in the hope that
   + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
   : ..  .:,   . . .    without even the implied warranty of
   =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
  _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=    =    ;      Public License for more details.
 ++=  -.   .`   .:
 :   = ...= . :.=-        You should have received a copy of the GNU
 -.  .:....=;==+<;          General Public License along with this file;
  -_. . .  )=. =           see the file COPYING. If not, write to the
   --    :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "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( 0x0 )
+    : 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(char*)), true );
     }
 
     // Files tab (display only if package is installed)
     if ( !m_package->versionInstalled().isNull() )
     {
         QWidget *filesWidget = new QWidget( tabWidget );
         QVBoxLayout *filesLayout = new QVBoxLayout( filesWidget, 2, 2 );
         QWhatsThis::add( &m_files, tr( "This area contains a list of files contained in this package." ) );
         m_files.reparent( filesWidget, QPoint( 0, 0 ) );
         m_files.setReadOnly( true );
         filesLayout->addWidget( &m_files );
 
-        QPushButton *btn = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ),
+        // 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( btn, tr( "Tap here to retrieve list of files contained in this package." ) );
-        filesLayout->addWidget( btn );
-        connect( btn, SIGNAL(clicked()), this, SLOT(slotBtnFileScan()) );
-        tabWidget->addTab( filesWidget, "binary", tr( "File list" ) );
+            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" ) );
 
-        // If file list is already cached, display
-        if ( !m_package->files().isNull() )
-            m_files.setText( m_package->files() );
     }
     else
         m_files.hide();
 }
 
 PackageInfoDlg::~PackageInfoDlg()
 {
     if ( !m_package )
         return;
 
     // Cache package information
     if ( !m_information.text().isNull() )
         m_package->setInformation( m_information.text() );
 
     // Cache package file list
-    if ( !m_files.text().isNull() )
+    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(char*)), true );
+
+    if ( m_retrieveFiles )
+        m_retrieveFiles->hide();
 }
 
 void PackageInfoDlg::slotInfo( char *info )
 {
     m_information.append( info );
 }
 
 void PackageInfoDlg::slotFiles( char *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 ec031e1..d1830de 100644
--- a/noncore/settings/packagemanager/packageinfodlg.h
+++ b/noncore/settings/packagemanager/packageinfodlg.h
@@ -1,65 +1,66 @@
 /*
-                            This file is part of the OPIE Project
+                    This file is part of the OPIE Project
 
                =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
-             .=l.
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+      .=l.
+     .>+-=
+_;:,   .>  :=|.         This file is free software; you can
+.> <`_,  > .  <=          redistribute it and/or modify it under
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+.="- .-=="i,   .._         License as published by the Free Software
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
+  ._= =}    :          or (at your option) any later version.
+  .%`+i>    _;_.
+  .i_,=:_.   -<s.       This file is distributed in the hope that
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
+  : ..  .:,   . . .    without even the implied warranty of
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
+..}^=.=    =    ;      Public License for more details.
+++=  -.   .`   .:
+:   = ...= . :.=-        You should have received a copy of the GNU
+-.  .:....=;==+<;          General Public License along with this file;
+ -_. . .  )=. =           see the file COPYING. If not, write to the
+  --    :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #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 = 0x0, OPackageManager *pm = 0x0, const QString &package = QString::null );
+    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
+    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( char *info );
     void slotFiles( char *filelist );
 };
 
 #endif