-rw-r--r-- | noncore/unsupported/oipkg/main.cpp | 7 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 51 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.h | 6 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/oipkg.pro | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/package.cpp | 6 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/package.h | 1 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistdoclnk.cpp | 36 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistdoclnk.h | 22 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistitem.cpp | 8 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistitem.h | 1 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistremote.cpp | 14 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistremote.h | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistview.cpp | 3 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 21 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.h | 4 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/settings.h | 9 |
16 files changed, 128 insertions, 65 deletions
diff --git a/noncore/unsupported/oipkg/main.cpp b/noncore/unsupported/oipkg/main.cpp index 5cef2dc..bacc973 100644 --- a/noncore/unsupported/oipkg/main.cpp +++ b/noncore/unsupported/oipkg/main.cpp | |||
@@ -12,10 +12,11 @@ int main( int argc, char ** argv ) | |||
12 | debugLevel = 2; | 12 | debugLevel = 2; |
13 | if (argc > 0) | 13 | if (argc > 0) |
14 | { | 14 | { |
15 | debugLevel = QString ( argv[1] ).toInt(); | 15 | debugLevel = QString ( argv[1] ).toInt(); |
16 | } | 16 | } |
17 | QPEApplication a( argc, argv ); | 17 | QPEApplication a( argc, argv ); |
18 | MainWindow mw; | 18 | MainWindow mw; |
19 | QMessageBox::information( &mw, "oipkg","While ipkg is working\noipkg is hanging.\nPlease be patient!"); | 19 | if (debugLevel < 4) |
20 | QMessageBox::information( &mw, "oipkg","While ipkg is working\noipkg is hanging.\nPlease be patient!"); | ||
20 | a.showMainDocumentWidget( &mw ); | 21 | a.showMainDocumentWidget( &mw ); |
21 | return a.exec(); | 22 | return a.exec(); |
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index 0422d65..b668660 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp | |||
@@ -39,6 +39,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : | |||
39 | listViewPackages = new PackageListView( this,"listViewPackages",settings ); | 39 | listViewPackages = new PackageListView( this,"listViewPackages",settings ); |
40 | setCentralWidget( listViewPackages ); | 40 | setCentralWidget( listViewPackages ); |
41 | listViewPackages->addList( tr("local"), &packageList ); | 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 | //wait = new QMessageBox(tr("oipkg"),tr("Please wait")//,QMessageBox::Information,QMessageBox::NoButton,QMessageBox::NoButton,QMessageBox::NoButton); | 44 | //wait = new QMessageBox(tr("oipkg"),tr("Please wait")//,QMessageBox::Information,QMessageBox::NoButton,QMessageBox::NoButton,QMessageBox::NoButton); |
44 | //wait = new QMessageBox(this); | 45 | //wait = new QMessageBox(this); |
@@ -46,7 +47,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : | |||
46 | ipkg = new PmIpkg( settings, this ); | 47 | ipkg = new PmIpkg( settings, this ); |
47 | // settings->setIpkg( ipkg ); | 48 | // settings->setIpkg( ipkg ); |
48 | packageList.setSettings( settings ); | 49 | packageListServers.setSettings( settings ); |
49 | packageListSearch.setSettings( settings ); | 50 | packageListSearch.setSettings( settings ); |
50 | packageList.update(); | 51 | packageListDocLnk.setSettings( settings ); |
52 | packageListServers.update(); | ||
53 | packageListDocLnk.update(); | ||
51 | makeMenu(); | 54 | makeMenu(); |
52 | makeChannel(); | 55 | makeChannel(); |
@@ -245,7 +248,8 @@ MainWindow::~MainWindow() | |||
245 | void MainWindow::runIpkg() | 248 | void MainWindow::runIpkg() |
246 | { | 249 | { |
247 | packageList.allPackages(); | 250 | packageListServers.allPackages(); |
248 | ipkg->loadList( packageListSearch ); | 251 | ipkg->loadList( packageListSearch ); |
249 | ipkg->commit( packageList ); | 252 | ipkg->loadList( packageListDocLnk ); |
253 | ipkg->commit( packageListServers ); | ||
250 | // ##### If we looked in the list of files, we could send out accurate | 254 | // ##### If we looked in the list of files, we could send out accurate |
251 | // ##### messages. But we don't bother yet, and just do an "all". | 255 | // ##### messages. But we don't bother yet, and just do an "all". |
@@ -262,7 +266,11 @@ void MainWindow::updateList() | |||
262 | connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) ); | 266 | connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) ); |
263 | t->start( 0, false ); | 267 | t->start( 0, false ); |
264 | packageList.clear(); | 268 | packageListServers.clear(); |
269 | packageListSearch.clear(); | ||
270 | packageListDocLnk.clear(); | ||
265 | ipkg->update(); | 271 | ipkg->update(); |
266 | packageList.update(); | 272 | packageListServers.update(); |
273 | packageListSearch.update(); | ||
274 | packageListDocLnk.update(); | ||
267 | t->stop(); | 275 | t->stop(); |
268 | // wait->hide(); | 276 | // wait->hide(); |
@@ -274,5 +282,5 @@ void MainWindow::filterList() | |||
274 | QString f = ""; | 282 | QString f = ""; |
275 | if ( findAction->isOn() ) f = findEdit->text(); | 283 | if ( findAction->isOn() ) f = findEdit->text(); |
276 | packageList.filterPackages( f ); | 284 | packageListServers.filterPackages( f ); |
277 | //wait->hide(); | 285 | //wait->hide(); |
278 | } | 286 | } |
@@ -283,23 +291,4 @@ void MainWindow::displayList() | |||
283 | filterList(); | 291 | filterList(); |
284 | listViewPackages->display(); | 292 | listViewPackages->display(); |
285 | //// if (!rootLocal) | ||
286 | //// { | ||
287 | //QCheckListItem *rootLocal = new QCheckListItem(listViewPackages,tr("local")); | ||
288 | //QCheckListItem *rootSearch = new QCheckListItem(listViewPackages,tr("ipkgfind")); | ||
289 | //// } | ||
290 | // listViewPackages->clear(); | ||
291 | // Package *pack = packageList.first(); | ||
292 | // PackageListItem *item; | ||
293 | // while( pack ) | ||
294 | // { | ||
295 | // item = new PackageListItem( rootLocal, pack, settings ); | ||
296 | // pack = packageList.next(); | ||
297 | // } | ||
298 | // pack = packageListSearch.first(); | ||
299 | // while( pack ) | ||
300 | // { | ||
301 | // item = new PackageListItem( rootSearch, pack, settings ); | ||
302 | // pack = packageListSearch.next(); | ||
303 | // } | ||
304 | } | 293 | } |
305 | 294 | ||
@@ -311,5 +300,5 @@ void MainWindow::sectionChanged() | |||
311 | this, SLOT( subSectionChanged() ) ); | 300 | this, SLOT( subSectionChanged() ) ); |
312 | subsection->clear(); | 301 | subsection->clear(); |
313 | packageList.setSection( section->currentText() ); | 302 | packageListServers.setSection( section->currentText() ); |
314 | setSubSections(); | 303 | setSubSections(); |
315 | connect( section, SIGNAL( activated(int) ), | 304 | connect( section, SIGNAL( activated(int) ), |
@@ -326,5 +315,5 @@ void MainWindow::subSectionChanged() | |||
326 | disconnect( subsection, SIGNAL(activated(int) ), | 315 | disconnect( subsection, SIGNAL(activated(int) ), |
327 | this, SLOT( subSectionChanged() ) ); | 316 | this, SLOT( subSectionChanged() ) ); |
328 | packageList.setSubSection( subsection->currentText() ); | 317 | packageListServers.setSubSection( subsection->currentText() ); |
329 | connect( section, SIGNAL( activated(int) ), | 318 | connect( section, SIGNAL( activated(int) ), |
330 | this, SLOT( sectionChanged() ) ); | 319 | this, SLOT( sectionChanged() ) ); |
@@ -337,5 +326,5 @@ void MainWindow::setSections() | |||
337 | { | 326 | { |
338 | section->clear(); | 327 | section->clear(); |
339 | section->insertStringList( packageList.getSections() ); | 328 | section->insertStringList( packageListServers.getSections() ); |
340 | } | 329 | } |
341 | 330 | ||
@@ -343,5 +332,5 @@ void MainWindow::setSubSections() | |||
343 | { | 332 | { |
344 | subsection->clear(); | 333 | subsection->clear(); |
345 | subsection->insertStringList( packageList.getSubSections() ); | 334 | subsection->insertStringList( packageListServers.getSubSections() ); |
346 | } | 335 | } |
347 | 336 | ||
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h index 4a73b78..f6023b0 100644 --- a/noncore/unsupported/oipkg/mainwindow.h +++ b/noncore/unsupported/oipkg/mainwindow.h | |||
@@ -10,4 +10,5 @@ | |||
10 | #include "packagelistremote.h" | 10 | #include "packagelistremote.h" |
11 | #include "packagelistlocal.h" | 11 | #include "packagelistlocal.h" |
12 | #include "packagelistdoclnk.h" | ||
12 | #include "pmipkg.h" | 13 | #include "pmipkg.h" |
13 | #include "pksettings.h" | 14 | #include "pksettings.h" |
@@ -69,9 +70,8 @@ private: | |||
69 | PmIpkg* ipkg; | 70 | PmIpkg* ipkg; |
70 | PackageManagerSettings *settings; | 71 | PackageManagerSettings *settings; |
71 | PackageListLocal packageList; | 72 | PackageListLocal packageListServers; |
72 | PackageListRemote packageListSearch; | 73 | PackageListRemote packageListSearch; |
74 | PackageListDocLnk packageListDocLnk; | ||
73 | PackageListView *listViewPackages; | 75 | PackageListView *listViewPackages; |
74 | // QCheckListItem* rootSearch; | ||
75 | // QCheckListItem* rootLocal; | ||
76 | QAction *runAction; | 76 | QAction *runAction; |
77 | QAction *updateAction; | 77 | QAction *updateAction; |
diff --git a/noncore/unsupported/oipkg/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro index 98f92c8..6ee1963 100644 --- a/noncore/unsupported/oipkg/oipkg.pro +++ b/noncore/unsupported/oipkg/oipkg.pro | |||
@@ -6,4 +6,5 @@ HEADERS = mainwindow.h \ | |||
6 | pksettings.h \ | 6 | pksettings.h \ |
7 | pmipkg.h \ | 7 | pmipkg.h \ |
8 | packagelistdoclnk.h \ | ||
8 | utils.h \ | 9 | utils.h \ |
9 | packagelistitem.h \ | 10 | packagelistitem.h \ |
@@ -16,4 +17,5 @@ SOURCES = main.cpp \ | |||
16 | mainwindow.cpp \ | 17 | mainwindow.cpp \ |
17 | utils.cpp \ | 18 | utils.cpp \ |
19 | packagelistdoclnk.cpp \ | ||
18 | packagelistview.cpp \ | 20 | packagelistview.cpp \ |
19 | packagelistremote.cpp \ | 21 | packagelistremote.cpp \ |
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp index f992641..9280d89 100644 --- a/noncore/unsupported/oipkg/package.cpp +++ b/noncore/unsupported/oipkg/package.cpp | |||
@@ -49,5 +49,4 @@ Package::Package( QString n, PackageManagerSettings *s ) | |||
49 | }else{ | 49 | }else{ |
50 | parseIpkgFile( n ); | 50 | parseIpkgFile( n ); |
51 | _toProcess = true; | ||
52 | _useFileName = true; | 51 | _useFileName = true; |
53 | _fileName = QString( n ); | 52 | _fileName = QString( n ); |
@@ -367,2 +366,7 @@ QDict<QString>* Package::getFields() | |||
367 | return &_values; | 366 | return &_values; |
368 | } | 367 | } |
368 | |||
369 | QString Package::status() | ||
370 | { | ||
371 | return _status; | ||
372 | } | ||
diff --git a/noncore/unsupported/oipkg/package.h b/noncore/unsupported/oipkg/package.h index fc725bc..257d9c7 100644 --- a/noncore/unsupported/oipkg/package.h +++ b/noncore/unsupported/oipkg/package.h | |||
@@ -51,4 +51,5 @@ class Package //: public QObject | |||
51 | void setName(QString); | 51 | void setName(QString); |
52 | QDict<QString>* getFields(); | 52 | QDict<QString>* getFields(); |
53 | QString status(); | ||
53 | public slots: | 54 | public slots: |
54 | void toggleProcess(); | 55 | void toggleProcess(); |
diff --git a/noncore/unsupported/oipkg/packagelistdoclnk.cpp b/noncore/unsupported/oipkg/packagelistdoclnk.cpp new file mode 100644 index 0000000..575ac62 --- a/dev/null +++ b/noncore/unsupported/oipkg/packagelistdoclnk.cpp | |||
@@ -0,0 +1,36 @@ | |||
1 | |||
2 | #include "packagelistdoclnk.h" | ||
3 | |||
4 | #include <qpe/applnk.h> | ||
5 | #include <qlist.h> | ||
6 | |||
7 | #include "package.h" | ||
8 | #include "pksettings.h" | ||
9 | |||
10 | PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s) | ||
11 | : PackageList(s) | ||
12 | { | ||
13 | PackageListDocLnk(); | ||
14 | } | ||
15 | |||
16 | PackageListDocLnk::PackageListDocLnk() | ||
17 | : PackageList() | ||
18 | { | ||
19 | doclnkset = new DocLnkSet("/mnt/nfs/ipk","application/ipkg"); | ||
20 | } | ||
21 | |||
22 | PackageListDocLnk::~PackageListDocLnk() | ||
23 | { | ||
24 | } | ||
25 | |||
26 | |||
27 | |||
28 | void PackageListDocLnk::update() | ||
29 | { | ||
30 | pvDebug(2,"PackageListDocLnk::update "); | ||
31 | QList<DocLnk> packlist = doclnkset->children(); | ||
32 | for (DocLnk *pack =packlist.first(); pack != 0; pack=packlist.next() ) | ||
33 | { | ||
34 | insertPackage( new Package(pack->file(), settings) ); | ||
35 | } | ||
36 | } | ||
diff --git a/noncore/unsupported/oipkg/packagelistdoclnk.h b/noncore/unsupported/oipkg/packagelistdoclnk.h new file mode 100644 index 0000000..3864ace --- a/dev/null +++ b/noncore/unsupported/oipkg/packagelistdoclnk.h | |||
@@ -0,0 +1,22 @@ | |||
1 | #ifndef PACKAGELISTDOCLNK_H | ||
2 | #define PACKAGELISTDOCLNK_H | ||
3 | |||
4 | #include "packagelist.h" | ||
5 | #include "debug.h" | ||
6 | |||
7 | class DocLnkSet; | ||
8 | |||
9 | class PackageListDocLnk : public PackageList | ||
10 | { | ||
11 | public: | ||
12 | PackageListDocLnk(); | ||
13 | PackageListDocLnk( PackageManagerSettings* s); | ||
14 | virtual ~PackageListDocLnk(); | ||
15 | public slots: | ||
16 | void update(); | ||
17 | private: | ||
18 | DocLnkSet *doclnkset; | ||
19 | }; | ||
20 | |||
21 | |||
22 | #endif | ||
diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp index 2f81714..45aaf1d 100644 --- a/noncore/unsupported/oipkg/packagelistitem.cpp +++ b/noncore/unsupported/oipkg/packagelistitem.cpp | |||
@@ -33,4 +33,5 @@ void PackageListItem::init( Package *pi, PackageManagerSettings *s) | |||
33 | destItem = new QCheckListItem( this, "" ); | 33 | destItem = new QCheckListItem( this, "" ); |
34 | linkItem = new QCheckListItem( this, "" ); | 34 | linkItem = new QCheckListItem( this, "" ); |
35 | statusItem = new QCheckListItem( this, "" ); | ||
35 | QCheckListItem *otherItem = new QCheckListItem( this, QObject::tr("other") ); | 36 | QCheckListItem *otherItem = new QCheckListItem( this, QObject::tr("other") ); |
36 | item = new QCheckListItem( otherItem, QObject::tr("Description: ")+pi->desc() ); | 37 | item = new QCheckListItem( otherItem, QObject::tr("Description: ")+pi->desc() ); |
@@ -130,11 +131,14 @@ void PackageListItem::setOn( bool b ) | |||
130 | void PackageListItem::displayDetails() | 131 | void PackageListItem::displayDetails() |
131 | { | 132 | { |
132 | QString sod = " ("+package->sizeUnits(); | 133 | QString sod; |
134 | sod += package->sizeUnits().isEmpty()?QString(""):QString(package->sizeUnits()); | ||
135 | //sod += QString(package->dest().isEmpty()?"":QObject::tr(" on ")+package->dest()); | ||
133 | sod += package->dest().isEmpty()?QString(""):QString(QObject::tr(" on ")+package->dest()); | 136 | sod += package->dest().isEmpty()?QString(""):QString(QObject::tr(" on ")+package->dest()); |
134 | sod += ")"; | 137 | sod = sod.isEmpty()?QString(""):QString(" ("+sod+")"); |
135 | setText(0, package->name()+sod ); | 138 | setText(0, package->name()+sod ); |
136 | nameItem->setText( 0, QObject::tr("Name: ")+package->name()); | 139 | nameItem->setText( 0, QObject::tr("Name: ")+package->name()); |
137 | linkItem->setText( 0, QObject::tr("Link: ")+QString(package->link()?QObject::tr("Yes"):QObject::tr("No")) ); | 140 | linkItem->setText( 0, QObject::tr("Link: ")+QString(package->link()?QObject::tr("Yes"):QObject::tr("No")) ); |
138 | destItem->setText( 0, QObject::tr("Destination: ")+package->dest() ); | 141 | destItem->setText( 0, QObject::tr("Destination: ")+package->dest() ); |
142 | statusItem->setText( 0, QObject::tr("Status: ")+package->status() ); | ||
139 | repaint(); | 143 | repaint(); |
140 | } | 144 | } |
diff --git a/noncore/unsupported/oipkg/packagelistitem.h b/noncore/unsupported/oipkg/packagelistitem.h index b128f0d..65e9711 100644 --- a/noncore/unsupported/oipkg/packagelistitem.h +++ b/noncore/unsupported/oipkg/packagelistitem.h | |||
@@ -33,4 +33,5 @@ private: | |||
33 | QCheckListItem *destItem; | 33 | QCheckListItem *destItem; |
34 | QCheckListItem *linkItem; | 34 | QCheckListItem *linkItem; |
35 | QCheckListItem *statusItem; | ||
35 | PackageManagerSettings *settings; | 36 | PackageManagerSettings *settings; |
36 | Package *package; | 37 | Package *package; |
diff --git a/noncore/unsupported/oipkg/packagelistremote.cpp b/noncore/unsupported/oipkg/packagelistremote.cpp index 721d4a6..1ec7292 100644 --- a/noncore/unsupported/oipkg/packagelistremote.cpp +++ b/noncore/unsupported/oipkg/packagelistremote.cpp | |||
@@ -23,4 +23,10 @@ PackageListRemote::~PackageListRemote() | |||
23 | void PackageListRemote::query(QString s) | 23 | void PackageListRemote::query(QString s) |
24 | { | 24 | { |
25 | searchString = s; | ||
26 | } | ||
27 | |||
28 | void PackageListRemote::update() | ||
29 | { | ||
30 | pvDebug(2,"PackageListRemote::update"); | ||
25 | int r=0; | 31 | int r=0; |
26 | QString cmd = "wget"; | 32 | QString cmd = "wget"; |
@@ -33,5 +39,5 @@ void PackageListRemote::query(QString s) | |||
33 | cmd += " \""+server+"/packages.phtml"; | 39 | cmd += " \""+server+"/packages.phtml"; |
34 | cmd += "?format=pda&searchtype=package§ion="; | 40 | cmd += "?format=pda&searchtype=package§ion="; |
35 | cmd += "&query="+s; | 41 | cmd += "&query="+searchString; |
36 | cmd += "\""; | 42 | cmd += "\""; |
37 | 43 | ||
@@ -39,9 +45,3 @@ void PackageListRemote::query(QString s) | |||
39 | r = system(cmd.latin1()); | 45 | r = system(cmd.latin1()); |
40 | readFileEntries( redirect ); | 46 | readFileEntries( redirect ); |
41 | |||
42 | } | ||
43 | |||
44 | void PackageListRemote::update() | ||
45 | { | ||
46 | pvDebug(2,"PackageListRemote::update\ndoing nothing "); | ||
47 | } | 47 | } |
diff --git a/noncore/unsupported/oipkg/packagelistremote.h b/noncore/unsupported/oipkg/packagelistremote.h index 147da1e..87bf10d 100644 --- a/noncore/unsupported/oipkg/packagelistremote.h +++ b/noncore/unsupported/oipkg/packagelistremote.h | |||
@@ -15,4 +15,6 @@ public: | |||
15 | public slots: | 15 | public slots: |
16 | void update(); | 16 | void update(); |
17 | private: | ||
18 | QString searchString; | ||
17 | }; | 19 | }; |
18 | 20 | ||
diff --git a/noncore/unsupported/oipkg/packagelistview.cpp b/noncore/unsupported/oipkg/packagelistview.cpp index 5137c64..b6b520b 100644 --- a/noncore/unsupported/oipkg/packagelistview.cpp +++ b/noncore/unsupported/oipkg/packagelistview.cpp | |||
@@ -129,4 +129,5 @@ void PackageListView::addList( QString n, PackageList* pl) | |||
129 | { | 129 | { |
130 | PackageLists.insert(n, pl); | 130 | PackageLists.insert(n, pl); |
131 | rootItems.insert(n, new QCheckListItem(this,n)); | 131 | QCheckListItem *item = new QCheckListItem(this,n); |
132 | rootItems.insert(n, item); | ||
132 | } | 133 | } |
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index 2559a51..be9d6da 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp | |||
@@ -31,5 +31,4 @@ PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlag | |||
31 | { | 31 | { |
32 | settings = s; | 32 | settings = s; |
33 | runwindowopen = false; | ||
34 | runwindow = new RunWindow( p, name, true, f ); | 33 | runwindow = new RunWindow( p, name, true, f ); |
35 | } | 34 | } |
@@ -74,5 +73,5 @@ int PmIpkg::runIpkg(const QString& args, const QString& dest ) | |||
74 | #ifdef PROC | 73 | #ifdef PROC |
75 | QString o = "start"; | 74 | QString o = "start"; |
76 | Process *ipkg = new Process( "ls");//cmd ); | 75 | Process *ipkg = new Process( cmd ); |
77 | out( "running:<br>\n"+ipkg->arguments().join(" ")+"<br>\n" ); | 76 | out( "running:<br>\n"+ipkg->arguments().join(" ")+"<br>\n" ); |
78 | QString description; | 77 | QString description; |
@@ -161,7 +160,7 @@ void PmIpkg::processFileList( QStringList *fileList, QString d ) | |||
161 | void PmIpkg::processLinkDir( QString file, QString dest ) | 160 | void PmIpkg::processLinkDir( QString file, QString dest ) |
162 | { | 161 | { |
163 | pvDebug( 7,"PmIpkg::processLinkDir "+file+" to "+ dest); | 162 | pvDebug( 4,"PmIpkg::processLinkDir "+file+" to "+ dest); |
164 | if (linkOpp==createLink) pvDebug( 2,"opp: createLink"); | 163 | if (linkOpp==createLink) pvDebug( 4,"opp: createLink"); |
165 | if (linkOpp==removeLink) pvDebug( 2,"opp:removeLink"); | 164 | if (linkOpp==removeLink) pvDebug( 4,"opp: removeLink"); |
166 | if ( dest == "???" || dest == "" ) return; | 165 | if ( dest == "???" || dest == "" ) return; |
167 | QString destFile = file; | 166 | QString destFile = file; |
@@ -171,4 +170,5 @@ void PmIpkg::processLinkDir( QString file, QString dest ) | |||
171 | if ( fileInfo.isDir() ) | 170 | if ( fileInfo.isDir() ) |
172 | { | 171 | { |
172 | pvDebug(4, "process dir "+file); | ||
173 | QDir destDir( destFile ); | 173 | QDir destDir( destFile ); |
174 | if (linkOpp==createLink) destDir.mkdir( destFile, true ); | 174 | if (linkOpp==createLink) destDir.mkdir( destFile, true ); |
@@ -180,5 +180,4 @@ void PmIpkg::processLinkDir( QString file, QString dest ) | |||
180 | while ( (fi=it.current()) ) | 180 | while ( (fi=it.current()) ) |
181 | { | 181 | { |
182 | pvDebug(4, "process dir "+fi->absFilePath()); | ||
183 | processLinkDir( fi->absFilePath(), dest ); | 182 | processLinkDir( fi->absFilePath(), dest ); |
184 | ++it; | 183 | ++it; |
@@ -227,7 +226,7 @@ void PmIpkg::loadList( PackageList pl ) | |||
227 | void PmIpkg::commit( PackageList pl ) | 226 | void PmIpkg::commit( PackageList pl ) |
228 | { | 227 | { |
229 | sizecount = 0; | 228 | int sizecount = 0; |
230 | QString rem="<b>"+tr("To remove:")+"</b><br>\n"; | 229 | // QString rem="<b>"+tr("To remove:")+"</b><br>\n"; |
231 | QString inst="<b>"+tr("To install:")+"</b><br>\n"; | 230 | // QString inst="<b>"+tr("To install:")+"</b><br>\n"; |
232 | loadList(pl); | 231 | loadList(pl); |
233 | for (uint i=0; i < to_remove.count(); i++) | 232 | for (uint i=0; i < to_remove.count(); i++) |
@@ -235,4 +234,5 @@ void PmIpkg::commit( PackageList pl ) | |||
235 | for (uint i=0; i < to_install.count(); i++) | 234 | for (uint i=0; i < to_install.count(); i++) |
236 | sizecount += to_install.at(i)->size().toInt(); | 235 | sizecount += to_install.at(i)->size().toInt(); |
236 | runwindow->progress->setTotalSteps(sizecount); | ||
237 | startDialog(); | 237 | startDialog(); |
238 | } | 238 | } |
@@ -322,5 +322,5 @@ void PmIpkg::remove() | |||
322 | } | 322 | } |
323 | it->processed(); | 323 | it->processed(); |
324 | 324 | // to_install.take( it ); | |
325 | out("<br><hr>"); | 325 | out("<br><hr>"); |
326 | }else{ | 326 | }else{ |
@@ -351,4 +351,5 @@ void PmIpkg::install() | |||
351 | } | 351 | } |
352 | it->processed(); | 352 | it->processed(); |
353 | // to_install.take( it->name() ); | ||
353 | out("<br><hr>"); | 354 | out("<br><hr>"); |
354 | }else{ | 355 | }else{ |
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h index fa00048..3799969 100644 --- a/noncore/unsupported/oipkg/pmipkg.h +++ b/noncore/unsupported/oipkg/pmipkg.h | |||
@@ -40,5 +40,5 @@ public slots: | |||
40 | 40 | ||
41 | private: | 41 | private: |
42 | int sizecount; | 42 | //int sizecount; |
43 | PackageManagerSettings* settings; | 43 | PackageManagerSettings* settings; |
44 | RunWindow *runwindow; | 44 | RunWindow *runwindow; |
@@ -46,5 +46,5 @@ private: | |||
46 | QList<Package> to_remove; | 46 | QList<Package> to_remove; |
47 | QList<Package> to_install; | 47 | QList<Package> to_install; |
48 | bool runwindowopen; | 48 | // bool runwindowopen; |
49 | QString fileNameToInstall; | 49 | QString fileNameToInstall; |
50 | QCheckBox *_force_reinstall; | 50 | QCheckBox *_force_reinstall; |
diff --git a/noncore/unsupported/oipkg/settings.h b/noncore/unsupported/oipkg/settings.h index 3be4334..bab7a4f 100644 --- a/noncore/unsupported/oipkg/settings.h +++ b/noncore/unsupported/oipkg/settings.h | |||
@@ -22,5 +22,7 @@ public: | |||
22 | QStringList getDestinationUrls(); | 22 | QStringList getDestinationUrls(); |
23 | 23 | ||
24 | public slots: | 24 | public slots: /** No descriptions */ |
25 | void createLinks(); | ||
26 | void removeLinks(); | ||
25 | void writeInstallationSettings(); | 27 | void writeInstallationSettings(); |
26 | void readInstallationSettings(); | 28 | void readInstallationSettings(); |
@@ -62,6 +64,3 @@ private: | |||
62 | 64 | ||
63 | #endif | 65 | #endif |
64 | /** No descriptions */ | 66 | |
65 | void createLinks(); | ||
66 | /** No descriptions */ | ||
67 | void removeLinks(); | ||