From d247cf2388c7077f10850d21bc1af1fd9015883f Mon Sep 17 00:00:00 2001 From: Olli Suutari Date: Sun, 4 Jun 2017 17:03:41 +0300 Subject: [PATCH] Fixed bug: https://bugs.launchpad.net/openlp/+bug/1694732 --- openlp/core/lib/ui.py | 1 + openlp/core/ui/lib/wizard.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py index 8cd68384f..fe67c53ba 100644 --- a/openlp/core/lib/ui.py +++ b/openlp/core/lib/ui.py @@ -49,6 +49,7 @@ def add_welcome_page(parent, image): parent.title_label = QtWidgets.QLabel(parent.welcome_page) parent.title_label.setObjectName('title_label') parent.welcome_layout.addWidget(parent.title_label) + parent.title_label.setWordWrap(True) parent.welcome_layout.addSpacing(40) parent.information_label = QtWidgets.QLabel(parent.welcome_page) parent.information_label.setWordWrap(True) diff --git a/openlp/core/ui/lib/wizard.py b/openlp/core/ui/lib/wizard.py index 088bc3c1f..c62a65cc7 100644 --- a/openlp/core/ui/lib/wizard.py +++ b/openlp/core/ui/lib/wizard.py @@ -25,7 +25,7 @@ The :mod:``wizard`` module provides generic wizard tools for OpenLP. import logging import os -from PyQt5 import QtGui, QtWidgets +from PyQt5 import QtCore, QtGui, QtWidgets from openlp.core.common import Registry, RegistryProperties, Settings, UiStrings, translate, is_macosx from openlp.core.lib import build_icon @@ -93,7 +93,10 @@ class OpenLPWizard(QtWidgets.QWizard, RegistryProperties): """ Constructor """ - super(OpenLPWizard, self).__init__(parent) + # QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint remove the "?" buttons from windows, + # QtCore.Qt.WindowCloseButtonHint enables the "x" button to close these windows. + super(OpenLPWizard, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint | + QtCore.Qt.WindowCloseButtonHint) self.plugin = plugin self.with_progress_page = add_progress_page self.setFixedWidth(640)