summaryrefslogtreecommitdiff
authortille <tille>2002-05-01 15:49:08 (UTC)
committer tille <tille>2002-05-01 15:49:08 (UTC)
commitda94bce203afca412336a7793ff8e58e18d59108 (patch) (unidiff)
tree0bc25fd1145459656d8cc7a4897bad51f123daf9
parentfcc0cee7ae337e8179b8ba4d4b6c46b519129daa (diff)
downloadopie-da94bce203afca412336a7793ff8e58e18d59108.zip
opie-da94bce203afca412336a7793ff8e58e18d59108.tar.gz
opie-da94bce203afca412336a7793ff8e58e18d59108.tar.bz2
handles different versions of the same package
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/main.cpp3
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp5
-rw-r--r--noncore/unsupported/oipkg/package.cpp65
-rw-r--r--noncore/unsupported/oipkg/package.h7
-rw-r--r--noncore/unsupported/oipkg/packagelist.cpp17
-rw-r--r--noncore/unsupported/oipkg/packagelistview.cpp1
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp10
-rw-r--r--noncore/unsupported/oipkg/pmipkg.h1
8 files changed, 62 insertions, 47 deletions
diff --git a/noncore/unsupported/oipkg/main.cpp b/noncore/unsupported/oipkg/main.cpp
index 4af59b0..5cef2dc 100644
--- a/noncore/unsupported/oipkg/main.cpp
+++ b/noncore/unsupported/oipkg/main.cpp
@@ -3,10 +3,12 @@
3 3
4#include <qpe/qpeapplication.h> 4#include <qpe/qpeapplication.h>
5#include <qstring.h> 5#include <qstring.h>
6#include <qmessagebox.h>
6int debugLevel; 7int debugLevel;
7 8
8int main( int argc, char ** argv ) 9int main( int argc, char ** argv )
9{ 10{
11
10 debugLevel = 2; 12 debugLevel = 2;
11 if (argc > 0) 13 if (argc > 0)
12 { 14 {
@@ -14,6 +16,7 @@ int main( int argc, char ** argv )
14 } 16 }
15 QPEApplication a( argc, argv ); 17 QPEApplication a( argc, argv );
16 MainWindow mw; 18 MainWindow mw;
19 QMessageBox::information( &mw, "oipkg","While ipkg is working\noipkg is hanging.\nPlease be patient!");
17 a.showMainDocumentWidget( &mw ); 20 a.showMainDocumentWidget( &mw );
18 return a.exec(); 21 return a.exec();
19} 22}
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 06828e0..4865c39 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -63,8 +63,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
63 connect( settings->createLinksButton, SIGNAL( clicked()), 63 connect( settings->createLinksButton, SIGNAL( clicked()),
64 SLOT(createLinks()) ); 64 SLOT(createLinks()) );
65 65
66 //rootLocal = new QCheckListItem(listViewPackages,tr("local"));
67 //rootSearch = new QCheckListItem(listViewPackages,tr("ipkgfind"));
68 displayList(); 66 displayList();
69} 67}
70 68
@@ -286,8 +284,11 @@ void MainWindow::displayList()
286 Package *pack = packageList.first(); 284 Package *pack = packageList.first();
287 PackageListItem *item; 285 PackageListItem *item;
288 286
287// if (!rootLocal)
288// {
289 QCheckListItem *rootLocal = new QCheckListItem(listViewPackages,tr("local")); 289 QCheckListItem *rootLocal = new QCheckListItem(listViewPackages,tr("local"));
290 QCheckListItem *rootSearch = new QCheckListItem(listViewPackages,tr("ipkgfind")); 290 QCheckListItem *rootSearch = new QCheckListItem(listViewPackages,tr("ipkgfind"));
291// }
291 while( pack ) 292 while( pack )
292 { 293 {
293 item = new PackageListItem( rootLocal, pack, settings ); 294 item = new PackageListItem( rootLocal, pack, settings );
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 6bb53a9..0787ece 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -69,55 +69,55 @@ void Package::setValue( QString n, QString t )
69 }else if ( n == "Installed-Size" ) 69 }else if ( n == "Installed-Size" )
70 { 70 {
71 _size = t; 71 _size = t;
72 }else if ( n == "Priority") 72// }else if ( n == "Priority")
73 { 73// {
74 74
75 }else if ( n == "Section") 75 }else if ( n == "Section")
76 { 76 {
77 setSection( t ); 77 setSection( t );
78 }else if ( n == "Maintainer") 78// }else if ( n == "Maintainer")
79 { 79// {
80 80//
81 }else if ( n == "Architecture") 81// }else if ( n == "Architecture")
82 { 82// {
83 83
84 }else if ( n == "Version") 84 }else if ( n == "Version")
85 { 85 {
86 86 _version = t;
87 }else if ( n == "Pre-Depends") 87// }else if ( n == "Pre-Depends")
88 { 88// {
89 89//
90 }else if ( n == "Depends") 90// }else if ( n == "Depends")
91 { 91// {
92 92
93 }else if ( n == "Filename") 93 }else if ( n == "Filename")
94 { 94 {
95 _fileName = t; 95 _fileName = t;
96 }else if ( n == "Size") 96// }else if ( n == "Size")
97 { 97 // {
98 98 //
99 }else if ( n == "MD5Sum") 99 //}else if ( n == "MD5Sum")
100 { 100 //{
101 101
102 } 102 }else if ( n == "Description")
103 if ( n == "Description")
104 { 103 {
105 setDesc( t ); 104 setDesc( t );
106 } 105 }else if ( n == "Status")
107 if ( n == "Status")
108 { 106 {
109 if ( installed() ) return; 107 if ( installed() ) return;
110 _status = t; 108 _status = t;
111 } 109// }else if ( n == "Essential")
112 if ( t == "Essential") 110// {
113 {
114 111
112 }else{
113 _values.insert(n,new QString(t));
115 } 114 }
116}; 115}
117 116
118QString Package::name() 117QString Package::name()
119{ 118{
120 return _name; 119 if (_displayName.isEmpty() ) return _name;
120 else return _displayName;
121} 121}
122 122
123 123
@@ -153,6 +153,12 @@ QString Package::size()
153 return _size; 153 return _size;
154} 154}
155 155
156
157QString Package::version()
158{
159 return _version;
160}
161
156QString Package::sizeUnits() 162QString Package::sizeUnits()
157{ 163{
158 int i = _size.toInt(); 164 int i = _size.toInt();
@@ -350,3 +356,8 @@ void Package::instalFromFile(bool iff)
350{ 356{
351 _useFileName = iff; 357 _useFileName = iff;
352} 358}
359
360void Package::setName(QString n)
361{
362 _displayName = n;
363}
diff --git a/noncore/unsupported/oipkg/package.h b/noncore/unsupported/oipkg/package.h
index 4618c3a..2ca966d 100644
--- a/noncore/unsupported/oipkg/package.h
+++ b/noncore/unsupported/oipkg/package.h
@@ -32,6 +32,7 @@ class Package //: public QObject
32 QString desc(); 32 QString desc();
33 QString size(); 33 QString size();
34 QString sizeUnits(); 34 QString sizeUnits();
35 QString version();
35 void setSection( QString ); 36 void setSection( QString );
36 QString section(); 37 QString section();
37 QString subSection(); 38 QString subSection();
@@ -47,13 +48,13 @@ class Package //: public QObject
47 void setLink(bool); 48 void setLink(bool);
48 void parseIpkgFile( QString ); 49 void parseIpkgFile( QString );
49 void instalFromFile(bool iff=true); 50 void instalFromFile(bool iff=true);
51 void setName(QString);
50public slots: 52public slots:
51// QString getPackageName();
52 void toggleProcess(); 53 void toggleProcess();
53 54
54private: 55private:
55 PackageManagerSettings *settings; 56 PackageManagerSettings *settings;
56// QString _packageName; 57 QString _displayName;
57 QString _name; 58 QString _name;
58 QString _fileName; 59 QString _fileName;
59 bool _toProcess; 60 bool _toProcess;
@@ -64,7 +65,9 @@ private:
64 QString _subsection; 65 QString _subsection;
65 QString _shortDesc; 66 QString _shortDesc;
66 QString _desc; 67 QString _desc;
68 QString _version;
67 QString _dest; 69 QString _dest;
70 QDict<QString> _values;
68 bool _useFileName; 71 bool _useFileName;
69 void parsePackage( QStringList ); 72 void parsePackage( QStringList );
70 void init(PackageManagerSettings *); 73 void init(PackageManagerSettings *);
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index b892b30..be20c71 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -33,17 +33,26 @@ PackageList::~PackageList()
33/** Inserts a package into the list */ 33/** Inserts a package into the list */
34void PackageList::insertPackage( Package* pack ) 34void PackageList::insertPackage( Package* pack )
35{ 35{
36 if (!pack) return;
36 Package* p = packageList.find( pack->name() ); 37 Package* p = packageList.find( pack->name() );
37 if ( p ) 38 if ( p )
38 { 39 {
39 p->copyValues( pack ); 40 if ( p->version() == pack->version() )
40 delete pack; 41 {
41 pack = p; 42 p->copyValues( pack );
43 delete pack;
44 pack = p;
45 } else {
46 p->setName( pack->name()+"["+p->version()+"]" );
47 pack->setName( pack->name()+"["+pack->version()+"]" );
48 packageList.insert( pack->name(), pack );
49 origPackageList.insert( pack->name(), pack );
50 }
42 }else{ 51 }else{
43 packageList.insert( pack->name(), pack ); 52 packageList.insert( pack->name(), pack );
44 origPackageList.insert( pack->name(), pack ); 53 origPackageList.insert( pack->name(), pack );
45 empty=false;
46 }; 54 };
55 empty=false;
47 updateSections( pack ); 56 updateSections( pack );
48} 57}
49 58
diff --git a/noncore/unsupported/oipkg/packagelistview.cpp b/noncore/unsupported/oipkg/packagelistview.cpp
index 610a0e1..36d081b 100644
--- a/noncore/unsupported/oipkg/packagelistview.cpp
+++ b/noncore/unsupported/oipkg/packagelistview.cpp
@@ -64,7 +64,6 @@ void PackageListView::showPopup()
64 connect( destsMenu, SIGNAL( activated( int ) ), 64 connect( destsMenu, SIGNAL( activated( int ) ),
65 this, SLOT( changePackageDest( int ) ) ); 65 this, SLOT( changePackageDest( int ) ) );
66 }else{ 66 }else{
67 // popupActcat setOn( activePackage->toProcess() );
68 } 67 }
69 popupMenu->popup( QCursor::pos() ); 68 popupMenu->popup( QCursor::pos() );
70} 69}
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index fe200f5..1798c80 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -286,15 +286,6 @@ void PmIpkg::startDialog()
286 _force_remove->setAutoResize( TRUE ); 286 _force_remove->setAutoResize( TRUE );
287 GroupBox1Layout->addWidget( _force_remove, 1, 0 ); 287 GroupBox1Layout->addWidget( _force_remove, 1, 0 );
288 RunWindowLayout->addWidget( GroupBox1 , 3, 0 ); 288 RunWindowLayout->addWidget( GroupBox1 , 3, 0 );
289
290// connect( doItButton, SIGNAL( clicked() ),
291 // this, SLOT( doIt() ) );
292// connect( installButton, SIGNAL( clicked() ),
293 // this, SLOT( install() ) );
294// connect( removeButton, SIGNAL( clicked() ),
295 // this, SLOT( remove() ) );
296// connect( cancelButton, SIGNAL( clicked() ),
297 // installDialog, SLOT( close() ) );
298 installDialog->showMaximized(); 289 installDialog->showMaximized();
299 if ( installDialog->exec() ) doIt(); 290 if ( installDialog->exec() ) doIt();
300 installDialog->close(); 291 installDialog->close();
@@ -335,7 +326,6 @@ void PmIpkg::remove()
335 }else{ 326 }else{
336 out("<b>"+tr("Error while removing")+"</b><hr>"+it->name()); 327 out("<b>"+tr("Error while removing")+"</b><hr>"+it->name());
337 } 328 }
338 pvDebug(2,"delete File List");
339 if ( it->link() )delete fileList; 329 if ( it->link() )delete fileList;
340 } 330 }
341 out("<br>"); 331 out("<br>");
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index 2b89023..fa00048 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -26,7 +26,6 @@ public:
26 void loadList( PackageList ); 26 void loadList( PackageList );
27 void commit( PackageList ); 27 void commit( PackageList );
28 void update(); 28 void update();
29 // PackageList* getPackageList();
30 void showButtons(bool b=true); 29 void showButtons(bool b=true);
31 void show( bool buttons=true ); 30 void show( bool buttons=true );
32 31