Changeset 999:e096a5638b87 for src/mlx/gui/timetable.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/timetable.py (modified) (5 diffs)

src/mlx/gui/timetable.py

@@ -76 +76 @@
         self._model = Gtk.ListStore(*types)
         if defaultSortableIndex is not None:
-            sortOrder = SORT_DESCENDING \
+            sortOrder = Gtk.SortType.DESCENDING \
               if self._columnDescriptors[defaultSortableIndex-1]._defaultDescending \
-              else SORT_ASCENDING
+              else Gtk.SortType.ASCENDING
             self._model.set_sort_column_id(defaultSortableIndex, sortOrder)
         self._view = Gtk.TreeView(self._model)
@@ -175 +175 @@
     def _buttonPressEvent(self, widget, event):
         """Called when a mouse button is pressed or released."""
-        if event.type!=EVENT_BUTTON_PRESS or event.button!=3 or \
+        if event.type!=Gdk.EventType.BUTTON_PRESS or event.button!=3 or \
            self._popupMenuProducer is None:
             return
@@ -441 +441 @@
         contentArea.pack_start(frame, True, True, 4)
 
-        self.add_button(xstr("button_cancel"), RESPONSETYPE_CANCEL)
-
-        self._okButton = self.add_button(xstr("button_book"), RESPONSETYPE_OK)
+        self.add_button(xstr("button_cancel"), Gtk.ResponseType.CANCEL)
+
+        self._okButton = self.add_button(xstr("button_book"), Gtk.ResponseType.OK)
         self._okButton.set_use_underline(True)
         self._okButton.set_can_default(True)
@@ -755 +755 @@
         result = dialog.run()
         dialog.hide()
-        if result==RESPONSETYPE_OK:
+        if result==Gtk.ResponseType.OK:
             flightIDs = [flightPair.flight0.id]
             if flightPair.flight1 is not None:
@@ -772 +772 @@
         if returned:
             dialog = Gtk.MessageDialog(parent = self,
-                                       type = MESSAGETYPE_INFO,
+                                       type = Gtk.MessageType.INFO,
                                        message_format = xstr("bookflights_successful"))
             dialog.format_secondary_markup(xstr("bookflights_successful_secondary"))
         else:
             dialog = Gtk.MessageDialog(parent = self,
-                                       type = MESSAGETYPE_ERROR,
+                                       type = Gtk.MessageType.ERROR,
                                        message_format = xstr("bookflights_failed"))
             dialog.format_secondary_markup(xstr("bookflights_failed_secondary"))
 
-        dialog.add_button(xstr("button_ok"), RESPONSETYPE_OK)
+        dialog.add_button(xstr("button_ok"), Gtk.ResponseType.OK)
         dialog.set_title(WINDOW_TITLE_BASE)