[Openlp-core] [Bug 1173749] Re: Songs with mismatching formatting tags still throw an exception

2013-08-24 Thread Oliver Wieland
** Changed in: openlp/2.0
 Assignee: (unassigned) = Oliver Wieland (oliwee)

** Changed in: openlp/2.0
   Status: Confirmed = In Progress

-- 
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1173749

Title:
  Songs with mismatching formatting tags still throw an exception

Status in OpenLP - Worship Presentation Software:
  Confirmed
Status in OpenLP 2.0 series:
  In Progress
Status in OpenLP trunk series:
  Confirmed

Bug description:
  There is another bug similar to this, bug #885874, but it does not
  seem to have fixed the issue below. Note that there is a mismatched
  {/g} tag which causes this error.

  Version: {u'full': u'2.0.1', u'version': u'2.0.1', u'build': None}

  --- Details of the Exception. ---

  Hi,
  I just found one bug. I just changed one Bridge to:

  Shine Your light and {g}Strahle hell und{/g}
  Let the whole world see {g}lass die Welt es sehn.{/g}
  We're singing {g}Wir singen{/g}
  For the glory Of the risen King{/g} {g}dir zur Ehre, auferstandner Herr.{/g}
  Jesus

  And got this error:

  --- Exception Traceback ---
  Traceback (most recent call last):
  File
  /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/mediaitem.py,
  line 393, in onEditClick
  self.onSongListLoad()
  File
  /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/mediaitem.py,
  line 254, in onSongListLoad
  item = self.buildServiceItem(self.editItem)
  File
  /usr/lib/pymodules/python2.6/openlp/core/lib/mediamanageritem.py, line
  591, in buildServiceItem
  if self.generateSlideData(serviceItem, item, xmlVersion, remote):
  File
  /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/mediaitem.py,
  line 529, in generateSlideData
  service_item.xml_version = self.openLyrics.song_to_xml(song)
  File /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/xml.py,
  line 361, in song_to_xml
  optional_verse, tags_element)
  File /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/xml.py,
  line 503, in _add_text_with_tags_to_lines
  element = etree.XML
  File lxml.etree.pyx, line 2512, in lxml.etree.XML
  (src/lxml/lxml.etree.c:48057)
  File parser.pxi, line 1545, in lxml.etree._parseMemoryDocument
  (src/lxml/lxml.etree.c:71812)
  File parser.pxi, line 1417, in lxml.etree._parseDoc
  (src/lxml/lxml.etree.c:70608)
  File parser.pxi, line 898, in
  lxml.etree._BaseParser._parseUnicodeDoc (src/lxml/lxml.etree.c:67148)
  File parser.pxi, line 539, in
  lxml.etree._ParserContext._handleParseResultDoc
  (src/lxml/lxml.etree.c:63824)
  File parser.pxi, line 625, in lxml.etree._handleParseResult
  (src/lxml/lxml.etree.c:64745)
  File parser.pxi, line 565, in lxml.etree._raiseParseError
  (src/lxml/lxml.etree.c:64088)
  XMLSyntaxError: Opening and ending tag mismatch: lines line 1 and tag,
  line 1, column 216

  --- System information ---
  Plattform: Linux-2.6.32-45-generic-i686-with-Ubuntu-10.04-lucid
  Desktop: GNOME

  --- Library Versions ---
  Python: 2.6.5
  Qt4: 4.6.2
  Phonon: 4.3.1
  PyQt4: 4.7.2
  QtWebkit: 532.4
  SQLAlchemy: 0.5.8
  SQLAlchemy Migrate:  0.7
  BeautifulSoup: 3.1.0.1
  lxml: 2.2.4
  Chardet: 2.0.1
  PyEnchant: 1.5.3
  PySQLite: 1.0.1
  Mako: 0.2.5
  pyUNO bridge: 3.2

To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1173749/+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 1216232] [NEW] OpenLyric exporter overwrites existing files

2013-08-24 Thread Phill
Public bug reported:

