Merge branch 'experimental' of github.com:kliment/Printrun into experimental

printrun/printrun_utils.py

-import os
+import os, sys
 import gettext
 
 # Set up Internationalization using gettext
@@ -16,17 +16,21 @@ def imagefile(filename):
         candidate = os.path.join(prefix, filename)
         if os.path.exists(candidate):
             return candidate
-    local_candidate = os.path.join(os.path.dirname(__file__), "images", filename)
+    local_candidate = os.path.join(os.path.dirname(sys.argv[0]), "images", filename)
     if os.path.exists(local_candidate):
         return local_candidate
     else:
-        return os.path.join(os.path.split(os.path.split(__file__)[0])[0], "images", filename)
+        return os.path.join("images", filename)
 
 def lookup_file(filename, prefixes):
     for prefix in prefixes:
         candidate = os.path.join(prefix, filename)
         if os.path.exists(candidate):
             return candidate
+    local_candidate = os.path.join(os.path.dirname(sys.argv[0]), filename)
+    if os.path.exists(local_candidate):
+        return local_candidate
+    else:
         return filename
 
 def pixmapfile(filename):

printrun/pronterface_widgets.py

@@ -14,6 +14,7 @@
 # along with Printrun.  If not, see <http://www.gnu.org/licenses/>.
 
 import wx
+import re
 
 class macroed(wx.Dialog):
     """Really simple editor to edit macro definitions"""
@@ -43,7 +44,7 @@ class macroed(wx.Dialog):
         titlesizer.Add(self.cancelb)
         topsizer = wx.BoxSizer(wx.VERTICAL)
         topsizer.Add(titlesizer, 0, wx.EXPAND)
-        self.e = wx.TextCtrl(self.panel, style = wx.TE_MULTILINE+wx.HSCROLL, size = (400, 400))
+        self.e = wx.TextCtrl(self.panel, style = wx.HSCROLL|wx.TE_MULTILINE|wx.TE_RICH2, size = (400, 400))
         if not self.gcode:
             self.e.SetValue(self.unindent(definition))
         else: