6 files changed, 98 insertions, 21 deletions

diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 54ee115..c803ca0 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -91,5 +91,5 @@ void MainWindow::makeMenu()
 
                 
-  runAction = new QAction( tr( "Commit" ),
+  runAction = new QAction( tr( "Apply" ),
                            Resource::loadPixmap( "oipkg/install" ),
                            QString::null, 0, this, 0 );
@@ -172,8 +172,5 @@ void MainWindow::makeMenu()
   connect( findEdit, SIGNAL( textChanged( const QString & ) ),
        this, SLOT( displayList() ) );
-        //a = new QAction( tr( "Filter" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 );
-//  connect( a, SIGNAL( activated() ), this, SLOT( filterList() ) );
-//  a->addTo( findBar );
-//    a->addTo( edit );
+
   a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
@@ -184,5 +181,4 @@ void MainWindow::makeMenu()
   findAction->setOn( true );
   findAction->addTo( viewMenu );
-
 }
 
@@ -194,12 +190,16 @@ void MainWindow::runIpkg()
 {
   ipkg->commit( packageList );
-  updateList(); //to remove
+//  updateList(); //to remove
 }
 
 void MainWindow::updateList()
 {
+        QTimer *t = new QTimer( this );
+  connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) );
+  t->start( 0, false );
         packageList.clear();
   ipkg->update();
   getList();
+  t->stop();
 }
 
@@ -347,2 +347,11 @@ void MainWindow::findClose()
 }
 
+void MainWindow::rotateUpdateIcon()
+{
+        pvDebug(2, "MainWindow::rotateUpdateIcon");
+ if ( updateIcon )
+        updateAction->setIconSet( Resource::loadIconSet( "oipkg/update" ) );
+ else
+        updateAction->setIconSet( Resource::loadIconSet( "oipkg/update2" ) );
+ updateIcon = !updateIcon;
+}
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h
index 0c1e474..892d5e8 100644
--- a/noncore/unsupported/oipkg/mainwindow.h
+++ b/noncore/unsupported/oipkg/mainwindow.h
@@ -4,4 +4,5 @@
 #include <qmainwindow.h>
 #include <qaction.h>
+#include <qtimer.h>
 #include <qpopupmenu.h>
 
@@ -70,4 +71,7 @@ private:
   QComboBox *subsection;
   QPopupMenu *popupMenu;
+  bool updateIcon;
+private slots:
+  void rotateUpdateIcon();
 };
 
diff --git a/noncore/unsupported/oipkg/pksettings.h b/noncore/unsupported/oipkg/pksettings.h
index cda352a..2982f1c 100644
--- a/noncore/unsupported/oipkg/pksettings.h
+++ b/noncore/unsupported/oipkg/pksettings.h
@@ -20,5 +20,4 @@ public:
   QStringList getActiveServers();
   QStringList getDestinationUrls();
-
 private:
   QIntDict<QString> serverurlDic;
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index b23b9ea..eae73ad 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -44,4 +44,12 @@ int PmIpkg::runIpkg(const QString& args)
 {
   pvDebug(2,"PmIpkg::runIpkg "+args);
+
+  //to make script ipkg happy
+  pvDebug(2, "cd "+settings->getDestinationUrl()+"/tmp/ipkg");
+  if (!QDir::setCurrent(settings->getDestinationUrl()+"/tmp/ipkg"))
+  {
+          QDir instDir = QDir(settings->getDestinationUrl()+"/tmp/ipkg");
+           instDir.mkdir(settings->getDestinationUrl()+"/tmp/ipkg");
+  }
 #ifdef PROC
   QStringList cmd = "/usr/bin/ipkg ";
@@ -154,4 +162,7 @@ void PmIpkg::commit( PackageList pl )
           out( "<h1>"+tr("Todo")+"</h1>\n"); 
 
+  to_install.clear();
+  to_remove.clear();
+  int sizecount = 0;
   QString rem="<b>To remove:</b><br>\n";
   QString inst="<b>To install:</b><br>\n";;
@@ -162,10 +173,22 @@ void PmIpkg::commit( PackageList pl )
           if ( pack->toInstall() )
             {
+ #ifndef NEWLIST
               to_install.append( pack->name() );
+ #endif
+ #ifdef NEWLIST
+              to_install.append( pack );
+               sizecount += pack->size().toInt();
+ #endif
               inst += pack->name()+"<br>";
             }
           if ( pack->toRemove() )
             {
+ #ifndef NEWLIST
               to_remove.append( pack->name() );
+ #endif
+ #ifdef NEWLIST
+              to_remove.append( pack );
+               sizecount += 1;
+ #endif
               rem += pack->name()+"<br>";
             }
@@ -177,4 +200,6 @@ void PmIpkg::commit( PackageList pl )
   qDebug("to remove=%i; to install=%i",to_remove.count(),to_install.count());
 
+  runwindow->progress->setTotalSteps( sizecount );
+
   connect( runwindow->doItButton, SIGNAL( clicked() ),
                                          SLOT( doIt() ) );
@@ -208,6 +233,8 @@ void PmIpkg::remove()
 
         out("<hr><hr><b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br>");
-    for (QStringList::ConstIterator it=to_remove.begin(); it!=to_remove.end(); ++it)
-    {
+
+ #ifndef NEWLIST
+   for (QStringList::ConstIterator it=to_remove.begin(); it!=to_remove.end(); ++it)
+   {
       if ( runIpkg("remove " + *it) == 0)
       {
@@ -217,4 +244,18 @@ void PmIpkg::remove()
       }
     }
+#endif
+ #ifdef NEWLIST
+   for (Package *it=to_remove.first(); it != 0; it=to_remove.next() )
+   {
+      if ( runIpkg("remove " + it->name()) == 0)
+      {
+              runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress());
+        it->processed();
+        runwindow->progress->setProgress( 1 );
+                }else{
+              out("<b>"+tr("Error while removing")+"</b>"+it->name());
+      }
+    }
+#endif
 }
 
