← Back to branch summary

~alisonken1/openlp/pjlink2-t

« back to all changes in this revision

Viewing changes to openlp/plugins/media/lib/mediaitem.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/plugins/media/lib/mediaitem.py
31
31
from openlp.core.common.path import Path, path_to_str, create_paths
32
32
from openlp.core.common.registry import Registry
33
33
from openlp.core.common.settings import Settings
34
 
from openlp.core.lib import ItemCapabilities, MediaManagerItem, MediaType, ServiceItem, ServiceItemContext, \
35
 
    check_item_selected
 
34
from openlp.core.lib import MediaType, ServiceItemContext, check_item_selected
 
35
from openlp.core.lib.mediamanageritem import MediaManagerItem
 
36
from openlp.core.lib.serviceitem import ItemCapabilities, ServiceItem
36
37
from openlp.core.lib.ui import create_widget_action, critical_error_message_box, create_horizontal_adjusting_combo_box
37
38
from openlp.core.ui import DisplayControllerType
38
39
from openlp.core.ui.icons import UiIcons