[gnue] r8357 - in trunk/gnue-designer/src: base forms/PagePainter ui/wx/uihelpers/doccanvas

[jcater]

Author: jcater
Date: 2006-04-04 20:35:09 -0500 (Tue, 04 Apr 2006)
New Revision: 8357

Modified:
   trunk/gnue-designer/src/base/Document.py
   trunk/gnue-designer/src/forms/PagePainter/PagePainter.py
   trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/settings.py
Log:
fixed error messages related to dialogs

Modified: trunk/gnue-designer/src/base/Document.py
===================================================================
--- trunk/gnue-designer/src/base/Document.py    2006-04-05 01:08:34 UTC (rev 
8356)
+++ trunk/gnue-designer/src/base/Document.py    2006-04-05 01:35:09 UTC (rev 
8357)
@@ -412,7 +412,7 @@
         else:
             if not os.access (location, os.R_OK):
                 self.show()
-                if not self.ui.dialogYesNo(
+                if not self.app.ui.dialogYesNo(
                   u_('The requested file does not exist.\n') +
                   u_('Do you want to create this file?') +
                   u_('\n\nFile: %s') \
@@ -426,7 +426,7 @@
 
             elif not os.access (location, os.W_OK):
                 self.show()
-                if not self.ui.dialogCancel(
+                if not self.app.ui.dialogCancel(
                   u_('The requested file is Read Only.\n') +
                   u_('To save any changes, you will \n') +
                   u_('be required to do a "Save As..."\n\nFile: %s') \
@@ -732,14 +732,14 @@
                    ( type, self.properties.fileExtensions[type]) ]
                 filterIndex.append(type)
 
-        path = self.ui.dialogSaveFile(
+        path = self.app.ui.dialogSaveFile(
                     u_("Save %s As...") % self.properties.description,
                     wildcards=wildcards,
                     parentWindow=self.ui)
 
         if path:
             if os.path.isfile(path):
-                overwrite = self.ui.dialogYesNo(
+                overwrite = self.app.ui.dialogYesNo(
                       u_('The file "%s".\n' % path) +
                       u_("exists. Overwrite?"),
                       u_("Unsaved Changes"),
@@ -756,7 +756,7 @@
 
     def _OnClose(self, event):
         if self.isDirty():
-            save = self.ui.dialogYesNoCancel(
+            save = self.app.ui.dialogYesNoCancel(
                     u_("This document has unsaved changes.\n") +
                     u_("Save changes before closing?"),
                     u_("Unsaved Changes"), icon="warn", parentWindow=self.ui)

Modified: trunk/gnue-designer/src/forms/PagePainter/PagePainter.py
===================================================================
--- trunk/gnue-designer/src/forms/PagePainter/PagePainter.py    2006-04-05 
01:08:34 UTC (rev 8356)
+++ trunk/gnue-designer/src/forms/PagePainter/PagePainter.py    2006-04-05 
01:35:09 UTC (rev 8357)
@@ -63,9 +63,9 @@
         # Determine text extents
         dc = wx.PaintDC(self)
         base_font = wx.NORMAL_FONT
-        fixed_font = wx.Font(base_font.GetPointSize(), 
+        fixed_font = wx.Font(base_font.GetPointSize(),
                             wx.MODERN, wx.NORMAL, wx.NORMAL)
-        
+
         self.SetFont(fixed_font)
 
         if not common.char_x_scale:
@@ -73,7 +73,6 @@
             avg_h = 0
             for char in string.digits + string.letters:
                 w, h = dc.GetTextExtent(char)
-                print char, w, h
                 avg_w += w
                 avg_h += h
             common.char_x_scale = avg_w // len(string.digits + string.letters)
@@ -83,8 +82,6 @@
             # are bigger than text labels.
             common.char_y_scale += 4
 
-            print common.char_x_scale
-
         canvas = self.canvas = PagePainterCanvas(self)
 
         self.document.app.ui.autoSizer(self, canvas)
@@ -113,14 +110,13 @@
         Inventory each object as it is identified or added
         """
 
-        # Right now, we assume if an object has an x,y component, it is 
+        # Right now, we assume if an object has an x,y component, it is
         # drawable. This won't be true when we support layout management.
         try:
             x = object['Char:x']
             y = object['Char:y']
         except:
             if not object._type == 'GFPage':
-                print "Not inventorying %s" % object
                 return
 
         canvas = self.canvas

Modified: trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/settings.py
===================================================================
--- trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/settings.py       
2006-04-05 01:08:34 UTC (rev 8356)
+++ trunk/gnue-designer/src/ui/wx/uihelpers/doccanvas/settings.py       
2006-04-05 01:35:09 UTC (rev 8357)
@@ -55,10 +55,10 @@
         return
 
     base_font = wx.NORMAL_FONT
-    fixed_font = wx.Font(base_font.GetPointSize()-2, 
+    fixed_font = wx.Font(base_font.GetPointSize(),
                          wx.MODERN, wx.NORMAL, wx.NORMAL)
-    small_fixed_font = wx.Font(base_font.GetPointSize()-3, 
-                         wx.MODERN, wx.NORMAL, wx.NORMAL) 
+    small_fixed_font = wx.Font(base_font.GetPointSize()-1,
+                         wx.MODERN, wx.NORMAL, wx.NORMAL)
 
     font_map['label'] = fixed_font
     font_map['box'] = small_fixed_font