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
@@ -85,17 +85,17 @@ void MainWindow::makeMenu()
   menuBar->insertItem( tr( "Settings" ), cfgMenu );
   //    menuBar->insertItem( tr( "Sections" ), sectMenu );
 
   QLabel *spacer = new QLabel( "", toolBar );
   spacer->setBackgroundColor( toolBar->backgroundColor() );
   toolBar->setStretchableWidget( spacer );
 
                 
-  runAction = new QAction( tr( "Commit" ),
+  runAction = new QAction( tr( "Apply" ),
                            Resource::loadPixmap( "oipkg/install" ),
                            QString::null, 0, this, 0 );
   connect( runAction, SIGNAL( activated() ),
            this, SLOT( runIpkg() ) );
   runAction->addTo( toolBar );
   runAction->addTo( srvMenu );
 
   srvMenu->insertSeparator ();
@@ -166,46 +166,46 @@ void MainWindow::makeMenu()
   addToolBar( findBar,  "Search", QMainWindow::Top, TRUE );
   label = new QLabel( tr("Filter: "), findBar );
   label->setBackgroundColor( findBar->backgroundColor() );
   findBar->setHorizontalStretchable( TRUE );
   findEdit = new QLineEdit( findBar, "findEdit" );
   findBar->setStretchableWidget( findEdit );
   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() ) );
   a->addTo( findBar );
   findAction = new QAction( tr( "Find" ), QString::null, 0, this, 0 );
   connect( findAction, SIGNAL( toggled(bool) ), this, SLOT( findShow(bool) ) );
   findAction->setToggleAction( true );
   findAction->setOn( true );
   findAction->addTo( viewMenu );
-
 }
 
 MainWindow::~MainWindow()
 {
 }
 
 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();
 }
 
 void MainWindow::getList()
 {
   packageList.update();
   displayList();
 }
 
@@ -341,8 +341,17 @@ void MainWindow::findShow(bool b)
   findAction->setOn( b );
 }
 
 void MainWindow::findClose()
 {
   findAction->setOn( false );
 }
 
+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
@@ -1,13 +1,14 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
 #include <qaction.h>
+#include <qtimer.h>
 #include <qpopupmenu.h>
 
 #include "packagelist.h"
 #include "pmipkg.h"
 #include "pksettings.h"
 #include "pkdesc.h"
 
 class QComboBox;
@@ -64,11 +65,14 @@ private:
   QListView *listViewPackages;
   QPopupMenu *contextMenu;
   QPEToolBar *findBar;
   QLineEdit *findEdit;
   QPEToolBar *sectionBar;
   QComboBox *section;
   QComboBox *subsection;
   QPopupMenu *popupMenu;
+  bool updateIcon;
+private slots:
+  void rotateUpdateIcon();
 };
 
 #endif
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
@@ -14,17 +14,16 @@ public:
 
   bool showDialog( int ) ;
   QString getDestinationUrl();
   QString getDestinationName();
   QString getLinkDestinationName();
   bool createLinks();
   QStringList getActiveServers();
   QStringList getDestinationUrls();
-
 private:
   QIntDict<QString> serverurlDic;
   QIntDict<QString> destinationurlDic;
   int ipkg_old;
   int editedserver;
   int editeddestination;
   int currentSetting;
   int installationSettingsCount;
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
@@ -38,16 +38,24 @@ PmIpkg::~PmIpkg()
 {
 }
 
 //#define PROC
 #define SYSTEM
 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 ";
 #endif
 #ifdef SYSTEM
   QString cmd = "/usr/bin/ipkg ";
 #endif
   cmd += " -dest "+settings->getDestinationName();
          cmd += " -force-defaults ";
