Changeset 268

Timestamp:

02/19/08 19:35:04 (11 months ago)

Author:

bob

Message:

 

Location:

artub

Files:

• StyledTextCtrl_2.py (modified) (5 diffs)
• artub.py (modified) (1 diff)
• locale/fr/LC_MESSAGES/artub.po (modified) (1 diff)
• plugins/basic_templates/monkey2.py (modified) (2 diffs)
• poujol/__init__.py (modified) (3 diffs)
• startuppage.py (modified) (1 diff)
• tools/macosx (added)
• tools/macosx/dyld_library_path.sh (added)
• tools/macosx/release_mac.sh (added)

artub/StyledTextCtrl_2.py

@@ -27 +27 @@
               'size2': 8,
              }
+elif wx.Platform == "__WXMAC__":
+    faces = { 'times': 'Times',
+              'mono' : 'Monaco',
+              'helv' : 'Helvetica',
+              'other': 'Courier New',
+              'size' : 12,
+              'size2': 10,
+             }
 else:
     faces = { 'times': 'Times',
-              'mono' : 'Courier',
+              'mono' : 'Courier New',
               'helv' : 'Helvetica',
               'other': 'new century schoolbook',
@@ -136 +144 @@
 
         # Global default styles for all languages
-        self.StyleSetSpec(stc.STC_STYLE_DEFAULT,     "face:%(helv)s,size:%(size)d" % faces)
+        self.StyleSetSpec(stc.STC_STYLE_DEFAULT,     "face:%(mono)s,size:%(size)d" % faces)
         self.StyleClearAll()  # Reset all to be like the default
 
         # Global default styles for all languages
-        self.StyleSetSpec(stc.STC_STYLE_DEFAULT,     "face:%(helv)s,size:%(size)d" % faces)
+        self.StyleSetSpec(stc.STC_STYLE_DEFAULT,     "face:%(mono)s,size:%(size)d" % faces)
         self.StyleSetSpec(stc.STC_STYLE_LINENUMBER,  "back:#C0C0C0,face:%(helv)s,size:%(size2)d" % faces)
         self.StyleSetSpec(stc.STC_STYLE_CONTROLCHAR, "face:%(other)s" % faces)
@@ -148 +156 @@
         # Python styles
         # Default 
-        self.StyleSetSpec(stc.STC_P_DEFAULT, "fore:#000000,face:%(helv)s,size:%(size)d" % faces)
+        self.StyleSetSpec(stc.STC_P_DEFAULT, "fore:#000000,face:%(mono)s,size:%(size)d" % faces)
         # Comments
         # self.StyleSetSpec(stc.STC_P_COMMENTLINE, "fore:#007F00,face:%(other)s,size:%(size)d" % faces)
@@ -154 +162 @@
         self.StyleSetSpec(stc.STC_P_NUMBER, "fore:#007F7F,size:%(size)d" % faces)
         # String
-        self.StyleSetSpec(stc.STC_P_STRING, "fore:#7F007F,face:%(helv)s,size:%(size)d" % faces)
+        self.StyleSetSpec(stc.STC_P_STRING, "fore:#7F007F,face:%(mono)s,size:%(size)d" % faces)
         # Single quoted string
-        self.StyleSetSpec(stc.STC_P_CHARACTER, "fore:#7F007F,face:%(helv)s,size:%(size)d" % faces)
+        self.StyleSetSpec(stc.STC_P_CHARACTER, "fore:#7F007F,face:%(mono)s,size:%(size)d" % faces)
         # Keyword
         self.StyleSetSpec(stc.STC_P_WORD, "fore:#00007F,bold,size:%(size)d" % faces)
@@ -170 +178 @@
         self.StyleSetSpec(stc.STC_P_OPERATOR, "bold,size:%(size)d" % faces)
         # Identifiers
-        self.StyleSetSpec(stc.STC_P_IDENTIFIER, "fore:#000000,face:%(helv)s,size:%(size)d" % faces)
+        self.StyleSetSpec(stc.STC_P_IDENTIFIER, "fore:#000000,face:%(mono)s,size:%(size)d" % faces)
         # Comment-blocks
         self.StyleSetSpec(stc.STC_P_COMMENTBLOCK, "fore:#7F7F7F,size:%(size)d" % faces)

artub/artub.py

@@ -7 +7 @@
 set_sys_path()
 
+print "Running Artub version", __version__
 import gettext
 gettext.install('artub', 'locale', unicode=1)
 import locale
 import wx
+print "Using wxPython", wx.VERSION_STRING
 try:
     info = wx.Locale.GetLanguageInfo(wx.Locale.GetSystemLanguage())

artub/locale/fr/LC_MESSAGES/artub.po

@@ -948 +948 @@
 #: propertiesbar/propertyeditors.py:1045
 msgid "Inherited from "
-msgstr "Hérité de"
+msgstr "Hérité de "
 
 #: redistributable.py:12

artub/plugins/basic_templates/monkey2.py

@@ -24 +24 @@
     def on_look(self):
         if self.walk_point:
-            game.ego.walk_to(self.walk_point.x, self.walk_point.y)
-            
-        game.ego.say(self.description)
+            ego.walk_to(self.walk_point.x, self.walk_point.y)
+            
+        ego.say(self.description)
         
     def on_hand(self):
         if self.walk_point:
-            game.ego.walk_to(self.walk_point.x, self.walk_point.y)
+            ego.walk_to(self.walk_point.x, self.walk_point.y)
                     
     def on_lose_focus(self, newobj):
@@ -40 +40 @@
     def on_walk(self):
         if self.walk_point:
-            game.ego.walk_to(self.walk_point.x, self.walk_point.y)
+            ego.walk_to(self.walk_point.x, self.walk_point.y)
                     
     def on_left_button_down(self):

artub/poujol/__init__.py

@@ -328 +328 @@
         
         if isinstance(parent, Sprite):
-            print >> sys.__stderr__, "set parent", parent
+            # print >> sys.__stderr__, "set parent", parent
             self.parent = parent
         
@@ -460 +460 @@
         
     def set_boxes(self):
+        print "set_boxes", self, len(self.contours), hasattr(self, "regions"), self.boxes
         if len(self.contours): return
         for i in self.boxes:
             c = Contour(i.points) 
+            print "adding contour", c
             self.contours.append(c)
+        print self.to_string()
         center = self.get_center()
         self.center = (center.x, center.y)
@@ -553 +556 @@
         Sprite.__init__(self, parent)
         poujolRegion.__init__(self, *args)
-        self.boxes = []
+        #self.boxes = []
         self.active = True
 

artub/startuppage.py

@@ -99 +99 @@
             print "<p>&nbsp;</p>"
             self.footer()
-            open(os.path.join(wx.GetApp().artub_path, 'startup', 'dynamic.html'), 'w').write(self.restore_outputs())
+            s = self.restore_outputs().encode('iso-8859-1')
+            open(os.path.join(wx.GetApp().artub_path, 'startup', 'dynamic.html'), 'w').write(s)
         except:
             raise