raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed #FIXME: constructor

This commit is contained in:
Andreas Preikschat 2013-04-03 12:25:41 +02:00
parent d9f8025042 2c94f0df83
commit fb0c1731d5
6 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/lib/settingstab.py
View File

@ -184,10 +184,8 @@ class SettingsTab(QtGui.QWidget):
"""
Adds the media controller to the class dynamically
"""
# if not hasattr(self, '_media_controller'):
# self._media_controller = Registry().get('media_controller')
# FIXME: python3
self._media_controller = Registry().get('media_controller')
if not hasattr(self, '_media_controller'):
self._media_controller = Registry().get('media_controller')
return self._media_controller
media_controller = property(_get_media_controller)

22
openlp/core/ui/filerenameform.py
View File

@ -45,9 +45,7 @@ class FileRenameForm(QtGui.QDialog, Ui_FileRenameDialog):
"""
Constructor
"""
super().__init__()
# TODO: python3 - parent correct?
#QtGui.QDialog.__init__(self, self.main_window)
super(FileRenameForm, self).__init__(Registry().get(u'main_window'))
self.setupUi(self)
def exec_(self, copy=False):
@ -61,12 +59,12 @@ class FileRenameForm(QtGui.QDialog, Ui_FileRenameDialog):
self.file_name_edit.setFocus()
return QtGui.QDialog.exec_(self)
def _get_main_window(self):
"""
Adds the main window to the class dynamically
"""
if not hasattr(self, u'_main_window'):
self._main_window = Registry().get(u'main_window')
return self._main_window
main_window = property(_get_main_window)
# def _get_main_window(self):
# """
# Adds the main window to the class dynamically
# """
# if not hasattr(self, u'_main_window'):
# self._main_window = Registry().get(u'main_window')
# return self._main_window
#
# main_window = property(_get_main_window)

2
openlp/core/ui/media/playertab.py
View File

@ -55,7 +55,7 @@ class PlayerTab(SettingsTab):
"""
Constructor
"""
self.media_players = self.media_controller.media_players
self.media_players = Registry().get('media_controller').media_players
self.saved_used_players = None
self.icon_path = u':/media/multimedia-player.png'
player_translated = translate('OpenLP.PlayerTab', 'Players')

4
openlp/core/ui/serviceitemeditform.py
View File

@ -44,9 +44,7 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
Constructor
"""
super().__init__()
# TODO: python3 - parent correct?
#QtGui.QDialog.__init__(self, self.main_window)
super(ServiceItemEditForm, self).__init__(Registry().get(u'main_window'))
self.setupUi(self)
self.item_list = []
self.list_widget.currentRowChanged.connect(self.on_current_row_changed)

4
openlp/core/ui/servicenoteform.py
View File

@ -43,9 +43,7 @@ class ServiceNoteForm(QtGui.QDialog):
"""
Constructor
"""
super().__init__()
# TODO: python3 - parent correct?
#QtGui.QDialog.__init__(self, self.main_window)
super(ServiceNoteForm, self).__init__(Registry().get(u'main_window'))
self.setupUi()
self.retranslateUi()

4
openlp/core/ui/starttimeform.py
View File

@ -45,9 +45,7 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog):
"""
Constructor
"""
super().__init__()
# TODO: python3 - parent correct?
#QtGui.QDialog.__init__(self, self.main_window)
super(StartTimeForm, self).__init__(Registry().get(u'main_window'))
self.setupUi(self)
def exec_(self):