Rename parameters to match the documentation (which

in turn matches Microsoft's documentation).
Drop unused parameter in CAB.append.
This commit is contained in:
Martin v. Löwis 2006-05-01 16:14:16 +00:00
parent 5f4307491e
commit a07fbce451
2 changed files with 15 additions and 16 deletions

View file

@ -1,5 +1,5 @@
# -*- coding: iso-8859-1 -*-
# Copyright (C) 2005 Martin v. Löwis
# Copyright (C) 2005, 2006 Martin v. Löwis
# Licensed to PSF under a Contributor Agreement.
# The bdist_wininst command proper
# based on bdist_wininst
@ -16,7 +16,7 @@
from distutils.errors import DistutilsOptionError
from distutils import log
import msilib
from msilib import schema, sequence, uisample
from msilib import schema, sequence, text
from msilib import Directory, Feature, Dialog, add_data
class PyDialog(Dialog):
@ -374,8 +374,8 @@ def add_ui(self):
("MaintenanceTypeDlg", "Installed AND NOT RESUME AND NOT Preselected", 1250),
("ProgressDlg", None, 1280)])
add_data(db, 'ActionText', uisample.ActionText)
add_data(db, 'UIText', uisample.UIText)
add_data(db, 'ActionText', text.ActionText)
add_data(db, 'UIText', text.UIText)
#####################################################################
# Standard dialogs: FatalError, UserExit, ExitDialog
fatal=PyDialog(db, "FatalError", x, y, w, h, modal, title,
@ -502,9 +502,9 @@ def add_ui(self):
seldlg.back("< Back", None, active=0)
c = seldlg.next("Next >", "Cancel")
c.event("SetTargetPath", "TARGETDIR", order=1)
c.event("SpawnWaitDialog", "WaitForCostingDlg", order=2)
c.event("EndDialog", "Return", order=3)
c.event("SetTargetPath", "TARGETDIR", ordering=1)
c.event("SpawnWaitDialog", "WaitForCostingDlg", ordering=2)
c.event("EndDialog", "Return", ordering=3)
c = seldlg.cancel("Cancel", "DirectoryCombo")
c.event("SpawnDialog", "CancelDlg")
@ -561,7 +561,7 @@ def add_ui(self):
c = whichusers.next("Next >", "Cancel")
c.event("[ALLUSERS]", "1", 'WhichUsers="ALL"', 1)
c.event("EndDialog", "Return", order = 2)
c.event("EndDialog", "Return", ordering = 2)
c = whichusers.cancel("Cancel", "AdminInstall")
c.event("SpawnDialog", "CancelDlg")