summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp24
-rw-r--r--noncore/unsupported/oipkg/mainwindow.h3
-rw-r--r--noncore/unsupported/oipkg/package.cpp4
-rw-r--r--noncore/unsupported/oipkg/packagelist.cpp2
-rw-r--r--noncore/unsupported/oipkg/packagelistitem.cpp5
-rw-r--r--noncore/unsupported/oipkg/packagelistremote.cpp2
6 files changed, 8 insertions, 32 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 ) :
41 listViewPackages->addList( tr("feeds"), &packageListServers ); 41 listViewPackages->addList( tr("feeds"), &packageListServers );
42 listViewPackages->addList( tr("ipkgfind"), &packageListSearch ); 42 listViewPackages->addList( tr("ipkgfind"), &packageListSearch );
43 listViewPackages->addList( tr("documents"), &packageListDocLnk ); 43 listViewPackages->addList( tr("documents"), &packageListDocLnk );
44 //wait = new QMessageBox(tr("oipkg"),tr("Please wait")//,QMessageBox::Information,QMessageBox::NoButton,QMessageBox::NoButton,QMessageBox::NoButton);
45 //wait = new QMessageBox(this);
46 // wait->setText(tr("Please wait"));
47 ipkg = new PmIpkg( settings, this ); 44 ipkg = new PmIpkg( settings, this );
48// settings->setIpkg( ipkg );
49 packageListServers.setSettings( settings ); 45 packageListServers.setSettings( settings );
50 packageListSearch.setSettings( settings ); 46 packageListSearch.setSettings( settings );
51 packageListDocLnk.setSettings( settings ); 47 packageListDocLnk.setSettings( settings );
@@ -269,10 +265,6 @@ void MainWindow::runIpkg()
269 265
270void MainWindow::updateList() 266void MainWindow::updateList()
271{ 267{
272 //wait->show();
273 QTimer *t = new QTimer( this );
274 connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) );
275 t->start( 0, false );
276 packageListServers.clear(); 268 packageListServers.clear();
277 packageListSearch.clear(); 269 packageListSearch.clear();
278 packageListDocLnk.clear(); 270 packageListDocLnk.clear();
@@ -280,22 +272,17 @@ void MainWindow::updateList()
280 packageListServers.update(); 272 packageListServers.update();
281 packageListSearch.update(); 273 packageListSearch.update();
282 packageListDocLnk.update(); 274 packageListDocLnk.update();
283 t->stop();
284 // wait->hide();
285} 275}
286 276
287void MainWindow::filterList() 277void MainWindow::filterList()
288{ 278{
289 //wait->show();
290 QString f = ""; 279 QString f = "";
291 if ( findAction->isOn() ) f = findEdit->text(); 280 if ( findAction->isOn() ) f = findEdit->text();
292 packageListServers.filterPackages( f ); 281 packageListServers.filterPackages( f );
293 //wait->hide();
294} 282}
295 283
296void MainWindow::displayList() 284void MainWindow::displayList()
297{ 285{
298 //wait->hide();
299 filterList(); 286 filterList();
300 listViewPackages->display(); 287 listViewPackages->display();
301} 288}
@@ -408,17 +395,6 @@ void MainWindow::destClose()
408 destAction->setOn( false ); 395 destAction->setOn( false );
409} 396}
410 397
411void MainWindow::rotateUpdateIcon()
412{
413 pvDebug(2, "MainWindow::rotateUpdateIcon");
414 if ( updateIcon )
415 updateAction->setIconSet( Resource::loadIconSet( "oipkg/update" ) );
416 else
417 updateAction->setIconSet( Resource::loadIconSet( "oipkg/update2" ) );
418 updateIcon = !updateIcon;
419}
420
421
422void MainWindow::setDocument(const QString &fileName) 398void MainWindow::setDocument(const QString &fileName)
423{ 399{
424 if ( !QFile::exists( fileName ) ) return; 400 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:
89 QPEToolBar *destBar; 89 QPEToolBar *destBar;
90 QComboBox *destination; 90 QComboBox *destination;
91 QCheckBox* CheckBoxLink; 91 QCheckBox* CheckBoxLink;
92// QMessageBox *wait;
93private slots:
94 void rotateUpdateIcon();
95}; 92};
96 93
97#endif 94#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 )
50 { 50 {
51 _name = QString( n ); 51 _name = QString( n );
52 }else{ 52 }else{
53 pvDebug(2,"remote file: "+n);
53 parseIpkgFile( n ); 54 parseIpkgFile( n );
54 _useFileName = true; 55 _useFileName = true;
55 _fileName = QString( n ); 56 _fileName = QString( n );
@@ -342,7 +343,8 @@ QString Package::dest()
342 343
343void Package::setDest( QString d ) 344void Package::setDest( QString d )
344{ 345{
345 _dest = d; 346 if ( d == "remote") _useFileName = true;
347 else _dest = d;
346} 348}
347 349
348void Package::setOn() 350void 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 )
175 if ( ! packEntry.isEmpty() ) 175 if ( ! packEntry.isEmpty() )
176 { 176 {
177 Package *p = new Package( packEntry, settings ); 177 Package *p = new Package( packEntry, settings );
178 p->setDest( dest );
179 if ( p ) 178 if ( p )
180 { 179 {
180 p->setDest( dest );
181 insertPackage( p ); 181 insertPackage( p );
182 packEntry.clear(); 182 packEntry.clear();
183 } 183 }
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)
33 setExpandable( true ); 33 setExpandable( true );
34 QCheckListItem *item; 34 QCheckListItem *item;
35 nameItem = new QCheckListItem( this, "" ); 35 nameItem = new QCheckListItem( this, "" );
36 item = new QCheckListItem( this, QObject::tr("Size: ")+pi->size() ); 36 item = new QCheckListItem( this, QObject::tr("Description: ")+pi->desc() );
37 item = new QCheckListItem( this, QObject::tr("Size: ")+pi->size() );
37 destItem = new QCheckListItem( this, "" ); 38 destItem = new QCheckListItem( this, "" );
38 linkItem = new QCheckListItem( this, "" ); 39 linkItem = new QCheckListItem( this, "" );
39 statusItem = new QCheckListItem( this, "" ); 40 statusItem = new QCheckListItem( this, "" );
40 QCheckListItem *otherItem = new QCheckListItem( this, QObject::tr("other") ); 41 QCheckListItem *otherItem = new QCheckListItem( this, QObject::tr("other") );
41 item = new QCheckListItem( otherItem, QObject::tr("Description: ")+pi->desc() ); 42 item = new QCheckListItem( otherItem, QObject::tr("Install Name: ")+pi->installName() );
42 QDict<QString> *fields = pi->getFields(); 43 QDict<QString> *fields = pi->getFields();
43 QDictIterator<QString> it( *fields ); 44 QDictIterator<QString> it( *fields );
44 while ( it.current() ) { 45 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()
45 45
46 pvDebug(4,"search :"+cmd); 46 pvDebug(4,"search :"+cmd);
47 r = system(cmd.latin1()); 47 r = system(cmd.latin1());
48 readFileEntries( redirect ); 48 readFileEntries( redirect, "remote" );
49} 49}