openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/futures into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


Fix UTF8 , and alert bugs
-- 
https://code.launchpad.net/~trb143/openlp/futures/+merge/19534
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2010-02-13 07:37:03 +0000
+++ openlp/core/ui/maindisplay.py	2010-02-17 20:43:10 +0000
@@ -203,7 +203,7 @@
         if not self.primary:
             self.setVisible(True)
             self.showFullScreen()
-        self.generateAlert()
+        Receiver.send_message(u'flush_alert')
 
     def addImageWithText(self, frame):
         frame = resize_image(frame,

=== modified file 'openlp/plugins/alerts/lib/alertsmanager.py'
--- openlp/plugins/alerts/lib/alertsmanager.py	2010-02-13 07:30:00 +0000
+++ openlp/plugins/alerts/lib/alertsmanager.py	2010-02-17 20:43:10 +0000
@@ -20,6 +20,8 @@
         self.timer_id = 0
         self.alertList = []
         QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'flush_alert'), self.generateAlert)
+        QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'alert_text'), self.displayAlert)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'screen_changed'), self.screenChanged)

=== modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py'
--- openlp/plugins/songusage/forms/songusagedetaildialog.py	2010-02-11 18:39:28 +0000
+++ openlp/plugins/songusage/forms/songusagedetaildialog.py	2010-02-17 20:43:10 +0000
@@ -1,69 +1,91 @@
 # -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 
-# Form implementation generated from reading ui file 'songusagedetaildialog.ui'
-#
-# Created: Tue Feb  9 07:34:05 2010
-#      by: PyQt4 UI code generator 4.6.2
-#
-# WARNING! All changes made in this file will be lost!
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
+# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
+# Carsten Tinggaard                                                           #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
 
 from PyQt4 import QtCore, QtGui
 
 class Ui_SongUsageDetailDialog(object):
     def setupUi(self, AuditDetailDialog):
-        AuditDetailDialog.setObjectName("AuditDetailDialog")
+        AuditDetailDialog.setObjectName(u'AuditDetailDialog')
         AuditDetailDialog.resize(609, 413)
         self.verticalLayout = QtGui.QVBoxLayout(AuditDetailDialog)
-        self.verticalLayout.setObjectName("verticalLayout")
+        self.verticalLayout.setObjectName(u'verticalLayout')
         self.DateRangeGroupBox = QtGui.QGroupBox(AuditDetailDialog)
-        self.DateRangeGroupBox.setObjectName("DateRangeGroupBox")
+        self.DateRangeGroupBox.setObjectName(u'DateRangeGroupBox')
         self.verticalLayout_2 = QtGui.QVBoxLayout(self.DateRangeGroupBox)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.verticalLayout_2.setObjectName(u'verticalLayout_2')
         self.DateHorizontalLayout = QtGui.QHBoxLayout()
-        self.DateHorizontalLayout.setObjectName("DateHorizontalLayout")
+        self.DateHorizontalLayout.setObjectName(u'DateHorizontalLayout')
         self.FromDate = QtGui.QCalendarWidget(self.DateRangeGroupBox)
-        self.FromDate.setObjectName("FromDate")
+        self.FromDate.setObjectName(u'FromDate')
         self.DateHorizontalLayout.addWidget(self.FromDate)
         self.ToLabel = QtGui.QLabel(self.DateRangeGroupBox)
         self.ToLabel.setScaledContents(False)
         self.ToLabel.setAlignment(QtCore.Qt.AlignCenter)
-        self.ToLabel.setObjectName("ToLabel")
+        self.ToLabel.setObjectName(u'ToLabel')
         self.DateHorizontalLayout.addWidget(self.ToLabel)
         self.ToDate = QtGui.QCalendarWidget(self.DateRangeGroupBox)
-        self.ToDate.setObjectName("ToDate")
+        self.ToDate.setObjectName(u'ToDate')
         self.DateHorizontalLayout.addWidget(self.ToDate)
         self.verticalLayout_2.addLayout(self.DateHorizontalLayout)
         self.FileGroupBox = QtGui.QGroupBox(self.DateRangeGroupBox)
-        self.FileGroupBox.setObjectName("FileGroupBox")
+        self.FileGroupBox.setObjectName(u'FileGroupBox')
         self.verticalLayout_4 = QtGui.QVBoxLayout(self.FileGroupBox)
-        self.verticalLayout_4.setObjectName("verticalLayout_4")
+        self.verticalLayout_4.setObjectName(u'verticalLayout_4')
         self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.horizontalLayout.setObjectName(u'horizontalLayout')
         self.FileLineEdit = QtGui.QLineEdit(self.FileGroupBox)
-        self.FileLineEdit.setObjectName("FileLineEdit")
+        self.FileLineEdit.setObjectName(u'FileLineEdit')
         self.horizontalLayout.addWidget(self.FileLineEdit)
         self.SaveFilePushButton = QtGui.QPushButton(self.FileGroupBox)
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/exports/export_load.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.SaveFilePushButton.setIcon(icon)
-        self.SaveFilePushButton.setObjectName("SaveFilePushButton")
+        self.SaveFilePushButton.setObjectName(u'SaveFilePushButton')
         self.horizontalLayout.addWidget(self.SaveFilePushButton)
         self.verticalLayout_4.addLayout(self.horizontalLayout)
         self.verticalLayout_2.addWidget(self.FileGroupBox)
         self.verticalLayout.addWidget(self.DateRangeGroupBox)
         self.buttonBox = QtGui.QDialogButtonBox(AuditDetailDialog)
         self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
+        self.buttonBox.setObjectName(u'buttonBox')
         self.verticalLayout.addWidget(self.buttonBox)
 
         self.retranslateUi(AuditDetailDialog)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), AuditDetailDialog.accept)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), AuditDetailDialog.close)
-        QtCore.QObject.connect(self.SaveFilePushButton, QtCore.SIGNAL("pressed()"), AuditDetailDialog.defineOutputLocation)
+        QtCore.QObject.connect(self.buttonBox,
+                                QtCore.SIGNAL(u'accepted()'),
+                                AuditDetailDialog.accept)
+        QtCore.QObject.connect(self.buttonBox,
+                               QtCore.SIGNAL(u'rejected()'),
+                               AuditDetailDialog.close)
+        QtCore.QObject.connect(self.SaveFilePushButton,
+                               QtCore.SIGNAL(u'pressed()'),
+                               AuditDetailDialog.defineOutputLocation)
         QtCore.QMetaObject.connectSlotsByName(AuditDetailDialog)
 
     def retranslateUi(self, AuditDetailDialog):
-        AuditDetailDialog.setWindowTitle(QtGui.QApplication.translate("AuditDetailDialog", "Audit Detail Extraction", None, QtGui.QApplication.UnicodeUTF8))
-        self.DateRangeGroupBox.setTitle(QtGui.QApplication.translate("AuditDetailDialog", "Select Date Range", None, QtGui.QApplication.UnicodeUTF8))
-        self.ToLabel.setText(QtGui.QApplication.translate("AuditDetailDialog", "to", None, QtGui.QApplication.UnicodeUTF8))
-        self.FileGroupBox.setTitle(QtGui.QApplication.translate("AuditDetailDialog", "Report Location", None, QtGui.QApplication.UnicodeUTF8))
+        AuditDetailDialog.setWindowTitle(self.trUtf8('Audit Detail Extraction'))
+        self.DateRangeGroupBox.setTitle(self.trUtf8('ASelect Date Range'))
+        self.ToLabel.setText(self.trUtf8('to'))
+        self.FileGroupBox.setTitle(self.trUtf8('Report Location'))