author | tille <tille> | 2002-05-01 15:49:08 (UTC) |
---|---|---|
committer | tille <tille> | 2002-05-01 15:49:08 (UTC) |
commit | da94bce203afca412336a7793ff8e58e18d59108 (patch) (unidiff) | |
tree | 0bc25fd1145459656d8cc7a4897bad51f123daf9 /noncore/unsupported/oipkg | |
parent | fcc0cee7ae337e8179b8ba4d4b6c46b519129daa (diff) | |
download | opie-da94bce203afca412336a7793ff8e58e18d59108.zip opie-da94bce203afca412336a7793ff8e58e18d59108.tar.gz opie-da94bce203afca412336a7793ff8e58e18d59108.tar.bz2 |
handles different versions of the same package
-rw-r--r-- | noncore/unsupported/oipkg/main.cpp | 3 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 5 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/package.cpp | 65 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/package.h | 7 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelist.cpp | 11 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistview.cpp | 1 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 10 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.h | 1 |
8 files changed, 59 insertions, 44 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 | |||
@@ -5,2 +5,3 @@ | |||
5 | #include <qstring.h> | 5 | #include <qstring.h> |
6 | #include <qmessagebox.h> | ||
6 | int debugLevel; | 7 | int debugLevel; |
@@ -9,2 +10,3 @@ int main( int argc, char ** argv ) | |||
9 | { | 10 | { |
11 | |||
10 | debugLevel = 2; | 12 | debugLevel = 2; |
@@ -16,2 +18,3 @@ int main( int argc, char ** 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 ); |
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 | |||
@@ -65,4 +65,2 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : | |||
65 | 65 | ||
66 | //rootLocal = new QCheckListItem(listViewPackages,tr("local")); | ||
67 | //rootSearch = new QCheckListItem(listViewPackages,tr("ipkgfind")); | ||
68 | displayList(); | 66 | displayList(); |
@@ -288,4 +286,7 @@ void MainWindow::displayList() | |||
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 ) |
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 | |||
@@ -71,4 +71,4 @@ void Package::setValue( QString n, QString t ) | |||
71 | _size = t; | 71 | _size = t; |
72 | }else if ( n == "Priority") | 72 | // }else if ( n == "Priority") |
73 | { | 73 | // { |
74 | 74 | ||
@@ -77,7 +77,7 @@ void Package::setValue( QString n, QString t ) | |||
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 | ||
@@ -85,8 +85,8 @@ void Package::setValue( QString n, QString t ) | |||
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 | ||
@@ -95,14 +95,12 @@ void Package::setValue( QString n, QString t ) | |||
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 | { |
@@ -110,8 +108,9 @@ void Package::setValue( QString n, QString t ) | |||
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)); | ||
114 | } | ||
115 | } | 115 | } |
116 | }; | ||
117 | 116 | ||
@@ -119,3 +118,4 @@ QString Package::name() | |||
119 | { | 118 | { |
120 | return _name; | 119 | if (_displayName.isEmpty() ) return _name; |
120 | else return _displayName; | ||
121 | } | 121 | } |
@@ -155,2 +155,8 @@ QString Package::size() | |||
155 | 155 | ||
156 | |||
157 | QString Package::version() | ||
158 | { | ||
159 | return _version; | ||
160 | } | ||
161 | |||
156 | QString Package::sizeUnits() | 162 | QString Package::sizeUnits() |
@@ -352 +358,6 @@ void Package::instalFromFile(bool iff) | |||
352 | } | 358 | } |
359 | |||
360 | void 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 | |||
@@ -34,2 +34,3 @@ class Package //: public QObject | |||
34 | QString sizeUnits(); | 34 | QString sizeUnits(); |
35 | QString version(); | ||
35 | void setSection( QString ); | 36 | void setSection( QString ); |
@@ -49,4 +50,4 @@ class Package //: public QObject | |||
49 | void instalFromFile(bool iff=true); | 50 | void instalFromFile(bool iff=true); |
51 | void setName(QString); | ||
50 | public slots: | 52 | public slots: |
51 | // QString getPackageName(); | ||
52 | void toggleProcess(); | 53 | void toggleProcess(); |
@@ -55,3 +56,3 @@ private: | |||
55 | PackageManagerSettings *settings; | 56 | PackageManagerSettings *settings; |
56 | // QString _packageName; | 57 | QString _displayName; |
57 | QString _name; | 58 | QString _name; |
@@ -66,3 +67,5 @@ private: | |||
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; |
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 | |||
@@ -35,2 +35,3 @@ void PackageList::insertPackage( Package* pack ) | |||
35 | { | 35 | { |
36 | if (!pack) return; | ||
36 | Package* p = packageList.find( pack->name() ); | 37 | Package* p = packageList.find( pack->name() ); |
@@ -38,2 +39,4 @@ void PackageList::insertPackage( Package* pack ) | |||
38 | { | 39 | { |
40 | if ( p->version() == pack->version() ) | ||
41 | { | ||
39 | p->copyValues( pack ); | 42 | p->copyValues( pack ); |
@@ -42,6 +45,12 @@ void PackageList::insertPackage( Package* pack ) | |||
42 | }else{ | 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 | } | ||
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 ); |
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 | |||
@@ -66,3 +66,2 @@ void PackageListView::showPopup() | |||
66 | }else{ | 66 | }else{ |
67 | // popupActcat setOn( activePackage->toProcess() ); | ||
68 | } | 67 | } |
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 | |||
@@ -288,11 +288,2 @@ void PmIpkg::startDialog() | |||
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(); |
@@ -337,3 +328,2 @@ void PmIpkg::remove() | |||
337 | } | 328 | } |
338 | pvDebug(2,"delete File List"); | ||
339 | if ( it->link() )delete fileList; | 329 | if ( it->link() )delete fileList; |
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 | |||
@@ -28,3 +28,2 @@ public: | |||
28 | void update(); | 28 | void update(); |
29 | // PackageList* getPackageList(); | ||
30 | void showButtons(bool b=true); | 29 | void showButtons(bool b=true); |