[PythonReports-checkins] PythonReports/PythonReports design.py, 1.6, 1.7

[alexander s. <a1...@us...>]

Update of /cvsroot/pythonreports/PythonReports/PythonReports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26314

Modified Files:
	design.py 
Log Message:
disable drawing canvas;
force fixed font for the shell

Index: design.py
===================================================================
RCS file: /cvsroot/pythonreports/PythonReports/PythonReports/design.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** design.py	3 Nov 2006 16:33:34 -0000	1.6
--- design.py	3 Nov 2006 17:18:25 -0000	1.7
***************
*** 2,5 ****
--- 2,7 ----
  
  """History (most recent first):
+ 03-nov-2006 [als]   disable drawing canvas;
+                     force fixed font for the shell
  03-nov-2006 [als]   handle file loading errors;
                      prompt to save changes on open file/new file/exit
***************
*** 737,740 ****
--- 739,743 ----
          # FIXME? on X windows, this makes entries slightly darker
          self.color_window = _tree_hlist["background"]
+         self.base_font = self.tk.splitlist(_tree_hlist["font"])
          # XXX on X windows, selected item is shown grey on grey!
          if _tree_hlist["selectforeground"] == _tree_hlist["selectbackground"]:
***************
*** 750,758 ****
          self.hp.add(self.pl)
          self.vp.add(self.hp)
!         self.shell = Shell(self.vp, borderwidth=2, relief=SUNKEN, height=10)
          self.vp.add(self.shell.frame)
!         self.canvas = Canvas(self.vp, borderwidth=2, relief=SUNKEN,
!             width=720, height=100)
!         self.vp.add(self.canvas)
          self.bind("<Destroy>", self.OnWindowClose)
  
--- 753,767 ----
          self.hp.add(self.pl)
          self.vp.add(self.hp)
!         # on windows, the shell gets proportional font.
!         # not sure what it will be on other platforms
!         # (Gentoo Linux makes it Courier); try Courer
!         self.shell = Shell(self.vp, borderwidth=2, relief=SUNKEN,
!             width=80, height=20, font=("Courier", self.base_font[1]))
          self.vp.add(self.shell.frame)
!         # it was planned to have a drag-and-click-style visual editor
!         # on the third pane.  maybe somewhen it'll be implemented too.
!         #self.canvas = Canvas(self.vp, borderwidth=2, relief=SUNKEN,
!         #    width=720, height=100)
!         #self.vp.add(self.canvas)
          self.bind("<Destroy>", self.OnWindowClose)
  
***************
*** 1016,1020 ****
          _hlist = self.tree.hlist
          _bbox = _hlist.tk.call(str(_hlist), "info", "bbox", self.current_node)
!         _ypos = _hlist.winfo_rooty() + int(_bbox.split(" ")[3])
          _xpos = _hlist.winfo_rootx() + 20 * (self.current_node.count(".") + 1)
          return (_xpos, _ypos)
--- 1025,1029 ----
          _hlist = self.tree.hlist
          _bbox = _hlist.tk.call(str(_hlist), "info", "bbox", self.current_node)
!         _ypos = _hlist.winfo_rooty() + int(self.tk.splitlist(_bbox)[3])
          _xpos = _hlist.winfo_rootx() + 20 * (self.current_node.count(".") + 1)
          return (_xpos, _ypos)