openlp-core team mailing list archive

[phill <phill.ridout@xxxxxxxxxxxxxx>]

phill has proposed merging lp:~phill-ridout/openlp/alert_icon into lp:openlp.

Requested reviews:
  Andreas Preikschat (googol)
  Tim Bentley (trb143)

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/alert_icon/+merge/128086

fixed alert dialog icon
fixed custom editor
Removed unused icon file
-- 
https://code.launchpad.net/~phill-ridout/openlp/alert_icon/+merge/128086
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/plugins/alerts/forms/alertdialog.py'
--- openlp/plugins/alerts/forms/alertdialog.py	2012-06-22 14:14:53 +0000
+++ openlp/plugins/alerts/forms/alertdialog.py	2012-10-04 18:25:33 +0000
@@ -35,7 +35,7 @@
     def setupUi(self, alertDialog):
         alertDialog.setObjectName(u'alertDialog')
         alertDialog.resize(400, 300)
-        alertDialog.setWindowIcon(build_icon(u':/icon/openlp.org-icon-32.bmp'))
+        alertDialog.setWindowIcon(build_icon(u':/icon/openlp-logo-16x16.png'))
         self.alertDialogLayout = QtGui.QGridLayout(alertDialog)
         self.alertDialogLayout.setObjectName(u'alertDialogLayout')
         self.alertTextLayout = QtGui.QFormLayout()

=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
--- openlp/plugins/custom/forms/editcustomdialog.py	2012-06-22 14:14:53 +0000
+++ openlp/plugins/custom/forms/editcustomdialog.py	2012-10-04 18:25:33 +0000
@@ -36,7 +36,7 @@
         customEditDialog.setObjectName(u'customEditDialog')
         customEditDialog.resize(450, 350)
         customEditDialog.setWindowIcon(
-            build_icon(u':/icon/openlp.org-icon-32.bmp'))
+            build_icon(u':/icon/openlp-logo-16x16.png'))
         self.dialogLayout = QtGui.QVBoxLayout(customEditDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
         self.titleLayout = QtGui.QHBoxLayout()

=== removed file 'resources/images/openlp.org-icon-32.bmp'
Binary files resources/images/openlp.org-icon-32.bmp	2010-09-14 18:18:47 +0000 and resources/images/openlp.org-icon-32.bmp	1970-01-01 00:00:00 +0000 differ