[Openlp-core] [Merge] lp:~trb143/openlp/fixes into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/fixes into lp:openlp. Requested reviews: Jon Tibble (meths) Fix remote song editing generation of error messages -- https://code.launchpad.net/~trb143/openlp/fixes/+merge/14433 Your team OpenLP Core is subscribed to branch lp:openlp. === modified file 'openlp/core/lib/mediamanageritem.py' --- openlp/core/lib/mediamanageritem.py 2009-11-03 01:12:35 + +++ openlp/core/lib/mediamanageritem.py 2009-11-04 18:15:24 + @@ -24,7 +24,6 @@ import types import os -import uuid from PyQt4 import QtCore, QtGui @@ -113,6 +112,7 @@ if title is not None: self.title = title self.Toolbar = None +self.remoteTriggered = None self.ServiceItemIconName = None self.PageLayout = QtGui.QVBoxLayout(self) self.PageLayout.setSpacing(0) @@ -358,13 +358,13 @@ u'to be defined by the plugin') def onPreviewClick(self): -if not self.ListView.selectedIndexes(): +if not self.ListView.selectedIndexes() and not self.remoteTriggered: QtGui.QMessageBox.information(self, self.trUtf8(u'No items selected...'), self.trUtf8(u'You must select one or more items')) log.debug(self.PluginNameShort + u' Preview Requested') service_item = self.buildServiceItem() -if service_item is not None: +if service_item: service_item.fromPlugin = True self.parent.preview_controller.addServiceItem(service_item) @@ -375,21 +375,20 @@ self.trUtf8(u'You must select one or more items')) log.debug(self.PluginNameShort + u' Live Requested') service_item = self.buildServiceItem() -if service_item is not None: +if service_item: service_item.fromPlugin = True service_item.uuid = unicode(uuid.uuid1()) self.parent.live_controller.addServiceItem(service_item) def onAddClick(self): -if not self.ListView.selectedIndexes(): +if not self.ListView.selectedIndexes() and not self.remoteTriggered: QtGui.QMessageBox.information(self, self.trUtf8(u'No items selected...'), self.trUtf8(u'You must select one or more items')) log.debug(self.PluginNameShort + u' Add Requested') service_item = self.buildServiceItem() -if service_item is not None: +if service_item: service_item.fromPlugin = False -service_item.uuid = unicode(uuid.uuid1()) self.parent.service_manager.addServiceItem(service_item) def buildServiceItem(self): @@ -397,7 +396,7 @@ Common method for generating a service item service_item = ServiceItem(self.parent) -if self.ServiceItemIconName is not None: +if self.ServiceItemIconName: service_item.addIcon(self.ServiceItemIconName) else: service_item.addIcon( === modified file 'openlp/core/lib/serviceitem.py' --- openlp/core/lib/serviceitem.py 2009-11-01 16:06:59 + +++ openlp/core/lib/serviceitem.py 2009-11-04 18:15:24 + @@ -25,6 +25,7 @@ import logging import os import time +import uuid from PyQt4 import QtGui @@ -73,6 +74,7 @@ self.service_item_type = None self.editEnabled = False self.service_frames = [] +self.uuid = unicode(uuid.uuid1()) def addIcon(self, icon): === modified file 'openlp/plugins/songs/lib/mediaitem.py' --- openlp/plugins/songs/lib/mediaitem.py 2009-11-03 06:15:35 + +++ openlp/plugins/songs/lib/mediaitem.py 2009-11-04 18:15:24 + @@ -55,7 +55,6 @@ self.parent.songmanager, self) #Holds information about whether the edit is remotly triggered and which #Song is required. -self.remoteTriggered = None self.remoteSong = -1 def initPluginNameVisible(self): @@ -180,7 +179,6 @@ def displayResultsSong(self, searchresults): log.debug(u'display results Song') self.ListView.clear() -#log.debug(u'Records returned from search %s, len(searchresults)) for song in searchresults: author_list = u'' for author in song.authors: ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~meths/openlp/trivialfixes into lp:openlp updated
The proposal to merge lp:~meths/openlp/trivialfixes into lp:openlp has been updated. Status: Needs review = Merged -- https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/14397 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/fixes into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/fixes into lp:openlp. Requested reviews: OpenLP Core (openlp-core) -- https://code.launchpad.net/~raoul-snyman/openlp/fixes/+merge/14437 Your team OpenLP Core is subscribed to branch lp:openlp. === modified file 'openlp/core/ui/maindisplay.py' --- openlp/core/ui/maindisplay.py 2009-11-03 18:14:25 + +++ openlp/core/ui/maindisplay.py 2009-11-04 20:15:20 + @@ -136,7 +136,8 @@ Sets up the screen on a particular screen. @param (integer) screen This is the screen number. -log.debug(u'Setup %s for %s ' %(self.screens, screenNumber) ) +log.debug(u'Setup %s for %s ' %(self.screens, screenNumber)) +self.setVisible(False) screen = self.screens[screenNumber] if screen[u'number'] != screenNumber: # We will most probably never actually hit this bit, but just in @@ -154,19 +155,18 @@ self.setVisible(False) self.primary = True #Build a custom splash screen -if str_to_bool(self.parent.generalConfig.get_config(u'show splash', u'True')): -self.InitialFrame = QtGui.QImage( -screen[u'size'].width(), screen[u'size'].height(), -QtGui.QImage.Format_ARGB32_Premultiplied) -splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png') -painter_image = QtGui.QPainter() -painter_image.begin(self.InitialFrame) -painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white) -painter_image.drawImage( -(screen[u'size'].width() - splash_image.width()) / 2, -(screen[u'size'].height() - splash_image.height()) / 2, -splash_image) -self.frameView(self.InitialFrame) +self.InitialFrame = QtGui.QImage( +screen[u'size'].width(), screen[u'size'].height(), +QtGui.QImage.Format_ARGB32_Premultiplied) +splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png') +painter_image = QtGui.QPainter() +painter_image.begin(self.InitialFrame) +painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white) +painter_image.drawImage( +(screen[u'size'].width() - splash_image.width()) / 2, +(screen[u'size'].height() - splash_image.height()) / 2, +splash_image) +self.frameView(self.InitialFrame) #Build a Black screen painter = QtGui.QPainter() self.blankFrame = QtGui.QImage( === modified file 'openlp/core/ui/mainwindow.py' --- openlp/core/ui/mainwindow.py 2009-11-03 15:13:52 + +++ openlp/core/ui/mainwindow.py 2009-11-04 20:15:21 + @@ -544,7 +544,6 @@ monitor number does not exist. screen_number = int(self.generalConfig.get_config(u'Monitor', 0)) - monitor_exists = False for screen in self.screenList: if screen[u'number'] == screen_number: @@ -560,7 +559,9 @@ self.showMaximized() screen_number = self.getMonitorNumber() self.mainDisplay.setup(screen_number) -self.setFocus() +if self.mainDisplay.isVisible(): +self.mainDisplay.setFocus() +self.activateWindow() if str_to_bool(self.generalConfig.get_config(u'Auto Open', False)): self.ServiceManagerContents.onLoadService(True) if str_to_bool(self.generalConfig.get_config(u'Screen Blank', False)) \ @@ -601,6 +602,7 @@ if updated_display != self.RenderManager.current_display: self.RenderManager.update_display(updated_display) self.mainDisplay.setup(updated_display) +self.activateWindow() def closeEvent(self, event): ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~meths/openlp/trivialfixes into lp:openlp
Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp. Requested reviews: OpenLP Core (openlp-core) Fix mismerge and typo -- https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/14448 Your team OpenLP Core is subscribed to branch lp:openlp. === modified file 'openlp/core/lib/mediamanageritem.py' --- openlp/core/lib/mediamanageritem.py 2009-11-04 18:21:08 + +++ openlp/core/lib/mediamanageritem.py 2009-11-04 23:25:18 + @@ -377,7 +377,6 @@ service_item = self.buildServiceItem() if service_item: service_item.fromPlugin = True -service_item.uuid = unicode(uuid.uuid1()) self.parent.live_controller.addServiceItem(service_item) def onAddClick(self): === modified file 'openlp/core/ui/generaltab.py' --- openlp/core/ui/generaltab.py 2009-10-30 22:03:09 + +++ openlp/core/ui/generaltab.py 2009-11-04 23:25:18 + @@ -151,7 +151,7 @@ self.AutoOpenCheckBox.setText(self.trUtf8(u'Automatically open the last service')) self.ShowSplashCheckBox.setText(self.trUtf8(u'Show the splash screen')) self.SettingsGroupBox.setTitle(self.trUtf8(u'Application Settings')) -self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Sevice before starting New')) +self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Service before starting New')) self.CCLIGroupBox.setTitle(self.trUtf8(u'CCLI Details')) self.NumberLabel.setText(self.trUtf8(u'CCLI Number:')) self.UsernameLabel.setText(self.trUtf8(u'SongSelect Username:')) ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~meths/openlp/trivialfixes into lp:openlp
Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp. Requested reviews: OpenLP Core (openlp-core) -- https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/14451 Your team OpenLP Core is subscribed to branch lp:openlp. === modified file 'openlp/core/lib/mediamanageritem.py' --- openlp/core/lib/mediamanageritem.py 2009-11-04 18:21:08 + +++ openlp/core/lib/mediamanageritem.py 2009-11-05 00:30:27 + @@ -377,7 +377,6 @@ service_item = self.buildServiceItem() if service_item: service_item.fromPlugin = True -service_item.uuid = unicode(uuid.uuid1()) self.parent.live_controller.addServiceItem(service_item) def onAddClick(self): === modified file 'openlp/core/ui/generaltab.py' --- openlp/core/ui/generaltab.py 2009-10-30 22:03:09 + +++ openlp/core/ui/generaltab.py 2009-11-05 00:30:27 + @@ -151,7 +151,7 @@ self.AutoOpenCheckBox.setText(self.trUtf8(u'Automatically open the last service')) self.ShowSplashCheckBox.setText(self.trUtf8(u'Show the splash screen')) self.SettingsGroupBox.setTitle(self.trUtf8(u'Application Settings')) -self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Sevice before starting New')) +self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Service before starting New')) self.CCLIGroupBox.setTitle(self.trUtf8(u'CCLI Details')) self.NumberLabel.setText(self.trUtf8(u'CCLI Number:')) self.UsernameLabel.setText(self.trUtf8(u'SongSelect Username:')) === modified file 'openlp/core/ui/thememanager.py' --- openlp/core/ui/thememanager.py 2009-11-04 01:16:15 + +++ openlp/core/ui/thememanager.py 2009-11-05 00:30:27 + @@ -430,6 +430,7 @@ log.debug(u'generateAndSaveImage %s %s %s', dir, name, theme_xml) theme = ThemeXML() theme.parse(theme_xml) +self.cleanTheme(theme) theme.extend_image_filename(dir) frame = self.generateImage(theme) samplepathname = os.path.join(self.path, name + u'.png') === modified file 'openlp/plugins/bibles/lib/manager.py' --- openlp/plugins/bibles/lib/manager.py 2009-11-03 19:01:53 + +++ openlp/plugins/bibles/lib/manager.py 2009-11-05 00:30:27 + @@ -173,14 +173,14 @@ nbible.save_meta(u'WEB', biblesource) # store the web id of the bible nbible.save_meta(u'bibleid', bibleid) -if proxyurl and proxyurl != u'': +if proxyurl: # store the proxy URL nbible.save_meta(u'proxy', proxyurl) nhttp.set_proxy(proxyurl) -if proxyid and proxyid != u'': +if proxyid: # store the proxy userid nbible.save_meta(u'proxyid', proxyid) -if proxypass and proxypass != u'': +if proxypass: # store the proxy password nbible.save_meta(u'proxypass', proxypass) return True ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~meths/openlp/trivialfixes into lp:openlp
Fixes: - missed double checks from truth tests - last theme.parse() without cleanTheme() - typo - mismerge with TRB's song edit fix -- https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/14451 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
