[Python-checkins] python/nondist/sandbox/msi msi.py, 1.4, 1.5 msilib.py, 1.5, 1.6

Wed Jan 7 17:04:12 EST 2004

Update of /cvsroot/python/python/nondist/sandbox/msi
In directory sc8-pr-cvs1:/tmp/cvs-serv31199
Modified Files:
	msi.py msilib.py 
Log Message:
Add test files. Reduce title font size. Fix typos.
Adjust control layout. Group features as subfeature
of the default feature.
Index: msi.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/msi/msi.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** msi.py	2 Jan 2004 20:43:24 -0000	1.4
--- msi.py	7 Jan 2004 22:04:10 -0000	1.5
***************
*** 88,93 ****
 
 def title(self, title):
! self.text("Title", 135, 20, 220, 60, 196611,
! r"{\VerdanaBold13}%s" % title)
 
 def back(self, title, next, name = "Back", active = 1):
--- 88,93 ----
 
 def title(self, title):
! self.text("Title", 135, 10, 220, 60, 196611,
! r"{\VerdanaBold10}%s" % title)
 
 def back(self, title, next, name = "Back", active = 1):
***************
*** 150,154 ****
 [("DlgFont8", "Tahoma", 9, None, 0),
 ("DlgFontBold8", "Tahoma", 8, None, 1), #bold
! ("VerdanaBold13", "Verdana", 13, None, 1),
 ])
 
--- 150,154 ----
 [("DlgFont8", "Tahoma", 9, None, 0),
 ("DlgFontBold8", "Tahoma", 8, None, 1), #bold
! ("VerdanaBold10", "Verdana", 10, None, 1),
 ])
 
***************
*** 179,185 ****
 fatal.back("< Back", "Finish", active = 0)
 fatal.cancel("Cancel", "Back", active = 0)
! fatal.text("Description1", 135, 70, 220, 60, 196611,
 "[ProductName] setup ended prematurely because of an error. Your system has not been modified. To install this program at a later time, please run the installation again.")
! fatal.text("Description2", 135, 135, 220, 20, 196611,
 "Click the Finish button to exit the Installer.")
 c=fatal.next("Finish", "Cancel", name="Finish")
--- 179,185 ----
 fatal.back("< Back", "Finish", active = 0)
 fatal.cancel("Cancel", "Back", active = 0)
! fatal.text("Description1", 135, 70, 220, 80, 196611,
 "[ProductName] setup ended prematurely because of an error. Your system has not been modified. To install this program at a later time, please run the installation again.")
! fatal.text("Description2", 135, 155, 220, 20, 196611,
 "Click the Finish button to exit the Installer.")
 c=fatal.next("Finish", "Cancel", name="Finish")
***************
*** 191,198 ****
 user_exit.back("< Back", "Finish", active = 0)
 user_exit.cancel("Cancel", "Back", active = 0)
! user_exit.text("Description1", 135, 70, 220, 40, 196611,
 "[ProductName] setup was interrupted. Your system has not been modified. "
 "To install this program at a later time, please run the installation again.")
! user_exit.text("Description2", 135, 115, 220, 20, 196611,
 "Click the Finish button to exit the Installer.")
 c = user_exit.next("Finish", "Cancel", name="Finish")
--- 191,198 ----
 user_exit.back("< Back", "Finish", active = 0)
 user_exit.cancel("Cancel", "Back", active = 0)
! user_exit.text("Description1", 135, 70, 220, 80, 196611,
 "[ProductName] setup was interrupted. Your system has not been modified. "
 "To install this program at a later time, please run the installation again.")
! user_exit.text("Description2", 135, 155, 220, 20, 196611,
 "Click the Finish button to exit the Installer.")
 c = user_exit.next("Finish", "Cancel", name="Finish")
***************
*** 273,277 ****
 prep.title("Welcome to the [ProductName] Installer")
 c=prep.text("ActionText", 135, 110, 220, 20, 196611, "Pondering...")
! c.mapping("AxtionText", "Text")
 c=prep.text("ActionData", 135, 135, 220, 30, 196611, None)
 c.mapping("ActionData", "Text")
--- 273,277 ----
 prep.title("Welcome to the [ProductName] Installer")
 c=prep.text("ActionText", 135, 110, 220, 20, 196611, "Pondering...")
! c.mapping("ActionText", "Text")
 c=prep.text("ActionData", 135, 135, 220, 30, 196611, None)
 c.mapping("ActionData", "Text")
***************
*** 346,354 ****
 c.event("SpawnDialog", "AdvancedDlg")
 
! c=features.text("ItemDescription", 140, 180, 210, 50, 3,
 "Multiline description of the currently selected item.")
 c.mapping("SelectionDescription","Text")
 
! c=features.text("ItemSize", 140, 230, 220, 25, 3,
 "The size of the currently selected item.")
 c.mapping("SelectionSize", "Text")
--- 346,354 ----
 c.event("SpawnDialog", "AdvancedDlg")
 
! c=features.text("ItemDescription", 140, 180, 210, 30, 3,
 "Multiline description of the currently selected item.")
 c.mapping("SelectionDescription","Text")
 
! c=features.text("ItemSize", 140, 210, 220, 45, 3,
 "The size of the currently selected item.")
 c.mapping("SelectionSize", "Text")
***************
*** 462,472 ****
 "Python Interpreter and Libraries",
 1, directory = "TARGETDIR")
! tcltk = Feature(db, "TclTk", "Tcl/Tk", "Tkinter, IDLE, pydoc", 3)
 htmlfiles = Feature(db, "Documentation", "Documentation",
! "Python HTMLHelp File", 5)
 tools = Feature(db, "Tools", "Utility Scripts",
! "Python utility scripts (Tools/", 7)
 testsuite = Feature(db, "Testsuite", "Test suite",
! "Python test suite (Lib/test/)", 9)
 
 def extract_msvcr71():
--- 462,475 ----
 "Python Interpreter and Libraries",
 1, directory = "TARGETDIR")
! tcltk = Feature(db, "TclTk", "Tcl/Tk", "Tkinter, IDLE, pydoc", 3,
! parent = default_feature)
 htmlfiles = Feature(db, "Documentation", "Documentation",
! "Python HTMLHelp File", 5, parent = default_feature)
 tools = Feature(db, "Tools", "Utility Scripts",
! "Python utility scripts (Tools/", 7, 
! 		 parent = default_feature)
 testsuite = Feature(db, "Testsuite", "Test suite",
! "Python test suite (Lib/test/)", 9, 
! 			parent = default_feature)
 
 def extract_msvcr71():
***************
*** 535,538 ****
--- 538,549 ----
 if files:
 lib.remove_pyc()
+ 	if dir=='test' and parent.physical=='Lib':
+ 	 lib.add_file("audiotest.au")
+ 	 lib.add_file("185test.db")
+ 	 lib.add_file("test.xml.out")
+ 	 lib.add_file("readme.txt", src="README")
+ 	 lib.glob("*.uue")
+ 	 lib.add_file("test.xml")
+ 	 lib.add_file("testtar.tar")
 if dir=='output':
 lib.glob("test_*")
Index: msilib.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/msi/msilib.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** msilib.py	7 Jan 2004 20:02:26 -0000	1.5
--- msilib.py	7 Jan 2004 22:04:10 -0000	1.6
***************
*** 519,522 ****
--- 519,523 ----
 if parent:
 attributes |= 2 # follow parent
+ 	 parent = parent.id
 add_data(db, "Feature",
 [(id, parent, title, desc, display,