author | tille <tille> | 2002-05-12 14:06:06 (UTC) |
---|---|---|
committer | tille <tille> | 2002-05-12 14:06:06 (UTC) |
commit | f388350086510b261c496c232da7302f4ec81cc3 (patch) (unidiff) | |
tree | 472aad42f650028bfd7fae66be6a19f37e2a26e0 | |
parent | c1f023c19bbee54a3a0575bd6035b133592edcfc (diff) | |
download | opie-f388350086510b261c496c232da7302f4ec81cc3.zip opie-f388350086510b261c496c232da7302f4ec81cc3.tar.gz opie-f388350086510b261c496c232da7302f4ec81cc3.tar.bz2 |
fixed filename for remote files
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 24 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.h | 3 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/package.cpp | 4 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelist.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistitem.cpp | 3 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistremote.cpp | 2 |
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 | |||
@@ -38,17 +38,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : | |||
38 | settings = new PackageManagerSettings(this,0,TRUE); | 38 | settings = new PackageManagerSettings(this,0,TRUE); |
39 | listViewPackages = new PackageListView( this,"listViewPackages",settings ); | 39 | listViewPackages = new PackageListView( this,"listViewPackages",settings ); |
40 | setCentralWidget( listViewPackages ); | 40 | setCentralWidget( listViewPackages ); |
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 ); |
52 | pvDebug(9,"packageListServers.update"); | 48 | pvDebug(9,"packageListServers.update"); |
53 | packageListServers.update(); | 49 | packageListServers.update(); |
54 | pvDebug(9,"packageListDocLnk.update"); | 50 | pvDebug(9,"packageListDocLnk.update"); |
@@ -266,39 +262,30 @@ void MainWindow::runIpkg() | |||
266 | e << lf; | 262 | e << lf; |
267 | displayList(); | 263 | displayList(); |
268 | } | 264 | } |
269 | 265 | ||
270 | void MainWindow::updateList() | 266 | void 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(); |
279 | ipkg->update(); | 271 | ipkg->update(); |
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 | ||
287 | void MainWindow::filterList() | 277 | void 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 | ||
296 | void MainWindow::displayList() | 284 | void MainWindow::displayList() |
297 | { | 285 | { |
298 | //wait->hide(); | ||
299 | filterList(); | 286 | filterList(); |
300 | listViewPackages->display(); | 287 | listViewPackages->display(); |
301 | } | 288 | } |
302 | 289 | ||
303 | void MainWindow::sectionChanged() | 290 | void MainWindow::sectionChanged() |
304 | { | 291 | { |
@@ -405,23 +392,12 @@ void MainWindow::destShow(bool b) | |||
405 | 392 | ||
406 | void MainWindow::destClose() | 393 | void MainWindow::destClose() |
407 | { | 394 | { |
408 | destAction->setOn( false ); | 395 | destAction->setOn( false ); |
409 | } | 396 | } |
410 | 397 | ||
411 | void 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 | |||
422 | void MainWindow::setDocument(const QString &fileName) | 398 | void MainWindow::setDocument(const QString &fileName) |
423 | { | 399 | { |
424 | if ( !QFile::exists( fileName ) ) return; | 400 | if ( !QFile::exists( fileName ) ) return; |
425 | ipkg->installFile( fileName ); | 401 | ipkg->installFile( fileName ); |
426 | QCopEnvelope e("QPE/System", "linkChanged(QString)"); | 402 | QCopEnvelope e("QPE/System", "linkChanged(QString)"); |
427 | QString lf = QString::null; | 403 | QString lf = QString::null; |
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 | |||
@@ -86,12 +86,9 @@ private: | |||
86 | QComboBox *section; | 86 | QComboBox *section; |
87 | QComboBox *subsection; | 87 | QComboBox *subsection; |
88 | QAction *destAction; | 88 | QAction *destAction; |
89 | QPEToolBar *destBar; | 89 | QPEToolBar *destBar; |
90 | QComboBox *destination; | 90 | QComboBox *destination; |
91 | QCheckBox* CheckBoxLink; | 91 | QCheckBox* CheckBoxLink; |
92 | // QMessageBox *wait; | ||
93 | private 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 | |||
@@ -47,12 +47,13 @@ Package::Package( QString n, PackageManagerSettings *s ) | |||
47 | { | 47 | { |
48 | init(s); | 48 | init(s); |
49 | if ( !QFile::exists( n ) ) | 49 | if ( !QFile::exists( n ) ) |
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 ); |
56 | } | 57 | } |
57 | } | 58 | } |
58 | 59 | ||
@@ -339,13 +340,14 @@ QString Package::dest() | |||
339 | return _dest!=""?_dest:settings->getDestinationName(); | 340 | return _dest!=""?_dest:settings->getDestinationName(); |
340 | else return ""; | 341 | else return ""; |
341 | } | 342 | } |
342 | 343 | ||
343 | void Package::setDest( QString d ) | 344 | void Package::setDest( QString d ) |
344 | { | 345 | { |
345 | _dest = d; | 346 | if ( d == "remote") _useFileName = true; |
347 | else _dest = d; | ||
346 | } | 348 | } |
347 | 349 | ||
348 | void Package::setOn() | 350 | void Package::setOn() |
349 | { | 351 | { |
350 | _toProcess = true; | 352 | _toProcess = true; |
351 | } | 353 | } |
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 | |||
@@ -172,15 +172,15 @@ void PackageList::readFileEntries( QString filename, QString dest ) | |||
172 | if ( line.find(QRegExp("[\n\t ]*")) || line == "" ) | 172 | if ( line.find(QRegExp("[\n\t ]*")) || line == "" ) |
173 | { | 173 | { |
174 | //end of package | 174 | //end of package |
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 | } |
184 | } | 184 | } |
185 | }else{ | 185 | }else{ |
186 | packEntry << line; | 186 | packEntry << line; |
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 | |||
@@ -30,18 +30,19 @@ void PackageListItem::init( Package *pi, PackageManagerSettings *s) | |||
30 | { | 30 | { |
31 | package = pi; | 31 | package = pi; |
32 | settings = s; | 32 | settings = 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("Description: ")+pi->desc() ); | ||
36 | item = new QCheckListItem( this, QObject::tr("Size: ")+pi->size() ); | 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() ) { |
45 | item = new QCheckListItem( otherItem, QString(it.currentKey()+": "+*it.current()) ); | 46 | item = new QCheckListItem( otherItem, QString(it.currentKey()+": "+*it.current()) ); |
46 | ++it; | 47 | ++it; |
47 | } | 48 | } |
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 | |||
@@ -42,8 +42,8 @@ void PackageListRemote::update() | |||
42 | cmd += "?format=pda&searchtype=package§ion="; | 42 | cmd += "?format=pda&searchtype=package§ion="; |
43 | cmd += "&query="+searchString; | 43 | cmd += "&query="+searchString; |
44 | cmd += "\""; | 44 | cmd += "\""; |
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 | } |