Merge pull request #12 from serathius/master

Rework and Zik 2.0 implementation.

1 files changed, 0 insertions, 155 deletions

diff --git a/SysIndicator.py b/SysIndicator.py
deleted file mode 100644
index 3c79286..0000000
--- a/SysIndicator.py
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import re
-import os
-import tempfile
-
-if sys.platform=="linux2" or sys.platform=="win32":
-    import gtk
-elif sys.platform=="darwin":
-    import objc
-    from Foundation import *
-    from AppKit import *
-    from PyObjCTools import AppHelper
-    from StatusAppMac import StatusApp
-
-
-class SysIndicator:
-    def __init__(self, icon,menu):
-        if sys.platform=="linux2":
-            self.menu = menu.gtk_menu
-            import appindicator
-            self.icon_directory = os.path.sep + 'usr' + os.path.sep+ 'share' + os.path.sep+'icons' + os.path.sep+'zik'+ os.path.sep
-            if not os.path.isdir(self.icon_directory):
-							self.icon_directory = os.path.dirname(sys.argv[0]) + os.path.sep + 'share' + os.path.sep+'icons' + os.path.sep+'zik'+ os.path.sep
-            self.statusicon = appindicator.Indicator("new-parrotzik-indicator",
-                                           "indicator-messages",
-                                           appindicator.CATEGORY_APPLICATION_STATUS)
-            self.statusicon.set_status(appindicator.STATUS_ACTIVE)
-            self.statusicon.set_icon_theme_path(self.icon_directory)
-            self.statusicon.set_menu(self.menu)          
-            
-        elif sys.platform=="win32":  
-            self.menu = menu.gtk_menu          
-            self.icon_directory = os.path.dirname(os.path.realpath(sys.argv[0])) + os.path.sep+ 'share' + os.path.sep+'icons' + os.path.sep+'zik'+ os.path.sep
-            self.statusicon = gtk.StatusIcon()            
-            self.statusicon.connect("popup-menu", self.gtk_right_click_event)
-            self.statusicon.set_tooltip("Parrot Zik")
-            self.menu_shown=False
-            sys.stdout = open(tempfile.gettempdir()+os.path.sep+"zik_tray_stdout.log", "w")
-            sys.stderr = open(tempfile.gettempdir()+os.path.sep+"zik_tray_stderr.log", "w")    
-
-        elif sys.platform=="darwin":
-            self.icon_directory = os.path.dirname(os.path.realpath(sys.argv[0])) + os.path.sep+ 'share' + os.path.sep+'icons' + os.path.sep+'zik'+ os.path.sep
-            self.statusicon = StatusApp.sharedApplication()
-            self.statusicon.initMenu(menu)
-        
-        self.setIcon(icon)
-
-    def setIcon(self, name):
-        if sys.platform=="linux2":
-            self.statusicon.set_icon(name)
-        elif sys.platform=="win32":
-            self.statusicon.set_from_file(self.icon_directory+name+'.png') 
-        elif sys.platform=="darwin":
-            self.statusicon.setIcon(name,self.icon_directory)
-
-    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.popdown()
-
-    def main(self):
-        if sys.platform=="linux2" or sys.platform=="win32":
-            gtk.main()       
-        elif sys.platform=="darwin":
-            #self.statusicon.run()
-            AppHelper.runEventLoop()
-
-    def show_about_dialog(self, widget):
-        if sys.platform=="linux2" or sys.platform=="win32":
-            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 UniversalMenu:
-    def __init__(self):
-        if sys.platform=="linux2" or sys.platform=="win32":
-            self.gtk_menu = gtk.Menu()
-        elif sys.platform=="darwin":
-            self.actions = {}
-            self.menubarMenu = NSMenu.alloc().init()
-            self.menubarMenu.setAutoenablesItems_(False)
-            
-
-    def append(self,MenuItem):
-        if sys.platform=="linux2" or sys.platform=="win32":
-            self.gtk_menu.append(MenuItem.gtk_item)
-        elif sys.platform=="darwin":
-            self.actions[MenuItem.title] = MenuItem.action
-            self.menubarMenu.addItem_(MenuItem.nsmenu_item)
-
-class MenuItem:
-    def __init__(self,name,action,sensitive = True, checkitem = False):
-        if sys.platform=="linux2" or sys.platform=="win32":
-            if checkitem:
-                self.gtk_item=gtk.CheckMenuItem(name) 
-            else:
-                self.gtk_item=gtk.MenuItem(name) 
-            self.gtk_item.show()
-            if action:
-                self.gtk_item.connect("activate", action)
-
-        elif sys.platform=="darwin":
-            self.title = name
-            self.action = action
-            self.nsmenu_item = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(name, 'clicked:', '')
-
-        self.set_sensitive(sensitive)
-
-    def set_sensitive(self,option):
-        if sys.platform=="linux2" or sys.platform=="win32":
-            return self.gtk_item.set_sensitive(option)
-        elif sys.platform=="darwin":
-            self.nsmenu_item.setEnabled_(option)
-
-    def set_active(self,option):
-        if sys.platform=="linux2" or sys.platform=="win32":
-            return self.gtk_item.set_active(option)
-        elif sys.platform=="darwin":
-            self.nsmenu_item.setState_(option)
-
-    def get_active(self):
-        if sys.platform=="linux2" or sys.platform=="win32":
-            return self.gtk_item.get_active()
-        elif sys.platform=="darwin":
-            print self.nsmenu_item.state
-            return self.nsmenu_item.state
-
-
-    def set_label(self,option):
-        if sys.platform=="linux2" or sys.platform=="win32":
-            return self.gtk_item.set_label(option)
-        elif sys.platform=="darwin":
-            self.title = option
-            self.nsmenu_item.setTitle_(option)
-            #self.rumps_item.title=option
-
-if __name__ == "__main__":
-
-    quit_item = MenuItem("Quit",sys.exit,True)     
-
-    menu = UniversalMenu()
-    menu.append(quit_item)
-
-    indicator = SysIndicator(icon = "zik-audio-headset",menu = menu)
-    indicator.main()
\ No newline at end of file