A few UI tweeks and updates.

Changed Contribute button and icon to Volunteer (As discussed with Roaul on IRC)
Changed and resized the remote QR code for better recoginition on some phones (BrianMayerDesign)
Updated the link and text to the Android Market, as it is now know as Google Play
Set the window title for the ProcessDialog when importing songs using the first run wizard.
This commit is contained in:
Philip Ridout 2012-08-04 15:43:44 +01:00
parent e31c64ef7c
commit d8589c4a6e
8 changed files with 15 additions and 13 deletions

View File

@ -72,10 +72,10 @@ class Ui_AboutDialog(object):
self.licenseTabLayout.addWidget(self.licenseTextEdit) self.licenseTabLayout.addWidget(self.licenseTextEdit)
self.aboutNotebook.addTab(self.licenseTab, u'') self.aboutNotebook.addTab(self.licenseTab, u'')
self.aboutDialogLayout.addWidget(self.aboutNotebook) 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', self.buttonBox = create_button_box(aboutDialog, u'buttonBox',
[u'close'], [self.contributeButton]) [u'close'], [self.volunteerButton])
self.aboutDialogLayout.addWidget(self.buttonBox) self.aboutDialogLayout.addWidget(self.buttonBox)
self.retranslateUi(aboutDialog) self.retranslateUi(aboutDialog)
self.aboutNotebook.setCurrentIndex(0) self.aboutNotebook.setCurrentIndex(0)
@ -96,7 +96,7 @@ class Ui_AboutDialog(object):
'\n' '\n'
'OpenLP is written and maintained by volunteers. If you would ' 'OpenLP is written and maintained by volunteers. If you would '
'like to see more free Christian software being written, please ' '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.setTabText(
self.aboutNotebook.indexOf(self.aboutTab), UiStrings().About) self.aboutNotebook.indexOf(self.aboutTab), UiStrings().About)
@ -615,5 +615,5 @@ class Ui_AboutDialog(object):
self.aboutNotebook.setTabText( self.aboutNotebook.setTabText(
self.aboutNotebook.indexOf(self.licenseTab), self.aboutNotebook.indexOf(self.licenseTab),
translate('OpenLP.AboutForm', 'License')) translate('OpenLP.AboutForm', 'License'))
self.contributeButton.setText(translate('OpenLP.AboutForm', self.volunteerButton.setText(translate('OpenLP.AboutForm',
'Contribute')) 'Volunteer'))

View File

@ -54,10 +54,10 @@ class AboutForm(QtGui.QDialog, Ui_AboutDialog):
build_text = u'' build_text = u''
about_text = about_text.replace(u'<revision>', build_text) about_text = about_text.replace(u'<revision>', build_text)
self.aboutTextEdit.setPlainText(about_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. Launch a web browser and go to the contribute page on the site.
""" """

View File

@ -122,9 +122,9 @@ class RemoteTab(SettingsTab):
self.androidAppGroupBox.setTitle( self.androidAppGroupBox.setTitle(
translate('RemotePlugin.RemoteTab', 'Android App')) translate('RemotePlugin.RemoteTab', 'Android App'))
self.qrDescriptionLabel.setText(translate('RemotePlugin.RemoteTab', 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): def setUrls(self):
ipAddress = u'localhost' ipAddress = u'localhost'

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 822 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB