[Openlp-core] [Merge] lp:~bastian-germann/openlp/main into lp:openlp
The proposal to merge lp:~bastian-germann/openlp/main into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~bastian-germann/openlp/main/+merge/372443 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~bastian-germann/openlp/main into lp:openlp
The proposal to merge lp:~bastian-germann/openlp/main into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~bastian-germann/openlp/main/+merge/372443 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/main into lp:openlp
Review: Approve -- https://code.launchpad.net/~bastian-germann/openlp/main/+merge/372443 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Passed
Linting passed! -- https://code.launchpad.net/~raoul-snyman/openlp/fix-wait-for-threads-error/+merge/372669 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-wait-for-threads-error into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] macOS Test Results: Passed
macOS tests passed! -- https://code.launchpad.net/~raoul-snyman/openlp/fix-wait-for-threads-error/+merge/372669 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-wait-for-threads-error into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~raoul-snyman/openlp/fix-wait-for-threads-error/+merge/372669 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-wait-for-threads-error into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] JavaScript Test Results: Passed
JavaScript tests passed! -- https://code.launchpad.net/~raoul-snyman/openlp/fix-wait-for-threads-error/+merge/372669 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-wait-for-threads-error into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-wait-for-threads-error into lp:openlp
Raoul Snyman has proposed merging
lp:~raoul-snyman/openlp/fix-wait-for-threads-error into lp:openlp.
Commit message:
Minor cosmetic fixes to remove the "<2>" from the app title in KDE:
- Name the display window "Display Window"
- Name the threads dialog "Please Wait"
- Also fix potential issue where threads remove themselves from the dictionary
at shutdown and cause an error.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/fix-wait-for-threads-error/+merge/372669
Minor cosmetic fixes to remove the "<2>" from the app title in KDE:
- Name the display window "Display Window"
- Name the threads dialog "Please Wait"
- Also fix potential issue where threads remove themselves from the dictionary
at shutdown and cause an error.
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~raoul-snyman/openlp/fix-wait-for-threads-error into lp:openlp.
=== modified file 'openlp/core/display/window.py'
--- openlp/core/display/window.py 2019-06-21 22:09:36 +
+++ openlp/core/display/window.py 2019-09-12 03:58:58 +
@@ -29,6 +29,7 @@
from PyQt5 import QtCore, QtWebChannel, QtWidgets
+from openlp.core.common.i18n import translate
from openlp.core.common.path import path_to_str
from openlp.core.common.settings import Settings
from openlp.core.common.registry import Registry
@@ -113,6 +114,7 @@
from openlp.core.display.webengine import WebEngineView
self._is_initialised = False
self._fbo = None
+self.setWindowTitle(translate('OpenLP.DisplayWindow', 'Display Window'))
self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool | QtCore.Qt.WindowStaysOnTopHint)
self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
self.setAutoFillBackground(True)
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2019-08-25 08:20:38 +
+++ openlp/core/ui/mainwindow.py 2019-09-12 03:58:58 +
@@ -548,11 +548,17 @@
# Sometimes the threads haven't finished, let's wait for them
wait_dialog = QtWidgets.QProgressDialog(translate('OpenLP.MainWindow', 'Waiting for some things to finish...'),
'', 0, 0, self)
+wait_dialog.setWindowTitle(translate('OpenLP.MainWindow', 'Please Wait'))
+for window_flag in [QtCore.Qt.WindowContextHelpButtonHint]:
+wait_dialog.setWindowFlag(window_flag, False)
wait_dialog.setWindowModality(QtCore.Qt.WindowModal)
wait_dialog.setAutoClose(False)
wait_dialog.setCancelButton(None)
wait_dialog.show()
-for thread_name in self.application.worker_threads.keys():
+thread_names = self.application.worker_threads.keys()
+for thread_name in thread_names:
+if thread_name not in self.application.worker_threads.keys():
+continue
self.log_debug('Waiting for thread %s' % thread_name)
self.application.processEvents()
thread = self.application.worker_threads[thread_name]['thread']
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