There is two problems with this:
1. We just blindly overwrite any existing files in the export directory
2. If two songs with the same title (but different lyrics) are exported one 
song overwrites the other.

One solution would be to ask the user if they want to over write, rename or 
skip with an option to apply to all. (This wouldn't really resolve the issue 
with same name different lyrics)
Or we could time stamp the file name (Again this wouldn't really resolve the 
issue with same name different lyrics)
We could also detect if the file exists and increment a counter in the file 
name. (Probably best combined with the time stamp)

** Affects: openlp
 Importance: Undecided
 Status: New

** Affects: openlp/2.0
 Importance: Undecided
 Status: New

** Affects: openlp/trunk
 Importance: Undecided
 Status: New


** Tags: song song-export

** Tags added: song song-export

** Also affects: openlp/2.0
   Importance: Undecided
   Status: New

** Also affects: openlp/trunk
   Importance: Undecided
   Status: New

** Changed in: openlp/2.0
Milestone: None = 2.0.3

** Changed in: openlp/trunk
Milestone: None = 2.1.1

-- 
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1216232

Title:
  OpenLyric exporter overwrites existing files

Status in OpenLP - Worship Presentation Software:
  New
Status in OpenLP 2.0 series:
  New
Status in OpenLP trunk series:
  New

Bug description:
  There is two problems with this:
  1. We just blindly overwrite any existing files in the export directory
  2. If two songs with the same title (but different lyrics) are exported one 
song overwrites the other.

  One solution would be to ask the user if they want to over write, rename or 
skip with an option to apply to all. (This wouldn't really resolve the issue 
with same name different lyrics)
  Or we could time stamp the file name (Again this wouldn't really resolve the 
issue with same name different lyrics)
  We could also detect if the file exists and increment a counter in the file 
name. (Probably best combined with the time stamp)

To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1216232/+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 1216234] [NEW] Layout style has not effect when using a second bible

2013-08-24 Thread Phill
Public bug reported:

In the bible manager on the advanced tab.

If you select a second bible the layout style combo box has no effect.

We could disable it if a second translation is selected, but I think it
would be nice if it worked (just given the limited space)

** Affects: openlp
 Importance: Undecided
 Status: New

** Affects: openlp/2.0
 Importance: Undecided
 Status: New

** Affects: openlp/trunk
 Importance: Undecided
 Status: New


** Tags: bible second-version

** Also affects: openlp/2.0
   Importance: Undecided
   Status: New

** Also affects: openlp/trunk
   Importance: Undecided
   Status: New

** Changed in: openlp/2.0
Milestone: None = 2.0.3

** Changed in: openlp/trunk
Milestone: None = 2.1.1

** Tags added: bible second-version

-- 
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1216234

Title:
  Layout style has not effect when using a second bible

Status in OpenLP - Worship Presentation Software:
  New
Status in OpenLP 2.0 series:
  New
Status in OpenLP trunk series:
  New

Bug description:
  In the bible manager on the advanced tab.

  If you select a second bible the layout style combo box has no effect.

  We could disable it if a second translation is selected, but I think
  it would be nice if it worked (just given the limited space)

To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1216234/+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 1173749] Re: Songs with mismatching formatting tags still throw an exception

2013-08-24 Thread Oliver Wieland
** Branch linked: lp:~oliwee/openlp/1173749-2.0

-- 
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1173749

Title:
  Songs with mismatching formatting tags still throw an exception

Status in OpenLP - Worship Presentation Software:
  Confirmed
Status in OpenLP 2.0 series:
  In Progress
Status in OpenLP trunk series:
  Confirmed

