Try to fix bug #1157938 by changing all the png icons to svg

Fixes: https://launchpad.net/bugs/1157938

openlp/core/ui/filerenamedialog.py

@@ -29,12 +29,14 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_FileRenameDialog(object):
     def setupUi(self, fileRenameDialog):
         fileRenameDialog.setObjectName(u'fileRenameDialog')
+        fileRenameDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         fileRenameDialog.resize(300, 10)
         self.dialogLayout = QtGui.QGridLayout(fileRenameDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')

openlp/core/ui/firsttimelanguagedialog.py

@@ -29,12 +29,14 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_FirstTimeLanguageDialog(object):
     def setupUi(self, languageDialog):
         languageDialog.setObjectName(u'languageDialog')
+        languageDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         languageDialog.resize(300, 50)
         self.dialogLayout = QtGui.QVBoxLayout(languageDialog)
         self.dialogLayout.setContentsMargins(8, 8, 8, 8)

openlp/core/ui/firsttimewizard.py

@@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui
 
 import sys
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import add_welcome_page
 
 
@@ -59,6 +59,7 @@ class Ui_FirstTimeWizard(object):
             QtGui.QWizard.NoBackButtonOnStartPage |
             QtGui.QWizard.NoBackButtonOnLastPage |
             QtGui.QWizard.HaveCustomButton1)
+        FirstTimeWizard.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.finishButton = self.button(QtGui.QWizard.FinishButton)
         self.noInternetFinishButton = self.button(QtGui.QWizard.CustomButton1)
         self.cancelButton = self.button(QtGui.QWizard.CancelButton)

openlp/core/ui/formattingtagdialog.py

@@ -29,13 +29,15 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import UiStrings, create_button_box
 
+
 class Ui_FormattingTagDialog(object):
 
     def setupUi(self, formattingTagDialog):
         formattingTagDialog.setObjectName(u'formattingTagDialog')
+        formattingTagDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         formattingTagDialog.resize(725, 548)
         self.listdataGridLayout = QtGui.QGridLayout(formattingTagDialog)
         self.listdataGridLayout.setMargin(8)

openlp/core/ui/mainwindow.py

@@ -82,13 +82,14 @@ PROGRESSBAR_STYLE = """
     }
 """
 
+
 class Ui_MainWindow(object):
     def setupUi(self, mainWindow):
         """
         Set up the user interface
         """
         mainWindow.setObjectName(u'MainWindow')
-        mainWindow.setWindowIcon(build_icon(u':/icon/openlp-logo-64x64.png'))
+        mainWindow.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         mainWindow.setDockNestingEnabled(True)
         # Set up the main container, which contains all the other form widgets.
         self.mainContent = QtGui.QWidget(mainWindow)

openlp/core/ui/plugindialog.py

@@ -29,13 +29,15 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import UiStrings, create_button_box
 
+
 class Ui_PluginViewDialog(object):
     def setupUi(self, pluginViewDialog):
         pluginViewDialog.setObjectName(u'pluginViewDialog')
         pluginViewDialog.setWindowModality(QtCore.Qt.ApplicationModal)
+        pluginViewDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.pluginLayout = QtGui.QVBoxLayout(pluginViewDialog)
         self.pluginLayout.setObjectName(u'pluginLayout')
         self.listLayout = QtGui.QHBoxLayout()

openlp/core/ui/printservicedialog.py

@@ -32,6 +32,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import build_icon, translate, SpellTextEdit
 from openlp.core.lib.ui import UiStrings
 
+
 class ZoomSize(object):
     """
     Type enumeration for Combo Box sizes
@@ -48,6 +49,7 @@ class Ui_PrintServiceDialog(object):
     def setupUi(self, printServiceDialog):
         printServiceDialog.setObjectName(u'printServiceDialog')
         printServiceDialog.resize(664, 594)
+        printServiceDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.mainLayout = QtGui.QVBoxLayout(printServiceDialog)
         self.mainLayout.setSpacing(0)
         self.mainLayout.setMargin(0)

openlp/core/ui/serviceitemeditdialog.py

@@ -29,12 +29,14 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box, create_button
 
+
 class Ui_ServiceItemEditDialog(object):
     def setupUi(self, serviceItemEditDialog):
         serviceItemEditDialog.setObjectName(u'serviceItemEditDialog')
+        serviceItemEditDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.dialogLayout = QtGui.QGridLayout(serviceItemEditDialog)
         self.dialogLayout.setContentsMargins(8, 8, 8, 8)
         self.dialogLayout.setSpacing(8)

openlp/core/ui/settingsdialog.py

@@ -32,12 +32,12 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_SettingsDialog(object):
     def setupUi(self, settingsDialog):
         settingsDialog.setObjectName(u'settingsDialog')
         settingsDialog.resize(800, 500)
-        settingsDialog.setWindowIcon(
+        settingsDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
-            build_icon(u':/system/system_settings.png'))
         self.dialogLayout = QtGui.QGridLayout(settingsDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
         self.dialogLayout.setMargin(8)

openlp/core/ui/shortcutlistdialog.py

@@ -32,6 +32,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
+
 class CaptureShortcutButton(QtGui.QPushButton):
     """
     A class to encapsulate a ``QPushButton``.
