Merge pull request #12 from serathius/master

Rework and Zik 2.0 implementation.

6 files changed, 305 insertions, 0 deletions

diff --git a/parrot_zik/indicator/__init__.py b/parrot_zik/indicator/__init__.py
new file mode 100644
index 0000000..156f7de
--- /dev/null
+++ b/parrot_zik/indicator/__init__.py
@@ -0,0 +1,25 @@
+__all__ = ('SysIndicator', 'Menu', 'MenuItem')
+
+import sys
+
+if sys.platform in ['linux', 'linux2']:
+    import argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--gtk", action="store_true")
+    args = parser.parse_args()
+    if args.gtk:
+        from parrot_zik.indicator.linux import LinuxGtkIndicator as SysIndicator
+    else:
+        from parrot_zik.indicator.linux import LinuxAppIndicator as SysIndicator
+    from parrot_zik.indicator.gtk_wrapping import GTKMenuItem as MenuItem
+    from parrot_zik.indicator.gtk_wrapping import GTKMenu as Menu
+elif sys.platform in ['win32']:
+    from parrot_zik.indicator.windows import WindowsIndicator as SysIndicator
+    from parrot_zik.indicator.gtk_wrapping import GTKMenuItem as MenuItem
+    from parrot_zik.indicator.gtk_wrapping import GTKMenu as Menu
+elif sys.platform == 'darwin':
+    from parrot_zik.indicator.mac import DarwinIndicator as SysIndicator
+    from parrot_zik.indicator.mac import NSMenuItem as MenuItem
+    from parrot_zik.indicator.mac import NSMenu as Menu
+else:
+    raise Exception('Platform not supported')
diff --git a/parrot_zik/indicator/base.py b/parrot_zik/indicator/base.py
new file mode 100644
index 0000000..b29368e
--- /dev/null
+++ b/parrot_zik/indicator/base.py
@@ -0,0 +1,48 @@
+class BaseIndicator(object):
+    def __init__(self, icon, menu, statusicon):
+        self.menu = menu
+        self.statusicon = statusicon
+        self.setIcon(icon)
+
+    def setIcon(self, name):
+        raise NotImplementedError
+
+    @classmethod
+    def main(cls):
+        raise NotImplementedError
+
+    def show_about_dialog(self, widget):
+        raise NotImplementedError
+
+    def quit(self, _):
+        raise NotImplementedError
+
+class MenuItemBase(object):
+    def __init__(self, base_item, sensitive, visible):
+        self.base_item = base_item
+        self.set_sensitive(sensitive)
+        if visible:
+            self.show()
+        else:
+            self.hide()
+
+    def set_sensitive(self, option):
+        raise NotImplementedError
+
+    def set_active(self, option):
+        raise NotImplementedError
+
+    def get_active(self):
+        raise NotImplementedError
+
+    def set_label(self, option):
+        raise NotImplementedError
+
+    def show(self):
+        self.base_item.show()
+
+    def hide(self):
+        self.base_item.hide()
+
+    def set_submenu(self, menu):
+        raise NotImplementedError
diff --git a/parrot_zik/indicator/gtk_wrapping.py b/parrot_zik/indicator/gtk_wrapping.py
new file mode 100644
index 0000000..6d4a5a8
--- /dev/null
+++ b/parrot_zik/indicator/gtk_wrapping.py
@@ -0,0 +1,46 @@
+import gtk
+
+from parrot_zik.indicator.base import MenuItemBase
+
+
+class GTKMenu(object):
+    def __init__(self):
+        self.gtk_menu = gtk.Menu()
+
+    def append(self, menu_item):
+        self.gtk_menu.append(menu_item.base_item)
+
+    def reposition(self):
+        self.gtk_menu.reposition()
+
+    def popup(self, *args, **kwargs):
+        self.gtk_menu.popup(*args, **kwargs)
+
+    def poVpdown(self, *args, **kwargs):
+        pass
+
+
+class GTKMenuItem(MenuItemBase):
+    def __init__(self, name, action, sensitive=True, checkitem=False, visible=True):
+        if checkitem:
+            gtk_item = gtk.CheckMenuItem(name)
+        else:
+            gtk_item = gtk.MenuItem(name)
+        if action:
+            gtk_item.connect("activate", action)
+        super(GTKMenuItem, self).__init__(gtk_item, sensitive, visible)
+
+    def set_sensitive(self, option):
+        return self.base_item.set_sensitive(option)
+
+    def set_active(self, option):
+        return self.base_item.set_active(option)
+
+    def get_active(self):
+        return self.base_item.get_active()
+
+    def set_label(self, option):
+        return self.base_item.set_label(option)
+
+    def set_submenu(self, menu):
+        self.base_item.set_submenu(menu.gtk_menu)
diff --git a/parrot_zik/indicator/linux.py b/parrot_zik/indicator/linux.py
new file mode 100644
index 0000000..f6f9cfc
--- /dev/null
+++ b/parrot_zik/indicator/linux.py
@@ -0,0 +1,69 @@
+import os
+
+import gtk
+
+from parrot_zik.indicator.base import BaseIndicator
+
+
+class LinuxIndicator(BaseIndicator):
+    def __init__(self, icon, menu, statusicon):
+        super(LinuxIndicator, self).__init__(icon, menu, statusicon)
+
+    def gtk_right_click_event(self, icon, button, time):
+        if not self.menu_shown:
+            self.menu_shown = True
+            self.menu.popup(None, None, gtk.status_icon_position_menu,
+                            button, time, self.statusicon)
+        else:
+            self.menu_shown = False
+            self.menu.poVpdown()
+
+    @classmethod
+    def main(cls):
+        gtk.main()
+
+    def quit(self, _):
+        gtk.main_quit()
+
+    def show_about_dialog(self, widget):
+        about_dialog = gtk.AboutDialog()
+        about_dialog.set_destroy_with_parent(True)
+        about_dialog.set_name("Parrot Zik Tray")
+        about_dialog.set_version("0.3")
+        about_dialog.set_authors(["Dmitry Moiseev m0sia@m0sia.ru"])
+        about_dialog.run()
+        about_dialog.destroy()
+
+
+class LinuxAppIndicator(LinuxIndicator):
+    def __init__(self, icon, menu):
+        import appindicator
+        self.icon_directory = os.path.join('/', 'usr', 'share', 'icons', 'zik')
+        if not os.path.isdir(self.icon_directory):
+            self.icon_directory = os.path.join('share', 'icons', 'zik')
+        statusicon = appindicator.Indicator(
+            "new-parrotzik-indicator", "indicator-messages",
+            appindicator.CATEGORY_APPLICATION_STATUS)
+        statusicon.set_status(appindicator.STATUS_ACTIVE)
+        statusicon.set_icon_theme_path(self.icon_directory)
+        statusicon.set_menu(menu.gtk_menu)
+        super(LinuxIndicator, self).__init__(icon, menu, statusicon)
+
+    def setIcon(self, name):
+        self.statusicon.set_icon(name)
+
+
+
+class LinuxGtkIndicator(LinuxIndicator):
+    def __init__(self, icon, menu):
+        self.icon_directory = os.path.join(
+            '/usr', 'share', 'icons/')
+        self.menu_shown = False
+        statusicon = gtk.StatusIcon()
+        statusicon.connect("popup-menu", self.gtk_right_click_event)
+        statusicon.set_tooltip("Parrot Zik")
+        super(LinuxIndicator, self).__init__(icon, menu, statusicon)
+
+    def setIcon(self, name):
+        self.statusicon.set_from_file(self.icon_directory + name + '.png')
+
diff --git a/parrot_zik/indicator/mac.py b/parrot_zik/indicator/mac.py
new file mode 100644
index 0000000..ceeacb0
--- /dev/null
+++ b/parrot_zik/indicator/mac.py
@@ -0,0 +1,70 @@
+import os
+import sys
+
+from Foundation import *
+from AppKit import *
+from PyObjCTools import AppHelper
+
+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):
+    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)
+
+    @classmethod
+    def main(cls):
+        AppHelper.runEventLoop()
+
+    def show_about_dialog(self, widget):
+        pass
+
+    def quit(self, _):
+        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)
diff --git a/parrot_zik/indicator/windows.py b/parrot_zik/indicator/windows.py
new file mode 100644
index 0000000..f10c91a
--- /dev/null
+++ b/parrot_zik/indicator/windows.py
@@ -0,0 +1,47 @@
+import sys
+import tempfile
+import gtk
+import os
+
+from parrot_zik.indicator.base import BaseIndicator
+
+
+class WindowsIndicator(BaseIndicator):
+    def __init__(self, icon, menu):
+        self.icon_directory = os.path.join(
+            os.path.dirname(os.path.realpath(sys.argv[0])), 'share', 'icons', 'zik')
+        self.menu_shown = False
+        sys.stdout = open(os.path.join(tempfile.gettempdir(), "zik_tray_stdout.log", "w"))
+        sys.stderr = open(os.path.join(tempfile.gettempdir(), "zik_tray_stderr.log", "w"))
+        statusicon = gtk.StatusIcon()
+        statusicon.connect("popup-menu", self.gtk_right_click_event)
+        statusicon.set_tooltip("Parrot Zik")
+        super(WindowsIndicator, self).__init__(icon, menu, statusicon)
+
+    def gtk_right_click_event(self, icon, button, time):
+        if not self.menu_shown:
+            self.menu_shown = True
+            self.menu.popup(None, None, gtk.status_icon_position_menu,
+                            button, time, self.statusicon)
+        else:
+            self.menu_shown = False
+            self.menu.poVpdown()
+
+    def setIcon(self, name):
+        self.statusicon.set_from_file(self.icon_directory + name + '.png')
+
+    @classmethod
+    def main(cls):
+        gtk.main()
+
+    def quit(self, _):
+        gtk.main_quit()
+
+    def show_about_dialog(self, widget):
+        about_dialog = gtk.AboutDialog()
+        about_dialog.set_destroy_with_parent(True)
+        about_dialog.set_name("Parrot Zik Tray")
+        about_dialog.set_version("0.3")
+        about_dialog.set_authors(["Dmitry Moiseev m0sia@m0sia.ru"])
+        about_dialog.run()
+        about_dialog.destroy()