openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Cleanups
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/27994
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py	2010-06-15 15:22:26 +0000
+++ openlp/core/lib/__init__.py	2010-06-19 15:16:31 +0000
@@ -95,11 +95,10 @@
         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``.
     """
-    button_icon = None
+    button_icon = QtGui.QIcon()
     if isinstance(icon, QtGui.QIcon):
         button_icon = icon
     elif isinstance(icon, basestring):
-        button_icon = QtGui.QIcon()
         if icon.startswith(u':/'):
             button_icon.addPixmap(QtGui.QPixmap(icon), QtGui.QIcon.Normal,
                 QtGui.QIcon.Off)
@@ -107,7 +106,6 @@
             button_icon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(icon)),
                 QtGui.QIcon.Normal, QtGui.QIcon.Off)
     elif isinstance(icon, QtGui.QImage):
-        button_icon = QtGui.QIcon()
         button_icon.addPixmap(QtGui.QPixmap.fromImage(icon),
             QtGui.QIcon.Normal, QtGui.QIcon.Off)
     return button_icon

=== modified file 'openlp/core/lib/toolbar.py'
--- openlp/core/lib/toolbar.py	2010-06-06 23:24:45 +0000
+++ openlp/core/lib/toolbar.py	2010-06-19 15:16:31 +0000
@@ -72,9 +72,6 @@
         ToolbarButton = None
         if icon:
             ButtonIcon = build_icon(icon)
-        else:
-            ButtonIcon = None
-        if ButtonIcon:
             if slot and not checkable:
                 ToolbarButton = self.addAction(ButtonIcon, title, slot)
             else:

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2010-06-19 03:43:10 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2010-06-19 15:16:31 +0000
@@ -29,7 +29,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
-    ItemCapabilities, SettingsManager, context_menu_action, Receiver, translate
+    ItemCapabilities, SettingsManager, translate
 
 log = logging.getLogger(__name__)