From 6504d74fa089a72eafa1a2bf5cc5bba55796807c Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Tue, 6 Jul 2010 13:58:33 +0100 Subject: [PATCH 1/5] 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 9e7f98e33c56e9f4ab64211517bfc8559f98369e Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 6 Jul 2010 22:27:57 +0200 Subject: [PATCH 2/5] Fixed a small bug where the item in the menu would remain checked despite the fact that the element on the form was no longer visible. --- openlp/core/ui/mainwindow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index d436ac379..3391f502a 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -785,7 +785,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.LiveController.Panel.setVisible(True) self.settingsmanager.set_preview_visibility(False) self.settingsmanager.set_live_visibility(True) - self.ViewPreviewPanel.setChecked(True) + self.ViewPreviewPanel.setChecked(False) self.ViewLivePanel.setChecked(True) def screenChanged(self): From b225a96d0960b0b6a60af0eb3ca050ea75a4b1d9 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Tue, 6 Jul 2010 22:18:55 +0100 Subject: [PATCH 3/5] Small modes refactoring --- openlp/core/ui/mainwindow.py | 42 ++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 3391f502a..a28e41772 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -753,12 +753,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.MediaManagerDock.setVisible(True) self.ServiceManagerDock.setVisible(True) self.ThemeManagerDock.setVisible(True) - self.PreviewController.Panel.setVisible(True) - self.LiveController.Panel.setVisible(True) - self.settingsmanager.set_preview_visibility(True) - self.settingsmanager.set_live_visibility(True) - self.ViewPreviewPanel.setChecked(True) - self.ViewLivePanel.setChecked(True) + self.togglePreviewPanel(True) + self.toggleLivePanel(True) def onModeSetupItemClicked(self): """ @@ -767,12 +763,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.MediaManagerDock.setVisible(True) self.ServiceManagerDock.setVisible(True) self.ThemeManagerDock.setVisible(False) - self.PreviewController.Panel.setVisible(True) - self.LiveController.Panel.setVisible(False) - self.settingsmanager.set_preview_visibility(True) - self.settingsmanager.set_live_visibility(False) - self.ViewPreviewPanel.setChecked(True) - self.ViewLivePanel.setChecked(False) + self.togglePreviewPanel(True) + self.toggleLivePanel(False) def onModeLiveItemClicked(self): """ @@ -781,12 +773,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.MediaManagerDock.setVisible(False) self.ServiceManagerDock.setVisible(True) self.ThemeManagerDock.setVisible(False) - self.PreviewController.Panel.setVisible(False) - self.LiveController.Panel.setVisible(True) - self.settingsmanager.set_preview_visibility(False) - self.settingsmanager.set_live_visibility(True) - self.ViewPreviewPanel.setChecked(False) - self.ViewLivePanel.setChecked(True) + self.togglePreviewPanel(False) + self.toggleLivePanel(True) def screenChanged(self): """ @@ -881,11 +869,29 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.ThemeManagerDock.setVisible(visible) def togglePreviewPanel(self, visible): + """ + Sets the visibility of the preview panel including saving the setting + and updating the menu. + + ``visible`` + A bool giving the state to set the panel to + True - Visible + False - Hidden + """ self.PreviewController.Panel.setVisible(visible) self.settingsmanager.set_preview_visibility(visible) self.ViewPreviewPanel.setChecked(visible) def toggleLivePanel(self, visible): + """ + Sets the visibility of the live panel including saving the setting and + updating the menu. + + ``visible`` + A bool giving the state to set the panel to + True - Visible + False - Hidden + """ self.LiveController.Panel.setVisible(visible) self.settingsmanager.set_live_visibility(visible) self.ViewLivePanel.setChecked(visible) From 8de0de9921baabca120d0ebd899bb6c83722f1ac Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Tue, 6 Jul 2010 22:23:09 +0100 Subject: [PATCH 4/5] Rename methods to better indicate function --- openlp/core/ui/mainwindow.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index a28e41772..9c5939070 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -559,10 +559,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.toggleThemeManager) QtCore.QObject.connect(self.ViewPreviewPanel, QtCore.SIGNAL(u'toggled(bool)'), - self.togglePreviewPanel) + self.setPreviewPanelVisibility) QtCore.QObject.connect(self.ViewLivePanel, QtCore.SIGNAL(u'toggled(bool)'), - self.toggleLivePanel) + self.setLivePanelVisibility) QtCore.QObject.connect(self.MediaManagerDock, QtCore.SIGNAL(u'visibilityChanged(bool)'), self.ViewMediaManagerItem.setChecked) @@ -753,8 +753,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.MediaManagerDock.setVisible(True) self.ServiceManagerDock.setVisible(True) self.ThemeManagerDock.setVisible(True) - self.togglePreviewPanel(True) - self.toggleLivePanel(True) + self.setPreviewPanelVisibility(True) + self.setLivePanelVisibility(True) def onModeSetupItemClicked(self): """ @@ -763,8 +763,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.MediaManagerDock.setVisible(True) self.ServiceManagerDock.setVisible(True) self.ThemeManagerDock.setVisible(False) - self.togglePreviewPanel(True) - self.toggleLivePanel(False) + self.setPreviewPanelVisibility(True) + self.setLivePanelVisibility(False) def onModeLiveItemClicked(self): """ @@ -773,8 +773,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.MediaManagerDock.setVisible(False) self.ServiceManagerDock.setVisible(True) self.ThemeManagerDock.setVisible(False) - self.togglePreviewPanel(False) - self.toggleLivePanel(True) + self.setPreviewPanelVisibility(False) + self.setLivePanelVisibility(True) def screenChanged(self): """ @@ -868,7 +868,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): if self.ThemeManagerDock.isVisible() != visible: self.ThemeManagerDock.setVisible(visible) - def togglePreviewPanel(self, visible): + def setPreviewPanelVisibility(self, visible): """ Sets the visibility of the preview panel including saving the setting and updating the menu. @@ -882,7 +882,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.settingsmanager.set_preview_visibility(visible) self.ViewPreviewPanel.setChecked(visible) - def toggleLivePanel(self, visible): + def setLivePanelVisibility(self, visible): """ Sets the visibility of the live panel including saving the setting and updating the menu. From 09fb6e6dda4566d56c921996e1e1da134bd3f99f Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Tue, 6 Jul 2010 22:59:52 +0100 Subject: [PATCH 5/5] 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)