Bug description:
  There is another bug similar to this, bug #885874, but it does not
  seem to have fixed the issue below. Note that there is a mismatched
  {/g} tag which causes this error.

  Version: {u'full': u'2.0.1', u'version': u'2.0.1', u'build': None}

  --- Details of the Exception. ---

  Hi,
  I just found one bug. I just changed one Bridge to:

  Shine Your light and {g}Strahle hell und{/g}
  Let the whole world see {g}lass die Welt es sehn.{/g}
  We're singing {g}Wir singen{/g}
  For the glory Of the risen King{/g} {g}dir zur Ehre, auferstandner Herr.{/g}
  Jesus

  And got this error:

  --- Exception Traceback ---
  Traceback (most recent call last):
  File
  /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/mediaitem.py,
  line 393, in onEditClick
  self.onSongListLoad()
  File
  /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/mediaitem.py,
  line 254, in onSongListLoad
  item = self.buildServiceItem(self.editItem)
  File
  /usr/lib/pymodules/python2.6/openlp/core/lib/mediamanageritem.py, line
  591, in buildServiceItem
  if self.generateSlideData(serviceItem, item, xmlVersion, remote):
  File
  /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/mediaitem.py,
  line 529, in generateSlideData
  service_item.xml_version = self.openLyrics.song_to_xml(song)
  File /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/xml.py,
  line 361, in song_to_xml
  optional_verse, tags_element)
  File /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/xml.py,
  line 503, in _add_text_with_tags_to_lines
  element = etree.XML
  File lxml.etree.pyx, line 2512, in lxml.etree.XML
  (src/lxml/lxml.etree.c:48057)
  File parser.pxi, line 1545, in lxml.etree._parseMemoryDocument
  (src/lxml/lxml.etree.c:71812)
  File parser.pxi, line 1417, in lxml.etree._parseDoc
  (src/lxml/lxml.etree.c:70608)
  File parser.pxi, line 898, in
  lxml.etree._BaseParser._parseUnicodeDoc (src/lxml/lxml.etree.c:67148)
  File parser.pxi, line 539, in
  lxml.etree._ParserContext._handleParseResultDoc
  (src/lxml/lxml.etree.c:63824)
  File parser.pxi, line 625, in lxml.etree._handleParseResult
  (src/lxml/lxml.etree.c:64745)
  File parser.pxi, line 565, in lxml.etree._raiseParseError
  (src/lxml/lxml.etree.c:64088)
  XMLSyntaxError: Opening and ending tag mismatch: lines line 1 and tag,
  line 1, column 216

  --- System information ---
  Plattform: Linux-2.6.32-45-generic-i686-with-Ubuntu-10.04-lucid
  Desktop: GNOME

  --- Library Versions ---
  Python: 2.6.5
  Qt4: 4.6.2
  Phonon: 4.3.1
  PyQt4: 4.7.2
  QtWebkit: 532.4
  SQLAlchemy: 0.5.8
  SQLAlchemy Migrate:  0.7
  BeautifulSoup: 3.1.0.1
  lxml: 2.2.4
  Chardet: 2.0.1
  PyEnchant: 1.5.3
  PySQLite: 1.0.1
  Mako: 0.2.5
  pyUNO bridge: 3.2

To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1173749/+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 1216234] Re: Layout style has not effect when using a second bible

2013-08-24 Thread Phill
This also affects the Quick tab in the bible media manager

-- 
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1216234

Title:
  Layout style has not effect when using a second bible

Status in OpenLP - Worship Presentation Software:
  New
Status in OpenLP 2.0 series:
  New
Status in OpenLP trunk series:
  New

Bug description:
  In the bible manager on the advanced tab.

  If you select a second bible the layout style combo box has no effect.

  We could disable it if a second translation is selected, but I think
  it would be nice if it worked (just given the limited space)

To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1216234/+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 1173749] Re: Songs with mismatching formatting tags still throw an exception

2013-08-24 Thread Oliver Wieland
1a) is done for 2.0 series. See linked branch.
I'm not sure if I should propose for merging, because it's assigned to V2.0.3. 
Maybe I should wait until 2.0.2 is released?

-- 
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1173749

Title:
  Songs with mismatching formatting tags still throw an exception

Status in OpenLP - Worship Presentation Software:
  Confirmed
Status in OpenLP 2.0 series:
  In Progress
Status in OpenLP trunk series:
  Confirmed

Bug description:
  There is another bug similar to this, bug #885874, but it does not
  seem to have fixed the issue below. Note that there is a mismatched
  {/g} tag which causes this error.

  Version: {u'full': u'2.0.1', u'version': u'2.0.1', u'build': None}

  --- Details of the Exception. ---

  Hi,
  I just found one bug. I just changed one Bridge to:

  Shine Your light and {g}Strahle hell und{/g}
  Let the whole world see {g}lass die Welt es sehn.{/g}
  We're singing {g}Wir singen{/g}
  For the glory Of the risen King{/g} {g}dir zur Ehre, auferstandner Herr.{/g}
  Jesus

  And got this error:

  --- Exception Traceback ---
  Traceback (most recent call last):
  File
  /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/mediaitem.py,
  line 393, in onEditClick
  self.onSongListLoad()
  File
  /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/mediaitem.py,
  line 254, in onSongListLoad
  item = self.buildServiceItem(self.editItem)
  File
  /usr/lib/pymodules/python2.6/openlp/core/lib/mediamanageritem.py, line
  591, in buildServiceItem
  if self.generateSlideData(serviceItem, item, xmlVersion, remote):
  File
  /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/mediaitem.py,
  line 529, in generateSlideData
  service_item.xml_version = self.openLyrics.song_to_xml(song)
  File /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/xml.py,
  line 361, in song_to_xml
  optional_verse, tags_element)
  File /usr/lib/pymodules/python2.6/openlp/plugins/songs/lib/xml.py,
  line 503, in _add_text_with_tags_to_lines
  element = etree.XML
  File lxml.etree.pyx, line 2512, in lxml.etree.XML
  (src/lxml/lxml.etree.c:48057)
  File parser.pxi, line 1545, in lxml.etree._parseMemoryDocument
  (src/lxml/lxml.etree.c:71812)
  File parser.pxi, line 1417, in lxml.etree._parseDoc
  (src/lxml/lxml.etree.c:70608)
  File parser.pxi, line 898, in
  lxml.etree._BaseParser._parseUnicodeDoc (src/lxml/lxml.etree.c:67148)
  File parser.pxi, line 539, in
  lxml.etree._ParserContext._handleParseResultDoc
  (src/lxml/lxml.etree.c:63824)
  File parser.pxi, line 625, in lxml.etree._handleParseResult
  (src/lxml/lxml.etree.c:64745)
  File parser.pxi, line 565, in lxml.etree._raiseParseError
  (src/lxml/lxml.etree.c:64088)
  XMLSyntaxError: Opening and ending tag mismatch: lines line 1 and tag,
  line 1, column 216

  --- System information ---
  Plattform: Linux-2.6.32-45-generic-i686-with-Ubuntu-10.04-lucid
  Desktop: GNOME

  --- Library Versions ---
  Python: 2.6.5
  Qt4: 4.6.2
  Phonon: 4.3.1
  PyQt4: 4.7.2
  QtWebkit: 532.4
  SQLAlchemy: 0.5.8
  SQLAlchemy Migrate:  0.7
  BeautifulSoup: 3.1.0.1
  lxml: 2.2.4
  Chardet: 2.0.1
  PyEnchant: 1.5.3
  PySQLite: 1.0.1
  Mako: 0.2.5
  pyUNO bridge: 3.2

To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1173749/+subscriptions

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp


[Openlp-core] [Merge] lp:~mahfiaz/openlp/support-2060 into lp:openlp

2013-08-24 Thread mahfiaz
mahfiaz has proposed merging lp:~mahfiaz/openlp/support-2060 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~mahfiaz/openlp/support-2060/+merge/181958

