Commit 27759e3f authored by Kliment Yanev's avatar Kliment Yanev

Add conditionals so Windows binary can be built directly from source

parent a7d2302e
...@@ -244,6 +244,9 @@ class showstl(wx.Window): ...@@ -244,6 +244,9 @@ class showstl(wx.Window):
class stlwin(wx.Frame): class stlwin(wx.Frame):
def __init__(self, size = (800, 580), callback = None, parent = None): def __init__(self, size = (800, 580), callback = None, parent = None):
wx.Frame.__init__(self, parent, title = _("Plate building tool"), size = size) wx.Frame.__init__(self, parent, title = _("Plate building tool"), size = size)
if hasattr(sys,"frozen") and sys.frozen=="windows_exe":
self.SetIcon(wx.Icon(sys.executable, wx.BITMAP_TYPE_ICO))
else:
self.SetIcon(wx.Icon(pixmapfile("plater.ico"), wx.BITMAP_TYPE_ICO)) self.SetIcon(wx.Icon(pixmapfile("plater.ico"), wx.BITMAP_TYPE_ICO))
self.mainsizer = wx.BoxSizer(wx.HORIZONTAL) self.mainsizer = wx.BoxSizer(wx.HORIZONTAL)
self.panel = wx.Panel(self, -1, size = (150, 600), pos = (0, 0)) self.panel = wx.Panel(self, -1, size = (150, 600), pos = (0, 0))
......
...@@ -609,6 +609,8 @@ class pronsole(cmd.Cmd): ...@@ -609,6 +609,8 @@ class pronsole(cmd.Cmd):
self.processing_rc = False self.processing_rc = False
def load_default_rc(self, rc_filename = ".pronsolerc"): def load_default_rc(self, rc_filename = ".pronsolerc"):
if rc_filename == ".pronsolerc" and hasattr(sys,"frozen") and sys.frozen in ["windows_exe", "console_exe"]:
rc_filename="printrunconf.ini"
try: try:
try: try:
self.load_rc(os.path.join(os.path.expanduser("~"), rc_filename)) self.load_rc(os.path.join(os.path.expanduser("~"), rc_filename))
......
...@@ -196,6 +196,9 @@ class PronterWindow(MainWindow, pronsole.pronsole): ...@@ -196,6 +196,9 @@ class PronterWindow(MainWindow, pronsole.pronsole):
self.filename = filename self.filename = filename
os.putenv("UBUNTU_MENUPROXY", "0") os.putenv("UBUNTU_MENUPROXY", "0")
MainWindow.__init__(self, None, title = _("Printer Interface"), size = size); MainWindow.__init__(self, None, title = _("Printer Interface"), size = size);
if hasattr(sys,"frozen") and sys.frozen=="windows_exe":
self.SetIcon(wx.Icon(sys.executable, wx.BITMAP_TYPE_ICO))
else:
self.SetIcon(wx.Icon(pixmapfile("P-face.ico"), wx.BITMAP_TYPE_ICO)) self.SetIcon(wx.Icon(pixmapfile("P-face.ico"), wx.BITMAP_TYPE_ICO))
self.panel = wx.Panel(self,-1, size = size) self.panel = wx.Panel(self,-1, size = size)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment