forked from openlp/openlp
Add Theme fix and form tab ordering
This commit is contained in:
Jon Tibble
parent
1e9022c1f5
commit
897929967a
|
|
@ -654,70 +654,6 @@ class Ui_AmendThemeDialog(object):
|
||||||
QtCore.QObject.connect(self.ThemeButtonBox,
|
QtCore.QObject.connect(self.ThemeButtonBox,
|
||||||
QtCore.SIGNAL(u'rejected()'), AmendThemeDialog.reject)
|
QtCore.SIGNAL(u'rejected()'), AmendThemeDialog.reject)
|
||||||
QtCore.QMetaObject.connectSlotsByName(AmendThemeDialog)
|
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):
|
def retranslateUi(self, AmendThemeDialog):
|
||||||
AmendThemeDialog.setWindowTitle(
|
AmendThemeDialog.setWindowTitle(
|
||||||
|
|
|
||||||
|
|
@ -118,6 +118,7 @@ class ThemeManager(QtGui.QWidget):
|
||||||
self.checkThemesExists(self.thumbPath)
|
self.checkThemesExists(self.thumbPath)
|
||||||
self.amendThemeForm.path = self.path
|
self.amendThemeForm.path = self.path
|
||||||
self.oldBackgroundImage = None
|
self.oldBackgroundImage = None
|
||||||
|
self.editingDefault = False
|
||||||
# Last little bits of setting up
|
# Last little bits of setting up
|
||||||
self.global_theme = unicode(QtCore.QSettings().value(
|
self.global_theme = unicode(QtCore.QSettings().value(
|
||||||
self.settingsSection + u'/global theme',
|
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
|
Loads the settings for the theme that is to be edited and launches the
|
||||||
theme editing form so the user can make their changes.
|
theme editing form so the user can make their changes.
|
||||||
"""
|
"""
|
||||||
self.editingDefault = False
|
|
||||||
if check_item_selected(self.ThemeListWidget, translate('ThemeManager',
|
if check_item_selected(self.ThemeListWidget, translate('ThemeManager',
|
||||||
'You must select a theme to edit.')):
|
'You must select a theme to edit.')):
|
||||||
item = self.ThemeListWidget.currentItem()
|
item = self.ThemeListWidget.currentItem()
|
||||||
|
|
@ -610,6 +610,7 @@ class ThemeManager(QtGui.QWidget):
|
||||||
self.settingsSection + u'/global theme',
|
self.settingsSection + u'/global theme',
|
||||||
QtCore.QVariant(self.global_theme))
|
QtCore.QVariant(self.global_theme))
|
||||||
Receiver.send_message(u'theme_update_global', self.global_theme)
|
Receiver.send_message(u'theme_update_global', self.global_theme)
|
||||||
|
self.editingDefault = False
|
||||||
self.pushThemes()
|
self.pushThemes()
|
||||||
else:
|
else:
|
||||||
# Don't close the dialog - allow the user to change the name of
|
# 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()'),
|
QtCore.QObject.connect(self.CloseButton, QtCore.SIGNAL(u'clicked()'),
|
||||||
AlertDialog.close)
|
AlertDialog.close)
|
||||||
QtCore.QMetaObject.connectSlotsByName(AlertDialog)
|
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):
|
def retranslateUi(self, AlertDialog):
|
||||||
AlertDialog.setWindowTitle(
|
AlertDialog.setWindowTitle(
|
||||||
|
|
|
||||||
|
|
@ -136,17 +136,6 @@ class Ui_customEditDialog(object):
|
||||||
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'),
|
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'),
|
||||||
customEditDialog.closePressed)
|
customEditDialog.closePressed)
|
||||||
QtCore.QMetaObject.connectSlotsByName(customEditDialog)
|
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):
|
def retranslateUi(self, customEditDialog):
|
||||||
customEditDialog.setWindowTitle(
|
customEditDialog.setWindowTitle(
|
||||||
|
|
|
||||||
|
|
@ -394,48 +394,12 @@ class Ui_EditSongDialog(object):
|
||||||
QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Save)
|
QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Save)
|
||||||
self.ButtonBox.setObjectName(u'ButtonBox')
|
self.ButtonBox.setObjectName(u'ButtonBox')
|
||||||
self.verticalLayout.addWidget(self.ButtonBox)
|
self.verticalLayout.addWidget(self.ButtonBox)
|
||||||
|
|
||||||
self.retranslateUi(EditSongDialog)
|
self.retranslateUi(EditSongDialog)
|
||||||
QtCore.QObject.connect(self.ButtonBox,
|
QtCore.QObject.connect(self.ButtonBox,
|
||||||
QtCore.SIGNAL(u'rejected()'), EditSongDialog.closePressed)
|
QtCore.SIGNAL(u'rejected()'), EditSongDialog.closePressed)
|
||||||
QtCore.QObject.connect(self.ButtonBox,
|
QtCore.QObject.connect(self.ButtonBox,
|
||||||
QtCore.SIGNAL(u'accepted()'), EditSongDialog.accept)
|
QtCore.SIGNAL(u'accepted()'), EditSongDialog.accept)
|
||||||
QtCore.QMetaObject.connectSlotsByName(EditSongDialog)
|
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):
|
def retranslateUi(self, EditSongDialog):
|
||||||
EditSongDialog.setWindowTitle(
|
EditSongDialog.setWindowTitle(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue