1. Implemented linking of apps to root (thanks to zecke for getting this started for me) 2. Bumped version to 0.5.0 (all v1.0 functionality is there...I think) 3. Added package dependency on ipkg-link 4. Updated Opie-PM ChangeLog, TODO

7 files changed, 93 insertions, 51 deletions

diff --git a/noncore/settings/packagemanager/ChangeLog b/noncore/settings/packagemanager/ChangeLog
index c9e33c4..7799136 100644
--- a/noncore/settings/packagemanager/ChangeLog
+++ b/noncore/settings/packagemanager/ChangeLog
@@ -1,2 +1,10 @@
+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>
 
diff --git a/noncore/settings/packagemanager/README b/noncore/settings/packagemanager/README
index bf93c98..c34a6af 100644
--- a/noncore/settings/packagemanager/README
+++ b/noncore/settings/packagemanager/README
@@ -3,5 +3,5 @@
 /*                       Opie - Package Manager
 /*                      ========================
-/*                           Version 0.4.0
+/*                           Version 0.5.0
 /*
 /*                A package management client for Opie
diff --git a/noncore/settings/packagemanager/TODO b/noncore/settings/packagemanager/TODO
index 633c589..265beda 100644
--- a/noncore/settings/packagemanager/TODO
+++ b/noncore/settings/packagemanager/TODO
@@ -3,5 +3,5 @@
 /*                       Opie - Package Manager
 /*                      ========================
-/*                           Version 0.4.0
+/*                           Version 0.5.0
 /*
 /*                A package management client for Opie
@@ -9,7 +9,7 @@
 /************************************************************************
 
----------------------------------------------
- To-do for Opie-PackageManager - April, 2004
----------------------------------------------
+-----------------------------------------------
+ To-do for Opie-PackageManager - November, 2004
+-----------------------------------------------
 
 ======================
@@ -17,7 +17,5 @@
 ======================
 
-1. Link non-root destination apps
-2. Implement QCOP interface for installing, removing, etc.
-3. Redesign configuration dialog
+1. Re-work package download dialog
 
 ======================
@@ -25,3 +23,3 @@
 ======================
 
-1. ???
\ No newline at end of file
+1. Re-work server and destination tabs in configuration dialog
\ No newline at end of file
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index 781f8f5..494603b 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -51,5 +51,5 @@ _;:,   .>  :=|.         This file is free software; you can
 #include "opackagemanager.h"
 
-InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo,
+InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption,
                         OPackage::Command command1, const QStringList &packages1,
                         OPackage::Command command2, const QStringList &packages2,
@@ -57,4 +57,5 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
     : QWidget( 0x0 )
     , m_packman( pm )
+    , m_installFound( false )
     , m_numCommands( 0 )
     , m_currCommand( 0 )
@@ -67,4 +68,7 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
         m_packages[ m_numCommands ] = packages1;
         ++m_numCommands;
+        
+        if ( command1 == OPackage::Install )
+            m_installFound = true;
     }
     if ( command2 != OPackage::NotDefined )
@@ -73,4 +77,7 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
         m_packages[ m_numCommands ] = packages2;
         ++m_numCommands;
+        
+        if ( command2 == OPackage::Install )
+            m_installFound = true;
     }
     if ( command3 != OPackage::NotDefined )
@@ -79,4 +86,7 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
         m_packages[ m_numCommands ] = packages3;
         ++m_numCommands;
+        
+        if ( command3 == OPackage::Install )
+            m_installFound = true;
     }
 
@@ -87,5 +97,5 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap
     QGridLayout *layout = new QGridLayout( this, 4, 2, 2, 4 );
 
-    if ( showDestInfo )
+    if ( m_installFound )
     {
         QLabel *label = new QLabel( tr( "Destination" ), this );
@@ -221,5 +231,5 @@ void InstallDlg::slotBtnStart()
     // Start was clicked, start executing
     QString dest;
-    if ( m_destination )
+    if ( m_installFound )
     {
         dest = m_destination->currentText();
@@ -238,4 +248,5 @@ void InstallDlg::slotBtnStart()
     }
 
+    Opie::Core::OProcess process( this );
     for ( m_currCommand = 0; m_currCommand < m_numCommands; m_currCommand++ )
     {
@@ -243,40 +254,65 @@ void InstallDlg::slotBtnStart()
         m_packman->executeCommand( m_command[ m_currCommand ], m_packages[ m_currCommand ], dest,
                                    this, SLOT(slotOutput(char*)), true );
-    }
-    slotProcessDone(0l);
 
-    // Get destination
-/*
-    if ( dest == "root" )
+        // Link/Unlink application if the package was removed from or installed to a destination
+        // other than root
+        if ( ( m_command[ m_currCommand ] == OPackage::Install && dest != "root" ) ||
+             ( m_command[ m_currCommand ] == OPackage::Remove ) )
     {
-        slotProcessDone(0l);
-        return;
-    }
+            //m_packman->findPackage( m_packages[ m_currCommand ]->destination() != "root"*/ ) 
 
