Changeset 1002:5e741be6b47c for src/mlx

Timestamp:

07/06/19 13:54:20 (5 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

The printing of a briefing works with Gtk 3 (re #347)

Location:

src/mlx/gui

Files:

• common.py (modified) (1 diff)
• flight.py (modified) (10 diffs)

src/mlx/gui/common.py

@@ -34 +34 @@
     pass
 from gi.repository import Pango
+from gi.repository import PangoCairo
 
 import codecs

src/mlx/gui/flight.py

@@ -684 +684 @@
         printOperation.set_use_full_page(False)
 
-        result = printOperation.run(Gtk.PRINT_OPERATION_ACTION_PRINT_DIALOG,
+        result = printOperation.run(Gtk.PrintOperationAction.PRINT_DIALOG,
                                     wizard.gui.mainWindow)
 
-        if result == Gtk.PRINT_OPERATION_RESULT_APPLY:
+        if result == Gtk.PrintOperationResult.APPLY:
             self._printSettings = printOperation.get_print_settings()
-        elif result == Gtk.PRINT_OPERATION_RESULT_ERROR:
+        elif result == Gtk.PrintOperationResult.ERROR:
             errorDialog(xstr("flightsel_print_failed",
                              wizard.gui.mainWindow,
@@ -705 +705 @@
 
         cr = context.get_cairo_context()
+
         cr.set_antialias(cairo.ANTIALIAS_GRAY)
 
@@ -712 +713 @@
         cr.stroke()
 
-        layout = cr.create_layout()
+        pcr = context.create_pango_context()
+
+        layout = Pango.Layout(pcr) # cr.create_layout()
         layout.set_text("Malév VA official briefing")
         font = Pango.FontDescription("sans")
@@ -719 +722 @@
         layout.set_font_description(font)
 
-        (_ink, (x0, y0, x1, y1)) = layout.get_extents()
-        width = float(x1 + 1 - x0) / Pango.SCALE
+        (_ink, logical) = layout.get_extents()
+        width = logical.width / Pango.SCALE
 
         y = 25 * scale
@@ -726 +729 @@
         cr.move_to((context.get_width() - width)/2.0, y)
         cr.set_line_width(0.1 * scale)
-        cr.layout_path(layout)
+        PangoCairo.layout_path(cr, layout)
         cr.stroke_preserve()
         cr.fill()
 
-        y += float(y1 + 1 - y0) / Pango.SCALE
+        y += logical.height / Pango.SCALE
         y += 6 * scale
 
-        layout = cr.create_layout()
+        layout = Pango.Layout(pcr)
         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.set_weight(450)
+        font.set_weight(Pango.Weight.MEDIUM)
         layout.set_font_description(font)
-        (_ink, (x0, y0, x1, y1)) = layout.get_extents()
-        width = float(x1 + 1 - x0) / Pango.SCALE
+        (_ink, logical) = layout.get_extents()
+        width = logical.width / Pango.SCALE
 
         cr.move_to((context.get_width() - width)/2.0, y)
         cr.set_line_width(0.1 * scale)
-        cr.layout_path(layout)
+        PangoCairo.layout_path(cr, layout)
         cr.stroke_preserve()
         cr.fill()
 
-        y += float(y1 + 1 - y0) / Pango.SCALE
+        y += logical.height / Pango.SCALE
         y += 4 * scale
 
@@ -761 +764 @@
         font = Pango.FontDescription("sans")
         font.set_size(int(7 * scale * Pango.SCALE))
-        font.set_weight(150)
+        font.set_weight(Pango.Weight.ULTRALIGHT)
 
         table = []
@@ -793 +796 @@
         totalHeight = 0
         for (label, value) in table:
-            labelLayout = cr.create_layout()
+            labelLayout = Pango.Layout(pcr)
             labelLayout.set_text(label)
             labelLayout.set_font_description(font)
 
-            (_ink, (x0, y0, x1, y1)) = labelLayout.get_extents()
-            maxLabelWidth = max(maxLabelWidth, x1 + 1 - x0)
-            labelHeight = y1 + 1 - y0
-
-            valueLayout = cr.create_layout()
+            (_ink, logical) = labelLayout.get_extents()
+            maxLabelWidth = max(maxLabelWidth, logical.width)
+            labelHeight = logical.height
+
+            valueLayout = Pango.Layout(pcr)
             valueLayout.set_text(value)
             valueLayout.set_font_description(font)
@@ -817 +820 @@
             valueLayout.set_width(int(valueWidth * Pango.SCALE))
 
-            (_ink, (x0, y0, x1, y1)) = valueLayout.get_extents()
-            valueHeight = y1 + 1 - y0
+            (_ink, logical) = valueLayout.get_extents()
+            valueHeight = logical.height
 
             height = float(max(labelHeight, valueHeight))/Pango.SCALE
@@ -837 +840 @@
             cr.move_to(labelX, y)
             cr.set_line_width(0.1)
-            cr.layout_path(labelLayout)
+            PangoCairo.layout_path(cr, labelLayout)
             cr.stroke_preserve()
             cr.fill()
@@ -843 +846 @@
             cr.move_to(valueX, y)
             cr.set_line_width(0.1)
-            cr.layout_path(valueLayout)
+            PangoCairo.layout_path(cr, valueLayout)
             cr.stroke_preserve()
             cr.fill()