From c8a3b646245ef4b6f19a367b13e4a7fa4be636f8 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sat, 11 Oct 2014 22:45:31 +0200
Subject: [PATCH] Set black icon for mac

---
 Desktop.py                   |  12 +++++++++---
 icon_mac.png                 | Bin 0 -> 435 bytes
 icon.png => icon_windows.png | Bin
 setup.py                     |   4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 icon_mac.png
 rename icon.png => icon_windows.png (100%)

diff --git a/Desktop.py b/Desktop.py
index aebc0519..2d523e1e 100644
--- a/Desktop.py
+++ b/Desktop.py
@@ -15,6 +15,13 @@ if hasattr(sys, 'frozen'):
 else:
     base_path = os.path.dirname(os.path.abspath(__file__))
 
+def icon():
+    icon = 'icon_windows.png'
+    if os.path.isfile('icon_mac.png'):
+        icon = 'icon_mac.png'
+
+    return wx.Icon(icon, wx.BITMAP_TYPE_PNG)
+
 lib_dir = os.path.join(base_path, 'libs')
 
 sys.path.insert(0, base_path)
@@ -36,8 +43,7 @@ class TaskBarIcon(wx.TaskBarIcon):
         wx.TaskBarIcon.__init__(self)
         self.frame = frame
 
-        icon = wx.Icon('icon.png', wx.BITMAP_TYPE_PNG)
-        self.SetIcon(icon)
+        self.SetIcon(icon())
 
         self.Bind(wx.EVT_TASKBAR_LEFT_UP, self.OnTaskBarClick)
         self.Bind(wx.EVT_TASKBAR_RIGHT_UP, self.OnTaskBarClick)
@@ -170,7 +176,7 @@ class CouchPotatoApp(wx.App, SoftwareUpdate):
         # Updater
         base_url = 'https://api.couchpota.to/updates/%s'
         self.InitUpdates(base_url % VERSION + '/', 'https://couchpota.to/updates/%s' % 'changelog.html',
-                         icon = wx.Icon('icon.png'))
+                         icon = icon())
 
         self.frame = MainFrame(self)
         self.frame.Bind(wx.EVT_CLOSE, self.onClose)
diff --git a/icon_mac.png b/icon_mac.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cdda5cba6f1a09336b5df94a1d3e7a7eb679745
GIT binary patch
literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg0004cNkl<ZNXPAz
z!D_-l5Qg^&dhnQfh)r4~B;6%})__ou=FqENi+BwPUUKoUZ!mXXBCpUF$UFEf)0s8Z
zXkxV19tzzLWSN=&b4)-XjvYMU+vi{KR|PiIVhwcR_XKoKE8s^zqYLLe3b^>&+qbaW
z<8cz}aZcbE0;^#Q@T@UVmu6xeCv}0|3UDC%*8UbY#h)ejN`bBkq9Q7WIK)>%;Ujdb
zTYzmTP^QN-JbOZ*@Lt}QTi9@Cd6H|50ylAWPy|JcF=m(n4?Ph+_ThoIpeN#kZ))7j
zAVZ$zjH}&5(8m!0g`{_*tbsK5W`PznoZ%Z05h<o%RwOv|0vq_wHSVR5nmcDW+b-BB
zuvHMOg4GB|=n)}?FvlIbq*@ChG_#!HtOzE10-VDRT~e*_Ohqs;Z$horx`#b<4(OFM
z)j6|$m1=pBV7V2@g)CfjYlFw&Sy{-%^#sn;$vfCN`=6I*o!psTPaqPZMPBmJ!q<!@
d-bHj3!6!n}c3yDj^d$fQ002ovPDHLkV1lmuz^(uQ

literal 0
HcmV?d00001

diff --git a/icon.png b/icon_windows.png
similarity index 100%
rename from icon.png
rename to icon_windows.png
diff --git a/setup.py b/setup.py
index 23b0dfc9..8def7da2 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ if sys.platform == "win32":
     )
     exeICON = os.path.join(base_path, 'icon.ico')
     DATA_FILES = getDataFiles([r'.\\couchpotato', r'.\\libs'])
-    DATA_FILES.append('icon.png')
+    DATA_FILES.append('icon_windows.png')
     file_ext = 'win32.zip'
 
 
@@ -78,7 +78,7 @@ elif sys.platform == "darwin":
         includes = includes,
     )
     exeICON = None
-    DATA_FILES = ['icon.png']
+    DATA_FILES = ['icon_mac.png']
 
     file_ext = 'macosx-10_6-intel.zip'