Applying various optimizations

[gc-dialer] / src / util / qwrappers.py

diff --git a/src/util/qwrappers.py b/src/util/qwrappers.py
index df69f41..cc458bf 100644 (file)
--- a/src/util/qwrappers.py
+++ b/src/util/qwrappers.py
@@ -61,7 +61,7 @@ class ApplicationWrapper(object):
                self._idleDelay = QtCore.QTimer()
                self._idleDelay.setSingleShot(True)
                self._idleDelay.setInterval(0)
-               self._idleDelay.timeout.connect(lambda: self._mainWindow.start())
+               self._idleDelay.timeout.connect(self._on_delayed_start)
                self._idleDelay.start()
 
        def load_settings(self):
@@ -113,6 +113,10 @@ class ApplicationWrapper(object):
                        self._mainWindow = None
 
        @misc_utils.log_exception(_moduleLogger)
+       def _on_delayed_start(self):
+               self._mainWindow.start()
+
+       @misc_utils.log_exception(_moduleLogger)
        def _on_app_quit(self, checked = False):
                if self._mainWindow is not None:
                        self.save_settings()
@@ -161,13 +165,17 @@ class WindowWrapper(object):
 
                self._layout = QtGui.QBoxLayout(QtGui.QBoxLayout.LeftToRight)
                self._layout.setContentsMargins(0, 0, 0, 0)
-               self._layout.addWidget(self._errorDisplay.toplevel)
+
+               self._superLayout = QtGui.QVBoxLayout()
+               self._superLayout.addWidget(self._errorDisplay.toplevel)
+               self._superLayout.setContentsMargins(0, 0, 0, 0)
+               self._superLayout.addLayout(self._layout)
 
                centralWidget = QtGui.QWidget()
-               centralWidget.setLayout(self._layout)
+               centralWidget.setLayout(self._superLayout)
                centralWidget.setContentsMargins(0, 0, 0, 0)
 
-               self._window = QtGui.QMainWindow(parent)
+               self._window = qui_utils.QSignalingMainWindow(parent)
                self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
                qui_utils.set_stackable(self._window, True)
                self._window.setCentralWidget(centralWidget)
@@ -203,10 +211,10 @@ class WindowWrapper(object):
                pass
 
        def show(self):
-               self.set_fullscreen(self._app.fullscreenAction.isChecked())
                self._window.show()
                for child in self.walk_children():
                        child.show()
+               self.set_fullscreen(self._app.fullscreenAction.isChecked())
 
        def hide(self):
                for child in self.walk_children():
@@ -214,10 +222,11 @@ class WindowWrapper(object):
                self._window.hide()
 
        def set_fullscreen(self, isFullscreen):
-               if isFullscreen:
-                       self._window.showFullScreen()
-               else:
-                       self._window.showNormal()
+               if self._window.isVisible():
+                       if isFullscreen:
+                               self._window.showFullScreen()
+                       else:
+                               self._window.showNormal()
                for child in self.walk_children():
                        child.set_fullscreen(isFullscreen)
 
@@ -230,7 +239,7 @@ class WindowWrapper(object):
                        child.set_orientation(isPortrait)
 
        @misc_utils.log_exception(_moduleLogger)
-       def _on_child_close(self):
+       def _on_child_close(self, obj = None):
                raise NotImplementedError("Booh")
 
        @misc_utils.log_exception(_moduleLogger)