← Back to branch summary

~raoul-snyman/openlp/dont-test-uno-on-macos

« back to all changes in this revision

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

  • Committer: Raoul Snyman
  • Date: 2017-10-25 21:18:38 UTC
  • mfrom: (2780.1.2 refactorings-3)
  • Revision ID: raoul@snyman.info-20171025211838-be4wutkihlytvkk3
Merge in refactorings-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/core/ui/maindisplay.py
36
36
from openlp.core.common import is_macosx, is_win
37
37
from openlp.core.common.applocation import AppLocation
38
38
from openlp.core.common.i18n import translate
39
 
from openlp.core.common.mixins import OpenLPMixin
 
39
from openlp.core.common.mixins import LogMixin, RegistryProperties
40
40
from openlp.core.common.path import path_to_str
41
 
from openlp.core.common.registry import Registry, RegistryProperties
 
41
from openlp.core.common.registry import Registry
42
42
from openlp.core.common.settings import Settings
43
43
from openlp.core.display.screens import ScreenList
44
44
from openlp.core.lib import ServiceItem, ImageSource, build_html, expand_tags, image_to_byte
131
131
        self.web_loaded = True
132
132
 
133
133
 
134
 
class MainDisplay(OpenLPMixin, Display, RegistryProperties):
 
134
class MainDisplay(Display, LogMixin, RegistryProperties):
135
135
    """
136
136
    This is the display screen as a specialized class from the Display class
137
137
    """
603
603
        self.web_view.setGeometry(0, 0, self.width(), self.height())
604
604
 
605
605
 
606
 
class AudioPlayer(OpenLPMixin, QtCore.QObject):
 
606
class AudioPlayer(LogMixin, QtCore.QObject):
607
607
    """
608
608
    This Class will play audio only allowing components to work with a soundtrack independent of the user interface.
609
609
    """