Changeset 998:6fda08fc895b

Timestamp:

07/04/19 18:08:19 (5 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Using 'GdkPixbuf' instead of 'gdkPixbuf', 'AppIndicator3' instead of 'appindicator' and 'Pango' instead of 'pango' (re #347)

Location:

src/mlx/gui

Files:

• common.py (modified) (3 diffs)
• flight.py (modified) (8 diffs)
• statusicon.py (modified) (2 diffs)

src/mlx/gui/common.py

@@ -24 +24 @@
 gi.require_version("Gdk", "3.0")
 from gi.repository import Gdk
-from gi.repository import GdkPixbuf as gdkPixbuf
+from gi.repository import GdkPixbuf
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 try:
     gi.require_version("AppIndicator3", "0.1")
-    from gi.repository import AppIndicator3 as appindicator
+    from gi.repository import AppIndicator3
     appIndicator = True
 except:
     pass
-from gi.repository import Pango as pango
+from gi.repository import Pango
 
 
@@ -75 +75 @@
 POLICY_ALWAYS = Gtk.PolicyType.ALWAYS
 
-WEIGHT_NORMAL = pango.Weight.NORMAL
-WEIGHT_BOLD = pango.Weight.BOLD
+WEIGHT_NORMAL = Pango.Weight.NORMAL
+WEIGHT_BOLD = Pango.Weight.BOLD
 
 WINDOW_STATE_ICONIFIED = Gdk.WindowState.ICONIFIED
@@ -95 +95 @@
 SELECTION_MULTIPLE = Gtk.SelectionMode.MULTIPLE
 
-pixbuf_new_from_file = gdkPixbuf.Pixbuf.new_from_file
+pixbuf_new_from_file = GdkPixbuf.Pixbuf.new_from_file
 
 import codecs

src/mlx/gui/flight.py

@@ -84 +84 @@
 
         titleLabel = Gtk.Label(title)
-        titleLabel.modify_font(pango.FontDescription("bold 24"))
+        titleLabel.modify_font(Pango.FontDescription("bold 24"))
         alignment.set_padding(padding_top = 4, padding_bottom = 4,
                               padding_left = 6, padding_right = 0)
@@ -714 +714 @@
         layout = cr.create_layout()
         layout.set_text("Malév VA official briefing")
-        font = pango.FontDescription("sans")
-        font.set_size(int(32 * scale * pango.SCALE))
-        font.set_weight(pango.WEIGHT_NORMAL)
+        font = Pango.FontDescription("sans")
+        font.set_size(int(32 * scale * Pango.SCALE))
+        font.set_weight(Pango.WEIGHT_NORMAL)
         layout.set_font_description(font)
 
         (_ink, (x0, y0, x1, y1)) = layout.get_extents()
-        width = float(x1 + 1 - x0) / pango.SCALE
+        width = float(x1 + 1 - x0) / Pango.SCALE
 
         y = 25 * scale
@@ -730 +730 @@
         cr.fill()
 
-        y += float(y1 + 1 - y0) / pango.SCALE
+        y += float(y1 + 1 - y0) / Pango.SCALE
         y += 6 * scale
 
@@ -736 +736 @@
         layout.set_text("%s (%s) részére" %
                         (loginResult.pilotName, loginResult.pilotID))
-        font = pango.FontDescription("sans")
-        font.set_size(int(16 * scale * pango.SCALE))
+        font = Pango.FontDescription("sans")
+        font.set_size(int(16 * scale * Pango.SCALE))
         font.set_weight(450)
         layout.set_font_description(font)
         (_ink, (x0, y0, x1, y1)) = layout.get_extents()
-        width = float(x1 + 1 - x0) / pango.SCALE
+        width = float(x1 + 1 - x0) / Pango.SCALE
 
         cr.move_to((context.get_width() - width)/2.0, y)
@@ -749 +749 @@
         cr.fill()
 
-        y += float(y1 + 1 - y0) / pango.SCALE
+        y += float(y1 + 1 - y0) / Pango.SCALE
         y += 4 * scale
 
@@ -759 +759 @@
         y += 20 * scale
 
-        font = pango.FontDescription("sans")
-        font.set_size(int(7 * scale * pango.SCALE))
+        font = Pango.FontDescription("sans")
+        font.set_size(int(7 * scale * Pango.SCALE))
         font.set_weight(150)
 
@@ -807 +807 @@
             labelLayouts.append((labelLayout, valueLayout, labelHeight))
 
-        maxLabelWidth = maxLabelWidth / pango.SCALE
+        maxLabelWidth = maxLabelWidth / Pango.SCALE
 
         valueX = labelX + labelValueFill + maxLabelWidth
@@ -815 +815 @@
             (labelFill + maxLabelWidth + labelValueFill + valueFill)
         for (labelLayout, valueLayout, labelHeight) in labelLayouts:
-            valueLayout.set_width(int(valueWidth * pango.SCALE))
+            valueLayout.set_width(int(valueWidth * Pango.SCALE))
 
             (_ink, (x0, y0, x1, y1)) = valueLayout.get_extents()
             valueHeight = y1 + 1 - y0
 
-            height = float(max(labelHeight, valueHeight))/pango.SCALE
+            height = float(max(labelHeight, valueHeight))/Pango.SCALE
             layouts.append((labelLayout, valueLayout, height))
 

src/mlx/gui/statusicon.py

@@ -74 +74 @@
 
         if appIndicator:
-            indicator = appindicator.Indicator.new ("mava-logger-x", iconFile,
-                                                    appindicator.IndicatorCategory.APPLICATION_STATUS)
-            indicator.set_status (appindicator.IndicatorStatus.ACTIVE)
+            indicator = AppIndicator3.Indicator.new ("mava-logger-x", iconFile,
+                                                     AppIndicator3.IndicatorCategory.APPLICATION_STATUS)
+            indicator.set_status (AppIndicator3.IndicatorStatus.ACTIVE)
 
             indicator.set_menu(menu)
@@ -122 +122 @@
         """Hide and destroy the status icon."""
         if appIndicator:
-            self._indicator.set_status(appindicator.IndicatorStatus.PASSIVE)
+            self._indicator.set_status(AppIndicator3.IndicatorStatus.PASSIVE)
         else:
             self._statusIcon.set_visible(False)