From b225a96d0960b0b6a60af0eb3ca050ea75a4b1d9 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Tue, 6 Jul 2010 22:18:55 +0100 Subject: [PATCH 1/2] 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 2/2] 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.