New, retina and dark mode compatible icon. Fix #48. Fix #41.

README.md

@@ -57,10 +57,13 @@ Acknowledgments
 ---------------
 Thanks to:
 
-* David Vignoni for his [upload icon][icon].
+* [Linh Pham Thi Dieu][linh] for his [upload icon][iconnew] (current versions of UpShot).
+* David Vignoni for his [upload icon][iconold] (early versions of UpShot).
 * Jason Costello for [Slate][slate], the website theme that upshot.it uses.
 
-[icon]: http://www.iconfinder.com/icondetails/1858/32/
+[linh]: http://linhpham.me/#works
+[iconnew]: https://www.iconfinder.com/icons/284001/cloud_upload_icon
+[iconold]: http://www.iconfinder.com/icondetails/1858/32/
 [slate]: https://github.com/jsncostello/slate
 
 

fabfile.py

@@ -81,7 +81,7 @@ def decorated(*args, **kwargs):
         data_files=DATA_FILES,
         options={'py2app': OPTIONS},
         setup_requires=['py2app'],
-        install_requires=['pyobjc'],
+        install_requires=['pyobjc-core'],
     )
 
     # Some cleanup.

lib/updater.py

@@ -14,7 +14,7 @@ class SparkleUpdater(NSObject):
     """
 
     def init(self):
-        super(SparkleUpdater, self).init()
+        #super(SparkleUpdater, self).init()
 
         # Load Sparkle framework.
         bundle_path = os.path.join(

upshot.py

@@ -49,9 +49,9 @@
 
 class Upshot(NSObject):
     """OS X status bar icon."""
-    image_paths = {
-        'icon16': 'icon16.png',
-        'icon16-off': 'icon16-off.png',
+    icon_paths = {
+        'icon_on': 'status',  # Refers to resources/<name>.png and <name>@2x.png
+        'icon_off': 'status-off',
     }
     images = {}
     statusitem = None
@@ -96,11 +96,11 @@ def build_menu(self):
         self.statusitem = statusbar.statusItemWithLength_(NSVariableStatusItemLength)
 
         # Set statusbar icon and color/grayscale mode.
-        for tag, img in self.image_paths.items():
-            self.images[tag] = NSImage.alloc().initByReferencingFile_(img)
-            self.images[tag].setTemplate_(
-                utils.get_pref('iconset') == 'grayscale')
-        self.statusitem.setImage_(self.images['icon16'])
+        for tag, img in self.icon_paths.items():
+            # Automatically pick named file as 1x or 2x based on Retina.
+            self.images[tag] = NSImage.imageNamed_(img)
+            self.images[tag].setTemplate_(True)
+        self.statusitem.setImage_(self.images['icon_on'])
 
         self.statusitem.setHighlightMode_(1)
         self.statusitem.setToolTip_('Upshot Screenshot Sharing')
@@ -163,13 +163,9 @@ def update_menu(self):
         if self.statusitem is None:
             return
 
-        # Apply iconset
-        self.images['icon16'].setTemplate_(
-            utils.get_pref('iconset') == 'grayscale')
-
         running = (self.observer is not None)
-        self.statusitem.setImage_(self.images['icon16' if running else
-                                              'icon16-off'])
+        self.statusitem.setImage_(self.images['icon_on' if running else
+                                              'icon_off'])
 
         if utils.get_pref('dropboxid'):  # Runnable.
             self.menuitems['stop'].setHidden_(not running)