From 49e856021a784a06db9c6a47a043780144867bdc Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 22 Sep 2009 20:20:11 +0100 Subject: [PATCH] Add database to audit --- openlp/plugins/audit/auditplugin.py | 8 ++++++-- openlp/plugins/audit/lib/__init__.py | 1 + openlp/plugins/audit/lib/audittab.py | 18 ------------------ 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/openlp/plugins/audit/auditplugin.py b/openlp/plugins/audit/auditplugin.py index e78b2d455..b548f75b7 100644 --- a/openlp/plugins/audit/auditplugin.py +++ b/openlp/plugins/audit/auditplugin.py @@ -27,8 +27,8 @@ import logging from PyQt4 import QtCore, QtGui from datetime import date -from openlp.core.lib import Plugin, Receiver, translate, str_to_bool -from openlp.plugins.audit.lib import AuditTab +from openlp.core.lib import Plugin, Receiver, translate, str_to_bool +from openlp.plugins.audit.lib import AuditTab, AuditManager class AuditPlugin(Plugin): global log @@ -106,6 +106,10 @@ class AuditPlugin(Plugin): else: self.auditFile = open(self.auditFileName, u'a') self.ToolsAuditItem.setChecked(self.auditActive) + try: + self.auditmanager = AuditManager() + except: + log.exception(u'oops') def toggleAuditState(self): self.auditActive = not self.auditActive diff --git a/openlp/plugins/audit/lib/__init__.py b/openlp/plugins/audit/lib/__init__.py index 9db18d784..f6e07dcc8 100644 --- a/openlp/plugins/audit/lib/__init__.py +++ b/openlp/plugins/audit/lib/__init__.py @@ -22,4 +22,5 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### +from manager import AuditManager from audittab import AuditTab diff --git a/openlp/plugins/audit/lib/audittab.py b/openlp/plugins/audit/lib/audittab.py index 7cd50b8a8..daa72fb58 100644 --- a/openlp/plugins/audit/lib/audittab.py +++ b/openlp/plugins/audit/lib/audittab.py @@ -39,17 +39,6 @@ class AuditTab(SettingsTab): self.AuditModeGroupBox.setObjectName(u'AuditModeGroupBox') self.verticalLayout = QtGui.QVBoxLayout(self.AuditModeGroupBox) self.verticalLayout.setObjectName("verticalLayout") - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") - self.AuditFileName = QtGui.QLineEdit(self) - self.AuditFileName.setObjectName("AuditFileName") - self.horizontalLayout.addWidget(self.AuditFileName) - icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.AuditFileButton = QtGui.QPushButton(self) - self.AuditFileButton.setObjectName("AuditFileButton") - self.AuditFileButton.setIcon(icon1) - self.horizontalLayout.addWidget(self.AuditFileButton) self.verticalLayout.addLayout(self.horizontalLayout) self.AuditActive = QtGui.QCheckBox(self) self.AuditActive.setObjectName("AuditActive") @@ -69,13 +58,6 @@ class AuditTab(SettingsTab): self.AuditFileName.setText(self.config.get_config(u'Audit file', u'')) self.AuditActive.setChecked(int(self.config.get_config(u'startup', 0))) - def onAuditFileButtonClicked(self): - filename = QtGui.QFileDialog.getSaveFileName(self, u'Audit File',self.AuditFileName.text()) - if filename != u'': - filename = unicode(filename) - self.AuditFileName.setText(filename) - def save(self): - self.config.set_config(u'Audit file', unicode(self.AuditFileName.text())) self.config.set_config(u'startup', unicode(self.AuditActive.checkState())) Receiver().send_message(u'audit_changed')