diff --git a/openlp/core/ui/screen.py b/openlp/core/ui/screen.py
index 0c8679205..19c4e01b5 100644
--- a/openlp/core/ui/screen.py
+++ b/openlp/core/ui/screen.py
@@ -80,10 +80,6 @@ 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/plugins/display/__init__.py b/openlp/plugins/display/__init__.py
deleted file mode 100644
index 1a348a0df..000000000
--- a/openlp/plugins/display/__init__.py
+++ /dev/null
@@ -1,24 +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 #
-###############################################################################
diff --git a/openlp/plugins/display/displaysplugin.py b/openlp/plugins/display/displaysplugin.py
deleted file mode 100644
index d55e1a27b..000000000
--- a/openlp/plugins/display/displaysplugin.py
+++ /dev/null
@@ -1,122 +0,0 @@
-from openlp.plugins.alerts.forms import AlertsTab, AlertForm# -*- 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 datetime import datetime
-import logging
-
-from PyQt4 import QtCore, QtGui
-
-from openlp.core.lib import Plugin, Receiver, str_to_bool, build_icon
-from openlp.plugins.display.forms import DisplayForm
-
-log = logging.getLogger(__name__)
-
-class DisplayPlugin(Plugin):
- log.info(u'Display Plugin loaded')
-
- def __init__(self, plugin_helpers):
- Plugin.__init__(self, u'Display', u'1.9.1', plugin_helpers)
- self.weight = -2
- self.icon = build_icon(u':/media/media_image.png')
-
- def add_tools_menu_item(self, tools_menu):
- """
- Give the Display plugin the opportunity to add items to the
- **Tools** menu.
-
- ``tools_menu``
- The actual **Tools** menu item, so that your actions can
- use it as their parent.
- """
- log.info(u'add tools menu')
- self.toolsMenu = tools_menu
- self.DisplayMenu = QtGui.QMenu(tools_menu)
- self.DisplayMenu.setObjectName(u'DisplayMenu')
- self.DisplayMenu.setTitle(tools_menu.trUtf8('&Override Display'))
- #Display Delete
- self.DisplayOverride = QtGui.QAction(tools_menu)
- self.DisplayOverride.setText(
- tools_menu.trUtf8('&Change Display Attributes'))
- self.DisplayOverride.setStatusTip(
- tools_menu.trUtf8('Amend the display attributes'))
- self.DisplayOverride.setObjectName(u'DisplayOverride')
- #Display activation
- DisplayIcon = build_icon(u':/tools/tools_alert.png')
- self.DisplayStatus = QtGui.QAction(tools_menu)
- self.DisplayStatus.setIcon(DisplayIcon)
- self.DisplayStatus.setCheckable(True)
- self.DisplayStatus.setChecked(False)
- self.DisplayStatus.setText(tools_menu.trUtf8('Use Display Override'))
- self.DisplayStatus.setStatusTip(
- tools_menu.trUtf8('Change start/stop using Display Override'))
- self.DisplayStatus.setShortcut(u'FX')
- self.DisplayStatus.setObjectName(u'DisplayStatus')
- #Add Menus together
- self.toolsMenu.addAction(self.DisplayMenu.menuAction())
- self.DisplayMenu.addAction(self.DisplayStatus)
- self.DisplayMenu.addSeparator()
- self.DisplayMenu.addAction(self.DisplayOverride)
- # Signals and slots
- QtCore.QObject.connect(self.DisplayStatus,
- QtCore.SIGNAL(u'visibilityChanged(bool)'),
- self.DisplayStatus.setChecked)
- QtCore.QObject.connect(self.DisplayStatus,
- QtCore.SIGNAL(u'triggered(bool)'),
- self.toggleDisplayState)
- QtCore.QObject.connect(self.DisplayOverride,
- QtCore.SIGNAL(u'triggered()'), self.onDisplayOverride)
- self.DisplayMenu.menuAction().setVisible(False)
-
- def initialise(self):
- log.info(u'Display Initialising')
- Plugin.initialise(self)
- self.DisplayStatus.setChecked(False)
- self.screens = self.maindisplay.screens
- self.displayform = DisplayForm(self, self.screens)
- self.DisplayMenu.menuAction().setVisible(True)
-
- def finalise(self):
- log.info(u'Plugin Finalise')
- self.DisplayMenu.menuAction().setVisible(False)
-
- def toggleDisplayState(self):
- log.info(u'toggleDisplayState')
- if self.DisplayStatus.isChecked():
- self.screens.set_override_display()
- else:
- self.screens.reset_current_display()
- Receiver.send_message(u'config_screen_changed')
-
- def onDisplayOverride(self):
- self.displayform.initialise()
- self.displayform.exec_()
- if self.DisplayStatus.isChecked():
- Receiver.send_message(u'config_screen_changed')
-
- def about(self):
- about_text = self.trUtf8('Display Plugin
This plugin '
- 'allows the dimensions of the live display to be changed.\n'
- 'These changes are not stored.')
- return about_text
diff --git a/openlp/plugins/display/forms/__init__.py b/openlp/plugins/display/forms/__init__.py
deleted file mode 100644
index e6a60c3a2..000000000
--- a/openlp/plugins/display/forms/__init__.py
+++ /dev/null
@@ -1,26 +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 displayform import DisplayForm
diff --git a/openlp/plugins/display/forms/displaydialog.py b/openlp/plugins/display/forms/displaydialog.py
deleted file mode 100644
index 8c145b73f..000000000
--- a/openlp/plugins/display/forms/displaydialog.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'displaydialog.ui'
-#
-# Created: Sat Apr 24 17:20:48 2010
-# by: PyQt4 UI code generator 4.7.2
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_DisplaysDialog(object):
- def setupUi(self, DisplaysDialog):
- DisplaysDialog.setObjectName("DisplaysDialog")
- DisplaysDialog.resize(327, 224)
- self.OkpushButton = QtGui.QPushButton(DisplaysDialog)
- self.OkpushButton.setGeometry(QtCore.QRect(210, 200, 97, 24))
- self.OkpushButton.setObjectName("OkpushButton")
- self.widget = QtGui.QWidget(DisplaysDialog)
- self.widget.setGeometry(QtCore.QRect(10, 0, 301, 191))
- self.widget.setObjectName("widget")
- self.verticalLayout = QtGui.QVBoxLayout(self.widget)
- self.verticalLayout.setObjectName("verticalLayout")
- self.CurrentGroupBox = QtGui.QGroupBox(self.widget)
- self.CurrentGroupBox.setObjectName("CurrentGroupBox")
- self.layoutWidget = QtGui.QWidget(self.CurrentGroupBox)
- self.layoutWidget.setGeometry(QtCore.QRect(20, 30, 261, 17))
- self.layoutWidget.setObjectName("layoutWidget")
- self.horizontalLayout = QtGui.QHBoxLayout(self.layoutWidget)
- self.horizontalLayout.setObjectName("horizontalLayout")
- self.Xpos = QtGui.QLabel(self.layoutWidget)
- self.Xpos.setAlignment(QtCore.Qt.AlignCenter)
- self.Xpos.setObjectName("Xpos")
- self.horizontalLayout.addWidget(self.Xpos)
- self.Ypos = QtGui.QLabel(self.layoutWidget)
- self.Ypos.setAlignment(QtCore.Qt.AlignCenter)
- self.Ypos.setObjectName("Ypos")
- self.horizontalLayout.addWidget(self.Ypos)
- self.Height = QtGui.QLabel(self.layoutWidget)
- self.Height.setAlignment(QtCore.Qt.AlignCenter)
- self.Height.setObjectName("Height")
- self.horizontalLayout.addWidget(self.Height)
- self.Width = QtGui.QLabel(self.layoutWidget)
- self.Width.setAlignment(QtCore.Qt.AlignCenter)
- self.Width.setObjectName("Width")
- self.horizontalLayout.addWidget(self.Width)
- self.verticalLayout.addWidget(self.CurrentGroupBox)
- self.CurrentGroupBox_2 = QtGui.QGroupBox(self.widget)
- self.CurrentGroupBox_2.setObjectName("CurrentGroupBox_2")
- self.layoutWidget1 = QtGui.QWidget(self.CurrentGroupBox_2)
- self.layoutWidget1.setGeometry(QtCore.QRect(20, 30, 261, 27))
- self.layoutWidget1.setObjectName("layoutWidget1")
- self.horizontalLayout_2 = QtGui.QHBoxLayout(self.layoutWidget1)
- self.horizontalLayout_2.setObjectName("horizontalLayout_2")
- self.XposEdit = QtGui.QLineEdit(self.layoutWidget1)
- self.XposEdit.setObjectName("XposEdit")
- self.horizontalLayout_2.addWidget(self.XposEdit)
- self.YposEdit = QtGui.QLineEdit(self.layoutWidget1)
- self.YposEdit.setObjectName("YposEdit")
- self.horizontalLayout_2.addWidget(self.YposEdit)
- self.HeightEdit = QtGui.QLineEdit(self.layoutWidget1)
- self.HeightEdit.setObjectName("HeightEdit")
- self.horizontalLayout_2.addWidget(self.HeightEdit)
- self.WidthEdit = QtGui.QLineEdit(self.layoutWidget1)
- self.WidthEdit.setObjectName("WidthEdit")
- self.horizontalLayout_2.addWidget(self.WidthEdit)
- self.verticalLayout.addWidget(self.CurrentGroupBox_2)
-
- self.retranslateUi(DisplaysDialog)
- QtCore.QObject.connect(self.OkpushButton, QtCore.SIGNAL("pressed()"), DisplaysDialog.close)
- QtCore.QMetaObject.connectSlotsByName(DisplaysDialog)
-
- def retranslateUi(self, DisplaysDialog):
- DisplaysDialog.setWindowTitle(QtGui.QApplication.translate("DisplaysDialog", "Amend Display Settings", None, QtGui.QApplication.UnicodeUTF8))
- self.OkpushButton.setText(QtGui.QApplication.translate("DisplaysDialog", "Ok", None, QtGui.QApplication.UnicodeUTF8))
- self.CurrentGroupBox.setTitle(QtGui.QApplication.translate("DisplaysDialog", "Default Settings", None, QtGui.QApplication.UnicodeUTF8))
- self.Xpos.setText(QtGui.QApplication.translate("DisplaysDialog", "0", None, QtGui.QApplication.UnicodeUTF8))
- self.Ypos.setText(QtGui.QApplication.translate("DisplaysDialog", "0", None, QtGui.QApplication.UnicodeUTF8))
- self.Height.setText(QtGui.QApplication.translate("DisplaysDialog", "0", None, QtGui.QApplication.UnicodeUTF8))
- self.Width.setText(QtGui.QApplication.translate("DisplaysDialog", "0", None, QtGui.QApplication.UnicodeUTF8))
- self.CurrentGroupBox_2.setTitle(QtGui.QApplication.translate("DisplaysDialog", "Amend Settings", None, QtGui.QApplication.UnicodeUTF8))
-
diff --git a/openlp/plugins/display/forms/displayform.py b/openlp/plugins/display/forms/displayform.py
deleted file mode 100644
index a7fa60b6e..000000000
--- a/openlp/plugins/display/forms/displayform.py
+++ /dev/null
@@ -1,61 +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.plugins.alerts.lib.models import AlertItem
-
-from displaydialog import Ui_DisplaysDialog
-
-class DisplayForm(QtGui.QDialog, Ui_DisplaysDialog):
- """
- Class documentation goes here.
- """
- def __init__(self, parent, screens):
- """
- Constructor
- """
- self.parent = parent
- self.screens = screens
- self.item_id = None
- QtGui.QDialog.__init__(self, None)
- self.setupUi(self)
-
- def initialise(self):
- 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()))
- self.XposEdit.setText(unicode(self.screens.override[u'size'].x()))
- self.YposEdit.setText(unicode(self.screens.override[u'size'].y()))
- self.HeightEdit.setText(unicode(self.screens.override[u'size'].height()))
- self.WidthEdit.setText(unicode(self.screens.override[u'size'].width()))
-
- def close(self):
- self.screens.override[u'size'] = QtCore.QRect(int(self.XposEdit.text()),\
- int(self.YposEdit.text()), int(self.WidthEdit.text()),\
- int(self.HeightEdit.text()))
- return QtGui.QDialog.close(self)