From d458ac2a98f0f909e47b662e5634cc6b6501f20a Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 28 Oct 2010 14:10:25 +0200 Subject: [PATCH] replaced songusagemanager --- openlp/plugins/songusage/forms/songusagedeleteform.py | 6 +++--- openlp/plugins/songusage/forms/songusagedetailform.py | 2 +- openlp/plugins/songusage/songusageplugin.py | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/openlp/plugins/songusage/forms/songusagedeleteform.py b/openlp/plugins/songusage/forms/songusagedeleteform.py index 36eda98b2..45e4e91a9 100644 --- a/openlp/plugins/songusage/forms/songusagedeleteform.py +++ b/openlp/plugins/songusage/forms/songusagedeleteform.py @@ -34,11 +34,11 @@ class SongUsageDeleteForm(QtGui.QDialog, Ui_SongUsageDeleteDialog): """ Class documentation goes here. """ - def __init__(self, songusagemanager, parent): + def __init__(self, manager, parent): """ Constructor """ - self.songusagemanager = songusagemanager + self.manager = manager QtGui.QDialog.__init__(self, parent) self.setupUi(self) @@ -53,6 +53,6 @@ class SongUsageDeleteForm(QtGui.QDialog, Ui_SongUsageDeleteDialog): QtGui.QMessageBox.Cancel) if ret == QtGui.QMessageBox.Ok: deleteDate = self.deleteCalendar.selectedDate().toPyDate() - self.songusagemanager.delete_all_objects(SongUsageItem, + self.manager.delete_all_objects(SongUsageItem, SongUsageItem.usagedate <= deleteDate) self.close() diff --git a/openlp/plugins/songusage/forms/songusagedetailform.py b/openlp/plugins/songusage/forms/songusagedetailform.py index b1668990b..18aa1797f 100644 --- a/openlp/plugins/songusage/forms/songusagedetailform.py +++ b/openlp/plugins/songusage/forms/songusagedetailform.py @@ -76,7 +76,7 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog): filename = u'usage_detail_%s_%s.txt' % ( self.fromDate.selectedDate().toString(u'ddMMyyyy'), self.toDate.selectedDate().toString(u'ddMMyyyy')) - usage = self.plugin.songusagemanager.get_all_objects( + usage = self.plugin.manager.get_all_objects( SongUsageItem, and_( SongUsageItem.usagedate >= self.fromDate.selectedDate().toPyDate(), SongUsageItem.usagedate < self.toDate.selectedDate().toPyDate()), diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index 8898721c6..124fe2863 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -44,7 +44,7 @@ class SongUsagePlugin(Plugin): Plugin.__init__(self, u'SongUsage', u'1.9.3', plugin_helpers) self.weight = -4 self.icon = build_icon(u':/plugins/plugin_songusage.png') - self.songusagemanager = None + self.manager = None self.songusageActive = False def addToolsMenuItem(self, tools_menu): @@ -115,9 +115,9 @@ class SongUsagePlugin(Plugin): self.settingsSection + u'/active', QtCore.QVariant(False)).toBool() self.SongUsageStatus.setChecked(self.SongUsageActive) - if self.songusagemanager is None: - self.songusagemanager = Manager(u'songusage', init_schema) - self.SongUsagedeleteform = SongUsageDeleteForm(self.songusagemanager, + if self.manager is None: + self.manager = Manager(u'songusage', init_schema) + self.SongUsagedeleteform = SongUsageDeleteForm(self.manager, self.formparent) self.SongUsagedetailform = SongUsageDetailForm(self, self.formparent) self.SongUsageMenu.menuAction().setVisible(True) @@ -148,7 +148,7 @@ class SongUsagePlugin(Plugin): song_usage_item.authors = u'' for author in audit[1]: song_usage_item.authors += author + u' ' - self.songusagemanager.save_object(song_usage_item) + self.manager.save_object(song_usage_item) def onSongUsageDelete(self): self.SongUsagedeleteform.exec_()