From 6504d74fa089a72eafa1a2bf5cc5bba55796807c Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Tue, 6 Jul 2010 13:58:33 +0100 Subject: [PATCH 1/2] Rename CheckedBoxen --- openlp/core/ui/amendthemedialog.py | 16 ++++++++-------- openlp/core/ui/amendthemeform.py | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/openlp/core/ui/amendthemedialog.py b/openlp/core/ui/amendthemedialog.py index 2bb202964..a5cd69610 100644 --- a/openlp/core/ui/amendthemedialog.py +++ b/openlp/core/ui/amendthemedialog.py @@ -596,15 +596,15 @@ class Ui_AmendThemeDialog(object): self.TransitionGroupBox.setObjectName(u'TransitionGroupBox') self.gridLayout_5 = QtGui.QGridLayout(self.TransitionGroupBox) self.gridLayout_5.setObjectName(u'gridLayout_5') - self.SlideTransitionCheckedBoxLabel = QtGui.QLabel( + self.SlideTransitionCheckBoxLabel = QtGui.QLabel( self.TransitionGroupBox) - self.SlideTransitionCheckedBoxLabel.setObjectName( - u'SlideTransitionCheckedBoxLabel') + self.SlideTransitionCheckBoxLabel.setObjectName( + u'SlideTransitionCheckBoxLabel') self.gridLayout_5.addWidget( - self.SlideTransitionCheckedBoxLabel, 0, 0, 1, 1) - self.SlideTransitionCheckedBox = QtGui.QCheckBox(self.AlignmentGroupBox) - self.SlideTransitionCheckedBox.setTristate(False) - self.gridLayout_5.addWidget(self.SlideTransitionCheckedBox, 0, 1, 1, 1) + self.SlideTransitionCheckBoxLabel, 0, 0, 1, 1) + self.SlideTransitionCheckBox = QtGui.QCheckBox(self.AlignmentGroupBox) + self.SlideTransitionCheckBox.setTristate(False) + self.gridLayout_5.addWidget(self.SlideTransitionCheckBox, 0, 1, 1, 1) self.OptionsRightLayout.addWidget(self.TransitionGroupBox) spacerItem6 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) @@ -864,7 +864,7 @@ class Ui_AmendThemeDialog(object): translate('AmendThemeForm', 'Bottom')) self.TransitionGroupBox.setTitle( translate('AmendThemeForm', 'Slide Transition')) - self.SlideTransitionCheckedBoxLabel.setText( + self.SlideTransitionCheckBoxLabel.setText( translate('AmendThemeForm', 'Transition active:')) self.ThemeTabWidget.setTabText( self.ThemeTabWidget.indexOf(self.OtherOptionsTab), diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index c85eff4b8..1c2658dc3 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -133,9 +133,9 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): QtCore.QObject.connect(self.OutlineSpinBox, QtCore.SIGNAL(u'editingFinished()'), self.onOutlineSpinBoxChanged) - QtCore.QObject.connect(self.SlideTransitionCheckedBox, + QtCore.QObject.connect(self.SlideTransitionCheckBox, QtCore.SIGNAL(u'stateChanged(int)'), - self.onSlideTransitionCheckedBoxChanged) + self.onSlideTransitionCheckBoxChanged) def accept(self): new_theme = ThemeXML() @@ -500,7 +500,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.stateChanging(self.theme) self.previewTheme() - def onSlideTransitionCheckedBoxChanged(self, value): + def onSlideTransitionCheckBoxChanged(self, value): if value == 2: # checked self.theme.display_slideTransition = True else: @@ -624,9 +624,9 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.ShadowColorPushButton.setEnabled(False) self.ShadowSpinBox.setValue(int(self.theme.display_shadow_size)) if self.theme.display_slideTransition: - self.SlideTransitionCheckedBox.setCheckState(QtCore.Qt.Checked) + self.SlideTransitionCheckBox.setCheckState(QtCore.Qt.Checked) else: - self.SlideTransitionCheckedBox.setCheckState(QtCore.Qt.Unchecked) + self.SlideTransitionCheckBox.setCheckState(QtCore.Qt.Unchecked) self.HorizontalComboBox.setCurrentIndex( self.theme.display_horizontalAlign) self.VerticalComboBox.setCurrentIndex(self.theme.display_verticalAlign) From 09fb6e6dda4566d56c921996e1e1da134bd3f99f Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Tue, 6 Jul 2010 22:59:52 +0100 Subject: [PATCH 2/2] Parent tweaks --- openlp/core/lib/toolbar.py | 2 +- openlp/core/ui/maindisplay.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py index a2979746e..6b87f84fe 100644 --- a/openlp/core/lib/toolbar.py +++ b/openlp/core/lib/toolbar.py @@ -42,7 +42,7 @@ class OpenLPToolbar(QtGui.QToolBar): """ Initialise the toolbar. """ - QtGui.QToolBar.__init__(self, None) + QtGui.QToolBar.__init__(self, parent) # useful to be able to reuse button icons... self.icons = {} self.setIconSize(QtCore.QSize(20, 20)) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index b770a9e05..530cd6124 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -210,7 +210,6 @@ class MainDisplay(DisplayWidget): self.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint) self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) - self.parent = parent # WA_TranslucentBackground is not available in QT4.4 try: self.setAttribute(QtCore.Qt.WA_TranslucentBackground) @@ -616,7 +615,7 @@ class VideoDisplay(Phonon.VideoWidget): def mediaShow(self, message=''): """ - Show the video disaply if it was already hidden + Show the video display if it was already hidden """ if self.hidden: self.hidden = False @@ -625,7 +624,7 @@ class VideoDisplay(Phonon.VideoWidget): class AudioPlayer(QtCore.QObject): """ - This Class will play audio only allowing components to work witn a + This Class will play audio only allowing components to work with a soundtrack which does not take over the user interface. """ log.info(u'AudioPlayer Loaded') @@ -641,8 +640,7 @@ class AudioPlayer(QtCore.QObject): The list of screens. """ log.debug(u'AudioPlayer Initialisation started') - QtCore.QObject.__init__(self) - self.parent = parent + QtCore.QObject.__init__(self, parent) self.message = None self.mediaObject = Phonon.MediaObject() self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory)