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

src/mlx/gui/callouts.py

@@ -54 +54 @@
                                                      xstr("callouts_title"),
                                                      gui.mainWindow,
-                                                     DIALOG_MODAL)
-
-        self.add_button(xstr("button_cancel"), RESPONSETYPE_REJECT)
-        self.add_button(xstr("button_ok"), RESPONSETYPE_ACCEPT)
+                                                     Gtk.DialogFlags.MODAL)
+
+        self.add_button(xstr("button_cancel"), Gtk.ResponseType.REJECT)
+        self.add_button(xstr("button_ok"), Gtk.ResponseType.ACCEPT)
 
         self._gui = gui
@@ -133 +133 @@
 
         self._fileListModel = Gtk.ListStore(int, str, str)
-        self._fileListModel.set_sort_column_id(0, SORT_DESCENDING)
+        self._fileListModel.set_sort_column_id(0, Gtk.SortType.DESCENDING)
 
         self._addingFile = False
@@ -156 +156 @@
         column.set_sort_indicator(True)
         column.set_sort_column_id(0)
-        column.set_sort_order(SORT_DESCENDING)
+        column.set_sort_order(Gtk.SortType.DESCENDING)
         column.set_expand(False)
 
@@ -173 +173 @@
                                self._fileListButtonPressed)
         selection = self._fileList.get_selection()
-        selection.set_mode(SELECTION_MULTIPLE)
+        selection.set_mode(Gtk.SelectionMode.MULTIPLE)
         selection.connect("changed", self._fileListSelectionChanged)
 
@@ -181 +181 @@
         scrolledWindow.add(self._fileList)
         scrolledWindow.set_size_request(300, -1)
-        scrolledWindow.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
-        scrolledWindow.set_shadow_type(SHADOW_IN)
+        scrolledWindow.set_policy(Gtk.PolicyType.AUTOMATIC,
+                                  Gtk.PolicyType.AUTOMATIC)
+        scrolledWindow.set_shadow_type(Gtk.ShadowType.IN)
         
         fileListAlignment = Gtk.Alignment(xscale=1.0, yscale=1.0, 
@@ -204 +205 @@
         self.hide()
 
-        if response==RESPONSETYPE_ACCEPT:
+        if response==Gtk.ResponseType.ACCEPT:
             self._saveApproachCallouts()
             config = self._gui.config
@@ -225 +226 @@
         dialog.hide()
 
-        if result==RESPONSETYPE_OK:
+        if result==Gtk.ResponseType.OK:
             filePath = dialog.get_filename()
             baseName = os.path.basename(filePath)
@@ -293 +294 @@
         if otherPath is not None:
             dialog = Gtk.MessageDialog(parent = self,
-                                       type = MESSAGETYPE_QUESTION,
+                                       type = Gtk.MessageType.QUESTION,
                                        message_format =
                                        xstr("callouts_altitude_clash"))
             dialog.format_secondary_markup(xstr("callouts_altitude_clash_sec"))
-            dialog.add_button(xstr("button_no"), RESPONSETYPE_NO)
-            dialog.add_button(xstr("button_yes"), RESPONSETYPE_YES)
+            dialog.add_button(xstr("button_no"), Gtk.ResponseType.NO)
+            dialog.add_button(xstr("button_yes"), Gtk.ResponseType.YES)
             dialog.set_title(WINDOW_TITLE_BASE)
 
@@ -304 +305 @@
             dialog.hide()
 
-            if result!=RESPONSETYPE_YES:
+            if result!=Gtk.ResponseType.YES:
                 newAltitude = None
                 
@@ -348 +349 @@
             dialog = Gtk.FileChooserDialog(title = WINDOW_TITLE_BASE + " - " +
                                            xstr("callouts_open_title"),
-                                           action = FILE_CHOOSER_ACTION_OPEN,
+                                           action = Gtk.FileChooserAction.OPEN,
                                            buttons = (Gtk.STOCK_CANCEL,
-                                                      RESPONSETYPE_CANCEL,
-                                                      Gtk.STOCK_OK, RESPONSETYPE_OK),
+                                                      Gtk.ResponseType.CANCEL,
+                                                      Gtk.STOCK_OK, Gtk.ResponseType.OK),
                                            parent = self)
             dialog.set_modal(True)            
@@ -389 +390 @@
         if altitude is not None: return altitude
 
-        descending = self._fileList.get_column(0).get_sort_order()==SORT_DESCENDING
+        descending = self._fileList.get_column(0).get_sort_order()==Gtk.SortType.DESCENDING
         model = self._fileListModel
         numEntries = model.iter_n_children(None)
@@ -473 +474 @@
     def _fileListButtonPressed(self, widget, event):
         """Called when a mouse button is pressed on the file list."""
-        if event.type!=EVENT_BUTTON_PRESS or event.button!=3:
+        if event.type!=Gdk.EventType.BUTTON_PRESS or event.button!=3:
             return