Fixed bug http://support.openlp.org/issues/2060 -sensitive variable names in 
SundayPlus file importer.
-- 
https://code.launchpad.net/~mahfiaz/openlp/support-2060/+merge/181958
Your team OpenLP Core is requested to review the proposed merge of 
lp:~mahfiaz/openlp/support-2060 into lp:openlp.
=== modified file 'openlp/plugins/songs/lib/sundayplusimport.py'
--- openlp/plugins/songs/lib/sundayplusimport.py	2013-03-07 08:05:43 +
+++ openlp/plugins/songs/lib/sundayplusimport.py	2013-08-24 15:51:28 +
@@ -96,6 +96,7 @@
 if data[i:i + 1] == '#':
 name_end = data.find(':', i + 1)
 name = data[i + 1:name_end]
+name = name.lower()
 i = name_end + 1
 while data[i:i + 1] == ' ':
 i += 1
@@ -123,23 +124,23 @@
 if not cell:
 if name == 'title':
 self.title = self.decode(self.unescape(value))
-elif name == 'Author':
+elif name == 'author':
 author = self.decode(self.unescape(value))
 if len(author):
 self.addAuthor(author)
-elif name == 'Copyright':
+elif name == 'copyright':
 self.copyright = self.decode(self.unescape(value))
-elif name[0:4] == 'CELL':
+elif name[0:4] == 'cell':
 self.parse(value, cell = name[4:])
 # We are in a verse group.
 else:
-if name == 'MARKER_NAME':
+if name == 'marker_name':
 value = value.strip()
 if len(value):
 verse_type = VerseType.tags[VerseType.from_loose_input(value[0])]
 if len(value) = 2 and value[-1] in ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']:
 verse_type = %s%s % (verse_type, value[-1])
-elif name == 'Hotkey':
+elif name == 'hotkey':
 # Hotkey always appears after MARKER_NAME, so it
 # effectively overrides MARKER_NAME, if present.
 if len(value) and value in HOTKEY_TO_VERSE_TYPE.keys():

___
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:~mahfiaz/openlp/support-2060 into lp:openlp

2013-08-24 Thread mahfiaz
The proposal to merge lp:~mahfiaz/openlp/support-2060 into lp:openlp has been 
updated.

Description changed to:

Fixed bug http://support.openlp.org/issues/2060 - case sensitive variable names 
in SundayPlus file importer.

For more details, see:
https://code.launchpad.net/~mahfiaz/openlp/support-2060/+merge/181958
-- 
https://code.launchpad.net/~mahfiaz/openlp/support-2060/+merge/181958
Your team OpenLP Core is requested to review the proposed merge of 
lp:~mahfiaz/openlp/support-2060 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:~oliwee/openlp/1173749-2.0 into lp:openlp/2.0

2013-08-24 Thread Oliver Wieland
Oliver Wieland has proposed merging lp:~oliwee/openlp/1173749-2.0 into 
lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1173749 in OpenLP: Songs with mismatching formatting tags still throw 
an exception
  https://bugs.launchpad.net/openlp/+bug/1173749

For more details, see:
https://code.launchpad.net/~oliwee/openlp/1173749-2.0/+merge/181959

Partially fix of Bug 1173749.
Validates the tags in the lyrics on editing a song. If there are misplaced 
tags, a message box will appear.
-- 
https://code.launchpad.net/~oliwee/openlp/1173749-2.0/+merge/181959
Your team OpenLP Core is requested to review the proposed merge of 
lp:~oliwee/openlp/1173749-2.0 into lp:openlp/2.0.
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2013-08-21 20:26:53 +
+++ openlp/plugins/songs/forms/editsongform.py	2013-08-24 16:04:28 +
@@ -132,6 +132,7 @@
 self.audioListWidget.setAlternatingRowColors(True)
 self.findVerseSplit = re.compile(u'---\[\]---\n', re.UNICODE)
 self.whitespace = re.compile(r'\W+', re.UNICODE)
+self.find_tags = re.compile(u'\{/?\w+\}', re.UNICODE)
 
 def keyPressEvent(self, event):
 
@@ -720,8 +721,45 @@
 self.manager.save_object(book)
 else:
 return False
