From df5aa3102f9d0257224ee9423afdfd42f00592ac Mon Sep 17 00:00:00 2001
From: Marek Siarkowicz <mareksiarkowicz@gmail.com>
Date: Mon, 15 Jun 2015 13:20:28 +0200
Subject: Refactor. Move.

---
 parrot_zik/indicator/mac.py | 66 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 parrot_zik/indicator/mac.py

(limited to 'parrot_zik/indicator/mac.py')

diff --git a/parrot_zik/indicator/mac.py b/parrot_zik/indicator/mac.py
new file mode 100644
index 0000000..8fdd1e6
--- /dev/null
+++ b/parrot_zik/indicator/mac.py
@@ -0,0 +1,66 @@
+import os
+import sys
+
+from Foundation import *
+from AppKit import *
+from PyObjCTools import AppHelper
+
+from .base import BaseIndicator
+from .base import MenuItemBase
+from ..status_app_mac import StatusApp
+
+
+class DarwinIndicator(BaseIndicator):
+    def __init__(self, icon, menu):
+        self.icon_directory = os.path.join(
+            os.path.dirname(os.path.realpath(sys.argv[0])), 'share', 'icons', 'zik')
+        statusicon = StatusApp.sharedApplication()
+        statusicon.initMenu(menu)
+        super(DarwinIndicator, self).__init__(icon, menu, statusicon)
+
+    def setIcon(self, name):
+        self.statusicon.setIcon(name, self.icon_directory)
+
+    def main(self):
+        AppHelper.runEventLoop()
+
+    def show_about_dialog(self, widget):
+        pass
+
+
+class NSMenu(object):
+    def __init__(self):
+        self.actions = {}
+        self.menubarMenu = NSMenu.alloc().init()
+        self.menubarMenu.setAutoenablesItems_(False)
+
+    def append(self, menu_item):
+        self.actions[menu_item.title] = menu_item.action
+        self.menubarMenu.addItem_(menu_item.nsmenu_item)
+
+    def reposition(self):
+        #  TODO
+        pass
+
+
+class NSMenuItem(MenuItemBase):
+    def __init__(self, name, action, sensitive=True, checkitem=False, visible=True):
+        self.title = name
+        self.action = action
+        nsmenu_item = (
+            NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(
+                name, 'clicked:', ''))
+        super(NSMenuItem, self).__init__(nsmenu_item, sensitive, visible)
+
+    def set_sensitive(self, option):
+        self.base_item.setEnabled_(option)
+
+    def set_active(self, option):
+        self.base_item.setState_(option)
+
+    def get_active(self):
+        return self.base_item.state
+
+    def set_label(self, option):
+        self.title = option
+        self.base_item.setTitle_(option)
-- 
cgit v1.2.1


From 3b4f022722e43d5821f4d2276018242c88cb1ed3 Mon Sep 17 00:00:00 2001
From: Marek Siarkowicz <mareksiarkowicz@gmail.com>
Date: Mon, 15 Jun 2015 13:30:06 +0200
Subject: Fix quit wrapping.

---
 parrot_zik/indicator/mac.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'parrot_zik/indicator/mac.py')

diff --git a/parrot_zik/indicator/mac.py b/parrot_zik/indicator/mac.py
index 8fdd1e6..d28ee26 100644
--- a/parrot_zik/indicator/mac.py
+++ b/parrot_zik/indicator/mac.py
@@ -27,6 +27,9 @@ class DarwinIndicator(BaseIndicator):
     def show_about_dialog(self, widget):
         pass
 
+    def quit(self, _):
+        pass
+
 
 class NSMenu(object):
     def __init__(self):
-- 
cgit v1.2.1


From f291feaa8a33645850818f811ba8d7f9eb9d4c31 Mon Sep 17 00:00:00 2001
From: Marek Siarkowicz <mareksiarkowicz@gmail.com>
Date: Mon, 15 Jun 2015 13:41:06 +0200
Subject: Refactor.

---
 parrot_zik/indicator/mac.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'parrot_zik/indicator/mac.py')

diff --git a/parrot_zik/indicator/mac.py b/parrot_zik/indicator/mac.py
index d28ee26..232e010 100644
--- a/parrot_zik/indicator/mac.py
+++ b/parrot_zik/indicator/mac.py
@@ -21,7 +21,8 @@ class DarwinIndicator(BaseIndicator):
     def setIcon(self, name):
         self.statusicon.setIcon(name, self.icon_directory)
 
-    def main(self):
+    @classmethod
+    def main(cls):
         AppHelper.runEventLoop()
 
     def show_about_dialog(self, widget):
-- 
cgit v1.2.1


From e7089b04e59ae1cf7a24649ec2ef64af56eb7dce Mon Sep 17 00:00:00 2001
From: Marek Siarkowicz <mareksiarkowicz@gmail.com>
Date: Mon, 15 Jun 2015 17:46:22 +0200
Subject: Use absolute package imports.

---
 parrot_zik/indicator/mac.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'parrot_zik/indicator/mac.py')

diff --git a/parrot_zik/indicator/mac.py b/parrot_zik/indicator/mac.py
index 232e010..ceeacb0 100644
--- a/parrot_zik/indicator/mac.py
+++ b/parrot_zik/indicator/mac.py
@@ -5,9 +5,9 @@ from Foundation import *
 from AppKit import *
 from PyObjCTools import AppHelper
 
-from .base import BaseIndicator
-from .base import MenuItemBase
-from ..status_app_mac import StatusApp
+from parrot_zik.indicator.base import BaseIndicator
+from parrot_zik.indicator.base import MenuItemBase
+from parrot_zik.status_app_mac import StatusApp
 
 
 class DarwinIndicator(BaseIndicator):
-- 
cgit v1.2.1