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

clean up

Browse Source 
bzr-revno: 2241
This commit is contained in:
Andreas Preikschat 2013-05-10 11:21:01 +02:00
commit 4c2ad74bb0
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ def build_icon(icon):
``icon`` ``icon``
The icon to build. This can be a QIcon, a resource string in the form ``:/resource/file.png``, or a file The icon to build. This can be a QIcon, a resource string in the form ``:/resource/file.png``, or a file
location like ``/path/to/file.png``. location like ``/path/to/file.png``. However, the **recommended** way is to specify a resource string.
""" """
button_icon = QtGui.QIcon() button_icon = QtGui.QIcon()
if isinstance(icon, QtGui.QIcon): if isinstance(icon, QtGui.QIcon):

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

@ -295,8 +295,8 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
Sets up the service manager, toolbars, list view, et al. Sets up the service manager, toolbars, list view, et al.
""" """
QtGui.QWidget.__init__(self, parent) QtGui.QWidget.__init__(self, parent)
self.active = build_icon(QtGui.QImage(u':/media/auto-start_active.png')) self.active = build_icon(u':/media/auto-start_active.png')
self.inactive = build_icon(QtGui.QImage(u':/media/auto-start_inactive.png')) self.inactive = build_icon(u':/media/auto-start_inactive.png')
Registry().register(u'service_manager', self) Registry().register(u'service_manager', self)
self.service_items = [] self.service_items = []
self.suffixes = [] self.suffixes = []

6
openlp/plugins/alerts/forms/alertdialog.py
View File

@ -75,9 +75,9 @@ class Ui_AlertDialog(object):
self.manage_button_layout.addWidget(self.delete_button) self.manage_button_layout.addWidget(self.delete_button)
self.manage_button_layout.addStretch() self.manage_button_layout.addStretch()
self.alert_dialog_layout.addLayout(self.manage_button_layout, 1, 1) self.alert_dialog_layout.addLayout(self.manage_button_layout, 1, 1)
displayIcon = build_icon(u':/general/general_live.png') display_icon = build_icon(u':/general/general_live.png')
self.display_button = create_button(alert_dialog, u'display_button', icon=displayIcon, enabled=False) self.display_button = create_button(alert_dialog, u'display_button', icon=display_icon, enabled=False)
self.display_close_button = create_button(alert_dialog, u'display_close_button', icon=displayIcon, self.display_close_button = create_button(alert_dialog, u'display_close_button', icon=display_icon,
enabled=False) enabled=False)
self.button_box = create_button_box(alert_dialog, u'button_box', [u'close'], self.button_box = create_button_box(alert_dialog, u'button_box', [u'close'],
[self.display_button, self.display_close_button]) [self.display_button, self.display_close_button])

8
openlp/plugins/media/lib/mediaitem.py
View File

@ -44,10 +44,10 @@ log = logging.getLogger(__name__)
CLAPPERBOARD = u':/media/slidecontroller_multimedia.png' CLAPPERBOARD = u':/media/slidecontroller_multimedia.png'
VIDEO_ICON = build_icon(QtGui.QImage(u':/media/media_video.png')) VIDEO_ICON = build_icon(u':/media/media_video.png')
AUDIO_ICON = build_icon(QtGui.QImage(u':/media/media_audio.png')) AUDIO_ICON = build_icon(u':/media/media_audio.png')
DVD_ICON = build_icon(QtGui.QImage(u':/media/media_video.png')) DVD_ICON = build_icon(u':/media/media_video.png')
ERROR_ICON = build_icon(QtGui.QImage(u':/general/general_delete.png')) ERROR_ICON = build_icon(u':/general/general_delete.png')
class MediaMediaItem(MediaManagerItem): class MediaMediaItem(MediaManagerItem):