forked from openlp/openlp
Clean up SongUsage so it now works again
This commit is contained in:
parent
04c68a075e
commit
af5bfe3066
@ -241,11 +241,8 @@ class MainDisplay(DisplayWidget):
|
|||||||
self.display_text.setPixmap(QtGui.QPixmap.fromImage(self.blankFrame))
|
self.display_text.setPixmap(QtGui.QPixmap.fromImage(self.blankFrame))
|
||||||
else:
|
else:
|
||||||
self.displayBlank = False
|
self.displayBlank = False
|
||||||
if self.display_text_frame:
|
if self.display_frame:
|
||||||
self.frameView(self.display_frame)
|
self.frameView(self.display_frame)
|
||||||
# if blanked != self.parent.LiveController.blankButton.isChecked():
|
|
||||||
# self.parent.LiveController.blankButton.setChecked(self.displayBlank)
|
|
||||||
# self.parent.generalConfig.set_config(u'screen blank', self.displayBlank)
|
|
||||||
|
|
||||||
def displayAlert(self, text=u''):
|
def displayAlert(self, text=u''):
|
||||||
"""
|
"""
|
||||||
|
@ -249,32 +249,33 @@ class ThemeManager(QtGui.QWidget):
|
|||||||
log.debug(u'Load themes from dir')
|
log.debug(u'Load themes from dir')
|
||||||
self.themelist = []
|
self.themelist = []
|
||||||
self.ThemeListWidget.clear()
|
self.ThemeListWidget.clear()
|
||||||
for root, dirs, files in os.walk(self.path):
|
#root, dirs, files = os.walk(self.path)
|
||||||
for name in files:
|
dirList = os.listdir(self.path)
|
||||||
if name.endswith(u'.png'):
|
for name in dirList:
|
||||||
#check to see file is in theme root directory
|
if name.endswith(u'.png'):
|
||||||
theme = os.path.join(self.path, name)
|
#check to see file is in theme root directory
|
||||||
if os.path.exists(theme):
|
theme = os.path.join(self.path, name)
|
||||||
(path, filename) = os.path.split(unicode(file))
|
if os.path.exists(theme):
|
||||||
textName = os.path.splitext(name)[0]
|
(path, filename) = os.path.split(unicode(file))
|
||||||
if textName == self.global_theme:
|
textName = os.path.splitext(name)[0]
|
||||||
name = u'%s (%s)' % (textName,
|
if textName == self.global_theme:
|
||||||
self.trUtf8('default'))
|
name = u'%s (%s)' % (textName,
|
||||||
else:
|
self.trUtf8('default'))
|
||||||
name = textName
|
else:
|
||||||
thumb = os.path.join(self.thumbPath, u'%s.png' % textName)
|
name = textName
|
||||||
item_name = QtGui.QListWidgetItem(name)
|
thumb = os.path.join(self.thumbPath, u'%s.png' % textName)
|
||||||
if os.path.exists(thumb):
|
item_name = QtGui.QListWidgetItem(name)
|
||||||
icon = build_icon(thumb)
|
if os.path.exists(thumb):
|
||||||
else:
|
icon = build_icon(thumb)
|
||||||
icon = build_icon(theme)
|
else:
|
||||||
pixmap = icon.pixmap(QtCore.QSize(88,50))
|
icon = build_icon(theme)
|
||||||
pixmap.save(thumb, u'png')
|
pixmap = icon.pixmap(QtCore.QSize(88,50))
|
||||||
item_name.setIcon(icon)
|
pixmap.save(thumb, u'png')
|
||||||
item_name.setData(QtCore.Qt.UserRole,
|
item_name.setIcon(icon)
|
||||||
QtCore.QVariant(textName))
|
item_name.setData(QtCore.Qt.UserRole,
|
||||||
self.ThemeListWidget.addItem(item_name)
|
QtCore.QVariant(textName))
|
||||||
self.themelist.append(textName)
|
self.ThemeListWidget.addItem(item_name)
|
||||||
|
self.themelist.append(textName)
|
||||||
self.pushThemes()
|
self.pushThemes()
|
||||||
|
|
||||||
def pushThemes(self):
|
def pushThemes(self):
|
||||||
|
@ -33,11 +33,11 @@ class SongUsageDeleteForm(QtGui.QDialog, Ui_SongUsageDeleteDialog):
|
|||||||
"""
|
"""
|
||||||
Class documentation goes here.
|
Class documentation goes here.
|
||||||
"""
|
"""
|
||||||
def __init__(self, auditmanager, parent=None):
|
def __init__(self, songusagemanager, parent=None):
|
||||||
"""
|
"""
|
||||||
Constructor
|
Constructor
|
||||||
"""
|
"""
|
||||||
self.auditmanager = auditmanager
|
self.songusagemanager = songusagemanager
|
||||||
QtGui.QDialog.__init__(self, parent)
|
QtGui.QDialog.__init__(self, parent)
|
||||||
self.setupUi(self)
|
self.setupUi(self)
|
||||||
|
|
||||||
@ -52,5 +52,5 @@ class SongUsageDeleteForm(QtGui.QDialog, Ui_SongUsageDeleteDialog):
|
|||||||
if ret == QtGui.QMessageBox.Ok:
|
if ret == QtGui.QMessageBox.Ok:
|
||||||
qDeleteDate = self.DeleteCalendar.selectedDate()
|
qDeleteDate = self.DeleteCalendar.selectedDate()
|
||||||
deleteDate = date(qDeleteDate.year(), qDeleteDate.month(), qDeleteDate.day())
|
deleteDate = date(qDeleteDate.year(), qDeleteDate.month(), qDeleteDate.day())
|
||||||
self.auditmanager.delete_to_date(deleteDate)
|
self.songusagemanager.delete_to_date(deleteDate)
|
||||||
self.close()
|
self.close()
|
||||||
|
@ -25,10 +25,14 @@
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
import logging
|
||||||
|
|
||||||
from songusagedetaildialog import Ui_SongUsageDetailDialog
|
from songusagedetaildialog import Ui_SongUsageDetailDialog
|
||||||
|
|
||||||
class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
|
class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
|
||||||
|
global log
|
||||||
|
log = logging.getLogger(u'SongUsageDetailForm')
|
||||||
|
log.info(u'SongUsage Detail Form loaded')
|
||||||
"""
|
"""
|
||||||
Class documentation goes here.
|
Class documentation goes here.
|
||||||
"""
|
"""
|
||||||
@ -106,19 +110,19 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
|
|||||||
self.close()
|
self.close()
|
||||||
|
|
||||||
def detailedReport(self):
|
def detailedReport(self):
|
||||||
print "detailed"
|
log.debug(u'Detailed report generated')
|
||||||
filename = u'audit_det_%s_%s.txt' % \
|
filename = u'usage_detail_%s_%s.txt' % \
|
||||||
(self.FromDateEdit.date().toString(u'ddMMyyyy'),
|
(self.FromDateEdit.date().toString(u'ddMMyyyy'),
|
||||||
self.ToDateEdit.date().toString(u'ddMMyyyy'))
|
self.ToDateEdit.date().toString(u'ddMMyyyy'))
|
||||||
audits = self.parent.auditmanager.get_all_audits()
|
usage = self.parent.songusagemanager.get_all_songusage()
|
||||||
outname = os.path.join(unicode(self.FileLineEdit.text()), filename)
|
outname = os.path.join(unicode(self.FileLineEdit.text()), filename)
|
||||||
file = None
|
file = None
|
||||||
try:
|
try:
|
||||||
file = open(outname, u'w')
|
file = open(outname, u'w')
|
||||||
for audit in audits:
|
for instance in usage:
|
||||||
record = u'\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\"\n' % \
|
record = u'\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\"\n' % \
|
||||||
(audit.auditdate,audit.audittime, audit.title,
|
(instance.usagedate,instance.usagetime, instance.title,
|
||||||
audit.copyright, audit.ccl_number , audit.authors)
|
instance.copyright, instance.ccl_number , instance.authors)
|
||||||
file.write(record)
|
file.write(record)
|
||||||
except:
|
except:
|
||||||
log.exception(u'Failed to write out audit records')
|
log.exception(u'Failed to write out audit records')
|
||||||
@ -127,8 +131,7 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
|
|||||||
file.close()
|
file.close()
|
||||||
|
|
||||||
def summaryReport(self):
|
def summaryReport(self):
|
||||||
print "summary"
|
log.debug(u'Summary report generated')
|
||||||
filename = u'audit_sum_%s_%s.txt' % \
|
filename = u'audit_sum_%s_%s.txt' % \
|
||||||
(self.FromDateEdit.date().toString(u'ddMMyyyy'),
|
(self.FromDateEdit.date().toString(u'ddMMyyyy'),
|
||||||
self.ToDateEdit.date().toString(u'ddMMyyyy'))
|
self.ToDateEdit.date().toString(u'ddMMyyyy'))
|
||||||
print filename
|
|
@ -141,7 +141,7 @@ class SongUsagePlugin(Plugin):
|
|||||||
SongUsageitem.authors = u''
|
SongUsageitem.authors = u''
|
||||||
for author in SongUsageData[1]:
|
for author in SongUsageData[1]:
|
||||||
SongUsageitem.authors += author + u' '
|
SongUsageitem.authors += author + u' '
|
||||||
self.songusagemanager.insert_SongUsage(SongUsageitem)
|
self.songusagemanager.insert_songusage(SongUsageitem)
|
||||||
|
|
||||||
def onSongUsageDelete(self):
|
def onSongUsageDelete(self):
|
||||||
self.SongUsagedeleteform.exec_()
|
self.SongUsagedeleteform.exec_()
|
||||||
@ -154,4 +154,4 @@ class SongUsagePlugin(Plugin):
|
|||||||
about_text = self.trUtf8('<b>SongUsage Plugin</b><br>This plugin '
|
about_text = self.trUtf8('<b>SongUsage Plugin</b><br>This plugin '
|
||||||
'records the use of songs and when they have been used during '
|
'records the use of songs and when they have been used during '
|
||||||
'a live service')
|
'a live service')
|
||||||
return about_text
|
return about_text
|
||||||
|
Loading…
Reference in New Issue
Block a user