raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

close the splash screen

This commit is contained in:
Tim Bentley 2018-02-03 07:59:36 +00:00
parent f7169ee708
commit 6ff1015205
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openlp/core/app.py
View File

@ -72,8 +72,7 @@ class OpenLP(QtWidgets.QApplication, LogMixin):
""" """
self.is_event_loop_active = True self.is_event_loop_active = True
result = QtWidgets.QApplication.exec() result = QtWidgets.QApplication.exec()
state = self.shared_memory.detach() self.shared_memory.detach()
print(state)
return result return result
def run(self, args): def run(self, args):
@ -121,7 +120,9 @@ class OpenLP(QtWidgets.QApplication, LogMixin):
self.main_window.show() self.main_window.show()
if can_show_splash: if can_show_splash:
# now kill the splashscreen # 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') log.debug('Splashscreen closed')
# make sure Qt really display the splash screen # make sure Qt really display the splash screen
self.processEvents() self.processEvents()

4
openlp/core/ui/mainwindow.py
View File

@ -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.actions import ActionList, CategoryOrder
from openlp.core.common.applocation import AppLocation from openlp.core.common.applocation import AppLocation
from openlp.core.common.i18n import LanguageManager, UiStrings, translate 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.path import Path, copyfile, create_paths
from openlp.core.common.registry import Registry from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings 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.')) 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. The main window.
""" """