From cce709218f16a6bd00ab0bc5ef106fac02d78f72 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 15 Jul 2010 07:38:23 +0200 Subject: [PATCH] Removed comments and now-defunct display tab. --- openlp/core/ui/displaytab.py | 244 --------------------------------- openlp/core/ui/generaltab.py | 8 -- openlp/core/ui/settingsform.py | 5 +- 3 files changed, 1 insertion(+), 256 deletions(-) delete mode 100644 openlp/core/ui/displaytab.py diff --git a/openlp/core/ui/displaytab.py b/openlp/core/ui/displaytab.py deleted file mode 100644 index 32dad1c2b..000000000 --- a/openlp/core/ui/displaytab.py +++ /dev/null @@ -1,244 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2010 Raoul Snyman # -# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # -# Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin # -# Thompson, Jon Tibble, Carsten Tinggaard # -# --------------------------------------------------------------------------- # -# This program is free software; you can redistribute it and/or modify it # -# under the terms of the GNU General Public License as published by the Free # -# Software Foundation; version 2 of the License. # -# # -# This program is distributed in the hope that it will be useful, but WITHOUT # -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # -# more details. # -# # -# You should have received a copy of the GNU General Public License along # -# with this program; if not, write to the Free Software Foundation, Inc., 59 # -# Temple Place, Suite 330, Boston, MA 02111-1307 USA # -############################################################################### - -from PyQt4 import QtGui, QtCore - -from openlp.core.lib import SettingsTab, Receiver, translate - -class DisplayTab(SettingsTab): - """ - Provide the UI for managing display related settings - """ - def __init__(self, screens): - """ - Initialise the display tab from a SettingsTab - """ - self.screens = screens - SettingsTab.__init__(self, u'Display') - - def setupUi(self): - """ - Set up the UI widgets to show the settings - """ - self.tabTitleVisible = translate('DisplayTab', 'Displays') - self.layoutWidget = QtGui.QWidget(self) - self.layoutWidget.setObjectName(u'layoutWidget') - self.verticalLayout = QtGui.QVBoxLayout(self.layoutWidget) - self.verticalLayout.setObjectName(u'verticalLayout') - self.OverrideCheckBox = QtGui.QCheckBox(self.layoutWidget) - self.OverrideCheckBox.setObjectName(u'OverrideCheckBox') - self.verticalLayout.addWidget(self.OverrideCheckBox) - self.CurrentGroupBox = QtGui.QGroupBox(self.layoutWidget) - self.CurrentGroupBox.setObjectName(u'CurrentGroupBox') - self.horizontalLayout = QtGui.QHBoxLayout(self.CurrentGroupBox) - self.horizontalLayout.setObjectName(u'horizontalLayout') - self.verticalLayout_6 = QtGui.QVBoxLayout() - self.verticalLayout_6.setObjectName(u'verticalLayout_6') - self.XLabel = QtGui.QLabel(self.CurrentGroupBox) - self.XLabel.setAlignment(QtCore.Qt.AlignCenter) - self.XLabel.setObjectName(u'XLabel') - self.verticalLayout_6.addWidget(self.XLabel) - self.Xpos = QtGui.QLabel(self.CurrentGroupBox) - self.Xpos.setAlignment(QtCore.Qt.AlignCenter) - self.Xpos.setObjectName(u'Xpos') - self.verticalLayout_6.addWidget(self.Xpos) - self.horizontalLayout.addLayout(self.verticalLayout_6) - self.verticalLayout_7 = QtGui.QVBoxLayout() - self.verticalLayout_7.setObjectName(u'verticalLayout_7') - self.YLabel = QtGui.QLabel(self.CurrentGroupBox) - self.YLabel.setAlignment(QtCore.Qt.AlignCenter) - self.YLabel.setObjectName(u'YLabel') - self.verticalLayout_7.addWidget(self.YLabel) - self.Ypos = QtGui.QLabel(self.CurrentGroupBox) - self.Ypos.setAlignment(QtCore.Qt.AlignCenter) - self.Ypos.setObjectName(u'Ypos') - self.verticalLayout_7.addWidget(self.Ypos) - self.horizontalLayout.addLayout(self.verticalLayout_7) - self.verticalLayout_9 = QtGui.QVBoxLayout() - self.verticalLayout_9.setObjectName(u'verticalLayout_9') - self.HeightLabel = QtGui.QLabel(self.CurrentGroupBox) - self.HeightLabel.setMaximumSize(QtCore.QSize(100, 16777215)) - self.HeightLabel.setAlignment(QtCore.Qt.AlignCenter) - self.HeightLabel.setObjectName(u'HeightLabel') - self.verticalLayout_9.addWidget(self.HeightLabel) - self.Height = QtGui.QLabel(self.CurrentGroupBox) - self.Height.setAlignment(QtCore.Qt.AlignCenter) - self.Height.setObjectName(u'Height') - self.verticalLayout_9.addWidget(self.Height) - self.horizontalLayout.addLayout(self.verticalLayout_9) - self.verticalLayout_8 = QtGui.QVBoxLayout() - self.verticalLayout_8.setObjectName(u'verticalLayout_8') - self.WidthLabel = QtGui.QLabel(self.CurrentGroupBox) - self.WidthLabel.setAlignment(QtCore.Qt.AlignCenter) - self.WidthLabel.setObjectName(u'WidthLabel') - self.verticalLayout_8.addWidget(self.WidthLabel) - self.Width = QtGui.QLabel(self.CurrentGroupBox) - self.Width.setAlignment(QtCore.Qt.AlignCenter) - self.Width.setObjectName(u'Width') - self.verticalLayout_8.addWidget(self.Width) - self.horizontalLayout.addLayout(self.verticalLayout_8) - self.verticalLayout.addWidget(self.CurrentGroupBox) - self.CurrentGroupBox_2 = QtGui.QGroupBox(self) - self.CurrentGroupBox_2.setGeometry(QtCore.QRect(0, 130, 248, 87)) - self.CurrentGroupBox_2.setMaximumSize(QtCore.QSize(500, 16777215)) - self.CurrentGroupBox_2.setObjectName(u'CurrentGroupBox_2') - self.horizontalLayout_2 = QtGui.QHBoxLayout(self.CurrentGroupBox_2) - self.horizontalLayout_2.setObjectName(u'horizontalLayout_2') - self.verticalLayout_2 = QtGui.QVBoxLayout() - self.verticalLayout_2.setObjectName(u'verticalLayout_2') - self.XAmendLabel = QtGui.QLabel(self.CurrentGroupBox_2) - self.XAmendLabel.setAlignment(QtCore.Qt.AlignCenter) - self.XAmendLabel.setObjectName(u'XAmendLabel') - self.verticalLayout_2.addWidget(self.XAmendLabel) - self.XposEdit = QtGui.QLineEdit(self.CurrentGroupBox_2) - self.XposEdit.setMaximumSize(QtCore.QSize(50, 16777215)) - self.XposEdit.setMaxLength(4) - self.XposEdit.setObjectName(u'XposEdit') - self.verticalLayout_2.addWidget(self.XposEdit) - self.horizontalLayout_2.addLayout(self.verticalLayout_2) - self.verticalLayout_3 = QtGui.QVBoxLayout() - self.verticalLayout_3.setObjectName(u'verticalLayout_3') - self.YAmendLabel = QtGui.QLabel(self.CurrentGroupBox_2) - self.YAmendLabel.setAlignment(QtCore.Qt.AlignCenter) - self.YAmendLabel.setObjectName(u'YAmendLabel') - self.verticalLayout_3.addWidget(self.YAmendLabel) - self.YposEdit = QtGui.QLineEdit(self.CurrentGroupBox_2) - self.YposEdit.setMaximumSize(QtCore.QSize(50, 16777215)) - self.YposEdit.setMaxLength(4) - self.YposEdit.setObjectName(u'YposEdit') - self.verticalLayout_3.addWidget(self.YposEdit) - self.horizontalLayout_2.addLayout(self.verticalLayout_3) - self.verticalLayout_4 = QtGui.QVBoxLayout() - self.verticalLayout_4.setObjectName(u'verticalLayout_4') - self.HeightAmendLabel = QtGui.QLabel(self.CurrentGroupBox_2) - self.HeightAmendLabel.setAlignment(QtCore.Qt.AlignCenter) - self.HeightAmendLabel.setObjectName(u'HeightAmendLabel') - self.verticalLayout_4.addWidget(self.HeightAmendLabel) - self.HeightEdit = QtGui.QLineEdit(self.CurrentGroupBox_2) - self.HeightEdit.setMaximumSize(QtCore.QSize(50, 16777215)) - self.HeightEdit.setMaxLength(4) - self.HeightEdit.setObjectName(u'HeightEdit') - self.verticalLayout_4.addWidget(self.HeightEdit) - self.horizontalLayout_2.addLayout(self.verticalLayout_4) - self.verticalLayout_5 = QtGui.QVBoxLayout() - self.verticalLayout_5.setSizeConstraint(QtGui.QLayout.SetMinimumSize) - self.verticalLayout_5.setObjectName(u'verticalLayout_5') - self.WidthAmendLabel = QtGui.QLabel(self.CurrentGroupBox_2) - self.WidthAmendLabel.setMaximumSize(QtCore.QSize(100, 16777215)) - self.WidthAmendLabel.setAlignment(QtCore.Qt.AlignCenter) - self.WidthAmendLabel.setObjectName(u'WidthAmendLabel') - self.verticalLayout_5.addWidget(self.WidthAmendLabel) - self.WidthEdit = QtGui.QLineEdit(self.CurrentGroupBox_2) - self.WidthEdit.setMaximumSize(QtCore.QSize(60, 16777215)) - self.WidthEdit.setObjectName(u'WidthEdit') - self.verticalLayout_5.addWidget(self.WidthEdit) - self.horizontalLayout_2.addLayout(self.verticalLayout_5) - self.verticalLayout.addWidget(self.CurrentGroupBox_2) - QtCore.QMetaObject.connectSlotsByName(self) - QtCore.QObject.connect(self.OverrideCheckBox, - QtCore.SIGNAL(u'stateChanged(int)'), self.onOverrideCheckBoxChanged) - - def retranslateUi(self): - """ - Provide i18n support for this UI - """ - self.setWindowTitle(translate('DisplayTab', 'Amend Display Settings')) - self.CurrentGroupBox.setTitle( - translate('DisplayTab', 'Default Settings')) - self.XLabel.setText(translate('DisplayTab', 'X')) - self.Xpos.setText(u'0') - self.YLabel.setText(translate('DisplayTab', 'Y')) - self.Ypos.setText(u'0') - self.HeightLabel.setText(translate('DisplayTab', 'Height')) - self.Height.setText(u'0') - self.WidthLabel.setText(translate('DisplayTab', 'Width')) - self.Width.setText(u'0') - self.CurrentGroupBox_2.setTitle( - translate('DisplayTab', 'Amend Settings')) - self.XAmendLabel.setText(translate('DisplayTab', 'X')) - self.YAmendLabel.setText(translate('DisplayTab', 'Y')) - self.HeightAmendLabel.setText(translate('DisplayTab', 'Height')) - self.WidthAmendLabel.setText(translate('DisplayTab', 'Width')) - self.OverrideCheckBox.setText( - translate('DisplayTab', 'Override Output Display')) - - def load(self): - """ - Load current display settings - """ - settings = QtCore.QSettings() - settings.beginGroup(self.settingsSection) - self.Xpos.setText(unicode(self.screens.current[u'size'].x())) - self.Ypos.setText(unicode(self.screens.current[u'size'].y())) - self.Height.setText(unicode(self.screens.current[u'size'].height())) - self.Width.setText(unicode(self.screens.current[u'size'].width())) - xpos = settings.value(u'x position', - QtCore.QVariant(self.screens.current[u'size'].x())).toString() - self.XposEdit.setText(xpos) - ypos = settings.value(u'y position', - QtCore.QVariant(self.screens.current[u'size'].y())).toString() - self.YposEdit.setText(ypos) - height = settings.value(u'height', - QtCore.QVariant(self.screens.current[u'size'].height())).toString() - self.HeightEdit.setText(height) - width = settings.value(u'width', - QtCore.QVariant(self.screens.current[u'size'].width())).toString() - self.WidthEdit.setText(width) - self.amend_display = settings.value(u'amend display', - QtCore.QVariant(False)).toBool() - self.OverrideCheckBox.setChecked(self.amend_display) - self.amend_display_start = self.amend_display - - def onOverrideCheckBoxChanged(self, check_state): - self.amend_display = False - # we have a set value convert to True/False - if check_state == QtCore.Qt.Checked: - self.amend_display = True - - def save(self): - """ - Save chosen settings - """ - settings = QtCore.QSettings() - settings.beginGroup(self.settingsSection) - settings.setValue('x position', QtCore.QVariant(self.XposEdit.text())) - settings.setValue('y position', QtCore.QVariant(self.YposEdit.text())) - settings.setValue('height', QtCore.QVariant(self.HeightEdit.text())) - settings.setValue('width', QtCore.QVariant(self.WidthEdit.text())) - settings.setValue('amend display', QtCore.QVariant(self.amend_display)) - self.postSetUp() - - def postSetUp(self): - self.screens.override[u'size'] = QtCore.QRect(int(self.XposEdit.text()), - int(self.YposEdit.text()), int(self.WidthEdit.text()), - int(self.HeightEdit.text())) - if self.amend_display: - self.screens.set_override_display() - else: - self.screens.reset_current_display() - #only trigger event if data has changed in this edit session - if self.amend_display_start != self.amend_display: - self.amend_display_start = self.amend_display - Receiver.send_message(u'config_screen_changed') diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 8988f1836..72718bb2c 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -233,8 +233,6 @@ class GeneralTab(SettingsTab): self.customXLabel.setObjectName(u'customXLabel') self.customXLayout.addWidget(self.customXLabel) self.customXValueEdit = QtGui.QLineEdit(self.displayGroupBox) - #self.customXValueEdit.setMaximumSize(QtCore.QSize(50, 16777215)) - #self.customXValueEdit.setMaxLength(4) self.customXValueEdit.setObjectName(u'customXValueEdit') self.customXLayout.addWidget(self.customXValueEdit) self.customLayout.addLayout(self.customXLayout) @@ -247,8 +245,6 @@ class GeneralTab(SettingsTab): self.customYLabel.setObjectName(u'customYLabel') self.customYLayout.addWidget(self.customYLabel) self.customYValueEdit = QtGui.QLineEdit(self.displayGroupBox) - #self.customYValueEdit.setMaximumSize(QtCore.QSize(50, 16777215)) - #self.customYValueEdit.setMaxLength(4) self.customYValueEdit.setObjectName(u'customYValueEdit') self.customYLayout.addWidget(self.customYValueEdit) self.customLayout.addLayout(self.customYLayout) @@ -261,8 +257,6 @@ class GeneralTab(SettingsTab): self.customHeightLabel.setObjectName(u'customHeightLabel') self.customHeightLayout.addWidget(self.customHeightLabel) self.customHeightValueEdit = QtGui.QLineEdit(self.displayGroupBox) - #self.customHeightValueEdit.setMaximumSize(QtCore.QSize(50, 16777215)) - #self.customHeightValueEdit.setMaxLength(4) self.customHeightValueEdit.setObjectName(u'customHeightValueEdit') self.customHeightLayout.addWidget(self.customHeightValueEdit) self.customLayout.addLayout(self.customHeightLayout) @@ -272,12 +266,10 @@ class GeneralTab(SettingsTab): self.customWidthLayout.setSizeConstraint(QtGui.QLayout.SetMinimumSize) self.customWidthLayout.setObjectName(u'customWidthLayout') self.customWidthLabel = QtGui.QLabel(self.displayGroupBox) - #self.customWidthLabel.setMaximumSize(QtCore.QSize(100, 16777215)) self.customWidthLabel.setAlignment(QtCore.Qt.AlignCenter) self.customWidthLabel.setObjectName(u'customWidthLabel') self.customWidthLayout.addWidget(self.customWidthLabel) self.customWidthValueEdit = QtGui.QLineEdit(self.displayGroupBox) - #self.customWidthValueEdit.setMaximumSize(QtCore.QSize(60, 16777215)) self.customWidthValueEdit.setObjectName(u'customWidthValueEdit') self.customWidthLayout.addWidget(self.customWidthValueEdit) self.customLayout.addLayout(self.customWidthLayout) diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index 55e5d6218..540568fb6 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -29,7 +29,7 @@ import logging from PyQt4 import QtGui -from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab #, DisplayTab +from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab from settingsdialog import Ui_SettingsDialog log = logging.getLogger(__name__) @@ -50,9 +50,6 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog): # Themes tab self.themesTab = ThemesTab(mainWindow) self.addTab(u'Themes', self.themesTab) - # Display tab - #self.DisplayTab = DisplayTab(screens) - #self.addTab(u'Display', self.DisplayTab) # Advanced tab self.advancedTab = AdvancedTab() self.addTab(u'Advanced', self.advancedTab)