From b4cfea211e8c0676aaddce57ec6ab0e6a8042efc Mon Sep 17 00:00:00 2001
From: Martin Thompson <martinthompson@openlp.org>
Date: Tue, 31 Aug 2010 20:49:57 +0100
Subject: [PATCH 01/21] Import completely unlabelled songs. Import unreferenced
 verses

---
 openlp/plugins/songs/lib/opensongimport.py    | 48 ++++++++++++-------
 openlp/plugins/songs/lib/songimport.py        |  6 +++
 openlp/plugins/songs/lib/test/test.opensong   | 21 +++++---
 .../songs/lib/test/test_opensongimport.py     | 18 ++++++-
 4 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index 8c675b9ab..e22f6f34d 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -159,8 +159,11 @@ class OpenSongImport(SongImport):
         Process the OpenSong file - pass in a file-like object,
         not a filename
         """
-        self.authors = []
-        self.verse_order_list = []
+        self.set_defaults()
+        # Setup blank storage to append to
+        verse_order_list = []
+        topics = []
+        verselist = []
         try:
             tree = objectify.parse(file)
         except Error, LxmlError:
@@ -183,10 +186,10 @@ class OpenSongImport(SongImport):
                     setattr(self, fn_or_string, ustring)
                 else:
                     fn_or_string(ustring)
-        if u'theme' in fields and unicode(root.theme) not in self.topics:
-            self.topics.append(unicode(root.theme))
-        if u'alttheme' in fields and unicode(root.alttheme) not in self.topics:
-            self.topics.append(unicode(root.alttheme))
+        if u'theme' in fields and unicode(root.theme) not in topics:
+            topics.append(unicode(root.theme))
+        if u'alttheme' in fields and unicode(root.alttheme) not in topics:
+            topics.append(unicode(root.alttheme))
         # data storage while importing
         verses = {}
         lyrics = unicode(root.lyrics)
@@ -214,7 +217,7 @@ class OpenSongImport(SongImport):
                 versetype = thisline[1].upper()
                 if versetype.isdigit():
                     versenum = versetype
-                    versetype = u'V'
+                    versetype = u''
                 elif thisline[2] != u']':
                     # there's a number to go with it - extract that as well
                     right_bracket = thisline.find(u']')
@@ -228,10 +231,13 @@ class OpenSongImport(SongImport):
             if thisline[0].isdigit():
                 versenum = thisline[0]
                 words = thisline[1:].strip()
-            if words is None and \
-                   versenum is not None and \
-                   versetype is not None:
+                
+            if words is None:# and \
+                   #versenum is not None and \
+                   #versetype is not None:
                 words = thisline
+                if not versenum: 
+                    versenum = u'1'
             if versenum is not None:
                 versetag = u'%s%s' % (versetype, versenum)
                 if not verses.has_key(versetype):
@@ -252,12 +258,15 @@ class OpenSongImport(SongImport):
         versetypes.sort()
         versetags = {}
         for versetype in versetypes:
+            our_verse_type = versetype
+            if our_verse_type == u'':
+                our_verse_type = u'V'
             versenums = verses[versetype].keys()
             versenums.sort()
             for num in versenums:
-                versetag = u'%s%s' % (versetype, num)
+                versetag = u'%s%s' % (our_verse_type, num)
                 lines = u'\n'.join(verses[versetype][num])
-                self.verses.append([versetag, lines])
+                verselist.append([versetag, lines])
                 # Keep track of what we have for error checking later
                 versetags[versetag] = 1
         # now figure out the presentation order
@@ -269,11 +278,18 @@ class OpenSongImport(SongImport):
             if len(our_verse_order) > 0:
                 order = our_verse_order
             else:
-                log.warn(u'No verse order available for %s, skipping.', self.title)
+                log.warn(u'No verse order available (either explicit or inferred) for %s, skipping.', self.title)
         for tag in order:
             if len(tag) == 1:
-                tag = tag + u'1' # Assume it's no.1 if it's not there
+                if not tag.isdigit():
+                    tag = tag + u'1' # Assume it's no.1 if it's not there
+                else:
+                    tag = u'V' + tag # Assume it's a verse if it has no prefix
             if not versetags.has_key(tag):
-                log.warn(u'Got order %s but not in versetags, skipping', tag)
+                log.warn(u'Got order %s but not in versetags, dropping this item from presentation order', tag)
             else:
-                self.verse_order_list.append(tag)
+                verse_order_list.append(tag)
+        # now copy the data
+        self.topics = topics
+        self.verse_order_list = verse_order_list
+        self.verses = verselist
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index 5889a3774..169ecf75c 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -52,6 +52,12 @@ class SongImport(QtCore.QObject):
         """
         self.manager = manager
         self.stop_import_flag = False
+        self.set_defaults()
+    def set_defaults(self):
+        """
+        Create defaults for properties - call this before each song
+        if importing many songs at once to ensure a clean beginning
+        """
         self.title = u''
         self.song_number = u''
         self.alternate_title = u''
diff --git a/openlp/plugins/songs/lib/test/test.opensong b/openlp/plugins/songs/lib/test/test.opensong
index 1ce60cf3b..5d3bc5530 100644
--- a/openlp/plugins/songs/lib/test/test.opensong
+++ b/openlp/plugins/songs/lib/test/test.opensong
@@ -4,7 +4,7 @@
   <author>MartiÑ Thómpson</author>
   <copyright>2010 Martin Thompson</copyright>
   <hymn_number>1</hymn_number>
-  <presentation>V1 C V2 C2 V3 B1 V1</presentation>
+  <presentation>V1 C V2 C2 3 B1 V1 T U</presentation>
   <ccli>Blah</ccli>
   <capo print="false"></capo>
   <key></key>
@@ -17,7 +17,12 @@
   <alttheme>TestAltTheme</alttheme>
   <tempo></tempo>
   <time_sig></time_sig>
-  <lyrics>;Comment
+  <lyrics>[3]
+. G A B
+ V3 Line 1
+. G A B
+ V3 Line 2
+
 . A   B C
 1 v1 Line 1___
 2 v2 Line 1___
@@ -25,10 +30,6 @@
 1 V1 Line 2
 2 V2 Line 2
  
-[3]
- V3 Line 1
- V3 Line 2
-
 [b1]
  Bridge 1
 ---
@@ -36,12 +37,18 @@
  Bridge 1 line 2
 
 [C]
-. A     B
+    . A     B
  Chorus 1
  
 [C2]
 .  A    B
  Chorus 2
+
+[T]
+  T Line 1
+
+[X]
+  Unreferenced verse line 1
  </lyrics>
   <style index="default_style">
   <title enabled="true" valign="bottom" align="center" include_verse="false" margin-left="0" margin-right="0" margin-top="0" margin-bottom="0" font="Helvetica" size="26" bold="true" italic="true" underline="false" color="#FFFFFF" border="true" border_color="#000000" shadow="true" shadow_color="#000000" fill="false" fill_color="#000000"/>
diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py
index faad1b0f2..3398595f7 100644
--- a/openlp/plugins/songs/lib/test/test_opensongimport.py
+++ b/openlp/plugins/songs/lib/test/test_opensongimport.py
@@ -63,7 +63,9 @@ def test():
     assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses 
     assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses 
     assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
-    assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3', u'B1', u'V1']
+    assert [u'V3', u'V3 Line 1\nV3 Line 2'] in o.verses
+    assert [u'X1', u'Unreferenced verse line 1'] in o.verses
+    assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3', u'B1', u'V1', u'T1']
     assert o.ccli_number == u'Blah'
     assert o.topics == [u'TestTheme', u'TestAltTheme']
 
@@ -104,6 +106,20 @@ def test():
     print o.verse_order_list
     assert o.verse_order_list == [u'V1', u'V2', u'B1', u'C1', u'C2']
 
