OpenLP

Merge lp:~raoul-snyman/openlp/dualdisplay into lp:openlp

  1. dualdisplay
  2. Merge into trunk
Proposed by Raoul Snyman
Status: Merged
Approved by: Raoul Snyman
Approved revision: 435
Merge reported by: Raoul Snyman
Merged at revision: not available
Proposed branch: lp:~raoul-snyman/openlp/dualdisplay
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~raoul-snyman/openlp/dualdisplay
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Michael Gorven (community) Approve
Review via email: mp+6086@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Gorven (mgorven) wrote :

+ screen_name = translate(u'GeneralTab', u'Screen') + u' ' + \
+ str(screen['number'] + 1)
+ if screen['primary']:
+ screen_name = screen_name + u' (' + \
+ translate(u'GeneralTab', u'primary') + u')'

String interpolation would make this a bit neater.
 review approve

review: Approve
Revision history for this message
Tim Bentley (trb143) wrote :

Looks fine to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openlp.pyw'
--- openlp.pyw 2009-04-28 19:40:51 +0000
+++ openlp.pyw 2009-05-01 11:50:09 +0000
@@ -52,9 +52,11 @@
52 self.processEvents()52 self.processEvents()
53 screens = []53 screens = []
54 # Decide how many screens we have and their size54 # Decide how many screens we have and their size
55 for screen in xrange (0 , self.desktop().numScreens()):55 for screen in xrange(0, self.desktop().numScreens()):
56 screens.insert(screen, (screen+1, self.desktop().availableGeometry(screen+1)))56 screens.append({u'number': screen,
57 log.info(u'Screen %d found with resolution %s', screen+1, self.desktop().availableGeometry(screen+1))57 u'size': self.desktop().availableGeometry(screen),
58 u'primary': (self.desktop().primaryScreen() == screen)})
59 log.info(u'Screen %d found with resolution %s', screen, self.desktop().availableGeometry(screen))
58 # start the main app window60 # start the main app window
59 self.main_window = MainWindow(screens)61 self.main_window = MainWindow(screens)
60 self.main_window.show()62 self.main_window.show()
6163
=== modified file 'openlp/core/lib/rendermanager.py'
--- openlp/core/lib/rendermanager.py 2009-04-25 06:38:21 +0000
+++ openlp/core/lib/rendermanager.py 2009-05-01 11:50:09 +0000
@@ -38,9 +38,9 @@
38 self.screen_list = screen_list38 self.screen_list = screen_list
39 self.theme_manager = theme_manager39 self.theme_manager = theme_manager
40 self.displays = len(screen_list)40 self.displays = len(screen_list)
41 self.current_display = 141 self.current_display = 0
42 self.renderer = Renderer(None)42 self.renderer = Renderer(None)
43 self.calculate_default(self.screen_list[self.current_display-1][1])43 self.calculate_default(self.screen_list[self.current_display]['size'])
44 self.frame = None44 self.frame = None
4545
46 def set_default_theme(self, theme):46 def set_default_theme(self, theme):
4747
=== modified file 'openlp/core/lib/settingstab.py'
--- openlp/core/lib/settingstab.py 2009-04-15 04:58:51 +0000
+++ openlp/core/lib/settingstab.py 2009-05-01 11:50:09 +0000
@@ -33,26 +33,51 @@
33 self.tabTitle = title33 self.tabTitle = title
34 self.setupUi()34 self.setupUi()
35 self.retranslateUi()35 self.retranslateUi()
36 self.initialise()
36 if title == None:37 if title == None:
37 self.config = PluginConfig(u"Main")38 self.config = PluginConfig(u'Main')
38 else:39 else:
39 self.config = PluginConfig(str(title))40 self.config = PluginConfig(str(title))
40 self.load()41 self.load()
4142
42 def setTitle(self, title):43 def setTitle(self, title):
44 """
45 Set the title of the tab.
46 """
43 self.tabTitle = title47 self.tabTitle = title
4448
45 def title(self):49 def title(self):
50 """
51 Get the title of the tab.
52 """
46 return self.tabTitle53 return self.tabTitle
4754
48 def setupUi(self):55 def setupUi(self):
56 """
57 Setup the tab's interface.
58 """
49 pass59 pass
5060
51 def retranslateUi(self):61 def retranslateUi(self):
62 """
63 Setup the interface translation strings.
64 """
65 pass
66
67 def initialise(self):
68 """
69 Do any extra initialisation here.
70 """
52 pass71 pass
5372
54 def load(self):73 def load(self):
74 """
75 Load settings from disk.
76 """
55 pass77 pass
5678
57 def save(self):79 def save(self):
80 """
81 Save settings to disk.
82 """
58 pass83 pass
5984
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2009-04-10 05:59:40 +0000
+++ openlp/core/ui/generaltab.py 2009-05-01 11:50:09 +0000
@@ -29,8 +29,8 @@
29 GeneralTab is the general settings tab in the settings dialog.29 GeneralTab is the general settings tab in the settings dialog.
30 """30 """
31 def __init__(self, screen_list):31 def __init__(self, screen_list):
32 self.screen_list = screen_list
32 SettingsTab.__init__(self, translate(u'GeneralTab', u'General'))33 SettingsTab.__init__(self, translate(u'GeneralTab', u'General'))
33 self.screen_list = screen_list
3434
35 def setupUi(self):35 def setupUi(self):
36 self.setObjectName(u'GeneralTab')36 self.setObjectName(u'GeneralTab')
@@ -55,8 +55,6 @@
55 self.MonitorLayout.addWidget(self.MonitorLabel)55 self.MonitorLayout.addWidget(self.MonitorLabel)
56 self.MonitorComboBox = QtGui.QComboBox(self.MonitorGroupBox)56 self.MonitorComboBox = QtGui.QComboBox(self.MonitorGroupBox)
57 self.MonitorComboBox.setObjectName(u'MonitorComboBox')57 self.MonitorComboBox.setObjectName(u'MonitorComboBox')
58 self.MonitorComboBox.addItem(QtCore.QString())
59 self.MonitorComboBox.addItem(QtCore.QString())
60 self.MonitorLayout.addWidget(self.MonitorComboBox)58 self.MonitorLayout.addWidget(self.MonitorComboBox)
61 self.GeneralLeftLayout.addWidget(self.MonitorGroupBox)59 self.GeneralLeftLayout.addWidget(self.MonitorGroupBox)
62 self.BlankScreenGroupBox = QtGui.QGroupBox(self.GeneralLeftWidget)60 self.BlankScreenGroupBox = QtGui.QGroupBox(self.GeneralLeftWidget)
@@ -121,8 +119,6 @@
121 def retranslateUi(self):119 def retranslateUi(self):
122 self.MonitorGroupBox.setTitle(translate(u'GeneralTab', u'Monitors'))120 self.MonitorGroupBox.setTitle(translate(u'GeneralTab', u'Monitors'))
123 self.MonitorLabel.setText(translate(u'GeneralTab', u'Select monitor for output display:'))121 self.MonitorLabel.setText(translate(u'GeneralTab', u'Select monitor for output display:'))
124 self.MonitorComboBox.setItemText(0, translate(u'GeneralTab', u'Monitor 1 on X11 Windowing System'))
125 self.MonitorComboBox.setItemText(1, translate(u'GeneralTab', u'Monitor 2 on X11 Windowing System'))
126 self.BlankScreenGroupBox.setTitle(translate(u'GeneralTab', u'Blank Screen'))122 self.BlankScreenGroupBox.setTitle(translate(u'GeneralTab', u'Blank Screen'))
127 self.WarningCheckBox.setText(translate(u'GeneralTab', u'Show warning on startup'))123 self.WarningCheckBox.setText(translate(u'GeneralTab', u'Show warning on startup'))
128 self.AutoOpenGroupBox.setTitle(translate(u'GeneralTab', u'Auto Open Last Service'))124 self.AutoOpenGroupBox.setTitle(translate(u'GeneralTab', u'Auto Open Last Service'))
@@ -132,3 +128,11 @@
132 self.UsernameLabel.setText(translate(u'GeneralTab', u'SongSelect Username:'))128 self.UsernameLabel.setText(translate(u'GeneralTab', u'SongSelect Username:'))
133 self.PasswordLabel.setText(translate(u'GeneralTab', u'SongSelect Password:'))129 self.PasswordLabel.setText(translate(u'GeneralTab', u'SongSelect Password:'))
134130
131 def initialise(self):
132 for screen in self.screen_list:
133 screen_name = translate(u'GeneralTab', u'Screen') + u' ' + \
134 str(screen['number'] + 1)
135 if screen['primary']:
136 screen_name = screen_name + u' (' + \
137 translate(u'GeneralTab', u'primary') + u')'
138 self.MonitorComboBox.addItem(screen_name)
135139
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2009-04-28 19:40:51 +0000
+++ openlp/core/ui/maindisplay.py 2009-05-01 11:50:09 +0000
@@ -24,32 +24,35 @@
2424
25class MainDisplay(QtGui.QWidget):25class MainDisplay(QtGui.QWidget):
2626
27 def __init__(self, screens, parent=None):27 def __init__(self, parent, screens):
28 QtGui.QWidget.__init__(self, parent)28 QtGui.QWidget.__init__(self, parent)
29 self.setWindowTitle(u'OpenLP Display')29 self.setWindowTitle(u'OpenLP Display')
30 self.screens = screens30 self.screens = screens
31 self.imagesize = screens[0][1]31 self.display = QtGui.QLabel(self)
32 self.display = QtGui.QLabel(self)
33 #self.showMinimized()
3432
35 def initialView(self):33 def setup(self, screenNumber):
36 self.display.setGeometry((self.imagesize.width()-429)/2, (self.imagesize.height()-429)/2, 429, 429)34 """
37 self.display.setPixmap(QtGui.QPixmap("openlp2.png"))35 Sets up the screen on a particular screen.
38 self.showMaximized()36 @param (integer) screen This is the screen number.
39 print len(self.screens)37 """
40 print self.isEnabled()38 screen = self.screens[screenNumber]
41 print self.isVisible()39 if screen['number'] != screenNumber:
42 print self.geometry()40 # We will most probably never actually hit this bit, but just in
43 #if len(self.screens) > 0:41 # case the index in the list doesn't match the screen number, we
42 # search for it.
43 for scrn in self.screens:
44 if scrn['number'] == screenNumber:
45 screen = scrn
46 break
47 self.setGeometry(screen['size'])
48 if not screen['primary']:
44 self.showFullScreen()49 self.showFullScreen()
45 self.show()50 else:
51 self.hide()
4652
47 def frameView(self, frame):53 def frameView(self, frame):
48 self.display.setGeometry(0, 0, imagesize.width(), imagesize.height())54 self.display.setGeometry(0, 0, imagesize.width(), imagesize.height())
49 self.display.setPixmap(QtGui.QPixmap(frame))55 self.display.setPixmap(QtGui.QPixmap(frame))
5056
51 def kill(self):57 def kill(self):
52 pass58 pass
53
54
55
5659
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2009-04-28 19:20:03 +0000
+++ openlp/core/ui/mainwindow.py 2009-05-01 12:32:08 +0000
@@ -37,7 +37,7 @@
3737
38 def __init__(self, screens):38 def __init__(self, screens):
39 self.main_window = QtGui.QMainWindow()39 self.main_window = QtGui.QMainWindow()
40 self.main_display = MainDisplay(screens, self.main_window)40 self.main_display = MainDisplay(None, screens)
41 self.screen_list = screens41 self.screen_list = screens
42 self.EventManager = EventManager()42 self.EventManager = EventManager()
43 self.alert_form = AlertForm()43 self.alert_form = AlertForm()
@@ -421,7 +421,7 @@
421421
422 def show(self):422 def show(self):
423 self.main_window.showMaximized()423 self.main_window.showMaximized()
424 self.main_display.initialView()424 self.main_display.setup(0)
425 self.main_display.show()425 self.main_display.show()
426426
427 def onHelpAboutItemClicked(self):427 def onHelpAboutItemClicked(self):
428428
=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py 2009-04-09 18:50:20 +0000
+++ openlp/core/ui/settingsform.py 2009-05-01 11:50:09 +0000
@@ -29,7 +29,7 @@
2929
30log = logging.getLogger('SettingsForm')30log = logging.getLogger('SettingsForm')
3131
32class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):32class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
3333
34 def __init__(self, screen_list, parent=None):34 def __init__(self, screen_list, parent=None):
35 QtGui.QDialog.__init__(self, parent)35 QtGui.QDialog.__init__(self, parent)