1 files changed, 23 insertions, 55 deletions

diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index be9d6da..fd8279b 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -59,9 +59,9 @@ int PmIpkg::runIpkg(const QString& args, const QString& dest )
 
-  if (_force_depends)
+  if (installDialog->_force_depends)
   {
-          if (_force_depends->isChecked())
+          if (installDialog->_force_depends->isChecked())
                  cmd += " -force-depends ";
-          if (_force_reinstall->isChecked())
+          if (installDialog->_force_reinstall->isChecked())
                  cmd += " -force-reinstall ";
-          if (_force_remove->isChecked())
+          if (installDialog->_force_remove->isChecked())
                  cmd += " -force-removal-of-essential-packages ";
@@ -175,3 +175,3 @@ void PmIpkg::processLinkDir( QString file, QString dest )
     QDir d( file );
-    d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks );
+//    d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks );
     const QFileInfoList *list = d.entryInfoList();
@@ -179,4 +179,6 @@ void PmIpkg::processLinkDir( QString file, QString dest )
     QFileInfo *fi;
+    qDebug( "while %i",list->count());
     while ( (fi=it.current()) )
     {
+            pvDebug(4, "processLinkDir "+fi->absFilePath());
                         processLinkDir( fi->absFilePath(), dest );                      
@@ -184,7 +186,2 @@ void PmIpkg::processLinkDir( QString file, QString dest )
     }
-//    if (linkOpp==removeLink)
-//    {
-        //    pvDebug(2,"remove  destDir "+ destFile );
-        //    destDir.remove( destFile, true );
-//    }
   } else
@@ -203,5 +200,6 @@ void PmIpkg::processLinkDir( QString file, QString dest )
     {
-      pvDebug(4,"removing "+destFile+" no "+file);
       QFileInfo toRemoveLink( destFile );
             if ( !QFile::exists( file ) && toRemoveLink.isSymLink() )
+             {
+              pvDebug(4,"removing "+destFile+" no "+file);
                         unlink( linkFile ); 
@@ -210,2 +208,3 @@ void PmIpkg::processLinkDir( QString file, QString dest )
 }
+}
 
@@ -225,8 +224,5 @@ void PmIpkg::loadList( PackageList pl )
 
-void PmIpkg::commit( PackageList pl )
+void PmIpkg::commit()
         {   
   int sizecount = 0;
-//  QString rem="<b>"+tr("To remove:")+"</b><br>\n";
-//  QString inst="<b>"+tr("To install:")+"</b><br>\n";
-  loadList(pl);
   for (uint i=0; i < to_remove.count(); i++)
@@ -241,12 +237,5 @@ void PmIpkg::startDialog()
 {
-  installDialog = new QDialog(0,0,true);
-  QGridLayout *RunWindowLayout = new QGridLayout( installDialog );
-  RunWindowLayout->setSpacing( 2 );
-  RunWindowLayout->setMargin( 2 );
-
-    PackageListView *plv = new PackageListView(installDialog, "install",settings);
-    plv->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding, plv->sizePolicy().mayShrinkVertically()) );
-    RunWindowLayout->addWidget( plv, 1, 0 );
+  installDialog = new InstallDialog(settings,0,0,true);
                 QCheckListItem *toRemoveItem;
-                toRemoveItem= new QCheckListItem( plv, QObject::tr("To remove") );
+        toRemoveItem= new QCheckListItem( installDialog->ListViewPackages, QObject::tr("To remove") );
           toRemoveItem->setOpen( true );
@@ -254,6 +243,6 @@ void PmIpkg::startDialog()
           {
-      toRemoveItem->insertItem( new PackageListItem(plv, it,settings) );
+    toRemoveItem->insertItem( new PackageListItem(installDialog->ListViewPackages, it,settings) );
                 } 
                 QCheckListItem *toInstallItem;
-                toInstallItem = new QCheckListItem( plv, QObject::tr("To install") );
+        toInstallItem = new QCheckListItem( installDialog->ListViewPackages, QObject::tr("To install") );
           toInstallItem->setOpen( true );
@@ -261,29 +250,4 @@ void PmIpkg::startDialog()
     {
-      toInstallItem->insertItem( new PackageListItem(plv, it,settings) );
-    }
-
-    QGroupBox *GroupBox1 = new QGroupBox( installDialog, "Ipkg" );
-    GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)3, GroupBox1->sizePolicy().mayShrinkVertically() ) );
-    GroupBox1->setTitle( tr( "Ipkg options" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 0 );
-    GroupBox1->layout()->setMargin( 0 );
-    QGridLayout *GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-    GroupBox1Layout->setSpacing( 3 );
-    GroupBox1Layout->setMargin( 3 );
-    _force_depends = new QCheckBox( GroupBox1, "_force_depends" );
-    _force_depends->setText( tr( "-force-depends" ) );
-    _force_depends->setAutoResize( TRUE );
-    _force_depends->setChecked(true);
-    GroupBox1Layout->addWidget( _force_depends, 0, 0 );
-    _force_reinstall = new QCheckBox( GroupBox1, "_force_reinstall" );
-    _force_reinstall->setText( tr( "-force-reinstall" ) );
-    _force_reinstall->setAutoResize( TRUE );
-    GroupBox1Layout->addWidget( _force_reinstall, 1, 0 );
-    _force_remove = new QCheckBox( GroupBox1, "_force_remove" );
-    _force_remove->setText( tr( "-force-removal-of-essential-packages" ) );
-    _force_remove->setAutoResize( TRUE );
-    GroupBox1Layout->addWidget( _force_remove, 1, 0 );
-    RunWindowLayout->addWidget( GroupBox1 , 3, 0 );
+    toInstallItem->insertItem( new PackageListItem(installDialog->ListViewPackages, it,settings) );
+  }
   installDialog->showMaximized();
@@ -292,2 +256,3 @@ void PmIpkg::startDialog()
   out(tr("<b>All done.</b>"));
+  to_install.clear();
 }
@@ -359,2 +324,3 @@ void PmIpkg::install()
     out("<br>");
+    to_install.clear();
 }
@@ -367,3 +333,4 @@ void PmIpkg::createLinks( const QString &dest )
   url = url==""?dest:url;
-        processLinkDir( "/", url );
+        processLinkDir( "/opt", url );
+        processLinkDir( "/usr", url );
 }
@@ -376,3 +343,4 @@ void PmIpkg::removeLinks( const QString &dest )
   url = url==""?dest:url;
-        processLinkDir( "/", url );
+        processLinkDir( "/opt", url );
+        processLinkDir( "/usr", url );
 }