r1657

openlp/core/lib/spelltextedit.py

@@ -29,6 +29,7 @@ import re
 try:
     import enchant
     from enchant import DictNotFoundError
+    from enchant.errors import Error
     ENCHANT_AVAILABLE = True
 except ImportError:
     ENCHANT_AVAILABLE = False
@@ -56,7 +57,7 @@ class SpellTextEdit(QtGui.QPlainTextEdit):
                 self.dictionary = enchant.Dict()
                 self.highlighter = Highlighter(self.document())
                 self.highlighter.spellingDictionary = self.dictionary
-            except DictNotFoundError:
+            except Error, DictNotFoundError:
                 ENCHANT_AVAILABLE = False
                 log.debug(u'Could not load default dictionary')
 

openlp/core/ui/maindisplay.py

@@ -49,7 +49,10 @@ class MainDisplay(QtGui.QGraphicsView):
     This is the display screen.
     """
     def __init__(self, parent, image_manager, live):
-        QtGui.QGraphicsView.__init__(self, parent)
+        if live:
+            QtGui.QGraphicsView.__init__(self)
+        else:
+            QtGui.QGraphicsView.__init__(self, parent)
         self.isLive = live
         self.image_manager = image_manager
         self.screens = ScreenList.get_instance()

openlp/core/ui/shortcutlistform.py

@@ -98,6 +98,9 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         if event.modifiers() & QtCore.Qt.ShiftModifier == \
             QtCore.Qt.ShiftModifier:
             key_string = u'Shift+' + key_string
+        if event.modifiers() & QtCore.Qt.MetaModifier == \
+            QtCore.Qt.MetaModifier:
+            key_string = u'Meta+' + key_string
         key_sequence = QtGui.QKeySequence(key_string)
         if self._validiate_shortcut(self._currentItemAction(), key_sequence):
             if self.primaryPushButton.isChecked():

openlp/core/ui/slidecontroller.py

@@ -500,7 +500,9 @@ class SlideController(QtGui.QWidget):
         """
         Allows the live toolbar to be customised
         """
-        self.toolbar.setVisible(True)
+        # Work-around for OS X, hide and then show the toolbar
+        # See bug #791050
+        self.toolbar.hide()
         self.mediabar.setVisible(False)
         self.toolbar.makeWidgetsInvisible([u'Song Menu'])
         self.toolbar.makeWidgetsInvisible(self.loopList)
@@ -515,12 +517,18 @@ class SlideController(QtGui.QWidget):
         if item.is_media():
             self.toolbar.setVisible(False)
             self.mediabar.setVisible(True)
+        else:
+            # Work-around for OS X, hide and then show the toolbar
+            # See bug #791050
+            self.toolbar.show()
 
     def enablePreviewToolBar(self, item):
         """
         Allows the Preview toolbar to be customised
         """
-        self.toolbar.setVisible(True)
+        # Work-around for OS X, hide and then show the toolbar
+        # See bug #791050
+        self.toolbar.hide()
         self.mediabar.setVisible(False)
         self.toolbar.makeWidgetsInvisible(self.songEditList)
         if item.is_capable(ItemCapabilities.AllowsEdit) and item.from_plugin:
@@ -529,6 +537,10 @@ class SlideController(QtGui.QWidget):
             self.toolbar.setVisible(False)
             self.mediabar.setVisible(True)
             self.volumeSlider.setAudioOutput(self.audio)
+        if not item.is_media():
+            # Work-around for OS X, hide and then show the toolbar
+            # See bug #791050
+            self.toolbar.show()
 
     def refreshServiceItem(self):
         """

openlp/core/ui/wizard.py

@@ -190,6 +190,14 @@ class OpenLPWizard(QtGui.QWizard):
             self.preWizard()
             self.performWizard()
             self.postWizard()
+        else:
+            self.customPageChanged(pageId)
+
+    def customPageChanged(self, pageId):
+        """
+        Called when changing to a page other than the progress page
+        """
+        pass
 
     def onErrorCopyToButtonClicked(self):
         """

openlp/plugins/songs/forms/editsongdialog.py

@@ -68,6 +68,8 @@ class Ui_EditSongDialog(object):
             QtCore.Qt.AlignTop)
         self.verseListWidget = QtGui.QTableWidget(self.lyricsTab)
         self.verseListWidget.horizontalHeader().setVisible(False)
+        self.verseListWidget.horizontalHeader().setStretchLastSection(True)
+        self.verseListWidget.horizontalHeader().setMinimumSectionSize(16)
         self.verseListWidget.setAlternatingRowColors(True)
         self.verseListWidget.setColumnCount(1)
         self.verseListWidget.setSelectionBehavior(

openlp/plugins/songs/forms/editsongform.py

@@ -233,7 +233,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         # lazy xml migration for now
         self.verseListWidget.clear()
         self.verseListWidget.setRowCount(0)
-        self.verseListWidget.setColumnWidth(0, self.width)
         # This is just because occasionally the lyrics come back as a "buffer"
         if isinstance(self.song.lyrics, buffer):
             self.song.lyrics = unicode(self.song.lyrics)

openlp/plugins/songs/forms/songimportform.py

@@ -343,6 +343,13 @@ class SongImportForm(OpenLPWizard):
         self.formatSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
             QtGui.QSizePolicy.Fixed)
 
+    def customPageChanged(self, pageId):
+        """
+        Called when changing to a page other than the progress page
+        """
+        if self.page(pageId) == self.sourcePage:
+            self.onCurrentIndexChanged(self.formatStack.currentIndex())
+
     def validateCurrentPage(self):
         """
         Validate the current page before moving on to the next page.

openlp/plugins/songs/lib/easislidesimport.py

@@ -73,15 +73,21 @@ class EasiSlidesImport(SongImport):
     def _parse_song(self, song):
         self._success = True
         self._add_unicode_attribute(u'title', song.Title1, True)
-        self._add_unicode_attribute(u'alternate_title', song.Title2)
-        self._add_unicode_attribute(u'song_number', song.SongNumber)
+        if hasattr(song, u'Title2'):
+            self._add_unicode_attribute(u'alternate_title', song.Title2)
+        if hasattr(song, u'SongNumber'):
+            self._add_unicode_attribute(u'song_number', song.SongNumber)
         if self.song_number == u'0':
             self.song_number = u''
         self._add_authors(song)
-        self._add_copyright(song.Copyright)
-        self._add_copyright(song.LicenceAdmin1)
-        self._add_copyright(song.LicenceAdmin2)
-        self._add_unicode_attribute(u'song_book_name', song.BookReference)
+        if hasattr(song, u'Copyright'):
+            self._add_copyright(song.Copyright)
+        if hasattr(song, u'LicenceAdmin1'):
+            self._add_copyright(song.LicenceAdmin1)
+        if hasattr(song, u'LicenceAdmin2'):
+            self._add_copyright(song.LicenceAdmin2)
+        if hasattr(song, u'BookReference'):
+            self._add_unicode_attribute(u'song_book_name', song.BookReference)
         self._parse_and_add_lyrics(song)
         if self._success:
             if not self.finish():

openlp/plugins/songs/lib/mediaitem.py

@@ -467,23 +467,20 @@ class SongMediaItem(MediaManagerItem):
             search_results = self.plugin.manager.get_all_objects(Song,
                 Song.search_title == item.data_string[u'title'],
                 Song.search_title.asc())
-        author_list = item.data_string[u'authors'].split(u', ')
         editId = 0
         add_song = True
         if search_results:
             for song in search_results:
+                author_list = item.data_string[u'authors']
                 same_authors = True
-                # If the author counts are different, we do not have to do any
-                # further checking.
-                if len(song.authors) == len(author_list):
-                    for author in song.authors:
-                        if author.display_name not in author_list:
-                            same_authors = False
-                else:
-                    same_authors = False
-                # All authors are the same, so we can stop here and the song
-                # does not have to be saved.
-                if same_authors:
+                for author in song.authors:
+                    if author.display_name in author_list:
+                        author_list = author_list.replace(author.display_name,
+                            u'', 1)
+                    else:
+                        same_authors = False
+                        break
+                if same_authors and author_list.strip(u', ') == u'':
                     add_song = False
                     editId = song.id
                     break

openlp/plugins/songs/lib/oooimport.py

@@ -37,14 +37,16 @@ log = logging.getLogger(__name__)
 
 if os.name == u'nt':
     from win32com.client import Dispatch
-    PAGE_BEFORE = 4
-    PAGE_AFTER = 5
-    PAGE_BOTH = 6
     NoConnectException = Exception
 else:
     import uno
     from com.sun.star.connection import NoConnectException
+try:
     from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER, PAGE_BOTH
+except ImportError:
+    PAGE_BEFORE = 4
+    PAGE_AFTER = 5
+    PAGE_BOTH = 6
 
 class OooImport(SongImport):
     """

openlp/plugins/songs/lib/openlyricsexport.py

@@ -70,10 +70,12 @@ class OpenLyricsExport(object):
                 song.title)
             xml = openLyrics.song_to_xml(song)
             tree = etree.ElementTree(etree.fromstring(xml))
-            filename = u'%s (%s).xml' % (song.title,
+            filename = u'%s (%s)' % (song.title,
                 u', '.join([author.display_name for author in song.authors]))
             filename = re.sub(
                 r'[/\\?*|<>\[\]":<>+%]+', u'_', filename).strip(u'_')
+            # Ensure the filename isn't too long for some filesystems
+            filename = u'%s.xml' % filename[0:250 - len(self.save_path)]
             # Pass a file object, because lxml does not cope with some special
             # characters in the path (see lp:757673 and lp:744337).
             tree.write(open(os.path.join(self.save_path, filename), u'w'),

openlp/plugins/songs/lib/sofimport.py

@@ -41,20 +41,23 @@ from oooimport import OooImport
 log = logging.getLogger(__name__)
 
 if os.name == u'nt':
-    BOLD = 150.0
-    ITALIC = 2
     from oooimport import PAGE_BEFORE, PAGE_AFTER, PAGE_BOTH
     RuntimeException = Exception
 else:
     try:
-        from com.sun.star.awt.FontWeight import BOLD
-        from com.sun.star.awt.FontSlant import ITALIC
         from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER, \
             PAGE_BOTH
         from com.sun.star.uno import RuntimeException
     except ImportError:
         pass
-
+try:
+    from com.sun.star.awt.FontWeight import BOLD
+except ImportError:
+    BOLD = 150.0
+try:
+    from com.sun.star.awt.FontSlant import ITALIC
+except ImportError:
+    ITALIC = 2
 
 class SofImport(OooImport):
     """