Changeset 994:e71fbf2ee978 for src/mlx/gui/gui.py

Timestamp:

07/04/19 17:29:58 (5 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Removed conditions on pygobject (re #347)

File:

• src/mlx/gui/gui.py (modified) (7 diffs)

src/mlx/gui/gui.py

@@ -206 +206 @@
         self._statusIcon = StatusIcon(iconDirectory, self)
 
-        self._busyCursor = gdk.Cursor(gdk.CursorType.WATCH if pygobject
-                                      else gdk.WATCH)
+        self._busyCursor = gdk.Cursor(gdk.CursorType.WATCH)
 
         self._loadPIREPDialog = None
@@ -444 +443 @@
         return self._flightInfo.faultsFullyExplained
 
-    if pygobject:
-        @property
-        def backgroundColour(self):
-            """Get the background colour of the main window."""
-            return self._mainWindow.get_style_context().\
-              get_background_color(gtk.StateFlags.NORMAL)
+    @property
+    def backgroundColour(self):
+        """Get the background colour of the main window."""
+        return self._mainWindow.get_style_context().\
+            get_background_color(gtk.StateFlags.NORMAL)
 
     def run(self):
@@ -741 +739 @@
     def _handleMainWindowState(self, window, event):
         """Hande a change in the state of the window"""
-        iconified = gdk.WindowState.ICONIFIED if pygobject \
-                    else gdk.WINDOW_STATE_ICONIFIED
+        iconified = gdk.WindowState.ICONIFIED
 
         if (event.changed_mask&WINDOW_STATE_WITHDRAWN)!=0:
@@ -750 +747 @@
                 self._statusIcon.mainWindowShown()
 
-        if self.config.hideMinimizedWindow and not pygobject and \
-           (event.changed_mask&WINDOW_STATE_ICONIFIED)!=0 and \
-           (event.new_window_state&WINDOW_STATE_ICONIFIED)!=0:
-            self.hideMainWindow(savePosition = False)
-        elif (event.changed_mask&WINDOW_STATE_ICONIFIED)!=0 and \
-             (event.new_window_state&WINDOW_STATE_ICONIFIED)==0:
+        if (event.changed_mask&WINDOW_STATE_ICONIFIED)!=0 and \
+           (event.new_window_state&WINDOW_STATE_ICONIFIED)==0:
             self._mainWindow.present()
 
@@ -798 +791 @@
             self._mainWindow.move(self._mainWindowX, self._mainWindowY)
 
-        if pygobject:
-            self._mainWindow.show()
-        else:
-            self._mainWindow.present()
+        self._mainWindow.show()
         self._mainWindow.deiconify()
 
@@ -1239 +1229 @@
         logScroller = gtk.ScrolledWindow()
         # FIXME: these should be constants in common
-        logScroller.set_policy(gtk.PolicyType.AUTOMATIC if pygobject
-                               else gtk.POLICY_AUTOMATIC,
-                               gtk.PolicyType.AUTOMATIC if pygobject
-                               else gtk.POLICY_AUTOMATIC)
-        logScroller.set_shadow_type(gtk.ShadowType.IN if pygobject
-                                    else gtk.SHADOW_IN)
+        logScroller.set_policy(gtk.PolicyType.AUTOMATIC,
+                               gtk.PolicyType.AUTOMATIC)
+        logScroller.set_shadow_type(gtk.ShadowType.IN)
         logView = gtk.TextView()
         logView.set_editable(False)
@@ -1849 +1836 @@
             dialog.set_license(xstr("about_license"))
 
-            if not pygobject:
-                gtk.about_dialog_set_url_hook(self._showAboutURL, None)
-
             self._aboutDialog = dialog