fix order and comment

This commit is contained in:
Tim Bentley 2014-03-13 20:08:47 +00:00
parent 31ee1b43a6
commit 5e6f97d74e
3 changed files with 3 additions and 3 deletions

View File

@ -95,7 +95,7 @@ class RegistryProperties(object):
def _get_preview_controller(self):
"""
Adds the live controller to the class dynamically
Adds the preview controller to the class dynamically
"""
if not hasattr(self, '_preview_controller') or not self._preview_controller:
self._preview_controller = Registry().get('preview_controller')

View File

@ -460,7 +460,7 @@ class Ui_MainWindow(object):
self.mode_live_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Live.'))
class MainWindow(RegistryProperties, QtGui.QMainWindow, Ui_MainWindow):
class MainWindow(QtGui.QMainWindow, Ui_MainWindow, RegistryProperties):
"""
The main window.
"""

View File

@ -102,7 +102,7 @@ class DisplayController(QtGui.QWidget):
Registry().execute('%s' % sender, [controller, args])
class SlideController(RegistryProperties, DisplayController):
class SlideController(DisplayController, RegistryProperties):
"""
SlideController is the slide controller widget. This widget is what the
user uses to control the displaying of verses/slides/etc on the screen.