forked from openlp/openlp
change screen size when the screen resolution changes (only when the user does not override the screen); reload settings when screen resolution changed or a new screen has been detected
This commit is contained in:
parent
86eb34ae1c
commit
4792a73bb4
34
openlp.pyw
34
openlp.pyw
@ -24,7 +24,7 @@
|
||||
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
||||
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||
###############################################################################
|
||||
|
||||
import copy
|
||||
import os
|
||||
import sys
|
||||
import logging
|
||||
@ -168,6 +168,8 @@ class OpenLP(QtGui.QApplication):
|
||||
QtCore.SIGNAL(u'cursor_normal'), self.setNormalCursor)
|
||||
QtCore.QObject.connect(self.desktop(),
|
||||
QtCore.SIGNAL(u'screenCountChanged(int)'), self.updateScreenList)
|
||||
QtCore.QObject.connect(self.desktop(),
|
||||
QtCore.SIGNAL(u'resized(int)'), self.updateScreenList)
|
||||
self.setOrganizationName(u'OpenLP')
|
||||
self.setOrganizationDomain(u'openlp.org')
|
||||
self.setApplicationName(u'OpenLP')
|
||||
@ -228,27 +230,33 @@ class OpenLP(QtGui.QApplication):
|
||||
Called when the list of screens has to be updated.
|
||||
|
||||
``applicationStart``
|
||||
Should be ``True`` when starting the application, otherwise
|
||||
``False``.
|
||||
``True`` when starting the application, otherwise ``False``.
|
||||
"""
|
||||
for screen in copy.deepcopy(self.screens.screen_list):
|
||||
# Remove unplugged screens.
|
||||
if screen[u'number'] == self.desktop().numScreens():
|
||||
self.screens.remove_screen(screen[u'number'])
|
||||
else:
|
||||
# Check if the screen has changed.
|
||||
temp_screen = {
|
||||
u'number': screen[u'number'],
|
||||
u'size': self.desktop().screenGeometry(screen[u'number']),
|
||||
u'primary':
|
||||
(self.desktop().primaryScreen() == screen[u'number'])
|
||||
}
|
||||
if temp_screen != screen:
|
||||
self.screens.update_screen(temp_screen)
|
||||
# Add new screens.
|
||||
for number in xrange(0, self.desktop().numScreens()):
|
||||
if not self.screens.screen_exists(number):
|
||||
size = self.desktop().screenGeometry(number)
|
||||
self.screens.add_screen({
|
||||
u'number': number,
|
||||
u'size': size,
|
||||
u'size': self.desktop().screenGeometry(number),
|
||||
u'primary': (self.desktop().primaryScreen() == number)
|
||||
})
|
||||
log.info(u'Screen %d found with resolution %s', number, size)
|
||||
# Remove unplugged screens.
|
||||
for screen in self.screens.screen_list:
|
||||
if screen[u'number'] > self.desktop().numScreens():
|
||||
self.screens.remove_screen(screen)
|
||||
log.info(u'Screen %d removed' % creen[u'number'])
|
||||
if not applicationStart:
|
||||
pass
|
||||
# TODO: Refresh settings.
|
||||
# Reload setting tabs to apply possible changes.
|
||||
self.mainWindow.settingsForm.reload()
|
||||
# TODO: Make the new (second) monitor the live display.
|
||||
|
||||
def main():
|
||||
|
@ -30,6 +30,8 @@ displays.
|
||||
import logging
|
||||
import copy
|
||||
|
||||
from openlp.core.lib import Receiver
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
class ScreenList(object):
|
||||
@ -39,6 +41,8 @@ class ScreenList(object):
|
||||
log.info(u'Screen loaded')
|
||||
|
||||
def __init__(self):
|
||||
# The screen used for the rendermanager.
|
||||
# (Why does the rendermanager needs his own?)
|
||||
self.preview = None
|
||||
self.current = None
|
||||
self.override = None
|
||||
@ -61,14 +65,43 @@ class ScreenList(object):
|
||||
u'number': 0,
|
||||
u'size': PyQt4.QtCore.QRect(0, 0, 1024, 768)
|
||||
}
|
||||
|
||||
"""
|
||||
print u'add screen: %s' % screen
|
||||
log.info(u'Screen %d found with resolution %s',
|
||||
screen[u'number'], screen[u'size'])
|
||||
if screen[u'primary']:
|
||||
self.current = screen
|
||||
self.screen_list.append(screen)
|
||||
self.display_count += 1
|
||||
|
||||
def update_screen(self, newScreen):
|
||||
"""
|
||||
Adjusts the screen's properties in the ``screen_list`` to the properties
|
||||
of the given screen.
|
||||
|
||||
``newScreen``
|
||||
A dict with the new properties of the screen::
|
||||
|
||||
{
|
||||
u'primary': True,
|
||||
u'number': 0,
|
||||
u'size': PyQt4.QtCore.QRect(0, 0, 1024, 768)
|
||||
}
|
||||
"""
|
||||
print u'update_screen %s' % newScreen[u'number']
|
||||
log.info(u'update_screen %d' % newScreen[u'number'])
|
||||
for oldScreen in self.screen_list:
|
||||
if newScreen[u'number'] == oldScreen[u'number']:
|
||||
self.remove_screen(oldScreen[u'number'])
|
||||
self.add_screen(newScreen)
|
||||
# The screen's default size is used, that is why we have to
|
||||
# update the override screen.
|
||||
if oldScreen == self.override:
|
||||
self.override = copy.deepcopy(newScreen)
|
||||
self.set_override_display()
|
||||
Receiver.send_message(u'config_screen_changed')
|
||||
break
|
||||
|
||||
def remove_screen(self, number):
|
||||
"""
|
||||
Remove a screen from the list of known screens.
|
||||
@ -76,9 +109,10 @@ class ScreenList(object):
|
||||
``number``
|
||||
The screen number (int).
|
||||
"""
|
||||
print u'remove screen %s' % number
|
||||
log.info(u'remove_screen %d' % number)
|
||||
for screen in self.screen_list:
|
||||
if screen[u'number'] == number:
|
||||
print u'remove screen %s' % number
|
||||
self.screen_list.remove(screen)
|
||||
self.display_count -= 1
|
||||
break
|
||||
@ -92,9 +126,7 @@ class ScreenList(object):
|
||||
"""
|
||||
for screen in self.screen_list:
|
||||
if screen[u'number'] == number:
|
||||
print u'screen %s exists' % number
|
||||
return True
|
||||
print u'screen %s does not exist' % number
|
||||
return False
|
||||
|
||||
def set_current_display(self, number):
|
||||
|
@ -107,3 +107,12 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
|
||||
"""
|
||||
for tabIndex in range(0, self.settingsTabWidget.count()):
|
||||
self.settingsTabWidget.widget(tabIndex).postSetUp()
|
||||
|
||||
def reload(self):
|
||||
"""
|
||||
Reload all tabs to update settings which have been changed and are
|
||||
outside of our scope.
|
||||
"""
|
||||
print u'reload'
|
||||
for tabIndex in range(0, self.settingsTabWidget.count()):
|
||||
self.settingsTabWidget.widget(tabIndex).load()
|
||||
|
Loading…
Reference in New Issue
Block a user