@@ -224,10 +265,10 @@ void PmIpkg::install()
          if ( to_install.count() == 0 ) return;
         show( true );
-        out("<hr><hr><b>"+tr("Installing")+"<br>"+tr("please wait")+"<b><br>");
-  if ( to_install.count() )
+        out("<hr><hr><b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>");
+ #ifndef NEWLIST
     for (QStringList::ConstIterator it=to_install.begin(); it!=to_install.end(); ++it)
     {
       if ( runIpkg("install " + *it) == 0 )
-                          {    
+                  {
                     if ( settings->createLinks() )
                                         makeLinks( *it );
@@ -236,5 +277,19 @@ void PmIpkg::install()
       }
     }
-        
+#endif
+ #ifdef NEWLIST
+           for (Package *it=to_install.first(); it != 0; it=to_install.next() )
+    {
+      if ( runIpkg("install " + it->name()) == 0 )
+                          {    
+              runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress());
+                    if ( settings->createLinks() )
+                                        makeLinks( it->name() );
+                it->processed();
+                }else{
+              out("<b>"+tr("Error while installing")+"</b>"+it->name());
+      }
+    }
+#endif
 }
 
@@ -291,7 +346,7 @@ void PmIpkg::show(bool b)
           runwindow->showMaximized();
         showButtons(b);
-        if ( b )
-                runwindow->progress->show();
-  else
-                runwindow->progress->show();
+        //if ( b )
+                runwindow->progress->hide();
+//  else
+        //      runwindow->progress->show();
 }
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index 8718f49..2692017 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -4,4 +4,5 @@
 
 #include <qobject.h>
+#include <qlist.h>
 #include <qstring.h>
 #include <qwidget.h>
@@ -11,6 +12,6 @@
 #include "debug.h"
 
-
-
+//#define NEWLIST
+class Package;
 class PmIpkg : public QObject
 {
@@ -29,6 +30,12 @@ private:
   PackageManagerSettings* settings;
   RunWindow *runwindow;
+#ifndef NEWLIST
   QStringList to_remove;
   QStringList to_install;
+#endif
+#ifdef NEWLIST
+  QList<Package> to_remove;
+  QList<Package> to_install;
+#endif
   bool runwindowopen;
 
diff --git a/noncore/unsupported/oipkg/settings.h b/noncore/unsupported/oipkg/settings.h
index d4b1072..5df522b 100644
--- a/noncore/unsupported/oipkg/settings.h
+++ b/noncore/unsupported/oipkg/settings.h
@@ -6,5 +6,6 @@
 
 
-class PackageManagerSettings : private PackageManagerSettingsBase
+class PackageManagerSettings : public PackageManagerSettingsBase
+//class PackageManagerSettings : private PackageManagerSettingsBase
 {
           // Q_OBJECT
@@ -20,4 +21,6 @@ public:
   QStringList getActiveServers();
   QStringList getDestinationUrls();
+  /** No descriptions */
+  QComboBox getActiveDestinationCombo();
 
 private: