-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 65 |
1 files changed, 61 insertions, 4 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index 06e2a03..0bc01df 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp | |||
@@ -33,4 +33,5 @@ using namespace std; | |||
33 | #include <qlabel.h> | 33 | #include <qlabel.h> |
34 | #include <qfile.h> | 34 | #include <qfile.h> |
35 | #include <qmessagebox.h> | ||
35 | 36 | ||
36 | #include "datamgr.h" | 37 | #include "datamgr.h" |
@@ -98,4 +99,5 @@ void NetworkPackageManager :: initGui() | |||
98 | update = new QPushButton( "Refresh List", this ); | 99 | update = new QPushButton( "Refresh List", this ); |
99 | download = new QPushButton( "Download", this ); | 100 | download = new QPushButton( "Download", this ); |
101 | upgrade = new QPushButton( "Upgrade", this ); | ||
100 | apply = new QPushButton( "Apply", this ); | 102 | apply = new QPushButton( "Apply", this ); |
101 | 103 | ||
@@ -111,4 +113,5 @@ void NetworkPackageManager :: initGui() | |||
111 | hbox2->addWidget( update ); | 113 | hbox2->addWidget( update ); |
112 | hbox2->addWidget( download ); | 114 | hbox2->addWidget( download ); |
115 | hbox2->addWidget( upgrade ); | ||
113 | hbox2->addWidget( apply ); | 116 | hbox2->addWidget( apply ); |
114 | } | 117 | } |
@@ -119,12 +122,13 @@ void NetworkPackageManager :: setupConnections() | |||
119 | connect( apply, SIGNAL(released()), this, SLOT(applyChanges()) ); | 122 | connect( apply, SIGNAL(released()), this, SLOT(applyChanges()) ); |
120 | connect( download, SIGNAL(released()), this, SLOT(downloadPackage()) ); | 123 | connect( download, SIGNAL(released()), this, SLOT(downloadPackage()) ); |
124 | connect( upgrade, SIGNAL( released()), this, SLOT(upgradePackages()) ); | ||
121 | connect( update, SIGNAL(released()), this, SLOT(updateServer()) ); | 125 | connect( update, SIGNAL(released()), this, SLOT(updateServer()) ); |
122 | } | 126 | } |
123 | 127 | ||
124 | void NetworkPackageManager :: showProgressDialog() | 128 | void NetworkPackageManager :: showProgressDialog( char *initialText ) |
125 | { | 129 | { |
126 | if ( !progressDlg ) | 130 | if ( !progressDlg ) |
127 | progressDlg = new ProgressDlg( this, "Progress", false ); | 131 | progressDlg = new ProgressDlg( this, "Progress", false ); |
128 | progressDlg->setText( "Reading installed packages" ); | 132 | progressDlg->setText( initialText ); |
129 | progressDlg->show(); | 133 | progressDlg->show(); |
130 | } | 134 | } |
@@ -176,14 +180,22 @@ void NetworkPackageManager :: serverSelected( int ) | |||
176 | 180 | ||
177 | // If the local server or the local ipkgs server disable the download button | 181 | // If the local server or the local ipkgs server disable the download button |
178 | download->setText( "Download" ); | ||
179 | if ( serverName == LOCAL_SERVER ) | 182 | if ( serverName == LOCAL_SERVER ) |
183 | { | ||
184 | upgrade->setEnabled( false ); | ||
185 | download->setText( "Download" ); | ||
180 | download->setEnabled( false ); | 186 | download->setEnabled( false ); |
187 | } | ||
181 | else if ( serverName == LOCAL_IPKGS ) | 188 | else if ( serverName == LOCAL_IPKGS ) |
182 | { | 189 | { |
190 | upgrade->setEnabled( false ); | ||
183 | download->setEnabled( true ); | 191 | download->setEnabled( true ); |
184 | download->setText( "Remove" ); | 192 | download->setText( "Remove" ); |
185 | } | 193 | } |
186 | else | 194 | else |
195 | { | ||
196 | upgrade->setEnabled( true ); | ||
187 | download->setEnabled( true ); | 197 | download->setEnabled( true ); |
198 | download->setText( "Download" ); | ||
199 | } | ||
188 | } | 200 | } |
189 | 201 | ||
@@ -226,4 +238,32 @@ void NetworkPackageManager :: updateServer() | |||
226 | } | 238 | } |
227 | 239 | ||
240 | void NetworkPackageManager :: upgradePackages() | ||
241 | { | ||
242 | // We're gonna do an upgrade of all packages | ||
243 | // First warn user that this isn't recommended | ||
244 | QString text = "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n"; | ||
245 | QMessageBox warn("Warning", text, QMessageBox::Warning, | ||
246 | QMessageBox::Yes, | ||
247 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default , | ||
248 | 0, this ); | ||
249 | warn.adjustSize(); | ||
250 | |||
251 | if ( warn.exec() == QMessageBox::Yes ) | ||
252 | { | ||
253 | // First, write out ipkg_conf file so that ipkg can use it | ||
254 | dataMgr->writeOutIpkgConf(); | ||
255 | |||
256 | // Now run upgrade | ||
257 | InstallDlgImpl dlg( this, "Upgrade", true ); | ||
258 | dlg.showDlg(); | ||
259 | |||
260 | // Reload data | ||
261 | dataMgr->reloadServerData( LOCAL_SERVER ); | ||
262 | |||
263 | dataMgr->reloadServerData( serversList->currentText() ); | ||
264 | serverSelected(-1); | ||
265 | } | ||
266 | } | ||
267 | |||
228 | 268 | ||
229 | void NetworkPackageManager :: downloadPackage() | 269 | void NetworkPackageManager :: downloadPackage() |
@@ -344,4 +384,5 @@ void NetworkPackageManager :: applyChanges() | |||
344 | // Reload data | 384 | // Reload data |
345 | dataMgr->reloadServerData( LOCAL_SERVER ); | 385 | dataMgr->reloadServerData( LOCAL_SERVER ); |
386 | |||
346 | dataMgr->reloadServerData( serversList->currentText() ); | 387 | dataMgr->reloadServerData( serversList->currentText() ); |
347 | serverSelected(-1); | 388 | serverSelected(-1); |
@@ -385,5 +426,21 @@ QString NetworkPackageManager :: dealWithItem( QCheckListItem *item ) | |||
385 | { | 426 | { |
386 | if ( p->getVersion() == p->getInstalledVersion() ) | 427 | if ( p->getVersion() == p->getInstalledVersion() ) |
387 | return QString( "D" ) + name; | 428 | { |
429 | QString msgtext; | ||
430 | msgtext.sprintf( "Do you wish to remove or reinstall\n%s?", (const char *)name ); | ||
431 | switch( QMessageBox::information( this, "Remove or ReInstall", | ||
432 | msgtext, "Remove", "ReInstall" ) ) | ||
433 | { | ||
434 | case 0: // Try again or Enter | ||
435 | return QString( "D" ) + name; | ||
436 | break; | ||
437 | case 1: // Quit or Escape | ||
438 | return QString( "U" ) + name; | ||
439 | break; | ||
440 | } | ||
441 | |||
442 | // User hit cancel (on dlg - assume remove) | ||
443 | return QString( "D" ) + name; | ||
444 | } | ||
388 | else | 445 | else |
389 | return QString( "U" ) + name; | 446 | return QString( "U" ) + name; |