From d0c6cf96394021bb3370b9478d76cb430996068b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 27 Apr 2010 20:59:44 +0100 Subject: [PATCH] move display to core --- openlp/core/ui/__init__.py | 1 + openlp/core/ui/generaltab.py | 2 +- openlp/core/ui/maindisplay.py | 3 +- openlp/core/ui/screen.py | 4 + openlp/core/ui/settingsform.py | 5 +- openlp/plugins/display/forms/displayform.py | 3 +- resources/forms/displaydialog.ui | 151 ---------- resources/forms/displaytab.ui | 295 ++++++++++++++++++++ 8 files changed, 309 insertions(+), 155 deletions(-) delete mode 100644 resources/forms/displaydialog.ui create mode 100644 resources/forms/displaytab.ui diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py index 675c57476..0c1ec731a 100644 --- a/openlp/core/ui/__init__.py +++ b/openlp/core/ui/__init__.py @@ -33,6 +33,7 @@ from maindisplay import DisplayManager from amendthemeform import AmendThemeForm from slidecontroller import SlideController from splashscreen import SplashScreen +from displaytab import DisplayTab from generaltab import GeneralTab from themestab import ThemesTab from aboutform import AboutForm diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index f7e87e879..75e06d691 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -172,7 +172,7 @@ class GeneralTab(SettingsTab): def retranslateUi(self): self.MonitorGroupBox.setTitle(self.trUtf8('Monitors')) self.MonitorLabel.setText(self.trUtf8('Select monitor for output display:')) - self.DisplayOnMonitorCheck.setText(self.trUtf8('Display if in single screen')) + self.DisplayOnMonitorCheck.setText(self.trUtf8('Display if a single screen')) self.StartupGroupBox.setTitle(self.trUtf8('Application Startup')) self.WarningCheckBox.setText(self.trUtf8('Show blank screen warning')) self.AutoOpenCheckBox.setText(self.trUtf8('Automatically open the last service')) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 6dfa7a83c..85db0ed12 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -214,7 +214,6 @@ class MainDisplay(DisplayWidget): def hideThemeDisplay(self): log.debug(u'hideDisplay') - a=c self.display_image.setPixmap(self.transparent) self.display_alert.setPixmap(self.transparent) self.display_text.setPixmap(self.transparent) @@ -336,6 +335,8 @@ class VideoDisplay(Phonon.VideoWidget): self.audioObject = Phonon.AudioOutput(Phonon.VideoCategory) Phonon.createPath(self.mediaObject, self) Phonon.createPath(self.mediaObject, self.audioObject) + self.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint \ + | QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog) QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'videodisplay_start'), self.onMediaQueue) QtCore.QObject.connect(Receiver.get_receiver(), diff --git a/openlp/core/ui/screen.py b/openlp/core/ui/screen.py index 19c4e01b5..0c8679205 100644 --- a/openlp/core/ui/screen.py +++ b/openlp/core/ui/screen.py @@ -80,6 +80,10 @@ class ScreenList(object): """ log.debug(u'set_override_display') self.current = copy.deepcopy(self.override) + print self.screen_list + print self.current + self.current[u'primary'] = True + print self.current self.preview = copy.deepcopy(self.current) def reset_current_display(self): diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index c86525a54..f923c9d7d 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -27,7 +27,7 @@ import logging from PyQt4 import QtGui -from openlp.core.ui import GeneralTab, ThemesTab +from openlp.core.ui import GeneralTab, ThemesTab, DisplayTab from settingsdialog import Ui_SettingsDialog log = logging.getLogger(__name__) @@ -43,6 +43,9 @@ 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) def addTab(self, name, tab): log.info(u'Adding %s tab' % tab.tabTitle) diff --git a/openlp/plugins/display/forms/displayform.py b/openlp/plugins/display/forms/displayform.py index b1ae02b0a..a7fa60b6e 100644 --- a/openlp/plugins/display/forms/displayform.py +++ b/openlp/plugins/display/forms/displayform.py @@ -44,7 +44,8 @@ class DisplayForm(QtGui.QDialog, Ui_DisplaysDialog): self.setupUi(self) def initialise(self): - self.Xpos.setText(unicode(self.screens.current[u'size'].x())) + xpos = int(self.config.get_config(u'x position', unicode(self.screens.current[u'size'].x()))) + self.Xpos.setText(xpos) 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())) diff --git a/resources/forms/displaydialog.ui b/resources/forms/displaydialog.ui deleted file mode 100644 index a8feb7842..000000000 --- a/resources/forms/displaydialog.ui +++ /dev/null @@ -1,151 +0,0 @@ - - - DisplaysDialog - - - - 0 - 0 - 327 - 224 - - - - Amend Display Settings - - - - - 210 - 200 - 97 - 24 - - - - Ok - - - - - - 10 - 0 - 301 - 191 - - - - - - - Default Settings - - - - - 20 - 30 - 261 - 17 - - - - - - - 0 - - - Qt::AlignCenter - - - - - - - 0 - - - Qt::AlignCenter - - - - - - - 0 - - - Qt::AlignCenter - - - - - - - 0 - - - Qt::AlignCenter - - - - - - - - - - - Amend Settings - - - - - 20 - 30 - 261 - 27 - - - - - - - - - - - - - - - - - - - - - - - - - - OkpushButton - pressed() - DisplaysDialog - close() - - - 258 - 211 - - - 163 - 111 - - - - - diff --git a/resources/forms/displaytab.ui b/resources/forms/displaytab.ui new file mode 100644 index 000000000..7d2d78798 --- /dev/null +++ b/resources/forms/displaytab.ui @@ -0,0 +1,295 @@ + + + DisplaysDialog + + + + 0 + 0 + 620 + 716 + + + + Amend Display Settings + + + + + 0 + 40 + 241 + 79 + + + + + + + Default Settings + + + + + + + + X + + + Qt::AlignCenter + + + + + + + 0 + + + Qt::AlignCenter + + + + + + + + + + + Y + + + Qt::AlignCenter + + + + + + + 0 + + + Qt::AlignCenter + + + + + + + + + + + + 100 + 16777215 + + + + Height + + + Qt::AlignCenter + + + + + + + 0 + + + Qt::AlignCenter + + + + + + + + + + + Width + + + Qt::AlignCenter + + + + + + + 0 + + + Qt::AlignCenter + + + + + + + + + + + + + + 0 + 130 + 248 + 87 + + + + + 500 + 16777215 + + + + Amend Settings + + + + + + + + X + + + Qt::AlignCenter + + + + + + + + 50 + 16777215 + + + + 4 + + + + + + + + + + + Y + + + Qt::AlignCenter + + + + + + + + 50 + 16777215 + + + + 4 + + + + + + + + + + + Height + + + Qt::AlignCenter + + + + + + + + 50 + 16777215 + + + + 4 + + + + + + + + + QLayout::SetMinimumSize + + + + + + 100 + 16777215 + + + + Width + + + Qt::AlignCenter + + + + + + + + 60 + 16777215 + + + + + + + + layoutWidget + YAmendLabel + HeightAmendLabel + WidthAmendLabel + YAmendLabel + + + + + 0 + 10 + 191 + 23 + + + + Override Output Display + + + + + +