[Python-checkins] r64029 - in sandbox/trunk/ttk-gsoc: samples/treeview_multicolumn.py samples/ttkcalendar.py src/2.x/ttk.py src/3.x/ttk.py

Sat Jun 7 22:49:42 CEST 2008

Author: guilherme.polo
Date: Sat Jun 7 22:49:42 2008
New Revision: 64029
Log:
Only strings inside tuples/lists should have special formatting, fixed at _format_optdict.
Modified:
 sandbox/trunk/ttk-gsoc/samples/treeview_multicolumn.py
 sandbox/trunk/ttk-gsoc/samples/ttkcalendar.py
 sandbox/trunk/ttk-gsoc/src/2.x/ttk.py
 sandbox/trunk/ttk-gsoc/src/3.x/ttk.py
Modified: sandbox/trunk/ttk-gsoc/samples/treeview_multicolumn.py
==============================================================================

--- sandbox/trunk/ttk-gsoc/samples/treeview_multicolumn.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/treeview_multicolumn.py	Sat Jun 7 22:49:42 2008
@@ -97,6 +97,10 @@
 root = Tkinter.Tk()
 root.wm_title("Multi-Column List")
 root.wm_iconname("mclist")
+
+ import plastik_theme
+ plastik_theme.install('~/tile-themes/plastik/plastik')
+
 app = App()
 root.mainloop()
 
Modified: sandbox/trunk/ttk-gsoc/samples/ttkcalendar.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/samples/ttkcalendar.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/ttkcalendar.py	Sat Jun 7 22:49:42 2008
@@ -103,8 +103,11 @@
 
 def test():
 root = Tkinter.Tk()
+ root.title('Ttk Calendar')
 x = Calendar(firstweekday=6)#, locale=('pt_BR', 'UTF-8'))
 x.pack(expand=1, fill='both')
+ s = ttk.Style()
+ s.theme_use('clam')
 root.mainloop()
 
 if __name__ == '__main__':
Modified: sandbox/trunk/ttk-gsoc/src/2.x/ttk.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/src/2.x/ttk.py	(original)
+++ sandbox/trunk/ttk-gsoc/src/2.x/ttk.py	Sat Jun 7 22:49:42 2008
@@ -65,8 +65,13 @@
 continue
 
 if isinstance(value, (list, tuple)):
- value = (unicode(val) if val else '{}' for val in value)
- value = format % ' '.join(value)
+ v = []
+ for val in value:
+ if isinstance(val, basestring):
+ v.append(unicode(val) if val else '{}')
+ else:
+ v.append(str(val))
+ value = format % ' '.join(v)
 
 if script and value == '':
 value = '{}' # empty string in Python is equivalent to {} in Tcl
Modified: sandbox/trunk/ttk-gsoc/src/3.x/ttk.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/src/3.x/ttk.py	(original)
+++ sandbox/trunk/ttk-gsoc/src/3.x/ttk.py	Sat Jun 7 22:49:42 2008
@@ -65,8 +65,13 @@
 continue
 
 if isinstance(value, (list, tuple)):
- value = (str(val) if val else '{}' for val in value)
- value = format % ' '.join(value)
+ v = []
+ for val in value:
+ if isinstance(val, str):
+ v.append(str(val) if val else '{}')
+ else:
+ v.append(str(val))
+ value = format % ' '.join(v)
 
 if script and value == '':
 value = '{}' # empty string in Python is equivalent to {} in Tcl
