diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-11-19 13:54:01 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-11-19 13:54:01 +0000 |
| commit | 45a276cdd2f9ceff5f89868428963ffa581e6f96 (patch) | |
| tree | b10457c78e3192e771d5469db925d48ebc14fe41 | |
| parent | 90a79e84a369ae000d93a379ff322f0b01259c65 (diff) | |
| download | cpython-git-45a276cdd2f9ceff5f89868428963ffa581e6f96.tar.gz | |
Merged revisions 67283 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67283 | martin.v.loewis | 2008-11-19 14:51:44 +0100 (Mi, 19 Nov 2008) | 1 line
Issue #4289: Remove Cancel button from AdvancedDlg.
........
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Tools/msi/msi.py | 9 |
2 files changed, 5 insertions, 6 deletions
@@ -63,6 +63,8 @@ Library Build ----- +- Issue #4289: Remove Cancel button from AdvancedDlg. + - Issue #1656675: Register a drop handler for .py* files on Windows. - Issue #4120: Exclude manifest from extension modules in VS2008. diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 9e20938c00..aa0202f22e 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -715,18 +715,15 @@ def add_ui(db): ##################################################################### # Advanced Dialog. advanced = PyDialog(db, "AdvancedDlg", x, y, w, h, modal, title, - "CompilePyc", "Next", "Cancel") + "CompilePyc", "Ok", "Ok") advanced.title("Advanced Options for [ProductName]") # A radio group with two options: allusers, justme advanced.checkbox("CompilePyc", 135, 60, 230, 50, 3, - "COMPILEALL", "Compile .py files to byte code after installation", "Next") + "COMPILEALL", "Compile .py files to byte code after installation", "Ok") - c = advanced.next("Finish", "Cancel") + c = advanced.cancel("Ok", "CompilePyc", name="Ok") # Button just has location of cancel button. c.event("EndDialog", "Return") - c = advanced.cancel("Cancel", "CompilePyc") - c.event("SpawnDialog", "CancelDlg") - ##################################################################### # Existing Directory dialog dlg = Dialog(db, "ExistingDirectoryDlg", 50, 30, 200, 80, modal, title, |