forked from openlp/openlp
Cleanups and fix alerts for Presentations
This commit is contained in:
parent
58894e2afa
commit
00e84d40f3
@ -42,4 +42,4 @@ from mainwindow import MainWindow
|
|||||||
|
|
||||||
__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow',
|
__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow',
|
||||||
'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
|
'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
|
||||||
'AmendThemeForm', 'MediaDockManager', 'ThemeLevel']
|
'AmendThemeForm', 'MediaDockManager']
|
||||||
|
@ -99,4 +99,4 @@ class AlertForm(QtGui.QDialog):
|
|||||||
self.CancelButton.setText(self.trUtf8('Cancel'))
|
self.CancelButton.setText(self.trUtf8('Cancel'))
|
||||||
|
|
||||||
def onDisplayClicked(self):
|
def onDisplayClicked(self):
|
||||||
self.parent.mainDisplay.displayAlert(unicode(self.AlertEntryEditItem.text()))
|
self.parent.mainDisplay.displayAlert(unicode(self.AlertEntryEditItem.text()))
|
||||||
|
@ -202,22 +202,21 @@ class MainDisplay(DisplayWidget):
|
|||||||
self.showFullScreen()
|
self.showFullScreen()
|
||||||
|
|
||||||
def hideDisplay(self):
|
def hideDisplay(self):
|
||||||
|
self.mediaLoaded = True
|
||||||
self.setVisible(False)
|
self.setVisible(False)
|
||||||
|
|
||||||
def showDisplay(self):
|
def showDisplay(self):
|
||||||
|
self.mediaLoaded = False
|
||||||
if not self.primary:
|
if not self.primary:
|
||||||
self.setVisible(True)
|
self.setVisible(True)
|
||||||
self.showFullScreen()
|
self.showFullScreen()
|
||||||
|
self.generateAlert()
|
||||||
|
|
||||||
def addImageWithText(self, frame):
|
def addImageWithText(self, frame):
|
||||||
frame = resize_image(frame,
|
frame = resize_image(frame,
|
||||||
self.screen[u'size'].width(),
|
self.screen[u'size'].width(),
|
||||||
self.screen[u'size'].height() )
|
self.screen[u'size'].height() )
|
||||||
self.display_image.setPixmap(QtGui.QPixmap.fromImage(frame))
|
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):
|
def frameView(self, frame, transition=False):
|
||||||
"""
|
"""
|
||||||
|
@ -56,7 +56,7 @@ class versionThread(QtCore.QThread):
|
|||||||
QtCore.QThread.__init__(self, parent)
|
QtCore.QThread.__init__(self, parent)
|
||||||
self.parent = parent
|
self.parent = parent
|
||||||
def run (self):
|
def run (self):
|
||||||
time.sleep(5)
|
time.sleep(2)
|
||||||
Receiver.send_message(u'version_check')
|
Receiver.send_message(u'version_check')
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,113 +1,129 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'editversedialog.ui'
|
###############################################################################
|
||||||
#
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
# Created: Wed Dec 2 08:14:47 2009
|
# --------------------------------------------------------------------------- #
|
||||||
# by: PyQt4 UI code generator 4.6.2
|
# Copyright (c) 2008-2010 Raoul Snyman #
|
||||||
#
|
# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
|
||||||
# WARNING! All changes made in this file will be lost!
|
# 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
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
class Ui_EditVerseDialog(object):
|
class Ui_EditVerseDialog(object):
|
||||||
def setupUi(self, EditVerseDialog):
|
def setupUi(self, EditVerseDialog):
|
||||||
EditVerseDialog.setObjectName("EditVerseDialog")
|
EditVerseDialog.setObjectName(u'EditVerseDialog')
|
||||||
EditVerseDialog.resize(500, 521)
|
EditVerseDialog.resize(500, 521)
|
||||||
EditVerseDialog.setModal(True)
|
EditVerseDialog.setModal(True)
|
||||||
self.layoutWidget = QtGui.QWidget(EditVerseDialog)
|
self.layoutWidget = QtGui.QWidget(EditVerseDialog)
|
||||||
self.layoutWidget.setGeometry(QtCore.QRect(11, 1, 471, 491))
|
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 = QtGui.QVBoxLayout(self.layoutWidget)
|
||||||
self.verticalLayout_3.setObjectName("verticalLayout_3")
|
self.verticalLayout_3.setObjectName(u'verticalLayout_3')
|
||||||
self.horizontalLayout = QtGui.QHBoxLayout()
|
self.horizontalLayout = QtGui.QHBoxLayout()
|
||||||
self.horizontalLayout.setObjectName("horizontalLayout")
|
self.horizontalLayout.setObjectName(u'horizontalLayout')
|
||||||
self.verticalLayout = QtGui.QVBoxLayout()
|
self.verticalLayout = QtGui.QVBoxLayout()
|
||||||
self.verticalLayout.setObjectName("verticalLayout")
|
self.verticalLayout.setObjectName(u'verticalLayout')
|
||||||
self.VerseTypeLabel = QtGui.QLabel(self.layoutWidget)
|
self.VerseTypeLabel = QtGui.QLabel(self.layoutWidget)
|
||||||
self.VerseTypeLabel.setTextFormat(QtCore.Qt.PlainText)
|
self.VerseTypeLabel.setTextFormat(QtCore.Qt.PlainText)
|
||||||
self.VerseTypeLabel.setAlignment(QtCore.Qt.AlignCenter)
|
self.VerseTypeLabel.setAlignment(QtCore.Qt.AlignCenter)
|
||||||
self.VerseTypeLabel.setObjectName("VerseTypeLabel")
|
self.VerseTypeLabel.setObjectName(u'VerseTypeLabel')
|
||||||
self.verticalLayout.addWidget(self.VerseTypeLabel)
|
self.verticalLayout.addWidget(self.VerseTypeLabel)
|
||||||
self.VerseListComboBox = QtGui.QComboBox(self.layoutWidget)
|
self.VerseListComboBox = QtGui.QComboBox(self.layoutWidget)
|
||||||
self.VerseListComboBox.setObjectName("VerseListComboBox")
|
self.VerseListComboBox.setObjectName(u'VerseListComboBox')
|
||||||
self.VerseListComboBox.addItem("")
|
self.VerseListComboBox.addItem(u'')
|
||||||
self.VerseListComboBox.addItem("")
|
self.VerseListComboBox.addItem(u'')
|
||||||
self.VerseListComboBox.addItem("")
|
self.VerseListComboBox.addItem(u'')
|
||||||
self.VerseListComboBox.addItem("")
|
self.VerseListComboBox.addItem(u'')
|
||||||
self.VerseListComboBox.addItem("")
|
self.VerseListComboBox.addItem(u'')
|
||||||
self.VerseListComboBox.addItem("")
|
self.VerseListComboBox.addItem(u'')
|
||||||
self.VerseListComboBox.addItem("")
|
self.VerseListComboBox.addItem(u'')
|
||||||
self.verticalLayout.addWidget(self.VerseListComboBox)
|
self.verticalLayout.addWidget(self.VerseListComboBox)
|
||||||
self.horizontalLayout.addLayout(self.verticalLayout)
|
self.horizontalLayout.addLayout(self.verticalLayout)
|
||||||
self.verticalLayout_2 = QtGui.QVBoxLayout()
|
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 = QtGui.QLabel(self.layoutWidget)
|
||||||
self.VerseNumberLabel.setAlignment(QtCore.Qt.AlignCenter)
|
self.VerseNumberLabel.setAlignment(QtCore.Qt.AlignCenter)
|
||||||
self.VerseNumberLabel.setObjectName("VerseNumberLabel")
|
self.VerseNumberLabel.setObjectName(u'VerseNumberLabel')
|
||||||
self.verticalLayout_2.addWidget(self.VerseNumberLabel)
|
self.verticalLayout_2.addWidget(self.VerseNumberLabel)
|
||||||
self.SubVerseListComboBox = QtGui.QComboBox(self.layoutWidget)
|
self.SubVerseListComboBox = QtGui.QComboBox(self.layoutWidget)
|
||||||
self.SubVerseListComboBox.setObjectName("SubVerseListComboBox")
|
self.SubVerseListComboBox.setObjectName(u'SubVerseListComboBox')
|
||||||
self.verticalLayout_2.addWidget(self.SubVerseListComboBox)
|
self.verticalLayout_2.addWidget(self.SubVerseListComboBox)
|
||||||
self.horizontalLayout.addLayout(self.verticalLayout_2)
|
self.horizontalLayout.addLayout(self.verticalLayout_2)
|
||||||
self.verticalLayout_3.addLayout(self.horizontalLayout)
|
self.verticalLayout_3.addLayout(self.horizontalLayout)
|
||||||
self.VerseTextEdit = QtGui.QTextEdit(self.layoutWidget)
|
self.VerseTextEdit = QtGui.QTextEdit(self.layoutWidget)
|
||||||
self.VerseTextEdit.setAcceptRichText(False)
|
self.VerseTextEdit.setAcceptRichText(False)
|
||||||
self.VerseTextEdit.setObjectName("VerseTextEdit")
|
self.VerseTextEdit.setObjectName(u'VerseTextEdit')
|
||||||
self.verticalLayout_3.addWidget(self.VerseTextEdit)
|
self.verticalLayout_3.addWidget(self.VerseTextEdit)
|
||||||
self.horizontalLayout_2 = QtGui.QHBoxLayout()
|
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 = QtGui.QPushButton(self.layoutWidget)
|
||||||
self.addBridge.setObjectName("addBridge")
|
self.addBridge.setObjectName(u'addBridge')
|
||||||
self.horizontalLayout_2.addWidget(self.addBridge)
|
self.horizontalLayout_2.addWidget(self.addBridge)
|
||||||
self.addVerse = QtGui.QPushButton(self.layoutWidget)
|
self.addVerse = QtGui.QPushButton(self.layoutWidget)
|
||||||
self.addVerse.setObjectName("addVerse")
|
self.addVerse.setObjectName(u'addVerse')
|
||||||
self.horizontalLayout_2.addWidget(self.addVerse)
|
self.horizontalLayout_2.addWidget(self.addVerse)
|
||||||
self.addChorus = QtGui.QPushButton(self.layoutWidget)
|
self.addChorus = QtGui.QPushButton(self.layoutWidget)
|
||||||
self.addChorus.setObjectName("addChorus")
|
self.addChorus.setObjectName(u'addChorus')
|
||||||
self.horizontalLayout_2.addWidget(self.addChorus)
|
self.horizontalLayout_2.addWidget(self.addChorus)
|
||||||
self.verticalLayout_3.addLayout(self.horizontalLayout_2)
|
self.verticalLayout_3.addLayout(self.horizontalLayout_2)
|
||||||
self.horizontalLayout_3 = QtGui.QHBoxLayout()
|
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 = QtGui.QPushButton(self.layoutWidget)
|
||||||
self.addPreChorus.setObjectName("addPreChorus")
|
self.addPreChorus.setObjectName(u'addPreChorus')
|
||||||
self.horizontalLayout_3.addWidget(self.addPreChorus)
|
self.horizontalLayout_3.addWidget(self.addPreChorus)
|
||||||
self.addIntro = QtGui.QPushButton(self.layoutWidget)
|
self.addIntro = QtGui.QPushButton(self.layoutWidget)
|
||||||
self.addIntro.setObjectName("addIntro")
|
self.addIntro.setObjectName(u'addIntro')
|
||||||
self.horizontalLayout_3.addWidget(self.addIntro)
|
self.horizontalLayout_3.addWidget(self.addIntro)
|
||||||
self.addOther = QtGui.QPushButton(self.layoutWidget)
|
self.addOther = QtGui.QPushButton(self.layoutWidget)
|
||||||
self.addOther.setObjectName("addOther")
|
self.addOther.setObjectName(u'addOther')
|
||||||
self.horizontalLayout_3.addWidget(self.addOther)
|
self.horizontalLayout_3.addWidget(self.addOther)
|
||||||
self.addEnding = QtGui.QPushButton(self.layoutWidget)
|
self.addEnding = QtGui.QPushButton(self.layoutWidget)
|
||||||
self.addEnding.setObjectName("addEnding")
|
self.addEnding.setObjectName(u'addEnding')
|
||||||
self.horizontalLayout_3.addWidget(self.addEnding)
|
self.horizontalLayout_3.addWidget(self.addEnding)
|
||||||
self.verticalLayout_3.addLayout(self.horizontalLayout_3)
|
self.verticalLayout_3.addLayout(self.horizontalLayout_3)
|
||||||
self.ButtonBox = QtGui.QDialogButtonBox(self.layoutWidget)
|
self.ButtonBox = QtGui.QDialogButtonBox(self.layoutWidget)
|
||||||
self.ButtonBox.setOrientation(QtCore.Qt.Horizontal)
|
self.ButtonBox.setOrientation(QtCore.Qt.Horizontal)
|
||||||
self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save)
|
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.verticalLayout_3.addWidget(self.ButtonBox)
|
||||||
|
|
||||||
self.retranslateUi(EditVerseDialog)
|
self.retranslateUi(EditVerseDialog)
|
||||||
QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("accepted()"), EditVerseDialog.accept)
|
QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'accepted()'), EditVerseDialog.accept)
|
||||||
QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("rejected()"), EditVerseDialog.reject)
|
QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'rejected()'), EditVerseDialog.reject)
|
||||||
QtCore.QMetaObject.connectSlotsByName(EditVerseDialog)
|
QtCore.QMetaObject.connectSlotsByName(EditVerseDialog)
|
||||||
|
|
||||||
def retranslateUi(self, EditVerseDialog):
|
def retranslateUi(self, EditVerseDialog):
|
||||||
EditVerseDialog.setWindowTitle(QtGui.QApplication.translate("EditVerseDialog", "Edit Verse", None, QtGui.QApplication.UnicodeUTF8))
|
EditVerseDialog.setWindowTitle(self.trUtf8('Edit Verse'))
|
||||||
self.VerseTypeLabel.setText(QtGui.QApplication.translate("EditVerseDialog", "Verse Type", None, QtGui.QApplication.UnicodeUTF8))
|
self.VerseTypeLabel.setText(self.trUtf8('Verse Type'))
|
||||||
self.VerseListComboBox.setItemText(0, QtGui.QApplication.translate("EditVerseDialog", "Intro", None, QtGui.QApplication.UnicodeUTF8))
|
self.VerseListComboBox.setItemText(0, self.trUtf8('Intro'))
|
||||||
self.VerseListComboBox.setItemText(1, QtGui.QApplication.translate("EditVerseDialog", "Verse", None, QtGui.QApplication.UnicodeUTF8))
|
self.VerseListComboBox.setItemText(1, self.trUtf8('Verse'))
|
||||||
self.VerseListComboBox.setItemText(2, QtGui.QApplication.translate("EditVerseDialog", "Pre-Chorus", None, QtGui.QApplication.UnicodeUTF8))
|
self.VerseListComboBox.setItemText(2, self.trUtf8('Pre-Chorus'))
|
||||||
self.VerseListComboBox.setItemText(3, QtGui.QApplication.translate("EditVerseDialog", "Chorus", None, QtGui.QApplication.UnicodeUTF8))
|
self.VerseListComboBox.setItemText(3, self.trUtf8('Chorus'))
|
||||||
self.VerseListComboBox.setItemText(4, QtGui.QApplication.translate("EditVerseDialog", "Bridge", None, QtGui.QApplication.UnicodeUTF8))
|
self.VerseListComboBox.setItemText(4, self.trUtf8('Bridge'))
|
||||||
self.VerseListComboBox.setItemText(5, QtGui.QApplication.translate("EditVerseDialog", "Ending", None, QtGui.QApplication.UnicodeUTF8))
|
self.VerseListComboBox.setItemText(5, self.trUtf8('Ending'))
|
||||||
self.VerseListComboBox.setItemText(6, QtGui.QApplication.translate("EditVerseDialog", "Other", None, QtGui.QApplication.UnicodeUTF8))
|
self.VerseListComboBox.setItemText(6, self.trUtf8('Other'))
|
||||||
self.VerseNumberLabel.setText(QtGui.QApplication.translate("EditVerseDialog", "Number", None, QtGui.QApplication.UnicodeUTF8))
|
self.VerseNumberLabel.setText(self.trUtf8('Number'))
|
||||||
self.addBridge.setText(QtGui.QApplication.translate("EditVerseDialog", "Bridge", None, QtGui.QApplication.UnicodeUTF8))
|
self.addBridge.setText(self.trUtf8('Bridge'))
|
||||||
self.addVerse.setText(QtGui.QApplication.translate("EditVerseDialog", "Verse", None, QtGui.QApplication.UnicodeUTF8))
|
self.addVerse.setText(self.trUtf8('Verse'))
|
||||||
self.addChorus.setText(QtGui.QApplication.translate("EditVerseDialog", "Chorus", None, QtGui.QApplication.UnicodeUTF8))
|
self.addChorus.setText(self.trUtf8('Chorus'))
|
||||||
self.addPreChorus.setText(QtGui.QApplication.translate("EditVerseDialog", "Pre-Chorus", None, QtGui.QApplication.UnicodeUTF8))
|
self.addPreChorus.setText(self.trUtf8('Pre-Chorus'))
|
||||||
self.addIntro.setText(QtGui.QApplication.translate("EditVerseDialog", "Intro", None, QtGui.QApplication.UnicodeUTF8))
|
self.addIntro.setText(self.trUtf8('Intro'))
|
||||||
self.addOther.setText(QtGui.QApplication.translate("EditVerseDialog", "Other", None, QtGui.QApplication.UnicodeUTF8))
|
self.addOther.setText(self.trUtf8('Other'))
|
||||||
self.addEnding.setText(QtGui.QApplication.translate("EditVerseDialog", "Ending", None, QtGui.QApplication.UnicodeUTF8))
|
self.addEnding.setText(self.trUtf8('Ending'))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user