5 files changed, 77 insertions, 203 deletions

diff --git a/noncore/unsupported/oipkg/main.cpp b/noncore/unsupported/oipkg/main.cpp
index d98bcaa..bb3d1db 100644
--- a/noncore/unsupported/oipkg/main.cpp
+++ b/noncore/unsupported/oipkg/main.cpp
@@ -3,7 +3,7 @@
 
 #include <qpe/qpeapplication.h>
 #include <qstring.h>
-#include <qmessagebox.h>
+//#include <qmessagebox.h>
 int debugLevel;
 
 int main( int argc, char ** argv )
@@ -17,8 +17,8 @@ int main( int argc, char ** argv )
   }
   QPEApplication a( argc, argv );
   MainWindow mw;
-  if (argc > 2)
-                QMessageBox::information( &mw, "oipkg","While ipkg is working\noipkg is hanging.\nPlease be patient!");
+//  if (argc > 2)
+        //      QMessageBox::information( &mw, "oipkg","While ipkg is working\noipkg is hanging.\nPlease be patient!");
   a.showMainDocumentWidget( &mw );
   return a.exec();
 }
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 55f915d..2fa91e3 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -93,8 +93,8 @@ void MainWindow::makeMenu()
   //    menuBar->insertItem( tr( "Sections" ), sectMenu );
 
   QLabel *spacer = new QLabel( "", toolBar );
-  spacer->setBackgroundColor( toolBar->backgroundColor() );
-  toolBar->setStretchableWidget( spacer );
+//  spacer->setBackgroundColor( toolBar->backgroundColor() );
+//  toolBar->setStretchableWidget( spacer );
 
                 
   runAction = new QAction( tr( "Apply" ),
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 5996e63..75f93cf 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -7,6 +7,7 @@
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/stringutil.h>
+#include <qpe/qpeapplication.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qgroupbox.h>
@@ -37,19 +38,11 @@ PmIpkg::~PmIpkg()
 {
 }
 
-//#define PROC
-#define SYSTEM
-#define QT_QPROCESS_DEBUG
-int PmIpkg::runIpkg(const QString& args, const QString& dest )
+bool PmIpkg::runIpkg(const QString& args, const QString& dest )
 {
-  pvDebug(2,"PmIpkg::runIpkg "+args);
+        bool ret=false;
   QDir::setCurrent("/tmp");
-#ifdef PROC
-  QString cmd;
-#endif
-#ifdef SYSTEM
   QString cmd = "/usr/bin/ipkg ";
-#endif
         pvDebug( 3,"PmIpkg::runIpkg got dest="+dest);
         if ( dest == "" )
           cmd += " -dest "+settings->getDestinationName();
@@ -68,42 +61,38 @@ int PmIpkg::runIpkg(const QString& args, const QString& dest )
                  cmd += " -force-removal-of-essential-packages ";
   }
 
-  out( "<hr><br>Starting to "+ args+"<br>\n");
+  out( "Starting to "+ args+"\n");
   cmd += args;
-  int r = 0;
-#ifdef PROC
-        QString o = "start";
-  Process *ipkg = new Process(QStringList() << "ipkg" << cmd );
-  out( "running:<br>\n"+ipkg->arguments().join(" ")+"<br>\n" );
-  QString description;
-  r = ipkg->exec("",o);
-  out( o );
-#endif
-#ifdef SYSTEM
-  out( "running:<br>\n"+cmd+"<br>\n" );
-  QString redirect = "/tmp/oipkg.pipe";
-  cmd += " 2>&1 | tee "+redirect+" 2>&1";
-  pvDebug(2, "running >"+cmd+"<");
-  r = system(cmd.latin1());
-  QFile f( redirect );
-  QString line;
-  QString oldLine;
-  while ( ! f.open(IO_ReadOnly) ) {};
-    QTextStream t( &f );
-    while ( !t.eof() )
-    {
-      line = t.readLine();
-                        if ( line != oldLine )
-                 {
-              out( line +"<br>" );
-                                oldLine = line;
+  out( "running:\n"+cmd+"\n" );
+  pvDebug(2,"running:"+cmd);
+  qApp->processEvents();
+  FILE *fp;
+  char line[130];
+  QString lineStr, lineStrOld;
+  sleep(1);
+  cmd +=" 2>&1";
+  fp = popen(  (const char *) cmd, "r");
+  if ( !fp ) {
+     qDebug("Could not execute '" + cmd + "'! err=%d", fp);
+     pclose(fp);
+     out("\nError while executing "+ cmd+"\n\n");
+     return false;
+  } else {
+     while ( fgets( line, sizeof line, fp)) {
+        lineStr = line;
+        lineStr=lineStr.left(lineStr.length()-1);
+        //Configuring opie-oipkg...Done
+        if (lineStr.contains("Done"))
+          ret = true;
+        if (lineStr!=lineStrOld)
+                out(lineStr);
+        lineStrOld = lineStr;
             }
+     pclose(fp);
     }
-  f.close();
-  out( "Finished!<br>");
-#endif
-
-  return r;
+  //out( "Finished!");
+  pvDebug(2,QString(ret?"success\n":"failure\n"));
+  return ret;
 }
 
 void PmIpkg::makeLinks(Package *pack)
@@ -127,7 +116,7 @@ QStringList* PmIpkg::getList( QString packFileName, QString d )
          if ( ! f.open(IO_ReadOnly) )
   {
            pvDebug(1," Panik!  Could not open");
-          out( "<b>Panik!</b> Could not open:<br>"+packFileName );
+          out( "Panik!\n Could not open:\n"+packFileName );
            return (QStringList*)0;
   }
   QStringList *fileList = new QStringList();
@@ -243,15 +232,18 @@ void PmIpkg::commit()
   runwindow->progress->setTotalSteps(sizecount);
   qDebug("Install size %i",sizecount);
   installDialog->showMaximized();
+  installDialog->show();
   if ( installDialog->exec() ) doIt();
          installDialog->close();
   runwindow->showMaximized();
-  out(tr("<b>All done.</b>"));
+  runwindow->show();
+  out(tr("\nAll done."));
 }
 
 void PmIpkg::doIt()
 {
-        show( true );
+        runwindow->progress->setProgress(0);
+        show();
          remove();
   install();
 }
@@ -261,59 +253,59 @@ void PmIpkg::remove()
 {
          if ( to_remove.count() == 0 ) return;
 
-        out("<b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br><hr>");
+        out(tr("Removing")+"\n"+tr("please wait")+"\n\n");
 
         QStringList *fileList;
   for (uint i=0; i < to_remove.count(); i++)
   {
                         if ( to_remove.at(i)->link() )fileList = getList( to_remove.at(i)->name(), to_remove.at(i)->dest() );     
-    if ( runIpkg("remove " + to_remove.at(i)->name(), to_remove.at(i)->dest() ) == 0)
+    if ( runIpkg("remove " + to_remove.at(i)->name(), to_remove.at(i)->dest() ))
     {
       runwindow->progress->setProgress( 1 );
              linkOpp = removeLink;
                    if ( to_remove.at(i)->link() )
              {
-                                        out( "<br>removing links<br>" );
-                                out( "for package "+to_remove.at(i)->name()+" in "+to_remove.at(i)->dest()+"<br>" );
+                                        out( "\nremoving links\n" );
+                                out( "for package "+to_remove.at(i)->name()+" in "+to_remove.at(i)->dest()+"\n" );
                 processFileList( fileList, to_remove.at(i)->dest() );
       }
             to_remove.at(i)->processed();
                 to_remove.take( i );       
-      out("<br><hr>");
+      out("\n\n");
                 }else{
-             out("<b>"+tr("Error while removing")+"</b><hr>"+to_remove.at(i)->name());
+             out(tr("Error while removing")+to_remove.at(i)->name()+"\n");
     }
           if ( to_remove.at(i)->link() )delete fileList;
   }
   to_remove.clear();
-  out("<br>");
+  out("\n");
 }
 
 
 void PmIpkg::install()
 {
          if ( to_install.count() == 0 ) return;
-                out("<b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>"); 
+                out(tr("Installing")+"\n"+tr("please wait")+"\n"); 
   for (uint i=0; i < to_install.count(); i++)
   {
-          if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() ) == 0 )
+          if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() ))
                         {    
             runwindow->progress->setProgress( to_install.at(i)->size().toInt() + runwindow->progress->progress());
       linkOpp = createLink;
             if ( to_install.at(i)->link() )
       {
-                                out( "<br>creating links<br>" );
-                        out( "for package "+to_install.at(i)->name()+" in "+to_install.at(i)->dest()+"<br>" );
+                                out( "\ncreating links\n" );
+                        out( "for package "+to_install.at(i)->name()+" in "+to_install.at(i)->dest()+"\n" );
                                 makeLinks( to_install.at(i) );
              }
              to_install.at(i)->processed();
       to_install.take( i );
-      out("<br><hr>");
+      out("\n\n");
           }else{
-             out("<b>"+tr("Error while installing")+"</b><hr>"+to_install.at(i)->name());
+             out(tr("Error while installing")+to_install.at(i)->name()+"\n");
     }
    }
