This commit is contained in:
Jonathan Corwin 2011-03-12 08:55:52 +00:00
commit bc4e4147a7
4 changed files with 37 additions and 11 deletions

View File

@ -186,7 +186,7 @@ class OpenLP(QtGui.QApplication):
# start the main app window # start the main app window
self.appClipboard = self.clipboard() self.appClipboard = self.clipboard()
self.mainWindow = MainWindow(screens, app_version, self.appClipboard, self.mainWindow = MainWindow(screens, app_version, self.appClipboard,
has_run_wizard) not has_run_wizard)
self.mainWindow.show() self.mainWindow.show()
if show_splash: if show_splash:
# now kill the splashscreen # now kill the splashscreen

View File

@ -178,8 +178,8 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
""" """
Prepare the UI for the process. Prepare the UI for the process.
""" """
# We start on 9 for the 9 plugins # We start on 2 for plugins status setting plus a "finished" point.
max_progress = 9 max_progress = 2
# Loop through the songs list and increase for each selected item # Loop through the songs list and increase for each selected item
for i in xrange(self.songsListWidget.count()): for i in xrange(self.songsListWidget.count()):
if self.songsListWidget.item(i).checkState() == QtCore.Qt.Checked: if self.songsListWidget.item(i).checkState() == QtCore.Qt.Checked:
@ -209,6 +209,8 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
self.finishButton.setEnabled(True) self.finishButton.setEnabled(True)
self.cancelButton.setVisible(False) self.cancelButton.setVisible(False)
self.nextButton.setVisible(False) self.nextButton.setVisible(False)
self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
'Download complete. Click the finish button to start OpenLP.'))
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')
def _performWizard(self): def _performWizard(self):
@ -219,21 +221,13 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
self._incrementProgressBar(translate('OpenLP.FirstTimeWizard', self._incrementProgressBar(translate('OpenLP.FirstTimeWizard',
'Enabling selected plugins...')) 'Enabling selected plugins...'))
self._setPluginStatus(self.songsCheckBox, u'songs/status') self._setPluginStatus(self.songsCheckBox, u'songs/status')
self._incrementProgressBar(None)
self._setPluginStatus(self.bibleCheckBox, u'bibles/status') self._setPluginStatus(self.bibleCheckBox, u'bibles/status')
self._incrementProgressBar(None)
self._setPluginStatus(self.presentationCheckBox, u'presentations/status') self._setPluginStatus(self.presentationCheckBox, u'presentations/status')
self._incrementProgressBar(None)
self._setPluginStatus(self.imageCheckBox, u'images/status') self._setPluginStatus(self.imageCheckBox, u'images/status')
self._incrementProgressBar(None)
self._setPluginStatus(self.mediaCheckBox, u'media/status') self._setPluginStatus(self.mediaCheckBox, u'media/status')
self._incrementProgressBar(None)
self._setPluginStatus(self.remoteCheckBox, u'remotes/status') self._setPluginStatus(self.remoteCheckBox, u'remotes/status')
self._incrementProgressBar(None)
self._setPluginStatus(self.customCheckBox, u'custom/status') self._setPluginStatus(self.customCheckBox, u'custom/status')
self._incrementProgressBar(None)
self._setPluginStatus(self.songUsageCheckBox, u'songusage/status') self._setPluginStatus(self.songUsageCheckBox, u'songusage/status')
self._incrementProgressBar(None)
self._setPluginStatus(self.alertCheckBox, u'alerts/status') self._setPluginStatus(self.alertCheckBox, u'alerts/status')
# Build directories for downloads # Build directories for downloads
songs_destination = AppLocation.get_section_data_path(u'songs') songs_destination = AppLocation.get_section_data_path(u'songs')

View File

@ -45,6 +45,18 @@ class MediaPlugin(Plugin):
self.icon = build_icon(self.icon_path) self.icon = build_icon(self.icon_path)
# passed with drag and drop messages # passed with drag and drop messages
self.dnd_id = u'Media' self.dnd_id = u'Media'
self.additional_extensions = {
u'audio/ac3': [u'.ac3'],
u'audio/flac': [u'.flac'],
u'audio/x-m4a': [u'.m4a'],
u'audio/x-mp3': [u'.mp3'],
u'audio/mpeg': [u'.mp3', u'.mp2', u'.mpga', u'.mpega', u'.m4a'],
u'audio/qcelp': [u'.qcp'],
u'audio/x-wma': [u'.wma'],
u'audio/x-ms-wma': [u'.wma'],
u'video/x-matroska': [u'.mpv', u'.mkv'],
u'video/x-wmv': [u'.wmv'],
u'video/x-ms-wmv': [u'.wmv']}
self.audio_extensions_list = [] self.audio_extensions_list = []
self.video_extensions_list = [] self.video_extensions_list = []
mimetypes.init() mimetypes.init()
@ -65,6 +77,17 @@ class MediaPlugin(Plugin):
self.serviceManager.supportedSuffixes(extension[1:]) self.serviceManager.supportedSuffixes(extension[1:])
log.info(u'MediaPlugin: %s extensions: %s' % (mimetype, log.info(u'MediaPlugin: %s extensions: %s' % (mimetype,
u' '.join(extensions))) u' '.join(extensions)))
# Add extensions for this mimetype from self.additional_extensions.
# This hack clears mimetypes' and operating system's shortcomings
# by providing possibly missing extensions.
if mimetype in self.additional_extensions.keys():
for extension in self.additional_extensions[mimetype]:
ext = u'*%s' % extensions
if ext not in list:
list.append(ext)
self.serviceManager.supportedSuffixes(extension[1:])
log.info(u'MediaPlugin: %s additional extensions: %s' % (mimetype,
u' '.join(self.additional_extensions[mimetype])))
def about(self): def about(self):
about_text = translate('MediaPlugin', '<strong>Media Plugin</strong>' about_text = translate('MediaPlugin', '<strong>Media Plugin</strong>'

View File

@ -88,6 +88,15 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
""" """
log.debug(u'accept') log.debug(u'accept')
path = unicode(self.fileLineEdit.text()) path = unicode(self.fileLineEdit.text())
if path == u'':
Receiver.send_message(u'openlp_error_message', {
u'title': translate('SongUsagePlugin.SongUsageDetailForm',
'Output Path Not Selected'),
u'message': unicode(translate(
'SongUsagePlugin.SongUsageDetailForm', 'You have not set a '
'valid output location for your song usage report. Please '
'select an existing path on your computer.'))})
return
check_directory_exists(path) check_directory_exists(path)
filename = unicode(translate('SongUsagePlugin.SongUsageDetailForm', filename = unicode(translate('SongUsagePlugin.SongUsageDetailForm',
'usage_detail_%s_%s.txt')) % ( 'usage_detail_%s_%s.txt')) % (