+for i in range(self.verseListWidget.rowCount()):
+item = self.verseListWidget.item(i, 0)
+tags = self.find_tags.findall(item.text())
+if self._validate_tags(tags) == False:
+field = unicode(item.data(QtCore.Qt.UserRole).toString())
+verse_tag = VerseType.translated_name(field[0])
+verse_num = field[1:]
+critical_error_message_box(
+message=translate('SongsPlugin.EditSongForm',
+'There are misplaced tags in %s %s. '
+'You need to fix this problem first.' % (verse_tag, verse_num)))
+return False
 return True
 
+def _validate_tags(self, _tags):
+ 
+Validates a list of tags
+Deletes the first affiliated tag pair which is located side by side in the list
+and call itself recursively with the shortened tag list. 
+If there is any misplaced tag in the list, either the lenght of the tag list is not even, 
+or the function won't find any tag pairs side by side.
+If there is no misplaced tag, the length of the list will be zero on any recursive run.
+
+Return:
+True if the function can't find any mismatched tags
+False if there are mismatched tags.
+
+if len(_tags) % 2 != 0:
+return False
+
+if len(_tags) == 0:
+return True
+
+for i in range(len(_tags)-1):
+if _tags[i+1] == {/ + _tags[i][1:]:
+del _tags[i:i+2]
+return self._validate_tags(_tags)
+return False
+
 def onCopyrightInsertButtonTriggered(self):
 text = self.copyrightEdit.text()
 pos = self.copyrightEdit.cursorPosition()

___
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:~mahfiaz/openlp/support-2060 into lp:openlp

2013-08-24 Thread Phill
mahfiaz, please add 'rb' to the open statement also can we merge lines 7  8? 
See my fix for 2.0.2 at 
https://code.launchpad.net/~phill-ridout/openlp/1211913_2.0 for reference

Also superfly is going to ask you for a test!
-- 
https://code.launchpad.net/~mahfiaz/openlp/support-2060/+merge/181958
Your team OpenLP Core is requested to review the proposed merge of 
lp:~mahfiaz/openlp/support-2060 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 1211913] Re: Issues importing Sunday Plus FIles

2013-08-24 Thread Phill
** Branch linked: lp:~mahfiaz/openlp/support-2060

** Changed in: openlp/trunk
   Importance: Undecided = Medium

** Changed in: openlp/trunk
   Status: New = In Progress

** Changed in: openlp/trunk
 Assignee: (unassigned) = Phill (phill-ridout)

** Changed in: openlp/trunk
 Assignee: Phill (phill-ridout) = mahfiaz (mahfiaz)

-- 
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1211913

Title:
  Issues importing Sunday Plus FIles

Status in OpenLP - Worship Presentation Software:
  In Progress
Status in OpenLP 2.0 series:
  Fix Committed
Status in OpenLP trunk series:
  In Progress

Bug description:
  http://support.openlp.org/issues/2059

  See the above issue for sample songs.

  About 400 files would not import having a quick look, these songs do
  appear to have valid lyrics so this needs looking at closer.

To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1211913/+subscriptions

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp


[Openlp-core] [Merge] lp:~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog into lp:openlp

2013-08-24 Thread mahfiaz
mahfiaz has proposed merging 
lp:~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog into 
lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog/+merge/181967

Fixed a tiny glitch, remove author button became always disabled even if not 
needed to.
-- 
https://code.launchpad.net/~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog/+merge/181967
Your team OpenLP Core is requested to review the proposed merge of 
lp:~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog into 
lp:openlp.
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2013-07-22 20:27:51 +
+++ openlp/plugins/songs/forms/editsongform.py	2013-08-24 21:57:24 +
@@ -530,7 +530,8 @@
 
 Remove the author from the list when the delete button is clicked.
 
-self.author_remove_button.setEnabled(False)
+if self.authors_list_view.count() = 2:
+self.author_remove_button.setEnabled(False)
 item = self.authors_list_view.currentItem()
 row = self.authors_list_view.row(item)
 self.authors_list_view.takeItem(row)

___
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