[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-09-04 Thread John Lines 
John Lines has proposed merging lp:~john+ubuntu-g/openlp/singingthefaith into 
lp:openlp.

Commit message:
Initial merge of SingingTheFaithImport, including update to importer.py

Requested reviews:
  Tomas Groth (tomasgroth)
  Phill (phill-ridout)
  Raoul Snyman (raoul-snyman)

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372277

Singing The Faith is the new Authorized Hymn book for the Methodist Church of 
Great Britain.
There is an electronic version of the Hymn book, for Windows only, which can 
export Hymns as text files.

This import module smooths the process of converting these text files into 
OpenLP. The input format is messy and not intended for automatic processing so 
the importer uses a combination of heuristics and a hints file. This version 
has not been tested on all the hymns in Singing The Faith, but deals with most 
of the, more than 600, hymns it has been tested with.

Documentation for the source format and hints file is at 
https://wiki.openlp.org/Development:SingingTheFaith_Format

The change includes a test module, which works for the single verse case, and 
for a whole song - both without use of hints, and another couple of cases using 
hints.


-- 
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py	2019-04-13 13:00:22 +
+++ openlp/plugins/songs/lib/importer.py	2019-09-04 16:19:42 +
@@ -42,6 +42,7 @@
 from .importers.powersong import PowerSongImport
 from .importers.presentationmanager import PresentationManagerImport
 from .importers.propresenter import ProPresenterImport
+from .importers.singingthefaith import SingingTheFaithImport
 from .importers.songbeamer import SongBeamerImport
 from .importers.songpro import SongProImport
 from .importers.songshowplus import SongShowPlusImport
@@ -173,16 +174,17 @@
 PowerSong = 16
 PresentationManager = 17
 ProPresenter = 18
-SongBeamer = 19
-SongPro = 20
-SongShowPlus = 21
-SongsOfFellowship = 22
-SundayPlus = 23
-VideoPsalm = 24
-WordsOfWorship = 25
-WorshipAssistant = 26
-WorshipCenterPro = 27
-ZionWorx = 28
+SingingTheFaith = 19
+SongBeamer = 20
+SongPro = 21
+SongShowPlus = 22
+SongsOfFellowship = 23
+SundayPlus = 24
+VideoPsalm = 25
+WordsOfWorship = 26
+WorshipAssistant = 27
+WorshipCenterPro = 28
+ZionWorx = 29
 
 # Set optional attribute defaults
 __defaults__ = {
@@ -343,6 +345,16 @@
 'filter': '{text} (*.pro4 *.pro5 *.pro6)'.format(text=translate('SongsPlugin.ImportWizardForm',
 'ProPresenter Song Files'))
 },
+SingingTheFaith: {
+'class': SingingTheFaithImport,
+'name': 'SingingTheFaith',
+'prefix': 'singingTheFaith',
+'filter': '{text} (*.txt)'.format(text=translate('SongsPlugin.ImportWizardForm',
+ 'Singing The Faith Exported Files')),
+'descriptionText': translate('SongsPlugin.ImportWizardForm',
+ 'First use Singing The Faith Electonic edition to export '
+ 'the song(s) in Text format.')
+},
 SongBeamer: {
 'class': SongBeamerImport,
 'name': 'SongBeamer',
@@ -462,6 +474,7 @@
 SongFormat.PowerSong,
 SongFormat.PresentationManager,
 SongFormat.ProPresenter,
+SongFormat.SingingTheFaith,
 SongFormat.SongBeamer,
 SongFormat.SongPro,
 SongFormat.SongShowPlus,

=== added file 'openlp/plugins/songs/lib/importers/singingthefaith-hints.tag'
--- openlp/plugins/songs/lib/importers/singingthefaith-hints.tag	1970-01-01 00:00:00 +
+++ openlp/plugins/songs/lib/importers/singingthefaith-hints.tag	2019-09-04 16:19:42 +
@@ -0,0 +1,666 @@
+Tag-STFHints-version: 1.0
+Version: 2
+SongbookNumberInTitle: False
+End:
+Hymn: 2
+VerseOrder: V1,C1,V2,C1,V3,C1
+End:
+Hymn: 8
+AddSpaceAfterColon: 2,11,20,33
+End:
+Hymn: 10
+CommentsLine: 17
+End:
+Hymn: 11
+CommentsLine: 24
+End:
+Hymn: 15
+VerseOrder: V1,C1,V2,C1,C2,C1
+End:
+Hymn: 18
+CommentsLine: 16
+End:
+Hymn: 19
+CommentsLine: 8
+End:
+Hymn: 22
+CommentsLine: 20
+End:
+Hymn: 24
+IgnoreLine: 13
+VerseOrder: V1,V2,V1
+End:
+Hymn: 26
+VerseOrder: V1,C1,V2,C1,V3,C1,V4,C1,V5,C1
+End:
+Hymn: 27
+AddComment: Verse 1 is original Shona
+SongTitle: Jesu, tawa pano
+IgnoreLine: 2
+CommentsLine: 31
+End:
+Hymn: 28
+CommentsLine: 41
+End:
+Hymn: 29
+CommentsLine: 18
+End:
+Hymn: 30
+CommentsLine: 26
+End:
+Hymn: 35
+VerseOrder: V1,C1,V2,C1,V3,C1
+End:
+Hymn: 37
+IgnoreLine: 42
+VerseOrder: V1,V2,C1,V3,V4,C1
+End:
+Hymn: 38
+ManualCheck: Yes
+AddComment: Make all and cantor words Bold tagged for readability
+SongTitle

[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-09-04 Thread John Lines 
The proposal to merge lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp 
has been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372194
-- 
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:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-09-03 Thread John Lines 
John Lines has proposed merging lp:~john+ubuntu-g/openlp/singingthefaith into 
lp:openlp.

Commit message:
Initial merge of SingingTheFaithImport, including update to importer.py

Requested reviews:
  Raoul Snyman (raoul-snyman)
  Tomas Groth (tomasgroth)
  Phill (phill-ridout)

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372194

Singing The Faith is the new Authorized Hymn book for the Methodist Church of 
Great Britain.
There is an electronic version of the Hymn book, for Windows only, which can 
export Hymns as text files.

This import module smooths the process of converting these text files into 
OpenLP. The input format is messy and not intended for automatic processing so 
the importer uses a combination of heuristics and a hints file. This version 
has not been tested on all the hymns in Singing The Faith, but deals with most 
of the, more than 600, hymns it has been tested with.

Documentation for the source format and hints file is at 
https://wiki.openlp.org/Development:SingingTheFaith_Format

The change includes a test module, which works for the single verse case, and 
for a whole song - both without use of hints, and another couple of cases using 
hints.


-- 
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py	2019-04-13 13:00:22 +
+++ openlp/plugins/songs/lib/importer.py	2019-09-03 12:48:40 +
@@ -42,6 +42,7 @@
 from .importers.powersong import PowerSongImport
 from .importers.presentationmanager import PresentationManagerImport
 from .importers.propresenter import ProPresenterImport
+from .importers.singingthefaith import SingingTheFaithImport
 from .importers.songbeamer import SongBeamerImport
 from .importers.songpro import SongProImport
 from .importers.songshowplus import SongShowPlusImport
@@ -173,16 +174,17 @@
 PowerSong = 16
 PresentationManager = 17
 ProPresenter = 18
-SongBeamer = 19
-SongPro = 20
-SongShowPlus = 21
-SongsOfFellowship = 22
-SundayPlus = 23
-VideoPsalm = 24
-WordsOfWorship = 25
-WorshipAssistant = 26
-WorshipCenterPro = 27
-ZionWorx = 28
+SingingTheFaith = 19
+SongBeamer = 20
+SongPro = 21
+SongShowPlus = 22
+SongsOfFellowship = 23
+SundayPlus = 24
+VideoPsalm = 25
+WordsOfWorship = 26
+WorshipAssistant = 27
+WorshipCenterPro = 28
+ZionWorx = 29
 
 # Set optional attribute defaults
 __defaults__ = {
@@ -343,6 +345,16 @@
 'filter': '{text} (*.pro4 *.pro5 *.pro6)'.format(text=translate('SongsPlugin.ImportWizardForm',
 'ProPresenter Song Files'))
 },
+SingingTheFaith: {
+'class': SingingTheFaithImport,
+'name': 'SingingTheFaith',
+'prefix': 'singingTheFaith',
+'filter': '{text} (*.txt)'.format(text=translate('SongsPlugin.ImportWizardForm',
+ 'Singing The Faith Exported Files')),
+'descriptionText': translate('SongsPlugin.ImportWizardForm',
+ 'First use Singing The Faith Electonic edition to export '
+ 'the song(s) in Text format.')
+},
 SongBeamer: {
 'class': SongBeamerImport,
 'name': 'SongBeamer',
@@ -462,6 +474,7 @@
 SongFormat.PowerSong,
 SongFormat.PresentationManager,
 SongFormat.ProPresenter,
+SongFormat.SingingTheFaith,
 SongFormat.SongBeamer,
 SongFormat.SongPro,
 SongFormat.SongShowPlus,

=== added file 'openlp/plugins/songs/lib/importers/singingthefaith.py'
--- openlp/plugins/songs/lib/importers/singingthefaith.py	1970-01-01 00:00:00 +
+++ openlp/plugins/songs/lib/importers/singingthefaith.py	2019-09-03 12:48:40 +
@@ -0,0 +1,427 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###
+# OpenLP - Open Source Lyrics Projection  #
+# --- #
+# Copyright (c) 2008-2019 OpenLP Developers   #
+# --- #
+# 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 3 of the License.  #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even

[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-09-03 Thread John Lines 
The proposal to merge lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp 
has been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372191
-- 
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] Linting: Failed

2019-09-03 Thread John Lines 
> Linting failed, please see https://ci.openlp.io/job/MP-05-Linting/166/ for
> more details

now fixed - blank lines at end of test code
-- 
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372191
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:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-09-03 Thread John Lines 
John Lines has proposed merging lp:~john+ubuntu-g/openlp/singingthefaith into 
lp:openlp.

Commit message:
Initial merge of SingingTheFaithImport, including update to importer.py

Requested reviews:
  Tomas Groth (tomasgroth)
  Phill (phill-ridout)
  Raoul Snyman (raoul-snyman)

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372191

Singing The Faith is the new Authorized Hymn book for the Methodist Church of 
Great Britain.
There is an electronic version of the Hymn book, for Windows only, which can 
export Hymns as text files.

This import module smooths the process of converting these text files into 
OpenLP. The input format is messy and not intended for automatic processing so 
the importer uses a combination of heuristics and a hints file. This version 
has not been tested on all the hymns in Singing The Faith, but deals with most 
of the, more than 600, hymns it has been tested with.

Documentation for the source format and hints file is at 
https://wiki.openlp.org/Development:SingingTheFaith_Format

The change includes a test module, which works for the single verse case, and 
for a whole song.


-- 
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py	2019-04-13 13:00:22 +
+++ openlp/plugins/songs/lib/importer.py	2019-09-03 11:58:03 +
@@ -42,6 +42,7 @@
 from .importers.powersong import PowerSongImport
 from .importers.presentationmanager import PresentationManagerImport
 from .importers.propresenter import ProPresenterImport
+from .importers.singingthefaith import SingingTheFaithImport
 from .importers.songbeamer import SongBeamerImport
 from .importers.songpro import SongProImport
 from .importers.songshowplus import SongShowPlusImport
@@ -173,16 +174,17 @@
 PowerSong = 16
 PresentationManager = 17
 ProPresenter = 18
-SongBeamer = 19
-SongPro = 20
-SongShowPlus = 21
-SongsOfFellowship = 22
-SundayPlus = 23
-VideoPsalm = 24
-WordsOfWorship = 25
-WorshipAssistant = 26
-WorshipCenterPro = 27
-ZionWorx = 28
+SingingTheFaith = 19
+SongBeamer = 20
+SongPro = 21
+SongShowPlus = 22
+SongsOfFellowship = 23
+SundayPlus = 24
+VideoPsalm = 25
+WordsOfWorship = 26
+WorshipAssistant = 27
+WorshipCenterPro = 28
+ZionWorx = 29
 
 # Set optional attribute defaults
 __defaults__ = {
@@ -343,6 +345,16 @@
 'filter': '{text} (*.pro4 *.pro5 *.pro6)'.format(text=translate('SongsPlugin.ImportWizardForm',
 'ProPresenter Song Files'))
 },
+SingingTheFaith: {
+'class': SingingTheFaithImport,
+'name': 'SingingTheFaith',
+'prefix': 'singingTheFaith',
+'filter': '{text} (*.txt)'.format(text=translate('SongsPlugin.ImportWizardForm',
+ 'Singing The Faith Exported Files')),
+'descriptionText': translate('SongsPlugin.ImportWizardForm',
+ 'First use Singing The Faith Electonic edition to export '
+ 'the song(s) in Text format.')
+},
 SongBeamer: {
 'class': SongBeamerImport,
 'name': 'SongBeamer',
@@ -462,6 +474,7 @@
 SongFormat.PowerSong,
 SongFormat.PresentationManager,
 SongFormat.ProPresenter,
+SongFormat.SingingTheFaith,
 SongFormat.SongBeamer,
 SongFormat.SongPro,
 SongFormat.SongShowPlus,

=== added file 'openlp/plugins/songs/lib/importers/singingthefaith.py'
--- openlp/plugins/songs/lib/importers/singingthefaith.py	1970-01-01 00:00:00 +
+++ openlp/plugins/songs/lib/importers/singingthefaith.py	2019-09-03 11:58:03 +
@@ -0,0 +1,427 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###
+# OpenLP - Open Source Lyrics Projection  #
+# --- #
+# Copyright (c) 2008-2019 OpenLP Developers   #
+# --- #
+# 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 3 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

[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-09-03 Thread John Lines 
The proposal to merge lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp 
has been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372031
-- 
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:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-08-29 Thread John Lines 
The proposal to merge lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp 
has been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/370364
-- 
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:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-08-23 Thread John Lines 
The use of STFnnn - in the title is now controlled by a hint. Also other code 
tidying.
-- 
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/370364
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:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-07-19 Thread John Lines 
The proposal to merge lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp 
has been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369490
-- 
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:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-07-16 Thread John Lines 
Using new string formatting, constructor for class.
-- 
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369490
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:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-06-30 Thread John Lines 
John Lines has proposed merging lp:~john+ubuntu-g/openlp/singingthefaith into 
lp:openlp.

Commit message:
Initial merge of SingingTheFaithImport, including update to importer.py

Requested reviews:
  Raoul Snyman (raoul-snyman)

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369490

Singing The Faith is the new Authorized Hymn book for the Methodist Church of 
Great Britain.
There is an electronic version of the Hymn book, for Windows only, which can 
export Hymns as text files.

This import module smooths the process of converting these text files into 
OpenLP. The input format is messy and not intended for automatic processing so 
the importer uses a combination of heuristics and a hints file. This version 
has not been tested on all the hymns in Singing The Faith, but deals with most 
of the, more than 100, hymns it has been tested with.

Note that it includes a test module, which works for the single verse case. 
Multiple verse songs import OK, but tests fail.
-- 
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py	2019-04-13 13:00:22 +
+++ openlp/plugins/songs/lib/importer.py	2019-06-30 19:19:46 +
@@ -42,6 +42,7 @@
 from .importers.powersong import PowerSongImport
 from .importers.presentationmanager import PresentationManagerImport
 from .importers.propresenter import ProPresenterImport
+from .importers.singingthefaith import SingingTheFaithImport
 from .importers.songbeamer import SongBeamerImport
 from .importers.songpro import SongProImport
 from .importers.songshowplus import SongShowPlusImport
@@ -173,16 +174,17 @@
 PowerSong = 16
 PresentationManager = 17
 ProPresenter = 18
-SongBeamer = 19
-SongPro = 20
-SongShowPlus = 21
-SongsOfFellowship = 22
-SundayPlus = 23
-VideoPsalm = 24
-WordsOfWorship = 25
-WorshipAssistant = 26
-WorshipCenterPro = 27
-ZionWorx = 28
+SingingTheFaith = 19
+SongBeamer = 20
+SongPro = 21
+SongShowPlus = 22
+SongsOfFellowship = 23
+SundayPlus = 24
+VideoPsalm = 25
+WordsOfWorship = 26
+WorshipAssistant = 27
+WorshipCenterPro = 28
+ZionWorx = 29
 
 # Set optional attribute defaults
 __defaults__ = {
@@ -343,6 +345,15 @@
 'filter': '{text} (*.pro4 *.pro5 *.pro6)'.format(text=translate('SongsPlugin.ImportWizardForm',
 'ProPresenter Song Files'))
 },
+SingingTheFaith: {
+'class': SingingTheFaithImport,
+'name': 'SingingTheFaith',
+'prefix': 'singingTheFaith',
+'filter': '%s (*.txt)' % translate('SongsPlugin.ImportWizardForm', 'Singing The Faith Exported Files'),
+'descriptionText': translate('SongsPlugin.ImportWizardForm',
+ 'First use Singing The Faith Electonic edition to export '
+ 'the song(s) in Text format.')
+},
 SongBeamer: {
 'class': SongBeamerImport,
 'name': 'SongBeamer',
@@ -462,6 +473,7 @@
 SongFormat.PowerSong,
 SongFormat.PresentationManager,
 SongFormat.ProPresenter,
+SongFormat.SingingTheFaith,
 SongFormat.SongBeamer,
 SongFormat.SongPro,
 SongFormat.SongShowPlus,

=== added file 'openlp/plugins/songs/lib/importers/singingthefaith.py'
--- openlp/plugins/songs/lib/importers/singingthefaith.py	1970-01-01 00:00:00 +
+++ openlp/plugins/songs/lib/importers/singingthefaith.py	2019-06-30 19:19:46 +
@@ -0,0 +1,347 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###
+# OpenLP - Open Source Lyrics Projection  #
+# --- #
+# Copyright (c) 2008-2019 OpenLP Developers   #
+# --- #
+# 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

[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-06-30 Thread John Lines 
The proposal to merge lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp 
has been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369489
-- 
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:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-06-30 Thread John Lines 
Fix lint tests outside main importer code
-- 
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369489
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:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-06-30 Thread John Lines 
John Lines has proposed merging lp:~john+ubuntu-g/openlp/singingthefaith into 
lp:openlp.

Commit message:
Initial merge of SingingTheFaithImport, including update to importer.py

Requested reviews:
  Raoul Snyman (raoul-snyman)

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369489

Singing The Faith is the new Authorized Hymn book for the Methodist Church of 
Great Britain.
There is an electronic version of the Hymn book, for Windows only, which can 
export Hymns as text files.

This import module smooths the process of converting these text files into 
OpenLP. The input format is messy and not intended for automatic processing so 
the importer uses a combination of heuristics and a hints file. This version 
has not been tested on all the hymns in Singing The Faith, but deals with most 
of the, more than 100, hymns it has been tested with.

Note that it includes a test module, which works for the single verse case. 
Multiple verse songs import OK, but tests fail.
-- 
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py	2019-04-13 13:00:22 +
+++ openlp/plugins/songs/lib/importer.py	2019-06-30 18:28:14 +
@@ -42,6 +42,7 @@
 from .importers.powersong import PowerSongImport
 from .importers.presentationmanager import PresentationManagerImport
 from .importers.propresenter import ProPresenterImport
+from .importers.singingthefaith import SingingTheFaithImport
 from .importers.songbeamer import SongBeamerImport
 from .importers.songpro import SongProImport
 from .importers.songshowplus import SongShowPlusImport
@@ -173,16 +174,17 @@
 PowerSong = 16
 PresentationManager = 17
 ProPresenter = 18
-SongBeamer = 19
-SongPro = 20
-SongShowPlus = 21
-SongsOfFellowship = 22
-SundayPlus = 23
-VideoPsalm = 24
-WordsOfWorship = 25
-WorshipAssistant = 26
-WorshipCenterPro = 27
-ZionWorx = 28
+SingingTheFaith = 19
+SongBeamer = 20
+SongPro = 21
+SongShowPlus = 22
+SongsOfFellowship = 23
+SundayPlus = 24
+VideoPsalm = 25
+WordsOfWorship = 26
+WorshipAssistant = 27
+WorshipCenterPro = 28
+ZionWorx = 29
 
 # Set optional attribute defaults
 __defaults__ = {
@@ -343,6 +345,15 @@
 'filter': '{text} (*.pro4 *.pro5 *.pro6)'.format(text=translate('SongsPlugin.ImportWizardForm',
 'ProPresenter Song Files'))
 },
+   SingingTheFaith: {
+'class': SingingTheFaithImport,
+'name': 'SingingTheFaith',
+'prefix': 'singingTheFaith',
+'filter': '%s (*.txt)' % translate('SongsPlugin.ImportWizardForm', 'Singing The Faith Exported Files'),
+'descriptionText': translate('SongsPlugin.ImportWizardForm',
+ 'First use Singing The Faith Electonic edition to export '
+ 'the song(s) in Text format.')
+},
 SongBeamer: {
 'class': SongBeamerImport,
 'name': 'SongBeamer',
@@ -462,6 +473,7 @@
 SongFormat.PowerSong,
 SongFormat.PresentationManager,
 SongFormat.ProPresenter,
+SongFormat.SingingTheFaith,
 SongFormat.SongBeamer,
 SongFormat.SongPro,
 SongFormat.SongShowPlus,

=== added file 'openlp/plugins/songs/lib/importers/singingthefaith.py'
--- openlp/plugins/songs/lib/importers/singingthefaith.py	1970-01-01 00:00:00 +
+++ openlp/plugins/songs/lib/importers/singingthefaith.py	2019-06-30 18:28:14 +
@@ -0,0 +1,347 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###
+# OpenLP - Open Source Lyrics Projection  #
+# --- #
+# Copyright (c) 2008-2019 OpenLP Developers   #
+# --- #
+# 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

[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-06-30 Thread John Lines 
The proposal to merge lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp 
has been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369398
-- 
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:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-06-30 Thread John Lines 
1. Thanks for the info on flake8 - is now flake8 clean - you are quite right - 
it is better for me to learn about the tools.
2. Think indentation is fixed - flake8 was handy as well
3. Email address now set in my bzr config
4. Can you have another look at the change now.

-- 
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369398
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:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-06-29 Thread John Lines 
> A few in-line comments. Also you don't need to use parenthesis around the
> expressions in the if statements.

Thanks - have updated to use Path more, and have removed redudant parentheses 
round expressions in if statements
-- 
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369398
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:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-06-27 Thread John Lines 
John Lines has proposed merging lp:~john+ubuntu-g/openlp/singingthefaith into 
lp:openlp.

Commit message:
Initial merge of SingingTheFaithImport, including update to importer.py

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/369398

Singing The Faith is the new Authorized Hymn book for the Methodist Church of 
Great Britain.
There is an electronic version of the Hymn book, for Windows only, which can 
export Hymns as text files.

This import module smooths the process of converting these text files into 
OpenLP. The input format is messy and not intended for automatic processing so 
the importer uses a combination of heuristics and a hints file. This version 
has not been tested on all the hymns in Singing The Faith, but deals with most 
of the, more than 100, hymns it has been tested with.

Note that it includes a test module, but that test module fails, and I am not 
sure why.
-- 
Your team OpenLP Core is requested to review the proposed merge of 
lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp.
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py	2019-04-13 13:00:22 +
+++ openlp/plugins/songs/lib/importer.py	2019-06-27 12:35:49 +
@@ -42,6 +42,7 @@
 from .importers.powersong import PowerSongImport
 from .importers.presentationmanager import PresentationManagerImport
 from .importers.propresenter import ProPresenterImport
+from .importers.singingthefaith import SingingTheFaithImport
 from .importers.songbeamer import SongBeamerImport
 from .importers.songpro import SongProImport
 from .importers.songshowplus import SongShowPlusImport
@@ -173,16 +174,17 @@
 PowerSong = 16
 PresentationManager = 17
 ProPresenter = 18
-SongBeamer = 19
-SongPro = 20
-SongShowPlus = 21
-SongsOfFellowship = 22
-SundayPlus = 23
-VideoPsalm = 24
-WordsOfWorship = 25
-WorshipAssistant = 26
-WorshipCenterPro = 27
-ZionWorx = 28
+SingingTheFaith = 19
+SongBeamer = 20
+SongPro = 21
+SongShowPlus = 22
+SongsOfFellowship = 23
+SundayPlus = 24
+VideoPsalm = 25
+WordsOfWorship = 26
+WorshipAssistant = 27
+WorshipCenterPro = 28
+ZionWorx = 29
 
 # Set optional attribute defaults
 __defaults__ = {
@@ -343,6 +345,15 @@
 'filter': '{text} (*.pro4 *.pro5 *.pro6)'.format(text=translate('SongsPlugin.ImportWizardForm',
 'ProPresenter Song Files'))
 },
+   SingingTheFaith: {
+'class': SingingTheFaithImport,
+'name': 'SingingTheFaith',
+'prefix': 'singingTheFaith',
+'filter': '%s (*.txt)' % translate('SongsPlugin.ImportWizardForm', 'Singing The Faith Exported Files'),
+'descriptionText': translate('SongsPlugin.ImportWizardForm',
+ 'First use Singing The Faith Electonic edition to export '
+ 'the song(s) in Text format.')
+},
 SongBeamer: {
 'class': SongBeamerImport,
 'name': 'SongBeamer',
@@ -462,6 +473,7 @@
 SongFormat.PowerSong,
 SongFormat.PresentationManager,
 SongFormat.ProPresenter,
+SongFormat.SingingTheFaith,
 SongFormat.SongBeamer,
 SongFormat.SongPro,
 SongFormat.SongShowPlus,

=== added file 'openlp/plugins/songs/lib/importers/singingthefaith.py'
--- openlp/plugins/songs/lib/importers/singingthefaith.py	1970-01-01 00:00:00 +
+++ openlp/plugins/songs/lib/importers/singingthefaith.py	2019-06-27 12:35:49 +
@@ -0,0 +1,389 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###
+# OpenLP - Open Source Lyrics Projection  #
+# --- #
+# Copyright (c) 2008-2019 OpenLP Developers   #
+# --- #
+# 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

[Openlp-core] [Bug 1832324] [NEW] Development version first run - ThemeManager no attribute '_write_theme'

2019-06-11 Thread John Lines 
Public bug reported:

**OpenLP Bug Report**
Version: {'full': '2.5.dev2856', 'version': '2.5.dev2856', 'build': None}

--- Details of the Exception. ---

First run of Development version, on system which had/has the packaged
Debian version, and existing 2.4 themes

 --- Exception Traceback ---
Traceback (most recent call last):
  File "./run_openlp.py", line 71, in 
start()
  File "./run_openlp.py", line 67, in start
main()
  File "/home/john/projects/openlp/openlp/trunk/openlp/core/app.py", line 450, 
in main
sys.exit(application.run(qt_args))
  File "/home/john/projects/openlp/openlp/trunk/openlp/core/app.py", line 125, 
in run
Registry().execute('bootstrap_initialise')
  File 
"/home/john/projects/openlp/openlp/trunk/openlp/core/common/registry.py", line 
148, in execute
result = function(*args, **kwargs)
  File 
"/home/john/projects/openlp/openlp/trunk/openlp/core/ui/thememanager.py", line 
154, in bootstrap_initialise
self.upgrade_themes()  # TODO: Can be removed when upgrade path from OpenLP 
2.4 no longer needed
  File 
"/home/john/projects/openlp/openlp/trunk/openlp/core/ui/thememanager.py", line 
176, in upgrade_themes
self._write_theme(theme)
AttributeError: 'ThemeManager' object has no attribute '_write_theme'

--- System information ---
Platform: Linux-4.19.0-5-amd64-x86_64-with-debian-10.0

--- Library Versions ---
Python: 3.7.3
PyQt5: 5.11.3
SQLAlchemy: 1.2.18
Alembic: 1.0.0
BeautifulSoup: 4.7.1
lxml: 4.3.3
Chardet: 3.0.4
PyEnchant: -
Mako: 1.0.7
VLC: OK
PyUNO: -


The upgraded had created a backup of my existing data in .local/share/

System runs without the crash if I remove the openlp directory in
.local/share so it does not attempt an upgrade.

** 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/1832324

Title:
  Development version  first run - ThemeManager  no attribute
  '_write_theme'

Status in OpenLP:
  New

Bug description:
  **OpenLP Bug Report**
  Version: {'full': '2.5.dev2856', 'version': '2.5.dev2856', 'build': None}

  --- Details of the Exception. ---

  First run of Development version, on system which had/has the packaged
  Debian version, and existing 2.4 themes

   --- Exception Traceback ---
  Traceback (most recent call last):
File "./run_openlp.py", line 71, in 
  start()
File "./run_openlp.py", line 67, in start
  main()
File "/home/john/projects/openlp/openlp/trunk/openlp/core/app.py", line 
450, in main
  sys.exit(application.run(qt_args))
File "/home/john/projects/openlp/openlp/trunk/openlp/core/app.py", line 
125, in run
  Registry().execute('bootstrap_initialise')
File 
"/home/john/projects/openlp/openlp/trunk/openlp/core/common/registry.py", line 
148, in execute
  result = function(*args, **kwargs)
File 
"/home/john/projects/openlp/openlp/trunk/openlp/core/ui/thememanager.py", line 
154, in bootstrap_initialise
  self.upgrade_themes()  # TODO: Can be removed when upgrade path from 
OpenLP 2.4 no longer needed
File 
"/home/john/projects/openlp/openlp/trunk/openlp/core/ui/thememanager.py", line 
176, in upgrade_themes
  self._write_theme(theme)
  AttributeError: 'ThemeManager' object has no attribute '_write_theme'

  --- System information ---
  Platform: Linux-4.19.0-5-amd64-x86_64-with-debian-10.0

  --- Library Versions ---
  Python: 3.7.3
  PyQt5: 5.11.3
  SQLAlchemy: 1.2.18
  Alembic: 1.0.0
  BeautifulSoup: 4.7.1
  lxml: 4.3.3
  Chardet: 3.0.4
  PyEnchant: -
  Mako: 1.0.7
  VLC: OK
  PyUNO: -

  
  The upgraded had created a backup of my existing data in .local/share/

  System runs without the crash if I remove the openlp directory in
  .local/share so it does not attempt an upgrade.

To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1832324/+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 1411302] [NEW] Entry and exit scripts

2015-01-15 Thread John Lines 
Public bug reported:

It would be useful if OpenLP could run a script from some known place
when it starts up, and another when it exits.

This would allow (if permitted by the Operating System), features such
as disabling automatic screen savers, or screen locks while OpenLP is
running, or the system going to sleep due to inactivity.

If the laptop goes to sleep during the sermon the proejctor may think it
has been disconnected and show a blue, rather than blank screen.

For laptops whichare used for other purposes as well as projecting the
exit script could restore a desired power saving mode.

** 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/1411302

Title:
  Entry and exit scripts

Status in OpenLP - Worship Presentation Software:
  New

Bug description:
  It would be useful if OpenLP could run a script from some known place
  when it starts up, and another when it exits.

  This would allow (if permitted by the Operating System), features such
  as disabling automatic screen savers, or screen locks while OpenLP is
  running, or the system going to sleep due to inactivity.

  If the laptop goes to sleep during the sermon the proejctor may think
  it has been disconnected and show a blue, rather than blank screen.

  For laptops whichare used for other purposes as well as projecting the
  exit script could restore a desired power saving mode.

To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1411302/+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