[Openlp-core] [Merge] lp:~strada/openlp/songbeamer-import-enhancements into lp:openlp
Stefan Strasser has proposed merging
lp:~strada/openlp/songbeamer-import-enhancements into lp:openlp.
Requested reviews:
Samuel Mehrbrodt (sam92)
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~strada/openlp/songbeamer-import-enhancements/+merge/215812
Some enhancements for songbeamer-import:
- added some missing verse-marks to be recognized by the importer
(Misc,Part,Teil,$$M=); all of them set to be translated to VerseType.Other (I
would prefer a special marker for Part/Teil but this is currently not existing
in openlp)
- special handling for mark $$M= in check_verse_marks because the name of this
mark may be different (after the =) and it is not countable; this mark is in
songbeamer used for custom marks (on importing from other formats or manual)
- page-break-recognition now accepts also -- (in songbeamer -- and --- are both
identically used to separate slides/verses, the only difference is in the
layout of a printout)
- added a functional test for the function check_verse_marks (checking the
recognition of different possible lines in one test)
- replaced all occurrences in the code of the deprecated alias assertEquals()
with assertEqual()
--
https://code.launchpad.net/~strada/openlp/songbeamer-import-enhancements/+merge/215812
Your team OpenLP Core is requested to review the proposed merge of
lp:~strada/openlp/songbeamer-import-enhancements into lp:openlp.
=== modified file 'openlp/plugins/songs/lib/songbeamerimport.py'
--- openlp/plugins/songs/lib/songbeamerimport.py 2014-03-29 13:31:28 +
+++ openlp/plugins/songs/lib/songbeamerimport.py 2014-04-15 05:48:25 +
@@ -56,11 +56,15 @@
'Zwischenspiel': VerseType.tags[VerseType.Bridge],
'Pre-Chorus': VerseType.tags[VerseType.PreChorus],
'Pre-Refrain': VerseType.tags[VerseType.PreChorus],
+'Misc': VerseType.tags[VerseType.Other],
'Pre-Bridge': VerseType.tags[VerseType.Other],
'Pre-Coda': VerseType.tags[VerseType.Other],
+'Part': VerseType.tags[VerseType.Other],
+'Teil': VerseType.tags[VerseType.Other],
'Unbekannt': VerseType.tags[VerseType.Other],
'Unknown': VerseType.tags[VerseType.Other],
-'Unbenannt': VerseType.tags[VerseType.Other]
+'Unbenannt': VerseType.tags[VerseType.Other],
+'$$M=': VerseType.tags[VerseType.Other]
}
@@ -132,7 +136,8 @@
line = str(line).strip()
if line.startswith('#') and not read_verses:
self.parseTags(line)
-elif line.startswith('---'):
+elif line.startswith('--'):
+# --- and -- allowed for page-breaks (difference in Songbeamer only in printout)
if self.current_verse:
self.replace_html_tags()
self.add_verse(self.current_verse, self.current_verse_type)
@@ -282,4 +287,7 @@
if marks[1].isdigit():
self.current_verse_type += marks[1]
return True
+elif marks[0].startswith('$$M='): # this verse-mark cannot be numbered
+self.current_verse_type = SongBeamerTypes.MarkTypes['$$M=']
+return True
return False
=== modified file 'tests/functional/openlp_core_common/test_registryproperties.py'
--- tests/functional/openlp_core_common/test_registryproperties.py 2014-04-02 19:35:09 +
+++ tests/functional/openlp_core_common/test_registryproperties.py 2014-04-15 05:48:25 +
@@ -52,7 +52,7 @@
# GIVEN an Empty Registry
# WHEN there is no Application
# THEN the application should be none
-self.assertEquals(self.application, None, 'The application value should be None')
+self.assertEqual(self.application, None, 'The application value should be None')
def application_test(self):
@@ -63,4 +63,4 @@
# WHEN the application is registered
Registry().register('application', application)
# THEN the application should be none
-self.assertEquals(self.application, application, 'The application value should match')
+self.assertEqual(self.application, application, 'The application value should match')
=== modified file 'tests/functional/openlp_plugins/bibles/test_http.py'
--- tests/functional/openlp_plugins/bibles/test_http.py 2014-04-02 18:51:21 +
+++ tests/functional/openlp_plugins/bibles/test_http.py 2014-04-15 05:48:25 +
@@ -180,4 +180,4 @@
'http://m.bibleserver.com/overlay/selectBook?translation=NIV')
self.assertFalse(self.mock_log.error.called, 'log.error should not have been called')
self.assertFalse(self.mock_send_error_message.called, 'send_error_message should not have been called')
-self.assertEquals(result, ['Genesis', 'Leviticus'])
+self.assertEqual(result, ['Genesis', 'Leviticus'])
=== modified file 'tests/functional/openlp_plugins/songs/test_ewimport.py'
---
Re: [Openlp-core] [Merge] lp:~sam92/openlp/verseorder-import into lp:openlp
Now I've resolved the conflict in this branch. -- https://code.launchpad.net/~sam92/openlp/verseorder-import/+merge/214723 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:~sam92/openlp/verseorder-import into lp:openlp
Samuel Mehrbrodt has proposed merging lp:~sam92/openlp/verseorder-import into
lp:openlp.
Requested reviews:
Tim Bentley (trb143)
Raoul Snyman (raoul-snyman)
For more details, see:
https://code.launchpad.net/~sam92/openlp/verseorder-import/+merge/215823
Update verse order when verse names change (OpenLyrics Import)
--
https://code.launchpad.net/~sam92/openlp/verseorder-import/+merge/215823
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/songs/lib/xml.py'
--- openlp/plugins/songs/lib/xml.py 2014-03-21 21:38:08 +
+++ openlp/plugins/songs/lib/xml.py 2014-04-15 08:16:32 +
@@ -675,6 +675,7 @@
sxml = SongXML()
verses = {}
verse_def_list = []
+verse_order = self._text(properties.verseOrder).split(' ') if hasattr(properties, 'verseOrder') else []
try:
lyrics = song_xml.lyrics
except AttributeError:
@@ -717,13 +718,17 @@
else:
verses[(verse_tag, verse_number, lang, translit, verse_part)] = text
verse_def_list.append((verse_tag, verse_number, lang, translit, verse_part))
+# Update verse order when the verse name has changed
+if verse_def != verse_tag + verse_number + verse_part:
+for i in range(len(verse_order)):
+if verse_order[i] == verse_def:
+verse_order[i] = verse_tag + verse_number + verse_part
# We have to use a list to keep the order, as dicts are not sorted.
for verse in verse_def_list:
sxml.add_verse_to_lyrics(verse[0], verse[1], verses[verse], verse[2])
song_obj.lyrics = str(sxml.extract_xml(), 'utf-8')
# Process verse order
-if hasattr(properties, 'verseOrder'):
-song_obj.verse_order = self._text(properties.verseOrder)
+song_obj.verse_order = ' '.join(verse_order)
def _process_songbooks(self, properties, song):
=== modified file 'tests/functional/openlp_core_lib/test_ui.py'
--- tests/functional/openlp_core_lib/test_ui.py 2014-04-08 21:20:51 +
+++ tests/functional/openlp_core_lib/test_ui.py 2014-04-15 08:16:32 +
@@ -98,3 +98,18 @@
self.assertEqual(combo, label.buddy())
for text in [UiStrings().Top, UiStrings().Middle, UiStrings().Bottom]:
self.assertTrue(combo.findText(text) = 0)
+
+def test_create_horizontal_adjusting_combo_box(self):
+
+Test creating a horizontal adjusting combo box
+
+# GIVEN: A dialog
+dialog = QtGui.QDialog()
+
+# WHEN: We create the combobox
+combo = create_horizontal_adjusting_combo_box(dialog, 'combo1')
+
+# THEN: We should get a ComboBox
+self.assertIsInstance(combo, QtGui.QComboBox)
+self.assertEqual('combo1', combo.objectName())
+self.assertEqual(QtGui.QComboBox.AdjustToMinimumContentsLength, combo.sizeAdjustPolicy())
___
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:~strada/openlp/songbeamer-import-enhancements into lp:openlp
Review: Approve Good work, Stefan! Approve from me, but core devs still need to check and merge. Anything else you'd like to work on? -- https://code.launchpad.net/~strada/openlp/songbeamer-import-enhancements/+merge/215812 Your team OpenLP Core is requested to review the proposed merge of lp:~strada/openlp/songbeamer-import-enhancements 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] [Bug 1299837] Re: OpenLP crashes when importing songs from EasyWorship
Sample files linked to from:
http://support.openlp.org/scp/tickets.php?id=2302
--
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1299837
Title:
OpenLP crashes when importing songs from EasyWorship
Status in OpenLP - Worship Presentation Software:
New
Bug description:
**OpenLP Bug Report**
Version: {u'full': u'2.0.4', u'version': u'2.0.4', u'build': None}
--- Details of the Exception. ---
When I try to import a songdatabase from EasyWorship 2009, OpenLP
crashes after 61% of the database has been imported.
--- Exception Traceback ---
Traceback (most recent call last):
File
D:\OpenLP_Code\2.0\build\pyi.win32\OpenLP\out00-PYZ.pyz\openlp.core.ui.wizard,
line 190, in onCurrentIdChanged
File
D:\OpenLP_Code\2.0\build\pyi.win32\OpenLP\out00-PYZ.pyz\openlp.plugins.songs.forms.songimportform,
line 391, in performWizard
File
D:\OpenLP_Code\2.0\build\pyi.win32\OpenLP\out00-PYZ.pyz\openlp.plugins.songs.lib.ewimport,
line 191, in doImport
File
D:\OpenLP_Code\2.0\build\pyi.win32\OpenLP\out00-PYZ.pyz\openlp.plugins.songs.lib,
line 596, in strip_rtf
UnicodeDecodeError: 'ascii' codec can't decode byte 0x86 in position 0:
ordinal not in range(128)
--- System information ---
Plattform: Windows-7-6.1.7601-SP1 Home Premium
Office version 2010
--- Library Versions ---
Python: 2.7.3
Qt4: 4.8.3
Phonon: 4.4.0
PyQt4: 4.9.5
QtWebkit: 534.34
SQLAlchemy: 0.7.7
SQLAlchemy Migrate: 0.7.2
BeautifulSoup: 3.2.1
lxml: 2.3.0
Chardet: 1.0.1
PyEnchant: 1.6.5
PySQLite: 1.0.1
Mako: 0.7.0
pyUNO bridge: -
To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1299837/+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 1256677] Re: Message Alerts
I remember fixing a bug on alerts and at the time experimenting with scrolling and css. Technically it works,. Maybe we should add a setting, or maybe add an option to the alert dialog. ** Changed in: openlp Importance: Undecided = Wishlist ** Also affects: openlp/trunk Importance: Wishlist Status: New ** Tags added: alerts -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1256677 Title: Message Alerts Status in OpenLP - Worship Presentation Software: New Status in OpenLP trunk series: New Bug description: Feature Request. As a user, I'd like to be able to have the Alerts scroll (to the right) when the message is too long to fit. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1256677/+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:~googol/openlp/jenkins-script into lp:openlp
Review: Approve -- https://code.launchpad.net/~googol/openlp/jenkins-script/+merge/215739 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:~sam92/openlp/bag_1225763 into lp:openlp
Review: Approve -- https://code.launchpad.net/~sam92/openlp/bag_1225763/+merge/215748 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/duplicate-speed into lp:openlp
Review: Approve -- https://code.launchpad.net/~googol/openlp/duplicate-speed/+merge/215746 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:~springermac/openlp/bzr-tag-test into lp:openlp
Review: Approve -- https://code.launchpad.net/~springermac/openlp/bzr-tag-test/+merge/215754 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:~sam92/openlp/verseorder-import into lp:openlp
Review: Approve -- https://code.launchpad.net/~sam92/openlp/verseorder-import/+merge/215823 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:~springermac/openlp/fix-ups into lp:openlp
Jonathan Springer has proposed merging lp:~springermac/openlp/fix-ups into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~springermac/openlp/fix-ups/+merge/215942
Fixes first time wizard to use url and paths in web config file
Fixes PEP8 error in servicemanager
Add tests for first time form
--
https://code.launchpad.net/~springermac/openlp/fix-ups/+merge/215942
Your team OpenLP Core is requested to review the proposed merge of
lp:~springermac/openlp/fix-ups into lp:openlp.
=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py 2014-03-20 19:10:31 +
+++ openlp/core/ui/firsttimeform.py 2014-04-15 18:53:48 +
@@ -67,7 +67,7 @@
title = config.get('theme_%s' % theme, 'title')
filename = config.get('theme_%s' % theme, 'filename')
screenshot = config.get('theme_%s' % theme, 'screenshot')
-urllib.request.urlretrieve('%s%s' % (self.parent().web, screenshot),
+urllib.request.urlretrieve('%s%s' % (self.parent().themes_url, screenshot),
os.path.join(gettempdir(), 'openlp', screenshot))
item = QtGui.QListWidgetItem(title, self.parent().themes_list_widget)
item.setData(QtCore.Qt.UserRole, filename)
@@ -96,6 +96,10 @@
if self.web_access:
files = self.web_access.read()
self.config.read_string(files.decode())
+self.web = self.config.get('general', 'base url')
+self.songs_url = self.web + self.config.get('songs', 'directory') + '/'
+self.bibles_url = self.web + self.config.get('bibles', 'directory') + '/'
+self.themes_url = self.web + self.config.get('themes', 'directory') + '/'
self.update_screen_list_combo()
self.was_download_cancelled = False
self.theme_screenshot_thread = None
@@ -341,7 +345,7 @@
item = self.songs_list_widget.item(i)
if item.checkState() == QtCore.Qt.Checked:
filename = item.data(QtCore.Qt.UserRole)
-size = self._get_file_size('%s%s' % (self.web, filename))
+size = self._get_file_size('%s%s' % (self.songs_url, filename))
self.max_progress += size
# Loop through the Bibles list and increase for each selected item
iterator = QtGui.QTreeWidgetItemIterator(self.bibles_tree_widget)
@@ -350,7 +354,7 @@
item = iterator.value()
if item.parent() and item.checkState(0) == QtCore.Qt.Checked:
filename = item.data(0, QtCore.Qt.UserRole)
-size = self._get_file_size('%s%s' % (self.web, filename))
+size = self._get_file_size('%s%s' % (self.bibles_url, filename))
self.max_progress += size
iterator += 1
# Loop through the themes list and increase for each selected item
@@ -359,7 +363,7 @@
item = self.themes_list_widget.item(i)
if item.checkState() == QtCore.Qt.Checked:
filename = item.data(QtCore.Qt.UserRole)
-size = self._get_file_size('%s%s' % (self.web, filename))
+size = self._get_file_size('%s%s' % (self.themes_url, filename))
self.max_progress += size
if self.max_progress:
# Add on 2 for plugins status setting plus a finished point.
@@ -435,7 +439,7 @@
self._increment_progress_bar(self.downloading % filename, 0)
self.previous_size = 0
destination = os.path.join(songs_destination, str(filename))
-self.url_get_file('%s%s' % (self.web, filename), destination)
+self.url_get_file('%s%s' % (self.songs_url, filename), destination)
# Download Bibles
bibles_iterator = QtGui.QTreeWidgetItemIterator(
self.bibles_tree_widget)
@@ -445,7 +449,7 @@
bible = item.data(0, QtCore.Qt.UserRole)
self._increment_progress_bar(self.downloading % bible, 0)
self.previous_size = 0
-self.url_get_file('%s%s' % (self.web, bible), os.path.join(bibles_destination, bible))
+self.url_get_file('%s%s' % (self.bibles_url, bible), os.path.join(bibles_destination, bible))
bibles_iterator += 1
# Download themes
for i in range(self.themes_list_widget.count()):
@@ -454,7 +458,7 @@
theme = item.data(QtCore.Qt.UserRole)
self._increment_progress_bar(self.downloading % theme, 0)
self.previous_size = 0
-self.url_get_file('%s%s' % (self.web, theme), os.path.join(themes_destination, theme))
+self.url_get_file('%s%s' % (self.themes_url, theme), os.path.join(themes_destination, theme))
# Set
[Openlp-core] [Bug 1308216] [NEW] Updating theme images causes full screen display of each theme
Public bug reported: Updating theme images causes full screen display of each theme Steps to reproduce: 1 On a single display system set OpenLP to display on monitor 1(primary) and display even if single screen. 2 Update the theme images via the menu item Output: Each theme is displayed full screen above the OpenLP window and OpenLP updates the theme previews Expected output: OpenLP should generate the themes previews silently and only show action through updating the progress bar. This is a regression from 2.0 behavior. ** Affects: openlp Importance: Undecided Status: New -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1308216 Title: Updating theme images causes full screen display of each theme Status in OpenLP - Worship Presentation Software: New Bug description: Updating theme images causes full screen display of each theme Steps to reproduce: 1 On a single display system set OpenLP to display on monitor 1(primary) and display even if single screen. 2 Update the theme images via the menu item Output: Each theme is displayed full screen above the OpenLP window and OpenLP updates the theme previews Expected output: OpenLP should generate the themes previews silently and only show action through updating the progress bar. This is a regression from 2.0 behavior. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1308216/+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:~googol/openlp/jenkins-script into lp:openlp
Review: Needs Fixing 240 + assert self.image_manager._conversion_queue.qsize() == 0, The queue should be empty. Please use self.assertEqual() and friends -- https://code.launchpad.net/~googol/openlp/jenkins-script/+merge/215739 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/duplicate-speed into lp:openlp
Review: Approve -- https://code.launchpad.net/~googol/openlp/duplicate-speed/+merge/215746 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:~sam92/openlp/verseorder-import into lp:openlp
Review: Approve -- https://code.launchpad.net/~sam92/openlp/verseorder-import/+merge/215823 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:~strada/openlp/songbeamer-import-enhancements into lp:openlp
Review: Approve -- https://code.launchpad.net/~strada/openlp/songbeamer-import-enhancements/+merge/215812 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:~strada/openlp/songbeamer-import-enhancements into lp:openlp
The proposal to merge lp:~strada/openlp/songbeamer-import-enhancements into lp:openlp has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~strada/openlp/songbeamer-import-enhancements/+merge/215812 -- https://code.launchpad.net/~strada/openlp/songbeamer-import-enhancements/+merge/215812 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/duplicate-speed into lp:openlp
The proposal to merge lp:~googol/openlp/duplicate-speed into lp:openlp has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~googol/openlp/duplicate-speed/+merge/215746 -- https://code.launchpad.net/~googol/openlp/duplicate-speed/+merge/215746 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:~sam92/openlp/bag_1225763 into lp:openlp
Review: Approve -- https://code.launchpad.net/~sam92/openlp/bag_1225763/+merge/215748 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:~springermac/openlp/fix-ups into lp:openlp
Review: Approve I prefer the following import order: 1. Python library imports 2. Third party imports 3. OpenLP code imports 4. OpenLP test imports -- https://code.launchpad.net/~springermac/openlp/fix-ups/+merge/215942 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:~strada/openlp/songbeamer-import-enhancements into lp:openlp
The proposal to merge lp:~strada/openlp/songbeamer-import-enhancements into lp:openlp has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~strada/openlp/songbeamer-import-enhancements/+merge/215812 -- https://code.launchpad.net/~strada/openlp/songbeamer-import-enhancements/+merge/215812 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:~springermac/openlp/bzr-tag-test into lp:openlp
The proposal to merge lp:~springermac/openlp/bzr-tag-test into lp:openlp has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~springermac/openlp/bzr-tag-test/+merge/215754 -- https://code.launchpad.net/~springermac/openlp/bzr-tag-test/+merge/215754 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/jenkins-script into lp:openlp
You really want to approve this. That is the output of this version of the script: http://s14.directupload.net/images/140415/3t54chkw.png ;) -- https://code.launchpad.net/~googol/openlp/jenkins-script/+merge/215950 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:~sam92/openlp/bag_1225763 into lp:openlp
Samuel Mehrbrodt has proposed merging lp:~sam92/openlp/bag_1225763 into
lp:openlp.
Requested reviews:
Andreas Preikschat (googol)
Tim Bentley (trb143)
Raoul Snyman (raoul-snyman)
Related bugs:
Bug #1225763 in OpenLP: Replacing background with video unblank screen even
if Blanked to Theme
https://bugs.launchpad.net/openlp/+bug/1225763
For more details, see:
https://code.launchpad.net/~sam92/openlp/bag_1225763/+merge/215955
Got the branch from https://code.launchpad.net/~marmyshev/openlp/bag_1225763/
Merged current trunk and added a test.
--
https://code.launchpad.net/~sam92/openlp/bag_1225763/+merge/215955
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file '.bzrignore'
--- .bzrignore 2013-11-07 20:35:02 +
+++ .bzrignore 2014-04-15 20:57:10 +
@@ -2,6 +2,7 @@
*.*~
\#*\#
*.eric4project
+*.eric5project
*.ropeproject
*.e4*
.eric4project
=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py 2014-03-26 12:06:48 +
+++ openlp/core/lib/ui.py 2014-04-15 20:57:10 +
@@ -173,7 +173,7 @@
kwargs.setdefault('tooltip', translate('OpenLP.Ui', 'Move selection down one position.'))
else:
log.warn('The role %s is not defined in create_push_button().', role)
-if kwargs.pop('class', '') == 'toolbutton':
+if kwargs.pop('btn_class', '') == 'toolbutton':
button = QtGui.QToolButton(parent)
else:
button = QtGui.QPushButton(parent)
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2014-04-12 20:19:22 +
+++ openlp/core/ui/media/mediacontroller.py 2014-04-15 20:57:10 +
@@ -506,7 +506,8 @@
else:
self.media_volume(controller, controller.media_info.volume)
if status:
-display.frame.evaluateJavaScript('show_blank(desktop);')
+if not controller.media_info.is_background:
+display.frame.evaluateJavaScript('show_blank(desktop);')
self.current_media_players[controller.controller_type].set_visible(display, True)
# Flash needs to be played and will not AutoPlay
if controller.media_info.is_flash:
@@ -517,7 +518,7 @@
controller.mediabar.actions['playbackPause'].setVisible(True)
controller.mediabar.actions['playbackStop'].setVisible(True)
if controller.is_live:
-if controller.hide_menu.defaultAction().isChecked():
+if controller.hide_menu.defaultAction().isChecked() and not controller.media_info.is_background:
controller.hide_menu.defaultAction().trigger()
# Start Timer for ui updates
if not self.timer.isActive():
=== modified file 'tests/functional/openlp_core_lib/test_ui.py'
--- tests/functional/openlp_core_lib/test_ui.py 2014-04-15 08:15:07 +
+++ tests/functional/openlp_core_lib/test_ui.py 2014-04-15 20:57:10 +
@@ -82,6 +82,38 @@
self.assertEqual(1, len(btnbox.buttons()))
self.assertEqual(QtGui.QDialogButtonBox.HelpRole, btnbox.buttonRole(btnbox.buttons()[0]))
+def test_create_button(self):
+
+Test creating a button
+
+# GIVEN: A dialog
+dialog = QtGui.QDialog()
+
+# WHEN: We create the button
+btn = create_button(dialog, 'my_btn')
+
+# THEN: We should get a button with a name
+self.assertIsInstance(btn, QtGui.QPushButton)
+self.assertEqual('my_btn', btn.objectName())
+self.assertTrue(btn.isEnabled())
+
+# WHEN: We create a button with some attributes
+btn = create_button(dialog, 'my_btn', text='Hello', tooltip='How are you?', enabled=False)
+
+# THEN: We should get a button with those attributes
+self.assertIsInstance(btn, QtGui.QPushButton)
+self.assertEqual('Hello', btn.text())
+self.assertEqual('How are you?', btn.toolTip())
+self.assertFalse(btn.isEnabled())
+
+# WHEN: We create a toolbutton
+btn = create_button(dialog, 'my_btn', btn_class='toolbutton')
+
+# THEN: We should get a toolbutton
+self.assertIsInstance(btn, QtGui.QToolButton)
+self.assertEqual('my_btn', btn.objectName())
+self.assertTrue(btn.isEnabled())
+
def test_create_valign_selection_widgets(self):
Test creating a combo box for valign selection
___
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:~sam92/openlp/bag_1225763 into lp:openlp
The proposal to merge lp:~sam92/openlp/bag_1225763 into lp:openlp has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~sam92/openlp/bag_1225763/+merge/215955 -- https://code.launchpad.net/~sam92/openlp/bag_1225763/+merge/215955 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:~marmyshev/openlp/bag_1225763 into lp:openlp
The proposal to merge lp:~marmyshev/openlp/bag_1225763 into lp:openlp has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~marmyshev/openlp/bag_1225763/+merge/186243 -- https://code.launchpad.net/~marmyshev/openlp/bag_1225763/+merge/186243 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:~sam92/openlp/bag_1225763 into lp:openlp
The proposal to merge lp:~sam92/openlp/bag_1225763 into lp:openlp has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~sam92/openlp/bag_1225763/+merge/215955 -- https://code.launchpad.net/~sam92/openlp/bag_1225763/+merge/215955 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/duplicate-speed into lp:openlp
The proposal to merge lp:~googol/openlp/duplicate-speed into lp:openlp has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~googol/openlp/duplicate-speed/+merge/215746 -- https://code.launchpad.net/~googol/openlp/duplicate-speed/+merge/215746 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/jenkins-script into lp:openlp
Review: Approve -- https://code.launchpad.net/~googol/openlp/jenkins-script/+merge/215950 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:~sam92/openlp/author-types into lp:openlp
Samuel Mehrbrodt has proposed merging lp:~sam92/openlp/author-types into
lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
Tim Bentley (trb143)
Andreas Preikschat (googol)
For more details, see:
https://code.launchpad.net/~sam92/openlp/author-types/+merge/215961
Add support for Author Type
--
https://code.launchpad.net/~sam92/openlp/author-types/+merge/215961
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file '.bzrignore'
--- .bzrignore 2014-04-08 13:46:08 +
+++ .bzrignore 2014-04-15 21:16:23 +
@@ -6,6 +6,8 @@
*.ropeproject
*.e4*
.eric4project
+.komodotools
+*.komodoproject
list
openlp.org 2.0.e4*
documentation/build/html
=== modified file 'openlp/core/lib/db.py'
--- openlp/core/lib/db.py 2014-03-30 11:02:25 +
+++ openlp/core/lib/db.py 2014-04-15 21:16:23 +
@@ -194,6 +194,7 @@
db_ver, up_ver = upgrade_db(self.db_url, upgrade_mod)
except (SQLAlchemyError, DBAPIError):
log.exception('Error loading database: %s', self.db_url)
+return
if db_ver up_ver:
critical_error_message_box(
translate('OpenLP.Manager', 'Database Error'),
@@ -215,7 +216,7 @@
Save an object to the database
:param object_instance: The object to save
-:param commit: Commit the session with this object
+:param commit: Commit the session with this object
for try_count in range(3):
try:
=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py 2014-03-20 19:10:31 +
+++ openlp/core/ui/firsttimeform.py 2014-04-15 21:16:23 +
@@ -110,10 +110,10 @@
Run the wizard.
-self.setDefaults()
+self.set_defaults()
return QtGui.QWizard.exec_(self)
-def setDefaults(self):
+def set_defaults(self):
Set up display at start of theme edit.
=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py 2014-03-20 19:10:31 +
+++ openlp/core/ui/themeform.py 2014-04-15 21:16:23 +
@@ -90,7 +90,7 @@
self.footer_font_combo_box.activated.connect(self.update_theme)
self.footer_size_spin_box.valueChanged.connect(self.update_theme)
-def setDefaults(self):
+def set_defaults(self):
Set up display at start of theme edit.
@@ -261,7 +261,7 @@
log.debug('Editing theme %s' % self.theme.theme_name)
self.temp_background_filename = ''
self.update_theme_allowed = False
-self.setDefaults()
+self.set_defaults()
self.update_theme_allowed = True
self.theme_name_label.setVisible(not edit)
self.theme_name_edit.setVisible(not edit)
=== modified file 'openlp/core/ui/wizard.py'
--- openlp/core/ui/wizard.py 2014-03-20 19:10:31 +
+++ openlp/core/ui/wizard.py 2014-04-15 21:16:23 +
@@ -197,7 +197,7 @@
Run the wizard.
-self.setDefaults()
+self.set_defaults()
return QtGui.QWizard.exec_(self)
def reject(self):
=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py 2014-03-21 18:23:35 +
+++ openlp/plugins/bibles/forms/bibleimportform.py 2014-04-15 21:16:23 +
@@ -465,7 +465,7 @@
self.license_details_page.registerField('license_copyright', self.copyright_edit)
self.license_details_page.registerField('license_permissions', self.permissions_edit)
-def setDefaults(self):
+def set_defaults(self):
Set default values for the wizard pages.
=== modified file 'openlp/plugins/bibles/forms/bibleupgradeform.py'
--- openlp/plugins/bibles/forms/bibleupgradeform.py 2014-04-01 17:07:25 +
+++ openlp/plugins/bibles/forms/bibleupgradeform.py 2014-04-15 21:16:23 +
@@ -307,7 +307,7 @@
if self.currentPage() == self.progress_page:
return True
-def setDefaults(self):
+def set_defaults(self):
Set default values for the wizard pages.
=== modified file 'openlp/plugins/songs/forms/duplicatesongremovalform.py'
--- openlp/plugins/songs/forms/duplicatesongremovalform.py 2014-04-14 18:53:33 +
+++ openlp/plugins/songs/forms/duplicatesongremovalform.py 2014-04-15 21:16:23 +
@@ -264,7 +264,7 @@
self.break_search = True
self.plugin.media_item.on_search_text_button_clicked()
-def setDefaults(self):
+def set_defaults(self):
Set default form values for the song import wizard.
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py 2014-03-17 19:05:55 +
+++ openlp/plugins/songs/forms/editsongdialog.py 2014-04-15 21:16:23 +
@@ -122,6 +122,11 @@
self.author_add_layout.setObjectName('author_add_layout')
[Openlp-core] [Merge] lp:~sam92/openlp/pdf-fixes into lp:openlp
Samuel Mehrbrodt has proposed merging lp:~sam92/openlp/pdf-fixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~sam92/openlp/pdf-fixes/+merge/215962
PDF Fixes
- Changed some types to float instead of int because the string conversion
failed: int('1.1') doesnt work
- Check if files exist before deleting them
- Replace 'pass' with 'continue'. 'pass' is like return, it stops the whole
method.
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/261/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/222/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/171/
[SUCCESS] http://ci.openlp.org/job/Branch-04-Windows_Tests/132/
[FAILURE] http://ci.openlp.org/job/Branch-05-Code-Analysis/88/
--
https://code.launchpad.net/~sam92/openlp/pdf-fixes/+merge/215962
Your team OpenLP Core is requested to review the proposed merge of
lp:~sam92/openlp/pdf-fixes into lp:openlp.
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2014-04-01 17:07:25 +
+++ openlp/core/ui/slidecontroller.py 2014-04-15 21:16:42 +
@@ -495,14 +495,14 @@
self.on_theme_display(False)
self.on_hide_display(False)
-def service_previous(self):
+def service_previous(self, field=None):
Live event to select the previous service item from the service manager.
self.keypress_queue.append(ServiceItemAction.Previous)
self._process_queue()
-def service_next(self):
+def service_next(self, field=None):
Live event to select the next service item from the service manager.
=== modified file 'openlp/plugins/presentations/lib/pdfcontroller.py'
--- openlp/plugins/presentations/lib/pdfcontroller.py 2014-04-12 20:19:22 +
+++ openlp/plugins/presentations/lib/pdfcontroller.py 2014-04-15 21:16:42 +
@@ -204,19 +204,19 @@
log.debug(' '.join(e.cmd))
log.debug(e.output)
# Extract the pdf resolution from output, the format is Size: x: width, y: height
-width = 0
-height = 0
+width = 0.0
+height = 0.0
for line in runlog.splitlines():
try:
-width = int(re.search('.*Size: x: (\d+\.?\d*), y: \d+.*', line.decode()).group(1))
-height = int(re.search('.*Size: x: \d+\.?\d*, y: (\d+\.?\d*).*', line.decode()).group(1))
+width = float(re.search('.*Size: x: (\d+\.?\d*), y: \d+.*', line.decode()).group(1))
+height = float(re.search('.*Size: x: \d+\.?\d*, y: (\d+\.?\d*).*', line.decode()).group(1))
break
except AttributeError:
-pass
+continue
# Calculate the ratio from pdf to screen
if width 0 and height 0:
-width_ratio = size.right() / float(width)
-height_ratio = size.bottom() / float(height)
+width_ratio = size.right() / width
+height_ratio = size.bottom() / height
# return the resolution that should be used. 72 is default.
if width_ratio height_ratio:
return int(height_ratio * 72)
=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py'
--- openlp/plugins/presentations/lib/presentationcontroller.py 2014-03-18 20:36:02 +
+++ openlp/plugins/presentations/lib/presentationcontroller.py 2014-04-15 21:16:42 +
@@ -122,8 +122,10 @@
a file, e.g. thumbnails
try:
-shutil.rmtree(self.get_thumbnail_folder())
-shutil.rmtree(self.get_temp_folder())
+if os.path.exists(self.get_thumbnail_folder()):
+shutil.rmtree(self.get_thumbnail_folder())
+if os.path.exists(self.get_temp_folder()):
+shutil.rmtree(self.get_temp_folder())
except OSError:
log.exception('Failed to delete presentation controller files')
=== modified file 'tests/functional/openlp_core_lib/test_ui.py'
--- tests/functional/openlp_core_lib/test_ui.py 2014-04-15 20:53:47 +
+++ tests/functional/openlp_core_lib/test_ui.py 2014-04-15 21:16:42 +
@@ -145,3 +145,28 @@
self.assertIsInstance(combo, QtGui.QComboBox)
self.assertEqual('combo1', combo.objectName())
self.assertEqual(QtGui.QComboBox.AdjustToMinimumContentsLength, combo.sizeAdjustPolicy())
+
+def test_create_action(self):
+
+Test creating an action
+
+# GIVEN: A dialog
+dialog = QtGui.QDialog()
+
+# WHEN: We create an action
+action = create_action(dialog, 'my_action')
+
+# THEN: We should get a QAction
+self.assertIsInstance(action, QtGui.QAction)
+self.assertEqual('my_action', action.objectName())
+
+# WHEN: We create an action with some properties
+action = create_action(dialog, 'my_action', text='my text',
[Openlp-core] [Merge] lp:~sam92/openlp/bug-1117098 into lp:openlp
Samuel Mehrbrodt has proposed merging lp:~sam92/openlp/bug-1117098 into
lp:openlp.
Requested reviews:
Tim Bentley (trb143)
Related bugs:
Bug #1117098 in OpenLP: Transparent theme is white on Mac OSX
https://bugs.launchpad.net/openlp/+bug/1117098
For more details, see:
https://code.launchpad.net/~sam92/openlp/bug-1117098/+merge/215965
Fix transparent theme on OS X
Got the branch from https://code.launchpad.net/~marmyshev/openlp/bug_1117098
and fixed the tests
--
https://code.launchpad.net/~sam92/openlp/bug-1117098/+merge/215965
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2014-03-20 19:10:31 +
+++ openlp/core/ui/maindisplay.py 2014-04-15 21:19:55 +
@@ -168,8 +168,10 @@
if enabled:
self.setAutoFillBackground(False)
+self.setStyleSheet(QGraphicsView {background: transparent; border: 0px;})
else:
self.setAttribute(QtCore.Qt.WA_NoSystemBackground, False)
+self.setStyleSheet(QGraphicsView {})
self.setAttribute(QtCore.Qt.WA_TranslucentBackground, enabled)
self.repaint()
=== modified file 'tests/functional/openlp_core_ui/test_maindisplay.py'
--- tests/functional/openlp_core_ui/test_maindisplay.py 2014-01-11 19:46:31 +
+++ tests/functional/openlp_core_ui/test_maindisplay.py 2014-04-15 21:19:55 +
@@ -79,3 +79,31 @@
# THEN: The controller should not be a live controller.
self.assertEqual(main_display.is_live, True, 'The main display should be a live controller')
+
+def set_transparency_test(self):
+
+Test creating an instance of the MainDisplay class
+
+# GIVEN: get an instance of MainDisplay
+display = MagicMock()
+main_display = MainDisplay(display)
+
+# WHEN: We enable transparency
+main_display.set_transparency(True)
+
+# THEN: There should be a Stylesheet
+self.assertEqual('QGraphicsView {background: transparent; border: 0px;}', main_display.styleSheet(),
+ 'MainDisplay instance should be transparent')
+self.assertFalse(main_display.autoFillBackground(),
+ 'MainDisplay instance should be without background auto fill')
+self.assertTrue(main_display.testAttribute(QtCore.Qt.WA_TranslucentBackground),
+'MainDisplay hasnt translucent background')
+
+# WHEN: We disable transparency
+main_display.set_transparency(False)
+
+# THEN: The Stylesheet should be empty
+self.assertEqual('QGraphicsView {}', main_display.styleSheet(),
+ 'MainDisplay instance should not be transparent')
+self.assertFalse(main_display.testAttribute(QtCore.Qt.WA_TranslucentBackground),
+'MainDisplay hasnt translucent background')
___
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:~sam92/openlp/bug-1154467 into lp:openlp
Samuel Mehrbrodt has proposed merging lp:~sam92/openlp/bug-1154467 into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #1154467 in OpenLP: Web download bible db's getting locked
https://bugs.launchpad.net/openlp/+bug/1154467
For more details, see:
https://code.launchpad.net/~sam92/openlp/bug-1154467/+merge/215964
Attempt to fix bug #1154467 by waiting 10ms and retrying the commit
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/266/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/227/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/176/
[SUCCESS] http://ci.openlp.org/job/Branch-04-Windows_Tests/137/
[FAILURE] http://ci.openlp.org/job/Branch-05-Code-Analysis/93/
--
https://code.launchpad.net/~sam92/openlp/bug-1154467/+merge/215964
Your team OpenLP Core is requested to review the proposed merge of
lp:~sam92/openlp/bug-1154467 into lp:openlp.
=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py 2014-04-12 20:19:22 +
+++ openlp/plugins/bibles/lib/db.py 2014-04-15 21:19:26 +
@@ -32,9 +32,11 @@
import os
import re
import sqlite3
+import time
from PyQt4 import QtCore
from sqlalchemy import Column, ForeignKey, Table, or_, types, func
+from sqlalchemy.exc import OperationalError
from sqlalchemy.orm import class_mapper, mapper, relation
from sqlalchemy.orm.exc import UnmappedClassError
@@ -235,7 +237,12 @@
text=verse_text
)
self.session.add(verse)
-self.session.commit()
+try:
+self.session.commit()
+except OperationalError:
+# Wait 10ms and try again (lp#1154467)
+time.sleep(0.01)
+self.session.commit()
def create_verse(self, book_id, chapter, verse, text):
=== added file 'tests/functional/openlp_plugins/songs/test_zionworximport.py'
--- tests/functional/openlp_plugins/songs/test_zionworximport.py 1970-01-01 00:00:00 +
+++ tests/functional/openlp_plugins/songs/test_zionworximport.py 2014-04-15 21:19:26 +
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###
+# OpenLP - Open Source Lyrics Projection #
+# --- #
+# Copyright (c) 2008-2014 Raoul Snyman#
+# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
+# Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
+# --- #
+# 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 #
+###
+
+This module contains tests for the ZionWorx song importer.
+
+
+from unittest import TestCase
+
+from tests.functional import MagicMock, patch
+from openlp.plugins.songs.lib.zionworximport import ZionWorxImport
+from openlp.plugins.songs.lib.songimport import SongImport
+
+
+class TestZionWorxImport(TestCase):
+
+Test the functions in the :mod:`zionworximport` module.
+
+def create_importer_test(self):
+
+Test creating an instance of the ZionWorx file importer
+
+# GIVEN: A mocked out SongImport class, and a mocked out manager
+with patch('openlp.plugins.songs.lib.songbeamerimport.SongImport'):
+mocked_manager = MagicMock()
+
+# WHEN: An importer object is created
+
[Openlp-core] [Merge] lp:~sam92/openlp/title-slide into lp:openlp
Samuel Mehrbrodt has proposed merging lp:~sam92/openlp/title-slide into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~sam92/openlp/title-slide/+merge/215963
Add an option for a title slide.
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/265/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/226/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/175/
[SUCCESS] http://ci.openlp.org/job/Branch-04-Windows_Tests/136/
[FAILURE] http://ci.openlp.org/job/Branch-05-Code-Analysis/92/
--
https://code.launchpad.net/~sam92/openlp/title-slide/+merge/215963
Your team OpenLP Core is requested to review the proposed merge of
lp:~sam92/openlp/title-slide into lp:openlp.
=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py 2014-04-14 18:28:04 +
+++ openlp/core/lib/serviceitem.py 2014-04-15 21:18:05 +
@@ -110,7 +110,9 @@
``CanEditTitle``
The capability to edit the title of the item
-
+
+``HasTitleSlide``
+The capability to show a title slide
CanPreview = 1
CanEdit = 2
@@ -129,6 +131,7 @@
HasBackgroundAudio = 15
CanAutoStartForLive = 16
CanEditTitle = 17
+HasTitleSlide = 18
class ServiceItem(RegistryProperties):
@@ -232,9 +235,16 @@
log.debug('Render called')
self._display_frames = []
self.bg_image_bytes = None
+self.title = clean_tags(self.title)
if not provides_own_theme_data:
self.renderer.set_item_theme(self.theme)
self.theme_data, self.main, self.footer = self.renderer.pre_render()
+if self.is_capable(ItemCapabilities.HasTitleSlide):
+self._display_frames.append({'title': 'Title',
+ 'text': self.title,
+ 'html': self.title,
+ 'verseTag': 'T'
+ })
if self.service_item_type == ServiceItemType.Text:
log.debug('Formatting slides: %s' % self.title)
# Save rendered pages to this dict. In the case that a slide is used twice we can use the pages saved to
@@ -260,7 +270,6 @@
pass
else:
log.error('Invalid value renderer: %s' % self.service_item_type)
-self.title = clean_tags(self.title)
# The footer should never be None, but to be compatible with a few
# nightly builds between 1.9.4 and 1.9.5, we have to correct this to
# avoid tracebacks.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2014-03-20 19:10:31 +
+++ openlp/core/ui/maindisplay.py 2014-04-15 21:18:05 +
@@ -44,7 +44,7 @@
from PyQt4.phonon import Phonon
from openlp.core.common import Registry, RegistryProperties, OpenLPMixin, Settings, translate
-from openlp.core.lib import ServiceItem, ImageSource, build_html, expand_tags, image_to_byte
+from openlp.core.lib import ServiceItem, ItemCapabilities, ImageSource, build_html, expand_tags, image_to_byte
from openlp.core.lib.theme import BackgroundType
from openlp.core.lib import ScreenList
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2014-04-12 20:19:22 +
+++ openlp/plugins/songs/lib/mediaitem.py 2014-04-15 21:18:05 +
@@ -125,6 +125,7 @@
self.search_as_you_type = Settings().value(self.settings_section + '/search as type')
self.update_service_on_edit = Settings().value(self.settings_section + '/update service on edit')
self.add_song_from_service = Settings().value(self.settings_section + '/add song from service',)
+self.display_title_slide = Settings().value(self.settings_section + '/display title slide',)
def retranslateUi(self):
self.search_text_label.setText('%s:' % UiStrings().Search)
@@ -413,6 +414,8 @@
service_item.add_capability(ItemCapabilities.OnLoadUpdate)
service_item.add_capability(ItemCapabilities.AddIfNewItem)
service_item.add_capability(ItemCapabilities.CanSoftBreak)
+if self.display_title_slide:
+service_item.add_capability(ItemCapabilities.HasTitleSlide)
song = self.plugin.manager.get_object(Song, item_id)
service_item.theme = song.theme_name
service_item.edit_id = item_id
=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py 2014-03-08 19:58:58 +
+++ openlp/plugins/songs/lib/songstab.py 2014-04-15 21:18:05 +
@@ -59,6 +59,9 @@
self.add_from_service_check_box = QtGui.QCheckBox(self.mode_group_box)
self.add_from_service_check_box.setObjectName('add_from_service_check_box')
self.mode_layout.addWidget(self.add_from_service_check_box)
+self.title_slide_check_box = QtGui.QCheckBox(self.mode_group_box)
+
Re: [Openlp-core] [Merge] lp:~sam92/openlp/bug-1117098 into lp:openlp
Review: Approve -- https://code.launchpad.net/~sam92/openlp/bug-1117098/+merge/215965 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:~sam92/openlp/pdf-fixes into lp:openlp
Review: Approve -- https://code.launchpad.net/~sam92/openlp/pdf-fixes/+merge/215962 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:~sam92/openlp/fix-songbook-search into lp:openlp
What Andreas said... -- https://code.launchpad.net/~sam92/openlp/fix-songbook-search/+merge/215243 Your team OpenLP Core is requested to review the proposed merge of lp:~sam92/openlp/fix-songbook-search 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
Re: [Openlp-core] [Merge] lp:~sam92/openlp/fix-songbook-search into lp:openlp
The file_import_test fails and I don't know why. Can someone help me out there? -- https://code.launchpad.net/~sam92/openlp/fix-songbook-search/+merge/215978 Your team OpenLP Core is requested to review the proposed merge of lp:~sam92/openlp/fix-songbook-search 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:~sam92/openlp/fix-songbook-search into lp:openlp
Samuel Mehrbrodt has proposed merging lp:~sam92/openlp/fix-songbook-search into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #1306958 in OpenLP: Song Book search broken
https://bugs.launchpad.net/openlp/+bug/1306958
For more details, see:
https://code.launchpad.net/~sam92/openlp/fix-songbook-search/+merge/215978
Fix Songbook search
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/264/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/225/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/174/
[SUCCESS] http://ci.openlp.org/job/Branch-04-Windows_Tests/135/
[FAILURE] http://ci.openlp.org/job/Branch-05-Code-Analysis/91/
--
https://code.launchpad.net/~sam92/openlp/fix-songbook-search/+merge/215978
Your team OpenLP Core is requested to review the proposed merge of
lp:~sam92/openlp/fix-songbook-search into lp:openlp.
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2014-04-12 20:19:22 +
+++ openlp/plugins/songs/lib/mediaitem.py 2014-04-15 22:24:48 +
@@ -192,7 +192,7 @@
song_number = False
if not search_results:
search_keywords = search_keywords.rpartition(' ')
-search_string = '%' + search_keywords + '%'
+search_string = '%' + search_keywords[0] + '%'
search_results = self.plugin.manager.get_all_objects(Book,
Book.name.like(search_string), Book.name.asc())
song_number = re.sub(r'[^0-9]', '', search_keywords[2])
=== modified file 'openlp/plugins/songs/lib/openlyricsimport.py'
--- openlp/plugins/songs/lib/openlyricsimport.py 2014-03-06 22:05:15 +
+++ openlp/plugins/songs/lib/openlyricsimport.py 2014-04-15 22:24:48 +
@@ -53,7 +53,7 @@
Initialise the Open Lyrics importer.
log.debug('initialise OpenLyricsImport')
-SongImport.__init__(self, manager, **kwargs)
+super(OpenLyricsImport, self).__init__(manager, **kwargs)
self.open_lyrics = OpenLyrics(self.manager)
def do_import(self):
@@ -71,7 +71,7 @@
# special characters in the path (see lp:757673 and lp:744337).
parsed_file = etree.parse(open(file_path, 'r'), parser)
xml = etree.tostring(parsed_file).decode()
-self.open_lyrics.xml_to_song(xml)
+return self.open_lyrics.xml_to_song(xml)
except etree.XMLSyntaxError:
log.exception('XML syntax error in file %s' % file_path)
self.log_error(file_path, SongStrings.XMLSyntaxError)
=== added file 'tests/functional/openlp_plugins/songs/test_openlyricsimport.py'
--- tests/functional/openlp_plugins/songs/test_openlyricsimport.py 1970-01-01 00:00:00 +
+++ tests/functional/openlp_plugins/songs/test_openlyricsimport.py 2014-04-15 22:24:48 +
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###
+# OpenLP - Open Source Lyrics Projection #
+# --- #
+# Copyright (c) 2008-2014 Raoul Snyman#
+# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
+# Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
+# --- #
+# 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
Re: [Openlp-core] [Merge] lp:~googol/openlp/jenkins-script into lp:openlp
Review: Approve -- https://code.launchpad.net/~googol/openlp/jenkins-script/+merge/215950 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/jenkins-script into lp:openlp
The proposal to merge lp:~googol/openlp/jenkins-script into lp:openlp has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~googol/openlp/jenkins-script/+merge/215950 -- https://code.launchpad.net/~googol/openlp/jenkins-script/+merge/215950 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:~sam92/openlp/bug-1117098 into lp:openlp
Review: Approve -- https://code.launchpad.net/~sam92/openlp/bug-1117098/+merge/215965 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/jenkins-script into lp:openlp
The proposal to merge lp:~googol/openlp/jenkins-script into lp:openlp has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~googol/openlp/jenkins-script/+merge/215950 -- https://code.launchpad.net/~googol/openlp/jenkins-script/+merge/215950 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:~sam92/openlp/bug-1117098 into lp:openlp
The proposal to merge lp:~sam92/openlp/bug-1117098 into lp:openlp has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~sam92/openlp/bug-1117098/+merge/215965 -- https://code.launchpad.net/~sam92/openlp/bug-1117098/+merge/215965 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:~sam92/openlp/bug-1117098 into lp:openlp
The proposal to merge lp:~sam92/openlp/bug-1117098 into lp:openlp has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~sam92/openlp/bug-1117098/+merge/215965 -- https://code.launchpad.net/~sam92/openlp/bug-1117098/+merge/215965 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:~sam92/openlp/pdf-fixes into lp:openlp
Review: Approve -- https://code.launchpad.net/~sam92/openlp/pdf-fixes/+merge/215962 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:~sam92/openlp/pdf-fixes into lp:openlp
The proposal to merge lp:~sam92/openlp/pdf-fixes into lp:openlp has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~sam92/openlp/pdf-fixes/+merge/215962 -- https://code.launchpad.net/~sam92/openlp/pdf-fixes/+merge/215962 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:~springermac/openlp/fix-ups into lp:openlp
Review: Approve -- https://code.launchpad.net/~springermac/openlp/fix-ups/+merge/215942 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:~springermac/openlp/fix-ups into lp:openlp
The proposal to merge lp:~springermac/openlp/fix-ups into lp:openlp has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~springermac/openlp/fix-ups/+merge/215942 -- https://code.launchpad.net/~springermac/openlp/fix-ups/+merge/215942 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:~springermac/openlp/fix-ups into lp:openlp
The proposal to merge lp:~springermac/openlp/fix-ups into lp:openlp has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~springermac/openlp/fix-ups/+merge/215942 -- https://code.launchpad.net/~springermac/openlp/fix-ups/+merge/215942 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 1117098] Re: Transparent theme is white on Mac OSX
** Changed in: openlp/trunk Status: In Progress = Fix Committed ** Changed in: openlp/trunk Assignee: Dmitriy Marmyshev (marmyshev) = (unassigned) ** Changed in: openlp/trunk Assignee: (unassigned) = Samuel Mehrbrodt (sam92) -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1117098 Title: Transparent theme is white on Mac OSX Status in OpenLP - Worship Presentation Software: Fix Committed Status in OpenLP 2.0 series: Fix Released Status in OpenLP trunk series: Fix Committed Bug description: Mac OS X Leopard OLP 2.0.1 release checked on windows 7 - there is no problems with transparency. On Mac - background is white instead of transparent. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1117098/+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