+    o.filenames = [u'test3.opensong']
+    o.do_import()
+    # o.finish()
+    o.print_song()
+    assert o.copyright == u'2010'
+    assert o.authors == [u'Martin Thompson']
+    assert o.title == u'Test single verse'
+    assert o.alternate_title == u''
+    assert o.ccli_number == u'123456'
+    assert o.verse_order_list == [u'V1']
+    assert o.topics == [u'Worship: Declaration']
+    print o.verses[0]
+    assert [u'V1', u'Line 1\nLine 2'] in o.verses 
+
     print "Tests passed"
     pass
 

From 192010588f3660a4781be63b56e89cd9dbe112f4 Mon Sep 17 00:00:00 2001
From: Martin Thompson <martinthompson@openlp.org>
Date: Thu, 2 Sep 2010 20:43:28 +0100
Subject: [PATCH 02/21] Test for & in authors

---
 openlp/plugins/songs/lib/opensongimport.py           | 2 +-
 openlp/plugins/songs/lib/test/test.opensong          | 2 +-
 openlp/plugins/songs/lib/test/test_opensongimport.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index e22f6f34d..dae60a3b7 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -286,7 +286,7 @@ class OpenSongImport(SongImport):
                 else:
                     tag = u'V' + tag # Assume it's a verse if it has no prefix
             if not versetags.has_key(tag):
-                log.warn(u'Got order %s but not in versetags, dropping this item from presentation order', tag)
+                log.info(u'Got order %s but not in versetags, dropping this item from presentation order', tag)
             else:
                 verse_order_list.append(tag)
         # now copy the data
diff --git a/openlp/plugins/songs/lib/test/test.opensong b/openlp/plugins/songs/lib/test/test.opensong
index 5d3bc5530..3633e7d62 100644
--- a/openlp/plugins/songs/lib/test/test.opensong
+++ b/openlp/plugins/songs/lib/test/test.opensong
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <song>
   <title>Martins Test</title>
-  <author>MartiÑ Thómpson</author>
+  <author>MartiÑ &amp; Martin2 Thómpson</author>
   <copyright>2010 Martin Thompson</copyright>
   <hymn_number>1</hymn_number>
   <presentation>V1 C V2 C2 3 B1 V1 T U</presentation>
diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py
index 3398595f7..6aa954b06 100644
--- a/openlp/plugins/songs/lib/test/test_opensongimport.py
+++ b/openlp/plugins/songs/lib/test/test_opensongimport.py
@@ -53,7 +53,7 @@ def test():
     o.do_import()
     o.print_song()
     assert o.copyright == u'2010 Martin Thompson'
-    assert o.authors == [u'MartiÑ Thómpson']
+    assert o.authors == [u'MartiÑ Thómpson', u'Martin2 Thómpson']
     assert o.title == u'Martins Test'
     assert o.alternate_title == u''
     assert o.song_number == u'1'

From 11a9d3d8f52ac806122705e5b8196c1e292056f2 Mon Sep 17 00:00:00 2001
From: Martin Thompson <martinthompson@openlp.org>
Date: Thu, 2 Sep 2010 21:21:31 +0100
Subject: [PATCH 03/21] Handles versetypes like 'V3a'

---
 openlp/plugins/songs/lib/opensongimport.py    | 43 +++++++++++--------
 openlp/plugins/songs/lib/test/test.opensong   |  4 +-
 .../songs/lib/test/test_opensongimport.py     |  4 +-
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index dae60a3b7..6a8daae54 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -29,6 +29,7 @@ import os
 from zipfile import ZipFile
 from lxml import objectify
 from lxml.etree import Error, LxmlError
+import re
 
 from openlp.plugins.songs.lib.songimport import SongImport
 
@@ -190,9 +191,9 @@ class OpenSongImport(SongImport):
             topics.append(unicode(root.theme))
         if u'alttheme' in fields and unicode(root.alttheme) not in topics:
             topics.append(unicode(root.alttheme))
+        lyrics = unicode(root.lyrics)
         # data storage while importing
         verses = {}
-        lyrics = unicode(root.lyrics)
         # keep track of a "default" verse order, in case none is specified
         our_verse_order = []
         verses_seen = {}
@@ -214,24 +215,28 @@ class OpenSongImport(SongImport):
                 continue
             # verse/chorus/etc. marker
             if thisline[0] == u'[':
-                versetype = thisline[1].upper()
-                if versetype.isdigit():
-                    versenum = versetype
-                    versetype = u''
-                elif thisline[2] != u']':
-                    # there's a number to go with it - extract that as well
-                    right_bracket = thisline.find(u']')
-                    versenum = thisline[2:right_bracket]
+                # drop the square brackets
+                right_bracket = thisline.find(u']')
+                content = thisline[1:right_bracket].upper()
+                print '"', content, '"'
+                # have we got any digits? If so, versenumber is everything from the digits
+                # to the end (even if there are some alpha chars on the end)
+                match = re.match(u'(.*)(\d+.*)', content)
+                if match is not None:
+                    print "Got digits"
+                    versetype = match.group(1)
+                    versenum = match.group(2)
+                # otherwise we assume number 1 and take the whole prefix as versetype
                 else:
-                    # if there's no number, assume it's no.1
+                    versetype = content
                     versenum = u'1'
+                print versetype, versenum
                 continue
             words = None
             # number at start of line.. it's verse number
             if thisline[0].isdigit():
                 versenum = thisline[0]
                 words = thisline[1:].strip()
-                
             if words is None:# and \
                    #versenum is not None and \
                    #versetype is not None:
@@ -248,6 +253,7 @@ class OpenSongImport(SongImport):
                 if not verses_seen.has_key(versetag):
                     verses_seen[versetag] = 1
                     our_verse_order.append(versetag)
+            print ">>", (versetype,), (versenum,), versetag, words
             if words:
                 # Tidy text and remove the ____s from extended words
                 words = self.tidy_text(words)
@@ -273,18 +279,21 @@ class OpenSongImport(SongImport):
         order = []
         if u'presentation' in fields and root.presentation != u'':
             order = unicode(root.presentation)
-            order = order.split()
+            # We make all the tags in the lyrics upper case, so match that here
+            # and then split into a list on the whitespace
+            order = order.upper().split()
         else:
             if len(our_verse_order) > 0:
                 order = our_verse_order
             else:
                 log.warn(u'No verse order available (either explicit or inferred) for %s, skipping.', self.title)
         for tag in order:
-            if len(tag) == 1:
-                if not tag.isdigit():
-                    tag = tag + u'1' # Assume it's no.1 if it's not there
-                else:
-                    tag = u'V' + tag # Assume it's a verse if it has no prefix
+            print tag
+            if tag[0].isdigit():
+                tag = u'V' + tag # Assume it's a verse if it has no prefix
+            elif not re.search('\d+', tag):
+                tag = tag + u'1' # Assume it's no.1 if there's no digits
+            print tag
             if not versetags.has_key(tag):
                 log.info(u'Got order %s but not in versetags, dropping this item from presentation order', tag)
             else:
diff --git a/openlp/plugins/songs/lib/test/test.opensong b/openlp/plugins/songs/lib/test/test.opensong
index 3633e7d62..0390f99b2 100644
--- a/openlp/plugins/songs/lib/test/test.opensong
+++ b/openlp/plugins/songs/lib/test/test.opensong
@@ -4,7 +4,7 @@
   <author>MartiÑ &amp; Martin2 Thómpson</author>
   <copyright>2010 Martin Thompson</copyright>
   <hymn_number>1</hymn_number>
-  <presentation>V1 C V2 C2 3 B1 V1 T U</presentation>
+  <presentation>V1 C V2 C2 3a B1 V1 T U</presentation>
   <ccli>Blah</ccli>
   <capo print="false"></capo>
   <key></key>
@@ -17,7 +17,7 @@
   <alttheme>TestAltTheme</alttheme>
   <tempo></tempo>
   <time_sig></time_sig>
-  <lyrics>[3]
+  <lyrics>[3a]
 . G A B
  V3 Line 1
 . G A B
diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py
index 6aa954b06..c994d8685 100644
--- a/openlp/plugins/songs/lib/test/test_opensongimport.py
+++ b/openlp/plugins/songs/lib/test/test_opensongimport.py
@@ -63,9 +63,9 @@ def test():
     assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses 
     assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses 
     assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
