diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py index 85db72b25..d8d7ba6e8 100644 --- a/openlp/core/ui/aboutdialog.py +++ b/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', - icon=u':/system/system_contribute.png') + self.volunteerButton = create_button(None, u'volunteerButton', + 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', - 'Contribute')) + self.volunteerButton.setText(translate('OpenLP.AboutForm', + 'Volunteer')) diff --git a/openlp/core/ui/aboutform.py b/openlp/core/ui/aboutform.py index 9b284165f..465286fa7 100644 --- a/openlp/core/ui/aboutform.py +++ b/openlp/core/ui/aboutform.py @@ -54,10 +54,10 @@ class AboutForm(QtGui.QDialog, Ui_AboutDialog): build_text = u'' about_text = about_text.replace(u'', build_text) self.aboutTextEdit.setPlainText(about_text) - QtCore.QObject.connect(self.contributeButton, - QtCore.SIGNAL(u'clicked()'), self.onContributeButtonClicked) + QtCore.QObject.connect(self.volunteerButton, + 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. """ diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 17a933a55..6dd37b9ed 100644 --- a/openlp/core/ui/maindisplay.py +++ b/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 diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index b6c9ee8d5..87a650a30 100644 --- a/openlp/core/ui/mainwindow.py +++ b/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') diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py index 1e5b4070d..ec440e24a 100644 --- a/openlp/plugins/remotes/lib/remotetab.py +++ b/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 ' - 'download to install the Android app from the Market.')) + 'Scan the QR code or click download to install the ' + 'Android app from Google Play.')) def setUrls(self): ipAddress = u'localhost' diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 583222e64..8b7bd36e8 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/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)) diff --git a/resources/images/android_app_qr.png b/resources/images/android_app_qr.png index 859800bbe..2f1c3a300 100644 Binary files a/resources/images/android_app_qr.png and b/resources/images/android_app_qr.png differ diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index 1b833a4db..128042bf0 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -116,7 +116,7 @@ system_help_contents.png system_online_help.png system_mediamanager.png - system_contribute.png + system_volunteer.png system_servicemanager.png system_thememanager.png system_exit.png diff --git a/resources/images/system_contribute.png b/resources/images/system_contribute.png deleted file mode 100644 index 39b0e0016..000000000 Binary files a/resources/images/system_contribute.png and /dev/null differ diff --git a/resources/images/system_volunteer.png b/resources/images/system_volunteer.png new file mode 100644 index 000000000..d01016102 Binary files /dev/null and b/resources/images/system_volunteer.png differ