@@ -148,39 +156,56 @@ void PmIpkg::processLinkDir( QString file, QString dest )
 }
 
 void PmIpkg::commit( PackageList pl )
         {   
         show( false );
   runwindow->outPut->setText("");
           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";;
   for( Package *pack = pl.first();pack ; (pack = pl.next())  )
     {
       if ( pack && (pack->name() != "") && pack)
         {
           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>";
             }
         }
     }
 
   out("<p>"+inst+"</p>"+"<p>"+rem+"</p><hl>");
 
   qDebug("to remove=%i; to install=%i",to_remove.count(),to_install.count());
 
+  runwindow->progress->setTotalSteps( sizecount );
+
   connect( runwindow->doItButton, SIGNAL( clicked() ),
                                          SLOT( doIt() ) );
   connect( runwindow->installButton, SIGNAL( clicked() ),
                                         this, SLOT( install() ) );
   connect( runwindow->removeButton, SIGNAL( clicked() ),
                                         this, SLOT( remove() ) );
   connect( runwindow->cancelButton, SIGNAL( clicked() ),
                                         runwindow, SLOT( close() ) );
@@ -202,45 +227,75 @@ void PmIpkg::doIt()
 
 
 void PmIpkg::remove()
 {
          if ( to_remove.count() == 0 ) return;
         show( true );
 
         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)
       {
 
                 }else{
               out("<b>"+tr("Error while removing")+"</b>"+*it);
       }
     }
+#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
 }
 
 
 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 );
                 }else{
               out("<b>"+tr("Error while installing")+"</b>"+*it);
       }
     }
-        
+#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
 }
 
 void PmIpkg::linkDestination( const QString msg, const QByteArray dest )
 // add 3rd package parameter
 {
                 qDebug("msg="+msg+" -- "+QString(dest) );
 //  QDir d( src );
 //  d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks );
@@ -285,13 +340,13 @@ void PmIpkg::showButtons(bool b)
   }
 }
 
 void PmIpkg::show(bool b)
 {
         if (!runwindow->isVisible())
           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
@@ -1,40 +1,47 @@
 #ifndef PMIPKG_H
 #define PMIPKG_H
 
 
 #include <qobject.h>
+#include <qlist.h>
 #include <qstring.h>
 #include <qwidget.h>
 #include "pksettings.h"
 #include "runwindow.h"
 #include "packagelist.h"
 #include "debug.h"
 
-
-
+//#define NEWLIST
+class Package;
 class PmIpkg : public QObject
 {
   Q_OBJECT
 public:
   PmIpkg( PackageManagerSettings* , QWidget* p=0,  const char * name=0, WFlags f=0 );
   ~PmIpkg();
 
   void commit( PackageList );
   void update();
   PackageList* getPackageList();
   void showButtons(bool b=true);
   void show( bool buttons=true );
 
 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;
 
   void makeLinks(QString);
   void processLinkDir( QString, QString );
 
   int runIpkg(const QString& args);
   void out( QString );
 
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
@@ -1,29 +1,32 @@
 #ifndef PACKAGEMANAGERSETTINGS_H
 #define PACKAGEMANAGERSETTINGS_H
 
 #include "pksettingsbase.h"
 #include <qintdict.h>
 
 
-class PackageManagerSettings : private PackageManagerSettingsBase
+class PackageManagerSettings : public PackageManagerSettingsBase
+//class PackageManagerSettings : private PackageManagerSettingsBase
 {
           // Q_OBJECT
 public: 
   PackageManagerSettings( QWidget* ,  const char* , WFlags  );
   ~PackageManagerSettings();
 
   bool showDialog( int ) ;
   QString getDestinationUrl();
   QString getDestinationName();
   QString getLinkDestinationName();
   bool createLinks();
   QStringList getActiveServers();
   QStringList getDestinationUrls();
+  /** No descriptions */
+  QComboBox getActiveDestinationCombo();
 
 private:
   QIntDict<QString> serverurlDic;
   QIntDict<QString> destinationurlDic;
   int ipkg_old;
   int editedserver;
   int editeddestination;
   int currentSetting;