Mercurial Mercurial > canfestival / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
.ico icons work with either windows or linux
authoretisserant
Fri, 29 Feb 2008 11:01:41 +0100
changeset 410 cbed250c4303
parent 409 f2920812471e
child 411 2af8099390e4
.ico icons work with either windows or linux
objdictgen/networkedit.py file | annotate | diff | comparison | revisions
objdictgen/objdictedit.py file | annotate | diff | comparison | revisions 
--- 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:
--- 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()
canfestival