2 files changed, 96 insertions, 34 deletions

diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index a058285..76c7a9c 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -138,13 +138,13 @@ void NetworkPackageManager :: selectLocalPackage( const QString &pkg )
 
 void NetworkPackageManager :: initGui()
 {
     QLabel *l = new QLabel( "Servers", this );
     serversList = new QComboBox( this );
     packagesList = new QListView( this );
-    update = new QPushButton( "Refresh List", this );
+    update = new QPushButton( "Refresh Lists", this );
     download = new QPushButton( "Download", this );
     upgrade = new QPushButton( "Upgrade", this );
     apply = new QPushButton( "Apply", this );
 
     QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1, "VBox" );
     QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1, "HBox1" );
@@ -282,14 +282,14 @@ void NetworkPackageManager :: serverSelected( int )
     }
 
     // If the local server or the local ipkgs server disable the download button
     if ( serverName == LOCAL_SERVER )
     {
         upgrade->setEnabled( false );
-        download->setText( "Download" );
-        download->setEnabled( false );
+        download->setText( "Install Remote" );
+        download->setEnabled( true );
     }
     else if ( serverName == LOCAL_IPKGS )
     {
         upgrade->setEnabled( false );
         download->setEnabled( true );
         download->setText( "Remove" );
@@ -362,12 +362,76 @@ void NetworkPackageManager :: upgradePackages()
 
 void NetworkPackageManager :: downloadPackage()
 {
     bool doUpdate = true;
     if ( download->text() == "Download" )
     {
+        // See if any packages are selected
+        bool found = false;
+        if ( serversList->currentText() != LOCAL_SERVER )
+        {
+            for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
+                  item != 0 && !found;
+                  item = (QCheckListItem *)item->nextSibling() )
+            {
+                if ( item->isOn() )
+                    found = true;
+            }
+        }
+        
+        // If user selected some packages then download the and store the locally
+        // otherwise, display dialog asking user what package to download from an http server
+        // and whether to install it
+        if ( found )
+            downloadSelectedPackages();
+        else
+            downloadRemotePackage();
+        
+    }
+    else if ( download->text() == "Remove" )
+    {
+        doUpdate = false;
+        for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
+              item != 0 ;
+              item = (QCheckListItem *)item->nextSibling() )
+        {
+            if ( item->isOn() )
+            {
+                QString name = item->text();
+                int pos = name.find( "*" );
+                name.truncate( pos );
+
+                // if (there is a (installed), remove it
+                pos = name.find( "(installed)" );
+                if ( pos > 0 )
+                    name.truncate( pos - 1 );
+               
+                Package *p = dataMgr->getServer( serversList->currentText() )->getPackage( name );
+
+                QString msgtext;
+                msgtext.sprintf( "Are you sure you wish to delete\n%s?", (const char *)p->getPackageName() );
+                if ( QMessageBox::information( this, "Are you sure?",
+                                    msgtext, "No", "Yes" ) == 1 )
+                {
+                    doUpdate = true;
+                    QFile f( p->getFilename() );
+                    f.remove();
+                }
+            }
+        }
+    }
+
+    if ( doUpdate )
+    {
+        dataMgr->reloadServerData();
+        serverSelected( -1 );
+    }
+}
+
+void NetworkPackageManager :: downloadSelectedPackages()
+{
         // First, write out ipkg_conf file so that ipkg can use it
         dataMgr->writeOutIpkgConf();
         
         // Display dialog to user asking where to download the files to
         bool ok = FALSE;
         QString dir = "";
@@ -416,50 +480,46 @@ void NetworkPackageManager :: downloadPackage()
 
                 ipkg.setPackage( name );
                 ipkg.runIpkg( );
             }
         }
     }
-    else if ( download->text() == "Remove" )
-    {
-        doUpdate = false;
-        for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild();
-              item != 0 ;
-              item = (QCheckListItem *)item->nextSibling() )
-        {
-            if ( item->isOn() )
+
+void NetworkPackageManager :: downloadRemotePackage()
             {
-                QString name = item->text();
-                int pos = name.find( "*" );
-                name.truncate( pos );
+    // Display dialog
+    bool ok;
+    QString package = InputDialog::getText( "Install Remote Package", tr( "Enter package location" ), "http://", &ok, this );
+    if ( !ok || package.isEmpty() )
+        return;
+//    DownloadRemoteDlgImpl dlg( this, "Install", true );
+//    if ( dlg.exec() == QDialog::Rejected )
+//        return;
 
-                // if (there is a (installed), remove it
-                pos = name.find( "(installed)" );
-                if ( pos > 0 )
-                    name.truncate( pos - 1 );
+    // grab details from dialog
+//    QString package = dlg.getPackageLocation();
                
-                Package *p = dataMgr->getServer( serversList->currentText() )->getPackage( name );
+    InstallData item;
+    item.option = "I";
+    item.packageName = package;
+    vector<InstallData> workingPackages;
+    workingPackages.push_back( item );
 
-                QString msgtext;
-                msgtext.sprintf( "Are you sure you wish to delete\n%s?", (const char *)p->getPackageName() );
-                if ( QMessageBox::information( this, "Are you sure?",
-                                    msgtext, "No", "Yes" ) == 1 )
-                {
-                    doUpdate = true;
-                    QFile f( p->getFilename() );
-                    f.remove();
-                }
-            }
-        }
-    }
+    InstallDlgImpl dlg2( workingPackages, dataMgr, this, "Install", true );
+    dlg2.showDlg();
 
-    if ( doUpdate )
-    {
+    // Reload data
         dataMgr->reloadServerData();
         serverSelected( -1 );
-    }
+
+#ifdef QWS
+    // Finally let the main system update itself
+    QCopEnvelope e("QPE/System", "linkChanged(QString)");
+    QString lf = QString::null;
+    e << lf;
+#endif
 }
 
 
 void NetworkPackageManager :: applyChanges()
 {
     stickyOption = "";
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h
index 20f6e2d..66a8903 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.h
+++ b/noncore/settings/aqpkg/networkpkgmgr.h
@@ -60,12 +60,14 @@ private:
 
     void timerEvent ( QTimerEvent * );
 
     void initGui();
     void setupConnections();
     void showProgressDialog( char *initialText );
+    void downloadSelectedPackages();
+    void downloadRemotePackage();
     InstallData dealWithItem( QCheckListItem *item );
     QString stickyOption;
 
 public slots:
     void serverSelected( int index );
     void applyChanges();