fixed filename for remote files

6 files changed, 7 insertions, 31 deletions

diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 1c56aae..9c4c752 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -41,11 +41,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
   listViewPackages->addList( tr("feeds"), &packageListServers );
   listViewPackages->addList( tr("ipkgfind"), &packageListSearch );
   listViewPackages->addList( tr("documents"), &packageListDocLnk );
-//	wait = new QMessageBox(tr("oipkg"),tr("Please wait")//,QMessageBox::Information,QMessageBox::NoButton,QMessageBox::NoButton,QMessageBox::NoButton);
-//	wait = new QMessageBox(this);
-// 	wait->setText(tr("Please wait"));
   ipkg = new PmIpkg( settings, this );
-//  settings->setIpkg( ipkg );
   packageListServers.setSettings( settings );
   packageListSearch.setSettings( settings );
   packageListDocLnk.setSettings( settings );
@@ -269,10 +265,6 @@ void MainWindow::runIpkg()
 
 void MainWindow::updateList()
 {
-//	wait->show();
-	QTimer *t = new QTimer( this );
-  connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) );
-  t->start( 0, false );
 	packageListServers.clear();
 	packageListSearch.clear();
   packageListDocLnk.clear();
@@ -280,22 +272,17 @@ void MainWindow::updateList()
   packageListServers.update();
   packageListSearch.update();
   packageListDocLnk.update();
-  t->stop();
-//	wait->hide();  	
 }
 
 void MainWindow::filterList()
 {
-//	wait->show();
  	QString f = "";
   if ( findAction->isOn() ) f = findEdit->text();
   packageListServers.filterPackages( f );
-//	wait->hide();
 }
 
 void MainWindow::displayList()
 {
-//	wait->hide();
 	filterList();
   listViewPackages->display();
 }
@@ -408,17 +395,6 @@ void MainWindow::destClose()
   destAction->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;
-}
-
-
 void MainWindow::setDocument(const QString &fileName)
 {
  	if ( !QFile::exists( fileName ) ) return;
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h
index ce3e761..4a5e8bf 100644
--- a/noncore/unsupported/oipkg/mainwindow.h
+++ b/noncore/unsupported/oipkg/mainwindow.h
@@ -89,9 +89,6 @@ private:
   QPEToolBar *destBar;
   QComboBox *destination;
   QCheckBox* CheckBoxLink;
-//  QMessageBox *wait;
-private slots:
-  void rotateUpdateIcon();
 };
 
 #endif
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 4542e42..8c5f0ea 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -50,6 +50,7 @@ Package::Package( QString n, PackageManagerSettings *s )
   {
 	  _name = QString( n );
   }else{
+    pvDebug(2,"remote file: "+n);
    	parseIpkgFile( n );
     _useFileName = true;
     _fileName = QString( n );
@@ -342,7 +343,8 @@ QString Package::dest()
 
 void Package::setDest( QString d )
 {
-	_dest = d;
+	if ( d == "remote") _useFileName = true;
+	else _dest = d;
 }
 
 void Package::setOn()
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index 8f835b7..1b572e0 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -175,9 +175,9 @@ void PackageList::readFileEntries( QString filename, QString dest )
 	  		if ( ! packEntry.isEmpty() )
 		    {
 		      Package *p = new Package( packEntry, settings );
-    	   	p->setDest( dest );
 	    	  if ( p )
 					{
+			      p->setDest( dest );
 		  			insertPackage( p );
 					  packEntry.clear();
 					}
diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp
index c743a49..55047d5 100644
--- a/noncore/unsupported/oipkg/packagelistitem.cpp
+++ b/noncore/unsupported/oipkg/packagelistitem.cpp
@@ -33,12 +33,13 @@ void PackageListItem::init( Package *pi, PackageManagerSettings *s)
   setExpandable( true );
 	QCheckListItem *item;
 	nameItem = new QCheckListItem( this, "" );
+	item = new QCheckListItem( this, QObject::tr("Description: ")+pi->desc() );
 	item = new QCheckListItem( this, QObject::tr("Size: ")+pi->size() );
 	destItem = new QCheckListItem( this, "" );
 	linkItem = new QCheckListItem( this, "" );
 	statusItem = new QCheckListItem( this, "" );
  	QCheckListItem *otherItem = new QCheckListItem( this, QObject::tr("other") );
-	item = new QCheckListItem( otherItem, QObject::tr("Description: ")+pi->desc() );
+	item = new QCheckListItem( otherItem, QObject::tr("Install Name: ")+pi->installName() );
   QDict<QString> *fields = pi->getFields();
   QDictIterator<QString> it( *fields );
 	while ( it.current() ) {
diff --git a/noncore/unsupported/oipkg/packagelistremote.cpp b/noncore/unsupported/oipkg/packagelistremote.cpp
index e37f256..bb29e80 100644
--- a/noncore/unsupported/oipkg/packagelistremote.cpp
+++ b/noncore/unsupported/oipkg/packagelistremote.cpp
@@ -45,5 +45,5 @@ void PackageListRemote::update()
 
   pvDebug(4,"search :"+cmd);
   r = system(cmd.latin1());
-  readFileEntries( redirect );
+  readFileEntries( redirect, "remote" );
 }