summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/installdialog.cpp3
-rw-r--r--noncore/unsupported/oipkg/installdialog.h5
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp52
-rw-r--r--noncore/unsupported/oipkg/pmipkg.h2
4 files changed, 34 insertions, 28 deletions
diff --git a/noncore/unsupported/oipkg/installdialog.cpp b/noncore/unsupported/oipkg/installdialog.cpp
index 72f436a..a2c9702 100644
--- a/noncore/unsupported/oipkg/installdialog.cpp
+++ b/noncore/unsupported/oipkg/installdialog.cpp
@@ -73,2 +73,5 @@ InstallDialog::InstallDialog( PackageManagerSettings* s, QWidget* parent, const
73 InstallDialogLayout->addWidget( GroupBoxOptions, 1, 0 ); 73 InstallDialogLayout->addWidget( GroupBoxOptions, 1, 0 );
74 toRemoveItem = new QCheckListItem( ListViewPackages, QObject::tr("To remove") );
75 toInstallItem = new QCheckListItem( ListViewPackages, QObject::tr("To install") );
76
74} 77}
diff --git a/noncore/unsupported/oipkg/installdialog.h b/noncore/unsupported/oipkg/installdialog.h
index f2164ac..5af2c35 100644
--- a/noncore/unsupported/oipkg/installdialog.h
+++ b/noncore/unsupported/oipkg/installdialog.h
@@ -27,4 +27,3 @@ class InstallDialog : public QDialog
27 27
28public: 28public: InstallDialog( PackageManagerSettings* s, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
29 InstallDialog( PackageManagerSettings* s, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
30 ~InstallDialog(); 29 ~InstallDialog();
@@ -36,2 +35,4 @@ public:
36 QCheckBox* _force_remove; 35 QCheckBox* _force_remove;
36 QCheckListItem *toRemoveItem;
37 QCheckListItem *toInstallItem;
37 38
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 75f93cf..f2852c3 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -216,7 +216,5 @@ void PmIpkg::commit()
216 int sizecount = 0; 216 int sizecount = 0;
217 installDialog = new InstallDialog(settings,0,0,true); 217 installDialog = new InstallDialog(settings,0,0,true);
218 QCheckListItem *toRemoveItem = new QCheckListItem( installDialog->ListViewPackages, QObject::tr("To remove") ); 218 installDialog->toRemoveItem->setOpen( true );
219 QCheckListItem *toInstallItem = new QCheckListItem( installDialog->ListViewPackages, QObject::tr("To install") ); 219 installDialog->toInstallItem->setOpen( true );
220 toRemoveItem->setOpen( true );
221 toInstallItem->setOpen( true );
222 for (uint i=0; i < to_remove.count(); i++) 220 for (uint i=0; i < to_remove.count(); i++)
@@ -224,3 +222,3 @@ void PmIpkg::commit()
224 sizecount += 1; 222 sizecount += 1;
225 toRemoveItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_remove.at(i),settings) ); 223 installDialog->toRemoveItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_remove.at(i),settings) );
226 } 224 }
@@ -229,3 +227,3 @@ void PmIpkg::commit()
229 sizecount += to_install.at(i)->size().toInt(); 227 sizecount += to_install.at(i)->size().toInt();
230 toInstallItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_install.at(i),settings) ); 228 installDialog->toInstallItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_install.at(i),settings) );
231 } 229 }
@@ -235,6 +233,9 @@ void PmIpkg::commit()
235 installDialog->show(); 233 installDialog->show();
236 if ( installDialog->exec() ) doIt(); 234 if ( installDialog->exec() )
235 {
236 doIt();
237 runwindow->showMaximized();
238 runwindow->show();
239 }
237 installDialog->close(); 240 installDialog->close();
238 runwindow->showMaximized();
239 runwindow->show();
240 out(tr("\nAll done.")); 241 out(tr("\nAll done."));
@@ -261,3 +262,3 @@ void PmIpkg::remove()
261 if ( to_remove.at(i)->link() )fileList = getList( to_remove.at(i)->name(), to_remove.at(i)->dest() ); 262 if ( to_remove.at(i)->link() )fileList = getList( to_remove.at(i)->name(), to_remove.at(i)->dest() );
262 if ( runIpkg("remove " + to_remove.at(i)->name(), to_remove.at(i)->dest() )) 263 if ( runIpkg("remove " + to_remove.at(i)->installName(), to_remove.at(i)->dest() ))
263 { 264 {
@@ -265,10 +266,5 @@ void PmIpkg::remove()
265 linkOpp = removeLink; 266 linkOpp = removeLink;
266 if ( to_remove.at(i)->link() )
267 {
268 out( "\nremoving links\n" );
269 out( "for package "+to_remove.at(i)->name()+" in "+to_remove.at(i)->dest()+"\n" );
270 processFileList( fileList, to_remove.at(i)->dest() );
271 }
272 to_remove.at(i)->processed(); 267 to_remove.at(i)->processed();
273 to_remove.take( i ); 268 to_remove.take( i );
269
274 out("\n\n"); 270 out("\n\n");
@@ -277,2 +273,8 @@ void PmIpkg::remove()
277 } 273 }
274 if ( to_remove.at(i)->link() )
275 {
276 out( "\nremoving links\n" );
277 out( "for package "+to_remove.at(i)->name()+" in "+to_remove.at(i)->dest()+"\n" );
278 processFileList( fileList, to_remove.at(i)->dest() );
279 }
278 if ( to_remove.at(i)->link() )delete fileList; 280 if ( to_remove.at(i)->link() )delete fileList;
@@ -293,9 +295,2 @@ void PmIpkg::install()
293 runwindow->progress->setProgress( to_install.at(i)->size().toInt() + runwindow->progress->progress()); 295 runwindow->progress->setProgress( to_install.at(i)->size().toInt() + runwindow->progress->progress());
294 linkOpp = createLink;
295 if ( to_install.at(i)->link() )
296 {
297 out( "\ncreating links\n" );
298 out( "for package "+to_install.at(i)->name()+" in "+to_install.at(i)->dest()+"\n" );
299 makeLinks( to_install.at(i) );
300 }
301 to_install.at(i)->processed(); 296 to_install.at(i)->processed();
@@ -306,2 +301,9 @@ void PmIpkg::install()
306 } 301 }
302 linkOpp = createLink;
303 if ( to_install.at(i)->link() )
304 {
305 out( "\ncreating links\n" );
306 out( "for package "+to_install.at(i)->name()+" in "+to_install.at(i)->dest()+"\n" );
307 makeLinks( to_install.at(i) );
308 }
307 } 309 }
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index f8ac39a..c543304 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -50,3 +50,3 @@ private:
50 QCheckBox *_force_depends; 50 QCheckBox *_force_depends;
51 void startDialog(); 51// void startDialog();
52 void makeLinks(Package*); 52 void makeLinks(Package*);