Merge branch 'fix-printicons' into 'master'

Fix Icons in Print when Dark Theme.

See merge request openlp/openlp!325
This commit is contained in:
Raoul Snyman 2021-04-28 06:38:59 +00:00
commit 431c4fe6ee
2 changed files with 1 additions and 10 deletions

View File

@ -31,7 +31,7 @@ from openlp.core.common.applocation import AppLocation
from openlp.core.common.i18n import UiStrings, translate from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.mixins import RegistryProperties from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.registry import Registry from openlp.core.common.registry import Registry
from openlp.core.lib import get_text_file_string, image_to_byte from openlp.core.lib import get_text_file_string
from openlp.core.ui.printservicedialog import Ui_PrintServiceDialog, ZoomSize from openlp.core.ui.printservicedialog import Ui_PrintServiceDialog, ZoomSize
@ -207,8 +207,6 @@ class PrintServiceForm(QtWidgets.QDialog, Ui_PrintServiceDialog, RegistryPropert
div = self._add_element('div', class_id='item', parent=body) div = self._add_element('div', class_id='item', parent=body)
# Add the title of the service item. # Add the title of the service item.
item_title = self._add_element('h2', parent=div, class_id='itemTitle') item_title = self._add_element('h2', parent=div, class_id='itemTitle')
img = image_to_byte(item.icon.pixmap(20, 20).toImage())
self._add_element('img', parent=item_title, attribute=('src', 'data:image/jpeg;base64, ' + img))
self._add_element('span', ' ' + html.escape(item.get_display_title()), item_title) self._add_element('span', ' ' + html.escape(item.get_display_title()), item_title)
if self.slide_text_check_box.isChecked(): if self.slide_text_check_box.isChecked():
# Add the text of the service item. # Add the text of the service item.

View File

@ -22,10 +22,3 @@ To run the tests, navigate to the root directory of the OpenLP project, and then
pytest -v tests pytest -v tests
Or, to run only the functional tests, run the following command::
pytest -v tests/functional
Or, to run only a particular test suite within a file, run the following command::
pytest -v tests/functional/openlp_core/test_app.py