-    assert [u'V3', u'V3 Line 1\nV3 Line 2'] in o.verses
+    assert [u'V3A', u'V3 Line 1\nV3 Line 2'] in o.verses
     assert [u'X1', u'Unreferenced verse line 1'] in o.verses
-    assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3', u'B1', u'V1', u'T1']
+    assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3A', u'B1', u'V1', u'T1']
     assert o.ccli_number == u'Blah'
     assert o.topics == [u'TestTheme', u'TestAltTheme']
 

From 84bff09d039a94d5455199d629278673425dc049 Mon Sep 17 00:00:00 2001
From: Martin Thompson <martinthompson@openlp.org>
Date: Thu, 2 Sep 2010 21:30:01 +0100
Subject: [PATCH 04/21] REmoved prints

---
 openlp/plugins/songs/lib/opensongimport.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index 6a8daae54..1f495013c 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -218,19 +218,16 @@ class OpenSongImport(SongImport):
                 # drop the square brackets
                 right_bracket = thisline.find(u']')
                 content = thisline[1:right_bracket].upper()
-                print '"', content, '"'
                 # have we got any digits? If so, versenumber is everything from the digits
                 # to the end (even if there are some alpha chars on the end)
                 match = re.match(u'(.*)(\d+.*)', content)
                 if match is not None:
-                    print "Got digits"
                     versetype = match.group(1)
                     versenum = match.group(2)
                 # otherwise we assume number 1 and take the whole prefix as versetype
                 else:
                     versetype = content
                     versenum = u'1'
-                print versetype, versenum
                 continue
             words = None
             # number at start of line.. it's verse number
@@ -253,7 +250,6 @@ class OpenSongImport(SongImport):
                 if not verses_seen.has_key(versetag):
                     verses_seen[versetag] = 1
                     our_verse_order.append(versetag)
-            print ">>", (versetype,), (versenum,), versetag, words
             if words:
                 # Tidy text and remove the ____s from extended words
                 words = self.tidy_text(words)
@@ -288,12 +284,10 @@ class OpenSongImport(SongImport):
             else:
                 log.warn(u'No verse order available (either explicit or inferred) for %s, skipping.', self.title)
         for tag in order:
-            print tag
             if tag[0].isdigit():
                 tag = u'V' + tag # Assume it's a verse if it has no prefix
             elif not re.search('\d+', tag):
                 tag = tag + u'1' # Assume it's no.1 if there's no digits
-            print tag
             if not versetags.has_key(tag):
                 log.info(u'Got order %s but not in versetags, dropping this item from presentation order', tag)
             else:

From db118196a513351368a306c5cf65e6060627d2fd Mon Sep 17 00:00:00 2001
From: Martin Thompson <martinthompson@openlp.org>
Date: Mon, 6 Sep 2010 20:56:20 +0100
Subject: [PATCH 05/21] test_opensong passes again

---
 openlp/plugins/songs/lib/opensongimport.py           | 7 ++++---
 openlp/plugins/songs/lib/songimport.py               | 7 ++++---
 openlp/plugins/songs/lib/test/test_opensongimport.py | 6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index 58af0edd4..baaec12e7 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -151,7 +151,7 @@ class OpenSongImport(SongImport):
                 self.do_import_file(file)
                 if self.commit:
                     self.finish()
-        if not self.commit:
+        if self.commit:
             self.finish()
 
 
@@ -296,5 +296,6 @@ class OpenSongImport(SongImport):
         self.topics = topics
         self.verse_order_list = verse_order_list
         self.verses = verselist
-        xxx sort out where to call setdefaults
-        xxx need to make calls to insert to database here
+
+        # xxx sort out where to call setdefaults
+        # xxx need to make calls to insert to database here
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index 622f139bd..5a4033280 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -52,16 +52,16 @@ class SongImport(QtCore.QObject):
         """
         self.manager = manager
         self.stop_import_flag = False
-        self.set_defaults()
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'songs_stop_import'), self.stop_import)
-        self.setDefaults()
+        self.set_defaults()
     
-    def setDefaults(self):
+    def set_defaults(self):
         """
         Create defaults for properties - call this before each song
         if importing many songs at once to ensure a clean beginning
         """
+        self.authors = []
         self.title = u''
         self.song_number = u''
         self.alternate_title = u''
@@ -251,6 +251,7 @@ class SongImport(QtCore.QObject):
         """
         Write the song and its fields to disk
         """
+        log.info(u'commiting song %s to database', self.title)
         song = Song()
         song.title = self.title
         song.search_title = self.remove_punctuation(self.title) \
diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py
index f2fcb8cd2..eabcce7e5 100644
--- a/openlp/plugins/songs/lib/test/test_opensongimport.py
+++ b/openlp/plugins/songs/lib/test/test_opensongimport.py
@@ -69,9 +69,9 @@ def test():
     assert o.topics == [u'TestTheme', u'TestAltTheme']
 
     o.filenames = [u'test.opensong.zip']
+    o.set_defaults()
     o.do_import()
     o.print_song()
-    o.finish()
     assert o.copyright == u'2010 Martin Thompson'
     assert o.authors == [u'MartiÑ Thómpson']
     assert o.title == u'Martins Test'
@@ -87,8 +87,8 @@ def test():
     assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3', u'B1', u'V1']
 
     o.filenames = [u'test2.opensong']
+    o.set_defaults()
     o.do_import()
-    # o.finish()
     o.print_song()
     assert o.copyright == u'2010 Martin Thompson'
     assert o.authors == [u'Martin Thompson']
@@ -106,8 +106,8 @@ def test():
     assert o.verse_order_list == [u'V1', u'V2', u'B1', u'C1', u'C2']
 
     o.filenames = [u'test3.opensong']
+    o.set_defaults()
     o.do_import()
-    # o.finish()
     o.print_song()
     assert o.copyright == u'2010'
     assert o.authors == [u'Martin Thompson']

From c25b0aa8ffc8a6ceaa25fab898b898f7587718d9 Mon Sep 17 00:00:00 2001
From: Martin Thompson <martinthompson@openlp.org>
Date: Mon, 6 Sep 2010 21:37:22 +0100
Subject: [PATCH 06/21] Test for multi character versetypes

---
 openlp/plugins/songs/lib/test/test.opensong         | 13 ++++++++++++-
 .../plugins/songs/lib/test/test_opensongimport.py   |  6 ++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/openlp/plugins/songs/lib/test/test.opensong b/openlp/plugins/songs/lib/test/test.opensong
index 0390f99b2..c75951492 100644
--- a/openlp/plugins/songs/lib/test/test.opensong
+++ b/openlp/plugins/songs/lib/test/test.opensong
@@ -4,7 +4,7 @@
   <author>MartiÑ &amp; Martin2 Thómpson</author>
   <copyright>2010 Martin Thompson</copyright>
   <hymn_number>1</hymn_number>
-  <presentation>V1 C V2 C2 3a B1 V1 T U</presentation>
+  <presentation>V1 C V2 C2 3a B1 V1 T U Rap1 Rap2 Rap3</presentation>
   <ccli>Blah</ccli>
   <capo print="false"></capo>
   <key></key>
@@ -47,6 +47,17 @@
 [T]
   T Line 1
 
+[Rap]
+1 Rap 1 Line 1
+2 Rap 2 Line 1
+1 Rap 1 Line 2
+2 Rap 2 Line 2
+
+[rap3]
+ Rap 3 Line 1
+ Rap 3 Line 2
+
+
 [X]
   Unreferenced verse line 1
  </lyrics>
diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py
index eabcce7e5..b503c65c5 100644
--- a/openlp/plugins/songs/lib/test/test_opensongimport.py
+++ b/openlp/plugins/songs/lib/test/test_opensongimport.py
@@ -63,8 +63,11 @@ def test():
     assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses 
     assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
     assert [u'V3A', u'V3 Line 1\nV3 Line 2'] in o.verses
+    assert [u'RAP1', u'Rap 1 Line 1\nRap 1 Line 2'] in o.verses
+    assert [u'RAP2', u'Rap 2 Line 1\nRap 2 Line 2'] in o.verses
+    assert [u'RAP3', u'Rap 3 Line 1\nRap 3 Line 2'] in o.verses
     assert [u'X1', u'Unreferenced verse line 1'] in o.verses
-    assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3A', u'B1', u'V1', u'T1']
+    assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3A', u'B1', u'V1', u'T1', u'RAP1', u'RAP2', u'RAP3']
     assert o.ccli_number == u'Blah'
     assert o.topics == [u'TestTheme', u'TestAltTheme']
 
@@ -120,7 +123,6 @@ def test():
     assert [u'V1', u'Line 1\nLine 2'] in o.verses 
 
     print "Tests passed"
-    pass
 
 if __name__ == "__main__":
     test()

From 062a88e2f24cb10bc1d2b61d3f9f1efb44e3b1d8 Mon Sep 17 00:00:00 2001
From: Martin Thompson <martinthompson@openlp.org>
Date: Sun, 12 Sep 2010 21:31:23 +0100
Subject: [PATCH 07/21] Better handling of progress bar.  Attempt to get
 'other' type verses into database

---
 openlp/plugins/songs/lib/opensongimport.py           | 11 ++++++++++-
 openlp/plugins/songs/lib/songimport.py               |  7 +++++++
 openlp/plugins/songs/lib/test/test_opensongimport.py |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index baaec12e7..6748d5a8a 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -119,7 +119,16 @@ class OpenSongImport(SongImport):
         import will not be committed to the database (useful for test scripts).
         """
         success = False
-        self.import_wizard.importProgressBar.setMaximum(len(self.filenames))
+        numfiles = 0
+        for filename in self.filenames:
+            ext = os.path.splitext(filename)[1]
+            if ext.lower() == u'.zip':
+                z = ZipFile(filename, u'r')
+                numfiles += len(z.infolist())
+            else:
+                numfiles += 1
+        log.debug("Total number of files: %d", numfiles)
+        self.import_wizard.importProgressBar.setMaximum(numfiles)
         for filename in self.filenames:
             if self.stop_import_flag:
                 break
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index 5a4033280..e049740cc 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -258,6 +258,7 @@ class SongImport(QtCore.QObject):
             + '@' + self.alternate_title
         song.song_number = self.song_number
         song.search_lyrics = u''
+        verses_changed_to_other = []
         sxml = SongXMLBuilder()
         for (versetag, versetext) in self.verses:
             if versetag[0] == u'C':
@@ -273,10 +274,16 @@ class SongImport(QtCore.QObject):
             elif versetag[0] == u'E':
                 versetype = VerseType.to_string(VerseType.Ending)
             else:
+                verses_changed_to_other.append(versetag)
                 versetype = VerseType.to_string(VerseType.Other)
+                print "Versetype", versetype
             sxml.add_verse_to_lyrics(versetype, versetag[1:], versetext)
             song.search_lyrics += u' ' + self.remove_punctuation(versetext)
+        print verses_changed_to_other
         song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
+        for tag in verses_changed_to_other:
+            pass
+            # xxx sort out the "other" verses
         song.verse_order = u' '.join(self.verse_order_list)
         song.copyright = self.copyright
         song.comments = self.comments
diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py
index b503c65c5..8bede1bbf 100644
--- a/openlp/plugins/songs/lib/test/test_opensongimport.py
+++ b/openlp/plugins/songs/lib/test/test_opensongimport.py
@@ -48,7 +48,7 @@ def test():
     manager = Manager(u'songs', init_schema)
     o = OpenSongImport(manager, filenames=[u'test.opensong'])
     o.import_wizard = wizard_stub()
-    o.commit = False
+    o.commit = True
     o.do_import()
     o.print_song()
     assert o.copyright == u'2010 Martin Thompson'

From ebf3ce587d477d35970a7cce8f8547a092d3898c Mon Sep 17 00:00:00 2001
From: Martin Thompson <martinthompson@openlp.org>
Date: Wed, 15 Sep 2010 21:12:03 +0100
Subject: [PATCH 08/21] Tweaks from review

---
 .bzrignore                                 |  2 --
 openlp/plugins/songs/lib/opensongimport.py | 15 ++++++++-------
 openlp/plugins/songs/lib/songimport.py     |  1 -
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index fd38bd412..073fb531a 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -19,5 +19,3 @@ _eric4project
 *.qm
 openlp/core/resources.py.old
 *.qm
-import_lots_errors.txt
-../import_lots_errors.txt
diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index b0a21271a..bf384e6f0 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -119,7 +119,7 @@ class OpenSongImport(SongImport):
         multiple opensong files. If `self.commit` is set False, the
         import will not be committed to the database (useful for test scripts).
         """
-        success = False
+        success = True
         numfiles = 0
         for filename in self.filenames:
             ext = os.path.splitext(filename)[1]
@@ -157,7 +157,8 @@ class OpenSongImport(SongImport):
                 if self.stop_import_flag:
                     success = False
                     break
-            else: # not a zipfile
+            else:
+                # not a zipfile
                 log.info('Direct import %s', filename)
                 self.import_wizard.incrementProgressBar(
                     unicode(translate('SongsPlugin.ImportWizardForm',
@@ -244,9 +245,7 @@ class OpenSongImport(SongImport):
             if thisline[0].isdigit():
                 versenum = thisline[0]
                 words = thisline[1:].strip()
-            if words is None:# and \
-                   #versenum is not None and \
-                   #versetype is not None:
+            if words is None:
                 words = thisline
                 if not versenum: 
                     versenum = u'1'
@@ -295,9 +294,11 @@ class OpenSongImport(SongImport):
                 log.warn(u'No verse order available (either explicit or inferred) for %s, skipping.', self.title)
         for tag in order:
             if tag[0].isdigit():
-                tag = u'V' + tag # Assume it's a verse if it has no prefix
+                # Assume it's a verse if it has no prefix
+                tag = u'V' + tag 
             elif not re.search('\d+', tag):
-                tag = tag + u'1' # Assume it's no.1 if there's no digits
+                # Assume it's no.1 if there's no digits
+                tag = tag + u'1'
             if not versetags.has_key(tag):
                 log.info(u'Got order %s but not in versetags, dropping this item from presentation order', tag)
             else:
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index a3085bb1c..dcf4ed8d8 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -291,7 +291,6 @@ class SongImport(QtCore.QObject):
                 versetag = newversetag
             sxml.add_verse_to_lyrics(versetype, versetag[1:], versetext)
             song.search_lyrics += u' ' + self.remove_punctuation(versetext)
-        # print verses_changed_to_other
         song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
         for i, current_verse_tag in enumerate(self.verse_order_list):
             if verses_changed_to_other.has_key(current_verse_tag):

From ea1321ef202a174335bbcc01ff207cbcb5a22914 Mon Sep 17 00:00:00 2001
From: rimach <rimach@siduxbox>
Date: Wed, 15 Sep 2010 22:51:01 +0200
Subject: [PATCH 09/21] add pipe using for soffice

---
 .../plugins/presentations/lib/impresscontroller.py | 14 +++++++++++---
 openlp/plugins/songs/lib/oooimport.py              | 12 +++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index 9ada43a5a..582368a4e 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -98,7 +98,12 @@ class ImpressController(PresentationController):
             self.manager._FlagAsMethod(u'Bridge_GetValueObject')
         else:
             # -headless
-            cmd = u'openoffice.org -nologo -norestore -minimized -invisible -nofirststartwizard -accept="socket,host=localhost,port=2002;urp;"'
+            #connection_type = u'socket'
+            connection_type = u'pipe,name=openlp_pipe:'
+            cmd = u'openoffice.org -nologo -norestore -minimized ' \
+                + u'-invisible -nofirststartwizard ' \
+                + '-accept="' + connection_type \
+                + u'socket,host=localhost,port=2002;urp;"'
             self.process = QtCore.QProcess()
             self.process.startDetached(cmd)
             self.process.waitForStarted()
@@ -117,11 +122,14 @@ class ImpressController(PresentationController):
             u'UnoUrlResolver')
         resolver = context.ServiceManager.createInstanceWithContext(
             u'com.sun.star.bridge.UnoUrlResolver', context)
+        #connection_type = u'socket'
+        connection_type = u'pipe,name=openlp_pipe:'
         while ctx is None and loop < 3:
             try:
                 log.debug(u'get UNO Desktop Openoffice - resolve')
-                ctx = resolver.resolve(u'uno:socket,host=localhost,port=2002;'
-                    u'urp;StarOffice.ComponentContext')
+                ctx = resolver.resolve(u'uno:' + connection_type \
+                    + u',host=localhost,' \
+                    + u'port=2002;urp;StarOffice.ComponentContext')
             except:
                 log.exception(u'Unable to find running instance ')
                 self.start_process()
diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py
index e8c723c0e..b092d2962 100644
--- a/openlp/plugins/songs/lib/oooimport.py
+++ b/openlp/plugins/songs/lib/oooimport.py
@@ -94,6 +94,8 @@ class OooImport(SongImport):
         Start OpenOffice.org process
         TODO: The presentation/Impress plugin may already have it running
         """
