forked from openlp/openlp
Removep
bzr commit -mRemovep
This commit is contained in:
parent
b5c2659506
commit
5d740a7706
@ -40,12 +40,10 @@ class RegistryMixin(object):
|
|||||||
"""
|
"""
|
||||||
Register the class and bootstrap hooks.
|
Register the class and bootstrap hooks.
|
||||||
"""
|
"""
|
||||||
print("RegistryMixin - before super ", self.__class__.__name__)
|
|
||||||
try:
|
try:
|
||||||
super(RegistryMixin, self).__init__(parent)
|
super(RegistryMixin, self).__init__(parent)
|
||||||
except TypeError:
|
except TypeError:
|
||||||
super(RegistryMixin, self).__init__()
|
super(RegistryMixin, self).__init__()
|
||||||
print("RegistryMixin - after super")
|
|
||||||
Registry().register(de_hump(self.__class__.__name__), self)
|
Registry().register(de_hump(self.__class__.__name__), self)
|
||||||
Registry().register_function('bootstrap_initialise', self.bootstrap_initialise)
|
Registry().register_function('bootstrap_initialise', self.bootstrap_initialise)
|
||||||
Registry().register_function('bootstrap_post_set_up', self.bootstrap_post_set_up)
|
Registry().register_function('bootstrap_post_set_up', self.bootstrap_post_set_up)
|
||||||
|
@ -57,9 +57,7 @@ class Renderer(OpenLPMixin, RegistryMixin):
|
|||||||
"""
|
"""
|
||||||
Initialise the renderer.
|
Initialise the renderer.
|
||||||
"""
|
"""
|
||||||
print("Renderer - before super")
|
|
||||||
super(Renderer, self).__init__(None)
|
super(Renderer, self).__init__(None)
|
||||||
print("Renderer - after super")
|
|
||||||
# Need live behaviour if this is also working as a pseudo MainDisplay.
|
# Need live behaviour if this is also working as a pseudo MainDisplay.
|
||||||
self.is_live = True
|
self.is_live = True
|
||||||
self.screens = ScreenList()
|
self.screens = ScreenList()
|
||||||
@ -580,7 +578,6 @@ class Renderer(OpenLPMixin, RegistryMixin):
|
|||||||
"""
|
"""
|
||||||
Adds the theme manager to the class dynamically
|
Adds the theme manager to the class dynamically
|
||||||
"""
|
"""
|
||||||
print("renderer _get_theme_manager")
|
|
||||||
if not hasattr(self, '_theme_manager') or not self._theme_manager :
|
if not hasattr(self, '_theme_manager') or not self._theme_manager :
|
||||||
self._theme_manager = Registry().get('theme_manager')
|
self._theme_manager = Registry().get('theme_manager')
|
||||||
return self._theme_manager
|
return self._theme_manager
|
||||||
|
@ -63,7 +63,6 @@ class Display(QtGui.QGraphicsView):
|
|||||||
"""
|
"""
|
||||||
Constructor
|
Constructor
|
||||||
"""
|
"""
|
||||||
print("Display - before super", parent, type(parent))
|
|
||||||
self.is_live = False
|
self.is_live = False
|
||||||
if hasattr(parent, 'is_live') and parent.is_live:
|
if hasattr(parent, 'is_live') and parent.is_live:
|
||||||
self.is_live = True
|
self.is_live = True
|
||||||
@ -73,7 +72,6 @@ class Display(QtGui.QGraphicsView):
|
|||||||
self.parent = lambda: parent
|
self.parent = lambda: parent
|
||||||
else:
|
else:
|
||||||
super(Display, self).__init__(parent)
|
super(Display, self).__init__(parent)
|
||||||
print("Display - after super")
|
|
||||||
self.controller = parent
|
self.controller = parent
|
||||||
self.screen = {}
|
self.screen = {}
|
||||||
# FIXME: On Mac OS X (tested on 10.7) the display screen is corrupt with
|
# FIXME: On Mac OS X (tested on 10.7) the display screen is corrupt with
|
||||||
@ -128,9 +126,7 @@ class MainDisplay(OpenLPMixin, Display):
|
|||||||
"""
|
"""
|
||||||
Constructor
|
Constructor
|
||||||
"""
|
"""
|
||||||
print("MainDisplay - before super")
|
|
||||||
super(MainDisplay, self).__init__(parent)
|
super(MainDisplay, self).__init__(parent)
|
||||||
print("MainDisplay - after super")
|
|
||||||
self.screens = ScreenList()
|
self.screens = ScreenList()
|
||||||
self.rebuild_css = False
|
self.rebuild_css = False
|
||||||
self.hide_mode = None
|
self.hide_mode = None
|
||||||
|
@ -468,9 +468,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
"""
|
"""
|
||||||
This constructor sets up the interface, the various managers, and the plugins.
|
This constructor sets up the interface, the various managers, and the plugins.
|
||||||
"""
|
"""
|
||||||
print("Mainwindow - before super")
|
|
||||||
super(MainWindow, self).__init__()
|
super(MainWindow, self).__init__()
|
||||||
print("Mainwindow - after super")
|
|
||||||
Registry().register('main_window', self)
|
Registry().register('main_window', self)
|
||||||
self.clipboard = self.application.clipboard()
|
self.clipboard = self.application.clipboard()
|
||||||
self.arguments = self.application.args
|
self.arguments = self.application.args
|
||||||
@ -543,7 +541,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
"""
|
"""
|
||||||
process the bootstrap post setup request
|
process the bootstrap post setup request
|
||||||
"""
|
"""
|
||||||
print("Mainwindow - bs post")
|
|
||||||
self.preview_controller.panel.setVisible(Settings().value('user interface/preview panel'))
|
self.preview_controller.panel.setVisible(Settings().value('user interface/preview panel'))
|
||||||
self.live_controller.panel.setVisible(Settings().value('user interface/live panel'))
|
self.live_controller.panel.setVisible(Settings().value('user interface/live panel'))
|
||||||
self.load_settings()
|
self.load_settings()
|
||||||
|
@ -316,9 +316,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
|
|||||||
"""
|
"""
|
||||||
Sets up the service manager, toolbars, list view, et al.
|
Sets up the service manager, toolbars, list view, et al.
|
||||||
"""
|
"""
|
||||||
print("ServiceManager - before super")
|
|
||||||
super(ServiceManager, self).__init__(parent)
|
super(ServiceManager, self).__init__(parent)
|
||||||
print("ServiceManager - after super")
|
|
||||||
self.active = build_icon(':/media/auto-start_active.png')
|
self.active = build_icon(':/media/auto-start_active.png')
|
||||||
self.inactive = build_icon(':/media/auto-start_inactive.png')
|
self.inactive = build_icon(':/media/auto-start_inactive.png')
|
||||||
self.service_items = []
|
self.service_items = []
|
||||||
@ -334,7 +332,6 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
|
|||||||
"""
|
"""
|
||||||
To be called as part of initialisation
|
To be called as part of initialisation
|
||||||
"""
|
"""
|
||||||
print("ServiceManager - bs i")
|
|
||||||
self.setup_ui(self)
|
self.setup_ui(self)
|
||||||
# Need to use event as called across threads and UI is updated
|
# Need to use event as called across threads and UI is updated
|
||||||
QtCore.QObject.connect(self, QtCore.SIGNAL('servicemanager_set_item'), self.on_set_item)
|
QtCore.QObject.connect(self, QtCore.SIGNAL('servicemanager_set_item'), self.on_set_item)
|
||||||
@ -343,7 +340,6 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
|
|||||||
"""
|
"""
|
||||||
Can be set up as a late setup
|
Can be set up as a late setup
|
||||||
"""
|
"""
|
||||||
print("ServiceManager - bs psu")
|
|
||||||
self.service_note_form = ServiceNoteForm()
|
self.service_note_form = ServiceNoteForm()
|
||||||
self.service_item_edit_form = ServiceItemEditForm()
|
self.service_item_edit_form = ServiceItemEditForm()
|
||||||
self.start_time_form = StartTimeForm()
|
self.start_time_form = StartTimeForm()
|
||||||
@ -1642,7 +1638,6 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
|
|||||||
"""
|
"""
|
||||||
Adds the Renderer to the class dynamically
|
Adds the Renderer to the class dynamically
|
||||||
"""
|
"""
|
||||||
print("serviceManager _get_renderer")
|
|
||||||
if not hasattr(self, '_renderer'):
|
if not hasattr(self, '_renderer'):
|
||||||
self._renderer = Registry().get('renderer')
|
self._renderer = Registry().get('renderer')
|
||||||
return self._renderer
|
return self._renderer
|
||||||
|
@ -135,9 +135,7 @@ class ThemeManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ThemeManager):
|
|||||||
"""
|
"""
|
||||||
Constructor
|
Constructor
|
||||||
"""
|
"""
|
||||||
print("ThemeManager - before super")
|
|
||||||
super(ThemeManager, self).__init__(parent)
|
super(ThemeManager, self).__init__(parent)
|
||||||
print("ThemeManager - after super")
|
|
||||||
self.settings_section = 'themes'
|
self.settings_section = 'themes'
|
||||||
# Variables
|
# Variables
|
||||||
self.theme_list = []
|
self.theme_list = []
|
||||||
@ -147,7 +145,6 @@ class ThemeManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ThemeManager):
|
|||||||
"""
|
"""
|
||||||
process the bootstrap initialise setup request
|
process the bootstrap initialise setup request
|
||||||
"""
|
"""
|
||||||
print("ThemeManager - bs i")
|
|
||||||
self.setup_ui(self)
|
self.setup_ui(self)
|
||||||
self.global_theme = Settings().value(self.settings_section + '/global theme')
|
self.global_theme = Settings().value(self.settings_section + '/global theme')
|
||||||
self.build_theme_path()
|
self.build_theme_path()
|
||||||
@ -157,7 +154,6 @@ class ThemeManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ThemeManager):
|
|||||||
"""
|
"""
|
||||||
process the bootstrap post setup request
|
process the bootstrap post setup request
|
||||||
"""
|
"""
|
||||||
print("ThemeManager - bs psu")
|
|
||||||
self.theme_form = ThemeForm(self)
|
self.theme_form = ThemeForm(self)
|
||||||
self.theme_form.path = self.path
|
self.theme_form.path = self.path
|
||||||
self.file_rename_form = FileRenameForm()
|
self.file_rename_form = FileRenameForm()
|
||||||
|
@ -87,7 +87,6 @@ class TestRouter(TestCase):
|
|||||||
router = HttpRouter()
|
router = HttpRouter()
|
||||||
router.initialise()
|
router.initialise()
|
||||||
test_value = 'b3BlbmxwOnBhc3N3b3Jk'
|
test_value = 'b3BlbmxwOnBhc3N3b3Jk'
|
||||||
print(router.auth)
|
|
||||||
|
|
||||||
# THEN: the function should return the correct password
|
# THEN: the function should return the correct password
|
||||||
self.assertEqual(router.auth, test_value,
|
self.assertEqual(router.auth, test_value,
|
||||||
|
Loading…
Reference in New Issue
Block a user