Head

openlp/core/ui/aboutdialog.py

@@ -72,10 +72,10 @@ class Ui_AboutDialog(object):
         self.licenseTabLayout.addWidget(self.licenseTextEdit)
         self.aboutNotebook.addTab(self.licenseTab, u'')
         self.aboutDialogLayout.addWidget(self.aboutNotebook)
-        self.contributeButton = create_button(None, u'contributeButton',
+        self.volunteerButton = create_button(None, u'volunteerButton',
-            icon=u':/system/system_contribute.png')
+            icon=u':/system/system_volunteer.png')
         self.buttonBox = create_button_box(aboutDialog, u'buttonBox',
-            [u'close'], [self.contributeButton])
+            [u'close'], [self.volunteerButton])
         self.aboutDialogLayout.addWidget(self.buttonBox)
         self.retranslateUi(aboutDialog)
         self.aboutNotebook.setCurrentIndex(0)
@@ -96,7 +96,7 @@ class Ui_AboutDialog(object):
             '\n'
             'OpenLP is written and maintained by volunteers. If you would '
             'like to see more free Christian software being written, please '
-            'consider contributing by using the button below.'
+            'consider volunteering by using the button below.'
         ))
         self.aboutNotebook.setTabText(
             self.aboutNotebook.indexOf(self.aboutTab), UiStrings().About)
@@ -615,5 +615,5 @@ class Ui_AboutDialog(object):
         self.aboutNotebook.setTabText(
             self.aboutNotebook.indexOf(self.licenseTab),
             translate('OpenLP.AboutForm', 'License'))
-        self.contributeButton.setText(translate('OpenLP.AboutForm',
+        self.volunteerButton.setText(translate('OpenLP.AboutForm',
-            'Contribute'))
+            'Volunteer'))

openlp/core/ui/aboutform.py

@@ -54,10 +54,10 @@ class AboutForm(QtGui.QDialog, Ui_AboutDialog):
             build_text = u''
         about_text = about_text.replace(u'<revision>', build_text)
         self.aboutTextEdit.setPlainText(about_text)
-        QtCore.QObject.connect(self.contributeButton,
+        QtCore.QObject.connect(self.volunteerButton,
-            QtCore.SIGNAL(u'clicked()'), self.onContributeButtonClicked)
+            QtCore.SIGNAL(u'clicked()'), self.onVolunteerButtonClicked)
 
-    def onContributeButtonClicked(self):
+    def onVolunteerButtonClicked(self):
         """
         Launch a web browser and go to the contribute page on the site.
         """

openlp/core/ui/maindisplay.py

@@ -580,7 +580,7 @@ class AudioPlayer(QtCore.QObject):
         self.playlist.extend(map(Phonon.MediaSource, filenames))
 
     def next(self):
-        if not self.repeat and self.currentIndex + 1 == len(self.playlist):
+        if not self.repeat and self.currentIndex + 1 >= len(self.playlist):
             return
         isPlaying = self.mediaObject.state() == Phonon.PlayingState
         self.currentIndex += 1

openlp/core/ui/mainwindow.py

@@ -210,6 +210,8 @@ class Ui_MainWindow(object):
             icon=u':/system/system_exit.png',
             shortcuts=[QtGui.QKeySequence(u'Alt+F4')],
             category=UiStrings().File, triggers=mainWindow.close)
+        # Give QT Extra Hint that this is the Exit Menu Item
+        self.fileExitItem.setMenuRole(QtGui.QAction.QuitRole)
         action_list.add_category(unicode(UiStrings().Import),
             CategoryOrder.standardMenu)
         self.importThemeItem = create_action(mainWindow,
@@ -304,6 +306,8 @@ class Ui_MainWindow(object):
         self.settingsConfigureItem = create_action(mainWindow,
             u'settingsConfigureItem', icon=u':/system/system_settings.png',
             category=UiStrings().Settings)
+        # Give QT Extra Hint that this is the Preferences Menu Item
+        self.settingsConfigureItem.setMenuRole(QtGui.QAction.PreferencesRole)
         self.settingsImportItem = create_action(mainWindow,
            u'settingsImportItem', category=UiStrings().Settings)
         self.settingsExportItem = create_action(mainWindow,
@@ -314,6 +318,8 @@ class Ui_MainWindow(object):
             icon=u':/system/system_about.png',
             shortcuts=[QtGui.QKeySequence(u'Ctrl+F1')],
             category=UiStrings().Help, triggers=self.onAboutItemClicked)
+        # Give QT Extra Hint that this is an About Menu Item
+        self.aboutItem.setMenuRole(QtGui.QAction.AboutRole)
         if os.name == u'nt':
             self.localHelpFile = os.path.join(
                 AppLocation.get_directory(AppLocation.AppDir), 'OpenLP.chm')

openlp/plugins/remotes/lib/remotetab.py

@@ -122,9 +122,9 @@ class RemoteTab(SettingsTab):
         self.androidAppGroupBox.setTitle(
             translate('RemotePlugin.RemoteTab', 'Android App'))
         self.qrDescriptionLabel.setText(translate('RemotePlugin.RemoteTab',
-            'Scan the QR code or click <a '
+            'Scan the QR code or click <a href="https://play.google.com/store/'
-            'href="https://market.android.com/details?id=org.openlp.android">'
+            'apps/details?id=org.openlp.android">download</a> to install the '
-            'download</a> to install the Android app from the Market.'))
+            'Android app from Google Play.'))
 
     def setUrls(self):
         ipAddress = u'localhost'

openlp/plugins/songs/songsplugin.py

@@ -147,6 +147,7 @@ class SongsPlugin(Plugin):
         progressDialog = QtGui.QProgressDialog(
             translate('SongsPlugin', 'Reindexing songs...'), UiStrings().Cancel,
             0, maxSongs, self.formParent)
+        progressDialog.setWindowTitle(translate('SongsPlugin', 'Reindexing songs'))
         progressDialog.setWindowModality(QtCore.Qt.WindowModal)
         songs = self.manager.get_all_objects(Song)
         for number, song in enumerate(songs):
@@ -247,6 +248,7 @@ class SongsPlugin(Plugin):
             return
         progress = QtGui.QProgressDialog(self.formParent)
         progress.setWindowModality(QtCore.Qt.WindowModal)
+        progress.setWindowTitle(translate('OpenLP.Ui', 'Importing Songs'))
         progress.setLabelText(translate('OpenLP.Ui', 'Starting import...'))
         progress.setCancelButton(None)
         progress.setRange(0, len(song_dbs))

resources/images/openlp-2.qrc

@@ -116,7 +116,7 @@
     <file>system_help_contents.png</file>
     <file>system_online_help.png</file>
     <file>system_mediamanager.png</file>
-    <file>system_contribute.png</file>
+    <file>system_volunteer.png</file>
     <file>system_servicemanager.png</file>
     <file>system_thememanager.png</file>
     <file>system_exit.png</file>