Merge trunk.

openlp/core/ui/media/phononplayer.py

@@ -51,6 +51,7 @@ ADDITIONAL_EXT = {
             u'video/x-matroska': [u'.mpv', u'.mkv'],
             u'video/x-wmv': [u'.wmv'],
             u'video/x-mpg': [u'.mpg'],
+            u'video/mpeg' : [u'.mp4', u'.mts'],
             u'video/x-ms-wmv': [u'.wmv']}
 
 

openlp/plugins/remotes/lib/remotetab.py

@@ -81,6 +81,21 @@ class RemoteTab(SettingsTab):
         self.stageUrl.setOpenExternalLinks(True)
         self.serverSettingsLayout.addRow(self.stageUrlLabel, self.stageUrl)
         self.leftLayout.addWidget(self.serverSettingsGroupBox)
+        self.androidAppGroupBox = QtGui.QGroupBox(self.rightColumn)
+        self.androidAppGroupBox.setObjectName(u'androidAppGroupBox')
+        self.rightLayout.addWidget(self.androidAppGroupBox)
+        self.qrLayout = QtGui.QVBoxLayout(self.androidAppGroupBox)
+        self.qrLayout.setObjectName(u'qrLayout')
+        self.qrCodeLabel = QtGui.QLabel(self.androidAppGroupBox)
+        self.qrCodeLabel.setPixmap(QtGui.QPixmap(u':/remotes/android_app_qr.png'))
+        self.qrCodeLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.qrCodeLabel.setObjectName(u'qrCodeLabel')
+        self.qrLayout.addWidget(self.qrCodeLabel)
+        self.qrDescriptionLabel = QtGui.QLabel(self.androidAppGroupBox)
+        self.qrDescriptionLabel.setObjectName(u'qrDescriptionLabel')
+        self.qrDescriptionLabel.setOpenExternalLinks(True)
+        self.qrDescriptionLabel.setWordWrap(True)
+        self.qrLayout.addWidget(self.qrDescriptionLabel)
         self.leftLayout.addStretch()
         self.rightLayout.addStretch()
         QtCore.QObject.connect(self.twelveHourCheckBox,
@@ -101,6 +116,12 @@ class RemoteTab(SettingsTab):
         self.twelveHourCheckBox.setText(
             translate('RemotePlugin.RemoteTab',
             'Display stage time in 12h format'))
+        self.androidAppGroupBox.setTitle(
+            translate('RemotePlugin.RemoteTab', 'Android App'))
+        self.qrDescriptionLabel.setText(translate('RemotePlugin.RemoteTab',
+            'Scan the QR code or click <a '
+            'href="https://market.android.com/details?id=org.openlp.android">'
+            'download</a> to install the Android app from the Market.'))
 
     def setUrls(self):
         ipAddress = u'localhost'

openlp/plugins/songs/lib/cclifileimport.py

@@ -216,9 +216,8 @@ class CCLIFileImport(SongImport):
         for author in author_list:
             separated = author.split(u',')
             if len(separated) > 1:
-                self.addAuthor(u' '.join(reversed(separated)))
-            else:
-                self.addAuthor(author)
+                author = u' '.join(map(unicode.strip, reversed(separated)))
+            self.addAuthor(author.strip())
         self.topics = [topic.strip() for topic in song_topics.split(u'/t')]
         return self.finish()
 

resources/images/openlp-2.qrc

@@ -149,4 +149,7 @@
     <file>theme_new.png</file>
     <file>theme_edit.png</file>
   </qresource>
+  <qresource prefix="remotes">
+    <file>android_app_qr.png</file>
+  </qresource>
 </RCC>

scripts/windows-builder.py

@@ -182,6 +182,7 @@ def run_pyinstaller():
         u'--windowed',
         u'--noupx',
         u'--additional-hooks-dir', hooks_path,
+        u'--log-level=ERROR',
         u'-o', branch_path,
         u'-i', win32_icon,
         u'-p', branch_path,