From 6ff101520569d43026e437aa4c0ddfac3159737d Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 3 Feb 2018 07:59:36 +0000 Subject: [PATCH] close the splash screen --- openlp/core/app.py | 7 ++++--- openlp/core/ui/mainwindow.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openlp/core/app.py b/openlp/core/app.py index a5ae04c6d..1bc069323 100644 --- a/openlp/core/app.py +++ b/openlp/core/app.py @@ -72,8 +72,7 @@ class OpenLP(QtWidgets.QApplication, LogMixin): """ self.is_event_loop_active = True result = QtWidgets.QApplication.exec() - state = self.shared_memory.detach() - print(state) + self.shared_memory.detach() return result def run(self, args): @@ -121,7 +120,9 @@ class OpenLP(QtWidgets.QApplication, LogMixin): self.main_window.show() if can_show_splash: # now kill the splashscreen - self.splash.finish(self.main_window) + log.debug('Splashscreen closing') + self.splash.close() + #self.splash.finish(self.main_window) log.debug('Splashscreen closed') # make sure Qt really display the splash screen self.processEvents() diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 43357c837..8ea09be2f 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -37,7 +37,7 @@ from openlp.core.common import is_win, is_macosx, add_actions from openlp.core.common.actions import ActionList, CategoryOrder from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import LanguageManager, UiStrings, translate -from openlp.core.common.mixins import RegistryProperties +from openlp.core.common.mixins import LogMixin, RegistryProperties from openlp.core.common.path import Path, copyfile, create_paths from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings @@ -465,7 +465,7 @@ class Ui_MainWindow(object): self.mode_live_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on Live.')) -class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties): +class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties, LogMixin): """ The main window. """