Changeset 575:a54baa5b89c3

Timestamp:

12/07/14 15:07:24 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Extracted some of the common imports into a non-GUI-specific module

Location:

src/mlx

Files:

• common.py (added)
• gui/common.py (modified) (4 diffs)

src/mlx/gui/common.py

@@ +1 @@
+
+from mlx.common import *
 
 import mlx.const as _const
@@ -26 +28 @@
 appIndicator = False
 
-if os.name=="nt" or "FORCE_PYGTK" in os.environ:
+if not pygobject:
     print "Using PyGTK"
     pygobject = False
@@ -32 +34 @@
     import gtk.gdk as gdk
     import gtk
-    import gobject
     import pango
+
     try:
         import appindicator
@@ -105 +107 @@
         return str(text)
 
-else:
-    print "Using PyGObject"
-    pygobject = True
+else: # pygobject
     from gi.repository import Gdk as gdk
     from gi.repository import GdkPixbuf as gdkPixbuf
     from gi.repository import Gtk as gtk
-    from gi.repository import GObject as gobject
     from gi.repository import AppIndicator3 as appindicator
     from gi.repository import Pango as pango
+
     appIndicator = True
+
 
     MESSAGETYPE_ERROR = gtk.MessageType.ERROR