+        #connection_type = u'socket'
+        connection_type = u'pipe,name=openlp_pipe:'
         if os.name == u'nt':
             self.start_ooo_process()
             self.desktop = self.manager.createInstance(
@@ -106,8 +108,9 @@ class OooImport(SongImport):
             loop = 0
             while ctx is None and loop < 5:
                 try:
-                    ctx = resolver.resolve(u'uno:socket,host=localhost,' \
-                        + 'port=2002;urp;StarOffice.ComponentContext')
+                    ctx = resolver.resolve(u'uno:' + connection_type \
+                        + u',host=localhost,' \
+                        + u'port=2002;urp;StarOffice.ComponentContext')
                 except:
                     pass
                 self.start_ooo_process()
@@ -117,6 +120,8 @@ class OooImport(SongImport):
                 "com.sun.star.frame.Desktop", ctx)
             
     def start_ooo_process(self):
+        #connection_type = u'socket'
+        connection_type = u'pipe,name=openlp_pipe:'
         try:
             if os.name == u'nt':
                 self.manager = Dispatch(u'com.sun.star.ServiceManager')
@@ -125,7 +130,8 @@ class OooImport(SongImport):
             else:
                 cmd = u'openoffice.org -nologo -norestore -minimized ' \
                     + u'-invisible -nofirststartwizard ' \
-                    + '-accept="socket,host=localhost,port=2002;urp;"'
+                    + '-accept="' + connection_type \
+                    + u'socket,host=localhost,port=2002;urp;"'
                 process = QtCore.QProcess()
                 process.startDetached(cmd)
                 process.waitForStarted()

From ec9230be386828bc648ab253e6c776638ea423b5 Mon Sep 17 00:00:00 2001
From: Martin Thompson <martinthompson@openlp.org>
Date: Wed, 15 Sep 2010 22:02:32 +0100
Subject: [PATCH 10/21] Put comment in right place

---
 openlp/plugins/songs/lib/opensongimport.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index bae1db18d..f4be0dc87 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -235,8 +235,8 @@ class OpenSongImport(SongImport):
                 if match is not None:
                     versetype = match.group(1)
                     versenum = match.group(2)
-                # otherwise we assume number 1 and take the whole prefix as versetype
                 else:
+                    # otherwise we assume number 1 and take the whole prefix as versetype
                     versetype = content
                     versenum = u'1'
                 continue

From a3aaf7dce88416c89a9156723d7d8e1a96a96c5e Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Thu, 16 Sep 2010 20:51:29 +0200
Subject: [PATCH 11/21] Some fancy footwork around encodings.

---
 openlp/plugins/songs/lib/olp1import.py | 36 +++++++++++++++++++-------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/openlp/plugins/songs/lib/olp1import.py b/openlp/plugins/songs/lib/olp1import.py
index 692c6792e..de750cb24 100644
--- a/openlp/plugins/songs/lib/olp1import.py
+++ b/openlp/plugins/songs/lib/olp1import.py
@@ -41,6 +41,8 @@ class OpenLP1SongImport(SongImport):
     The :class:`OpenLP1SongImport` class provides OpenLP with the ability to
     import song databases from installations of openlp.org 1.x.
     """
+    last_encoding = u'windows-1252'
+
     def __init__(self, manager, **kwargs):
         """
         Initialise the import.
@@ -54,20 +56,33 @@ class OpenLP1SongImport(SongImport):
         SongImport.__init__(self, manager)
         self.import_source = kwargs[u'filename']
 
-    def decode_string(self, raw):
+    def decode_string(self, raw, guess):
         """
         Use chardet to detect the encoding of the raw string, and convert it
         to unicode.
 
         ``raw``
             The raw bytestring to decode.
+        ``guess``
+            What chardet guessed the encoding to be.
         """
-        detection = chardet.detect(raw)
-        if detection[u'confidence'] < 0.8:
+        if guess[u'confidence'] < 0.8:
             codec = u'windows-1252'
         else:
-            codec = detection[u'encoding']
-        return unicode(raw, codec)
+            codec = guess[u'encoding']
+        try:
+            decoded = unicode(raw, codec)
+            self.last_encoding = codec
+        except UnicodeDecodeError:
+            log.exception(u'Error in detecting openlp.org 1.x database encoding.')
+            try:
+                decoded = unicode(raw, self.last_encoding)
+            except UnicodeDecodeError:
+                # possibly show an error form
+                #self.import_wizard.showError(u'There was a problem '
+                #    u'detecting the encoding of a string')
+                decoded = raw
+        return decoded
 
     def do_import(self):
         """
@@ -103,9 +118,10 @@ class OpenLP1SongImport(SongImport):
                 success = False
                 break
             song_id = song[0]
-            title = self.decode_string(song[1])
-            lyrics = self.decode_string(song[2]).replace(u'\r', u'')
-            copyright = self.decode_string(song[3])
+            guess = chardet.detect(song[2])
+            title = self.decode_string(song[1], guess)
+            lyrics = self.decode_string(song[2], guess).replace(u'\r', u'')
+            copyright = self.decode_string(song[3], guess)
             self.import_wizard.incrementProgressBar(
                 unicode(translate('SongsPlugin.ImportWizardForm',
                     'Importing "%s"...')) % title)
@@ -121,7 +137,7 @@ class OpenLP1SongImport(SongImport):
                     break
                 for author in authors:
                     if author[0] == author_id[0]:
-                        self.parse_author(self.decode_string(author[1]))
+                        self.parse_author(self.decode_string(author[1], guess))
                         break
             if self.stop_import_flag:
                 success = False
@@ -136,7 +152,7 @@ class OpenLP1SongImport(SongImport):
                         break
                     for track in tracks:
                         if track[0] == track_id[0]:
-                            self.add_media_file(self.decode_string(track[1]))
+                            self.add_media_file(self.decode_string(track[1], guess))
                             break
             if self.stop_import_flag:
                 success = False

From d2bf1fedae06f58c554252726c0d022b354e57f1 Mon Sep 17 00:00:00 2001
From: rimach <rimach@siduxbox>
Date: Thu, 16 Sep 2010 23:01:44 +0200
Subject: [PATCH 12/21] correct piped soffice start, fix Python2.5 problem with
 unicode strings in optparse

---
 openlp.pyw                                    |  22 +++++++-------
 .../presentations/lib/impresscontroller.py    |  28 +++++++++++-------
 openlp/plugins/songs/lib/oooimport.py         |  28 +++++++++++-------
 resources/images/about-new.bmp                | Bin
 resources/openlp.desktop                      |  17 +++++++++--
 5 files changed, 60 insertions(+), 35 deletions(-)
 mode change 100755 => 100644 resources/images/about-new.bmp
 mode change 100644 => 100755 resources/openlp.desktop

diff --git a/openlp.pyw b/openlp.pyw
index 9327a1168..80b49321e 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -162,18 +162,18 @@ def main():
     the PyQt4 Application.
     """
     # Set up command line options.
-    usage = u'Usage: %prog [options] [qt-options]'
+    usage = 'Usage: %prog [options] [qt-options]'
     parser = OptionParser(usage=usage)