-   out("<br>");
+   out("\n");
    to_install.clear();
 }
 
@@ -339,7 +331,7 @@ void PmIpkg::removeLinks( const QString &dest )
 
 void PmIpkg::update()
 {
-        show( false );
+        show();
         runIpkg( "update" );
          runwindow->close();
 }
@@ -347,38 +339,25 @@ void PmIpkg::update()
 void PmIpkg::out( QString o )
 {
                 runwindow->outPut->append(o);
-         //runwindow->outPut->setCursorPosition(0, runwindow->outPut->contentsHeight());
-        //runwindow->outPut->setText( runwindow->outPut->text()+o );
-  runwindow->outPut->setContentsPos(0, runwindow->outPut->contentsHeight());
+         runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE);
 }
 
 
-void PmIpkg::showButtons(bool b)
-{
-        if ( b )
-         {
-                runwindow->cancelButton->hide();
-                runwindow->doItButton->hide();
-          runwindow->removeButton->hide();
-          runwindow->installButton->hide();
-  }else{
-                runwindow->cancelButton->show();
-                runwindow->doItButton->show();
-          runwindow->removeButton->show();
-          runwindow->installButton->show();
 
-  }
-}
 
-void PmIpkg::show(bool b)
+void PmIpkg::show()
 {
         if (!runwindow->isVisible())
+         {
           runwindow->showMaximized();
-        showButtons(b);
-        if ( !b )
-                runwindow->progress->hide();
-  else
-                runwindow->progress->show();
+          runwindow->show();
+  }
+  runwindow->outPut->setText("");
+        //showButtons(b);
+        //if ( !b )
+        //      runwindow->progress->hide();
+//  else
+        //      runwindow->progress->show();
 }
 
 void PmIpkg::installFile(const QString &fileName, const QString &dest)
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index 7bc62f1..f8ac39a 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -27,8 +27,7 @@ public:
   void loadList( PackageList* );
   void commit();
   void update();
-  void showButtons(bool b=true);
-  void show( bool buttons=true );
+  void show();
 
 public slots:
         void doIt();
@@ -53,7 +52,7 @@ private:
   void makeLinks(Package*);
   void linkPackage( QString, QString );
   void processLinkDir( QString , QString );
-  int  runIpkg(const QString& args, const QString& dest="" );
+  bool runIpkg(const QString& args, const QString& dest="" );
   void out( QString );
         QStringList* getList( QString, QString );
         void processFileList( QStringList*, QString );
diff --git a/noncore/unsupported/oipkg/runwindow.ui b/noncore/unsupported/oipkg/runwindow.ui
index 8582ce8..839e151 100644
--- a/noncore/unsupported/oipkg/runwindow.ui
+++ b/noncore/unsupported/oipkg/runwindow.ui
@@ -11,7 +11,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>344</width>
+            <width>340</width>
             <height>442</height>
         </rect>
     </property>
@@ -45,96 +45,11 @@
                 <number>0</number>
             </property>
         </widget>
-        <widget row="3"  column="0" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>buttons</cstring>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>doItButton</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>0</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>font</name>
-                        <font>
-                            <pointsize>8</pointsize>
-                        </font>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Do all </string>
-                    </property>
-                    <property stdset="1">
-                        <name>autoResize</name>
-                        <bool>false</bool>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>installButton</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>font</name>
-                        <font>
-                            <pointsize>8</pointsize>
-                        </font>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Install</string>
-                    </property>
-                    <property stdset="1">
-                        <name>autoResize</name>
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>removeButton</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>font</name>
-                        <font>
-                            <pointsize>7</pointsize>
-                        </font>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Remove</string>
-                    </property>
-                    <property stdset="1">
-                        <name>autoResize</name>
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QPushButton</class>
+        <widget row="1"  column="0" >
+            <class>QMultiLineEdit</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>cancelButton</cstring>
+                <cstring>outPut</cstring>
                     </property>
                     <property stdset="1">
                         <name>font</name>
@@ -143,27 +58,8 @@
                         </font>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>Cancel</string>
-                    </property>
-                    <property stdset="1">
-                        <name>autoResize</name>
-                        <bool>true</bool>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-        <widget row="1"  column="0" >
-            <class>QTextView</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>outPut</cstring>
-            </property>
-            <property stdset="1">
-                <name>font</name>
-                <font>
-                    <pointsize>6</pointsize>
-                </font>
+                <name>wordWrap</name>
+                <enum>WidgetWidth</enum>
             </property>
         </widget>
     </grid>