[Python-3000-checkins] r67285 - in python/branches/py3k: Misc/NEWS Tools/msi/msi.py
martin.v.loewis
python-3000-checkins at python.org
Wed Nov 19 14:55:07 CET 2008
Author: martin.v.loewis
Date: Wed Nov 19 14:55:07 2008
New Revision: 67285
Log:
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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Misc/NEWS
python/branches/py3k/Tools/msi/msi.py
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Wed Nov 19 14:55:07 2008
@@ -45,6 +45,8 @@
Build
-----
+- Issue #4289: Remove Cancel button from AdvancedDlg.
+
- Issue #1656675: Register a drop handler for .py* files on Windows.
Tools/Demos
Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py (original)
+++ python/branches/py3k/Tools/msi/msi.py Wed Nov 19 14:55:07 2008
@@ -717,18 +717,15 @@
#####################################################################
# 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,
More information about the Python-3000-checkins
mailing list