author | tille <tille> | 2002-04-26 00:50:30 (UTC) |
---|---|---|
committer | tille <tille> | 2002-04-26 00:50:30 (UTC) |
commit | a111f57eedcf27623e9bff2816c83d3287272aff (patch) (unidiff) | |
tree | b43ac41ffbdc741f731cf3f91aab064ba94ab0f3 /noncore/unsupported/oipkg | |
parent | 5198d98daeaa1e8eb8568ccd3c516ab70fbed512 (diff) | |
download | opie-a111f57eedcf27623e9bff2816c83d3287272aff.zip opie-a111f57eedcf27623e9bff2816c83d3287272aff.tar.gz opie-a111f57eedcf27623e9bff2816c83d3287272aff.tar.bz2 |
added support for scipt ipkg (again;)
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 23 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.h | 4 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettings.h | 1 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 75 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.h | 11 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/settings.h | 5 |
6 files changed, 98 insertions, 21 deletions
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index 54ee115..c803ca0 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp | |||
@@ -81,25 +81,25 @@ void MainWindow::makeMenu() | |||
81 | setToolBarsMovable( false ); | 81 | setToolBarsMovable( false ); |
82 | toolBar->setHorizontalStretchable( true ); | 82 | toolBar->setHorizontalStretchable( true ); |
83 | menuBar->insertItem( tr( "Package" ), srvMenu ); | 83 | menuBar->insertItem( tr( "Package" ), srvMenu ); |
84 | menuBar->insertItem( tr( "View" ), viewMenu ); | 84 | menuBar->insertItem( tr( "View" ), viewMenu ); |
85 | menuBar->insertItem( tr( "Settings" ), cfgMenu ); | 85 | menuBar->insertItem( tr( "Settings" ), cfgMenu ); |
86 | // menuBar->insertItem( tr( "Sections" ), sectMenu ); | 86 | // menuBar->insertItem( tr( "Sections" ), sectMenu ); |
87 | 87 | ||
88 | QLabel *spacer = new QLabel( "", toolBar ); | 88 | QLabel *spacer = new QLabel( "", toolBar ); |
89 | spacer->setBackgroundColor( toolBar->backgroundColor() ); | 89 | spacer->setBackgroundColor( toolBar->backgroundColor() ); |
90 | toolBar->setStretchableWidget( spacer ); | 90 | toolBar->setStretchableWidget( spacer ); |
91 | 91 | ||
92 | 92 | ||
93 | runAction = new QAction( tr( "Commit" ), | 93 | runAction = new QAction( tr( "Apply" ), |
94 | Resource::loadPixmap( "oipkg/install" ), | 94 | Resource::loadPixmap( "oipkg/install" ), |
95 | QString::null, 0, this, 0 ); | 95 | QString::null, 0, this, 0 ); |
96 | connect( runAction, SIGNAL( activated() ), | 96 | connect( runAction, SIGNAL( activated() ), |
97 | this, SLOT( runIpkg() ) ); | 97 | this, SLOT( runIpkg() ) ); |
98 | runAction->addTo( toolBar ); | 98 | runAction->addTo( toolBar ); |
99 | runAction->addTo( srvMenu ); | 99 | runAction->addTo( srvMenu ); |
100 | 100 | ||
101 | srvMenu->insertSeparator (); | 101 | srvMenu->insertSeparator (); |
102 | 102 | ||
103 | updateAction = new QAction( tr( "Update" ), | 103 | updateAction = new QAction( tr( "Update" ), |
104 | Resource::loadIconSet( "oipkg/update" ), | 104 | Resource::loadIconSet( "oipkg/update" ), |
105 | QString::null, 0, this, 0 ); | 105 | QString::null, 0, this, 0 ); |
@@ -162,54 +162,54 @@ void MainWindow::makeMenu() | |||
162 | sectionAction->setOn( true ); | 162 | sectionAction->setOn( true ); |
163 | sectionAction->addTo( viewMenu ); | 163 | sectionAction->addTo( viewMenu ); |
164 | 164 | ||
165 | findBar = new QPEToolBar(this); | 165 | findBar = new QPEToolBar(this); |
166 | addToolBar( findBar, "Search", QMainWindow::Top, TRUE ); | 166 | addToolBar( findBar, "Search", QMainWindow::Top, TRUE ); |
167 | label = new QLabel( tr("Filter: "), findBar ); | 167 | label = new QLabel( tr("Filter: "), findBar ); |
168 | label->setBackgroundColor( findBar->backgroundColor() ); | 168 | label->setBackgroundColor( findBar->backgroundColor() ); |
169 | findBar->setHorizontalStretchable( TRUE ); | 169 | findBar->setHorizontalStretchable( TRUE ); |
170 | findEdit = new QLineEdit( findBar, "findEdit" ); | 170 | findEdit = new QLineEdit( findBar, "findEdit" ); |
171 | findBar->setStretchableWidget( findEdit ); | 171 | findBar->setStretchableWidget( findEdit ); |
172 | connect( findEdit, SIGNAL( textChanged( const QString & ) ), | 172 | connect( findEdit, SIGNAL( textChanged( const QString & ) ), |
173 | this, SLOT( displayList() ) ); | 173 | this, SLOT( displayList() ) ); |
174 | //a = new QAction( tr( "Filter" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 ); | 174 | |
175 | // connect( a, SIGNAL( activated() ), this, SLOT( filterList() ) ); | ||
176 | // a->addTo( findBar ); | ||
177 | // a->addTo( edit ); | ||
178 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | 175 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); |
179 | connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); | 176 | connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); |
180 | a->addTo( findBar ); | 177 | a->addTo( findBar ); |
181 | findAction = new QAction( tr( "Find" ), QString::null, 0, this, 0 ); | 178 | findAction = new QAction( tr( "Find" ), QString::null, 0, this, 0 ); |
182 | connect( findAction, SIGNAL( toggled(bool) ), this, SLOT( findShow(bool) ) ); | 179 | connect( findAction, SIGNAL( toggled(bool) ), this, SLOT( findShow(bool) ) ); |
183 | findAction->setToggleAction( true ); | 180 | findAction->setToggleAction( true ); |
184 | findAction->setOn( true ); | 181 | findAction->setOn( true ); |
185 | findAction->addTo( viewMenu ); | 182 | findAction->addTo( viewMenu ); |
186 | |||
187 | } | 183 | } |
188 | 184 | ||
189 | MainWindow::~MainWindow() | 185 | MainWindow::~MainWindow() |
190 | { | 186 | { |
191 | } | 187 | } |
192 | 188 | ||
193 | void MainWindow::runIpkg() | 189 | void MainWindow::runIpkg() |
194 | { | 190 | { |
195 | ipkg->commit( packageList ); | 191 | ipkg->commit( packageList ); |
196 | updateList(); //to remove | 192 | // updateList(); //to remove |
197 | } | 193 | } |
198 | 194 | ||
199 | void MainWindow::updateList() | 195 | void MainWindow::updateList() |
200 | { | 196 | { |
197 | QTimer *t = new QTimer( this ); | ||
198 | connect( t, SIGNAL(timeout()), SLOT( rotateUpdateIcon() ) ); | ||
199 | t->start( 0, false ); | ||
201 | packageList.clear(); | 200 | packageList.clear(); |
202 | ipkg->update(); | 201 | ipkg->update(); |
203 | getList(); | 202 | getList(); |
203 | t->stop(); | ||
204 | } | 204 | } |
205 | 205 | ||
206 | void MainWindow::getList() | 206 | void MainWindow::getList() |
207 | { | 207 | { |
208 | packageList.update(); | 208 | packageList.update(); |
209 | displayList(); | 209 | displayList(); |
210 | } | 210 | } |
211 | 211 | ||
212 | void MainWindow::filterList() | 212 | void MainWindow::filterList() |
213 | { | 213 | { |
214 | QString f = ""; | 214 | QString f = ""; |
215 | if ( findAction->isOn() ) f = findEdit->text(); | 215 | if ( findAction->isOn() ) f = findEdit->text(); |
@@ -337,12 +337,21 @@ void MainWindow::sectionClose() | |||
337 | void MainWindow::findShow(bool b) | 337 | void MainWindow::findShow(bool b) |
338 | { | 338 | { |
339 | if (b) findBar->show(); | 339 | if (b) findBar->show(); |
340 | else findBar->hide(); | 340 | else findBar->hide(); |
341 | findAction->setOn( b ); | 341 | findAction->setOn( b ); |
342 | } | 342 | } |
343 | 343 | ||
344 | void MainWindow::findClose() | 344 | void MainWindow::findClose() |
345 | { | 345 | { |
346 | findAction->setOn( false ); | 346 | findAction->setOn( false ); |
347 | } | 347 | } |
348 | 348 | ||
349 | void MainWindow::rotateUpdateIcon() | ||
350 | { | ||
351 | pvDebug(2, "MainWindow::rotateUpdateIcon"); | ||
352 | if ( updateIcon ) | ||
353 | updateAction->setIconSet( Resource::loadIconSet( "oipkg/update" ) ); | ||
354 | else | ||
355 | updateAction->setIconSet( Resource::loadIconSet( "oipkg/update2" ) ); | ||
356 | updateIcon = !updateIcon; | ||
357 | } | ||
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h index 0c1e474..892d5e8 100644 --- a/noncore/unsupported/oipkg/mainwindow.h +++ b/noncore/unsupported/oipkg/mainwindow.h | |||
@@ -1,17 +1,18 @@ | |||
1 | #ifndef MAINWINDOW_H | 1 | #ifndef MAINWINDOW_H |
2 | #define MAINWINDOW_H | 2 | #define MAINWINDOW_H |
3 | 3 | ||
4 | #include <qmainwindow.h> | 4 | #include <qmainwindow.h> |
5 | #include <qaction.h> | 5 | #include <qaction.h> |
6 | #include <qtimer.h> | ||
6 | #include <qpopupmenu.h> | 7 | #include <qpopupmenu.h> |
7 | 8 | ||
8 | #include "packagelist.h" | 9 | #include "packagelist.h" |
9 | #include "pmipkg.h" | 10 | #include "pmipkg.h" |
10 | #include "pksettings.h" | 11 | #include "pksettings.h" |
11 | #include "pkdesc.h" | 12 | #include "pkdesc.h" |
12 | 13 | ||
13 | class QComboBox; | 14 | class QComboBox; |
14 | class QPEToolBar; | 15 | class QPEToolBar; |
15 | class QLineEdit; | 16 | class QLineEdit; |
16 | class QListView; | 17 | class QListView; |
17 | 18 | ||
@@ -60,15 +61,18 @@ private: | |||
60 | QAction *detailsAction; | 61 | QAction *detailsAction; |
61 | QAction *updateAction; | 62 | QAction *updateAction; |
62 | QAction *findAction; | 63 | QAction *findAction; |
63 | QAction *sectionAction; | 64 | QAction *sectionAction; |
64 | QListView *listViewPackages; | 65 | QListView *listViewPackages; |
65 | QPopupMenu *contextMenu; | 66 | QPopupMenu *contextMenu; |
66 | QPEToolBar *findBar; | 67 | QPEToolBar *findBar; |
67 | QLineEdit *findEdit; | 68 | QLineEdit *findEdit; |
68 | QPEToolBar *sectionBar; | 69 | QPEToolBar *sectionBar; |
69 | QComboBox *section; | 70 | QComboBox *section; |
70 | QComboBox *subsection; | 71 | QComboBox *subsection; |
71 | QPopupMenu *popupMenu; | 72 | QPopupMenu *popupMenu; |
73 | bool updateIcon; | ||
74 | private slots: | ||
75 | void rotateUpdateIcon(); | ||
72 | }; | 76 | }; |
73 | 77 | ||
74 | #endif | 78 | #endif |
diff --git a/noncore/unsupported/oipkg/pksettings.h b/noncore/unsupported/oipkg/pksettings.h index cda352a..2982f1c 100644 --- a/noncore/unsupported/oipkg/pksettings.h +++ b/noncore/unsupported/oipkg/pksettings.h | |||
@@ -10,25 +10,24 @@ class PackageManagerSettings : private PackageManagerSettingsBase | |||
10 | // Q_OBJECT | 10 | // Q_OBJECT |
11 | public: | 11 | public: |
12 | PackageManagerSettings( QWidget* , const char* , WFlags ); | 12 | PackageManagerSettings( QWidget* , const char* , WFlags ); |
13 | ~PackageManagerSettings(); | 13 | ~PackageManagerSettings(); |
14 | 14 | ||
15 | bool showDialog( int ) ; | 15 | bool showDialog( int ) ; |
16 | QString getDestinationUrl(); | 16 | QString getDestinationUrl(); |
17 | QString getDestinationName(); | 17 | QString getDestinationName(); |
18 | QString getLinkDestinationName(); | 18 | QString getLinkDestinationName(); |
19 | bool createLinks(); | 19 | bool createLinks(); |
20 | QStringList getActiveServers(); | 20 | QStringList getActiveServers(); |
21 | QStringList getDestinationUrls(); | 21 | QStringList getDestinationUrls(); |
22 | |||
23 | private: | 22 | private: |
24 | QIntDict<QString> serverurlDic; | 23 | QIntDict<QString> serverurlDic; |
25 | QIntDict<QString> destinationurlDic; | 24 | QIntDict<QString> destinationurlDic; |
26 | int ipkg_old; | 25 | int ipkg_old; |
27 | int editedserver; | 26 | int editedserver; |
28 | int editeddestination; | 27 | int editeddestination; |
29 | int currentSetting; | 28 | int currentSetting; |
30 | int installationSettingsCount; | 29 | int installationSettingsCount; |
31 | bool changed; | 30 | bool changed; |
32 | 31 | ||
33 | bool readIpkgConfig(const QString&); | 32 | bool readIpkgConfig(const QString&); |
34 | void writeIpkgConfig(const QString&); | 33 | void writeIpkgConfig(const QString&); |
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index b23b9ea..eae73ad 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp | |||
@@ -34,24 +34,32 @@ PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlag | |||
34 | runwindow = new RunWindow( p, name, true, f ); | 34 | runwindow = new RunWindow( p, name, true, f ); |
35 | } | 35 | } |
36 | 36 | ||
37 | PmIpkg::~PmIpkg() | 37 | PmIpkg::~PmIpkg() |
38 | { | 38 | { |
39 | } | 39 | } |
40 | 40 | ||
41 | //#define PROC | 41 | //#define PROC |
42 | #define SYSTEM | 42 | #define SYSTEM |
43 | int PmIpkg::runIpkg(const QString& args) | 43 | int PmIpkg::runIpkg(const QString& args) |
44 | { | 44 | { |
45 | pvDebug(2,"PmIpkg::runIpkg "+args); | 45 | pvDebug(2,"PmIpkg::runIpkg "+args); |
46 | |||
47 | //to make script ipkg happy | ||
48 | pvDebug(2, "cd "+settings->getDestinationUrl()+"/tmp/ipkg"); | ||
49 | if (!QDir::setCurrent(settings->getDestinationUrl()+"/tmp/ipkg")) | ||
50 | { | ||
51 | QDir instDir = QDir(settings->getDestinationUrl()+"/tmp/ipkg"); | ||
52 | instDir.mkdir(settings->getDestinationUrl()+"/tmp/ipkg"); | ||
53 | } | ||
46 | #ifdef PROC | 54 | #ifdef PROC |
47 | QStringList cmd = "/usr/bin/ipkg "; | 55 | QStringList cmd = "/usr/bin/ipkg "; |
48 | #endif | 56 | #endif |
49 | #ifdef SYSTEM | 57 | #ifdef SYSTEM |
50 | QString cmd = "/usr/bin/ipkg "; | 58 | QString cmd = "/usr/bin/ipkg "; |
51 | #endif | 59 | #endif |
52 | cmd += " -dest "+settings->getDestinationName(); | 60 | cmd += " -dest "+settings->getDestinationName(); |
53 | cmd += " -force-defaults "; | 61 | cmd += " -force-defaults "; |
54 | 62 | ||
55 | out( "<hr><br>Starting to "+ args+"<br>\n"); | 63 | out( "<hr><br>Starting to "+ args+"<br>\n"); |
56 | cmd += args; | 64 | cmd += args; |
57 | out( "running:<br>\n"+cmd+"<br>\n" ); | 65 | out( "running:<br>\n"+cmd+"<br>\n" ); |
@@ -144,47 +152,64 @@ void PmIpkg::processLinkDir( QString file, QString dest ) | |||
144 | // out( "linking: "+file+" -> "+destFile ); | 152 | // out( "linking: "+file+" -> "+destFile ); |
145 | qDebug( "linking: %s -> %s", instFile, linkFile ); | 153 | qDebug( "linking: %s -> %s", instFile, linkFile ); |
146 | symlink( instFile, linkFile ); | 154 | symlink( instFile, linkFile ); |
147 | } | 155 | } |
148 | } | 156 | } |
149 | 157 | ||
150 | void PmIpkg::commit( PackageList pl ) | 158 | void PmIpkg::commit( PackageList pl ) |
151 | { | 159 | { |
152 | show( false ); | 160 | show( false ); |
153 | runwindow->outPut->setText(""); | 161 | runwindow->outPut->setText(""); |
154 | out( "<h1>"+tr("Todo")+"</h1>\n"); | 162 | out( "<h1>"+tr("Todo")+"</h1>\n"); |
155 | 163 | ||
164 | to_install.clear(); | ||
165 | to_remove.clear(); | ||
166 | int sizecount = 0; | ||
156 | QString rem="<b>To remove:</b><br>\n"; | 167 | QString rem="<b>To remove:</b><br>\n"; |
157 | QString inst="<b>To install:</b><br>\n";; | 168 | QString inst="<b>To install:</b><br>\n";; |
158 | for( Package *pack = pl.first();pack ; (pack = pl.next()) ) | 169 | for( Package *pack = pl.first();pack ; (pack = pl.next()) ) |
159 | { | 170 | { |
160 | if ( pack && (pack->name() != "") && pack) | 171 | if ( pack && (pack->name() != "") && pack) |
161 | { | 172 | { |
162 | if ( pack->toInstall() ) | 173 | if ( pack->toInstall() ) |
163 | { | 174 | { |
175 | #ifndef NEWLIST | ||
164 | to_install.append( pack->name() ); | 176 | to_install.append( pack->name() ); |
177 | #endif | ||
178 | #ifdef NEWLIST | ||
179 | to_install.append( pack ); | ||
180 | sizecount += pack->size().toInt(); | ||
181 | #endif | ||
165 | inst += pack->name()+"<br>"; | 182 | inst += pack->name()+"<br>"; |
166 | } | 183 | } |
167 | if ( pack->toRemove() ) | 184 | if ( pack->toRemove() ) |
168 | { | 185 | { |
186 | #ifndef NEWLIST | ||
169 | to_remove.append( pack->name() ); | 187 | to_remove.append( pack->name() ); |
188 | #endif | ||
189 | #ifdef NEWLIST | ||
190 | to_remove.append( pack ); | ||
191 | sizecount += 1; | ||
192 | #endif | ||
170 | rem += pack->name()+"<br>"; | 193 | rem += pack->name()+"<br>"; |
171 | } | 194 | } |
172 | } | 195 | } |
173 | } | 196 | } |
174 | 197 | ||
175 | out("<p>"+inst+"</p>"+"<p>"+rem+"</p><hl>"); | 198 | out("<p>"+inst+"</p>"+"<p>"+rem+"</p><hl>"); |
176 | 199 | ||
177 | qDebug("to remove=%i; to install=%i",to_remove.count(),to_install.count()); | 200 | qDebug("to remove=%i; to install=%i",to_remove.count(),to_install.count()); |
178 | 201 | ||
202 | runwindow->progress->setTotalSteps( sizecount ); | ||
203 | |||
179 | connect( runwindow->doItButton, SIGNAL( clicked() ), | 204 | connect( runwindow->doItButton, SIGNAL( clicked() ), |
180 | SLOT( doIt() ) ); | 205 | SLOT( doIt() ) ); |
181 | connect( runwindow->installButton, SIGNAL( clicked() ), | 206 | connect( runwindow->installButton, SIGNAL( clicked() ), |
182 | this, SLOT( install() ) ); | 207 | this, SLOT( install() ) ); |
183 | connect( runwindow->removeButton, SIGNAL( clicked() ), | 208 | connect( runwindow->removeButton, SIGNAL( clicked() ), |
184 | this, SLOT( remove() ) ); | 209 | this, SLOT( remove() ) ); |
185 | connect( runwindow->cancelButton, SIGNAL( clicked() ), | 210 | connect( runwindow->cancelButton, SIGNAL( clicked() ), |
186 | runwindow, SLOT( close() ) ); | 211 | runwindow, SLOT( close() ) ); |
187 | 212 | ||
188 | runwindow->exec(); | 213 | runwindow->exec(); |
189 | // ##### If we looked in the list of files, we could send out accurate | 214 | // ##### If we looked in the list of files, we could send out accurate |
190 | // ##### messages. But we don't bother yet, and just do an "all". | 215 | // ##### messages. But we don't bother yet, and just do an "all". |
@@ -198,53 +223,83 @@ void PmIpkg::doIt() | |||
198 | { | 223 | { |
199 | remove(); | 224 | remove(); |
200 | install(); | 225 | install(); |
201 | } | 226 | } |
202 | 227 | ||
203 | 228 | ||
204 | void PmIpkg::remove() | 229 | void PmIpkg::remove() |
205 | { | 230 | { |
206 | if ( to_remove.count() == 0 ) return; | 231 | if ( to_remove.count() == 0 ) return; |
207 | show( true ); | 232 | show( true ); |
208 | 233 | ||
209 | out("<hr><hr><b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br>"); | 234 | out("<hr><hr><b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br>"); |
210 | for (QStringList::ConstIterator it=to_remove.begin(); it!=to_remove.end(); ++it) | 235 | |
211 | { | 236 | #ifndef NEWLIST |
237 | for (QStringList::ConstIterator it=to_remove.begin(); it!=to_remove.end(); ++it) | ||
238 | { | ||
212 | if ( runIpkg("remove " + *it) == 0) | 239 | if ( runIpkg("remove " + *it) == 0) |
213 | { | 240 | { |
214 | 241 | ||
215 | }else{ | 242 | }else{ |
216 | out("<b>"+tr("Error while removing")+"</b>"+*it); | 243 | out("<b>"+tr("Error while removing")+"</b>"+*it); |
217 | } | 244 | } |
218 | } | 245 | } |
246 | #endif | ||
247 | #ifdef NEWLIST | ||
248 | for (Package *it=to_remove.first(); it != 0; it=to_remove.next() ) | ||
249 | { | ||
250 | if ( runIpkg("remove " + it->name()) == 0) | ||
251 | { | ||
252 | runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress()); | ||
253 | it->processed(); | ||
254 | runwindow->progress->setProgress( 1 ); | ||
255 | }else{ | ||
256 | out("<b>"+tr("Error while removing")+"</b>"+it->name()); | ||
257 | } | ||
258 | } | ||
259 | #endif | ||
219 | } | 260 | } |
220 | 261 | ||
221 | 262 | ||
222 | void PmIpkg::install() | 263 | void PmIpkg::install() |
223 | { | 264 | { |
224 | if ( to_install.count() == 0 ) return; | 265 | if ( to_install.count() == 0 ) return; |
225 | show( true ); | 266 | show( true ); |
226 | out("<hr><hr><b>"+tr("Installing")+"<br>"+tr("please wait")+"<b><br>"); | 267 | out("<hr><hr><b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>"); |
227 | if ( to_install.count() ) | 268 | #ifndef NEWLIST |
228 | for (QStringList::ConstIterator it=to_install.begin(); it!=to_install.end(); ++it) | 269 | for (QStringList::ConstIterator it=to_install.begin(); it!=to_install.end(); ++it) |
229 | { | 270 | { |
230 | if ( runIpkg("install " + *it) == 0 ) | 271 | if ( runIpkg("install " + *it) == 0 ) |
231 | { | 272 | { |
232 | if ( settings->createLinks() ) | 273 | if ( settings->createLinks() ) |
233 | makeLinks( *it ); | 274 | makeLinks( *it ); |
234 | }else{ | 275 | }else{ |
235 | out("<b>"+tr("Error while installing")+"</b>"+*it); | 276 | out("<b>"+tr("Error while installing")+"</b>"+*it); |
236 | } | 277 | } |
237 | } | 278 | } |
238 | 279 | #endif | |
280 | #ifdef NEWLIST | ||
281 | for (Package *it=to_install.first(); it != 0; it=to_install.next() ) | ||
282 | { | ||
283 | if ( runIpkg("install " + it->name()) == 0 ) | ||
284 | { | ||
285 | runwindow->progress->setProgress( it->size().toInt() + runwindow->progress->progress()); | ||
286 | if ( settings->createLinks() ) | ||
287 | makeLinks( it->name() ); | ||
288 | it->processed(); | ||
289 | }else{ | ||
290 | out("<b>"+tr("Error while installing")+"</b>"+it->name()); | ||
291 | } | ||
292 | } | ||
293 | #endif | ||
239 | } | 294 | } |
240 | 295 | ||
241 | void PmIpkg::linkDestination( const QString msg, const QByteArray dest ) | 296 | void PmIpkg::linkDestination( const QString msg, const QByteArray dest ) |
242 | // add 3rd package parameter | 297 | // add 3rd package parameter |
243 | { | 298 | { |
244 | qDebug("msg="+msg+" -- "+QString(dest) ); | 299 | qDebug("msg="+msg+" -- "+QString(dest) ); |
245 | // QDir d( src ); | 300 | // QDir d( src ); |
246 | // d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); | 301 | // d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); |
247 | //// if (! d.exists() ) return; | 302 | //// if (! d.exists() ) return; |
248 | // const QFileInfoList *list = d.entryInfoList(); | 303 | // const QFileInfoList *list = d.entryInfoList(); |
249 | // QFileInfoListIterator it( *list ); | 304 | // QFileInfoListIterator it( *list ); |
250 | // QFileInfo *fi; | 305 | // QFileInfo *fi; |
@@ -281,17 +336,17 @@ void PmIpkg::showButtons(bool b) | |||
281 | runwindow->doItButton->show(); | 336 | runwindow->doItButton->show(); |
282 | runwindow->removeButton->show(); | 337 | runwindow->removeButton->show(); |
283 | runwindow->installButton->show(); | 338 | runwindow->installButton->show(); |
284 | 339 | ||
285 | } | 340 | } |
286 | } | 341 | } |
287 | 342 | ||
288 | void PmIpkg::show(bool b) | 343 | void PmIpkg::show(bool b) |
289 | { | 344 | { |
290 | if (!runwindow->isVisible()) | 345 | if (!runwindow->isVisible()) |
291 | runwindow->showMaximized(); | 346 | runwindow->showMaximized(); |
292 | showButtons(b); | 347 | showButtons(b); |
293 | if ( b ) | 348 | //if ( b ) |
294 | runwindow->progress->show(); | 349 | runwindow->progress->hide(); |
295 | else | 350 | // else |
296 | runwindow->progress->show(); | 351 | // runwindow->progress->show(); |
297 | } | 352 | } |
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h index 8718f49..2692017 100644 --- a/noncore/unsupported/oipkg/pmipkg.h +++ b/noncore/unsupported/oipkg/pmipkg.h | |||
@@ -1,44 +1,51 @@ | |||
1 | #ifndef PMIPKG_H | 1 | #ifndef PMIPKG_H |
2 | #define PMIPKG_H | 2 | #define PMIPKG_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <qobject.h> | 5 | #include <qobject.h> |
6 | #include <qlist.h> | ||
6 | #include <qstring.h> | 7 | #include <qstring.h> |
7 | #include <qwidget.h> | 8 | #include <qwidget.h> |
8 | #include "pksettings.h" | 9 | #include "pksettings.h" |
9 | #include "runwindow.h" | 10 | #include "runwindow.h" |
10 | #include "packagelist.h" | 11 | #include "packagelist.h" |
11 | #include "debug.h" | 12 | #include "debug.h" |
12 | 13 | ||
13 | 14 | //#define NEWLIST | |
14 | 15 | class Package; | |
15 | class PmIpkg : public QObject | 16 | class PmIpkg : public QObject |
16 | { | 17 | { |
17 | Q_OBJECT | 18 | Q_OBJECT |
18 | public: | 19 | public: |
19 | PmIpkg( PackageManagerSettings* , QWidget* p=0, const char * name=0, WFlags f=0 ); | 20 | PmIpkg( PackageManagerSettings* , QWidget* p=0, const char * name=0, WFlags f=0 ); |
20 | ~PmIpkg(); | 21 | ~PmIpkg(); |
21 | 22 | ||
22 | void commit( PackageList ); | 23 | void commit( PackageList ); |
23 | void update(); | 24 | void update(); |
24 | PackageList* getPackageList(); | 25 | PackageList* getPackageList(); |
25 | void showButtons(bool b=true); | 26 | void showButtons(bool b=true); |
26 | void show( bool buttons=true ); | 27 | void show( bool buttons=true ); |
27 | 28 | ||
28 | private: | 29 | private: |
29 | PackageManagerSettings* settings; | 30 | PackageManagerSettings* settings; |
30 | RunWindow *runwindow; | 31 | RunWindow *runwindow; |
32 | #ifndef NEWLIST | ||
31 | QStringList to_remove; | 33 | QStringList to_remove; |
32 | QStringList to_install; | 34 | QStringList to_install; |
35 | #endif | ||
36 | #ifdef NEWLIST | ||
37 | QList<Package> to_remove; | ||
38 | QList<Package> to_install; | ||
39 | #endif | ||
33 | bool runwindowopen; | 40 | bool runwindowopen; |
34 | 41 | ||
35 | void makeLinks(QString); | 42 | void makeLinks(QString); |
36 | void processLinkDir( QString, QString ); | 43 | void processLinkDir( QString, QString ); |
37 | 44 | ||
38 | int runIpkg(const QString& args); | 45 | int runIpkg(const QString& args); |
39 | void out( QString ); | 46 | void out( QString ); |
40 | 47 | ||
41 | public slots: | 48 | public slots: |
42 | void doIt(); | 49 | void doIt(); |
43 | void install(); | 50 | void install(); |
44 | void remove(); | 51 | void remove(); |
diff --git a/noncore/unsupported/oipkg/settings.h b/noncore/unsupported/oipkg/settings.h index d4b1072..5df522b 100644 --- a/noncore/unsupported/oipkg/settings.h +++ b/noncore/unsupported/oipkg/settings.h | |||
@@ -1,33 +1,36 @@ | |||
1 | #ifndef PACKAGEMANAGERSETTINGS_H | 1 | #ifndef PACKAGEMANAGERSETTINGS_H |
2 | #define PACKAGEMANAGERSETTINGS_H | 2 | #define PACKAGEMANAGERSETTINGS_H |
3 | 3 | ||
4 | #include "pksettingsbase.h" | 4 | #include "pksettingsbase.h" |
5 | #include <qintdict.h> | 5 | #include <qintdict.h> |
6 | 6 | ||
7 | 7 | ||
8 | class PackageManagerSettings : private PackageManagerSettingsBase | 8 | class PackageManagerSettings : public PackageManagerSettingsBase |
9 | //class PackageManagerSettings : private PackageManagerSettingsBase | ||
9 | { | 10 | { |
10 | // Q_OBJECT | 11 | // Q_OBJECT |
11 | public: | 12 | public: |
12 | PackageManagerSettings( QWidget* , const char* , WFlags ); | 13 | PackageManagerSettings( QWidget* , const char* , WFlags ); |
13 | ~PackageManagerSettings(); | 14 | ~PackageManagerSettings(); |
14 | 15 | ||
15 | bool showDialog( int ) ; | 16 | bool showDialog( int ) ; |
16 | QString getDestinationUrl(); | 17 | QString getDestinationUrl(); |
17 | QString getDestinationName(); | 18 | QString getDestinationName(); |
18 | QString getLinkDestinationName(); | 19 | QString getLinkDestinationName(); |
19 | bool createLinks(); | 20 | bool createLinks(); |
20 | QStringList getActiveServers(); | 21 | QStringList getActiveServers(); |
21 | QStringList getDestinationUrls(); | 22 | QStringList getDestinationUrls(); |
23 | /** No descriptions */ | ||
24 | QComboBox getActiveDestinationCombo(); | ||
22 | 25 | ||
23 | private: | 26 | private: |
24 | QIntDict<QString> serverurlDic; | 27 | QIntDict<QString> serverurlDic; |
25 | QIntDict<QString> destinationurlDic; | 28 | QIntDict<QString> destinationurlDic; |
26 | int ipkg_old; | 29 | int ipkg_old; |
27 | int editedserver; | 30 | int editedserver; |
28 | int editeddestination; | 31 | int editeddestination; |
29 | int currentSetting; | 32 | int currentSetting; |
30 | int installationSettingsCount; | 33 | int installationSettingsCount; |
31 | bool changed; | 34 | bool changed; |
32 | 35 | ||
33 | bool readIpkgConfig(const QString&); | 36 | bool readIpkgConfig(const QString&); |