openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/testing into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Fix theme bug #606256

While checking theme bug found that tab order was broken.  Qt does the Right Thing(tm) when there is no tab order giving us one less thing to maintain so remove them.
This has highlighted a bug in tab ordering on the song edit form where the tab gets stuck in the verse list - happens in trunk so it's nothing to do with this patch.  Any ideas?
-- 
https://code.launchpad.net/~meths/openlp/testing/+merge/30098
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/testing into lp:openlp.

=== modified file 'openlp/core/ui/amendthemedialog.py'
--- openlp/core/ui/amendthemedialog.py	2010-07-12 22:32:46 +0000
+++ openlp/core/ui/amendthemedialog.py	2010-07-16 12:37:40 +0000
@@ -654,70 +654,6 @@
         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(

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2010-07-13 18:32:29 +0000
+++ openlp/core/ui/thememanager.py	2010-07-16 12:37:40 +0000
@@ -118,6 +118,7 @@
         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 @@
         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 @@
                     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

=== modified file 'openlp/plugins/alerts/forms/alertdialog.py'
--- openlp/plugins/alerts/forms/alertdialog.py	2010-07-08 12:25:17 +0000
+++ openlp/plugins/alerts/forms/alertdialog.py	2010-07-16 12:37:40 +0000
@@ -120,14 +120,6 @@
         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(

=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
--- openlp/plugins/custom/forms/editcustomdialog.py	2010-07-08 11:46:03 +0000
+++ openlp/plugins/custom/forms/editcustomdialog.py	2010-07-16 12:37:40 +0000
@@ -136,17 +136,6 @@
         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(

=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py	2010-06-25 18:14:38 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py	2010-07-16 12:37:40 +0000
@@ -394,48 +394,12 @@
             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(