-    parser.add_option(u'-e', u'--no-error-form', dest=u'no_error_form',
-        action=u'store_true', help=u'Disable the error notification form.')
-    parser.add_option(u'-l', u'--log-level', dest=u'loglevel',
-        default=u'warning', metavar=u'LEVEL', help=u'Set logging to LEVEL '
-        u'level. Valid values are "debug", "info", "warning".')
-    parser.add_option(u'-p', u'--portable', dest=u'portable',
-        action=u'store_true', help=u'Specify if this should be run as a '
-        u'portable app, off a USB flash drive (not implemented).')
-    parser.add_option(u'-s', u'--style', dest=u'style',
-        help=u'Set the Qt4 style (passed directly to Qt4).')
+    parser.add_option('-e', '--no-error-form', dest='no_error_form',
+        action='store_true', help='Disable the error notification form.')
+    parser.add_option('-l', '--log-level', dest='loglevel',
+        default='warning', metavar='LEVEL', help='Set logging to LEVEL '
+        'level. Valid values are "debug", "info", "warning".')
+    parser.add_option('-p', '--portable', dest='portable',
+        action='store_true', help='Specify if this should be run as a '
+        'portable app, off a USB flash drive (not implemented).')
+    parser.add_option('-s', '--style', dest='style',
+        help='Set the Qt4 style (passed directly to Qt4).')
     # Set up logging
     log_path = AppLocation.get_directory(AppLocation.CacheDir)
     if not os.path.exists(log_path):
diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index 582368a4e..8d2f8e76e 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -74,6 +74,7 @@ class ImpressController(PresentationController):
         self.process = None
         self.desktop = None
         self.manager = None
+        self.uno_connection_type = u'pipe' #u'socket'
 
     def check_available(self):
         """
@@ -98,12 +99,14 @@ class ImpressController(PresentationController):
             self.manager._FlagAsMethod(u'Bridge_GetValueObject')
         else:
             # -headless
-            #connection_type = u'socket'
-            connection_type = u'pipe,name=openlp_pipe:'
-            cmd = u'openoffice.org -nologo -norestore -minimized ' \
-                + u'-invisible -nofirststartwizard ' \
-                + '-accept="' + connection_type \
-                + u'socket,host=localhost,port=2002;urp;"'
+            if self.uno_connection_type == u'pipe':
+                cmd = u'openoffice.org -nologo -norestore -minimized ' \
+                    + u'-invisible -nofirststartwizard ' \
+                    + u'-accept=pipe,name=openlp_pipe;urp;'
+            else:
+                cmd = u'openoffice.org -nologo -norestore -minimized ' \
+                    + u'-invisible -nofirststartwizard ' \
+                    + u'-accept=socket,host=localhost,port=2002;urp;'
             self.process = QtCore.QProcess()
             self.process.startDetached(cmd)
             self.process.waitForStarted()
@@ -123,13 +126,18 @@ class ImpressController(PresentationController):
         resolver = context.ServiceManager.createInstanceWithContext(
             u'com.sun.star.bridge.UnoUrlResolver', context)
         #connection_type = u'socket'
-        connection_type = u'pipe,name=openlp_pipe:'
+        connection_type = u'pipe,name=openlp_pipe'
         while ctx is None and loop < 3:
             try:
                 log.debug(u'get UNO Desktop Openoffice - resolve')
-                ctx = resolver.resolve(u'uno:' + connection_type \
-                    + u',host=localhost,' \
-                    + u'port=2002;urp;StarOffice.ComponentContext')
+                if self.uno_connection_type == u'pipe':
+                    ctx = resolver.resolve(u'uno:' \
+                        + u'pipe,name=openlp_pipe;' \
+                        + u'urp;StarOffice.ComponentContext')
+                else:
+                    ctx = resolver.resolve(u'uno:' \
+                        + u'socket,host=localhost,port=2002;' \
+                        + u'urp;StarOffice.ComponentContext')
             except:
                 log.exception(u'Unable to find running instance ')
                 self.start_process()
diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py
index b092d2962..26a0abfcc 100644
--- a/openlp/plugins/songs/lib/oooimport.py
+++ b/openlp/plugins/songs/lib/oooimport.py
@@ -59,6 +59,7 @@ class OooImport(SongImport):
         self.document = None
         self.process_started = False
         self.filenames = kwargs[u'filenames']
+        self.uno_connection_type = u'pipe' #u'socket'
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'song_stop_import'), self.stop_import)
 
@@ -94,8 +95,6 @@ class OooImport(SongImport):
         Start OpenOffice.org process
         TODO: The presentation/Impress plugin may already have it running
         """
-        #connection_type = u'socket'
-        connection_type = u'pipe,name=openlp_pipe:'
         if os.name == u'nt':
             self.start_ooo_process()
             self.desktop = self.manager.createInstance(
@@ -108,9 +107,14 @@ class OooImport(SongImport):
             loop = 0
             while ctx is None and loop < 5:
                 try:
-                    ctx = resolver.resolve(u'uno:' + connection_type \
-                        + u',host=localhost,' \
-                        + u'port=2002;urp;StarOffice.ComponentContext')
+                    if self.uno_connection_type == u'pipe':
+                        ctx = resolver.resolve(u'uno:' \
+                            + u'pipe,name=openlp_pipe;' \
+                            + u'urp;StarOffice.ComponentContext')
+                    else:
+                        ctx = resolver.resolve(u'uno:' \
+                            + u'socket,host=localhost,port=2002;' \
+                            + u'urp;StarOffice.ComponentContext')
                 except:
                     pass
                 self.start_ooo_process()
@@ -120,18 +124,20 @@ class OooImport(SongImport):
                 "com.sun.star.frame.Desktop", ctx)
             
     def start_ooo_process(self):
-        #connection_type = u'socket'
-        connection_type = u'pipe,name=openlp_pipe:'
         try:
             if os.name == u'nt':
                 self.manager = Dispatch(u'com.sun.star.ServiceManager')
                 self.manager._FlagAsMethod(u'Bridge_GetStruct')
                 self.manager._FlagAsMethod(u'Bridge_GetValueObject')
             else:
-                cmd = u'openoffice.org -nologo -norestore -minimized ' \
-                    + u'-invisible -nofirststartwizard ' \
-                    + '-accept="' + connection_type \
-                    + u'socket,host=localhost,port=2002;urp;"'
+                if self.uno_connection_type == u'pipe':
+                    cmd = u'openoffice.org -nologo -norestore -minimized ' \
+                        + u'-invisible -nofirststartwizard ' \
+                        + u'-accept=pipe,name=openlp_pipe;urp;'
+                else:
+                    cmd = u'openoffice.org -nologo -norestore -minimized ' \
+                        + u'-invisible -nofirststartwizard ' \
+                        + u'-accept=socket,host=localhost,port=2002;urp;'
                 process = QtCore.QProcess()
                 process.startDetached(cmd)
                 process.waitForStarted()
diff --git a/resources/images/about-new.bmp b/resources/images/about-new.bmp
old mode 100755
new mode 100644
diff --git a/resources/openlp.desktop b/resources/openlp.desktop
old mode 100644
new mode 100755
index 0c843bd69..684119773
--- a/resources/openlp.desktop
+++ b/resources/openlp.desktop
@@ -1,10 +1,21 @@
 [Desktop Entry]
+Categories=AudioVideo;
+Comment[de]=
+Comment=
 Encoding=UTF-8
-Name=OpenLP
-GenericName=Church lyrics projection
 Exec=openlp
+GenericName[de]=Church lyrics projection
+GenericName=Church lyrics projection
 Icon=openlp
+MimeType=
+Name[de]=OpenLP
+Name=OpenLP
+Path=
 StartupNotify=true
 Terminal=false
+TerminalOptions=
 Type=Application
-Categories=AudioVideo;
+X-DBUS-ServiceName=
+X-DBUS-StartupType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=

From ba346502e44da0470ae86d37c42c9819386beb1c Mon Sep 17 00:00:00 2001
From: rimach <rimach@siduxbox>
Date: Thu, 16 Sep 2010 23:04:02 +0200
Subject: [PATCH 13/21] Head

---
 resources/openlp.desktop | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/resources/openlp.desktop b/resources/openlp.desktop
index 684119773..d84f69297 100755
--- a/resources/openlp.desktop
+++ b/resources/openlp.desktop
@@ -1,21 +1,11 @@
+#!/usr/bin/env xdg-open
 [Desktop Entry]
-Categories=AudioVideo;
-Comment[de]=
-Comment=
 Encoding=UTF-8
-Exec=openlp
-GenericName[de]=Church lyrics projection
-GenericName=Church lyrics projection
-Icon=openlp
-MimeType=
-Name[de]=OpenLP
 Name=OpenLP
-Path=
+GenericName=Church lyrics projection
+Exec=openlp
+Icon=openlp
 StartupNotify=true
 Terminal=false
-TerminalOptions=
 Type=Application
-X-DBUS-ServiceName=
-X-DBUS-StartupType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
+Categories=AudioVideo;

From c8d9fd97df504b6eed3e2931a3ffa639244e8604 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Fri, 17 Sep 2010 08:20:51 +0200
Subject: [PATCH 14/21] Fixed a spelling error.

---
 openlp/core/ui/exceptiondialog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py
index 28097e938..49e2c8151 100644
--- a/openlp/core/ui/exceptiondialog.py
+++ b/openlp/core/ui/exceptiondialog.py
@@ -73,7 +73,7 @@ class Ui_ExceptionDialog(object):
 
     def retranslateUi(self, exceptionDialog):
         exceptionDialog.setWindowTitle(
-            translate('OpenLP.ExceptionDialog', 'Error Occured'))
+            translate('OpenLP.ExceptionDialog', 'Error Occurred'))
         self.messageLabel.setText(translate('OpenLP.ExceptionDialog', 'Oops! '
             'OpenLP hit a problem, and couldn\'t recover. The text in the box '
             'below contains information that might be helpful to the OpenLP '

From 794493d0d19d0d8f600e5aaadcfdbf79be1fdfe8 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Fri, 17 Sep 2010 21:02:25 +0200
Subject: [PATCH 15/21] Fixed bug #640460.

---
 openlp/plugins/songs/forms/editsongform.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 458e7200c..ae9938ab4 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -621,6 +621,10 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             self.close()
 
     def saveSong(self):
+        """
+        Get all the data from the widgets on the form, and then save it to the
+        database.
+        """
         self.song.title = unicode(self.TitleEditItem.text())
         self.song.alternate_title = unicode(self.AlternativeEdit.text())
         self.song.copyright = unicode(self.CopyrightEditItem.text())
@@ -646,6 +650,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 self.song.topics.append(self.songmanager.get_object(Topic,
                     topicId))
             self.songmanager.save_object(self.song)
+            self.song = None
             return True
         return False
 

From 1e5645995c096c04932f572b232d308b86b2063f Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Fri, 17 Sep 2010 22:06:41 +0200
Subject: [PATCH 16/21] Some more spelling/grammatical corrections.

---
 openlp/plugins/songs/forms/songimportwizard.py    | 2 +-
 openlp/plugins/songs/forms/songmaintenanceform.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openlp/plugins/songs/forms/songimportwizard.py b/openlp/plugins/songs/forms/songimportwizard.py
index 9ae6d7348..37ee10612 100644
--- a/openlp/plugins/songs/forms/songimportwizard.py
+++ b/openlp/plugins/songs/forms/songimportwizard.py
@@ -519,7 +519,7 @@ class Ui_SongImportWizard(object):
         self.openLyricsDisabledLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'The OpenLyrics '
             'importer has not yet been developed, but as you can see, we are '
-            'still intendeding to do so. Hopefully it will be in the next '
+            'still intending to do so. Hopefully it will be in the next '
             'release.'))
         self.openSongAddButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index a2c12a6d6..48f9a5a55 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -324,8 +324,8 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                     QtGui.QMessageBox.critical(self,
                         translate('SongsPlugin.SongMaintenanceForm', 'Error'),
                         translate('SongsPlugin.SongMaintenanceForm',
-                        'Could not save your modified author, because he '
-                        'already exists.'))
+                        'Could not save your modified author, because the '
+                        'author already exists.'))
 
     def onTopicEditButtonClick(self):
         topic_id = self._getCurrentItemId(self.TopicsListWidget)

From 93b2d54c92c9bb6203ae734f93531f228faa3428 Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Sat, 18 Sep 2010 16:24:39 +0100
Subject: [PATCH 17/21] String fixes

