← Back to branch summary

~alisonken1/openlp/pjlink2-t

« back to all changes in this revision

Viewing changes to openlp/core/ui/maindisplay.py

  • Committer: Raoul Snyman
  • Author(s): Simon Hanna
  • Date: 2018-08-26 00:20:41 UTC
  • mfrom: (2829.1.2 rework-imports)
  • Revision ID: raoul@snyman.info-20180826002041-olbs1zdmapl4teg3
Rework a couple of imports. Now a subset of tests can be run again, which previously failed due to circular imports (at least that's what I guess)

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/core/ui/maindisplay.py
40
40
from openlp.core.common.registry import Registry
41
41
from openlp.core.common.settings import Settings
42
42
from openlp.core.display.screens import ScreenList
43
 
from openlp.core.lib import ServiceItem, ImageSource, build_html, expand_tags, image_to_byte
 
43
from openlp.core.lib import ImageSource, expand_tags, image_to_byte
 
44
from openlp.core.lib.htmlbuilder import build_html
 
45
from openlp.core.lib.serviceitem import ServiceItem
44
46
from openlp.core.lib.theme import BackgroundType
45
47
from openlp.core.ui import HideMode, AlertLocation, DisplayControllerType
46
48
from openlp.core.ui.icons import UiIcons