@@ -54,6 +55,7 @@ class Ui_ShortcutListDialog(object):
     def setupUi(self, shortcutListDialog):
         shortcutListDialog.setObjectName(u'shortcutListDialog')
         shortcutListDialog.resize(500, 438)
+        shortcutListDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.shortcutListLayout = QtGui.QVBoxLayout(shortcutListDialog)
         self.shortcutListLayout.setObjectName(u'shortcutListLayout')
         self.descriptionLabel = QtGui.QLabel(shortcutListDialog)

openlp/core/ui/starttimedialog.py

@@ -29,13 +29,15 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import UiStrings, create_button_box
 
+
 class Ui_StartTimeDialog(object):
     def setupUi(self, StartTimeDialog):
         StartTimeDialog.setObjectName(u'StartTimeDialog')
         StartTimeDialog.resize(350, 10)
+        StartTimeDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.dialogLayout = QtGui.QGridLayout(StartTimeDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
         self.startLabel = QtGui.QLabel(StartTimeDialog)

openlp/core/ui/themelayoutdialog.py

@@ -29,14 +29,14 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
 
 class Ui_ThemeLayoutDialog(object):
     def setupUi(self, themeLayoutDialog):
         themeLayoutDialog.setObjectName(u'themeLayoutDialogDialog')
-        #themeLayoutDialog.resize(300, 200)
+        themeLayoutDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.previewLayout = QtGui.QVBoxLayout(themeLayoutDialog)
         self.previewLayout.setObjectName(u'previewLayout')
         self.previewArea = QtGui.QWidget(themeLayoutDialog)

openlp/core/ui/themewizard.py

@@ -35,6 +35,7 @@ from openlp.core.lib.theme import HorizontalType, BackgroundType, \
 from openlp.core.lib.ui import UiStrings, add_welcome_page, \
     create_valign_selection_widgets
 
+
 class Ui_ThemeWizard(object):
     def setupUi(self, themeWizard):
         themeWizard.setObjectName(u'OpenLP.ThemeWizard')
@@ -43,6 +44,7 @@ class Ui_ThemeWizard(object):
         themeWizard.setOptions(QtGui.QWizard.IndependentPages |
             QtGui.QWizard.NoBackButtonOnStartPage |
             QtGui.QWizard.HaveCustomButton1)
+        themeWizard.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.spacer = QtGui.QSpacerItem(10, 0,
             QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
         # Welcome Page

openlp/core/ui/wizard.py

@@ -39,6 +39,7 @@ from openlp.core.lib.ui import UiStrings, add_welcome_page
 
 log = logging.getLogger(__name__)
 
+
 class WizardStrings(object):
     """
     Provide standard strings for wizards to use.
@@ -103,6 +104,7 @@ class OpenLPWizard(QtGui.QWizard):
         """
         Set up the wizard UI.
         """
+        self.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.setModal(True)
         self.setWizardStyle(QtGui.QWizard.ModernStyle)
         self.setOptions(QtGui.QWizard.IndependentPages |

openlp/plugins/alerts/forms/alertdialog.py

@@ -36,7 +36,7 @@ class Ui_AlertDialog(object):
     def setupUi(self, alertDialog):
         alertDialog.setObjectName(u'alertDialog')
         alertDialog.resize(400, 300)
-        alertDialog.setWindowIcon(build_icon(u':/icon/openlp-logo-16x16.png'))
+        alertDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.alertDialogLayout = QtGui.QGridLayout(alertDialog)
         self.alertDialogLayout.setObjectName(u'alertDialogLayout')
         self.alertTextLayout = QtGui.QFormLayout()

openlp/plugins/bibles/forms/bibleimportform.py

@@ -45,6 +45,7 @@ from openlp.plugins.bibles.lib.db import BiblesResourcesDB, clean_filename
 
 log = logging.getLogger(__name__)
 
+
 class WebDownload(object):
     """
     Provides an enumeration for the web bible types available to OpenLP.

openlp/plugins/bibles/forms/booknamedialog.py

@@ -29,13 +29,15 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_BookNameDialog(object):
     def setupUi(self, bookNameDialog):
         bookNameDialog.setObjectName(u'bookNameDialog')
         bookNameDialog.resize(400, 271)
+        bookNameDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.bookNameLayout = QtGui.QVBoxLayout(bookNameDialog)
         self.bookNameLayout.setSpacing(8)
         self.bookNameLayout.setMargin(8)

openlp/plugins/bibles/forms/editbibledialog.py

@@ -39,8 +39,7 @@ class Ui_EditBibleDialog(object):
     def setupUi(self, editBibleDialog):
         editBibleDialog.setObjectName(u'editBibleDialog')
         editBibleDialog.resize(520, 400)
-        editBibleDialog.setWindowIcon(
+        editBibleDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
-            build_icon(u':/icon/openlp-logo-16x16.png'))
         editBibleDialog.setModal(True)
         self.dialogLayout = QtGui.QVBoxLayout(editBibleDialog)
         self.dialogLayout.setSpacing(8)

openlp/plugins/bibles/forms/languagedialog.py

@@ -29,13 +29,15 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_LanguageDialog(object):
     def setupUi(self, languageDialog):
         languageDialog.setObjectName(u'languageDialog')
         languageDialog.resize(400, 165)
+        languageDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.languageLayout = QtGui.QVBoxLayout(languageDialog)
         self.languageLayout.setSpacing(8)
         self.languageLayout.setMargin(8)

openlp/plugins/custom/forms/editcustomdialog.py

@@ -32,12 +32,12 @@ from PyQt4 import QtGui
 from openlp.core.lib import build_icon, translate
 from openlp.core.lib.ui import UiStrings, create_button_box, create_button
 
+
 class Ui_CustomEditDialog(object):
     def setupUi(self, customEditDialog):
         customEditDialog.setObjectName(u'customEditDialog')
         customEditDialog.resize(450, 350)
-        customEditDialog.setWindowIcon(
+        customEditDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
-            build_icon(u':/icon/openlp-logo-16x16.png'))
         self.dialogLayout = QtGui.QVBoxLayout(customEditDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
         self.titleLayout = QtGui.QHBoxLayout()

openlp/plugins/custom/forms/editcustomslidedialog.py

@@ -32,10 +32,12 @@ from PyQt4 import QtGui
 from openlp.core.lib import translate, SpellTextEdit, build_icon
 from openlp.core.lib.ui import UiStrings, create_button, create_button_box
 
+
 class Ui_CustomSlideEditDialog(object):
     def setupUi(self, customSlideEditDialog):
         customSlideEditDialog.setObjectName(u'customSlideEditDialog')
         customSlideEditDialog.resize(350, 300)
+        customSlideEditDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.dialogLayout = QtGui.QVBoxLayout(customSlideEditDialog)
         self.slideTextEdit = SpellTextEdit(self)
         self.slideTextEdit.setObjectName(u'slideTextEdit')

openlp/plugins/songs/forms/authorsdialog.py

@@ -29,13 +29,15 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_AuthorsDialog(object):
     def setupUi(self, authorsDialog):
         authorsDialog.setObjectName(u'AuthorsDialog')
         authorsDialog.resize(300, 10)
+        authorsDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.dialogLayout = QtGui.QVBoxLayout(authorsDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
         self.authorLayout = QtGui.QFormLayout()

openlp/plugins/songs/forms/editsongdialog.py

@@ -33,12 +33,12 @@ from openlp.core.lib import build_icon, translate
 from openlp.core.lib.ui import UiStrings, create_button_box, create_button
 from openlp.plugins.songs.lib.ui import SongStrings
 
+
 class Ui_EditSongDialog(object):
     def setupUi(self, editSongDialog):
         editSongDialog.setObjectName(u'editSongDialog')
         editSongDialog.resize(650, 400)
-        editSongDialog.setWindowIcon(
+        editSongDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
-            build_icon(u':/icon/openlp-logo-16x16.png'))
         editSongDialog.setModal(True)
         self.dialogLayout = QtGui.QVBoxLayout(editSongDialog)
         self.dialogLayout.setSpacing(8)

openlp/plugins/songs/forms/editversedialog.py

@@ -33,11 +33,13 @@ from openlp.core.lib import build_icon, translate, SpellTextEdit
 from openlp.core.lib.ui import create_button_box, UiStrings
 from openlp.plugins.songs.lib import VerseType
 
+
 class Ui_EditVerseDialog(object):
     def setupUi(self, editVerseDialog):
         editVerseDialog.setObjectName(u'editVerseDialog')
         editVerseDialog.resize(400, 400)
         editVerseDialog.setModal(True)
+        editVerseDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.dialogLayout = QtGui.QVBoxLayout(editVerseDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
         self.verseTextEdit = SpellTextEdit(editVerseDialog)

openlp/plugins/songs/forms/mediafilesdialog.py

@@ -32,14 +32,14 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_MediaFilesDialog(object):
     def setupUi(self, mediaFilesDialog):
         mediaFilesDialog.setObjectName(u'mediaFilesDialog')
         mediaFilesDialog.setWindowModality(QtCore.Qt.ApplicationModal)
         mediaFilesDialog.resize(400, 300)
         mediaFilesDialog.setModal(True)
-        mediaFilesDialog.setWindowIcon(
+        mediaFilesDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
-            build_icon(u':/icon/openlp-logo-16x16.png'))
         self.filesVerticalLayout = QtGui.QVBoxLayout(mediaFilesDialog)
         self.filesVerticalLayout.setSpacing(8)
         self.filesVerticalLayout.setMargin(8)

openlp/plugins/songs/forms/songbookdialog.py

@@ -29,13 +29,15 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_SongBookDialog(object):
     def setupUi(self, songBookDialog):
         songBookDialog.setObjectName(u'songBookDialog')
         songBookDialog.resize(300, 10)
+        songBookDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.dialogLayout = QtGui.QVBoxLayout(songBookDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
         self.bookLayout = QtGui.QFormLayout()

openlp/plugins/songs/forms/songmaintenancedialog.py

@@ -33,11 +33,14 @@ from openlp.core.lib import build_icon
 from openlp.core.lib.ui import UiStrings, create_button_box
 from openlp.plugins.songs.lib.ui import SongStrings
 
+
 class Ui_SongMaintenanceDialog(object):
     def setupUi(self, songMaintenanceDialog):
         songMaintenanceDialog.setObjectName(u'songMaintenanceDialog')
         songMaintenanceDialog.setWindowModality(QtCore.Qt.ApplicationModal)
         songMaintenanceDialog.resize(10, 350)
+        songMaintenanceDialog.setWindowIcon(
+            build_icon(u':/icon/openlp-logo.svg'))
         self.dialogLayout = QtGui.QGridLayout(songMaintenanceDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
         self.typeListWidget = QtGui.QListWidget(songMaintenanceDialog)

openlp/plugins/songs/forms/topicsdialog.py

@@ -29,13 +29,15 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_TopicsDialog(object):
     def setupUi(self, topicsDialog):
         topicsDialog.setObjectName(u'topicsDialog')
         topicsDialog.resize(300, 10)
+        topicsDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.dialogLayout = QtGui.QVBoxLayout(topicsDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
         self.nameLayout = QtGui.QFormLayout()

openlp/plugins/songusage/forms/songusagedeletedialog.py

@@ -29,13 +29,16 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_SongUsageDeleteDialog(object):
     def setupUi(self, songUsageDeleteDialog):
         songUsageDeleteDialog.setObjectName(u'songUsageDeleteDialog')
         songUsageDeleteDialog.resize(291, 243)
+        songUsageDeleteDialog.setWindowIcon(
+            build_icon(u':/icon/openlp-logo.svg'))
         self.verticalLayout = QtGui.QVBoxLayout(songUsageDeleteDialog)
         self.verticalLayout.setSpacing(8)
         self.verticalLayout.setContentsMargins(8, 8, 8, 8)

openlp/plugins/songusage/forms/songusagedetaildialog.py

@@ -32,10 +32,13 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import build_icon, translate
 from openlp.core.lib.ui import create_button_box
 
+
 class Ui_SongUsageDetailDialog(object):
     def setupUi(self, songUsageDetailDialog):
         songUsageDetailDialog.setObjectName(u'songUsageDetailDialog')
         songUsageDetailDialog.resize(609, 413)
+        songUsageDetailDialog.setWindowIcon(
+            build_icon(u':/icon/openlp-logo.svg'))
         self.verticalLayout = QtGui.QVBoxLayout(songUsageDetailDialog)
         self.verticalLayout.setSpacing(8)
         self.verticalLayout.setContentsMargins(8, 8, 8, 8)