Changeset 997:57814da33b6a

Timestamp:

07/04/19 18:02:37 (5 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Using 'Gdk' instead of 'gdk' (re #347)

Location:

src/mlx/gui

Files:

• cef.py (modified) (2 diffs)
• common.py (modified) (4 diffs)
• faultexplain.py (modified) (1 diff)
• flightlist.py (modified) (2 diffs)
• gui.py (modified) (2 diffs)
• statusbar.py (modified) (1 diff)
• timetable.py (modified) (2 diffs)

src/mlx/gui/cef.py

@@ -323 +323 @@
     """Start a browser instance in the given container with the given URL."""
     if os.name=="nt":
-        gdk.threads_enter()
+        Gdk.threads_enter()
         ctypes.pythonapi.PyCapsule_GetPointer.restype = ctypes.c_void_p
         ctypes.pythonapi.PyCapsule_GetPointer.argtypes = \
@@ -332 +332 @@
         windowID = libgdk.gdk_win32_window_get_handle(gpointer)
         container.windowID = windowID
-        gdk.threads_leave()
+        Gdk.threads_leave()
     else:
         container.set_visual(container.get_screen().lookup_visual(0x21))

src/mlx/gui/common.py

@@ -23 +23 @@
 import gi
 gi.require_version("Gdk", "3.0")
-from gi.repository import Gdk as gdk
+from gi.repository import Gdk
 from gi.repository import GdkPixbuf as gdkPixbuf
 gi.require_version("Gtk", "3.0")
@@ -47 +47 @@
 RESPONSETYPE_CANCEL = Gtk.ResponseType.CANCEL
 ACCEL_VISIBLE = Gtk.AccelFlags.VISIBLE
-CONTROL_MASK = gdk.ModifierType.CONTROL_MASK
+CONTROL_MASK = Gdk.ModifierType.CONTROL_MASK
 DIALOG_MODAL = Gtk.DialogFlags.MODAL
 WRAP_WORD = Gtk.WrapMode.WORD
@@ -53 +53 @@
 JUSTIFY_LEFT = Gtk.Justification.LEFT
 
-CONTROL_MASK = gdk.ModifierType.CONTROL_MASK
-SHIFT_MASK = gdk.ModifierType.SHIFT_MASK
-BUTTON1_MASK = gdk.ModifierType.BUTTON1_MASK
-
-SCROLL_UP = gdk.ScrollDirection.UP
-SCROLL_DOWN = gdk.ScrollDirection.DOWN
+CONTROL_MASK = Gdk.ModifierType.CONTROL_MASK
+SHIFT_MASK = Gdk.ModifierType.SHIFT_MASK
+BUTTON1_MASK = Gdk.ModifierType.BUTTON1_MASK
+
+SCROLL_UP = Gdk.ScrollDirection.UP
+SCROLL_DOWN = Gdk.ScrollDirection.DOWN
 
 SPIN_USER_DEFINED = Gtk.SpinType.USER_DEFINED
@@ -78 +78 @@
 WEIGHT_BOLD = pango.Weight.BOLD
 
-WINDOW_STATE_ICONIFIED = gdk.WindowState.ICONIFIED
-WINDOW_STATE_WITHDRAWN = gdk.WindowState.WITHDRAWN
+WINDOW_STATE_ICONIFIED = Gdk.WindowState.ICONIFIED
+WINDOW_STATE_WITHDRAWN = Gdk.WindowState.WITHDRAWN
 
 SORT_ASCENDING = Gtk.SortType.ASCENDING
 SORT_DESCENDING = Gtk.SortType.DESCENDING
 
-EVENT_BUTTON_PRESS = gdk.EventType.BUTTON_PRESS
+EVENT_BUTTON_PRESS = Gdk.EventType.BUTTON_PRESS
 
 TREE_VIEW_COLUMN_FIXED = Gtk.TreeViewColumnSizing.FIXED

src/mlx/gui/faultexplain.py

@@ -283 +283 @@
         styleContext = self.get_style_context()
         if allExplained:
-            outerColour = innerColour = gdk.RGBA(red = 0.0, green=0.0,
+            outerColour = innerColour = Gdk.RGBA(red = 0.0, green=0.0,
                                                  blue=0.0, alpha=0.0)
         else:

src/mlx/gui/flightlist.py

@@ -580 +580 @@
         If the Escape key is pressed, 'delete-event' is emitted to close the
         window."""
-        if gdk.keyval_name(event.keyval) == "Escape":
+        if Gdk.keyval_name(event.keyval) == "Escape":
             self.emit("delete-event", None)
             return True
@@ -763 +763 @@
         If the Escape key is pressed, 'delete-event' is emitted to close the
         window."""
-        if gdk.keyval_name(event.keyval) == "Escape":
+        if Gdk.keyval_name(event.keyval) == "Escape":
             self.emit("delete-event", None)
             return True

src/mlx/gui/gui.py

@@ -206 +206 @@
         self._statusIcon = StatusIcon(iconDirectory, self)
 
-        self._busyCursor = gdk.Cursor(gdk.CursorType.WATCH)
+        self._busyCursor = Gdk.Cursor(Gdk.CursorType.WATCH)
 
         self._loadPIREPDialog = None
@@ -739 +739 @@
     def _handleMainWindowState(self, window, event):
         """Hande a change in the state of the window"""
-        iconified = gdk.WindowState.ICONIFIED
+        iconified = Gdk.WindowState.ICONIFIED
 
         if (event.changed_mask&WINDOW_STATE_WITHDRAWN)!=0:

src/mlx/gui/statusbar.py

@@ -126 +126 @@
             icon = self._connGreyIcon
 
-        gdk.cairo_set_source_pixbuf(eventOrContext, icon, 0, 0)
+        Gdk.cairo_set_source_pixbuf(eventOrContext, icon, 0, 0)
         eventOrContext.paint()
 

src/mlx/gui/timetable.py

@@ -292 +292 @@
         If the Escape key is pressed, 'delete-event' is emitted to close the
         window."""
-        keyName = gdk.keyval_name(event.keyval)
+        keyName = Gdk.keyval_name(event.keyval)
         if keyName =="Escape":
             self.emit("delete-event", None)
@@ -702 +702 @@
         If the Escape key is pressed, 'delete-event' is emitted to close the
         window."""
-        if gdk.keyval_name(event.keyval) == "Escape":
+        if Gdk.keyval_name(event.keyval) == "Escape":
             self.emit("delete-event", None)
             return True