raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Head

Browse Source
This commit is contained in:
Tim Bentley 2009-08-06 18:47:38 +01:00
commit b38553bffe
8 changed files with 1060 additions and 861 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openlp/core/ui/maindisplay.py
View File

@ -24,8 +24,20 @@ from time import sleep
from openlp.core.lib import translate from openlp.core.lib import translate
class MainDisplay(QtGui.QWidget): class MainDisplay(QtGui.QWidget):
"""
This is the form that is used to display things on the projector.
"""
def __init__(self, parent , screens): def __init__(self, parent, screens):
"""
The constructor for the display form.
``parent``
The parent widget.
``screens``
The list of screens.
"""
QtGui.QWidget.__init__(self, parent) QtGui.QWidget.__init__(self, parent)
self.setWindowTitle(u'OpenLP Display') self.setWindowTitle(u'OpenLP Display')
self.screens = screens self.screens = screens
@ -37,7 +49,7 @@ class MainDisplay(QtGui.QWidget):
self.display.setScaledContents(True) self.display.setScaledContents(True)
self.layout.addWidget(self.display) self.layout.addWidget(self.display)
self.displayBlank = False self.displayBlank = False
self.blankFrame= None self.blankFrame = None
self.alertactive = False self.alertactive = False
self.alerttext = u'' self.alerttext = u''
self.alertTab = None self.alertTab = None
@ -48,6 +60,10 @@ class MainDisplay(QtGui.QWidget):
Sets up the screen on a particular screen. Sets up the screen on a particular screen.
@param (integer) screen This is the screen number. @param (integer) screen This is the screen number.
""" """
# Temporary fix until I can speak to Tim Bentley.
if screenNumber not in self.screens:
screenNumber = 0
# /Temporary fix
screen = self.screens[screenNumber] screen = self.screens[screenNumber]
if screen[u'number'] != screenNumber: if screen[u'number'] != screenNumber:
# We will most probably never actually hit this bit, but just in # We will most probably never actually hit this bit, but just in
@ -70,7 +86,8 @@ class MainDisplay(QtGui.QWidget):
painter_image.begin(self.InitialFrame) painter_image.begin(self.InitialFrame)
painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white) painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white)
painter_image.drawImage((screen[u'size'].width() - splash_image.width()) / 2, painter_image.drawImage((screen[u'size'].width() - splash_image.width()) / 2,
(screen[u'size'].height() - splash_image.height()) / 2 , splash_image) (screen[u'size'].height() - splash_image.height()) / 2,
splash_image)
self.frameView(self.InitialFrame) self.frameView(self.InitialFrame)
#Build a Black screen #Build a Black screen
painter = QtGui.QPainter() painter = QtGui.QPainter()
@ -86,7 +103,6 @@ class MainDisplay(QtGui.QWidget):
``frame`` ``frame``
Image frame to be rendered Image frame to be rendered
""" """
self.frame = frame self.frame = frame
if self.timer_id != 0 : if self.timer_id != 0 :
self.displayAlert() self.displayAlert()
@ -119,7 +135,9 @@ class MainDisplay(QtGui.QWidget):
alertframe = QtGui.QPixmap.fromImage(self.frame) alertframe = QtGui.QPixmap.fromImage(self.frame)
painter = QtGui.QPainter(alertframe) painter = QtGui.QPainter(alertframe)
top = alertframe.rect().height() * 0.9 top = alertframe.rect().height() * 0.9
painter.fillRect(QtCore.QRect(0, top , alertframe.rect().width(), alertframe.rect().height() - top), QtGui.QColor(self.alertTab.bg_color)) painter.fillRect(
QtCore.QRect(0, top, alertframe.rect().width(), alertframe.rect().height() - top),
QtGui.QColor(self.alertTab.bg_color))
font = QtGui.QFont() font = QtGui.QFont()
font.setFamily(self.alertTab.font_face) font.setFamily(self.alertTab.font_face)
font.setBold(True) font.setBold(True)
@ -128,12 +146,13 @@ class MainDisplay(QtGui.QWidget):
painter.setPen(QtGui.QColor(self.alertTab.font_color)) painter.setPen(QtGui.QColor(self.alertTab.font_color))
x, y = (0, top) x, y = (0, top)
metrics=QtGui.QFontMetrics(font) metrics=QtGui.QFontMetrics(font)
painter.drawText(x, y+metrics.height()-metrics.descent()-1, self.alerttext) painter.drawText(
x, y + metrics.height() - metrics.descent() - 1, self.alerttext)
painter.end() painter.end()
self.display.setPixmap(alertframe) self.display.setPixmap(alertframe)
# check to see if we have a timer running # check to see if we have a timer running
if self.timer_id == 0: if self.timer_id == 0:
self.timer_id = self.startTimer(int(self.alertTab.timeout) * 1000) self.timer_id = self.startTimer(int(self.alertTab.timeout) * 1000)
def timerEvent(self, event): def timerEvent(self, event):
if event.timerId() == self.timer_id: if event.timerId() == self.timer_id:

21
openlp/core/ui/mainwindow.py
View File

@ -129,13 +129,20 @@ class MainWindow(object):
Hook to close the main window and display windows on exit Hook to close the main window and display windows on exit
""" """
if self.oosNotSaved == True: if self.oosNotSaved == True:
box = QtGui.QMessageBox() ret = QtGui.QMessageBox.question(self,
box.setWindowTitle(translate(u'mainWindow', u'Question?')) translate(u'mainWindow', u'Save Changes to Service?'),
box.setText(translate(u'mainWindow', u'Save changes to Order of Service?')) translate(u'mainWindow', u'Your service has been changed, do you want to save those changes?'),
box.setIcon(QtGui.QMessageBox.Question) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Cancel | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Save),
box.setStandardButtons(QtGui.QMessageBox.Save | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Cancel); QtGui.QMessageBox.Save)
box.setDefaultButton(QtGui.QMessageBox.Save); #
ret = box.exec_() #
# box = QtGui.QMessageBox()
# box.setWindowTitle(translate(u'mainWindow', u'Question?'))
# box.setText(translate(u'mainWindow', u'Save changes to Order of Service?'))
# box.setIcon(QtGui.QMessageBox.Question)
# box.setStandardButtons(QtGui.QMessageBox.Save | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Cancel);
# box.setDefaultButton(QtGui.QMessageBox.Save);
# ret = box.exec_()
if ret == QtGui.QMessageBox.Save: if ret == QtGui.QMessageBox.Save:
self.ServiceManagerContents.onSaveService() self.ServiceManagerContents.onSaveService()
self.mainDisplay.close() self.mainDisplay.close()

5
openlp/core/ui/settingsform.py
View File

@ -24,7 +24,6 @@ from PyQt4 import QtCore, QtGui
from openlp.core.lib import SettingsTab from openlp.core.lib import SettingsTab
from openlp.core.resources import * from openlp.core.resources import *
from openlp.core.ui import GeneralTab, ThemesTab, AlertsTab from openlp.core.ui import GeneralTab, ThemesTab, AlertsTab
from settingsdialog import Ui_SettingsDialog from settingsdialog import Ui_SettingsDialog
log = logging.getLogger(u'SettingsForm') log = logging.getLogger(u'SettingsForm')
@ -49,6 +48,6 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
self.SettingsTabWidget.addTab(tab, tab.title()) self.SettingsTabWidget.addTab(tab, tab.title())
def accept(self): def accept(self):
for tab_index in range(0, self.SettingsTabWidget.count()): for tab_index in range(0, self.SettingsTabWidget.count()):
self.SettingsTabWidget.widget(tab_index).save() self.SettingsTabWidget.widget(tab_index).save()
return QtGui.QDialog.accept(self) return QtGui.QDialog.accept(self)

555
openlp/plugins/songs/forms/editsongdialog.py
View File

@ -1,151 +1,111 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
"""
OpenLP - Open Source Lyrics Projection
Copyright (c) 2008 Raoul Snyman
Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley,
This program is free software; you can redistribute it and/or modify it under # Form implementation generated from reading ui file '/home/raoul/Projects/openlp/songmaintenance/resources/forms/editsongdialog.ui'
the terms of the GNU General Public License as published by the Free Software #
Foundation; version 2 of the License. # Created: Mon Jul 27 22:18:20 2009
# by: PyQt4 UI code generator 4.4.4
#
# WARNING! All changes made in this file will be lost!
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 openlp.core.lib import translate
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
class Ui_EditSongDialog(object): class Ui_EditSongDialog(object):
def setupUi(self, EditSongDialog): def setupUi(self, EditSongDialog):
EditSongDialog.setObjectName(u'EditSongDialog') EditSongDialog.setObjectName("EditSongDialog")
EditSongDialog.resize(786, 704) EditSongDialog.resize(645, 417)
icon = QtGui.QIcon() icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
EditSongDialog.setWindowIcon(icon) EditSongDialog.setWindowIcon(icon)
EditSongDialog.setModal(True) EditSongDialog.setModal(True)
self.EditSongLayout = QtGui.QVBoxLayout(EditSongDialog) self.verticalLayout = QtGui.QVBoxLayout(EditSongDialog)
self.EditSongLayout.setSpacing(8) self.verticalLayout.setMargin(8)
self.EditSongLayout.setMargin(8) self.verticalLayout.setObjectName("verticalLayout")
self.EditSongLayout.setObjectName(u'EditSongLayout') self.SongTabWidget = QtGui.QTabWidget(EditSongDialog)
self.TopWidget = QtGui.QWidget(EditSongDialog) self.SongTabWidget.setObjectName("SongTabWidget")
self.TopWidget.setObjectName(u'TopWidget') self.LyricsTab = QtGui.QWidget()
self.TopLayout = QtGui.QHBoxLayout(self.TopWidget) self.LyricsTab.setObjectName("LyricsTab")
self.TopLayout.setSpacing(8) self.LyricsTabLayout = QtGui.QGridLayout(self.LyricsTab)
self.TopLayout.setMargin(0) self.LyricsTabLayout.setMargin(8)
self.TopLayout.setObjectName(u'TopLayout') self.LyricsTabLayout.setSpacing(8)
self.TextWidget = QtGui.QWidget(self.TopWidget) self.LyricsTabLayout.setObjectName("LyricsTabLayout")
self.TextWidget.setObjectName(u'TextWidget') self.TitleLabel = QtGui.QLabel(self.LyricsTab)
self.DetailsLayout = QtGui.QVBoxLayout(self.TextWidget) self.TitleLabel.setObjectName("TitleLabel")
self.DetailsLayout.setSpacing(8) self.LyricsTabLayout.addWidget(self.TitleLabel, 0, 0, 1, 1)
self.DetailsLayout.setMargin(0) self.TitleEditItem = QtGui.QLineEdit(self.LyricsTab)
self.DetailsLayout.setObjectName(u'DetailsLayout')
self.TitleLabel = QtGui.QLabel(self.TextWidget)
self.TitleLabel.setObjectName(u'TitleLabel')
self.DetailsLayout.addWidget(self.TitleLabel)
self.TitleEditItem = QtGui.QLineEdit(self.TextWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.TitleEditItem.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.TitleEditItem.sizePolicy().hasHeightForWidth())
self.TitleEditItem.setSizePolicy(sizePolicy) self.TitleEditItem.setSizePolicy(sizePolicy)
self.TitleEditItem.setObjectName(u'TitleEditItem') self.TitleEditItem.setObjectName("TitleEditItem")
self.DetailsLayout.addWidget(self.TitleEditItem) self.LyricsTabLayout.addWidget(self.TitleEditItem, 0, 1, 1, 2)
self.AlternativeTitleLabel = QtGui.QLabel(self.TextWidget) self.AlternativeTitleLabel = QtGui.QLabel(self.LyricsTab)
self.AlternativeTitleLabel.setObjectName(u'AlternativeTitleLabel') self.AlternativeTitleLabel.setObjectName("AlternativeTitleLabel")
self.DetailsLayout.addWidget(self.AlternativeTitleLabel) self.LyricsTabLayout.addWidget(self.AlternativeTitleLabel, 1, 0, 1, 1)
self.AlternativeEdit = QtGui.QLineEdit(self.TextWidget) self.AlternativeEdit = QtGui.QLineEdit(self.LyricsTab)
self.AlternativeEdit.setObjectName(u'AlternativeEdit') self.AlternativeEdit.setObjectName("AlternativeEdit")
self.DetailsLayout.addWidget(self.AlternativeEdit) self.LyricsTabLayout.addWidget(self.AlternativeEdit, 1, 1, 1, 2)
self.LyricsLabel = QtGui.QLabel(self.TextWidget) self.LyricsLabel = QtGui.QLabel(self.LyricsTab)
self.LyricsLabel.setObjectName(u'LyricsLabel') self.LyricsLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
self.DetailsLayout.addWidget(self.LyricsLabel) self.LyricsLabel.setObjectName("LyricsLabel")
self.VerseEditWidget = QtGui.QWidget(self.TextWidget) self.LyricsTabLayout.addWidget(self.LyricsLabel, 2, 0, 1, 1)
self.VerseEditWidget.setObjectName(u'VerseEditWidget') self.VerseListWidget = QtGui.QListWidget(self.LyricsTab)
self.VerseEditLayout = QtGui.QVBoxLayout(self.VerseEditWidget) self.VerseListWidget.setSpacing(2)
self.VerseEditLayout.setSpacing(8)
self.VerseEditLayout.setMargin(0)
self.VerseEditLayout.setObjectName(u'VerseEditLayout')
self.VerseListWidget = QtGui.QListWidget(self.VerseEditWidget)
self.VerseListWidget.setObjectName(u'VerseListWidget')
self.VerseListWidget.setAlternatingRowColors(True) self.VerseListWidget.setAlternatingRowColors(True)
self.VerseEditLayout.addWidget(self.VerseListWidget) self.VerseListWidget.setObjectName("VerseListWidget")
self.VerseButtonWidget = QtGui.QWidget(self.VerseEditWidget) self.LyricsTabLayout.addWidget(self.VerseListWidget, 2, 1, 1, 1)
self.VerseButtonWidget.setObjectName(u'VerseButtonWidget') self.VerseOrderLabel = QtGui.QLabel(self.LyricsTab)
self.VerseButtonLayout = QtGui.QHBoxLayout(self.VerseButtonWidget) self.VerseOrderLabel.setObjectName("VerseOrderLabel")
self.VerseButtonLayout.setSpacing(8) self.LyricsTabLayout.addWidget(self.VerseOrderLabel, 4, 0, 1, 1)
self.VerseButtonLayout.setMargin(0) self.VerseOrderEdit = QtGui.QLineEdit(self.LyricsTab)
self.VerseButtonLayout.setObjectName(u'VerseButtonLayout') self.VerseOrderEdit.setObjectName("VerseOrderEdit")
spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) self.LyricsTabLayout.addWidget(self.VerseOrderEdit, 4, 1, 1, 2)
self.VerseButtonLayout.addItem(spacerItem) self.VerseButtonWidget = QtGui.QWidget(self.LyricsTab)
self.AddButton = QtGui.QPushButton(self.VerseButtonWidget) self.VerseButtonWidget.setObjectName("VerseButtonWidget")
self.AddButton.setObjectName(u'AddButton') self.VerseButtonsLayout = QtGui.QVBoxLayout(self.VerseButtonWidget)
self.VerseButtonLayout.addWidget(self.AddButton) self.VerseButtonsLayout.setSpacing(8)
self.EditButton = QtGui.QPushButton(self.VerseButtonWidget) self.VerseButtonsLayout.setMargin(0)
self.EditButton.setObjectName(u'EditButton') self.VerseButtonsLayout.setObjectName("VerseButtonsLayout")
self.VerseButtonLayout.addWidget(self.EditButton) self.VerseAddButton = QtGui.QPushButton(self.VerseButtonWidget)
self.DeleteButton = QtGui.QPushButton(self.VerseButtonWidget) self.VerseAddButton.setObjectName("VerseAddButton")
self.DeleteButton.setObjectName(u'DeleteButton') self.VerseButtonsLayout.addWidget(self.VerseAddButton)
self.VerseButtonLayout.addWidget(self.DeleteButton) self.VerseEditButton = QtGui.QPushButton(self.VerseButtonWidget)
self.VerseEditLayout.addWidget(self.VerseButtonWidget) self.VerseEditButton.setObjectName("VerseEditButton")
self.DetailsLayout.addWidget(self.VerseEditWidget) self.VerseButtonsLayout.addWidget(self.VerseEditButton)
self.VerseOrderLabel = QtGui.QLabel(self.TextWidget) self.VerseEditAllButton = QtGui.QPushButton(self.VerseButtonWidget)
self.VerseOrderLabel.setObjectName(u'VerseOrderLabel') self.VerseEditAllButton.setObjectName("VerseEditAllButton")
self.DetailsLayout.addWidget(self.VerseOrderLabel) self.VerseButtonsLayout.addWidget(self.VerseEditAllButton)
self.VerseOrderEdit = QtGui.QLineEdit(self.TextWidget) self.VerseDeleteButton = QtGui.QPushButton(self.VerseButtonWidget)
self.VerseOrderEdit.setObjectName(u'VerseOrderEdit') self.VerseDeleteButton.setObjectName("VerseDeleteButton")
self.DetailsLayout.addWidget(self.VerseOrderEdit) self.VerseButtonsLayout.addWidget(self.VerseDeleteButton)
self.CommentsLabel = QtGui.QLabel(self.TextWidget) spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.CommentsLabel.setObjectName(u'CommentsLabel') self.VerseButtonsLayout.addItem(spacerItem)
self.DetailsLayout.addWidget(self.CommentsLabel) self.LyricsTabLayout.addWidget(self.VerseButtonWidget, 2, 2, 1, 1)
self.CommentsEdit = QtGui.QTextEdit(self.TextWidget) self.SongTabWidget.addTab(self.LyricsTab, "")
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) self.AuthorsTab = QtGui.QWidget()
sizePolicy.setHorizontalStretch(0) self.AuthorsTab.setObjectName("AuthorsTab")
sizePolicy.setVerticalStretch(0) self.AuthorsTabLayout = QtGui.QHBoxLayout(self.AuthorsTab)
sizePolicy.setHeightForWidth(self.CommentsEdit.sizePolicy().hasHeightForWidth()) self.AuthorsTabLayout.setSpacing(8)
self.CommentsEdit.setSizePolicy(sizePolicy) self.AuthorsTabLayout.setMargin(8)
self.CommentsEdit.setMaximumSize(QtCore.QSize(16777215, 84)) self.AuthorsTabLayout.setObjectName("AuthorsTabLayout")
self.CommentsEdit.setObjectName(u'CommentsEdit') self.AuthorsMaintenanceWidget = QtGui.QWidget(self.AuthorsTab)
self.DetailsLayout.addWidget(self.CommentsEdit) self.AuthorsMaintenanceWidget.setObjectName("AuthorsMaintenanceWidget")
self.ThemeGroupBox = QtGui.QGroupBox(self.TextWidget) self.AuthorsMaintenanceLayout = QtGui.QVBoxLayout(self.AuthorsMaintenanceWidget)
self.ThemeGroupBox.setObjectName(u'ThemeGroupBox') self.AuthorsMaintenanceLayout.setSpacing(8)
self.ThemeLayout = QtGui.QHBoxLayout(self.ThemeGroupBox) self.AuthorsMaintenanceLayout.setMargin(0)
self.ThemeLayout.setSpacing(8) self.AuthorsMaintenanceLayout.setObjectName("AuthorsMaintenanceLayout")
self.ThemeLayout.setMargin(8) self.AuthorsGroupBox = QtGui.QGroupBox(self.AuthorsMaintenanceWidget)
self.ThemeLayout.setObjectName(u'ThemeLayout') self.AuthorsGroupBox.setObjectName("AuthorsGroupBox")
self.ThemeSelectionComboItem = QtGui.QComboBox(self.ThemeGroupBox)
self.ThemeSelectionComboItem.setObjectName(u'ThemeSelectionComboItem')
self.ThemeLayout.addWidget(self.ThemeSelectionComboItem)
self.DetailsLayout.addWidget(self.ThemeGroupBox)
self.TopLayout.addWidget(self.TextWidget)
self.AdditionalWidget = QtGui.QWidget(self.TopWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.AdditionalWidget.sizePolicy().hasHeightForWidth())
self.AdditionalWidget.setSizePolicy(sizePolicy)
self.AdditionalWidget.setMinimumSize(QtCore.QSize(100, 0))
self.AdditionalWidget.setObjectName(u'AdditionalWidget')
self.AdditionalLayout = QtGui.QVBoxLayout(self.AdditionalWidget)
self.AdditionalLayout.setSpacing(8)
self.AdditionalLayout.setMargin(0)
self.AdditionalLayout.setObjectName(u'AdditionalLayout')
self.AuthorsGroupBox = QtGui.QGroupBox(self.AdditionalWidget)
self.AuthorsGroupBox.setObjectName(u'AuthorsGroupBox')
self.AuthorsLayout = QtGui.QVBoxLayout(self.AuthorsGroupBox) self.AuthorsLayout = QtGui.QVBoxLayout(self.AuthorsGroupBox)
self.AuthorsLayout.setSpacing(8) self.AuthorsLayout.setSpacing(8)
self.AuthorsLayout.setMargin(8) self.AuthorsLayout.setMargin(8)
self.AuthorsLayout.setObjectName(u'AuthorsLayout') self.AuthorsLayout.setObjectName("AuthorsLayout")
self.AuthorAddWidget = QtGui.QWidget(self.AuthorsGroupBox) self.AuthorAddWidget = QtGui.QWidget(self.AuthorsGroupBox)
self.AuthorAddWidget.setObjectName(u'AuthorAddWidget') self.AuthorAddWidget.setObjectName("AuthorAddWidget")
self.AddAuthorLayout = QtGui.QHBoxLayout(self.AuthorAddWidget) self.AuthorAddLayout = QtGui.QHBoxLayout(self.AuthorAddWidget)
self.AddAuthorLayout.setSpacing(8) self.AuthorAddLayout.setSpacing(8)
self.AddAuthorLayout.setMargin(0) self.AuthorAddLayout.setMargin(0)
self.AddAuthorLayout.setObjectName(u'AddAuthorLayout') self.AuthorAddLayout.setObjectName("AuthorAddLayout")
self.AuthorsSelectionComboItem = QtGui.QComboBox(self.AuthorAddWidget) self.AuthorsSelectionComboItem = QtGui.QComboBox(self.AuthorAddWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
@ -156,194 +116,283 @@ class Ui_EditSongDialog(object):
self.AuthorsSelectionComboItem.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically) self.AuthorsSelectionComboItem.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
self.AuthorsSelectionComboItem.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength) self.AuthorsSelectionComboItem.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength)
self.AuthorsSelectionComboItem.setMinimumContentsLength(8) self.AuthorsSelectionComboItem.setMinimumContentsLength(8)
self.AuthorsSelectionComboItem.setObjectName(u'AuthorsSelectionComboItem') self.AuthorsSelectionComboItem.setObjectName("AuthorsSelectionComboItem")
self.AddAuthorLayout.addWidget(self.AuthorsSelectionComboItem) self.AuthorAddLayout.addWidget(self.AuthorsSelectionComboItem)
self.AuthorAddtoSongItem = QtGui.QPushButton(self.AuthorAddWidget) self.AuthorAddButton = QtGui.QPushButton(self.AuthorAddWidget)
self.AuthorAddtoSongItem.setMaximumSize(QtCore.QSize(110, 16777215)) self.AuthorAddButton.setMaximumSize(QtCore.QSize(110, 16777215))
self.AuthorAddtoSongItem.setObjectName(u'AuthorAddtoSongItem') self.AuthorAddButton.setObjectName("AuthorAddButton")
self.AddAuthorLayout.addWidget(self.AuthorAddtoSongItem) self.AuthorAddLayout.addWidget(self.AuthorAddButton)
self.AuthorsLayout.addWidget(self.AuthorAddWidget) self.AuthorsLayout.addWidget(self.AuthorAddWidget)
self.AuthorsListView = QtGui.QListWidget(self.AuthorsGroupBox) self.AuthorsListView = QtGui.QListWidget(self.AuthorsGroupBox)
self.AuthorsListView.setAlternatingRowColors(True) self.AuthorsListView.setAlternatingRowColors(True)
self.AuthorsListView.setObjectName(u'AuthorsListView') self.AuthorsListView.setObjectName("AuthorsListView")
self.AuthorsLayout.addWidget(self.AuthorsListView) self.AuthorsLayout.addWidget(self.AuthorsListView)
self.AuthorRemoveWidget = QtGui.QWidget(self.AuthorsGroupBox) self.AuthorRemoveWidget = QtGui.QWidget(self.AuthorsGroupBox)
self.AuthorRemoveWidget.setObjectName(u'AuthorRemoveWidget') self.AuthorRemoveWidget.setObjectName("AuthorRemoveWidget")
self.AuthorRemoveLayout = QtGui.QHBoxLayout(self.AuthorRemoveWidget) self.AuthorRemoveLayout = QtGui.QHBoxLayout(self.AuthorRemoveWidget)
self.AuthorRemoveLayout.setSpacing(8) self.AuthorRemoveLayout.setSpacing(8)
self.AuthorRemoveLayout.setMargin(0) self.AuthorRemoveLayout.setMargin(0)
self.AuthorRemoveLayout.setObjectName(u'AuthorRemoveLayout') self.AuthorRemoveLayout.setObjectName("AuthorRemoveLayout")
spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.AuthorRemoveLayout.addItem(spacerItem1) self.AuthorRemoveLayout.addItem(spacerItem1)
self.AuthorRemoveItem = QtGui.QPushButton(self.AuthorRemoveWidget) self.AuthorRemoveButton = QtGui.QPushButton(self.AuthorRemoveWidget)
self.AuthorRemoveItem.setObjectName(u'AuthorRemoveItem') self.AuthorRemoveButton.setObjectName("AuthorRemoveButton")
self.AuthorRemoveLayout.addWidget(self.AuthorRemoveItem) self.AuthorRemoveLayout.addWidget(self.AuthorRemoveButton)
# self.AddAuthorsButton = QtGui.QPushButton(self.AuthorRemoveWidget)
# self.AddAuthorsButton.setObjectName(u'AddAuthorsButton')
# self.AuthorRemoveLayout.addWidget(self.AddAuthorsButton)
self.AuthorsLayout.addWidget(self.AuthorRemoveWidget) self.AuthorsLayout.addWidget(self.AuthorRemoveWidget)
self.AdditionalLayout.addWidget(self.AuthorsGroupBox) self.AuthorsMaintenanceLayout.addWidget(self.AuthorsGroupBox)
self.SongBookGroup = QtGui.QGroupBox(self.AdditionalWidget) self.MaintenanceWidget = QtGui.QWidget(self.AuthorsMaintenanceWidget)
self.SongBookGroup.setObjectName(u'SongBookGroup') self.MaintenanceWidget.setObjectName("MaintenanceWidget")
self.SongbookLayout = QtGui.QGridLayout(self.SongBookGroup) self.MaintenanceLayout = QtGui.QHBoxLayout(self.MaintenanceWidget)
self.SongbookLayout.setMargin(8) self.MaintenanceLayout.setSpacing(0)
self.SongbookLayout.setSpacing(8) self.MaintenanceLayout.setMargin(0)
self.SongbookLayout.setObjectName(u'SongbookLayout') self.MaintenanceLayout.setObjectName("MaintenanceLayout")
self.SongbookCombo = QtGui.QComboBox(self.SongBookGroup) self.MaintenanceButton = QtGui.QPushButton(self.MaintenanceWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) self.MaintenanceButton.setObjectName("MaintenanceButton")
sizePolicy.setHorizontalStretch(0) self.MaintenanceLayout.addWidget(self.MaintenanceButton)
sizePolicy.setVerticalStretch(0) spacerItem2 = QtGui.QSpacerItem(66, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
sizePolicy.setHeightForWidth(self.SongbookCombo.sizePolicy().hasHeightForWidth()) self.MaintenanceLayout.addItem(spacerItem2)
self.SongbookCombo.setSizePolicy(sizePolicy) self.AuthorsMaintenanceLayout.addWidget(self.MaintenanceWidget)
self.SongbookCombo.setObjectName(u'SongbookCombo') self.AuthorsTabLayout.addWidget(self.AuthorsMaintenanceWidget)
self.SongbookLayout.addWidget(self.SongbookCombo, 0, 0, 1, 1) self.TopicBookWidget = QtGui.QWidget(self.AuthorsTab)
# self.AddSongBookButton = QtGui.QPushButton(self.SongBookGroup) self.TopicBookWidget.setObjectName("TopicBookWidget")
# sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) self.TopicBookLayout = QtGui.QVBoxLayout(self.TopicBookWidget)
# sizePolicy.setHorizontalStretch(0) self.TopicBookLayout.setSpacing(8)
# sizePolicy.setVerticalStretch(0) self.TopicBookLayout.setMargin(0)
# sizePolicy.setHeightForWidth(self.AddSongBookButton.sizePolicy().hasHeightForWidth()) self.TopicBookLayout.setObjectName("TopicBookLayout")
# self.AddSongBookButton.setSizePolicy(sizePolicy) self.TopicGroupBox = QtGui.QGroupBox(self.TopicBookWidget)
# self.AddSongBookButton.setObjectName(u'AddSongBookButton')
# self.SongbookLayout.addWidget(self.AddSongBookButton, 0, 1, 1, 1)
self.AdditionalLayout.addWidget(self.SongBookGroup)
self.TopicGroupBox = QtGui.QGroupBox(self.AdditionalWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.TopicGroupBox.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.TopicGroupBox.sizePolicy().hasHeightForWidth())
self.TopicGroupBox.setSizePolicy(sizePolicy) self.TopicGroupBox.setSizePolicy(sizePolicy)
self.TopicGroupBox.setObjectName(u'TopicGroupBox') self.TopicGroupBox.setObjectName("TopicGroupBox")
self.TopicLayout = QtGui.QVBoxLayout(self.TopicGroupBox) self.TopicLayout = QtGui.QVBoxLayout(self.TopicGroupBox)
self.TopicLayout.setSpacing(8) self.TopicLayout.setSpacing(8)
self.TopicLayout.setMargin(8) self.TopicLayout.setMargin(8)
self.TopicLayout.setObjectName(u'TopicLayout') self.TopicLayout.setObjectName("TopicLayout")
self.TopicAddWidget = QtGui.QWidget(self.TopicGroupBox) self.TopicAddWidget = QtGui.QWidget(self.TopicGroupBox)
self.TopicAddWidget.setObjectName(u'TopicAddWidget') self.TopicAddWidget.setObjectName("TopicAddWidget")
self.TopicAddLayout = QtGui.QHBoxLayout(self.TopicAddWidget) self.TopicAddLayout = QtGui.QHBoxLayout(self.TopicAddWidget)
self.TopicAddLayout.setSpacing(8) self.TopicAddLayout.setSpacing(8)
self.TopicAddLayout.setMargin(0) self.TopicAddLayout.setMargin(0)
self.TopicAddLayout.setObjectName(u'TopicAddLayout') self.TopicAddLayout.setObjectName("TopicAddLayout")
self.SongTopicCombo = QtGui.QComboBox(self.TopicAddWidget) self.SongTopicCombo = QtGui.QComboBox(self.TopicAddWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.SongTopicCombo.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.SongTopicCombo.sizePolicy().hasHeightForWidth())
self.SongTopicCombo.setSizePolicy(sizePolicy) self.SongTopicCombo.setSizePolicy(sizePolicy)
self.SongTopicCombo.setObjectName(u'SongTopicCombo') self.SongTopicCombo.setObjectName("SongTopicCombo")
self.TopicAddLayout.addWidget(self.SongTopicCombo) self.TopicAddLayout.addWidget(self.SongTopicCombo)
self.AddTopicsToSongButton = QtGui.QPushButton(self.TopicAddWidget) self.TopicAddButton = QtGui.QPushButton(self.TopicAddWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.AddTopicsToSongButton.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.TopicAddButton.sizePolicy().hasHeightForWidth())
self.AddTopicsToSongButton.setSizePolicy(sizePolicy) self.TopicAddButton.setSizePolicy(sizePolicy)
self.AddTopicsToSongButton.setObjectName(u'AddTopicsToSongButton') self.TopicAddButton.setObjectName("TopicAddButton")
self.TopicAddLayout.addWidget(self.AddTopicsToSongButton) self.TopicAddLayout.addWidget(self.TopicAddButton)
self.TopicLayout.addWidget(self.TopicAddWidget) self.TopicLayout.addWidget(self.TopicAddWidget)
self.TopicsListView = QtGui.QListWidget(self.TopicGroupBox) self.TopicsListView = QtGui.QListWidget(self.TopicGroupBox)
self.TopicsListView.setAlternatingRowColors(True) self.TopicsListView.setAlternatingRowColors(True)
self.TopicsListView.setObjectName(u'TopicsListView') self.TopicsListView.setObjectName("TopicsListView")
self.TopicLayout.addWidget(self.TopicsListView) self.TopicLayout.addWidget(self.TopicsListView)
self.TopicRemoveWidget = QtGui.QWidget(self.TopicGroupBox) self.TopicRemoveWidget = QtGui.QWidget(self.TopicGroupBox)
self.TopicRemoveWidget.setObjectName(u'TopicRemoveWidget') self.TopicRemoveWidget.setObjectName("TopicRemoveWidget")
self.TopicRemoveLayout = QtGui.QHBoxLayout(self.TopicRemoveWidget) self.TopicRemoveLayout = QtGui.QHBoxLayout(self.TopicRemoveWidget)
self.TopicRemoveLayout.setSpacing(8) self.TopicRemoveLayout.setSpacing(8)
self.TopicRemoveLayout.setMargin(0) self.TopicRemoveLayout.setMargin(0)
self.TopicRemoveLayout.setObjectName(u'TopicRemoveLayout') self.TopicRemoveLayout.setObjectName("TopicRemoveLayout")
spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.TopicRemoveLayout.addItem(spacerItem2) self.TopicRemoveLayout.addItem(spacerItem3)
self.TopicRemoveItem = QtGui.QPushButton(self.TopicRemoveWidget) self.TopicRemoveButton = QtGui.QPushButton(self.TopicRemoveWidget)
self.TopicRemoveItem.setObjectName(u'TopicRemoveItem') self.TopicRemoveButton.setObjectName("TopicRemoveButton")
self.TopicRemoveLayout.addWidget(self.TopicRemoveItem) self.TopicRemoveLayout.addWidget(self.TopicRemoveButton)
# self.AddTopicButton = QtGui.QPushButton(self.TopicRemoveWidget)
# self.AddTopicButton.setObjectName(u'AddTopicButton')
# self.TopicRemoveLayout.addWidget(self.AddTopicButton)
self.TopicLayout.addWidget(self.TopicRemoveWidget) self.TopicLayout.addWidget(self.TopicRemoveWidget)
self.AdditionalLayout.addWidget(self.TopicGroupBox) self.TopicBookLayout.addWidget(self.TopicGroupBox)
self.CopyrightgroupBox = QtGui.QGroupBox(self.AdditionalWidget) self.SongBookGroup = QtGui.QGroupBox(self.TopicBookWidget)
self.CopyrightgroupBox.setObjectName(u'CopyrightgroupBox') self.SongBookGroup.setObjectName("SongBookGroup")
self.CopyrightLayout = QtGui.QVBoxLayout(self.CopyrightgroupBox) self.SongbookLayout = QtGui.QGridLayout(self.SongBookGroup)
self.SongbookLayout.setMargin(8)
self.SongbookLayout.setSpacing(8)
self.SongbookLayout.setObjectName("SongbookLayout")
self.SongbookCombo = QtGui.QComboBox(self.SongBookGroup)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.SongbookCombo.sizePolicy().hasHeightForWidth())
self.SongbookCombo.setSizePolicy(sizePolicy)
self.SongbookCombo.setObjectName("SongbookCombo")
self.SongbookLayout.addWidget(self.SongbookCombo, 0, 0, 1, 1)
self.TopicBookLayout.addWidget(self.SongBookGroup)
self.AuthorsTabLayout.addWidget(self.TopicBookWidget)
self.SongTabWidget.addTab(self.AuthorsTab, "")
self.ThemeTab = QtGui.QWidget()
self.ThemeTab.setObjectName("ThemeTab")
self.ThemeTabLayout = QtGui.QVBoxLayout(self.ThemeTab)
self.ThemeTabLayout.setSpacing(8)
self.ThemeTabLayout.setMargin(8)
self.ThemeTabLayout.setObjectName("ThemeTabLayout")
self.ThemeCopyCommentsWidget = QtGui.QWidget(self.ThemeTab)
self.ThemeCopyCommentsWidget.setObjectName("ThemeCopyCommentsWidget")
self.ThemeCopyCommentsLayout = QtGui.QHBoxLayout(self.ThemeCopyCommentsWidget)
self.ThemeCopyCommentsLayout.setSpacing(8)
self.ThemeCopyCommentsLayout.setMargin(0)
self.ThemeCopyCommentsLayout.setObjectName("ThemeCopyCommentsLayout")
self.TextWidget = QtGui.QWidget(self.ThemeCopyCommentsWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.TextWidget.sizePolicy().hasHeightForWidth())
self.TextWidget.setSizePolicy(sizePolicy)
self.TextWidget.setObjectName("TextWidget")
self.DetailsLayout = QtGui.QVBoxLayout(self.TextWidget)
self.DetailsLayout.setSpacing(8)
self.DetailsLayout.setMargin(0)
self.DetailsLayout.setObjectName("DetailsLayout")
self.ThemeGroupBox = QtGui.QGroupBox(self.TextWidget)
self.ThemeGroupBox.setObjectName("ThemeGroupBox")
self.ThemeLayout = QtGui.QHBoxLayout(self.ThemeGroupBox)
self.ThemeLayout.setSpacing(8)
self.ThemeLayout.setMargin(8)
self.ThemeLayout.setObjectName("ThemeLayout")
self.ThemeSelectionComboItem = QtGui.QComboBox(self.ThemeGroupBox)
self.ThemeSelectionComboItem.setObjectName("ThemeSelectionComboItem")
self.ThemeLayout.addWidget(self.ThemeSelectionComboItem)
self.ThemeAddButton = QtGui.QPushButton(self.ThemeGroupBox)
self.ThemeAddButton.setMaximumSize(QtCore.QSize(110, 16777215))
self.ThemeAddButton.setObjectName("ThemeAddButton")
self.ThemeLayout.addWidget(self.ThemeAddButton)
self.DetailsLayout.addWidget(self.ThemeGroupBox)
self.CopyrightGroupBox = QtGui.QGroupBox(self.TextWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.CopyrightGroupBox.sizePolicy().hasHeightForWidth())
self.CopyrightGroupBox.setSizePolicy(sizePolicy)
self.CopyrightGroupBox.setObjectName("CopyrightGroupBox")
self.CopyrightLayout = QtGui.QVBoxLayout(self.CopyrightGroupBox)
self.CopyrightLayout.setSpacing(8) self.CopyrightLayout.setSpacing(8)
self.CopyrightLayout.setMargin(8) self.CopyrightLayout.setMargin(8)
self.CopyrightLayout.setObjectName(u'CopyrightLayout') self.CopyrightLayout.setObjectName("CopyrightLayout")
self.CopyrightWidget = QtGui.QWidget(self.CopyrightgroupBox) self.CopyrightWidget = QtGui.QWidget(self.CopyrightGroupBox)
self.CopyrightWidget.setObjectName(u'CopyrightWidget') self.CopyrightWidget.setObjectName("CopyrightWidget")
self.CopyLayout = QtGui.QHBoxLayout(self.CopyrightWidget) self.CopyLayout = QtGui.QHBoxLayout(self.CopyrightWidget)
self.CopyLayout.setSpacing(8) self.CopyLayout.setSpacing(8)
self.CopyLayout.setMargin(0) self.CopyLayout.setMargin(0)
self.CopyLayout.setObjectName(u'CopyLayout') self.CopyLayout.setObjectName("CopyLayout")
self.CopyrightEditItem = QtGui.QLineEdit(self.CopyrightWidget) self.CopyrightEditItem = QtGui.QLineEdit(self.CopyrightWidget)
self.CopyrightEditItem.setObjectName(u'CopyrightEditItem') self.CopyrightEditItem.setObjectName("CopyrightEditItem")
self.CopyLayout.addWidget(self.CopyrightEditItem) self.CopyLayout.addWidget(self.CopyrightEditItem)
self.CopyrightInsertItem = QtGui.QPushButton(self.CopyrightWidget) self.CopyrightInsertButton = QtGui.QPushButton(self.CopyrightWidget)
self.CopyrightInsertItem.setMaximumSize(QtCore.QSize(29, 16777215)) self.CopyrightInsertButton.setMaximumSize(QtCore.QSize(29, 16777215))
self.CopyrightInsertItem.setObjectName(u'CopyrightInsertItem') self.CopyrightInsertButton.setObjectName("CopyrightInsertButton")
self.CopyLayout.addWidget(self.CopyrightInsertItem) self.CopyLayout.addWidget(self.CopyrightInsertButton)
self.CopyrightLayout.addWidget(self.CopyrightWidget) self.CopyrightLayout.addWidget(self.CopyrightWidget)
self.CcliWidget = QtGui.QWidget(self.CopyrightgroupBox) self.CcliWidget = QtGui.QWidget(self.CopyrightGroupBox)
self.CcliWidget.setObjectName(u'CcliWidget') self.CcliWidget.setObjectName("CcliWidget")
self.CCLILayout = QtGui.QHBoxLayout(self.CcliWidget) self.CCLILayout = QtGui.QHBoxLayout(self.CcliWidget)
self.CCLILayout.setSpacing(8) self.CCLILayout.setSpacing(8)
self.CCLILayout.setMargin(0) self.CCLILayout.setMargin(0)
self.CCLILayout.setObjectName(u'CCLILayout') self.CCLILayout.setObjectName("CCLILayout")
self.CCLILabel = QtGui.QLabel(self.CcliWidget) self.CCLILabel = QtGui.QLabel(self.CcliWidget)
self.CCLILabel.setObjectName(u'CCLILabel') self.CCLILabel.setObjectName("CCLILabel")
self.CCLILayout.addWidget(self.CCLILabel) self.CCLILayout.addWidget(self.CCLILabel)
self.CCLNumberEdit = QtGui.QLineEdit(self.CcliWidget) self.CCLNumberEdit = QtGui.QLineEdit(self.CcliWidget)
self.CCLNumberEdit.setObjectName(u'CCLNumberEdit') self.CCLNumberEdit.setObjectName("CCLNumberEdit")
self.CCLILayout.addWidget(self.CCLNumberEdit) self.CCLILayout.addWidget(self.CCLNumberEdit)
self.CopyrightLayout.addWidget(self.CcliWidget) self.CopyrightLayout.addWidget(self.CcliWidget)
self.AdditionalLayout.addWidget(self.CopyrightgroupBox) self.DetailsLayout.addWidget(self.CopyrightGroupBox)
self.TopLayout.addWidget(self.AdditionalWidget) spacerItem4 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.EditSongLayout.addWidget(self.TopWidget) self.DetailsLayout.addItem(spacerItem4)
self.ThemeCopyCommentsLayout.addWidget(self.TextWidget)
self.CommentsGroupBox = QtGui.QGroupBox(self.ThemeCopyCommentsWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.CommentsGroupBox.sizePolicy().hasHeightForWidth())
self.CommentsGroupBox.setSizePolicy(sizePolicy)
self.CommentsGroupBox.setObjectName("CommentsGroupBox")
self.CommentsLayout = QtGui.QVBoxLayout(self.CommentsGroupBox)
self.CommentsLayout.setSpacing(0)
self.CommentsLayout.setMargin(8)
self.CommentsLayout.setObjectName("CommentsLayout")
self.CommentsEdit = QtGui.QTextEdit(self.CommentsGroupBox)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.CommentsEdit.sizePolicy().hasHeightForWidth())
self.CommentsEdit.setSizePolicy(sizePolicy)
self.CommentsEdit.setMaximumSize(QtCore.QSize(16777215, 16777215))
self.CommentsEdit.setObjectName("CommentsEdit")
self.CommentsLayout.addWidget(self.CommentsEdit)
self.ThemeCopyCommentsLayout.addWidget(self.CommentsGroupBox)
self.ThemeTabLayout.addWidget(self.ThemeCopyCommentsWidget)
spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.ThemeTabLayout.addItem(spacerItem5)
self.SongTabWidget.addTab(self.ThemeTab, "")
self.verticalLayout.addWidget(self.SongTabWidget)
self.ButtonBox = QtGui.QDialogButtonBox(EditSongDialog) self.ButtonBox = QtGui.QDialogButtonBox(EditSongDialog)
self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save) self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save)
self.ButtonBox.setObjectName(u'ButtonBox') self.ButtonBox.setObjectName("ButtonBox")
self.EditSongLayout.addWidget(self.ButtonBox) self.verticalLayout.addWidget(self.ButtonBox)
self.retranslateUi(EditSongDialog) self.retranslateUi(EditSongDialog)
QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'rejected()'), EditSongDialog.close) self.SongTabWidget.setCurrentIndex(0)
QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'accepted()'), self.onAccept) QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("rejected()"), EditSongDialog.close)
QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("accepted()"), EditSongDialog.close)
QtCore.QMetaObject.connectSlotsByName(EditSongDialog) QtCore.QMetaObject.connectSlotsByName(EditSongDialog)
EditSongDialog.setTabOrder(self.SongTabWidget, self.TitleEditItem)
EditSongDialog.setTabOrder(self.TitleEditItem, self.AlternativeEdit) EditSongDialog.setTabOrder(self.TitleEditItem, self.AlternativeEdit)
EditSongDialog.setTabOrder(self.AlternativeEdit, self.VerseOrderEdit) EditSongDialog.setTabOrder(self.AlternativeEdit, self.VerseListWidget)
EditSongDialog.setTabOrder(self.VerseOrderEdit, self.CommentsEdit) EditSongDialog.setTabOrder(self.VerseListWidget, self.VerseAddButton)
EditSongDialog.setTabOrder(self.CommentsEdit, self.ThemeSelectionComboItem) EditSongDialog.setTabOrder(self.VerseAddButton, self.VerseEditButton)
EditSongDialog.setTabOrder(self.ThemeSelectionComboItem, self.AuthorAddtoSongItem) EditSongDialog.setTabOrder(self.VerseEditButton, self.VerseEditAllButton)
EditSongDialog.setTabOrder(self.AuthorAddtoSongItem, self.AuthorsListView) EditSongDialog.setTabOrder(self.VerseEditAllButton, self.VerseDeleteButton)
EditSongDialog.setTabOrder(self.AuthorsListView, self.AuthorRemoveItem) EditSongDialog.setTabOrder(self.VerseDeleteButton, self.VerseOrderEdit)
EditSongDialog.setTabOrder(self.AuthorRemoveItem, self.SongbookCombo) EditSongDialog.setTabOrder(self.VerseOrderEdit, self.AuthorsSelectionComboItem)
#EditSongDialog.setTabOrder(self.SongbookCombo, self.AddSongBookButton) EditSongDialog.setTabOrder(self.AuthorsSelectionComboItem, self.AuthorAddButton)
#EditSongDialog.setTabOrder(self.AddSongBookButton, self.SongTopicCombo) EditSongDialog.setTabOrder(self.AuthorAddButton, self.AuthorsListView)
EditSongDialog.setTabOrder(self.SongbookCombo, self.SongTopicCombo) EditSongDialog.setTabOrder(self.AuthorsListView, self.AuthorRemoveButton)
EditSongDialog.setTabOrder(self.SongTopicCombo, self.TopicsListView) EditSongDialog.setTabOrder(self.AuthorRemoveButton, self.MaintenanceButton)
EditSongDialog.setTabOrder(self.TopicsListView, self.TopicRemoveItem) EditSongDialog.setTabOrder(self.MaintenanceButton, self.SongTopicCombo)
EditSongDialog.setTabOrder(self.TopicRemoveItem, self.CopyrightEditItem) EditSongDialog.setTabOrder(self.SongTopicCombo, self.TopicAddButton)
EditSongDialog.setTabOrder(self.CopyrightEditItem, self.CopyrightInsertItem) EditSongDialog.setTabOrder(self.TopicAddButton, self.TopicsListView)
EditSongDialog.setTabOrder(self.CopyrightInsertItem, self.CCLNumberEdit) EditSongDialog.setTabOrder(self.TopicsListView, self.TopicRemoveButton)
EditSongDialog.setTabOrder(self.CCLNumberEdit, self.ButtonBox) EditSongDialog.setTabOrder(self.TopicRemoveButton, self.SongbookCombo)
EditSongDialog.setTabOrder(self.SongbookCombo, self.ThemeSelectionComboItem)
EditSongDialog.setTabOrder(self.ThemeSelectionComboItem, self.ThemeAddButton)
EditSongDialog.setTabOrder(self.ThemeAddButton, self.CopyrightEditItem)
EditSongDialog.setTabOrder(self.CopyrightEditItem, self.CopyrightInsertButton)
EditSongDialog.setTabOrder(self.CopyrightInsertButton, self.CCLNumberEdit)
EditSongDialog.setTabOrder(self.CCLNumberEdit, self.CommentsEdit)
EditSongDialog.setTabOrder(self.CommentsEdit, self.ButtonBox)
def retranslateUi(self, EditSongDialog): def retranslateUi(self, EditSongDialog):
EditSongDialog.setWindowTitle(translate(u'EditSongDialog', u'Song Editor')) EditSongDialog.setWindowTitle(QtGui.QApplication.translate("EditSongDialog", "Song Editor", None, QtGui.QApplication.UnicodeUTF8))
self.TitleLabel.setText(translate(u'EditSongDialog', u'Title:')) self.TitleLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Title:", None, QtGui.QApplication.UnicodeUTF8))
self.AlternativeTitleLabel.setText(translate(u'EditSongDialog', u'Alternative Title:')) self.AlternativeTitleLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Alternative Title:", None, QtGui.QApplication.UnicodeUTF8))
self.LyricsLabel.setText(translate(u'EditSongDialog', u'Lyrics:')) self.LyricsLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Lyrics:", None, QtGui.QApplication.UnicodeUTF8))
self.AddButton.setText(translate(u'EditSongDialog', u'Add')) self.VerseOrderLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Verse Order:", None, QtGui.QApplication.UnicodeUTF8))
self.EditButton.setText(translate(u'EditSongDialog', u'Edit')) self.VerseAddButton.setText(QtGui.QApplication.translate("EditSongDialog", "Add", None, QtGui.QApplication.UnicodeUTF8))
self.DeleteButton.setText(translate(u'EditSongDialog', u'Delete')) self.VerseEditButton.setText(QtGui.QApplication.translate("EditSongDialog", "Edit", None, QtGui.QApplication.UnicodeUTF8))
self.VerseOrderLabel.setText(translate(u'EditSongDialog', u'Verse Order:')) self.VerseEditAllButton.setText(QtGui.QApplication.translate("EditSongDialog", "Edit All", None, QtGui.QApplication.UnicodeUTF8))
self.CommentsLabel.setText(translate(u'EditSongDialog', u'Comments:')) self.VerseDeleteButton.setText(QtGui.QApplication.translate("EditSongDialog", "Delete", None, QtGui.QApplication.UnicodeUTF8))
self.ThemeGroupBox.setTitle(translate(u'EditSongDialog', u'Theme')) self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.LyricsTab), QtGui.QApplication.translate("EditSongDialog", "Title && Lyrics", None, QtGui.QApplication.UnicodeUTF8))
self.AuthorsGroupBox.setTitle(translate(u'EditSongDialog', u'Authors')) self.AuthorsGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Authors", None, QtGui.QApplication.UnicodeUTF8))
self.AuthorAddtoSongItem.setText(translate(u'EditSongDialog', u'Add to Song')) self.AuthorAddButton.setText(QtGui.QApplication.translate("EditSongDialog", "&Add to Song", None, QtGui.QApplication.UnicodeUTF8))
self.AuthorRemoveItem.setText(translate(u'EditSongDialog', u'Remove')) self.AuthorRemoveButton.setText(QtGui.QApplication.translate("EditSongDialog", "&Remove", None, QtGui.QApplication.UnicodeUTF8))
#self.AddAuthorsButton.setText(translate(u'EditSongDialog', u'Manage Authors')) self.MaintenanceButton.setText(QtGui.QApplication.translate("EditSongDialog", "&Manage Authors, Topics, Books", None, QtGui.QApplication.UnicodeUTF8))
self.SongBookGroup.setTitle(translate(u'EditSongDialog', u'Song Book')) self.TopicGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Topic", None, QtGui.QApplication.UnicodeUTF8))
#self.AddSongBookButton.setText(translate(u'EditSongDialog', u'Manage Song Books')) self.TopicAddButton.setText(QtGui.QApplication.translate("EditSongDialog", "A&dd to Song", None, QtGui.QApplication.UnicodeUTF8))
self.TopicGroupBox.setTitle(translate(u'EditSongDialog', u'Topic')) self.TopicRemoveButton.setText(QtGui.QApplication.translate("EditSongDialog", "R&emove", None, QtGui.QApplication.UnicodeUTF8))
self.AddTopicsToSongButton.setText(translate(u'EditSongDialog', u'Add to Song')) self.SongBookGroup.setTitle(QtGui.QApplication.translate("EditSongDialog", "Song Book", None, QtGui.QApplication.UnicodeUTF8))
self.TopicRemoveItem.setText(translate(u'EditSongDialog', u'Remove')) self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.AuthorsTab), QtGui.QApplication.translate("EditSongDialog", "Authors, Topics && Book", None, QtGui.QApplication.UnicodeUTF8))
#self.AddTopicButton.setText(translate(u'EditSongDialog', u'Manage Topics')) self.ThemeGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Theme", None, QtGui.QApplication.UnicodeUTF8))
self.CopyrightgroupBox.setTitle(translate(u'EditSongDialog', u'Copyright Infomaton')) self.ThemeAddButton.setText(QtGui.QApplication.translate("EditSongDialog", "Add a Theme", None, QtGui.QApplication.UnicodeUTF8))
self.CopyrightInsertItem.setText(translate(u'EditSongDialog', u'(c)')) self.CopyrightGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Copyright Information", None, QtGui.QApplication.UnicodeUTF8))
self.CCLILabel.setText(translate(u'EditSongDialog', u'CCLI Number:')) self.CopyrightInsertButton.setText(QtGui.QApplication.translate("EditSongDialog", "©", None, QtGui.QApplication.UnicodeUTF8))
self.CCLILabel.setText(QtGui.QApplication.translate("EditSongDialog", "CCLI Number:", None, QtGui.QApplication.UnicodeUTF8))
self.CommentsGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Comments", None, QtGui.QApplication.UnicodeUTF8))
self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.ThemeTab), QtGui.QApplication.translate("EditSongDialog", "Theme, Copyright Info && Comments", None, QtGui.QApplication.UnicodeUTF8))

101
openlp/plugins/songs/forms/editsongform.py
View File

@ -18,12 +18,13 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA Place, Suite 330, Boston, MA 02111-1307 USA
""" """
import logging import logging
from PyQt4 import Qt, QtCore, QtGui
from openlp.core.lib import SongXMLBuilder, SongXMLParser, Event, EventType, EventManager
from openlp.plugins.songs.forms import AuthorsForm, TopicsForm, SongBookForm, \
EditVerseForm
from openlp.plugins.songs.lib.models import Song
from PyQt4 import Qt, QtCore, QtGui
from openlp.core.lib import SongXMLBuilder, SongXMLParser, Event, \
EventType, EventManager
from openlp.plugins.songs.forms import EditVerseForm
from openlp.plugins.songs.lib.models import Song
from editsongdialog import Ui_EditSongDialog from editsongdialog import Ui_EditSongDialog
class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
@ -33,44 +34,46 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
global log global log
log = logging.getLogger(u'EditSongForm') log = logging.getLogger(u'EditSongForm')
log.info(u'Song Editor loaded') log.info(u'Song Editor loaded')
def __init__(self, songmanager, eventmanager, parent=None):
def __init__(self, songmanager, eventmanager, parent=None):
""" """
Constructor Constructor
""" """
QtGui.QDialog.__init__(self, parent) QtGui.QDialog.__init__(self, parent)
self.setupUi(self) self.setupUi(self)
# Connecting signals and slots # Connecting signals and slots
# QtCore.QObject.connect(self.AddAuthorsButton, QtCore.QObject.connect(self.AuthorAddButton,
# QtCore.SIGNAL(u'clicked()'), self.onAddAuthorsButtonClicked) QtCore.SIGNAL(u'clicked()'), self.onAuthorAddButtonClicked)
QtCore.QObject.connect(self.AuthorAddtoSongItem, QtCore.QObject.connect(self.AuthorRemoveButton,
QtCore.SIGNAL(u'clicked()'), self.onAuthorAddtoSongItemClicked) QtCore.SIGNAL(u'clicked()'), self.onAuthorRemoveButtonClicked)
QtCore.QObject.connect(self.AuthorRemoveItem,
QtCore.SIGNAL(u'clicked()'), self.onAuthorRemovefromSongItemClicked)
QtCore.QObject.connect(self.AuthorsListView, QtCore.QObject.connect(self.AuthorsListView,
QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'), self.onAuthorsListViewPressed) QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'), self.onAuthorsListViewPressed)
QtCore.QObject.connect(self.AddTopicsToSongButton, QtCore.QObject.connect(self.TopicAddButton,
QtCore.SIGNAL(u'clicked()'), self.onTopicAddtoSongItemClicked) QtCore.SIGNAL(u'clicked()'), self.onTopicAddButtonClicked)
QtCore.QObject.connect(self.TopicRemoveItem, QtCore.QObject.connect(self.TopicRemoveButton,
QtCore.SIGNAL(u'clicked()'), self.onTopicRemovefromSongItemClicked) QtCore.SIGNAL(u'clicked()'), self.onTopicRemoveButtonClicked)
QtCore.QObject.connect(self.TopicsListView, QtCore.QObject.connect(self.TopicsListView,
QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'), self.onTopicListViewPressed) QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'), self.onTopicListViewPressed)
QtCore.QObject.connect(self.CopyrightInsertItem, QtCore.QObject.connect(self.CopyrightInsertButton,
QtCore.SIGNAL(u'clicked()'), self.onCopyrightInsertItemTriggered) QtCore.SIGNAL(u'clicked()'), self.onCopyrightInsertButtonTriggered)
QtCore.QObject.connect(self.AddButton, QtCore.QObject.connect(self.VerseAddButton,
QtCore.SIGNAL(u'clicked()'), self.onAddVerseButtonClicked) QtCore.SIGNAL(u'clicked()'), self.onVerseAddButtonClicked)
QtCore.QObject.connect(self.EditButton, QtCore.QObject.connect(self.VerseEditButton,
QtCore.SIGNAL(u'clicked()'), self.onEditVerseButtonClicked) QtCore.SIGNAL(u'clicked()'), self.onVerseEditButtonClicked)
QtCore.QObject.connect(self.DeleteButton, QtCore.QObject.connect(self.VerseDeleteButton,
QtCore.SIGNAL(u'clicked()'), self.onDeleteVerseButtonClicked) QtCore.SIGNAL(u'clicked()'), self.onVerseDeleteButtonClicked)
QtCore.QObject.connect(self.VerseListWidget, QtCore.QObject.connect(self.VerseListWidget,
QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'), self.onVerseListViewPressed) QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'), self.onVerseListViewPressed)
QtCore.QObject.connect(self.SongbookCombo, QtCore.QObject.connect(self.SongbookCombo,
QtCore.SIGNAL(u'activated(int)'), self.onSongBookComboChanged) QtCore.SIGNAL(u'activated(int)'), self.onSongBookComboChanged)
QtCore.QObject.connect(self.ThemeSelectionComboItem, QtCore.QObject.connect(self.ThemeSelectionComboItem,
QtCore.SIGNAL(u'activated(int)'), self.onThemeComboChanged) QtCore.SIGNAL(u'activated(int)'), self.onThemeComboChanged)
QtCore.QObject.connect(self.MaintenanceButton,
QtCore.SIGNAL(u'clicked()'), self.onMaintenanceButtonClicked)
# Create other objects and forms # Create other objects and forms
self.songmanager = songmanager self.songmanager = songmanager
self.eventmanager = eventmanager self.eventmanager = eventmanager
self.parent = parent
self.verse_form = EditVerseForm() self.verse_form = EditVerseForm()
self.initialise() self.initialise()
self.AuthorsListView.setSortingEnabled(False) self.AuthorsListView.setSortingEnabled(False)
@ -79,10 +82,10 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.TopicsListView.setAlternatingRowColors(True) self.TopicsListView.setAlternatingRowColors(True)
def initialise(self): def initialise(self):
self.EditButton.setEnabled(False) self.VerseEditButton.setEnabled(False)
self.DeleteButton.setEnabled(False) self.VerseDeleteButton.setEnabled(False)
self.AuthorRemoveItem.setEnabled(False) self.AuthorRemoveButton.setEnabled(False)
self.TopicRemoveItem.setEnabled(False) self.TopicRemoveButton.setEnabled(False)
self.title_change = False self.title_change = False
def loadAuthors(self): def loadAuthors(self):
@ -177,7 +180,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.CCLNumberEdit.setText(u'') self.CCLNumberEdit.setText(u'')
#lazy xml migration for now #lazy xml migration for now
if self.song.lyrics.startswith(u'<?xml version='): if self.song.lyrics.startswith(u'<?xml version='):
songXML=SongXMLParser(self.song.lyrics) songXML = SongXMLParser(self.song.lyrics)
verseList = songXML.get_verses() verseList = songXML.get_verses()
for verse in verseList: for verse in verseList:
self.VerseListWidget.addItem(verse[1]) self.VerseListWidget.addItem(verse[1])
@ -201,7 +204,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.title_change = False self.title_change = False
self.TitleEditItem.setFocus(QtCore.Qt.OtherFocusReason) self.TitleEditItem.setFocus(QtCore.Qt.OtherFocusReason)
def onAuthorAddtoSongItemClicked(self): def onAuthorAddButtonClicked(self):
item = int(self.AuthorsSelectionComboItem.currentIndex()) item = int(self.AuthorsSelectionComboItem.currentIndex())
if item > -1: if item > -1:
item_id = (self.AuthorsSelectionComboItem.itemData(item)).toInt()[0] item_id = (self.AuthorsSelectionComboItem.itemData(item)).toInt()[0]
@ -213,9 +216,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
def onAuthorsListViewPressed(self): def onAuthorsListViewPressed(self):
if self.AuthorsListView.count() > 1: if self.AuthorsListView.count() > 1:
self.AuthorRemoveItem.setEnabled(True) self.AuthorRemoveButton.setEnabled(True)
def onAuthorRemovefromSongItemClicked(self): def onAuthorRemoveButtonClicked(self):
self.AuthorRemoveItem.setEnabled(False) self.AuthorRemoveItem.setEnabled(False)
item = self.AuthorsListView.currentItem() item = self.AuthorsListView.currentItem()
author_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] author_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
@ -224,7 +227,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
row = self.AuthorsListView.row(item) row = self.AuthorsListView.row(item)
self.AuthorsListView.takeItem(row) self.AuthorsListView.takeItem(row)
def onTopicAddtoSongItemClicked(self): def onTopicAddButtonClicked(self):
item = int(self.SongTopicCombo.currentIndex()) item = int(self.SongTopicCombo.currentIndex())
if item > -1: if item > -1:
item_id = (self.SongTopicCombo.itemData(item)).toInt()[0] item_id = (self.SongTopicCombo.itemData(item)).toInt()[0]
@ -235,10 +238,10 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.TopicsListView.addItem(topic_item) self.TopicsListView.addItem(topic_item)
def onTopicListViewPressed(self): def onTopicListViewPressed(self):
self.TopicRemoveItem.setEnabled(True) self.TopicRemoveButton.setEnabled(True)
def onTopicRemovefromSongItemClicked(self): def onTopicRemoveButtonClicked(self):
self.TopicRemoveItem.setEnabled(False) self.TopicRemoveButton.setEnabled(False)
item = self.TopicsListView.currentItem() item = self.TopicsListView.currentItem()
topic_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] topic_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
topic = self.songmanager.get_topic(topic_id) topic = self.songmanager.get_topic(topic_id)
@ -262,29 +265,29 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.song.theme_name = them_name self.song.theme_name = them_name
def onVerseListViewPressed(self): def onVerseListViewPressed(self):
self.EditButton.setEnabled(True) self.VerseEditButton.setEnabled(True)
self.DeleteButton.setEnabled(True) self.VerseDeleteButton.setEnabled(True)
def onAddVerseButtonClicked(self): def onVerseAddButtonClicked(self):
self.verse_form.setVerse(u'') self.verse_form.setVerse(u'')
self.verse_form.exec_() self.verse_form.exec_()
self.VerseListWidget.addItem(self.verse_form.getVerse()) self.VerseListWidget.addItem(self.verse_form.getVerse())
def onEditVerseButtonClicked(self): def onVerseEditButtonClicked(self):
item = self.VerseListWidget.currentItem() item = self.VerseListWidget.currentItem()
if item is not None: if item is not None:
self.verse_form.setVerse(item.text()) self.verse_form.setVerse(item.text())
self.verse_form.exec_() self.verse_form.exec_()
item.setText(self.verse_form.getVerse()) item.setText(self.verse_form.getVerse())
self.VerseListWidget.repaint() self.VerseListWidget.repaint()
self.EditButton.setEnabled(False) self.VerseEditButton.setEnabled(False)
self.DeleteButton.setEnabled(False) self.VerseDeleteButton.setEnabled(False)
def onDeleteVerseButtonClicked(self): def onVerseDeleteButtonClicked(self):
item = self.VerseListWidget.takeItem(self.VerseListWidget.currentRow()) item = self.VerseListWidget.takeItem(self.VerseListWidget.currentRow())
item = None item = None
self.EditButton.setEnabled(False) self.VerseEditButton.setEnabled(False)
self.DeleteButton.setEnabled(False) self.VerseDeleteButton.setEnabled(False)
def _validate_song(self): def _validate_song(self):
""" """
@ -323,7 +326,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
def on_CCLNumberEdit_lostFocus(self): def on_CCLNumberEdit_lostFocus(self):
self.song.ccli_number = self.CCLNumberEdit.text() self.song.ccli_number = self.CCLNumberEdit.text()
def onCopyrightInsertItemTriggered(self): def onCopyrightInsertButtonTriggered(self):
text = self.CopyrightEditItem.displayText() text = self.CopyrightEditItem.displayText()
pos = self.CopyrightEditItem.cursorPosition() pos = self.CopyrightEditItem.cursorPosition()
text = text[:pos] + u'©' + text[pos:] text = text[:pos] + u'©' + text[pos:]
@ -331,6 +334,12 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.CopyrightEditItem.setFocus() self.CopyrightEditItem.setFocus()
self.CopyrightEditItem.setCursorPosition(pos + 1) self.CopyrightEditItem.setCursorPosition(pos + 1)
def onMaintenanceButtonClicked(self):
self.parent.song_maintenance_form.exec_()
self.loadAuthors()
self.loadBooks()
self.loadTopics()
def onAccept(self): def onAccept(self):
log.debug(u'OnAccept') log.debug(u'OnAccept')
if not self._validate_song(): if not self._validate_song():

8
openlp/plugins/songs/lib/mediaitem.py
View File

@ -20,14 +20,14 @@ Place, Suite 330, Boston, MA 02111-1307 USA
import logging import logging
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import MediaManagerItem, translate, ServiceItem, \ from openlp.core.lib import MediaManagerItem, translate, ServiceItem, \
SongXMLParser, contextMenuAction, contextMenuSeparator SongXMLParser, contextMenuAction, contextMenuSeparator
from openlp.plugins.songs.forms import EditSongForm, AuthorsForm, \ from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm
TopicsForm, SongBookForm, SongMaintenanceForm
class SongList(QtGui.QListWidget): class SongList(QtGui.QListWidget):
def __init__(self,parent=None,name=None): def __init__(self, parent=None, name=None):
QtGui.QListWidget.__init__(self,parent) QtGui.QListWidget.__init__(self,parent)
def mouseMoveEvent(self, event): def mouseMoveEvent(self, event):
@ -59,7 +59,7 @@ class SongMediaItem(MediaManagerItem):
self.PluginTextShort = u'Song' self.PluginTextShort = u'Song'
self.ConfigSection = u'song' self.ConfigSection = u'song'
MediaManagerItem.__init__(self, parent, icon, title) MediaManagerItem.__init__(self, parent, icon, title)
self.edit_song_form = EditSongForm(self.parent.songmanager, self.parent.event_manager) self.edit_song_form = EditSongForm(self.parent.songmanager, self.parent.event_manager, self)
self.song_maintenance_form = SongMaintenanceForm(self.parent.songmanager, self) self.song_maintenance_form = SongMaintenanceForm(self.parent.songmanager, self)
def setupUi(self): def setupUi(self):

27
openlp/plugins/songs/songsplugin.py
View File

@ -71,15 +71,22 @@ class SongsPlugin(Plugin):
self.ImportSongMenu.setTitle(translate(u'main_window', u'&Song')) self.ImportSongMenu.setTitle(translate(u'main_window', u'&Song'))
self.ImportOpenSongItem.setText(translate(u'main_window', u'OpenSong')) self.ImportOpenSongItem.setText(translate(u'main_window', u'OpenSong'))
self.ImportOpenlp1Item.setText(translate(u'main_window', u'openlp.org 1.0')) self.ImportOpenlp1Item.setText(translate(u'main_window', u'openlp.org 1.0'))
self.ImportOpenlp1Item.setToolTip(translate(u'main_window', u'Export songs in openlp.org 1.0 format')) self.ImportOpenlp1Item.setToolTip(
self.ImportOpenlp1Item.setStatusTip(translate(u'main_window', u'Export songs in openlp.org 1.0 format')) translate(u'main_window', u'Export songs in openlp.org 1.0 format'))
self.ImportOpenlp1Item.setStatusTip(
translate(u'main_window', u'Export songs in openlp.org 1.0 format'))
self.ImportOpenlp2Item.setText(translate(u'main_window', u'OpenLP 2.0')) self.ImportOpenlp2Item.setText(translate(u'main_window', u'OpenLP 2.0'))
self.ImportOpenlp2Item.setToolTip(translate(u'main_window', u'Export songs in OpenLP 2.0 format')) self.ImportOpenlp2Item.setToolTip(
self.ImportOpenlp2Item.setStatusTip(translate(u'main_window', u'Export songs in OpenLP 2.0 format')) translate(u'main_window', u'Export songs in OpenLP 2.0 format'))
self.ImportOpenlp2Item.setStatusTip(
translate(u'main_window', u'Export songs in OpenLP 2.0 format'))
# Signals and slots # Signals and slots
QtCore.QObject.connect(self.ImportOpenlp1Item, QtCore.SIGNAL(u'triggered()'), self.onImportOpenlp1ItemClick) QtCore.QObject.connect(self.ImportOpenlp1Item,
QtCore.QObject.connect(self.ImportOpenlp2Item, QtCore.SIGNAL(u'triggered()'), self.onImportOpenlp1ItemClick) QtCore.SIGNAL(u'triggered()'), self.onImportOpenlp1ItemClick)
QtCore.QObject.connect(self.ImportOpenSongItem, QtCore.SIGNAL(u'triggered()'), self.onImportOpenSongItemClick) QtCore.QObject.connect(self.ImportOpenlp2Item,
QtCore.SIGNAL(u'triggered()'), self.onImportOpenlp1ItemClick)
QtCore.QObject.connect(self.ImportOpenSongItem,
QtCore.SIGNAL(u'triggered()'), self.onImportOpenSongItemClick)
def add_export_menu_item(self, export_menu): def add_export_menu_item(self, export_menu):
self.ExportSongMenu = QtGui.QMenu(export_menu) self.ExportSongMenu = QtGui.QMenu(export_menu)
@ -101,8 +108,10 @@ class SongsPlugin(Plugin):
self.ExportOpenlp1Item.setText(translate(u'main_window', u'openlp.org 1.0')) self.ExportOpenlp1Item.setText(translate(u'main_window', u'openlp.org 1.0'))
self.ExportOpenlp2Item.setText(translate(u'main_window', u'OpenLP 2.0')) self.ExportOpenlp2Item.setText(translate(u'main_window', u'OpenLP 2.0'))
# Signals and slots # Signals and slots
QtCore.QObject.connect(self.ExportOpenlp1Item, QtCore.SIGNAL(u'triggered()'), self.onExportOpenlp1ItemClicked) QtCore.QObject.connect(self.ExportOpenlp1Item,
QtCore.QObject.connect(self.ExportOpenSongItem, QtCore.SIGNAL(u'triggered()'), self.onExportOpenSongItemClicked) QtCore.SIGNAL(u'triggered()'), self.onExportOpenlp1ItemClicked)
QtCore.QObject.connect(self.ExportOpenSongItem,
QtCore.SIGNAL(u'triggered()'), self.onExportOpenSongItemClicked)
def initialise(self): def initialise(self):
self.media_item.displayResultsSong(self.songmanager.get_songs()) self.media_item.displayResultsSong(self.songmanager.get_songs())

1171
resources/forms/editsongdialog.ui
View File

File diff suppressed because it is too large Load Diff