summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/main.cpp7
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp51
-rw-r--r--noncore/unsupported/oipkg/mainwindow.h6
-rw-r--r--noncore/unsupported/oipkg/oipkg.pro2
-rw-r--r--noncore/unsupported/oipkg/package.cpp6
-rw-r--r--noncore/unsupported/oipkg/package.h1
-rw-r--r--noncore/unsupported/oipkg/packagelistdoclnk.cpp36
-rw-r--r--noncore/unsupported/oipkg/packagelistdoclnk.h22
-rw-r--r--noncore/unsupported/oipkg/packagelistitem.cpp8
-rw-r--r--noncore/unsupported/oipkg/packagelistitem.h1
-rw-r--r--noncore/unsupported/oipkg/packagelistremote.cpp14
-rw-r--r--noncore/unsupported/oipkg/packagelistremote.h2
-rw-r--r--noncore/unsupported/oipkg/packagelistview.cpp3
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp21
-rw-r--r--noncore/unsupported/oipkg/pmipkg.h4
-rw-r--r--noncore/unsupported/oipkg/settings.h9
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
@@ -13,8 +13,9 @@ int main( int argc, char ** argv )
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 );
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
@@ -40,4 +40,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
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);
@@ -47,5 +48,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
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();
@@ -246,5 +249,6 @@ 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
@@ -263,5 +267,9 @@ void MainWindow::updateList()
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();
@@ -275,3 +283,3 @@ void MainWindow::filterList()
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();
@@ -284,21 +292,2 @@ void MainWindow::displayList()
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}
@@ -312,3 +301,3 @@ void MainWindow::sectionChanged()
312 subsection->clear(); 301 subsection->clear();
313 packageList.setSection( section->currentText() ); 302 packageListServers.setSection( section->currentText() );
314 setSubSections(); 303 setSubSections();
@@ -327,3 +316,3 @@ void MainWindow::subSectionChanged()
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) ),
@@ -338,3 +327,3 @@ void MainWindow::setSections()
338 section->clear(); 327 section->clear();
339 section->insertStringList( packageList.getSections() ); 328 section->insertStringList( packageListServers.getSections() );
340} 329}
@@ -344,3 +333,3 @@ void MainWindow::setSubSections()
344 subsection->clear(); 333 subsection->clear();
345 subsection->insertStringList( packageList.getSubSections() ); 334 subsection->insertStringList( packageListServers.getSubSections() );
346} 335}
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
@@ -11,2 +11,3 @@
11#include "packagelistlocal.h" 11#include "packagelistlocal.h"
12#include "packagelistdoclnk.h"
12#include "pmipkg.h" 13#include "pmipkg.h"
@@ -70,7 +71,6 @@ private:
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;
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
@@ -7,2 +7,3 @@ HEADERS = mainwindow.h \
7 pmipkg.h \ 7 pmipkg.h \
8 packagelistdoclnk.h \
8 utils.h \ 9 utils.h \
@@ -17,2 +18,3 @@ SOURCES = main.cpp \
17 utils.cpp \ 18 utils.cpp \
19 packagelistdoclnk.cpp \
18 packagelistview.cpp \ 20 packagelistview.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
@@ -50,3 +50,2 @@ Package::Package( QString n, PackageManagerSettings *s )
50 parseIpkgFile( n ); 50 parseIpkgFile( n );
51 _toProcess = true;
52 _useFileName = true; 51 _useFileName = true;
@@ -368 +367,6 @@ QDict<QString>* Package::getFields()
368} 367}
368
369QString 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
@@ -52,2 +52,3 @@ class Package //: public QObject
52 QDict<QString>* getFields(); 52 QDict<QString>* getFields();
53 QString status();
53public slots: 54public slots:
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
10PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s)
11 : PackageList(s)
12{
13 PackageListDocLnk();
14}
15
16PackageListDocLnk::PackageListDocLnk()
17 : PackageList()
18{
19 doclnkset = new DocLnkSet("/mnt/nfs/ipk","application/ipkg");
20}
21
22PackageListDocLnk::~PackageListDocLnk()
23{
24}
25
26
27
28void 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
7class DocLnkSet;
8
9class PackageListDocLnk : public PackageList
10{
11public:
12 PackageListDocLnk();
13 PackageListDocLnk( PackageManagerSettings* s);
14 virtual ~PackageListDocLnk();
15public slots:
16 void update();
17private:
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
@@ -34,2 +34,3 @@ void PackageListItem::init( Package *pi, PackageManagerSettings *s)
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") );
@@ -131,5 +132,7 @@ 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 );
@@ -138,2 +141,3 @@ void PackageListItem::displayDetails()
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();
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
@@ -34,2 +34,3 @@ private:
34 QCheckListItem *linkItem; 34 QCheckListItem *linkItem;
35 QCheckListItem *statusItem;
35 PackageManagerSettings *settings; 36 PackageManagerSettings *settings;
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
@@ -24,2 +24,8 @@ void PackageListRemote::query(QString s)
24{ 24{
25 searchString = s;
26}
27
28void PackageListRemote::update()
29{
30 pvDebug(2,"PackageListRemote::update");
25 int r=0; 31 int r=0;
@@ -34,3 +40,3 @@ void PackageListRemote::query(QString s)
34 cmd += "?format=pda&searchtype=package&section="; 40 cmd += "?format=pda&searchtype=package&section=";
35 cmd += "&query="+s; 41 cmd += "&query="+searchString;
36 cmd += "\""; 42 cmd += "\"";
@@ -40,8 +46,2 @@ void PackageListRemote::query(QString s)
40 readFileEntries( redirect ); 46 readFileEntries( redirect );
41
42}
43
44void 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
@@ -16,2 +16,4 @@ public slots:
16 void update(); 16 void update();
17private:
18 QString searchString;
17}; 19};
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
@@ -130,3 +130,4 @@ void PackageListView::addList( QString n, PackageList* pl)
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
@@ -32,3 +32,2 @@ PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlag
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 );
@@ -75,3 +74,3 @@ int PmIpkg::runIpkg(const QString& args, const QString& dest )
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" );
@@ -162,5 +161,5 @@ 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;
@@ -172,2 +171,3 @@ void PmIpkg::processLinkDir( QString file, QString dest )
172 { 171 {
172 pvDebug(4, "process dir "+file);
173 QDir destDir( destFile ); 173 QDir destDir( destFile );
@@ -181,3 +181,2 @@ void PmIpkg::processLinkDir( QString file, QString dest )
181 { 181 {
182 pvDebug(4, "process dir "+fi->absFilePath());
183 processLinkDir( fi->absFilePath(), dest ); 182 processLinkDir( fi->absFilePath(), dest );
@@ -228,5 +227,5 @@ 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);
@@ -236,2 +235,3 @@ void PmIpkg::commit( PackageList pl )
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();
@@ -323,3 +323,3 @@ void PmIpkg::remove()
323 it->processed(); 323 it->processed();
324 324 // to_install.take( it );
325 out("<br><hr>"); 325 out("<br><hr>");
@@ -352,2 +352,3 @@ void PmIpkg::install()
352 it->processed(); 352 it->processed();
353 // to_install.take( it->name() );
353 out("<br><hr>"); 354 out("<br><hr>");
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
@@ -41,3 +41,3 @@ public slots:
41private: 41private:
42 int sizecount; 42 //int sizecount;
43 PackageManagerSettings* settings; 43 PackageManagerSettings* settings;
@@ -47,3 +47,3 @@ private:
47 QList<Package> to_install; 47 QList<Package> to_install;
48 bool runwindowopen; 48// bool runwindowopen;
49 QString fileNameToInstall; 49 QString fileNameToInstall;
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
@@ -23,3 +23,5 @@ public:
23 23
24public slots: 24public slots: /** No descriptions */
25 void createLinks();
26 void removeLinks();
25 void writeInstallationSettings(); 27 void writeInstallationSettings();
@@ -63,5 +65,2 @@ private:
63#endif 65#endif
64 /** No descriptions */ 66
65 void createLinks();
66 /** No descriptions */
67 void removeLinks();