From 00e84d40f3522b9d6dcb157be31fed38261c8a84 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 6 Feb 2010 08:04:01 +0000 Subject: [PATCH] Cleanups and fix alerts for Presentations --- openlp/core/ui/__init__.py | 2 +- openlp/core/ui/alertform.py | 2 +- openlp/core/ui/maindisplay.py | 7 +- openlp/core/ui/mainwindow.py | 2 +- openlp/plugins/songs/forms/editversedialog.py | 122 ++++++++++-------- 5 files changed, 75 insertions(+), 60 deletions(-) diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py index 42f232638..5d4c798d8 100644 --- a/openlp/core/ui/__init__.py +++ b/openlp/core/ui/__init__.py @@ -42,4 +42,4 @@ from mainwindow import MainWindow __all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow', 'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager', - 'AmendThemeForm', 'MediaDockManager', 'ThemeLevel'] + 'AmendThemeForm', 'MediaDockManager'] diff --git a/openlp/core/ui/alertform.py b/openlp/core/ui/alertform.py index 4b099b954..beae62a53 100644 --- a/openlp/core/ui/alertform.py +++ b/openlp/core/ui/alertform.py @@ -99,4 +99,4 @@ class AlertForm(QtGui.QDialog): self.CancelButton.setText(self.trUtf8('Cancel')) def onDisplayClicked(self): - self.parent.mainDisplay.displayAlert(unicode(self.AlertEntryEditItem.text())) \ No newline at end of file + self.parent.mainDisplay.displayAlert(unicode(self.AlertEntryEditItem.text())) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 65a8843a8..bf0e11cb3 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -202,22 +202,21 @@ class MainDisplay(DisplayWidget): self.showFullScreen() def hideDisplay(self): + self.mediaLoaded = True self.setVisible(False) def showDisplay(self): + self.mediaLoaded = False if not self.primary: self.setVisible(True) self.showFullScreen() + self.generateAlert() def addImageWithText(self, frame): frame = resize_image(frame, self.screen[u'size'].width(), self.screen[u'size'].height() ) self.display_image.setPixmap(QtGui.QPixmap.fromImage(frame)) -# self.display_image.show() -# if not self.isVisible(): -# self.setVisible(True) -# self.showFullScreen() def frameView(self, frame, transition=False): """ diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index a17ee7d5a..36f427d13 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -56,7 +56,7 @@ class versionThread(QtCore.QThread): QtCore.QThread.__init__(self, parent) self.parent = parent def run (self): - time.sleep(5) + time.sleep(2) Receiver.send_message(u'version_check') diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py index 8f532ac3f..89e704c87 100644 --- a/openlp/plugins/songs/forms/editversedialog.py +++ b/openlp/plugins/songs/forms/editversedialog.py @@ -1,113 +1,129 @@ # -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 -# Form implementation generated from reading ui file 'editversedialog.ui' -# -# Created: Wed Dec 2 08:14:47 2009 -# 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_EditVerseDialog(object): def setupUi(self, EditVerseDialog): - EditVerseDialog.setObjectName("EditVerseDialog") + EditVerseDialog.setObjectName(u'EditVerseDialog') EditVerseDialog.resize(500, 521) EditVerseDialog.setModal(True) self.layoutWidget = QtGui.QWidget(EditVerseDialog) self.layoutWidget.setGeometry(QtCore.QRect(11, 1, 471, 491)) - self.layoutWidget.setObjectName("layoutWidget") + self.layoutWidget.setObjectName(u'layoutWidget') self.verticalLayout_3 = QtGui.QVBoxLayout(self.layoutWidget) - self.verticalLayout_3.setObjectName("verticalLayout_3") + self.verticalLayout_3.setObjectName(u'verticalLayout_3') self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") + self.horizontalLayout.setObjectName(u'horizontalLayout') self.verticalLayout = QtGui.QVBoxLayout() - self.verticalLayout.setObjectName("verticalLayout") + self.verticalLayout.setObjectName(u'verticalLayout') self.VerseTypeLabel = QtGui.QLabel(self.layoutWidget) self.VerseTypeLabel.setTextFormat(QtCore.Qt.PlainText) self.VerseTypeLabel.setAlignment(QtCore.Qt.AlignCenter) - self.VerseTypeLabel.setObjectName("VerseTypeLabel") + self.VerseTypeLabel.setObjectName(u'VerseTypeLabel') self.verticalLayout.addWidget(self.VerseTypeLabel) self.VerseListComboBox = QtGui.QComboBox(self.layoutWidget) - self.VerseListComboBox.setObjectName("VerseListComboBox") - self.VerseListComboBox.addItem("") - self.VerseListComboBox.addItem("") - self.VerseListComboBox.addItem("") - self.VerseListComboBox.addItem("") - self.VerseListComboBox.addItem("") - self.VerseListComboBox.addItem("") - self.VerseListComboBox.addItem("") + self.VerseListComboBox.setObjectName(u'VerseListComboBox') + self.VerseListComboBox.addItem(u'') + self.VerseListComboBox.addItem(u'') + self.VerseListComboBox.addItem(u'') + self.VerseListComboBox.addItem(u'') + self.VerseListComboBox.addItem(u'') + self.VerseListComboBox.addItem(u'') + self.VerseListComboBox.addItem(u'') self.verticalLayout.addWidget(self.VerseListComboBox) self.horizontalLayout.addLayout(self.verticalLayout) self.verticalLayout_2 = QtGui.QVBoxLayout() - self.verticalLayout_2.setObjectName("verticalLayout_2") + self.verticalLayout_2.setObjectName(u'verticalLayout_2') self.VerseNumberLabel = QtGui.QLabel(self.layoutWidget) self.VerseNumberLabel.setAlignment(QtCore.Qt.AlignCenter) - self.VerseNumberLabel.setObjectName("VerseNumberLabel") + self.VerseNumberLabel.setObjectName(u'VerseNumberLabel') self.verticalLayout_2.addWidget(self.VerseNumberLabel) self.SubVerseListComboBox = QtGui.QComboBox(self.layoutWidget) - self.SubVerseListComboBox.setObjectName("SubVerseListComboBox") + self.SubVerseListComboBox.setObjectName(u'SubVerseListComboBox') self.verticalLayout_2.addWidget(self.SubVerseListComboBox) self.horizontalLayout.addLayout(self.verticalLayout_2) self.verticalLayout_3.addLayout(self.horizontalLayout) self.VerseTextEdit = QtGui.QTextEdit(self.layoutWidget) self.VerseTextEdit.setAcceptRichText(False) - self.VerseTextEdit.setObjectName("VerseTextEdit") + self.VerseTextEdit.setObjectName(u'VerseTextEdit') self.verticalLayout_3.addWidget(self.VerseTextEdit) self.horizontalLayout_2 = QtGui.QHBoxLayout() - self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') self.addBridge = QtGui.QPushButton(self.layoutWidget) - self.addBridge.setObjectName("addBridge") + self.addBridge.setObjectName(u'addBridge') self.horizontalLayout_2.addWidget(self.addBridge) self.addVerse = QtGui.QPushButton(self.layoutWidget) - self.addVerse.setObjectName("addVerse") + self.addVerse.setObjectName(u'addVerse') self.horizontalLayout_2.addWidget(self.addVerse) self.addChorus = QtGui.QPushButton(self.layoutWidget) - self.addChorus.setObjectName("addChorus") + self.addChorus.setObjectName(u'addChorus') self.horizontalLayout_2.addWidget(self.addChorus) self.verticalLayout_3.addLayout(self.horizontalLayout_2) self.horizontalLayout_3 = QtGui.QHBoxLayout() - self.horizontalLayout_3.setObjectName("horizontalLayout_3") + self.horizontalLayout_3.setObjectName(u'horizontalLayout_3') self.addPreChorus = QtGui.QPushButton(self.layoutWidget) - self.addPreChorus.setObjectName("addPreChorus") + self.addPreChorus.setObjectName(u'addPreChorus') self.horizontalLayout_3.addWidget(self.addPreChorus) self.addIntro = QtGui.QPushButton(self.layoutWidget) - self.addIntro.setObjectName("addIntro") + self.addIntro.setObjectName(u'addIntro') self.horizontalLayout_3.addWidget(self.addIntro) self.addOther = QtGui.QPushButton(self.layoutWidget) - self.addOther.setObjectName("addOther") + self.addOther.setObjectName(u'addOther') self.horizontalLayout_3.addWidget(self.addOther) self.addEnding = QtGui.QPushButton(self.layoutWidget) - self.addEnding.setObjectName("addEnding") + self.addEnding.setObjectName(u'addEnding') self.horizontalLayout_3.addWidget(self.addEnding) self.verticalLayout_3.addLayout(self.horizontalLayout_3) self.ButtonBox = QtGui.QDialogButtonBox(self.layoutWidget) self.ButtonBox.setOrientation(QtCore.Qt.Horizontal) self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save) - self.ButtonBox.setObjectName("ButtonBox") + self.ButtonBox.setObjectName(u'ButtonBox') self.verticalLayout_3.addWidget(self.ButtonBox) self.retranslateUi(EditVerseDialog) - QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("accepted()"), EditVerseDialog.accept) - QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("rejected()"), EditVerseDialog.reject) + QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'accepted()'), EditVerseDialog.accept) + QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'rejected()'), EditVerseDialog.reject) QtCore.QMetaObject.connectSlotsByName(EditVerseDialog) def retranslateUi(self, EditVerseDialog): - EditVerseDialog.setWindowTitle(QtGui.QApplication.translate("EditVerseDialog", "Edit Verse", None, QtGui.QApplication.UnicodeUTF8)) - self.VerseTypeLabel.setText(QtGui.QApplication.translate("EditVerseDialog", "Verse Type", None, QtGui.QApplication.UnicodeUTF8)) - self.VerseListComboBox.setItemText(0, QtGui.QApplication.translate("EditVerseDialog", "Intro", None, QtGui.QApplication.UnicodeUTF8)) - self.VerseListComboBox.setItemText(1, QtGui.QApplication.translate("EditVerseDialog", "Verse", None, QtGui.QApplication.UnicodeUTF8)) - self.VerseListComboBox.setItemText(2, QtGui.QApplication.translate("EditVerseDialog", "Pre-Chorus", None, QtGui.QApplication.UnicodeUTF8)) - self.VerseListComboBox.setItemText(3, QtGui.QApplication.translate("EditVerseDialog", "Chorus", None, QtGui.QApplication.UnicodeUTF8)) - self.VerseListComboBox.setItemText(4, QtGui.QApplication.translate("EditVerseDialog", "Bridge", None, QtGui.QApplication.UnicodeUTF8)) - self.VerseListComboBox.setItemText(5, QtGui.QApplication.translate("EditVerseDialog", "Ending", None, QtGui.QApplication.UnicodeUTF8)) - self.VerseListComboBox.setItemText(6, QtGui.QApplication.translate("EditVerseDialog", "Other", None, QtGui.QApplication.UnicodeUTF8)) - self.VerseNumberLabel.setText(QtGui.QApplication.translate("EditVerseDialog", "Number", None, QtGui.QApplication.UnicodeUTF8)) - self.addBridge.setText(QtGui.QApplication.translate("EditVerseDialog", "Bridge", None, QtGui.QApplication.UnicodeUTF8)) - self.addVerse.setText(QtGui.QApplication.translate("EditVerseDialog", "Verse", None, QtGui.QApplication.UnicodeUTF8)) - self.addChorus.setText(QtGui.QApplication.translate("EditVerseDialog", "Chorus", None, QtGui.QApplication.UnicodeUTF8)) - self.addPreChorus.setText(QtGui.QApplication.translate("EditVerseDialog", "Pre-Chorus", None, QtGui.QApplication.UnicodeUTF8)) - self.addIntro.setText(QtGui.QApplication.translate("EditVerseDialog", "Intro", None, QtGui.QApplication.UnicodeUTF8)) - self.addOther.setText(QtGui.QApplication.translate("EditVerseDialog", "Other", None, QtGui.QApplication.UnicodeUTF8)) - self.addEnding.setText(QtGui.QApplication.translate("EditVerseDialog", "Ending", None, QtGui.QApplication.UnicodeUTF8)) + EditVerseDialog.setWindowTitle(self.trUtf8('Edit Verse')) + self.VerseTypeLabel.setText(self.trUtf8('Verse Type')) + self.VerseListComboBox.setItemText(0, self.trUtf8('Intro')) + self.VerseListComboBox.setItemText(1, self.trUtf8('Verse')) + self.VerseListComboBox.setItemText(2, self.trUtf8('Pre-Chorus')) + self.VerseListComboBox.setItemText(3, self.trUtf8('Chorus')) + self.VerseListComboBox.setItemText(4, self.trUtf8('Bridge')) + self.VerseListComboBox.setItemText(5, self.trUtf8('Ending')) + self.VerseListComboBox.setItemText(6, self.trUtf8('Other')) + self.VerseNumberLabel.setText(self.trUtf8('Number')) + self.addBridge.setText(self.trUtf8('Bridge')) + self.addVerse.setText(self.trUtf8('Verse')) + self.addChorus.setText(self.trUtf8('Chorus')) + self.addPreChorus.setText(self.trUtf8('Pre-Chorus')) + self.addIntro.setText(self.trUtf8('Intro')) + self.addOther.setText(self.trUtf8('Other')) + self.addEnding.setText(self.trUtf8('Ending'))