-    m_destItem = m_packman->findConfItem( OConfItem::Destination, dest );
-    if ( m_destItem )
+            // Loop through all package names in the command group
+            for ( QStringList::Iterator it = m_packages[ m_currCommand ].begin();
+                  it != m_packages[ m_currCommand ].end();
+                  ++it )
     {
-        QString path = m_destItem->value();
-        Opie::Core::OProcess *process = new Opie::Core::OProcess( this, "ipkg-link process" );
-        connect( process, SIGNAL(processExited(Opie::Core::OProcess*)),
-                 this, SLOT(slotProcessDone(Opie::Core::OProcess*)) );
+                OPackage *currPackage = m_packman->findPackage( (*it) );
 
-        *process << "ipkg-link" << "mount" << path;
-        if ( !process->start( Opie::Core::OProcess::NotifyOnExit,
+                // Skip package if it is not found or being removed from 'root'
+                if ( !currPackage || ( m_command[ m_currCommand ] == OPackage::Remove &&
+                                       currPackage->destination() == "root" ) )
+                    continue;
+                    
+                // Display feedback to user
+                if ( m_command[ m_currCommand ] == OPackage::Install )
+                    m_output->append( tr( QString( "Running ipkg-link to link package '%1'." )
+                                            .arg( currPackage->name() ) ) );
+                else
+                    m_output->append( tr( QString( "Running ipkg-link to remove links for package '%1'." )
+                                            .arg( currPackage->name() ) ) );
+                m_output->setCursorPosition( m_output->numLines(), 0 );
+                
+                // Execute ipkg-link
+                process.clearArguments();
+                process << "ipkg-link"
+                        << ( ( m_command[ m_currCommand ] == OPackage::Install ) ? "add" : "remove" )
+                        << currPackage->name();
+                if ( !process.start( Opie::Core::OProcess::Block,
                               Opie::Core::OProcess::NoCommunication ) )
-            slotProcessDone( 0l );
-        m_output->append( tr( "Starting ipkg-link to link installed applications." ) );
+                {
+                    slotProcessDone( 0x0 );
+                    m_output->append( tr( "Unable to run ipkg-link." ) );
         m_output->setCursorPosition( m_output->numLines(), 0 );
+                    return;
     }
-*/
+            }
+                           
+        }
+    }
+    
+    slotProcessDone( 0x0 );
 }
 
 void InstallDlg::slotProcessDone( Opie::Core::OProcess *proc )
 {
-    delete proc;
-
+    if ( proc )
+    {
+        // Display message pnly if linking was done
     m_output->append( tr( "The package linking is done." ) );
     m_output->setCursorPosition( m_output->numLines(), 0 );
 
+        delete proc;
+    }
+    
     // All commands executed, allow user to close dialog
     m_btnStart->setEnabled( true );
diff --git a/noncore/settings/packagemanager/installdlg.h b/noncore/settings/packagemanager/installdlg.h
index f45c17c..eabb717 100644
--- a/noncore/settings/packagemanager/installdlg.h
+++ b/noncore/settings/packagemanager/installdlg.h
@@ -56,6 +56,6 @@ class InstallDlg : public QWidget
 
 public:
-    InstallDlg( QWidget *parent = 0x0, OPackageManager *pm = 0x0, const QString &caption = QString::null,
-                bool showDestInfo = true,
+    InstallDlg( QWidget *parent = 0x0, OPackageManager *pm = 0x0,
+                const QString &caption = QString::null,
                 OPackage::Command command1 = OPackage::NotDefined,
                 const QStringList &packages1 = QStringList(),
@@ -68,4 +68,7 @@ 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
diff --git a/noncore/settings/packagemanager/mainwindow.cpp b/noncore/settings/packagemanager/mainwindow.cpp
index 459a75b..8a5b90c 100644
--- a/noncore/settings/packagemanager/mainwindow.cpp
+++ b/noncore/settings/packagemanager/mainwindow.cpp
@@ -313,5 +313,5 @@ void MainWindow::installLocalPackage( const QString &ipkFile )
 {
     // Install selected file
-    InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Install local package" ), true,
+    InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Install local package" ),
                                         OPackage::Install, ipkFile );
     connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
@@ -387,5 +387,5 @@ void MainWindow::slotUpdate()
 {
     // Create package manager output widget
-    InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Update package information" ), false,
+    InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Update package information" ),
                                       OPackage::Update );
     connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
@@ -399,5 +399,5 @@ void MainWindow::slotUpgrade()
 {
     // Create package manager output widget
-    InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Upgrade installed packages" ), false,
+    InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Upgrade installed packages" ),
                                       OPackage::Upgrade );
     connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
@@ -446,5 +446,5 @@ void MainWindow::slotDownload()
 
         // Create package manager output widget
-        InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Download packages" ), false,
+        InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Download packages" ),
                                         OPackage::Download, workingPackages );
         connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
@@ -521,16 +521,13 @@ void MainWindow::slotApply()
 
     // Send command only if there are packages to process
-    OPackage::Command removeCmd = OPackage::NotDefined;
-    if ( !removeList.isEmpty() )
-        removeCmd = OPackage::Remove;
-    OPackage::Command installCmd = OPackage::NotDefined;
-    if ( !installList.isEmpty() )
-        installCmd = OPackage::Install;
-    OPackage::Command upgradeCmd = OPackage::NotDefined;
-    if ( !upgradeList.isEmpty() )
-        upgradeCmd = OPackage::Upgrade;
+    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" ), !installList.isEmpty(),
+    InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Apply changes" ),
                                       removeCmd, removeList,
                                       installCmd, installList,
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control
index 5385ea5..aacd0ca 100644
--- a/noncore/settings/packagemanager/opie-packagemanager.control
+++ b/noncore/settings/packagemanager/opie-packagemanager.control
@@ -3,8 +3,8 @@ Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/package
 Priority: optional
 Section: opie/settings
-Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg (>=0.99.120)
+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.4.0$EXTRAVERSION
+Version: 0.5.0$EXTRAVERSION