openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/icon-image-clean-up into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/icon-image-clean-up/+merge/162039

Hello,

- do not create 
-- 
https://code.launchpad.net/~googol/openlp/icon-image-clean-up/+merge/162039
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/icon-image-clean-up into lp:openlp.

=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py	2013-03-23 07:07:06 +0000
+++ openlp/core/lib/__init__.py	2013-05-02 07:28:26 +0000
@@ -155,7 +155,7 @@
 
     ``icon``
         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()
     if isinstance(icon, QtGui.QIcon):

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2013-04-20 20:34:46 +0000
+++ openlp/core/ui/servicemanager.py	2013-05-02 07:28:26 +0000
@@ -295,8 +295,8 @@
         Sets up the service manager, toolbars, list view, et al.
         """
         QtGui.QWidget.__init__(self, parent)
-        self.active = build_icon(QtGui.QImage(u':/media/auto-start_active.png'))
-        self.inactive = build_icon(QtGui.QImage(u':/media/auto-start_inactive.png'))
+        self.active = build_icon(u':/media/auto-start_active.png')
+        self.inactive = build_icon(u':/media/auto-start_inactive.png')
         Registry().register(u'service_manager', self)
         self.service_items = []
         self.suffixes = []

=== modified file 'openlp/plugins/alerts/forms/alertdialog.py'
--- openlp/plugins/alerts/forms/alertdialog.py	2013-04-18 17:17:00 +0000
+++ openlp/plugins/alerts/forms/alertdialog.py	2013-05-02 07:28:26 +0000
@@ -75,9 +75,9 @@
         self.manage_button_layout.addWidget(self.delete_button)
         self.manage_button_layout.addStretch()
         self.alert_dialog_layout.addLayout(self.manage_button_layout, 1, 1)
-        displayIcon = build_icon(u':/general/general_live.png')
-        self.display_button = create_button(alert_dialog, u'display_button', icon=displayIcon, enabled=False)
-        self.display_close_button = create_button(alert_dialog, u'display_close_button', icon=displayIcon,
+        display_icon = build_icon(u':/general/general_live.png')
+        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=display_icon,
             enabled=False)
         self.button_box = create_button_box(alert_dialog, u'button_box', [u'close'],
             [self.display_button, self.display_close_button])

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2013-04-19 19:15:12 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2013-05-02 07:28:26 +0000
@@ -44,10 +44,10 @@
 
 
 CLAPPERBOARD = u':/media/slidecontroller_multimedia.png'
-VIDEO_ICON = build_icon(QtGui.QImage(u':/media/media_video.png'))
-AUDIO_ICON = build_icon(QtGui.QImage(u':/media/media_audio.png'))
-DVD_ICON = build_icon(QtGui.QImage(u':/media/media_video.png'))
-ERROR_ICON = build_icon(QtGui.QImage(u':/general/general_delete.png'))
+VIDEO_ICON = build_icon(u':/media/media_video.png')
+AUDIO_ICON = build_icon(u':/media/media_audio.png')
+DVD_ICON = build_icon(u':/media/media_video.png')
+ERROR_ICON = build_icon(u':/general/general_delete.png')
 
 
 class MediaMediaItem(MediaManagerItem):