amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Renamed global PackageManager object to package_manager to reduce confusion

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@907 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-05-31 14:45:04 +00:00
parent 74545e8724
commit f3ff6f22ae
18 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/packages_window.cpp
+8 -8
View File
@@ -182,7 +182,7 @@ void PackagesWindow::init(Window* parent, bool show_only_installable) {
// get packages
wxBusyCursor busy;
packages.installedPackages(installable_packages);
package_manager.findAllInstalledPackages(installable_packages);
FOR_EACH(p, installable_packages) p->determineStatus();
checkInstallerList(false);
@@ -254,12 +254,12 @@ void PackagesWindow::onOk(wxCommandEvent& ev) {
wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_SMOOTH
);
// Clear package list
packages.reset();
package_manager.reset();
// Download installers
int package_pos = 0, progress = 0;
int package_pos = 0, step = 0;
FOR_EACH(ip, installable_packages) {
++package_pos; ++progress;
if (!progress.Update(progress, String::Format(_ERROR_("downloading updates"), package_pos, total))) {
++package_pos; ++step;
if (!progress.Update(step, String::Format(_ERROR_("downloading updates"), package_pos, total))) {
return; // aborted
}
if ((ip->action & PACKAGE_INSTALL) && ip->installer && !ip->installer->installer) {
@@ -281,11 +281,11 @@ void PackagesWindow::onOk(wxCommandEvent& ev) {
// Install stuff
package_pos = 0 ;
FOR_EACH(ip, installable_packages) {
++package_pos; ++progress;
if (!progress.Update(progress, String::Format(_ERROR_("installing updates"), package_pos, total))) {
++package_pos; ++step;
if (!progress.Update(step, String::Format(_ERROR_("installing updates"), package_pos, total))) {
// don't allow abort.
}
packages.install(*ip);
package_manager.install(*ip);
}
// Done
// Continue event propagation into the dialog window so that it closes.