Changeset 999:e096a5638b87 for src/mlx/gui/pirep.py

Timestamp:

07/04/19 18:54:23 (5 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Removed Gtk 2/3 constant definitions (re #347)

File:

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

src/mlx/gui/pirep.py

@@ -40 +40 @@
         heading.set_editable(False)
         heading.set_can_focus(False)
-        heading.set_wrap_mode(WRAP_WORD)
+        heading.set_wrap_mode(Gtk.WrapMode.WORD)
         heading.set_size_request(-1, 16)
 
         buffer = heading.get_buffer()
-        self._headingTag  = buffer.create_tag("heading", weight=WEIGHT_BOLD)
+        self._headingTag  = buffer.create_tag("heading", weight=Pango.Weight.BOLD)
         buffer.set_text("%s - %s" % (senderPID, senderName))
         buffer.apply_tag(self._headingTag,
@@ -57 +57 @@
 
         self._messageView = messageView = Gtk.TextView()
-        messageView.set_wrap_mode(WRAP_WORD)
+        messageView.set_wrap_mode(Gtk.WrapMode.WORD)
         messageView.set_editable(False)
         messageView.set_can_focus(False)
@@ -112 +112 @@
 
         scroller = Gtk.ScrolledWindow()
-        scroller.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
-        scroller.set_shadow_type(SHADOW_NONE)
+        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        scroller.set_shadow_type(Gtk.ShadowType.NONE)
 
         self._messages = Gtk.VBox()
@@ -204 +204 @@
         - the text view."""
         scrolledWindow = Gtk.ScrolledWindow()
-        scrolledWindow.set_shadow_type(SHADOW_IN)
-        scrolledWindow.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
+        scrolledWindow.set_shadow_type(Gtk.ShadowType.IN)
+        scrolledWindow.set_policy(Gtk.PolicyType.AUTOMATIC,
+                                  Gtk.PolicyType.AUTOMATIC)
 
         textView = Gtk.TextView()
-        textView.set_wrap_mode(WRAP_WORD)
+        textView.set_wrap_mode(Gtk.WrapMode.WORD)
         textView.set_editable(editable)
         textView.set_cursor_visible(editable)
@@ -313 +314 @@
             self._notebook.append_page(messagesTab, label)
 
-        self._okButton = self.add_button(xstr("button_ok"), RESPONSETYPE_OK)
+        self._okButton = self.add_button(xstr("button_ok"), Gtk.ResponseType.OK)
         self._okButton.set_can_default(True)
 
@@ -868 +869 @@
         self._notebook.append_page(logTab, label)
 
-        self.add_button(xstr("button_cancel"), RESPONSETYPE_CANCEL)
-
-        self._okButton = self.add_button(xstr("button_save"), RESPONSETYPE_NONE)
+        self.add_button(xstr("button_cancel"), Gtk.ResponseType.CANCEL)
+
+        self._okButton = self.add_button(xstr("button_save"), Gtk.ResponseType.NONE)
         self._okButton.connect("clicked", self._okClicked)
         self._okButton.set_can_default(True)
@@ -1512 +1513 @@
         The PIREP is updated from the data in the window."""
         if not askYesNo(xstr("pirepEdit_save_question"), parent = self):
-            self.response(RESPONSETYPE_CANCEL)
+            self.response(Gtk.ResponseType.CANCEL)
 
         pirep = self._pirep
@@ -1559 +1560 @@
         pirep.flightDefects = self._flightInfo.faultsAndExplanations
 
-        self.response(RESPONSETYPE_OK)
+        self.response(Gtk.ResponseType.OK)