Changeset 998:6fda08fc895b for src/mlx/gui/flight.py

Timestamp:

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

Author:

István Váradi <ivaradi@…>

Branch:

python3

hg-Phase:

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

Message:

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

File:

• src/mlx/gui/flight.py (modified) (8 diffs)

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))