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)


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

=== modified file 'openlp/plugins/bibles/forms/bibleimportwizard.py'
--- openlp/plugins/bibles/forms/bibleimportwizard.py	2010-07-08 11:46:03 +0000
+++ openlp/plugins/bibles/forms/bibleimportwizard.py	2010-07-09 11:38:41 +0000
@@ -105,7 +105,8 @@
         self.OsisLocationLayout.addWidget(self.OSISLocationEdit)
         self.OsisFileButton = QtGui.QToolButton(self.OsisPage)
         self.OsisFileButton.setMaximumSize(QtCore.QSize(32, 16777215))
-        self.OsisFileButton.setIcon(build_icon(u':/general/general_open.png'))
+        generalIcon = build_icon(u':/general/general_open.png')
+        self.OsisFileButton.setIcon(generalIcon)
         self.OsisFileButton.setObjectName(u'OsisFileButton')
         self.OsisLocationLayout.addWidget(self.OsisFileButton)
         self.OsisLayout.setLayout(1, QtGui.QFormLayout.FieldRole,
@@ -135,7 +136,7 @@
         self.CsvBooksLayout.addWidget(self.BooksLocationEdit)
         self.BooksFileButton = QtGui.QToolButton(self.CsvPage)
         self.BooksFileButton.setMaximumSize(QtCore.QSize(32, 16777215))
-        self.BooksFileButton.setIcon(icon)
+        self.BooksFileButton.setIcon(generalIcon)
         self.BooksFileButton.setObjectName(u'BooksFileButton')
         self.CsvBooksLayout.addWidget(self.BooksFileButton)
         self.CsvSourceLayout.setLayout(0, QtGui.QFormLayout.FieldRole,
@@ -152,7 +153,7 @@
         self.CsvVerseLayout.addWidget(self.CsvVerseLocationEdit)
         self.CsvVersesFileButton = QtGui.QToolButton(self.CsvPage)
         self.CsvVersesFileButton.setMaximumSize(QtCore.QSize(32, 16777215))
-        self.CsvVersesFileButton.setIcon(icon)
+        self.CsvVersesFileButton.setIcon(generalIcon)
         self.CsvVersesFileButton.setObjectName(u'CsvVersesFileButton')
         self.CsvVerseLayout.addWidget(self.CsvVersesFileButton)
         self.CsvSourceLayout.setLayout(1, QtGui.QFormLayout.FieldRole,
@@ -175,7 +176,7 @@
         self.OpenSongFileEdit.setObjectName(u'OpenSongFileEdit')
         self.OpenSongFileLayout.addWidget(self.OpenSongFileEdit)
         self.OpenSongBrowseButton = QtGui.QToolButton(self.OpenSongPage)
-        self.OpenSongBrowseButton.setIcon(icon)
+        self.OpenSongBrowseButton.setIcon(generalIcon)
         self.OpenSongBrowseButton.setObjectName(u'OpenSongBrowseButton')
         self.OpenSongFileLayout.addWidget(self.OpenSongBrowseButton)
         self.OpenSongLayout.setLayout(0, QtGui.QFormLayout.FieldRole,