aboutsummaryrefslogtreecommitdiff
path: root/parrot_zik/indicator
diff options
context:
space:
mode:
Diffstat (limited to 'parrot_zik/indicator')
-rw-r--r--parrot_zik/indicator/__init__.py25
-rw-r--r--parrot_zik/indicator/gtk_wrapping.py2
-rw-r--r--parrot_zik/indicator/linux.py2
-rw-r--r--parrot_zik/indicator/mac.py6
-rw-r--r--parrot_zik/indicator/windows.py2
5 files changed, 16 insertions, 21 deletions
diff --git a/parrot_zik/indicator/__init__.py b/parrot_zik/indicator/__init__.py
index aeda305..4194dde 100644
--- a/parrot_zik/indicator/__init__.py
+++ b/parrot_zik/indicator/__init__.py
@@ -2,22 +2,17 @@ __all__ = ('SysIndicator', 'Menu', 'MenuItem')
import sys
-if sys.platform == 'linux2':
- import linux
- import gtk_wrapping
- SysIndicator = linux.LinuxIndicator
- Menu = gtk_wrapping.GTKMenu
- MenuItem = gtk_wrapping.GTKMenuItem
+if sys.platform in ['linux', 'linux2']:
+ from parrot_zik.indicator.linux import LinuxIndicator 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 == 'win32':
- import gtk_wrapping
- import windows
- SysIndicator = windows.WindowsIndicator
- Menu = gtk_wrapping.GTKMenu
- MenuItem = gtk_wrapping.GTKMenuItem
+ 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':
- import mac
- SysIndicator = mac.DarwinIndicator
- Menu = mac.NSMenu
- MenuItem = mac.NSMenuItem
+ 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/gtk_wrapping.py b/parrot_zik/indicator/gtk_wrapping.py
index 9494adc..ce78c1d 100644
--- a/parrot_zik/indicator/gtk_wrapping.py
+++ b/parrot_zik/indicator/gtk_wrapping.py
@@ -1,6 +1,6 @@
import gtk
-from .base import MenuItemBase
+from parrot_zik.indicator.base import MenuItemBase
class GTKMenu(object):
diff --git a/parrot_zik/indicator/linux.py b/parrot_zik/indicator/linux.py
index fc0f425..278f781 100644
--- a/parrot_zik/indicator/linux.py
+++ b/parrot_zik/indicator/linux.py
@@ -2,7 +2,7 @@ import os
import gtk
-from .base import BaseIndicator
+from parrot_zik.indicator.base import BaseIndicator
class LinuxIndicator(BaseIndicator):
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):
diff --git a/parrot_zik/indicator/windows.py b/parrot_zik/indicator/windows.py
index 79a4ef3..f10c91a 100644
--- a/parrot_zik/indicator/windows.py
+++ b/parrot_zik/indicator/windows.py
@@ -3,7 +3,7 @@ import tempfile
import gtk
import os
-from .base import BaseIndicator
+from parrot_zik.indicator.base import BaseIndicator
class WindowsIndicator(BaseIndicator):