---
 openlp/core/ui/servicemanager.py                | 3 ++-
 openlp/core/ui/slidecontroller.py               | 3 ++-
 openlp/core/ui/thememanager.py                  | 4 ++--
 openlp/plugins/bibles/forms/importwizardform.py | 4 ++--
 openlp/plugins/bibles/lib/manager.py            | 2 +-
 openlp/plugins/songs/forms/authorsform.py       | 3 +--
 openlp/plugins/songs/forms/topicsform.py        | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index b2058a2e1..8db14956d 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -884,7 +884,8 @@ class ServiceManager(QtGui.QWidget):
             QtGui.QMessageBox.critical(self,
                 translate('OpenLP.ServiceManager', 'Missing Display Handler'),
                 translate('OpenLP.ServiceManager', 'Your item cannot be '
-                    'displayed as there is no handler to display it'))
+                    'displayed as the plugin required to display it is missing '
+                    'or inactive'))
 
     def remoteEdit(self):
         """
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 9f9b4d433..7a2e3ccf0 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -209,7 +209,8 @@ class SlideController(QtGui.QWidget):
             self.Toolbar.addToolbarSeparator(u'Close Separator')
             self.Toolbar.addToolbarButton(
                 u'Edit Song', u':/general/general_edit.png',
-                translate('OpenLP.SlideController', 'Edit and re-preview song'),
+                translate('OpenLP.SlideController', 
+                'Edit and reload song preview'),
                 self.onEditSong)
         if isLive:
             self.Toolbar.addToolbarSeparator(u'Loop Separator')
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 3ad6b5c8d..d8324f977 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -242,14 +242,14 @@ class ThemeManager(QtGui.QWidget):
                         QtGui.QMessageBox.critical(self,
                             translate('OpenLP.ThemeManager', 'Error'),
                             unicode(translate('OpenLP.ThemeManager',
-                                'Theme %s is use in %s plugin.')) % \
+                                'Theme %s is used in the %s plugin.')) % \
                                 (theme, plugin.name))
                         return
                 if unicode(self.serviceComboBox.currentText()) == theme:
                     QtGui.QMessageBox.critical(self,
                         translate('OpenLP.ThemeManager', 'Error'),
                         unicode(translate('OpenLP.ThemeManager',
-                        'Theme %s is use by the service manager.')) % theme)
+                        'Theme %s is used by the service manager.')) % theme)
                     return
                 row = self.themeListWidget.row(item)
                 self.themeListWidget.takeItem(row)
diff --git a/openlp/plugins/bibles/forms/importwizardform.py b/openlp/plugins/bibles/forms/importwizardform.py
index 67f3756dc..84f0f41ee 100644
--- a/openlp/plugins/bibles/forms/importwizardform.py
+++ b/openlp/plugins/bibles/forms/importwizardform.py
@@ -182,7 +182,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                     translate('BiblesPlugin.ImportWizardForm',
                         'Empty Copyright'),
                     translate('BiblesPlugin.ImportWizardForm',
-                        'You need to set a copyright for your Bible! '
+                        'You need to set a copyright for your Bible. '
                         'Bibles in the Public Domain need to be marked as '
                         'such.'))
                 self.CopyrightEdit.setFocus()
@@ -192,7 +192,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                     translate('BiblesPlugin.ImportWizardForm',
                         'Bible Exists'),
                     translate('BiblesPlugin.ImportWizardForm',
-                        'This Bible already exists! Please import '
+                        'This Bible already exists. Please import '
                         'a different Bible or first delete the existing one.'))
                 self.VersionNameEdit.setFocus()
                 return False
diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py
index 4f35556f1..fd2c2adff 100644
--- a/openlp/plugins/bibles/lib/manager.py
+++ b/openlp/plugins/bibles/lib/manager.py
@@ -246,7 +246,7 @@ class BibleManager(object):
                 translate('BiblesPlugin.BibleManager',
                 'Scripture Reference Error'),
                 translate('BiblesPlugin.BibleManager', 'Your scripture '
-                'reference is either not supported by OpenLP or invalid. '
+                'reference is either not supported by OpenLP or is invalid. '
                 'Please make sure your reference conforms to one of the '
                 'following patterns:\n\n'
                 'Book Chapter\n'
diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py
index c7d1b0396..1dacd82cc 100644
--- a/openlp/plugins/songs/forms/authorsform.py
+++ b/openlp/plugins/songs/forms/authorsform.py
@@ -97,8 +97,7 @@ class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
                     self, translate('SongsPlugin.AuthorsForm', 'Error'),
                     translate('SongsPlugin.AuthorsForm',
                         'You have not set a display name for the '
-                        'author, would you like me to combine the first and '
-                        'last names for you?'),
+                        'author, combine the first and last names?'),
                     QtGui.QMessageBox.StandardButtons(
                         QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
                     ) == QtGui.QMessageBox.Yes:
diff --git a/openlp/plugins/songs/forms/topicsform.py b/openlp/plugins/songs/forms/topicsform.py
index a618dd9db..c45228527 100644
--- a/openlp/plugins/songs/forms/topicsform.py
+++ b/openlp/plugins/songs/forms/topicsform.py
@@ -51,7 +51,7 @@ class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
             QtGui.QMessageBox.critical(
                 self, translate('SongsPlugin.TopicsForm', 'Error'),
                 translate('SongsPlugin.TopicsForm',
-                    'You need to type in a topic name!'))
+                    'You need to type in a topic name.'))
             self.NameEdit.setFocus()
             return False
         else:

From c8d3e3df232dcb44434934d1cf65350b3632f464 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Sat, 18 Sep 2010 18:11:37 +0200
Subject: [PATCH 18/21] fixed bug #641734

---
 scripts/bible-1to2-converter.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bible-1to2-converter.py b/scripts/bible-1to2-converter.py
index 111d22043..ebf246608 100755
--- a/scripts/bible-1to2-converter.py
+++ b/scripts/bible-1to2-converter.py
@@ -127,6 +127,8 @@ def import_bible():
     for row in rows:
         key = unicode(row[0], u'cp1252')
         value = unicode(row[1], u'cp1252')
+        if key == u'Permission':
+            key = u'Permissions'
         sql_insert = u'INSERT INTO metadata '\
             '("key", "value") '\
             'VALUES (?, ?)'

From 7f5a6411d6c694f7a47ace9cebae3d423b50bf7a Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Sat, 18 Sep 2010 19:14:27 +0200
Subject: [PATCH 19/21] Fix for bug #640697

---
 openlp/core/ui/mainwindow.py | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 60a6ae2b7..193d4ba0c 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -575,7 +575,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             QtCore.SIGNAL(u'toggled(bool)'), self.setAutoLanguage)
         self.LanguageGroup.triggered.connect(LanguageManager.set_language)
         QtCore.QObject.connect(self.ModeDefaultItem,
-            QtCore.SIGNAL(u'triggered()'), self.setViewMode)
+            QtCore.SIGNAL(u'triggered()'), self.onModeDetaultItemClicked)
         QtCore.QObject.connect(self.ModeSetupItem,
             QtCore.SIGNAL(u'triggered()'), self.onModeSetupItemClicked)
         QtCore.QObject.connect(self.ModeLiveItem,
@@ -670,6 +670,16 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             self.generalSettingsSection + u'/auto open',
             QtCore.QVariant(False)).toBool():
             self.ServiceManagerContents.onLoadService(True)
+        view_mode = QtCore.QSettings().value(u'%s/view mode' % \
+            self.generalSettingsSection, u'default')
+        if view_mode == u'default':
+            self.ModeDefaultItem.setChecked(True)
+        elif view_mode == u'setup':
+            self.setViewMode(True, True, False, True, False)
+            self.ModeSetupItem.setChecked(True)
+        elif view_mode == u'live':
+            self.setViewMode(False, True, False, False, True)
+            self.ModeLiveItem.setChecked(True)
 
     def blankCheck(self):
         """
@@ -677,8 +687,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         Triggered by delay thread.
         """
         settings = QtCore.QSettings()
-        settings.beginGroup(self.generalSettingsSection)
-        if settings.value(u'screen blank', QtCore.QVariant(False)).toBool():
+        if settings.value(u'%s/screen blank' % self.generalSettingsSection,
+            QtCore.QVariant(False)).toBool():
             self.LiveController.mainDisplaySetBackground()
             if settings.value(u'blank warning',
                 QtCore.QVariant(False)).toBool():
@@ -687,7 +697,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
                         'OpenLP Main Display Blanked'),
                     translate('OpenLP.MainWindow',
                          'The Main Display has been blanked out'))
-        settings.endGroup()
 
     def onHelpWebSiteClicked(self):
         """
@@ -716,16 +725,31 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         """
         self.settingsForm.exec_()
 
+    def onModeDetaultItemClicked(self):
+        """
+        Put OpenLP into "Default" view mode.
+        """
+        settings = QtCore.QSettings()
+        settings.setValue(u'%s/view mode' % self.generalSettingsSection,
+            u'default')
+        self.setViewMode(True, True, True, True, True)
+
     def onModeSetupItemClicked(self):
         """
         Put OpenLP into "Setup" view mode.
         """
+        settings = QtCore.QSettings()
+        settings.setValue(u'%s/view mode' % self.generalSettingsSection,
+            u'setup')
         self.setViewMode(True, True, False, True, False)
 
     def onModeLiveItemClicked(self):
         """
         Put OpenLP into "Live" view mode.
         """
+        settings = QtCore.QSettings()
+        settings.setValue(u'%s/view mode' % self.generalSettingsSection,
+            u'live')
         self.setViewMode(False, True, False, False, True)
 
     def setViewMode(self, media=True, service=True, theme=True, preview=True,

From bf35338c990e6eccc439bb0a393df39d50db9da7 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Sat, 18 Sep 2010 20:15:54 +0200
Subject: [PATCH 20/21] Fix some typos.

---
 openlp/core/ui/mainwindow.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 193d4ba0c..0d158d042 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -575,7 +575,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             QtCore.SIGNAL(u'toggled(bool)'), self.setAutoLanguage)
         self.LanguageGroup.triggered.connect(LanguageManager.set_language)
         QtCore.QObject.connect(self.ModeDefaultItem,
-            QtCore.SIGNAL(u'triggered()'), self.onModeDetaultItemClicked)
+            QtCore.SIGNAL(u'triggered()'), self.onModeDefaultItemClicked)
         QtCore.QObject.connect(self.ModeSetupItem,
             QtCore.SIGNAL(u'triggered()'), self.onModeSetupItemClicked)
         QtCore.QObject.connect(self.ModeLiveItem,
@@ -725,7 +725,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         """
         self.settingsForm.exec_()
 
-    def onModeDetaultItemClicked(self):
+    def onModeDefaultItemClicked(self):
         """
         Put OpenLP into "Default" view mode.
         """

From 86bed937f5983171e1e688f119a73c31524f2a3d Mon Sep 17 00:00:00 2001
From: rimach <rimach@siduxbox>
Date: Sat, 18 Sep 2010 20:56:57 +0200
Subject: [PATCH 21/21] Remove unused lines

---
 openlp/plugins/presentations/lib/impresscontroller.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index 8d2f8e76e..d054c3e9c 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -125,8 +125,6 @@ class ImpressController(PresentationController):
             u'UnoUrlResolver')
         resolver = context.ServiceManager.createInstanceWithContext(
             u'com.sun.star.bridge.UnoUrlResolver', context)
-        #connection_type = u'socket'
-        connection_type = u'pipe,name=openlp_pipe'
         while ctx is None and loop < 3:
             try:
                 log.debug(u'get UNO Desktop Openoffice - resolve')