Changeset 994:e71fbf2ee978 for src/mlx/gui/statusbar.py

Timestamp:

07/04/19 17:29:58 (5 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

hg-Phase:

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

Message:

Removed conditions on pygobject (re #347)

File:

• src/mlx/gui/statusbar.py (modified) (3 diffs)

src/mlx/gui/statusbar.py

@@ -30 +30 @@
         self._connected = False
         
-        self.set_shadow_type(gtk.ShadowType.NONE if pygobject
-                             else gtk.SHADOW_NONE)
+        self.set_shadow_type(gtk.ShadowType.NONE)
 
         frameAlignment = gtk.Alignment(xscale = 1.0, yscale = 1.0)
@@ -55 +54 @@
         self._connStateArea.set_tooltip_markup(xstr("statusbar_conn_tooltip"))
 
-        if pygobject:
-            self._connStateArea.connect("draw", self._drawConnState)
-        else:
-            self._connStateArea.connect("expose_event", self._drawConnState)
+        self._connStateArea.connect("draw", self._drawConnState)
 
         alignment = gtk.Alignment(xalign = 0.5, yalign = 0.5)
@@ -130 +126 @@
             icon = self._connGreyIcon
 
-        if pygobject:
-            gdk.cairo_set_source_pixbuf(eventOrContext, icon, 0, 0)
-            eventOrContext.paint()
-        else:
-            gc = connStateArea.get_style().fg_gc[gtk.STATE_NORMAL]
-            drawable = connStateArea.get_window()
-            drawable.draw_pixbuf(gc, icon, 0, 0, 0, 0)
+        gdk.cairo_set_source_pixbuf(eventOrContext, icon, 0, 0)
+        eventOrContext.paint()
 
     def _updateFlightStatus(self):