# HG changeset patch # User etisserant # Date 1204279301 -3600 # Node ID cbed250c43038e8838b9afef4351cc41d95a0edd # Parent f2920812471e268c655a5ee44f37f0d351f27434 .ico icons work with either windows or linux diff -r f2920812471e -r cbed250c4303 objdictgen/networkedit.py --- a/objdictgen/networkedit.py Wed Feb 27 11:15:43 2008 +0100 +++ b/objdictgen/networkedit.py Fri Feb 29 11:01:41 2008 +0100 @@ -316,13 +316,9 @@ self.HtmlFrameOpened = [] self.BusId = None - # Add beremiz's icon in top left corner of the frame - if wx.Platform == '__WXMSW__': - icon = wx.Icon(os.path.join(ScriptDirectory,"networkedit.ico"),wx.BITMAP_TYPE_ICO) - else: - icon = wx.Icon(os.path.join(ScriptDirectory,"networkedit.png"),wx.BITMAP_TYPE_PNG) + icon = wx.Icon(os.path.join(ScriptDirectory,"networkedit.ico"),wx.BITMAP_TYPE_ICO) self.SetIcon(icon) - + if self.ModeSolo: self.Manager = NodeManager() if projectOpen: diff -r f2920812471e -r cbed250c4303 objdictgen/objdictedit.py --- a/objdictgen/objdictedit.py Wed Feb 27 11:15:43 2008 +0100 +++ b/objdictgen/objdictedit.py Fri Feb 29 11:01:41 2008 +0100 @@ -302,11 +302,7 @@ self.HtmlFrameOpened = [] self.ModeSolo = True - # Add beremiz's icon in top left corner of the frame - if wx.Platform == '__WXMSW__': - icon = wx.Icon(os.path.join(ScriptDirectory,"objdictedit.ico"),wx.BITMAP_TYPE_ICO) - else: - icon = wx.Icon(os.path.join(ScriptDirectory,"objdictedit.png"),wx.BITMAP_TYPE_PNG) + icon = wx.Icon(os.path.join(ScriptDirectory,"networkedit.ico"),wx.BITMAP_TYPE_ICO) self.SetIcon(icon) self.Manager = NodeManager()