raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix song service load (Bug #696219) 

Cleanups
Change cursor when activating plugins

bzr-revno: 1274
This commit is contained in:
Jon Tibble 2011-02-06 14:46:02 +00:00
parent bb31adfc6e 6e5889a3cb
commit cbe4f9332c
5 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/mediamanageritem.py
View File

@ -158,7 +158,7 @@ class MediaManagerItem(QtGui.QWidget):
``icon`` ``icon``
The icon of the button. This can be an instance of QIcon, or a The icon of the button. This can be an instance of QIcon, or a
string cotaining either the absolute path to the image, or an string containing either the absolute path to the image, or an
internal resource path starting with ':/'. internal resource path starting with ':/'.
``slot`` ``slot``

2
openlp/core/lib/toolbar.py
View File

@ -61,7 +61,7 @@ class OpenLPToolbar(QtGui.QToolBar):
``icon`` ``icon``
The icon of the button. This can be an instance of QIcon, or a The icon of the button. This can be an instance of QIcon, or a
string cotaining either the absolute path to the image, or an string containing either the absolute path to the image, or an
internal resource path starting with ':/'. internal resource path starting with ':/'.
``tooltip`` ``tooltip``

4
openlp/core/ui/pluginform.py
View File

@ -28,7 +28,7 @@ import logging
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import PluginStatus, StringContent, translate from openlp.core.lib import PluginStatus, Receiver, StringContent, translate
from plugindialog import Ui_PluginViewDialog from plugindialog import Ui_PluginViewDialog
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -129,7 +129,9 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
if self.programaticChange: if self.programaticChange:
return return
if status == 0: if status == 0:
Receiver.send_message(u'cursor_busy')
self.activePlugin.toggleStatus(PluginStatus.Active) self.activePlugin.toggleStatus(PluginStatus.Active)
Receiver.send_message(u'cursor_normal')
else: else:
self.activePlugin.toggleStatus(PluginStatus.Inactive) self.activePlugin.toggleStatus(PluginStatus.Inactive)
status_text = unicode( status_text = unicode(

5
openlp/core/ui/thememanager.py
View File

@ -334,9 +334,8 @@ class ThemeManager(QtGui.QWidget):
row = self.themeListWidget.row(item) row = self.themeListWidget.row(item)
self.themeListWidget.takeItem(row) self.themeListWidget.takeItem(row)
self.deleteTheme(theme) self.deleteTheme(theme)
# As we do not reload the themes, push out the change # As we do not reload the themes, push out the change. Reload the
# Reaload the list as the internal lists and events need # list as the internal lists and events need to be triggered.
# to be triggered
self._pushThemes() self._pushThemes()
def deleteTheme(self, theme): def deleteTheme(self, theme):

82
openlp/plugins/songs/lib/mediaitem.py
View File

@ -32,7 +32,7 @@ from PyQt4 import QtCore, QtGui
from sqlalchemy.sql import or_ from sqlalchemy.sql import or_
from openlp.core.lib import MediaManagerItem, BaseListWithDnD, Receiver, \ from openlp.core.lib import MediaManagerItem, BaseListWithDnD, Receiver, \
ItemCapabilities, translate, check_item_selected ItemCapabilities, translate, check_item_selected, PluginStatus
from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm, \ from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm, \
SongImportForm SongImportForm
from openlp.plugins.songs.lib import OpenLyrics, SongXML from openlp.plugins.songs.lib import OpenLyrics, SongXML
@ -396,46 +396,46 @@ class SongMediaItem(MediaManagerItem):
Triggered by a song being loaded by the service item Triggered by a song being loaded by the service item
""" """
log.debug(u'serviceLoad') log.debug(u'serviceLoad')
if item.data_string: if self.plugin.status != PluginStatus.Active or not item.data_string:
search_results = self.parent.manager.get_all_objects(Song, return
Song.search_title == re.compile(r'\W+', re.UNICODE).sub(u' ', search_results = self.parent.manager.get_all_objects(Song,
item.data_string[u'title'].split(u'@')[0].lower()).strip(), Song.search_title == re.compile(r'\W+', re.UNICODE).sub(u' ',
Song.search_title.asc()) item.data_string[u'title'].split(u'@')[0].lower()).strip(),
author_list = item.data_string[u'authors'].split(u', ') Song.search_title.asc())
# The service item always has an author (at least it has u'' as author_list = item.data_string[u'authors'].split(u', ')
# author). However, songs saved in the database do not have to have # The service item always has an author (at least it has u'' as
# an author. # author). However, songs saved in the database do not have to have
if u'' in author_list: # an author.
author_list.remove(u'') if u'' in author_list:
editId = 0 author_list.remove(u'')
add_song = True editId = 0
if search_results: add_song = True
for song in search_results: if search_results:
same_authors = True for song in search_results:
# If the author counts are different, we do not have to do same_authors = True
# any further checking. This is also important when a song # If the author counts are different, we do not have to do any
# does not have any author (because we can not loop over an # further checking. This is also important when a song does not
# empty list). # have any author (because we can not loop over an empty list).
if len(song.authors) == len(author_list): if len(song.authors) == len(author_list):
for author in song.authors: for author in song.authors:
if author.display_name not in author_list: if author.display_name not in author_list:
same_authors = False same_authors = False
else: else:
same_authors = False same_authors = False
# All authors are the same, so we can stop here and the song # All authors are the same, so we can stop here and the song
# does not have to be saved. # does not have to be saved.
if same_authors: if same_authors:
add_song = False add_song = False
editId = song.id editId = song.id
break break
if add_song: if add_song:
if self.addSongFromService: if self.addSongFromService:
editId = self.openLyrics.xml_to_song(item.xml_version) editId = self.openLyrics.xml_to_song(item.xml_version)
self.onSearchTextButtonClick() self.onSearchTextButtonClick()
# Update service with correct song id. # Update service with correct song id.
if editId: if editId:
Receiver.send_message(u'service_item_update', Receiver.send_message(u'service_item_update',
u'%s:%s' % (editId, item._uuid)) u'%s:%s' % (editId, item._uuid))
def collateSongTitles(self, song_1, song_2): def collateSongTitles(self, song_1, song_2):
""" """