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

Make use of the registry for retrieving a widget parent.

Browse Source
This commit is contained in:
Patrick Zimmermann 2013-02-14 22:31:43 +01:00
parent 89b9a1dabc
commit 489dc40cba
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openlp/plugins/songs/forms/duplicatesongremovalform.py
View File

@ -35,7 +35,7 @@ import os
from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate, build_icon
from openlp.core.lib import Registry, translate, build_icon
from openlp.core.lib.db import Manager
from openlp.core.lib.ui import UiStrings, critical_error_message_box
from openlp.core.ui.wizard import OpenLPWizard, WizardStrings
@ -53,7 +53,7 @@ class DuplicateSongRemovalForm(OpenLPWizard):
"""
log.info(u'DuplicateSongRemovalForm loaded')
def __init__(self, parent, plugin):
def __init__(self, plugin):
"""
Instantiate the wizard, and run any extra setup we need to.
@ -66,7 +66,7 @@ class DuplicateSongRemovalForm(OpenLPWizard):
self.duplicate_song_list = []
self.review_current_count = 0
self.review_total_count = 0
OpenLPWizard.__init__(self, parent, plugin, u'duplicateSongRemovalWizard',
OpenLPWizard.__init__(self, self.main_window, plugin, u'duplicateSongRemovalWizard',
u':/wizards/wizard_duplicateremoval.bmp', False)
def customSignals(self):
@ -346,3 +346,13 @@ class DuplicateSongRemovalForm(OpenLPWizard):
self.button(QtGui.QWizard.FinishButton).show()
self.button(QtGui.QWizard.FinishButton).setEnabled(True)
self.button(QtGui.QWizard.NextButton).hide()
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/plugins/songs/songsplugin.py
View File

@ -178,7 +178,7 @@ class SongsPlugin(Plugin):
"""
Search for duplicates in the song database.
"""
DuplicateSongRemovalForm(self.main_window, self).exec_()
DuplicateSongRemovalForm(self).exec_()
def onSongImportItemClicked(self):
if self.mediaItem: