forked from openlp/openlp
Head
This commit is contained in:
Tim Bentley
commit
f45625ac92
@ -654,70 +654,6 @@ class Ui_AmendThemeDialog(object):
|
||||
QtCore.QObject.connect(self.ThemeButtonBox,
|
||||
QtCore.SIGNAL(u'rejected()'), AmendThemeDialog.reject)
|
||||
QtCore.QMetaObject.connectSlotsByName(AmendThemeDialog)
|
||||
AmendThemeDialog.setTabOrder(self.ThemeButtonBox, self.ThemeNameEdit)
|
||||
AmendThemeDialog.setTabOrder(self.ThemeNameEdit, self.ThemeTabWidget)
|
||||
AmendThemeDialog.setTabOrder(self.ThemeTabWidget,
|
||||
self.BackgroundComboBox)
|
||||
AmendThemeDialog.setTabOrder(self.BackgroundComboBox,
|
||||
self.BackgroundTypeComboBox)
|
||||
AmendThemeDialog.setTabOrder(self.BackgroundTypeComboBox,
|
||||
self.Color1PushButton)
|
||||
AmendThemeDialog.setTabOrder(self.Color1PushButton,
|
||||
self.Color2PushButton)
|
||||
AmendThemeDialog.setTabOrder(self.Color2PushButton, self.ImageLineEdit)
|
||||
AmendThemeDialog.setTabOrder(self.ImageLineEdit, self.ImageToolButton)
|
||||
AmendThemeDialog.setTabOrder(self.ImageToolButton,
|
||||
self.GradientComboBox)
|
||||
AmendThemeDialog.setTabOrder(self.GradientComboBox,
|
||||
self.FontMainComboBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontMainComboBox,
|
||||
self.FontMainColorPushButton)
|
||||
AmendThemeDialog.setTabOrder(self.FontMainColorPushButton,
|
||||
self.FontMainSizeSpinBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontMainSizeSpinBox,
|
||||
self.FontMainWeightComboBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontMainWeightComboBox,
|
||||
self.FontMainLineSpacingSpinBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontMainLineSpacingSpinBox,
|
||||
self.FontMainDefaultCheckBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontMainDefaultCheckBox,
|
||||
self.FontMainXSpinBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontMainXSpinBox,
|
||||
self.FontMainYSpinBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontMainYSpinBox,
|
||||
self.FontMainWidthSpinBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontMainWidthSpinBox,
|
||||
self.FontMainHeightSpinBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontMainHeightSpinBox,
|
||||
self.FontFooterComboBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontFooterComboBox,
|
||||
self.FontFooterColorPushButton)
|
||||
AmendThemeDialog.setTabOrder(self.FontFooterColorPushButton,
|
||||
self.FontFooterSizeSpinBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontFooterSizeSpinBox,
|
||||
self.FontFooterWeightComboBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontFooterWeightComboBox,
|
||||
self.FontFooterDefaultCheckBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontFooterDefaultCheckBox,
|
||||
self.FontFooterXSpinBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontFooterXSpinBox,
|
||||
self.FontFooterYSpinBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontFooterYSpinBox,
|
||||
self.FontFooterWidthSpinBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontFooterWidthSpinBox,
|
||||
self.FontFooterHeightSpinBox)
|
||||
AmendThemeDialog.setTabOrder(self.FontFooterHeightSpinBox,
|
||||
self.OutlineCheckBox)
|
||||
AmendThemeDialog.setTabOrder(self.OutlineCheckBox,
|
||||
self.OutlineColorPushButton)
|
||||
AmendThemeDialog.setTabOrder(self.OutlineColorPushButton,
|
||||
self.ShadowCheckBox)
|
||||
AmendThemeDialog.setTabOrder(self.ShadowCheckBox,
|
||||
self.ShadowColorPushButton)
|
||||
AmendThemeDialog.setTabOrder(self.ShadowColorPushButton,
|
||||
self.HorizontalComboBox)
|
||||
AmendThemeDialog.setTabOrder(self.HorizontalComboBox,
|
||||
self.VerticalComboBox)
|
||||
|
||||
def retranslateUi(self, AmendThemeDialog):
|
||||
AmendThemeDialog.setWindowTitle(
|
||||
|
||||
@ -118,6 +118,7 @@ class ThemeManager(QtGui.QWidget):
|
||||
self.checkThemesExists(self.thumbPath)
|
||||
self.amendThemeForm.path = self.path
|
||||
self.oldBackgroundImage = None
|
||||
self.editingDefault = False
|
||||
# Last little bits of setting up
|
||||
self.global_theme = unicode(QtCore.QSettings().value(
|
||||
self.settingsSection + u'/global theme',
|
||||
@ -184,7 +185,6 @@ class ThemeManager(QtGui.QWidget):
|
||||
Loads the settings for the theme that is to be edited and launches the
|
||||
theme editing form so the user can make their changes.
|
||||
"""
|
||||
self.editingDefault = False
|
||||
if check_item_selected(self.ThemeListWidget, translate('ThemeManager',
|
||||
'You must select a theme to edit.')):
|
||||
item = self.ThemeListWidget.currentItem()
|
||||
@ -610,6 +610,7 @@ class ThemeManager(QtGui.QWidget):
|
||||
self.settingsSection + u'/global theme',
|
||||
QtCore.QVariant(self.global_theme))
|
||||
Receiver.send_message(u'theme_update_global', self.global_theme)
|
||||
self.editingDefault = False
|
||||
self.pushThemes()
|
||||
else:
|
||||
# Don't close the dialog - allow the user to change the name of
|
||||
|
||||
@ -120,14 +120,6 @@ class Ui_AlertDialog(object):
|
||||
QtCore.QObject.connect(self.CloseButton, QtCore.SIGNAL(u'clicked()'),
|
||||
AlertDialog.close)
|
||||
QtCore.QMetaObject.connectSlotsByName(AlertDialog)
|
||||
AlertDialog.setTabOrder(self.AlertTextEdit, self.ParameterEdit)
|
||||
AlertDialog.setTabOrder(self.ParameterEdit, self.AlertListWidget)
|
||||
AlertDialog.setTabOrder(self.AlertListWidget, self.NewButton)
|
||||
AlertDialog.setTabOrder(self.NewButton, self.SaveButton)
|
||||
AlertDialog.setTabOrder(self.SaveButton, self.DeleteButton)
|
||||
AlertDialog.setTabOrder(self.DeleteButton, self.DisplayButton)
|
||||
AlertDialog.setTabOrder(self.DisplayButton, self.DisplayCloseButton)
|
||||
AlertDialog.setTabOrder(self.DisplayCloseButton, self.CloseButton)
|
||||
|
||||
def retranslateUi(self, AlertDialog):
|
||||
AlertDialog.setWindowTitle(
|
||||
|
||||
@ -136,17 +136,6 @@ class Ui_customEditDialog(object):
|
||||
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'),
|
||||
customEditDialog.closePressed)
|
||||
QtCore.QMetaObject.connectSlotsByName(customEditDialog)
|
||||
customEditDialog.setTabOrder(self.TitleEdit, self.VerseTextEdit)
|
||||
customEditDialog.setTabOrder(self.VerseTextEdit, self.AddButton)
|
||||
customEditDialog.setTabOrder(self.AddButton, self.VerseListView)
|
||||
customEditDialog.setTabOrder(self.VerseListView, self.EditButton)
|
||||
customEditDialog.setTabOrder(self.EditButton, self.EditAllButton)
|
||||
customEditDialog.setTabOrder(self.EditAllButton, self.SaveButton)
|
||||
customEditDialog.setTabOrder(self.SaveButton, self.DeleteButton)
|
||||
customEditDialog.setTabOrder(self.DeleteButton, self.CreditEdit)
|
||||
customEditDialog.setTabOrder(self.CreditEdit, self.UpButton)
|
||||
customEditDialog.setTabOrder(self.UpButton, self.DownButton)
|
||||
customEditDialog.setTabOrder(self.DownButton, self.ThemeComboBox)
|
||||
|
||||
def retranslateUi(self, customEditDialog):
|
||||
customEditDialog.setWindowTitle(
|
||||
|
||||
@ -394,48 +394,12 @@ class Ui_EditSongDialog(object):
|
||||
QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Save)
|
||||
self.ButtonBox.setObjectName(u'ButtonBox')
|
||||
self.verticalLayout.addWidget(self.ButtonBox)
|
||||
|
||||
self.retranslateUi(EditSongDialog)
|
||||
QtCore.QObject.connect(self.ButtonBox,
|
||||
QtCore.SIGNAL(u'rejected()'), EditSongDialog.closePressed)
|
||||
QtCore.QObject.connect(self.ButtonBox,
|
||||
QtCore.SIGNAL(u'accepted()'), EditSongDialog.accept)
|
||||
QtCore.QMetaObject.connectSlotsByName(EditSongDialog)
|
||||
EditSongDialog.setTabOrder(self.SongTabWidget, self.TitleEditItem)
|
||||
EditSongDialog.setTabOrder(self.TitleEditItem, self.AlternativeEdit)
|
||||
EditSongDialog.setTabOrder(self.AlternativeEdit, self.VerseListWidget)
|
||||
EditSongDialog.setTabOrder(self.VerseListWidget, self.VerseAddButton)
|
||||
EditSongDialog.setTabOrder(self.VerseAddButton, self.VerseEditButton)
|
||||
EditSongDialog.setTabOrder(self.VerseEditButton,
|
||||
self.VerseEditAllButton)
|
||||
EditSongDialog.setTabOrder(self.VerseEditAllButton,
|
||||
self.VerseDeleteButton)
|
||||
EditSongDialog.setTabOrder(self.VerseDeleteButton, self.VerseOrderEdit)
|
||||
EditSongDialog.setTabOrder(self.VerseOrderEdit,
|
||||
self.AuthorsSelectionComboItem)
|
||||
EditSongDialog.setTabOrder(self.AuthorsSelectionComboItem,
|
||||
self.AuthorAddButton)
|
||||
EditSongDialog.setTabOrder(self.AuthorAddButton, self.AuthorsListView)
|
||||
EditSongDialog.setTabOrder(self.AuthorsListView,
|
||||
self.AuthorRemoveButton)
|
||||
EditSongDialog.setTabOrder(self.AuthorRemoveButton,
|
||||
self.MaintenanceButton)
|
||||
EditSongDialog.setTabOrder(self.MaintenanceButton, self.SongTopicCombo)
|
||||
EditSongDialog.setTabOrder(self.SongTopicCombo, self.TopicAddButton)
|
||||
EditSongDialog.setTabOrder(self.TopicAddButton, self.TopicsListView)
|
||||
EditSongDialog.setTabOrder(self.TopicsListView, self.TopicRemoveButton)
|
||||
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):
|
||||
EditSongDialog.setWindowTitle(
|
||||
|
||||
@ -137,7 +137,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
||||
|
||||
def checkAuthor(self, new_author, edit=False):
|
||||
"""
|
||||
Returns False when the given Author is already in the list elsewise
|
||||
Returns False if the given Author is already in the list otherwise
|
||||
True.
|
||||
"""
|
||||
authors = self.songmanager.get_all_objects_filtered(Author,
|
||||
@ -163,11 +163,10 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
||||
|
||||
def checkTopic(self, new_topic, edit=False):
|
||||
"""
|
||||
Returns False when the given Topic is already in the list elsewise True.
|
||||
Returns False if the given Topic is already in the list otherwise True.
|
||||
"""
|
||||
topics = self.songmanager.get_all_objects_filtered(Topic,
|
||||
Topic.name == new_topic.name
|
||||
)
|
||||
Topic.name == new_topic.name)
|
||||
if len(topics) > 0:
|
||||
# If we edit an existing Topic, we need to make sure that we do
|
||||
# not return False when nothing has changed (because this would
|
||||
@ -184,14 +183,11 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
||||
|
||||
def checkBook(self, new_book, edit=False):
|
||||
"""
|
||||
Returns False when the given Book is already in the list elsewise True.
|
||||
Returns False if the given Book is already in the list otherwise True.
|
||||
"""
|
||||
books = self.songmanager.get_all_objects_filtered(Book,
|
||||
and_(
|
||||
Book.name == new_book.name,
|
||||
Book.publisher == new_book.publisher
|
||||
)
|
||||
)
|
||||
and_(Book.name == new_book.name,
|
||||
Book.publisher == new_book.publisher))
|
||||
if len(books) > 0:
|
||||
# If we edit an existing Book, we need to make sure that we do
|
||||
# not return False when nothing has changed (because this would
|
||||
|
||||
Loading…
Reference in New Issue
Block a user