Re: [Openlp-core] [Merge] lp:~googol/openlp/ticket-729 into lp:openlp
- Original message - > It is mentioned by omission as opposed to explicitly; when talking about > Qt-derived classes local variables are not mentioned, only > class-specific things are mentioned. > > I guess we need to spell it out. I have tried to make the "Instance Variables" section more explicit. -- Raoul Snyman (B. Tech. Information Technology) https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110096 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
Re: [Openlp-core] [Merge] lp:~googol/openlp/ticket-729 into lp:openlp
- Original message - > Had me confused too, Raoul. Is the wiki clear/up-to-date on this? It is mentioned by omission as opposed to explicitly; when talking about Qt-derived classes local variables are not mentioned, only class-specific things are mentioned. I guess we need to spell it out. -- Raoul Snyman (B. Tech. Information Technology) https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110096 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
Re: [Openlp-core] [Merge] lp:~googol/openlp/ticket-729 into lp:openlp
> No. Local variables should not be camelCase. Local variables follow PEP8. It is only methods and properties of Qt-derived classes that use camelCase. Had me confused too, Raoul. Is the wiki clear/up-to-date on this? -- https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110096 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
Re: [Openlp-core] [Merge] lp:~googol/openlp/ticket-729 into lp:openlp
Review: Needs Fixing *sigh* No. Local variables should not be camelCase. Local variables follow PEP8. It is only methods and properties of Qt-derived classes that use camelCase. -- https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110096 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] [Bug 991150] Re: Web Download Bible parse error
** Changed in: openlp Status: Fix Committed => Fix Released -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/991150 Title: Web Download Bible parse error Status in OpenLP - Worship Presentation Software: Fix Released Bug description: Win7 x64 Home Premium OpenLP 1.9.9 Steps to reproduce: * Import Bible -> Web Download -> Bible Gateway -> NIV 2010 * Search for "Mark 9:33-37" on either Quick or Advanced tabs Result (Error dialog): --Parse Error-- There was a problem extracting your verse selection. If this error continues to occur please consider reporting a bug. Debug log for 'Quick' search: http://pastebin.com/qnXS5qPD To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/991150/+subscriptions ___ 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/bug-991150 into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/bug-991150 into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/bug-991150/+merge/109944 -- https://code.launchpad.net/~raoul-snyman/openlp/bug-991150/+merge/109944 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
Re: [Openlp-core] [Merge] lp:~googol/openlp/ticket-729 into lp:openlp
Review: Approve -- https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110096 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
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/bug-991150 into lp:openlp
Review: Approve -- https://code.launchpad.net/~raoul-snyman/openlp/bug-991150/+merge/109944 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/bug-991150 into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/bug-991150 into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/bug-991150/+merge/109944 -- https://code.launchpad.net/~raoul-snyman/openlp/bug-991150/+merge/109944 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:~googol/openlp/ticket-729 into lp:openlp
Andreas Preikschat has proposed merging lp:~googol/openlp/ticket-729 into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110096
Hello,
- fixed ticket 729 (http://support.openlp.org/issues/729)
-> line 8
- changed some variables to camelCase
--
https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110096
Your team OpenLP Core is requested to review the proposed merge of
lp:~googol/openlp/ticket-729 into lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2012-06-09 23:14:28 +
+++ openlp/core/ui/maindisplay.py 2012-06-13 15:55:25 +
@@ -130,6 +130,7 @@
else:
self.audioPlayer = None
self.firstTime = True
+self.webLoaded = True
self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
windowFlags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool | \
QtCore.Qt.WindowStaysOnTopHint
@@ -194,27 +195,27 @@
Display.setup(self)
if self.isLive:
# Build the initial frame.
-image_file = Settings().value(u'advanced/default image',
+backgroundColor = QtGui.QColor()
+backgroundColor.setNamedColor(Settings().value(
+u'advanced/default color',
+QtCore.QVariant(u'#ff')).toString())
+if not backgroundColor.isValid():
+backgroundColor = QtCore.Qt.white
+imageFile = Settings().value(u'advanced/default image',
QtCore.QVariant(u':/graphics/openlp-splash-screen.png'))\
.toString()
-background_color = QtGui.QColor()
-background_color.setNamedColor(Settings().value(
-u'advanced/default color',
-QtCore.QVariant(u'#ff')).toString())
-if not background_color.isValid():
-background_color = QtCore.Qt.white
-splash_image = QtGui.QImage(image_file)
+splashImage = QtGui.QImage(imageFile)
self.initialFrame = QtGui.QImage(
self.screen[u'size'].width(),
self.screen[u'size'].height(),
QtGui.QImage.Format_ARGB32_Premultiplied)
-painter_image = QtGui.QPainter()
-painter_image.begin(self.initialFrame)
-painter_image.fillRect(self.initialFrame.rect(), background_color)
-painter_image.drawImage(
-(self.screen[u'size'].width() - splash_image.width()) / 2,
-(self.screen[u'size'].height() - splash_image.height()) / 2,
-splash_image)
+painterImage = QtGui.QPainter()
+painterImage.begin(self.initialFrame)
+painterImage.fillRect(self.initialFrame.rect(), backgroundColor)
+painterImage.drawImage(
+(self.screen[u'size'].width() - splashImage.width()) / 2,
+(self.screen[u'size'].height() - splashImage.height()) / 2,
+splashImage)
serviceItem = ServiceItem()
serviceItem.bg_image_bytes = image_to_byte(self.initialFrame)
self.webView.setHtml(build_html(serviceItem, self.screen,
@@ -247,27 +248,27 @@
log.debug(u'alert to display')
# First we convert <>& marks to html variants, then apply
# formattingtags, finally we double all backslashes for JavaScript.
-text_prepared = expand_tags(
+textPrepared = expand_tags(
cgi.escape(text)).replace(u'\\', u'').replace(u'\"', u'\\\"')
if self.height() != self.screen[u'size'].height() or not \
self.isVisible():
shrink = True
-js = u'show_alert("%s", "%s")' % (text_prepared, u'top')
+js = u'show_alert("%s", "%s")' % (textPrepared, u'top')
else:
shrink = False
-js = u'show_alert("%s", "")' % text_prepared
+js = u'show_alert("%s", "")' % textPrepared
height = self.frame.evaluateJavaScript(js)
if shrink:
if text:
-alert_height = int(height.toString())
-self.resize(self.width(), alert_height)
+alertHeight = int(height.toString())
+self.resize(self.width(), alertHeight)
self.setVisible(True)
if location == AlertLocation.Middle:
self.move(self.screen[u'size'].left(),
-(self.screen[u'size'].height() - alert_height) / 2)
+(self.screen[u'size'].height() - alertHeight) / 2)
elif location == AlertLocation.Bottom:
self.move(self.screen[u'size'].left(),
-self.screen[u'size'].height() - alert_height)
+self.screen[u'size'].height() - alertHeight)
else:
self.setVisible(Fal
[Openlp-core] [Merge] lp:~googol/openlp/ticket-729 into lp:openlp
The proposal to merge lp:~googol/openlp/ticket-729 into lp:openlp has been updated. Description changed to: Hello, - fixed ticket 729 (http://support.openlp.org/issues/729) -> line 8 - changed some variables to camelCase For more details, see: https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110094 -- https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110094 Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/ticket-729 into 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:~googol/openlp/ticket-729 into lp:openlp
Andreas Preikschat has proposed merging lp:~googol/openlp/ticket-729 into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110094
Hello,
- fixed ticket 729 (http://support.openlp.org/issues/729)
- changed some variables to camelCase
--
https://code.launchpad.net/~googol/openlp/ticket-729/+merge/110094
Your team OpenLP Core is requested to review the proposed merge of
lp:~googol/openlp/ticket-729 into lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2012-06-09 23:14:28 +
+++ openlp/core/ui/maindisplay.py 2012-06-13 15:49:28 +
@@ -130,6 +130,7 @@
else:
self.audioPlayer = None
self.firstTime = True
+self.webLoaded = True
self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
windowFlags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool | \
QtCore.Qt.WindowStaysOnTopHint
@@ -194,27 +195,27 @@
Display.setup(self)
if self.isLive:
# Build the initial frame.
-image_file = Settings().value(u'advanced/default image',
+backgroundColor = QtGui.QColor()
+backgroundColor.setNamedColor(Settings().value(
+u'advanced/default color',
+QtCore.QVariant(u'#ff')).toString())
+if not backgroundColor.isValid():
+backgroundColor = QtCore.Qt.white
+imageFile = Settings().value(u'advanced/default image',
QtCore.QVariant(u':/graphics/openlp-splash-screen.png'))\
.toString()
-background_color = QtGui.QColor()
-background_color.setNamedColor(Settings().value(
-u'advanced/default color',
-QtCore.QVariant(u'#ff')).toString())
-if not background_color.isValid():
-background_color = QtCore.Qt.white
-splash_image = QtGui.QImage(image_file)
+splashImage = QtGui.QImage(imageFile)
self.initialFrame = QtGui.QImage(
self.screen[u'size'].width(),
self.screen[u'size'].height(),
QtGui.QImage.Format_ARGB32_Premultiplied)
-painter_image = QtGui.QPainter()
-painter_image.begin(self.initialFrame)
-painter_image.fillRect(self.initialFrame.rect(), background_color)
-painter_image.drawImage(
-(self.screen[u'size'].width() - splash_image.width()) / 2,
-(self.screen[u'size'].height() - splash_image.height()) / 2,
-splash_image)
+painterImage = QtGui.QPainter()
+painterImage.begin(self.initialFrame)
+painterImage.fillRect(self.initialFrame.rect(), backgroundColor)
+painterImage.drawImage(
+(self.screen[u'size'].width() - splashImage.width()) / 2,
+(self.screen[u'size'].height() - splashImage.height()) / 2,
+splashImage)
serviceItem = ServiceItem()
serviceItem.bg_image_bytes = image_to_byte(self.initialFrame)
self.webView.setHtml(build_html(serviceItem, self.screen,
@@ -247,27 +248,27 @@
log.debug(u'alert to display')
# First we convert <>& marks to html variants, then apply
# formattingtags, finally we double all backslashes for JavaScript.
-text_prepared = expand_tags(
+textPrepared = expand_tags(
cgi.escape(text)).replace(u'\\', u'').replace(u'\"', u'\\\"')
if self.height() != self.screen[u'size'].height() or not \
self.isVisible():
shrink = True
-js = u'show_alert("%s", "%s")' % (text_prepared, u'top')
+js = u'show_alert("%s", "%s")' % (textPrepared, u'top')
else:
shrink = False
-js = u'show_alert("%s", "")' % text_prepared
+js = u'show_alert("%s", "")' % textPrepared
height = self.frame.evaluateJavaScript(js)
if shrink:
if text:
-alert_height = int(height.toString())
-self.resize(self.width(), alert_height)
+alertHeight = int(height.toString())
+self.resize(self.width(), alertHeight)
self.setVisible(True)
if location == AlertLocation.Middle:
self.move(self.screen[u'size'].left(),
-(self.screen[u'size'].height() - alert_height) / 2)
+(self.screen[u'size'].height() - alertHeight) / 2)
elif location == AlertLocation.Bottom:
self.move(self.screen[u'size'].left(),
-self.screen[u'size'].height() - alert_height)
+self.screen[u'size'].height() - alertHeight)
else:
self.setVisible(False)
[Openlp-core] [Bug 1012628] Re: Set data path via command line switch
"-" options should really only be single character. Will probably be best just to implement the long form. -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1012628 Title: Set data path via command line switch Status in OpenLP - Worship Presentation Software: New Bug description: Data path can now be changed via GUI. It could be useful if the data path could be set via a command line switch. This would allow different shortcuts to run openlp with different data sets. Could also be useful for testing environments. e.g. $ openlp -dp "D:\worship\openlp data" $ openlp --data-path "D:\worship\openlp data" To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1012628/+subscriptions ___ 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] [Bug 1012628] [NEW] Set data path via command line switch
Public bug reported: Data path can now be changed via GUI. It could be useful if the data path could be set via a command line switch. This would allow different shortcuts to run openlp with different data sets. Could also be useful for testing environments. e.g. $ openlp -dp "D:\worship\openlp data" $ openlp --data-path "D:\worship\openlp data" ** Affects: openlp Importance: Wishlist Status: New ** Changed in: openlp Importance: Undecided => Wishlist -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1012628 Title: Set data path via command line switch Status in OpenLP - Worship Presentation Software: New Bug description: Data path can now be changed via GUI. It could be useful if the data path could be set via a command line switch. This would allow different shortcuts to run openlp with different data sets. Could also be useful for testing environments. e.g. $ openlp -dp "D:\worship\openlp data" $ openlp --data-path "D:\worship\openlp data" To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1012628/+subscriptions ___ 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:~phill-ridout/openlp/bug-1011286 into lp:openlp
On Jun 12, 2012 8:06 PM, "Raoul Snyman" < raoul.sny...@saturnlaboratories.co.za> wrote: > > Review: Needs Fixing Can you clarify what you want? The current behaviour is: Click Add/Edit verse try to close the dialog box by clicking save, to save with out any text and there is a message box telling the user that there needs to be text. Click edit all, and leave it blank a stack trace occurs. Add only one line and the stack trace occurs. Save the song with no verses, and a message appears telling you that you can't do that. > You should be able to close the dialog via OK without any text in the dialog. No text is also valid. My fix fixes the edit all version of the dialog box. The edit (single verse) is not affected. If you were to remove all text, then this would delete all verses. And you wouldn't be able to save the song. -- https://code.launchpad.net/~phill-ridout/openlp/bug-1011286/+merge/109568 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] [Bug 904690] Re: cloning a song does not retain splits
** Changed in: openlp Status: Expired => Confirmed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/904690 Title: cloning a song does not retain splits Status in OpenLP - Worship Presentation Software: Confirmed Bug description: Cloning a song does not retain the Verse splits. Example below Original song: ---[Verse:1]--- What Child is this who laid to rest On Mary's lap is sleeping Whom angels greet with anthems sweet While shepherds watch are keeping ---[Verse:1]--- This this is Christ the King Whom shepherds guard and angels sing Haste haste to bring Him laud The Babe the Son The Glorious One The Babe the Son of Mary Cloned: ---[Verse:1]--- What Child is this who laid to rest On Mary's lap is sleeping Whom angels greet with anthems sweet While shepherds watch are keeping This this is Christ the King Whom shepherds guard and angels sing Haste haste to bring Him laud The Babe the Son The Glorious One The Babe the Son of Mary To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/904690/+subscriptions ___ 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
