openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #30626
[Merge] lp:~phill-ridout/openlp/resource_clean_up into lp:openlp
Phill has proposed merging lp:~phill-ridout/openlp/resource_clean_up into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/resource_clean_up/+merge/309636
Added a script to clean up the resource folder.
Ran script and made some other resource cleanup code changes.
Add this to your merge proposal:
--------------------------------
lp:~phill-ridout/openlp/resource_clean_up (revision 2705)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1803/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1714/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1652/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1408/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/998/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1066/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/934/
[SUCCESS] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/95/
Process finished with exit code 0
--
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/resource_clean_up into lp:openlp.
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2016-08-12 19:16:12 +0000
+++ openlp/core/lib/__init__.py 2016-10-30 09:13:09 +0000
@@ -129,16 +129,16 @@
location like ``/path/to/file.png``. However, the **recommended** way is to specify a resource string.
:return: The build icon.
"""
+ if isinstance(icon, QtGui.QIcon):
+ return icon
+ pix_map = None
button_icon = QtGui.QIcon()
- if isinstance(icon, QtGui.QIcon):
- button_icon = icon
- elif isinstance(icon, str):
- if icon.startswith(':/'):
- button_icon.addPixmap(QtGui.QPixmap(icon), QtGui.QIcon.Normal, QtGui.QIcon.Off)
- else:
- button_icon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(icon)), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ if isinstance(icon, str):
+ pix_map = QtGui.QPixmap(icon)
elif isinstance(icon, QtGui.QImage):
- button_icon.addPixmap(QtGui.QPixmap.fromImage(icon), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ pix_map = QtGui.QPixmap.fromImage(icon)
+ if pix_map:
+ button_icon.addPixmap(pix_map, QtGui.QIcon.Normal, QtGui.QIcon.Off)
return button_icon
=== modified file 'openlp/core/ui/exceptiondialog.py'
--- openlp/core/ui/exceptiondialog.py 2016-10-17 17:40:45 +0000
+++ openlp/core/ui/exceptiondialog.py 2016-10-30 09:13:09 +0000
@@ -38,7 +38,7 @@
Set up the UI.
"""
exception_dialog.setObjectName('exception_dialog')
- exception_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ exception_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
self.exception_layout = QtWidgets.QVBoxLayout(exception_dialog)
self.exception_layout.setObjectName('exception_layout')
self.message_layout = QtWidgets.QHBoxLayout()
=== modified file 'openlp/core/ui/filerenamedialog.py'
--- openlp/core/ui/filerenamedialog.py 2015-12-31 22:46:06 +0000
+++ openlp/core/ui/filerenamedialog.py 2016-10-30 09:13:09 +0000
@@ -37,7 +37,7 @@
Set up the UI
"""
file_rename_dialog.setObjectName('file_rename_dialog')
- file_rename_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ file_rename_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
file_rename_dialog.resize(300, 10)
self.dialog_layout = QtWidgets.QGridLayout(file_rename_dialog)
self.dialog_layout.setObjectName('dialog_layout')
=== modified file 'openlp/core/ui/firsttimelanguagedialog.py'
--- openlp/core/ui/firsttimelanguagedialog.py 2015-12-31 22:46:06 +0000
+++ openlp/core/ui/firsttimelanguagedialog.py 2016-10-30 09:13:09 +0000
@@ -38,7 +38,7 @@
Set up the UI.
"""
language_dialog.setObjectName('language_dialog')
- language_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ language_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
language_dialog.resize(300, 50)
self.dialog_layout = QtWidgets.QVBoxLayout(language_dialog)
self.dialog_layout.setContentsMargins(8, 8, 8, 8)
=== modified file 'openlp/core/ui/firsttimewizard.py'
--- openlp/core/ui/firsttimewizard.py 2016-05-20 16:22:06 +0000
+++ openlp/core/ui/firsttimewizard.py 2016-10-30 09:13:09 +0000
@@ -55,7 +55,7 @@
:param first_time_wizard: The wizard form
"""
first_time_wizard.setObjectName('first_time_wizard')
- first_time_wizard.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ first_time_wizard.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
first_time_wizard.resize(550, 386)
first_time_wizard.setModal(True)
first_time_wizard.setOptions(QtWidgets.QWizard.IndependentPages | QtWidgets.QWizard.NoBackButtonOnStartPage |
=== modified file 'openlp/core/ui/formattingtagdialog.py'
--- openlp/core/ui/formattingtagdialog.py 2015-12-31 22:46:06 +0000
+++ openlp/core/ui/formattingtagdialog.py 2016-10-30 09:13:09 +0000
@@ -38,7 +38,7 @@
Set up the UI
"""
formatting_tag_dialog.setObjectName('formatting_tag_dialog')
- formatting_tag_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ formatting_tag_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
formatting_tag_dialog.resize(725, 548)
self.list_data_grid_layout = QtWidgets.QVBoxLayout(formatting_tag_dialog)
self.list_data_grid_layout.setContentsMargins(8, 8, 8, 8)
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2016-08-10 18:50:40 +0000
+++ openlp/core/ui/generaltab.py 2016-10-30 09:13:09 +0000
@@ -44,7 +44,7 @@
self.logo_file = ':/graphics/openlp-splash-screen.png'
self.logo_background_color = '#ffffff'
self.screens = ScreenList()
- self.icon_path = ':/icon/openlp-logo-16x16.png'
+ self.icon_path = ':/icon/openlp-logo.svg'
general_translated = translate('OpenLP.GeneralTab', 'General')
super(GeneralTab, self).__init__(parent, 'Core', general_translated)
=== modified file 'openlp/core/ui/plugindialog.py'
--- openlp/core/ui/plugindialog.py 2016-05-20 16:22:06 +0000
+++ openlp/core/ui/plugindialog.py 2016-10-30 09:13:09 +0000
@@ -38,7 +38,7 @@
Set up the UI
"""
plugin_view_dialog.setObjectName('plugin_view_dialog')
- plugin_view_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ plugin_view_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
plugin_view_dialog.setWindowModality(QtCore.Qt.ApplicationModal)
self.plugin_layout = QtWidgets.QVBoxLayout(plugin_view_dialog)
self.plugin_layout.setObjectName('plugin_layout')
=== modified file 'openlp/core/ui/printservicedialog.py'
--- openlp/core/ui/printservicedialog.py 2016-05-21 05:02:31 +0000
+++ openlp/core/ui/printservicedialog.py 2016-10-30 09:13:09 +0000
@@ -50,7 +50,7 @@
Set up the UI
"""
print_service_dialog.setObjectName('print_service_dialog')
- print_service_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ print_service_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
print_service_dialog.resize(664, 594)
self.main_layout = QtWidgets.QVBoxLayout(print_service_dialog)
self.main_layout.setSpacing(0)
=== modified file 'openlp/core/ui/projector/editform.py'
--- openlp/core/ui/projector/editform.py 2016-07-18 21:36:16 +0000
+++ openlp/core/ui/projector/editform.py 2016-10-30 09:13:09 +0000
@@ -47,7 +47,7 @@
Create the interface layout.
"""
edit_projector_dialog.setObjectName('edit_projector_dialog')
- edit_projector_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo-32x32.png'))
+ edit_projector_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
edit_projector_dialog.setMinimumWidth(400)
edit_projector_dialog.setModal(True)
# Define the basic layout
=== modified file 'openlp/core/ui/serviceitemeditdialog.py'
--- openlp/core/ui/serviceitemeditdialog.py 2015-12-31 22:46:06 +0000
+++ openlp/core/ui/serviceitemeditdialog.py 2016-10-30 09:13:09 +0000
@@ -38,7 +38,7 @@
Set up the UI
"""
serviceItemEditDialog.setObjectName('serviceItemEditDialog')
- serviceItemEditDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ serviceItemEditDialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
self.dialog_layout = QtWidgets.QGridLayout(serviceItemEditDialog)
self.dialog_layout.setContentsMargins(8, 8, 8, 8)
self.dialog_layout.setSpacing(8)
=== modified file 'openlp/core/ui/settingsdialog.py'
--- openlp/core/ui/settingsdialog.py 2015-12-31 22:46:06 +0000
+++ openlp/core/ui/settingsdialog.py 2016-10-30 09:13:09 +0000
@@ -38,7 +38,7 @@
Set up the UI
"""
settings_dialog.setObjectName('settings_dialog')
- settings_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ settings_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
settings_dialog.resize(800, 700)
self.dialog_layout = QtWidgets.QGridLayout(settings_dialog)
self.dialog_layout.setObjectName('dialog_layout')
=== modified file 'openlp/core/ui/shortcutlistdialog.py'
--- openlp/core/ui/shortcutlistdialog.py 2015-12-31 22:46:06 +0000
+++ openlp/core/ui/shortcutlistdialog.py 2016-10-30 09:13:09 +0000
@@ -72,7 +72,7 @@
Set up the UI
"""
shortcutListDialog.setObjectName('shortcutListDialog')
- shortcutListDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ shortcutListDialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
shortcutListDialog.resize(500, 438)
self.shortcut_list_layout = QtWidgets.QVBoxLayout(shortcutListDialog)
self.shortcut_list_layout.setObjectName('shortcut_list_layout')
=== modified file 'openlp/core/ui/starttimedialog.py'
--- openlp/core/ui/starttimedialog.py 2015-12-31 22:46:06 +0000
+++ openlp/core/ui/starttimedialog.py 2016-10-30 09:13:09 +0000
@@ -38,7 +38,7 @@
Set up the UI
"""
StartTimeDialog.setObjectName('StartTimeDialog')
- StartTimeDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ StartTimeDialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
StartTimeDialog.resize(350, 10)
self.dialog_layout = QtWidgets.QGridLayout(StartTimeDialog)
self.dialog_layout.setObjectName('dialog_layout')
=== modified file 'openlp/core/ui/themelayoutdialog.py'
--- openlp/core/ui/themelayoutdialog.py 2015-12-31 22:46:06 +0000
+++ openlp/core/ui/themelayoutdialog.py 2016-10-30 09:13:09 +0000
@@ -38,7 +38,7 @@
Set up the UI
"""
themeLayoutDialog.setObjectName('themeLayoutDialogDialog')
- themeLayoutDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ themeLayoutDialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
self.preview_layout = QtWidgets.QVBoxLayout(themeLayoutDialog)
self.preview_layout.setObjectName('preview_layout')
self.preview_area = QtWidgets.QWidget(themeLayoutDialog)
=== modified file 'openlp/core/ui/themewizard.py'
--- openlp/core/ui/themewizard.py 2016-07-24 20:20:25 +0000
+++ openlp/core/ui/themewizard.py 2016-10-30 09:13:09 +0000
@@ -40,7 +40,7 @@
Set up the UI
"""
theme_wizard.setObjectName('OpenLP.ThemeWizard')
- theme_wizard.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ theme_wizard.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
theme_wizard.setModal(True)
theme_wizard.setOptions(QtWidgets.QWizard.IndependentPages |
QtWidgets.QWizard.NoBackButtonOnStartPage | QtWidgets.QWizard.HaveCustomButton1)
=== modified file 'openlp/plugins/alerts/forms/alertdialog.py'
--- openlp/plugins/alerts/forms/alertdialog.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/alerts/forms/alertdialog.py 2016-10-30 09:13:09 +0000
@@ -39,7 +39,7 @@
"""
alert_dialog.setObjectName('alert_dialog')
alert_dialog.resize(400, 300)
- alert_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ alert_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
self.alert_dialog_layout = QtWidgets.QGridLayout(alert_dialog)
self.alert_dialog_layout.setObjectName('alert_dialog_layout')
self.alert_text_layout = QtWidgets.QFormLayout()
=== modified file 'openlp/plugins/bibles/forms/booknamedialog.py'
--- openlp/plugins/bibles/forms/booknamedialog.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/bibles/forms/booknamedialog.py 2016-10-30 09:13:09 +0000
@@ -30,7 +30,7 @@
class Ui_BookNameDialog(object):
def setupUi(self, book_name_dialog):
book_name_dialog.setObjectName('book_name_dialog')
- book_name_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ book_name_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
book_name_dialog.resize(400, 271)
self.book_name_layout = QtWidgets.QVBoxLayout(book_name_dialog)
self.book_name_layout.setSpacing(8)
=== modified file 'openlp/plugins/bibles/forms/editbibledialog.py'
--- openlp/plugins/bibles/forms/editbibledialog.py 2016-06-08 20:26:01 +0000
+++ openlp/plugins/bibles/forms/editbibledialog.py 2016-10-30 09:13:09 +0000
@@ -32,7 +32,7 @@
class Ui_EditBibleDialog(object):
def setupUi(self, edit_bible_dialog):
edit_bible_dialog.setObjectName('edit_bible_dialog')
- edit_bible_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ edit_bible_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
edit_bible_dialog.resize(520, 400)
edit_bible_dialog.setModal(True)
self.dialog_layout = QtWidgets.QVBoxLayout(edit_bible_dialog)
=== modified file 'openlp/plugins/bibles/forms/languagedialog.py'
--- openlp/plugins/bibles/forms/languagedialog.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/bibles/forms/languagedialog.py 2016-10-30 09:13:09 +0000
@@ -30,7 +30,7 @@
class Ui_LanguageDialog(object):
def setupUi(self, language_dialog):
language_dialog.setObjectName('language_dialog')
- language_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ language_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
language_dialog.resize(400, 165)
self.language_layout = QtWidgets.QVBoxLayout(language_dialog)
self.language_layout.setSpacing(8)
=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
--- openlp/plugins/custom/forms/editcustomdialog.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/custom/forms/editcustomdialog.py 2016-10-30 09:13:09 +0000
@@ -34,7 +34,7 @@
:param custom_edit_dialog: The Dialog
"""
custom_edit_dialog.setObjectName('custom_edit_dialog')
- custom_edit_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ custom_edit_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
custom_edit_dialog.resize(450, 350)
self.dialog_layout = QtWidgets.QVBoxLayout(custom_edit_dialog)
self.dialog_layout.setObjectName('dialog_layout')
=== modified file 'openlp/plugins/custom/forms/editcustomslidedialog.py'
--- openlp/plugins/custom/forms/editcustomslidedialog.py 2016-05-21 05:02:31 +0000
+++ openlp/plugins/custom/forms/editcustomslidedialog.py 2016-10-30 09:13:09 +0000
@@ -31,7 +31,7 @@
class Ui_CustomSlideEditDialog(object):
def setupUi(self, custom_slide_edit_dialog):
custom_slide_edit_dialog.setObjectName('custom_slide_edit_dialog')
- custom_slide_edit_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ custom_slide_edit_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
custom_slide_edit_dialog.resize(350, 300)
self.dialog_layout = QtWidgets.QVBoxLayout(custom_slide_edit_dialog)
self.slide_text_edit = SpellTextEdit(self)
=== modified file 'openlp/plugins/songs/forms/authorsdialog.py'
--- openlp/plugins/songs/forms/authorsdialog.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/songs/forms/authorsdialog.py 2016-10-30 09:13:09 +0000
@@ -36,7 +36,7 @@
Set up the UI for the dialog.
"""
authors_dialog.setObjectName('authors_dialog')
- authors_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ authors_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
authors_dialog.resize(300, 10)
authors_dialog.setModal(True)
self.dialog_layout = QtWidgets.QVBoxLayout(authors_dialog)
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py 2016-01-04 18:47:03 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py 2016-10-30 09:13:09 +0000
@@ -36,7 +36,7 @@
"""
def setupUi(self, edit_song_dialog):
edit_song_dialog.setObjectName('edit_song_dialog')
- edit_song_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ edit_song_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
edit_song_dialog.resize(900, 600)
edit_song_dialog.setModal(True)
self.dialog_layout = QtWidgets.QVBoxLayout(edit_song_dialog)
=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
--- openlp/plugins/songs/forms/editversedialog.py 2016-05-21 05:02:31 +0000
+++ openlp/plugins/songs/forms/editversedialog.py 2016-10-30 09:13:09 +0000
@@ -31,7 +31,7 @@
class Ui_EditVerseDialog(object):
def setupUi(self, edit_verse_dialog):
edit_verse_dialog.setObjectName('edit_verse_dialog')
- edit_verse_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ edit_verse_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
edit_verse_dialog.resize(400, 400)
edit_verse_dialog.setModal(True)
self.dialog_layout = QtWidgets.QVBoxLayout(edit_verse_dialog)
=== modified file 'openlp/plugins/songs/forms/mediafilesdialog.py'
--- openlp/plugins/songs/forms/mediafilesdialog.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/songs/forms/mediafilesdialog.py 2016-10-30 09:13:09 +0000
@@ -35,7 +35,7 @@
Set up the user interface.
"""
media_files_dialog.setObjectName('media_files_dialog')
- media_files_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ media_files_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
media_files_dialog.setWindowModality(QtCore.Qt.ApplicationModal)
media_files_dialog.resize(400, 300)
media_files_dialog.setModal(True)
=== modified file 'openlp/plugins/songs/forms/songbookdialog.py'
--- openlp/plugins/songs/forms/songbookdialog.py 2016-01-04 18:47:03 +0000
+++ openlp/plugins/songs/forms/songbookdialog.py 2016-10-30 09:13:09 +0000
@@ -35,7 +35,7 @@
Set up the user interface.
"""
song_book_dialog.setObjectName('song_book_dialog')
- song_book_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ song_book_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
song_book_dialog.resize(300, 10)
self.dialog_layout = QtWidgets.QVBoxLayout(song_book_dialog)
self.dialog_layout.setObjectName('dialog_layout')
=== modified file 'openlp/plugins/songs/forms/songexportform.py'
--- openlp/plugins/songs/forms/songexportform.py 2016-05-27 08:13:14 +0000
+++ openlp/plugins/songs/forms/songexportform.py 2016-10-30 09:13:09 +0000
@@ -51,7 +51,7 @@
:param parent: The QWidget-derived parent of the wizard.
:param plugin: The songs plugin.
"""
- super(SongExportForm, self).__init__(parent, plugin, 'song_export_wizard', ':/wizards/wizard_exportsong.bmp')
+ super(SongExportForm, self).__init__(parent, plugin, 'song_export_wizard', ':/wizards/wizard_song.bmp')
self.stop_export_flag = False
Registry().register_function('openlp_stop_wizard', self.stop_export)
=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py 2016-05-27 08:13:14 +0000
+++ openlp/plugins/songs/forms/songimportform.py 2016-10-30 09:13:09 +0000
@@ -52,7 +52,7 @@
:param parent: The QWidget-derived parent of the wizard.
:param plugin: The songs plugin.
"""
- super(SongImportForm, self).__init__(parent, plugin, 'songImportWizard', ':/wizards/wizard_importsong.bmp')
+ super(SongImportForm, self).__init__(parent, plugin, 'songImportWizard', ':/wizards/wizard_song.bmp')
self.clipboard = self.main_window.clipboard
def setupUi(self, image):
=== modified file 'openlp/plugins/songs/forms/songmaintenancedialog.py'
--- openlp/plugins/songs/forms/songmaintenancedialog.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/songs/forms/songmaintenancedialog.py 2016-10-30 09:13:09 +0000
@@ -37,7 +37,7 @@
Set up the user interface for the song maintenance dialog
"""
song_maintenance_dialog.setObjectName('song_maintenance_dialog')
- song_maintenance_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ song_maintenance_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
song_maintenance_dialog.setWindowModality(QtCore.Qt.ApplicationModal)
song_maintenance_dialog.resize(10, 350)
self.dialog_layout = QtWidgets.QGridLayout(song_maintenance_dialog)
=== modified file 'openlp/plugins/songs/forms/songreviewwidget.py'
--- openlp/plugins/songs/forms/songreviewwidget.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/songs/forms/songreviewwidget.py 2016-10-30 09:13:09 +0000
@@ -182,7 +182,7 @@
self.song_vertical_layout.addWidget(self.song_group_box)
self.song_remove_button = QtWidgets.QPushButton(self)
self.song_remove_button.setObjectName('song_remove_button')
- self.song_remove_button.setIcon(build_icon(':/songs/song_delete.png'))
+ self.song_remove_button.setIcon(build_icon(':/general/general_delete.png'))
self.song_remove_button.setSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
self.song_vertical_layout.addWidget(self.song_remove_button, alignment=QtCore.Qt.AlignHCenter)
=== modified file 'openlp/plugins/songs/forms/topicsdialog.py'
--- openlp/plugins/songs/forms/topicsdialog.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/songs/forms/topicsdialog.py 2016-10-30 09:13:09 +0000
@@ -35,7 +35,7 @@
Set up the user interface for the topics dialog.
"""
topics_dialog.setObjectName('topics_dialog')
- topics_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ topics_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
topics_dialog.resize(300, 10)
self.dialog_layout = QtWidgets.QVBoxLayout(topics_dialog)
self.dialog_layout.setObjectName('dialog_layout')
=== modified file 'openlp/plugins/songusage/forms/songusagedeletedialog.py'
--- openlp/plugins/songusage/forms/songusagedeletedialog.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/songusage/forms/songusagedeletedialog.py 2016-10-30 09:13:09 +0000
@@ -38,7 +38,7 @@
:param song_usage_delete_dialog:
"""
song_usage_delete_dialog.setObjectName('song_usage_delete_dialog')
- song_usage_delete_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ song_usage_delete_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
song_usage_delete_dialog.resize(291, 243)
self.vertical_layout = QtWidgets.QVBoxLayout(song_usage_delete_dialog)
self.vertical_layout.setSpacing(8)
=== modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py'
--- openlp/plugins/songusage/forms/songusagedetaildialog.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/songusage/forms/songusagedetaildialog.py 2016-10-30 09:13:09 +0000
@@ -38,7 +38,7 @@
:param song_usage_detail_dialog:
"""
song_usage_detail_dialog.setObjectName('song_usage_detail_dialog')
- song_usage_detail_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
+ song_usage_detail_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
song_usage_detail_dialog.resize(609, 413)
self.vertical_layout = QtWidgets.QVBoxLayout(song_usage_detail_dialog)
self.vertical_layout.setSpacing(8)
=== removed file 'resources/images/about-new.bmp'
Binary files resources/images/about-new.bmp 2010-09-19 08:47:00 +0000 and resources/images/about-new.bmp 1970-01-01 00:00:00 +0000 differ
=== modified file 'resources/images/bibles_search_clear.png'
Binary files resources/images/bibles_search_clear.png 2016-07-31 11:01:03 +0000 and resources/images/bibles_search_clear.png 2016-10-30 09:13:09 +0000 differ
=== modified file 'resources/images/bibles_search_combined.png'
Binary files resources/images/bibles_search_combined.png 2016-07-31 11:01:03 +0000 and resources/images/bibles_search_combined.png 2016-10-30 09:13:09 +0000 differ
=== removed file 'resources/images/bibles_upgrade_alert.png'
Binary files resources/images/bibles_upgrade_alert.png 2011-04-26 18:18:13 +0000 and resources/images/bibles_upgrade_alert.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/custom_delete.png'
Binary files resources/images/custom_delete.png 2010-09-14 18:18:47 +0000 and resources/images/custom_delete.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/custom_edit.png'
Binary files resources/images/custom_edit.png 2010-09-14 18:18:47 +0000 and resources/images/custom_edit.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/custom_new.png'
Binary files resources/images/custom_new.png 2010-09-14 18:18:47 +0000 and resources/images/custom_new.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/general_search_clear.png'
Binary files resources/images/general_search_clear.png 2010-12-28 21:12:20 +0000 and resources/images/general_search_clear.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/image_clapperboard.png'
Binary files resources/images/image_clapperboard.png 2010-09-14 18:18:47 +0000 and resources/images/image_clapperboard.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/image_delete.png'
Binary files resources/images/image_delete.png 2010-09-14 18:18:47 +0000 and resources/images/image_delete.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/image_load.png'
Binary files resources/images/image_load.png 2010-09-14 18:18:47 +0000 and resources/images/image_load.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/import_load.png'
Binary files resources/images/import_load.png 2010-09-14 18:18:47 +0000 and resources/images/import_load.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/import_move_to_list.png'
Binary files resources/images/import_move_to_list.png 2010-09-14 18:18:47 +0000 and resources/images/import_move_to_list.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/import_remove.png'
Binary files resources/images/import_remove.png 2010-09-14 18:18:47 +0000 and resources/images/import_remove.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/import_selectall.png'
Binary files resources/images/import_selectall.png 2010-09-14 18:18:47 +0000 and resources/images/import_selectall.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/messagebox_critical.png'
Binary files resources/images/messagebox_critical.png 2010-09-14 18:18:47 +0000 and resources/images/messagebox_critical.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/messagebox_info.png'
Binary files resources/images/messagebox_info.png 2010-09-14 18:18:47 +0000 and resources/images/messagebox_info.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/messagebox_warning.png'
Binary files resources/images/messagebox_warning.png 2010-09-14 18:18:47 +0000 and resources/images/messagebox_warning.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'resources/images/openlp-2.qrc'
--- resources/images/openlp-2.qrc 2016-08-11 21:15:03 +0000
+++ resources/images/openlp-2.qrc 2016-10-30 09:13:09 +0000
@@ -23,8 +23,7 @@
<file>topic_maintenance.png</file>
<file>song_author_edit.png</file>
<file>song_book_edit.png</file>
- <file>song_delete.png</file>
- </qresource>
+ </qresource>
<qresource prefix="images">
<file>image_group.png</file>
<file>image_new_group.png</file>
@@ -33,7 +32,6 @@
<file>bibles_search_combined.png</file>
<file>bibles_search_text.png</file>
<file>bibles_search_reference.png</file>
- <file>bibles_upgrade_alert.png</file>
<file>bibles_search_clear.png</file>
<file>bibles_search_unlock.png</file>
<file>bibles_search_lock.png</file>
@@ -71,7 +69,6 @@
<file>general_back.png</file>
</qresource>
<qresource prefix="slides">
- <file>slide_close.png</file>
<file>slide_next.png</file>
<file>slide_blank.png</file>
<file>slide_desktop.png</file>
@@ -83,12 +80,6 @@
<file>media_playback_next.png</file>
</qresource>
<qresource prefix="icon">
- <file>openlp-logo-16x16.png</file>
- <file>openlp-logo-32x32.png</file>
- <file>openlp-logo-48x48.png</file>
- <file>openlp-logo-64x64.png</file>
- <file>openlp-logo-128x128.png</file>
- <file>openlp-logo-256x256.png</file>
<file>openlp-logo.svg</file>
</qresource>
<qresource prefix="graphics">
@@ -97,24 +88,18 @@
<file>openlp-about-logo.png</file>
</qresource>
<qresource prefix="imports">
- <file>import_selectall.png</file>
- <file>import_move_to_list.png</file>
- <file>import_remove.png</file>
- <file>import_load.png</file>
- </qresource>
+ </qresource>
<qresource prefix="exports">
<file>export_load.png</file>
</qresource>
<qresource prefix="wizards">
<file>openlp-osx-wizard.png</file>
- <file>wizard_exportsong.bmp</file>
- <file>wizard_importsong.bmp</file>
+ <file>wizard_song.bmp</file>
<file>wizard_importbible.bmp</file>
<file>wizard_firsttime.bmp</file>
<file>wizard_createtheme.bmp</file>
<file>wizard_duplicateremoval.bmp</file>
- <file>wizard_createprojector.png</file>
- </qresource>
+ </qresource>
<qresource prefix="services">
<file>service_collapse_all.png</file>
<file>service_expand_all.png</file>
@@ -155,10 +140,7 @@
<file>multimedia-player.png</file>
</qresource>
<qresource prefix="messagebox">
- <file>messagebox_critical.png</file>
- <file>messagebox_info.png</file>
- <file>messagebox_warning.png</file>
- </qresource>
+ </qresource>
<qresource prefix="remote">
<file>network_server.png</file>
<file>network_ssl.png</file>
@@ -170,10 +152,8 @@
</qresource>
<qresource prefix="tools">
<file>tools_add.png</file>
- <file>tools_alert.png</file>
- </qresource>
+ </qresource>
<qresource prefix="themes">
- <file>theme_delete.png</file>
<file>theme_new.png</file>
<file>theme_edit.png</file>
</qresource>
@@ -201,12 +181,10 @@
<file>projector_power_on_tiled.png</file>
<file>projector_show.png</file>
<file>projector_show_tiled.png</file>
- <file>projector_spacer.png</file>
<file>projector_warmup.png</file>
- <file>projector_view.png</file>
- </qresource>
+ </qresource>
<qresource prefix="remotes">
<file>android_app_qr.png</file>
<file>ios_app_qr.png</file>
</qresource>
-</RCC>
+</RCC>
\ No newline at end of file
=== removed file 'resources/images/openlp-about-logo.svg'
--- resources/images/openlp-about-logo.svg 2012-11-01 17:41:22 +0000
+++ resources/images/openlp-about-logo.svg 1970-01-01 00:00:00 +0000
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:xlink="http://www.w3.org/1999/xlink";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="500"
- height="85"
- id="svg4363"
- sodipodi:version="0.32"
- inkscape:version="0.48.3.1 r9886"
- version="1.0"
- sodipodi:docname="openlp-website-logo.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-filename="/home/raoul/Projects/OpenLP/bug-1069109/resources/images/openlp-about-logo.png"
- inkscape:export-xdpi="91.058823"
- inkscape:export-ydpi="91.058823">
- <defs
- id="defs4365">
- <linearGradient
- id="linearGradient4043">
- <stop
- id="stop4045"
- offset="0"
- style="stop-color:#000d26;stop-opacity:1;" />
- <stop
- id="stop4047"
- offset="1"
- style="stop-color:#77a5ff;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- id="linearGradient3208">
- <stop
- style="stop-color:#ffffff;stop-opacity:0.25098041;"
- offset="0"
- id="stop3210" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop3212" />
- </linearGradient>
- <linearGradient
- id="linearGradient6359">
- <stop
- style="stop-color:#000d26;stop-opacity:1;"
- offset="0"
- id="stop6361" />
- <stop
- style="stop-color:#507fda;stop-opacity:1;"
- offset="1"
- id="stop6363" />
- </linearGradient>
- <linearGradient
- id="linearGradient3195">
- <stop
- style="stop-color:#cdcdff;stop-opacity:1;"
- offset="0"
- id="stop3197" />
- <stop
- style="stop-color:#ebebff;stop-opacity:1;"
- offset="1"
- id="stop3199" />
- </linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective4371" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient4437"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.12702,0,0,0.1374728,-18.124431,2.9208725)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient4440"
- gradientUnits="userSpaceOnUse"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938"
- gradientTransform="matrix(0.1142015,0,0,0.1142015,-11.580885,2.363006)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient4445"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <filter
- inkscape:collect="always"
- id="filter4956">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="10.731562"
- id="feGaussianBlur4958" />
- </filter>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient4967"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <filter
- inkscape:collect="always"
- id="filter5019">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="4.333215"
- id="feGaussianBlur5021" />
- </filter>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient4027"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.12702,0,0,0.1374728,-16.124431,1.0651835)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient4030"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.1142015,0,0,0.1142015,-9.580885,0.507317)"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4043"
- id="linearGradient4082"
- x1="903.01746"
- y1="1155.8621"
- x2="903.01746"
- y2="1010.8456"
- gradientUnits="userSpaceOnUse" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="4"
- inkscape:cx="184.78458"
- inkscape:cy="42.5"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="1600"
- inkscape:window-height="845"
- inkscape:window-x="-4"
- inkscape:window-y="-3"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata4368">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- transform="matrix(0.1118197,0,0,0.1118197,-8.786549,-1.2232712)"
- d="m 833.03006,395.26932 a 357.71872,357.71872 0 1 1 -715.43744,0 357.71872,357.71872 0 1 1 715.43744,0 z"
- sodipodi:ry="357.71872"
- sodipodi:rx="357.71872"
- sodipodi:cy="395.26932"
- sodipodi:cx="475.31134"
- id="path3204"
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter4956)"
- sodipodi:type="arc" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- sodipodi:type="arc"
- style="fill:#051e52;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
- id="path3206"
- sodipodi:cx="475.31134"
- sodipodi:cy="395.26932"
- sodipodi:rx="357.71872"
- sodipodi:ry="357.71872"
- d="m 833.03006,395.26932 a 357.71872,357.71872 0 1 1 -715.43744,0 357.71872,357.71872 0 1 1 715.43744,0 z"
- transform="matrix(0.1118197,0,0,0.1118197,-8.786549,-1.2232712)" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- transform="matrix(0.1107234,0,0,0.1107234,-8.265479,-0.7899487)"
- d="m 833.03006,395.26932 a 357.71872,357.71872 0 1 1 -715.43744,0 357.71872,357.71872 0 1 1 715.43744,0 z"
- sodipodi:ry="357.71872"
- sodipodi:rx="357.71872"
- sodipodi:cy="395.26932"
- sodipodi:cx="475.31134"
- id="path3208"
- style="fill:url(#linearGradient4967);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
- sodipodi:type="arc" />
- <path
- inkscape:connector-curvature="0"
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- id="path3210"
- d="m 44.36148,3.758491 c -6.297077,0 -12.248038,1.4878106 -17.522793,4.1290979 L 55.060733,30.528036 82.41913,52.476137 c 0.757958,-3.042375 1.159859,-6.2242 1.159859,-9.500137 0,-21.647054 -17.570455,-39.2175089 -39.217509,-39.217509 z m -27.440479,11.21316 c -1.397407,1.36948 -2.691129,2.843176 -3.872145,4.407464 L 51.188588,38.186674 79.157249,51.980074 51.306358,35.417288 16.921001,14.971651 z M 7.3459186,29.999854 c -0.6358568,1.811994 -1.1400074,3.684306 -1.5060323,5.60658 l 42.8148557,10.577914 28.5361,7.051943 -28.528962,-9.493 L 7.3459186,29.999854 z M 5.4223371,47.622573 c 0.2287353,1.934542 0.5954569,3.825699 1.0956206,5.663681 l 40.0561763,1.142015 30.40258,0.870786 -29.481831,-3.165522 -42.0725459,-4.51096 z m 72.7356489,9.510844 -31.32333,3.343963 -35.406034,3.779356 c 1.044472,1.612311 2.202222,3.144536 3.465302,4.582335 l 31.005707,-5.738626 32.258355,-5.967028 z m 2.416076,0.913612 -33.01494,10.899106 -23.311381,7.694326 c 5.882638,3.524576 12.76171,5.549478 20.113739,5.549479 16.307671,0 30.301779,-9.969218 36.212582,-24.142911 z"
- style="fill:url(#linearGradient4030);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
- <path
- inkscape:connector-curvature="0"
- id="path3212"
- d="m 44.36148,3.758491 c -6.297077,0 -12.248038,1.4878106 -17.522793,4.1290979 l 28.222046,22.6404471 9.211065,7.390979 C 71.133234,37.064569 77.342848,35.776232 82.579726,34.161072 78.576448,16.75338 62.978175,3.7584911 44.36148,3.758491 z m -27.440479,11.21316 c -1.397407,1.36948 -2.691129,2.843176 -3.872145,4.407464 l 38.139732,18.807559 1.459638,0.720897 c 1.387008,-0.06663 2.75609,-0.150339 4.107685,-0.249815 L 51.306358,35.417288 16.921001,14.971651 z M 7.3459186,29.999854 c -0.4665326,1.329474 -0.862645,2.69238 -1.1848406,4.082704 7.470753,2.334095 16.950926,3.993198 27.508286,4.675124 L 7.3459186,29.999854 z"
- style="fill:url(#linearGradient4027);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
- <g
- id="g4991"
- transform="matrix(0.5913526,0,0,0.5913526,-290.02996,-588.79058)"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.69103849;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter5019)">
- <path
- inkscape:connector-curvature="0"
- id="path4993"
- d="m 801.444,1038.553 15.617,0 c 18.862,0 28.496,10.444 28.496,25.961 0,15.212 -9.634,25.859 -28.496,25.859 l -8.316,0 0,17.139 -7.301,0 0,-68.959 0,0 z m 15.211,45.431 c 15.517,0 21.297,-8.112 21.297,-19.471 0,-11.359 -5.78,-19.471 -21.297,-19.471 l -7.91,0 0,38.941 7.91,0 0,10e-4 z"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.69103849;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- id="path4995"
- d="m 852.858,1038.553 41.984,0 0,6.49 -34.684,0 0,32.35 30.931,0 0,6.389 -30.931,0 0,17.24 36.103,0 0,6.49 -43.403,0 0,-68.959 z"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.69103849;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- id="path4997"
- d="m 913.197,1059.545 c -1.927,-2.333 -4.767,-6.39 -4.767,-6.39 0,0 0.608,4.868 0.608,7.81 l 0,46.547 -6.896,0 0,-69.669 1.217,0 41.173,48.677 c 1.927,2.333 4.259,5.163 4.259,5.163 0,0 0,-3.642 0,-6.582 l 0,-46.548 6.795,0 0,69.669 -1.217,0 -41.172,-48.677 z"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.69103849;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- id="path4999"
- d="m 677.015,1070.032 c 0,-34.836 26.253,-58.564 58.564,-58.564 32.311,0 58.564,23.729 58.564,58.564 0,34.835 -26.253,58.564 -58.564,58.564 -32.311,0 -58.564,-23.728 -58.564,-58.564 z m 110.06,0 c 0,-29.955 -22.045,-52.338 -51.496,-52.338 -29.451,0 -51.496,22.383 -51.496,52.338 0,29.956 22.045,52.338 51.496,52.338 29.451,0 51.496,-22.382 51.496,-52.338 z"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.69103849;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- id="path5001"
- d="m 967.521,1012.814 23.561,0 0,93.737 51.833,0 0,20.699 -75.394,0 0,-114.436 z"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.69103849;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- id="path5003"
- d="m 1054.85,1012.814 31.639,0 c 31.975,0 51.16,16.661 51.16,44.26 0,27.6 -19.354,44.092 -51.16,44.092 l -8.078,0 0,26.085 -23.561,0 0,-114.437 z m 30.965,67.653 c 19.185,0 27.599,-7.741 27.599,-23.393 0,-15.819 -8.751,-23.561 -27.599,-23.561 l -7.405,0 0,46.953 7.405,0 0,0 z"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.69103849;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- style="fill:url(#linearGradient4082);fill-opacity:1.0;stroke:#ffffff;stroke-width:0.84551924000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- transform="matrix(0.5913526,0,0,0.5913526,-290.02996,-590.79058)"
- id="g5005"
- inkscape:export-xdpi="76.235291"
- inkscape:export-ydpi="76.235291">
- <path
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient4082);fill-opacity:1.0;stroke:#ffffff;stroke-width:0.84551924000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 801.444,1038.553 15.617,0 c 18.862,0 28.496,10.444 28.496,25.961 0,15.212 -9.634,25.859 -28.496,25.859 l -8.316,0 0,17.139 -7.301,0 0,-68.959 0,0 z m 15.211,45.431 c 15.517,0 21.297,-8.112 21.297,-19.471 0,-11.359 -5.78,-19.471 -21.297,-19.471 l -7.91,0 0,38.941 7.91,0 0,10e-4 z"
- id="path5007" />
- <path
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient4082);fill-opacity:1.0;stroke:#ffffff;stroke-width:0.84551924000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 852.858,1038.553 41.984,0 0,6.49 -34.684,0 0,32.35 30.931,0 0,6.389 -30.931,0 0,17.24 36.103,0 0,6.49 -43.403,0 0,-68.959 z"
- id="path5009" />
- <path
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient4082);fill-opacity:1.0;stroke:#ffffff;stroke-width:0.84551924000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 913.197,1059.545 c -1.927,-2.333 -4.767,-6.39 -4.767,-6.39 0,0 0.608,4.868 0.608,7.81 l 0,46.547 -6.896,0 0,-69.669 1.217,0 41.173,48.677 c 1.927,2.333 4.259,5.163 4.259,5.163 0,0 0,-3.642 0,-6.582 l 0,-46.548 6.795,0 0,69.669 -1.217,0 -41.172,-48.677 z"
- id="path5011" />
- <path
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient4082);fill-opacity:1.0;stroke:#ffffff;stroke-width:0.84551924000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 677.015,1070.032 c 0,-34.836 26.253,-58.564 58.564,-58.564 32.311,0 58.564,23.729 58.564,58.564 0,34.835 -26.253,58.564 -58.564,58.564 -32.311,0 -58.564,-23.728 -58.564,-58.564 z m 110.06,0 c 0,-29.955 -22.045,-52.338 -51.496,-52.338 -29.451,0 -51.496,22.383 -51.496,52.338 0,29.956 22.045,52.338 51.496,52.338 29.451,0 51.496,-22.382 51.496,-52.338 z"
- id="path5013" />
- <path
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient4082);fill-opacity:1.0;stroke:#ffffff;stroke-width:0.84551924000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 967.521,1012.814 23.561,0 0,93.737 51.833,0 0,20.699 -75.394,0 0,-114.436 z"
- id="path5015" />
- <path
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient4082);fill-opacity:1.0;stroke:#ffffff;stroke-width:0.84551924000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 1054.85,1012.814 31.639,0 c 31.975,0 51.16,16.661 51.16,44.26 0,27.6 -19.354,44.092 -51.16,44.092 l -8.078,0 0,26.085 -23.561,0 0,-114.437 z m 30.965,67.653 c 19.185,0 27.599,-7.741 27.599,-23.393 0,-15.819 -8.751,-23.561 -27.599,-23.561 l -7.405,0 0,46.953 7.405,0 0,0 z"
- id="path5017" />
- </g>
- </g>
-</svg>
=== removed file 'resources/images/openlp-default-dualdisplay.svg'
--- resources/images/openlp-default-dualdisplay.svg 2010-09-14 18:18:47 +0000
+++ resources/images/openlp-default-dualdisplay.svg 1970-01-01 00:00:00 +0000
@@ -1,489 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:xlink="http://www.w3.org/1999/xlink";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="640"
- height="480"
- id="svg3208"
- sodipodi:version="0.32"
- inkscape:version="0.46"
- version="1.0"
- sodipodi:docname="openlp-default-dualdisplay.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs3210">
- <filter
- inkscape:collect="always"
- id="filter4005">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="4.333215"
- id="feGaussianBlur4007" />
- </filter>
- <linearGradient
- id="linearGradient3208">
- <stop
- style="stop-color:#ffffff;stop-opacity:0.25098041;"
- offset="0"
- id="stop3210" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop3212" />
- </linearGradient>
- <linearGradient
- id="linearGradient6359">
- <stop
- style="stop-color:#000d26;stop-opacity:1;"
- offset="0"
- id="stop6361" />
- <stop
- style="stop-color:#507fda;stop-opacity:1;"
- offset="1"
- id="stop6363" />
- </linearGradient>
- <linearGradient
- id="linearGradient3195">
- <stop
- style="stop-color:#cdcdff;stop-opacity:1;"
- offset="0"
- id="stop3197" />
- <stop
- style="stop-color:#ebebff;stop-opacity:1;"
- offset="1"
- id="stop3199" />
- </linearGradient>
- <filter
- inkscape:collect="always"
- id="filter6926">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="3.5771872"
- id="feGaussianBlur6928" />
- </filter>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective3216" />
- <filter
- inkscape:collect="always"
- id="filter4203"
- x="-0.0062387524"
- width="1.0124775"
- y="-0.15678384"
- height="1.3135677">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="1.5096395"
- id="feGaussianBlur4205" />
- </filter>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient4257"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient4284"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.5557126,0,0,0.6014434,52.878388,26.36294)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient4287"
- gradientUnits="userSpaceOnUse"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938"
- gradientTransform="matrix(0.4996316,0,0,0.4996316,81.506404,23.922274)" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.56875"
- inkscape:cx="320"
- inkscape:cy="233.85153"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- width="940px"
- inkscape:window-width="1280"
- inkscape:window-height="958"
- inkscape:window-x="-4"
- inkscape:window-y="-4" />
- <metadata
- id="metadata3213">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g4335">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.00028753;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline;filter:url(#filter6926)"
- id="path3204"
- sodipodi:cx="475.31134"
- sodipodi:cy="395.26932"
- sodipodi:rx="357.71872"
- sodipodi:ry="357.71872"
- d="M 833.03006,395.26932 A 357.71872,357.71872 0 1 1 117.59262,395.26932 A 357.71872,357.71872 0 1 1 833.03006,395.26932 z"
- transform="matrix(0.4892111,0,0,0.4892111,84.981623,16.35095)"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- transform="matrix(0.4892111,0,0,0.4892111,84.981623,16.35095)"
- d="M 833.03006,395.26932 A 357.71872,357.71872 0 1 1 117.59262,395.26932 A 357.71872,357.71872 0 1 1 833.03006,395.26932 z"
- sodipodi:ry="357.71872"
- sodipodi:rx="357.71872"
- sodipodi:cy="395.26932"
- sodipodi:cx="475.31134"
- id="path3206"
- style="fill:#051e52;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.00028753;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- sodipodi:type="arc"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- sodipodi:type="arc"
- style="fill:url(#linearGradient4257);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.00028753;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- id="path3208"
- sodipodi:cx="475.31134"
- sodipodi:cy="395.26932"
- sodipodi:rx="357.71872"
- sodipodi:ry="357.71872"
- d="M 833.03006,395.26932 A 357.71872,357.71872 0 1 1 117.59262,395.26932 A 357.71872,357.71872 0 1 1 833.03006,395.26932 z"
- transform="matrix(0.4844149,0,0,0.4844149,87.261306,18.246736)"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:url(#linearGradient4287);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- d="M 317.50427,38.146161 C 289.95456,38.146161 263.9191,44.655333 240.84204,56.210966 L 364.3135,155.26293 L 484.0065,251.28588 C 487.32257,237.97549 489.08088,224.055 489.08088,209.72278 C 489.08088,115.01691 412.21014,38.146162 317.50427,38.146161 z M 197.45216,87.203739 C 191.33851,93.195216 185.67847,99.642637 180.51153,106.4864 L 347.37287,188.76948 L 469.73577,249.1156 L 347.88811,176.65341 L 197.45216,87.203739 z M 155.56118,152.95213 C 152.7793,160.87961 150.57364,169.07097 148.97228,177.48092 L 336.28729,223.7593 L 461.13274,254.61155 L 336.31852,213.07968 L 155.56118,152.95213 z M 147.14551,230.05154 C 148.14622,238.51516 149.75063,246.78897 151.93885,254.83014 L 327.18463,259.82646 L 460.19593,263.63615 L 331.21291,249.78698 L 147.14551,230.05154 z M 465.36399,271.66148 L 328.32441,286.29132 L 173.423,302.826 C 177.99257,309.87987 183.05773,316.58335 188.5837,322.87372 L 324.23368,297.76723 L 465.36399,271.66148 z M 475.93433,275.65853 L 331.49395,323.34212 L 229.50665,357.0048 C 255.2432,372.42482 285.33914,381.28377 317.50427,381.28378 C 388.85034,381.28378 450.07456,337.66845 475.93433,275.65853 z"
- id="path3210"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:url(#linearGradient4284);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.80000019;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
- d="M 317.50427,38.146161 C 289.95456,38.146161 263.9191,44.655333 240.84204,56.210966 L 364.3135,155.26293 L 404.61191,187.59846 C 434.6307,183.86026 461.79776,178.22379 484.70911,171.15746 C 467.19476,94.998806 398.95232,38.146162 317.50427,38.146161 z M 197.45216,87.203739 C 191.33851,93.195216 185.67847,99.642637 180.51153,106.4864 L 347.37287,188.76948 L 353.75879,191.9234 C 359.82695,191.63189 365.81668,191.26566 371.72991,190.83046 L 347.88811,176.65341 L 197.45216,87.203739 z M 155.56118,152.95213 C 153.5201,158.76858 151.7871,164.73129 150.3775,170.81396 C 183.06204,181.02563 224.53781,188.28421 270.72626,191.26763 L 155.56118,152.95213 z"
- id="path3212" />
- <g
- style="fill:#ffffff;fill-opacity:1;filter:url(#filter4005)"
- id="g2762"
- transform="matrix(0.6503605,0,0,0.6503605,-272.58365,-486.18544)">
- <path
- style="fill:#ffffff;fill-opacity:1"
- id="path2764"
- d="M 801.444,1038.553 L 817.061,1038.553 C 835.923,1038.553 845.557,1048.997 845.557,1064.514 C 845.557,1079.726 835.923,1090.373 817.061,1090.373 L 808.745,1090.373 L 808.745,1107.512 L 801.444,1107.512 L 801.444,1038.553 L 801.444,1038.553 z M 816.655,1083.984 C 832.172,1083.984 837.952,1075.872 837.952,1064.513 C 837.952,1053.154 832.172,1045.042 816.655,1045.042 L 808.745,1045.042 L 808.745,1083.983 L 816.655,1083.983 L 816.655,1083.984 z" />
- <path
- style="fill:#ffffff;fill-opacity:1"
- id="path2766"
- d="M 852.858,1038.553 L 894.842,1038.553 L 894.842,1045.043 L 860.158,1045.043 L 860.158,1077.393 L 891.089,1077.393 L 891.089,1083.782 L 860.158,1083.782 L 860.158,1101.022 L 896.261,1101.022 L 896.261,1107.512 L 852.858,1107.512 L 852.858,1038.553 z" />
- <path
- style="fill:#ffffff;fill-opacity:1"
- id="path2768"
- d="M 913.197,1059.545 C 911.27,1057.212 908.43,1053.155 908.43,1053.155 C 908.43,1053.155 909.038,1058.023 909.038,1060.965 L 909.038,1107.512 L 902.142,1107.512 L 902.142,1037.843 L 903.359,1037.843 L 944.532,1086.52 C 946.459,1088.853 948.791,1091.683 948.791,1091.683 C 948.791,1091.683 948.791,1088.041 948.791,1085.101 L 948.791,1038.553 L 955.586,1038.553 L 955.586,1108.222 L 954.369,1108.222 L 913.197,1059.545 z" />
- <path
- style="fill:#ffffff;fill-opacity:1"
- id="path2770"
- d="M 677.015,1070.032 C 677.015,1035.196 703.268,1011.468 735.579,1011.468 C 767.89,1011.468 794.143,1035.197 794.143,1070.032 C 794.143,1104.867 767.89,1128.596 735.579,1128.596 C 703.268,1128.596 677.015,1104.868 677.015,1070.032 z M 787.075,1070.032 C 787.075,1040.077 765.03,1017.694 735.579,1017.694 C 706.128,1017.694 684.083,1040.077 684.083,1070.032 C 684.083,1099.988 706.128,1122.37 735.579,1122.37 C 765.03,1122.37 787.075,1099.988 787.075,1070.032 z" />
- <path
- style="fill:#ffffff;fill-opacity:1"
- id="path2772"
- d="M 967.521,1012.814 L 991.082,1012.814 L 991.082,1106.551 L 1042.915,1106.551 L 1042.915,1127.25 L 967.521,1127.25 L 967.521,1012.814 z" />
- <path
- style="fill:#ffffff;fill-opacity:1"
- id="path2774"
- d="M 1054.85,1012.814 L 1086.489,1012.814 C 1118.464,1012.814 1137.649,1029.475 1137.649,1057.074 C 1137.649,1084.674 1118.295,1101.166 1086.489,1101.166 L 1078.411,1101.166 L 1078.411,1127.251 L 1054.85,1127.251 L 1054.85,1012.814 z M 1085.815,1080.467 C 1105,1080.467 1113.414,1072.726 1113.414,1057.074 C 1113.414,1041.255 1104.663,1033.513 1085.815,1033.513 L 1078.41,1033.513 L 1078.41,1080.466 L 1085.815,1080.466 L 1085.815,1080.467 z" />
- </g>
- <g
- style="fill:#000d26;fill-opacity:1"
- transform="matrix(0.6503605,0,0,0.6503605,-272.58365,-486.18544)"
- id="g3221">
- <path
- style="fill:#000d26;fill-opacity:1"
- d="M 801.444,1038.553 L 817.061,1038.553 C 835.923,1038.553 845.557,1048.997 845.557,1064.514 C 845.557,1079.726 835.923,1090.373 817.061,1090.373 L 808.745,1090.373 L 808.745,1107.512 L 801.444,1107.512 L 801.444,1038.553 L 801.444,1038.553 z M 816.655,1083.984 C 832.172,1083.984 837.952,1075.872 837.952,1064.513 C 837.952,1053.154 832.172,1045.042 816.655,1045.042 L 808.745,1045.042 L 808.745,1083.983 L 816.655,1083.983 L 816.655,1083.984 z"
- id="path3223" />
- <path
- style="fill:#000d26;fill-opacity:1"
- d="M 852.858,1038.553 L 894.842,1038.553 L 894.842,1045.043 L 860.158,1045.043 L 860.158,1077.393 L 891.089,1077.393 L 891.089,1083.782 L 860.158,1083.782 L 860.158,1101.022 L 896.261,1101.022 L 896.261,1107.512 L 852.858,1107.512 L 852.858,1038.553 z"
- id="path3225" />
- <path
- style="fill:#000d26;fill-opacity:1"
- d="M 913.197,1059.545 C 911.27,1057.212 908.43,1053.155 908.43,1053.155 C 908.43,1053.155 909.038,1058.023 909.038,1060.965 L 909.038,1107.512 L 902.142,1107.512 L 902.142,1037.843 L 903.359,1037.843 L 944.532,1086.52 C 946.459,1088.853 948.791,1091.683 948.791,1091.683 C 948.791,1091.683 948.791,1088.041 948.791,1085.101 L 948.791,1038.553 L 955.586,1038.553 L 955.586,1108.222 L 954.369,1108.222 L 913.197,1059.545 z"
- id="path3227" />
- <path
- style="fill:#000d26;fill-opacity:1"
- d="M 677.015,1070.032 C 677.015,1035.196 703.268,1011.468 735.579,1011.468 C 767.89,1011.468 794.143,1035.197 794.143,1070.032 C 794.143,1104.867 767.89,1128.596 735.579,1128.596 C 703.268,1128.596 677.015,1104.868 677.015,1070.032 z M 787.075,1070.032 C 787.075,1040.077 765.03,1017.694 735.579,1017.694 C 706.128,1017.694 684.083,1040.077 684.083,1070.032 C 684.083,1099.988 706.128,1122.37 735.579,1122.37 C 765.03,1122.37 787.075,1099.988 787.075,1070.032 z"
- id="path3229" />
- <path
- style="fill:#000d26;fill-opacity:1"
- d="M 967.521,1012.814 L 991.082,1012.814 L 991.082,1106.551 L 1042.915,1106.551 L 1042.915,1127.25 L 967.521,1127.25 L 967.521,1012.814 z"
- id="path3335" />
- <path
- style="fill:#000d26;fill-opacity:1"
- d="M 1054.85,1012.814 L 1086.489,1012.814 C 1118.464,1012.814 1137.649,1029.475 1137.649,1057.074 C 1137.649,1084.674 1118.295,1101.166 1086.489,1101.166 L 1078.411,1101.166 L 1078.411,1127.251 L 1054.85,1127.251 L 1054.85,1012.814 z M 1085.815,1080.467 C 1105,1080.467 1113.414,1072.726 1113.414,1057.074 C 1113.414,1041.255 1104.663,1033.513 1085.815,1033.513 L 1078.41,1033.513 L 1078.41,1080.466 L 1085.815,1080.466 L 1085.815,1080.467 z"
- id="path3337" />
- </g>
- </g>
- <g
- id="g4356">
- <g
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1;filter:url(#filter4203)"
- transform="translate(4.4621514,71.394422)"
- id="g3339">
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3025"
- d="M 22.673731,370.71529 C 22.673731,364.06085 27.839035,359.16086 34.328304,359.16086 C 40.81705,359.16086 45.981829,364.06085 45.981829,370.71529 C 45.981829,377.36973 40.81705,382.26971 34.328304,382.26971 C 27.839035,382.26971 22.673731,377.37025 22.673731,370.71529 z M 41.214502,370.71529 C 41.214502,366.51058 38.433386,363.29898 34.328304,363.29898 C 30.222698,363.29898 27.441583,366.51058 27.441583,370.71529 C 27.441583,374.91999 30.222698,378.1316 34.328304,378.1316 C 38.433386,378.1316 41.214502,374.91999 41.214502,370.71529 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3027"
- d="M 49.922267,359.45869 L 56.146219,359.45869 C 62.436763,359.45869 66.21046,362.73583 66.21046,368.16541 C 66.21046,373.59498 62.403205,376.83961 56.146219,376.83961 L 54.556936,376.83961 L 54.556936,381.97136 L 49.922267,381.97136 L 49.922267,359.45869 z M 56.013561,372.76809 C 59.787782,372.76809 61.443133,371.2454 61.443133,368.16593 C 61.443133,365.05343 59.721715,363.53074 56.013561,363.53074 L 54.556936,363.53074 L 54.556936,372.76809 L 56.013561,372.76809 L 56.013561,372.76809 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3013"
- d="M 70.150962,359.45843 L 85.049122,359.45843 L 85.049122,363.53048 L 74.785631,363.53048 L 74.785631,370.68199 L 83.824257,370.68199 L 83.824257,374.65494 L 74.785631,374.65494 L 74.785631,377.89957 L 85.512641,377.89957 L 85.512641,381.97162 L 70.150962,381.97162 L 70.150962,359.45843 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3015"
- d="M 209.80292,381.97162 L 204.43941,381.97162 L 200.73126,376.27726 C 200.3013,376.34332 199.83778,376.37636 199.40729,376.37636 L 197.81801,376.37636 L 197.81801,381.97162 L 193.18334,381.97162 L 193.18334,359.45843 L 199.40729,359.45843 C 205.69784,359.45843 209.47153,362.4713 209.47153,367.96694 C 209.47153,371.47637 207.91581,373.69487 205.13469,374.95277 L 209.80292,381.97162 z M 199.27463,372.33734 C 203.04886,372.33734 204.70421,371.14604 204.70421,367.96694 C 204.70421,364.7889 202.98279,363.53048 199.27463,363.53048 L 197.81801,363.53048 L 197.81801,372.33734 L 199.27463,372.33734 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3017"
- d="M 534.09128,363.53048 L 527.6686,363.53048 L 527.6686,359.45843 L 545.14968,359.45843 L 545.14968,363.53048 L 538.72647,363.53048 L 538.72647,381.97162 L 534.09128,381.97162 L 534.09128,363.53048 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3019"
- d="M 295.01444,374.82011 L 286.47289,359.45843 L 291.60463,359.45843 L 295.57706,366.70904 C 296.43803,368.2978 297.3981,370.97982 297.3981,370.97982 C 297.3981,370.97982 298.2921,368.33136 299.15308,366.70904 L 302.96086,359.45843 L 307.69462,359.45843 L 299.68319,374.48925 L 299.68319,381.97162 L 295.01496,381.97162 L 295.01496,374.82011 L 295.01444,374.82011 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3021"
- d="M 171.03352,373.67756 L 171.03352,359.30951 L 175.66819,359.30951 L 175.66819,373.41329 C 175.66819,376.69044 177.0923,377.94834 180.17124,377.94834 C 183.21715,377.94834 184.60771,376.69044 184.60771,373.41329 L 184.60771,359.30951 L 189.2429,359.30951 L 189.2429,373.67756 C 189.2429,379.37193 185.30247,382.12054 180.17124,382.12054 C 174.97291,382.12001 171.03352,379.37193 171.03352,373.67756 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3023"
- d="M 332.19508,359.45843 L 336.82975,359.45843 L 336.82975,381.97162 L 332.19508,381.97162 L 332.19508,359.45843 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3031"
- d="M 123.72152,377.51864 L 127.49574,375.3337 C 128.48885,376.95602 129.77978,378.14785 132.06434,378.14785 C 133.98448,378.14785 135.20987,377.18778 135.20987,375.86329 C 135.20987,374.27453 133.95198,373.71138 131.83311,372.78435 L 130.67431,372.28779 C 127.33005,370.8642 125.11208,369.07672 125.11208,365.30249 C 125.11208,361.8261 127.76106,359.17712 131.89917,359.17712 C 134.84546,359.17712 136.96433,360.20378 138.48754,362.88527 L 134.87849,365.20287 C 134.08359,363.77928 133.22314,363.21666 131.89865,363.21666 C 130.54112,363.21666 129.68068,364.07763 129.68068,365.20287 C 129.68068,366.59343 130.54165,367.15657 132.52786,368.01702 L 133.68666,368.51357 C 137.62657,370.20196 139.84454,371.92337 139.84454,375.79722 C 139.84454,379.96889 136.5674,382.25293 132.16397,382.25293 C 127.86016,382.25293 125.07904,380.20013 123.72152,377.51864 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3041"
- d="M 465.62309,377.8828 L 469.39678,375.59876 C 470.12562,376.88969 470.78734,377.98242 472.37663,377.98242 C 473.89984,377.98242 474.85991,377.38624 474.85991,375.06865 L 474.85991,359.30951 L 479.49511,359.30951 L 479.49511,375.13471 C 479.49511,379.9356 476.68096,382.12054 472.57535,382.12054 C 468.8672,382.12054 466.71529,380.20039 465.62309,377.8828 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3045"
- d="M 269.79773,359.45843 L 274.4324,359.45843 L 274.4324,377.89905 L 284.62982,377.89905 L 284.62982,381.97162 L 269.79773,381.97162 L 269.79773,359.45843 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3051"
- d="M 213.74336,370.69825 C 213.74336,364.04381 218.87458,359.17686 225.33082,359.17686 C 229.40339,359.17686 232.31664,360.63296 234.33641,363.77849 L 230.79342,366.29481 C 229.73372,364.57287 227.9132,363.34801 225.33082,363.34801 C 221.25824,363.34801 218.51068,366.49354 218.51068,370.69825 C 218.51068,374.90295 221.25824,378.11455 225.33082,378.11455 C 228.24459,378.11455 229.86638,376.724 231.12481,374.80385 L 234.73386,377.28662 C 232.78016,380.33305 229.66818,382.25319 225.33082,382.25319 C 218.8751,382.25267 213.74336,377.35321 213.74336,370.69825 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3057"
- d="M 96.140027,371.50967 C 95.014786,370.44997 93.458536,368.43072 93.458536,368.43072 C 93.458536,368.43072 93.789921,370.91349 93.789921,372.53581 L 93.789921,381.97136 L 89.45308,381.97136 L 89.45308,359.25996 L 89.916599,359.25996 L 101.2723,369.92038 C 102.36503,370.94652 103.92075,372.99933 103.92075,372.99933 C 103.92075,372.99933 103.62293,370.45049 103.62293,368.89424 L 103.62293,359.45869 L 107.95977,359.45869 L 107.95977,382.17009 L 107.49625,382.17009 L 96.140027,371.50967 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- d="M 143.78498,370.71503 C 143.78498,364.06059 148.95028,359.1606 155.43955,359.1606 C 161.9283,359.1606 167.09308,364.06059 167.09308,370.71503 C 167.09308,377.36946 161.9283,382.26945 155.43955,382.26945 C 148.95028,382.26945 143.78498,377.36999 143.78498,370.71503 z M 162.32575,370.71503 C 162.32575,366.51032 159.54464,363.29872 155.43955,363.29872 C 151.33395,363.29872 148.55283,366.51032 148.55283,370.71503 C 148.55283,374.91973 151.33395,378.13133 155.43955,378.13133 C 159.54464,378.13133 162.32575,374.91973 162.32575,370.71503 z"
- id="path3231" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- d="M 238.6743,359.45843 L 253.57246,359.45843 L 253.57246,363.53048 L 243.30897,363.53048 L 243.30897,370.68199 L 252.34759,370.68199 L 252.34759,374.65494 L 243.30897,374.65494 L 243.30897,377.89957 L 254.03598,377.89957 L 254.03598,381.97162 L 238.6743,381.97162 L 238.6743,359.45843 z"
- id="path3233" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- d="M 328.25464,381.97162 L 322.89114,381.97162 L 319.18298,376.27726 C 318.75302,376.34332 318.2895,376.37636 317.85901,376.37636 L 316.26973,376.37636 L 316.26973,381.97162 L 311.63506,381.97162 L 311.63506,359.45843 L 317.85901,359.45843 C 324.14956,359.45843 327.92326,362.4713 327.92326,367.96694 C 327.92326,371.47637 326.36753,373.69487 323.58641,374.95277 L 328.25464,381.97162 z M 317.72636,372.33734 C 321.50058,372.33734 323.15593,371.14604 323.15593,367.96694 C 323.15593,364.7889 321.43451,363.53048 317.72636,363.53048 L 316.26973,363.53048 L 316.26973,372.33734 L 317.72636,372.33734 z"
- id="path3235" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- d="M 365.70113,377.51864 L 369.47535,375.3337 C 370.46845,376.95602 371.75938,378.14785 374.04395,378.14785 C 375.96409,378.14785 377.18948,377.18778 377.18948,375.86329 C 377.18948,374.27453 375.93158,373.71138 373.81271,372.78435 L 372.65391,372.28779 C 369.30965,370.8642 367.09168,369.07672 367.09168,365.30249 C 367.09168,361.8261 369.74066,359.17712 373.87878,359.17712 C 376.82506,359.17712 378.94393,360.20378 380.46715,362.88527 L 376.8581,365.20287 C 376.06319,363.77928 375.20275,363.21666 373.87826,363.21666 C 372.52073,363.21666 371.66028,364.07763 371.66028,365.20287 C 371.66028,366.59343 372.52126,367.15657 374.50747,368.01702 L 375.66627,368.51357 C 379.60618,370.20196 381.82415,371.92337 381.82415,375.79722 C 381.82415,379.96889 378.54701,382.25293 374.14357,382.25293 C 369.83976,382.25293 367.05865,380.20013 365.70113,377.51864 z"
- id="path3237" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- d="M 340.77019,370.69825 C 340.77019,364.04381 345.90141,359.17686 352.35764,359.17686 C 356.43022,359.17686 359.34347,360.63296 361.36323,363.77849 L 357.82025,366.29481 C 356.76055,364.57287 354.94003,363.34801 352.35764,363.34801 C 348.28507,363.34801 345.53751,366.49354 345.53751,370.69825 C 345.53751,374.90295 348.28507,378.11455 352.35764,378.11455 C 355.27142,378.11455 356.89321,376.724 358.15163,374.80385 L 361.76069,377.28662 C 359.80698,380.33305 356.69501,382.25319 352.35764,382.25319 C 345.90193,382.25267 340.77019,377.35321 340.77019,370.69825 z"
- id="path3239" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- d="M 397.5859,359.45869 L 403.80985,359.45869 C 410.1004,359.45869 413.8741,362.73583 413.8741,368.16541 C 413.8741,373.59498 410.06684,376.83961 403.80985,376.83961 L 402.22057,376.83961 L 402.22057,381.97136 L 397.5859,381.97136 L 397.5859,359.45869 z M 403.6772,372.76809 C 407.45142,372.76809 409.10677,371.2454 409.10677,368.16593 C 409.10677,365.05343 407.38535,363.53074 403.6772,363.53074 L 402.22057,363.53074 L 402.22057,372.76809 L 403.6772,372.76809 L 403.6772,372.76809 z"
- id="path3241" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- d="M 483.43554,359.45843 L 498.33371,359.45843 L 498.33371,363.53048 L 488.07021,363.53048 L 488.07021,370.68199 L 497.10884,370.68199 L 497.10884,374.65494 L 488.07021,374.65494 L 488.07021,377.89957 L 498.79723,377.89957 L 498.79723,381.97162 L 483.43554,381.97162 L 483.43554,359.45843 z"
- id="path3243" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- d="M 434.43411,381.97162 L 429.07061,381.97162 L 425.36245,376.27726 C 424.93249,376.34332 424.46897,376.37636 424.03849,376.37636 L 422.4492,376.37636 L 422.4492,381.97162 L 417.81453,381.97162 L 417.81453,359.45843 L 424.03849,359.45843 C 430.32903,359.45843 434.10273,362.4713 434.10273,367.96694 C 434.10273,371.47637 432.547,373.69487 429.76589,374.95277 L 434.43411,381.97162 z M 423.90583,372.33734 C 427.68005,372.33734 429.3354,371.14604 429.3354,367.96694 C 429.3354,364.7889 427.61398,363.53048 423.90583,363.53048 L 422.4492,363.53048 L 422.4492,372.33734 L 423.90583,372.33734 z"
- id="path3245" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- d="M 549.09011,359.45843 L 553.72478,359.45843 L 553.72478,381.97162 L 549.09011,381.97162 L 549.09011,359.45843 z"
- id="path3247" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- d="M 502.73766,370.69825 C 502.73766,364.04381 507.86888,359.17686 514.32512,359.17686 C 518.39769,359.17686 521.31094,360.63296 523.33071,363.77849 L 519.78773,366.29481 C 518.72803,364.57287 516.90751,363.34801 514.32512,363.34801 C 510.25255,363.34801 507.50499,366.49354 507.50499,370.69825 C 507.50499,374.90295 510.25255,378.11455 514.32512,378.11455 C 517.23889,378.11455 518.86069,376.724 520.11911,374.80385 L 523.72816,377.28662 C 521.77446,380.33305 518.66249,382.25319 514.32512,382.25319 C 507.86941,382.25267 502.73766,377.35321 502.73766,370.69825 z"
- id="path3249" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- d="M 591.6007,371.50967 C 590.47546,370.44997 588.91921,368.43072 588.91921,368.43072 C 588.91921,368.43072 589.2506,370.91349 589.2506,372.53581 L 589.2506,381.97136 L 584.91376,381.97136 L 584.91376,359.25996 L 585.37728,359.25996 L 596.73297,369.92038 C 597.8257,370.94652 599.38143,372.99933 599.38143,372.99933 C 599.38143,372.99933 599.0836,370.45049 599.0836,368.89424 L 599.0836,359.45869 L 603.42044,359.45869 L 603.42044,382.17009 L 602.95693,382.17009 L 591.6007,371.50967 z"
- id="path3251" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- id="path3253"
- d="M 438.37455,370.71503 C 438.37455,364.06059 443.53985,359.1606 450.02912,359.1606 C 456.51787,359.1606 461.68265,364.06059 461.68265,370.71503 C 461.68265,377.36946 456.51787,382.26945 450.02912,382.26945 C 443.53985,382.26945 438.37455,377.36999 438.37455,370.71503 z M 456.91532,370.71503 C 456.91532,366.51032 454.13421,363.29872 450.02912,363.29872 C 445.92352,363.29872 443.1424,366.51032 443.1424,370.71503 C 443.1424,374.91973 445.92352,378.13133 450.02912,378.13133 C 454.13421,378.13133 456.91532,374.91973 456.91532,370.71503 z" />
- <path
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
- d="M 557.66522,370.71503 C 557.66522,364.06059 562.83052,359.1606 569.31979,359.1606 C 575.80854,359.1606 580.97332,364.06059 580.97332,370.71503 C 580.97332,377.36946 575.80854,382.26945 569.31979,382.26945 C 562.83052,382.26945 557.66522,377.36999 557.66522,370.71503 z M 576.20599,370.71503 C 576.20599,366.51032 573.42488,363.29872 569.31979,363.29872 C 565.21419,363.29872 562.43307,366.51032 562.43307,370.71503 C 562.43307,374.91973 565.21419,378.13133 569.31979,378.13133 C 573.42488,378.13133 576.20599,374.91973 576.20599,370.71503 z"
- id="path3255" />
- </g>
- <g
- id="g4137"
- transform="translate(4.4621514,71.394422)"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1">
- <path
- d="M 22.673731,370.71529 C 22.673731,364.06085 27.839035,359.16086 34.328304,359.16086 C 40.81705,359.16086 45.981829,364.06085 45.981829,370.71529 C 45.981829,377.36973 40.81705,382.26971 34.328304,382.26971 C 27.839035,382.26971 22.673731,377.37025 22.673731,370.71529 z M 41.214502,370.71529 C 41.214502,366.51058 38.433386,363.29898 34.328304,363.29898 C 30.222698,363.29898 27.441583,366.51058 27.441583,370.71529 C 27.441583,374.91999 30.222698,378.1316 34.328304,378.1316 C 38.433386,378.1316 41.214502,374.91999 41.214502,370.71529 z"
- id="path4139"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 49.922267,359.45869 L 56.146219,359.45869 C 62.436763,359.45869 66.21046,362.73583 66.21046,368.16541 C 66.21046,373.59498 62.403205,376.83961 56.146219,376.83961 L 54.556936,376.83961 L 54.556936,381.97136 L 49.922267,381.97136 L 49.922267,359.45869 z M 56.013561,372.76809 C 59.787782,372.76809 61.443133,371.2454 61.443133,368.16593 C 61.443133,365.05343 59.721715,363.53074 56.013561,363.53074 L 54.556936,363.53074 L 54.556936,372.76809 L 56.013561,372.76809 L 56.013561,372.76809 z"
- id="path4141"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 70.150962,359.45843 L 85.049122,359.45843 L 85.049122,363.53048 L 74.785631,363.53048 L 74.785631,370.68199 L 83.824257,370.68199 L 83.824257,374.65494 L 74.785631,374.65494 L 74.785631,377.89957 L 85.512641,377.89957 L 85.512641,381.97162 L 70.150962,381.97162 L 70.150962,359.45843 z"
- id="path4143"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 209.80292,381.97162 L 204.43941,381.97162 L 200.73126,376.27726 C 200.3013,376.34332 199.83778,376.37636 199.40729,376.37636 L 197.81801,376.37636 L 197.81801,381.97162 L 193.18334,381.97162 L 193.18334,359.45843 L 199.40729,359.45843 C 205.69784,359.45843 209.47153,362.4713 209.47153,367.96694 C 209.47153,371.47637 207.91581,373.69487 205.13469,374.95277 L 209.80292,381.97162 z M 199.27463,372.33734 C 203.04886,372.33734 204.70421,371.14604 204.70421,367.96694 C 204.70421,364.7889 202.98279,363.53048 199.27463,363.53048 L 197.81801,363.53048 L 197.81801,372.33734 L 199.27463,372.33734 z"
- id="path4145"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 534.09128,363.53048 L 527.6686,363.53048 L 527.6686,359.45843 L 545.14968,359.45843 L 545.14968,363.53048 L 538.72647,363.53048 L 538.72647,381.97162 L 534.09128,381.97162 L 534.09128,363.53048 z"
- id="path4147"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 295.01444,374.82011 L 286.47289,359.45843 L 291.60463,359.45843 L 295.57706,366.70904 C 296.43803,368.2978 297.3981,370.97982 297.3981,370.97982 C 297.3981,370.97982 298.2921,368.33136 299.15308,366.70904 L 302.96086,359.45843 L 307.69462,359.45843 L 299.68319,374.48925 L 299.68319,381.97162 L 295.01496,381.97162 L 295.01496,374.82011 L 295.01444,374.82011 z"
- id="path4149"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 171.03352,373.67756 L 171.03352,359.30951 L 175.66819,359.30951 L 175.66819,373.41329 C 175.66819,376.69044 177.0923,377.94834 180.17124,377.94834 C 183.21715,377.94834 184.60771,376.69044 184.60771,373.41329 L 184.60771,359.30951 L 189.2429,359.30951 L 189.2429,373.67756 C 189.2429,379.37193 185.30247,382.12054 180.17124,382.12054 C 174.97291,382.12001 171.03352,379.37193 171.03352,373.67756 z"
- id="path4151"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 332.19508,359.45843 L 336.82975,359.45843 L 336.82975,381.97162 L 332.19508,381.97162 L 332.19508,359.45843 z"
- id="path4153"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 123.72152,377.51864 L 127.49574,375.3337 C 128.48885,376.95602 129.77978,378.14785 132.06434,378.14785 C 133.98448,378.14785 135.20987,377.18778 135.20987,375.86329 C 135.20987,374.27453 133.95198,373.71138 131.83311,372.78435 L 130.67431,372.28779 C 127.33005,370.8642 125.11208,369.07672 125.11208,365.30249 C 125.11208,361.8261 127.76106,359.17712 131.89917,359.17712 C 134.84546,359.17712 136.96433,360.20378 138.48754,362.88527 L 134.87849,365.20287 C 134.08359,363.77928 133.22314,363.21666 131.89865,363.21666 C 130.54112,363.21666 129.68068,364.07763 129.68068,365.20287 C 129.68068,366.59343 130.54165,367.15657 132.52786,368.01702 L 133.68666,368.51357 C 137.62657,370.20196 139.84454,371.92337 139.84454,375.79722 C 139.84454,379.96889 136.5674,382.25293 132.16397,382.25293 C 127.86016,382.25293 125.07904,380.20013 123.72152,377.51864 z"
- id="path4155"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 465.62309,377.8828 L 469.39678,375.59876 C 470.12562,376.88969 470.78734,377.98242 472.37663,377.98242 C 473.89984,377.98242 474.85991,377.38624 474.85991,375.06865 L 474.85991,359.30951 L 479.49511,359.30951 L 479.49511,375.13471 C 479.49511,379.9356 476.68096,382.12054 472.57535,382.12054 C 468.8672,382.12054 466.71529,380.20039 465.62309,377.8828 z"
- id="path4157"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 269.79773,359.45843 L 274.4324,359.45843 L 274.4324,377.89905 L 284.62982,377.89905 L 284.62982,381.97162 L 269.79773,381.97162 L 269.79773,359.45843 z"
- id="path4159"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 213.74336,370.69825 C 213.74336,364.04381 218.87458,359.17686 225.33082,359.17686 C 229.40339,359.17686 232.31664,360.63296 234.33641,363.77849 L 230.79342,366.29481 C 229.73372,364.57287 227.9132,363.34801 225.33082,363.34801 C 221.25824,363.34801 218.51068,366.49354 218.51068,370.69825 C 218.51068,374.90295 221.25824,378.11455 225.33082,378.11455 C 228.24459,378.11455 229.86638,376.724 231.12481,374.80385 L 234.73386,377.28662 C 232.78016,380.33305 229.66818,382.25319 225.33082,382.25319 C 218.8751,382.25267 213.74336,377.35321 213.74336,370.69825 z"
- id="path4161"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 96.140027,371.50967 C 95.014786,370.44997 93.458536,368.43072 93.458536,368.43072 C 93.458536,368.43072 93.789921,370.91349 93.789921,372.53581 L 93.789921,381.97136 L 89.45308,381.97136 L 89.45308,359.25996 L 89.916599,359.25996 L 101.2723,369.92038 C 102.36503,370.94652 103.92075,372.99933 103.92075,372.99933 C 103.92075,372.99933 103.62293,370.45049 103.62293,368.89424 L 103.62293,359.45869 L 107.95977,359.45869 L 107.95977,382.17009 L 107.49625,382.17009 L 96.140027,371.50967 z"
- id="path4163"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- id="path4165"
- d="M 143.78498,370.71503 C 143.78498,364.06059 148.95028,359.1606 155.43955,359.1606 C 161.9283,359.1606 167.09308,364.06059 167.09308,370.71503 C 167.09308,377.36946 161.9283,382.26945 155.43955,382.26945 C 148.95028,382.26945 143.78498,377.36999 143.78498,370.71503 z M 162.32575,370.71503 C 162.32575,366.51032 159.54464,363.29872 155.43955,363.29872 C 151.33395,363.29872 148.55283,366.51032 148.55283,370.71503 C 148.55283,374.91973 151.33395,378.13133 155.43955,378.13133 C 159.54464,378.13133 162.32575,374.91973 162.32575,370.71503 z"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- id="path4167"
- d="M 238.6743,359.45843 L 253.57246,359.45843 L 253.57246,363.53048 L 243.30897,363.53048 L 243.30897,370.68199 L 252.34759,370.68199 L 252.34759,374.65494 L 243.30897,374.65494 L 243.30897,377.89957 L 254.03598,377.89957 L 254.03598,381.97162 L 238.6743,381.97162 L 238.6743,359.45843 z"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- id="path4169"
- d="M 328.25464,381.97162 L 322.89114,381.97162 L 319.18298,376.27726 C 318.75302,376.34332 318.2895,376.37636 317.85901,376.37636 L 316.26973,376.37636 L 316.26973,381.97162 L 311.63506,381.97162 L 311.63506,359.45843 L 317.85901,359.45843 C 324.14956,359.45843 327.92326,362.4713 327.92326,367.96694 C 327.92326,371.47637 326.36753,373.69487 323.58641,374.95277 L 328.25464,381.97162 z M 317.72636,372.33734 C 321.50058,372.33734 323.15593,371.14604 323.15593,367.96694 C 323.15593,364.7889 321.43451,363.53048 317.72636,363.53048 L 316.26973,363.53048 L 316.26973,372.33734 L 317.72636,372.33734 z"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- id="path4171"
- d="M 365.70113,377.51864 L 369.47535,375.3337 C 370.46845,376.95602 371.75938,378.14785 374.04395,378.14785 C 375.96409,378.14785 377.18948,377.18778 377.18948,375.86329 C 377.18948,374.27453 375.93158,373.71138 373.81271,372.78435 L 372.65391,372.28779 C 369.30965,370.8642 367.09168,369.07672 367.09168,365.30249 C 367.09168,361.8261 369.74066,359.17712 373.87878,359.17712 C 376.82506,359.17712 378.94393,360.20378 380.46715,362.88527 L 376.8581,365.20287 C 376.06319,363.77928 375.20275,363.21666 373.87826,363.21666 C 372.52073,363.21666 371.66028,364.07763 371.66028,365.20287 C 371.66028,366.59343 372.52126,367.15657 374.50747,368.01702 L 375.66627,368.51357 C 379.60618,370.20196 381.82415,371.92337 381.82415,375.79722 C 381.82415,379.96889 378.54701,382.25293 374.14357,382.25293 C 369.83976,382.25293 367.05865,380.20013 365.70113,377.51864 z"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- id="path4173"
- d="M 340.77019,370.69825 C 340.77019,364.04381 345.90141,359.17686 352.35764,359.17686 C 356.43022,359.17686 359.34347,360.63296 361.36323,363.77849 L 357.82025,366.29481 C 356.76055,364.57287 354.94003,363.34801 352.35764,363.34801 C 348.28507,363.34801 345.53751,366.49354 345.53751,370.69825 C 345.53751,374.90295 348.28507,378.11455 352.35764,378.11455 C 355.27142,378.11455 356.89321,376.724 358.15163,374.80385 L 361.76069,377.28662 C 359.80698,380.33305 356.69501,382.25319 352.35764,382.25319 C 345.90193,382.25267 340.77019,377.35321 340.77019,370.69825 z"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- id="path4175"
- d="M 397.5859,359.45869 L 403.80985,359.45869 C 410.1004,359.45869 413.8741,362.73583 413.8741,368.16541 C 413.8741,373.59498 410.06684,376.83961 403.80985,376.83961 L 402.22057,376.83961 L 402.22057,381.97136 L 397.5859,381.97136 L 397.5859,359.45869 z M 403.6772,372.76809 C 407.45142,372.76809 409.10677,371.2454 409.10677,368.16593 C 409.10677,365.05343 407.38535,363.53074 403.6772,363.53074 L 402.22057,363.53074 L 402.22057,372.76809 L 403.6772,372.76809 L 403.6772,372.76809 z"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- id="path4177"
- d="M 483.43554,359.45843 L 498.33371,359.45843 L 498.33371,363.53048 L 488.07021,363.53048 L 488.07021,370.68199 L 497.10884,370.68199 L 497.10884,374.65494 L 488.07021,374.65494 L 488.07021,377.89957 L 498.79723,377.89957 L 498.79723,381.97162 L 483.43554,381.97162 L 483.43554,359.45843 z"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- id="path4179"
- d="M 434.43411,381.97162 L 429.07061,381.97162 L 425.36245,376.27726 C 424.93249,376.34332 424.46897,376.37636 424.03849,376.37636 L 422.4492,376.37636 L 422.4492,381.97162 L 417.81453,381.97162 L 417.81453,359.45843 L 424.03849,359.45843 C 430.32903,359.45843 434.10273,362.4713 434.10273,367.96694 C 434.10273,371.47637 432.547,373.69487 429.76589,374.95277 L 434.43411,381.97162 z M 423.90583,372.33734 C 427.68005,372.33734 429.3354,371.14604 429.3354,367.96694 C 429.3354,364.7889 427.61398,363.53048 423.90583,363.53048 L 422.4492,363.53048 L 422.4492,372.33734 L 423.90583,372.33734 z"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- id="path4181"
- d="M 549.09011,359.45843 L 553.72478,359.45843 L 553.72478,381.97162 L 549.09011,381.97162 L 549.09011,359.45843 z"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- id="path4183"
- d="M 502.73766,370.69825 C 502.73766,364.04381 507.86888,359.17686 514.32512,359.17686 C 518.39769,359.17686 521.31094,360.63296 523.33071,363.77849 L 519.78773,366.29481 C 518.72803,364.57287 516.90751,363.34801 514.32512,363.34801 C 510.25255,363.34801 507.50499,366.49354 507.50499,370.69825 C 507.50499,374.90295 510.25255,378.11455 514.32512,378.11455 C 517.23889,378.11455 518.86069,376.724 520.11911,374.80385 L 523.72816,377.28662 C 521.77446,380.33305 518.66249,382.25319 514.32512,382.25319 C 507.86941,382.25267 502.73766,377.35321 502.73766,370.69825 z"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- id="path4185"
- d="M 591.6007,371.50967 C 590.47546,370.44997 588.91921,368.43072 588.91921,368.43072 C 588.91921,368.43072 589.2506,370.91349 589.2506,372.53581 L 589.2506,381.97136 L 584.91376,381.97136 L 584.91376,359.25996 L 585.37728,359.25996 L 596.73297,369.92038 C 597.8257,370.94652 599.38143,372.99933 599.38143,372.99933 C 599.38143,372.99933 599.0836,370.45049 599.0836,368.89424 L 599.0836,359.45869 L 603.42044,359.45869 L 603.42044,382.17009 L 602.95693,382.17009 L 591.6007,371.50967 z"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- d="M 438.37455,370.71503 C 438.37455,364.06059 443.53985,359.1606 450.02912,359.1606 C 456.51787,359.1606 461.68265,364.06059 461.68265,370.71503 C 461.68265,377.36946 456.51787,382.26945 450.02912,382.26945 C 443.53985,382.26945 438.37455,377.36999 438.37455,370.71503 z M 456.91532,370.71503 C 456.91532,366.51032 454.13421,363.29872 450.02912,363.29872 C 445.92352,363.29872 443.1424,366.51032 443.1424,370.71503 C 443.1424,374.91973 445.92352,378.13133 450.02912,378.13133 C 454.13421,378.13133 456.91532,374.91973 456.91532,370.71503 z"
- id="path4187"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- <path
- id="path4189"
- d="M 557.66522,370.71503 C 557.66522,364.06059 562.83052,359.1606 569.31979,359.1606 C 575.80854,359.1606 580.97332,364.06059 580.97332,370.71503 C 580.97332,377.36946 575.80854,382.26945 569.31979,382.26945 C 562.83052,382.26945 557.66522,377.36999 557.66522,370.71503 z M 576.20599,370.71503 C 576.20599,366.51032 573.42488,363.29872 569.31979,363.29872 C 565.21419,363.29872 562.43307,366.51032 562.43307,370.71503 C 562.43307,374.91973 565.21419,378.13133 569.31979,378.13133 C 573.42488,378.13133 576.20599,374.91973 576.20599,370.71503 z"
- style="fill:#000d26;fill-opacity:1;stroke:#cdcdff;stroke-opacity:1" />
- </g>
- </g>
- </g>
-</svg>
=== removed file 'resources/images/openlp-logo-256x256.png'
Binary files resources/images/openlp-logo-256x256.png 2010-09-14 18:18:47 +0000 and resources/images/openlp-logo-256x256.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/openlp-logo-420x420.png'
Binary files resources/images/openlp-logo-420x420.png 2010-09-14 18:18:47 +0000 and resources/images/openlp-logo-420x420.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'resources/images/openlp-logo.svg'
--- resources/images/openlp-logo.svg 2010-09-14 18:18:47 +0000
+++ resources/images/openlp-logo.svg 2016-10-30 09:13:09 +0000
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:cc="http://creativecommons.org/ns#";
@@ -8,263 +6,80 @@
xmlns:svg="http://www.w3.org/2000/svg";
xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="467.39178"
+ style="display:inline"
+ version="1.0"
+ id="svg5740"
height="467.39178"
- id="svg5740"
- sodipodi:version="0.32"
- inkscape:version="0.47 r22583"
- version="1.0"
- sodipodi:docname="openlp-logo.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- inkscape:export-xdpi="91.860847"
- inkscape:export-ydpi="91.860847"
- style="display:inline">
+ width="467.39178">
<defs
id="defs5742">
<linearGradient
id="linearGradient3208">
<stop
- style="stop-color:#ffffff;stop-opacity:0.25098041;"
+ id="stop3210"
offset="0"
- id="stop3210" />
+ style="stop-color:#ffffff;stop-opacity:0.25098041;" />
<stop
- style="stop-color:#ffffff;stop-opacity:0;"
+ id="stop3212"
offset="1"
- id="stop3212" />
+ style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient3195">
<stop
- style="stop-color:#cdcdff;stop-opacity:1;"
+ id="stop3197"
offset="0"
- id="stop3197" />
+ style="stop-color:#cdcdff;stop-opacity:1;" />
<stop
- style="stop-color:#ebebff;stop-opacity:1;"
+ id="stop3199"
offset="1"
- id="stop3199" />
+ style="stop-color:#ebebff;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient6359">
<stop
- style="stop-color:#000d26;stop-opacity:1;"
+ id="stop6361"
offset="0"
- id="stop6361" />
+ style="stop-color:#000d26;stop-opacity:1;" />
<stop
- style="stop-color:#507fda;stop-opacity:1;"
+ id="stop6363"
offset="1"
- id="stop6363" />
+ style="stop-color:#507fda;stop-opacity:1;" />
</linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective5748" />
<filter
- inkscape:collect="always"
- id="filter6926"
- color-interpolation-filters="sRGB">
+ color-interpolation-filters="sRGB"
+ id="filter6926">
<feGaussianBlur
- inkscape:collect="always"
- stdDeviation="3.5771872"
- id="feGaussianBlur6928" />
+ id="feGaussianBlur6928"
+ stdDeviation="3.5771872" />
</filter>
<linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3214"
- x1="470.25891"
- y1="276.68851"
- x2="463.2301"
- y2="14.822601"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3229"
- gradientUnits="userSpaceOnUse"
- x1="470.25891"
- y1="276.68851"
- x2="463.2301"
- y2="14.822601" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3279"
- gradientUnits="userSpaceOnUse"
- x1="470.25891"
- y1="276.68851"
- x2="463.2301"
- y2="14.822601" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3287"
- gradientUnits="userSpaceOnUse"
- x1="470.25891"
- y1="276.68851"
- x2="463.2301"
- y2="14.822601"
- gradientTransform="matrix(1.1122448,0,0,1.2037738,-57.29825,4.8849318)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient3196"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient3198"
- gradientUnits="userSpaceOnUse"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3200"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1122448,0,0,1.2037738,-57.29825,4.8849318)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient3215"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient3217"
- gradientUnits="userSpaceOnUse"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3219"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1122448,0,0,1.2037738,-57.29825,4.8849318)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient4010"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.7247086,0,0,0.7843464,-109.42065,-2.1325924)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient4013"
- gradientUnits="userSpaceOnUse"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
+ y2="436.03787"
+ x2="418.20981"
+ y1="384.05795"
+ x1="117.59262"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4053"
+ xlink:href="#linearGradient3195" />
+ <linearGradient
y2="371.85938"
- gradientTransform="matrix(0.6515729,0,0,0.6515729,-72.086668,-5.3154816)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient4047"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient4049"
- gradientUnits="userSpaceOnUse"
+ x2="201.10622"
+ y1="480.55844"
x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient4051"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1122448,0,0,1.2037738,-57.29825,4.8849318)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient4053"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
+ gradientTransform="matrix(0.6515729,0,0,0.6515729,-72.086668,-5.3154816)"
+ gradientUnits="userSpaceOnUse"
id="linearGradient4055"
+ xlink:href="#linearGradient6359" />
+ <linearGradient
+ y2="104.30029"
+ x2="469.44925"
+ y1="276.68851"
+ x1="470.25891"
+ gradientTransform="matrix(0.7247086,0,0,0.7843464,-109.42065,-2.1325924)"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6515729,0,0,0.6515729,-72.086668,-5.3154816)"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
id="linearGradient4057"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.7247086,0,0,0.7843464,-109.42065,-2.1325924)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
+ xlink:href="#linearGradient3208" />
</defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.0119683"
- inkscape:cx="501.72348"
- inkscape:cy="187.6618"
- inkscape:document-units="px"
- inkscape:current-layer="layer6"
- showgrid="false"
- inkscape:window-width="1600"
- inkscape:window-height="839"
- inkscape:window-x="1022"
- inkscape:window-y="-3"
- inkscape:window-maximized="1" />
<metadata
id="metadata5745">
<rdf:RDF>
@@ -273,92 +88,56 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Shadow"
- inkscape:groupmode="layer"
- id="layer1"
- style="display:inline"
- transform="translate(-11.872025,-13.171852)" />
- <g
- inkscape:groupmode="layer"
- id="layer5"
- inkscape:label="Border"
- style="display:inline"
- transform="translate(-11.872025,-13.171852)" />
- <g
- inkscape:groupmode="layer"
- id="layer3"
- inkscape:label="Rays Background"
- style="display:inline"
- transform="translate(-11.872025,-13.171852)" />
- <g
- inkscape:groupmode="layer"
- id="layer2"
- inkscape:label="Rays Foreground"
- style="display:inline"
- transform="translate(-11.872025,-13.171852)" />
- <g
- inkscape:groupmode="layer"
- id="layer6"
- inkscape:label="Reflection"
- style="display:inline"
- transform="translate(-11.872025,-13.171852)">
+ transform="translate(-11.872025,-13.171852)"
+ style="display:inline"
+ id="layer1" />
+ <g
+ transform="translate(-11.872025,-13.171852)"
+ style="display:inline"
+ id="layer5" />
+ <g
+ transform="translate(-11.872025,-13.171852)"
+ style="display:inline"
+ id="layer3" />
+ <g
+ transform="translate(-11.872025,-13.171852)"
+ style="display:inline"
+ id="layer2" />
+ <g
+ transform="translate(-11.872025,-13.171852)"
+ style="display:inline"
+ id="layer6">
<g
- id="g4018"
- transform="translate(9.8817328,9.8817328)">
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
+ transform="translate(9.8817328,9.8817328)"
+ id="g4018">
+ <path
+ style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter6926)"
+ id="path6903"
+ d="M 833.03006,395.26932 A 357.71872,357.71872 0 0 1 475.31134,752.98804 357.71872,357.71872 0 0 1 117.59262,395.26932 357.71872,357.71872 0 0 1 475.31134,37.550598 357.71872,357.71872 0 0 1 833.03006,395.26932 Z"
+ transform="matrix(0.6379835,0,0,0.6379835,-67.554612,-15.189295)" />
+ <path
transform="matrix(0.6379835,0,0,0.6379835,-67.554612,-15.189295)"
- d="m 833.03006,395.26932 c 0,197.56259 -160.15613,357.71872 -357.71872,357.71872 -197.56259,0 -357.71872,-160.15613 -357.71872,-357.71872 0,-197.5626 160.15613,-357.718722 357.71872,-357.718722 197.56259,0 357.71872,160.156122 357.71872,357.718722 z"
- sodipodi:ry="357.71872"
- sodipodi:rx="357.71872"
- sodipodi:cy="395.26932"
- sodipodi:cx="475.31134"
- id="path6903"
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline;filter:url(#filter6926)"
- sodipodi:type="arc" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- sodipodi:type="arc"
- style="fill:#051e52;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
+ d="M 833.03006,395.26932 A 357.71872,357.71872 0 0 1 475.31134,752.98804 357.71872,357.71872 0 0 1 117.59262,395.26932 357.71872,357.71872 0 0 1 475.31134,37.550598 357.71872,357.71872 0 0 1 833.03006,395.26932 Z"
id="path6900"
- sodipodi:cx="475.31134"
- sodipodi:cy="395.26932"
- sodipodi:rx="357.71872"
- sodipodi:ry="357.71872"
- d="m 833.03006,395.26932 c 0,197.56259 -160.15613,357.71872 -357.71872,357.71872 -197.56259,0 -357.71872,-160.15613 -357.71872,-357.71872 0,-197.5626 160.15613,-357.718722 357.71872,-357.718722 197.56259,0 357.71872,160.156122 357.71872,357.718722 z"
- transform="matrix(0.6379835,0,0,0.6379835,-67.554612,-15.189295)" />
+ style="fill:#051e52;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
<path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- transform="matrix(0.6317287,0,0,0.6317287,-64.581662,-12.716988)"
- d="m 833.03006,395.26932 c 0,197.56259 -160.15613,357.71872 -357.71872,357.71872 -197.56259,0 -357.71872,-160.15613 -357.71872,-357.71872 0,-197.5626 160.15613,-357.718722 357.71872,-357.718722 197.56259,0 357.71872,160.156122 357.71872,357.718722 z"
- sodipodi:ry="357.71872"
- sodipodi:rx="357.71872"
- sodipodi:cy="395.26932"
- sodipodi:cx="475.31134"
+ style="fill:url(#linearGradient4053);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
id="path6317"
- style="fill:url(#linearGradient4053);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
- sodipodi:type="arc" />
+ d="M 833.03006,395.26932 A 357.71872,357.71872 0 0 1 475.31134,752.98804 357.71872,357.71872 0 0 1 117.59262,395.26932 357.71872,357.71872 0 0 1 475.31134,37.550598 357.71872,357.71872 0 0 1 833.03006,395.26932 Z"
+ transform="matrix(0.6317287,0,0,0.6317287,-64.581662,-12.716988)" />
<path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- id="path6327"
+ style="fill:url(#linearGradient4055);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
d="m 235.67972,13.233984 c -35.92776,0 -69.88078,8.488655 -99.97572,23.558433 L 296.72396,165.96674 452.81639,291.19091 c 4.32451,-17.35817 6.61754,-35.51197 6.61754,-54.20272 0,-123.50655 -100.24766,-223.754205 -223.75421,-223.754206 z M 79.118968,77.210299 C 71.146114,85.023824 63.764822,93.431949 57.026574,102.35694 L 274.63156,209.66285 434.20584,288.36064 275.3035,193.86221 79.118968,77.210299 z M 24.488653,162.95322 c -3.62786,10.33827 -6.504275,21.02069 -8.592618,31.98816 L 260.17479,255.29332 422.98657,295.52794 260.21551,241.36595 24.488653,162.95322 z M 13.513722,263.49906 c 1.305042,11.03747 3.397359,21.8274 6.251027,32.31395 l 228.539191,6.51573 173.46093,4.96824 L 253.55725,289.23619 13.513722,263.49906 z M 428.50457,317.76287 249.79034,336.84174 47.782384,358.40473 c 5.959201,9.19899 12.564704,17.94104 19.771165,26.14436 L 244.45559,351.80755 428.50457,317.76287 z m 13.78484,5.21258 -188.36565,62.18449 -133.00232,43.89972 c 33.5632,20.10936 72.81152,31.66237 114.75828,31.66238 93.04288,0 172.8858,-56.87905 206.60969,-137.74659 z"
- style="fill:url(#linearGradient4055);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+ id="path6327" />
<path
- id="path3203"
+ style="fill:url(#linearGradient4057);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
d="m 235.67972,13.233984 c -35.92776,0 -69.88078,8.488655 -99.97572,23.558433 l 161.01996,129.174323 52.55342,42.16899 c 39.1477,-4.87501 74.57645,-12.22557 104.45528,-21.44082 C 430.89209,87.375898 341.89666,13.233985 235.67972,13.233984 z M 79.118968,77.210299 c -7.972854,7.813525 -15.354146,16.22165 -22.092394,25.146641 l 217.604986,107.30591 8.32792,4.11306 c 7.91353,-0.38016 15.72478,-0.85776 23.43626,-1.42532 L 275.3035,193.86221 79.118968,77.210299 z M 24.488653,162.95322 c -2.661786,7.58527 -4.921793,15.36128 -6.760069,23.29373 42.624133,13.3171 96.712956,22.78306 156.947626,26.67377 L 24.488653,162.95322 z"
- style="fill:url(#linearGradient4057);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+ id="path3203" />
</g>
</g>
</svg>
=== removed file 'resources/images/openlp-splash-screen.svg'
--- resources/images/openlp-splash-screen.svg 2010-09-14 18:18:47 +0000
+++ resources/images/openlp-splash-screen.svg 1970-01-01 00:00:00 +0000
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:xlink="http://www.w3.org/1999/xlink";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="370"
- height="370"
- id="svg4079"
- sodipodi:version="0.32"
- inkscape:version="0.47pre4 r22446"
- sodipodi:docname="openlp-splash-screen.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- version="1.0"
- inkscape:export-filename="/home/raoul/Projects/openlp/bitsandbobs/resources/images/openlp-splash-screen2.png"
- inkscape:export-xdpi="53.549999"
- inkscape:export-ydpi="53.549999">
- <defs
- id="defs4081">
- <filter
- inkscape:collect="always"
- id="filter4005">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="4.333215"
- id="feGaussianBlur4007" />
- </filter>
- <linearGradient
- id="linearGradient3208">
- <stop
- style="stop-color:#ffffff;stop-opacity:0.25098041;"
- offset="0"
- id="stop3210" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop3212" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient4051"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1122448,0,0,1.2037738,-57.29825,4.8849318)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- id="linearGradient6359">
- <stop
- style="stop-color:#000d26;stop-opacity:1;"
- offset="0"
- id="stop6361" />
- <stop
- style="stop-color:#507fda;stop-opacity:1;"
- offset="1"
- id="stop6363" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient4049"
- gradientUnits="userSpaceOnUse"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938" />
- <linearGradient
- id="linearGradient3195">
- <stop
- style="stop-color:#cdcdff;stop-opacity:1;"
- offset="0"
- id="stop3197" />
- <stop
- style="stop-color:#ebebff;stop-opacity:1;"
- offset="1"
- id="stop3199" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient4047"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <filter
- inkscape:collect="always"
- id="filter6926">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="3.5771872"
- id="feGaussianBlur6928" />
- </filter>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective4087" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3195"
- id="linearGradient3817"
- gradientUnits="userSpaceOnUse"
- x1="117.59262"
- y1="384.05795"
- x2="418.20981"
- y2="436.03787" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient3819"
- gradientUnits="userSpaceOnUse"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3821"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1122448,0,0,1.2037738,-57.29825,4.8849318)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3208"
- id="linearGradient3824"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.55571269,0,0,0.60144348,-66.059425,16.146882)"
- x1="470.25891"
- y1="276.68851"
- x2="469.44925"
- y2="104.30029" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6359"
- id="linearGradient3827"
- gradientUnits="userSpaceOnUse"
- x1="815.75"
- y1="480.55844"
- x2="201.10622"
- y2="371.85938"
- gradientTransform="matrix(0.49963164,0,0,0.49963164,-37.431406,13.706216)" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="224.70154"
- inkscape:cy="190.60628"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="1280"
- inkscape:window-height="961"
- inkscape:window-x="-3"
- inkscape:window-y="-4"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata4084">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-13.571437,-14.505051)">
- <g
- id="g3832">
- <path
- transform="matrix(0.48921117,0,0,0.48921117,-33.956187,6.1348916)"
- d="m 833.03006,395.26932 c 0,197.56259 -160.15613,357.71872 -357.71872,357.71872 -197.56259,0 -357.71872,-160.15613 -357.71872,-357.71872 0,-197.5626 160.15613,-357.718722 357.71872,-357.718722 197.56259,0 357.71872,160.156122 357.71872,357.718722 z"
- sodipodi:ry="357.71872"
- sodipodi:rx="357.71872"
- sodipodi:cy="395.26932"
- sodipodi:cx="475.31134"
- id="path3206"
- style="fill:#051e52;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
- sodipodi:type="arc"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- sodipodi:type="arc"
- style="fill:url(#linearGradient3817);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
- id="path3208"
- sodipodi:cx="475.31134"
- sodipodi:cy="395.26932"
- sodipodi:rx="357.71872"
- sodipodi:ry="357.71872"
- d="m 833.03006,395.26932 c 0,197.56259 -160.15613,357.71872 -357.71872,357.71872 -197.56259,0 -357.71872,-160.15613 -357.71872,-357.71872 0,-197.5626 160.15613,-357.718722 357.71872,-357.718722 197.56259,0 357.71872,160.156122 357.71872,357.718722 z"
- transform="matrix(0.48441496,0,0,0.48441496,-31.676504,8.0306779)"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:url(#linearGradient3827);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
- d="m 198.56648,27.930104 c -27.54972,0 -53.58518,6.509173 -76.66223,18.064807 l 123.47147,99.051969 119.693,96.02296 c 3.31607,-13.31039 5.07438,-27.23088 5.07438,-41.56311 0,-94.70587 -76.87075,-171.576625 -171.57662,-171.576626 z M 78.514361,76.987686 C 72.400709,82.979164 66.740672,89.426585 61.573726,96.270345 L 228.43508,178.55343 350.79799,238.89956 228.95033,166.43736 78.514361,76.987686 z m -41.89099,65.748404 c -2.781874,7.92747 -4.987533,16.11884 -6.588892,24.52879 L 217.3495,213.54326 342.19496,244.39551 217.38073,202.86363 36.623371,142.73609 z m -8.41567,77.0994 c 1.000717,8.46362 2.605124,16.73744 4.793341,24.77861 l 175.245798,4.99632 133.01131,3.80969 L 212.27512,239.57094 28.207701,219.83549 z M 346.42621,261.44544 209.38662,276.07528 54.485202,292.60997 c 4.569566,7.05386 9.634722,13.75734 15.160698,20.04772 L 205.29589,287.5512 346.42621,261.44544 z m 10.57034,3.99706 -144.44039,47.68359 -101.98731,33.66268 c 25.73655,15.42002 55.8325,24.27897 87.99763,24.27898 71.34607,0 132.5703,-43.61534 158.43007,-105.62525 z"
- id="path3210"
- inkscape:export-filename="/home/raoul/openlp-logo-0.2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:url(#linearGradient3824);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"
- d="m 198.56648,27.930104 c -27.54972,0 -53.58518,6.509173 -76.66223,18.064807 l 123.47147,99.051969 40.29841,32.33554 c 30.01879,-3.7382 57.18585,-9.37467 80.0972,-16.44101 C 348.25699,84.782754 280.01453,27.930105 198.56648,27.930104 z M 78.514361,76.987686 C 72.400709,82.979164 66.740672,89.426585 61.573726,96.270345 l 166.861354,82.283085 6.38592,3.15392 c 6.06816,-0.29151 12.05789,-0.65773 17.97112,-1.09294 L 228.95033,166.43736 78.514361,76.987686 z m -41.89099,65.748404 c -2.04108,5.81644 -3.774072,11.77916 -5.183678,17.86183 32.684548,10.21166 74.160317,17.47024 120.348767,20.45367 L 36.623371,142.73609 z"
- id="path3212" />
- <g
- style="fill:#ffffff;fill-opacity:1;filter:url(#filter4005)"
- id="g2762"
- transform="matrix(0.6503605,0,0,0.6503605,-391.52146,-496.40149)">
- <path
- style="fill:#ffffff;fill-opacity:1"
- id="path2764"
- d="m 801.444,1038.553 15.617,0 c 18.862,0 28.496,10.444 28.496,25.961 0,15.212 -9.634,25.859 -28.496,25.859 l -8.316,0 0,17.139 -7.301,0 0,-68.959 0,0 z m 15.211,45.431 c 15.517,0 21.297,-8.112 21.297,-19.471 0,-11.359 -5.78,-19.471 -21.297,-19.471 l -7.91,0 0,38.941 7.91,0 0,10e-4 z" />
- <path
- style="fill:#ffffff;fill-opacity:1"
- id="path2766"
- d="m 852.858,1038.553 41.984,0 0,6.49 -34.684,0 0,32.35 30.931,0 0,6.389 -30.931,0 0,17.24 36.103,0 0,6.49 -43.403,0 0,-68.959 z" />
- <path
- style="fill:#ffffff;fill-opacity:1"
- id="path2768"
- d="m 913.197,1059.545 c -1.927,-2.333 -4.767,-6.39 -4.767,-6.39 0,0 0.608,4.868 0.608,7.81 l 0,46.547 -6.896,0 0,-69.669 1.217,0 41.173,48.677 c 1.927,2.333 4.259,5.163 4.259,5.163 0,0 0,-3.642 0,-6.582 l 0,-46.548 6.795,0 0,69.669 -1.217,0 -41.172,-48.677 z" />
- <path
- style="fill:#ffffff;fill-opacity:1"
- id="path2770"
- d="m 677.015,1070.032 c 0,-34.836 26.253,-58.564 58.564,-58.564 32.311,0 58.564,23.729 58.564,58.564 0,34.835 -26.253,58.564 -58.564,58.564 -32.311,0 -58.564,-23.728 -58.564,-58.564 z m 110.06,0 c 0,-29.955 -22.045,-52.338 -51.496,-52.338 -29.451,0 -51.496,22.383 -51.496,52.338 0,29.956 22.045,52.338 51.496,52.338 29.451,0 51.496,-22.382 51.496,-52.338 z" />
- <path
- style="fill:#ffffff;fill-opacity:1"
- id="path2772"
- d="m 967.521,1012.814 23.561,0 0,93.737 51.833,0 0,20.699 -75.394,0 0,-114.436 z" />
- <path
- style="fill:#ffffff;fill-opacity:1"
- id="path2774"
- d="m 1054.85,1012.814 31.639,0 c 31.975,0 51.16,16.661 51.16,44.26 0,27.6 -19.354,44.092 -51.16,44.092 l -8.078,0 0,26.085 -23.561,0 0,-114.437 z m 30.965,67.653 c 19.185,0 27.599,-7.741 27.599,-23.393 0,-15.819 -8.751,-23.561 -27.599,-23.561 l -7.405,0 0,46.953 7.405,0 0,0 z" />
- </g>
- <g
- style="fill:#000d26;fill-opacity:1"
- transform="matrix(0.6503605,0,0,0.6503605,-391.52146,-496.40149)"
- id="g3221">
- <path
- style="fill:#000d26;fill-opacity:1"
- d="m 801.444,1038.553 15.617,0 c 18.862,0 28.496,10.444 28.496,25.961 0,15.212 -9.634,25.859 -28.496,25.859 l -8.316,0 0,17.139 -7.301,0 0,-68.959 0,0 z m 15.211,45.431 c 15.517,0 21.297,-8.112 21.297,-19.471 0,-11.359 -5.78,-19.471 -21.297,-19.471 l -7.91,0 0,38.941 7.91,0 0,10e-4 z"
- id="path3223" />
- <path
- style="fill:#000d26;fill-opacity:1"
- d="m 852.858,1038.553 41.984,0 0,6.49 -34.684,0 0,32.35 30.931,0 0,6.389 -30.931,0 0,17.24 36.103,0 0,6.49 -43.403,0 0,-68.959 z"
- id="path3225" />
- <path
- style="fill:#000d26;fill-opacity:1"
- d="m 913.197,1059.545 c -1.927,-2.333 -4.767,-6.39 -4.767,-6.39 0,0 0.608,4.868 0.608,7.81 l 0,46.547 -6.896,0 0,-69.669 1.217,0 41.173,48.677 c 1.927,2.333 4.259,5.163 4.259,5.163 0,0 0,-3.642 0,-6.582 l 0,-46.548 6.795,0 0,69.669 -1.217,0 -41.172,-48.677 z"
- id="path3227" />
- <path
- style="fill:#000d26;fill-opacity:1"
- d="m 677.015,1070.032 c 0,-34.836 26.253,-58.564 58.564,-58.564 32.311,0 58.564,23.729 58.564,58.564 0,34.835 -26.253,58.564 -58.564,58.564 -32.311,0 -58.564,-23.728 -58.564,-58.564 z m 110.06,0 c 0,-29.955 -22.045,-52.338 -51.496,-52.338 -29.451,0 -51.496,22.383 -51.496,52.338 0,29.956 22.045,52.338 51.496,52.338 29.451,0 51.496,-22.382 51.496,-52.338 z"
- id="path3229" />
- <path
- style="fill:#000d26;fill-opacity:1"
- d="m 967.521,1012.814 23.561,0 0,93.737 51.833,0 0,20.699 -75.394,0 0,-114.436 z"
- id="path3231" />
- <path
- style="fill:#000d26;fill-opacity:1"
- d="m 1054.85,1012.814 31.639,0 c 31.975,0 51.16,16.661 51.16,44.26 0,27.6 -19.354,44.092 -51.16,44.092 l -8.078,0 0,26.085 -23.561,0 0,-114.437 z m 30.965,67.653 c 19.185,0 27.599,-7.741 27.599,-23.393 0,-15.819 -8.751,-23.561 -27.599,-23.561 l -7.405,0 0,46.953 7.405,0 0,0 z"
- id="path3233" />
- </g>
- </g>
- </g>
-</svg>
=== removed file 'resources/images/openlp.org.ico'
Binary files resources/images/openlp.org.ico 2010-09-14 18:18:47 +0000 and resources/images/openlp.org.ico 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/presentation_delete.png'
Binary files resources/images/presentation_delete.png 2010-09-14 18:18:47 +0000 and resources/images/presentation_delete.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/presentation_load.png'
Binary files resources/images/presentation_load.png 2010-09-14 18:18:47 +0000 and resources/images/presentation_load.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/projector_connectors.png'
Binary files resources/images/projector_connectors.png 2014-10-06 19:10:03 +0000 and resources/images/projector_connectors.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/projector_spacer.png'
Binary files resources/images/projector_spacer.png 2014-10-10 17:29:52 +0000 and resources/images/projector_spacer.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/projector_view.png'
Binary files resources/images/projector_view.png 2014-10-10 02:07:43 +0000 and resources/images/projector_view.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/service_delete.png'
Binary files resources/images/service_delete.png 2010-09-14 18:18:47 +0000 and resources/images/service_delete.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/service_edit.png'
Binary files resources/images/service_edit.png 2010-09-14 18:18:47 +0000 and resources/images/service_edit.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/service_new.png'
Binary files resources/images/service_new.png 2010-09-14 18:18:47 +0000 and resources/images/service_new.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/service_open.png'
Binary files resources/images/service_open.png 2010-09-14 18:18:47 +0000 and resources/images/service_open.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/service_save.png'
Binary files resources/images/service_save.png 2010-09-14 18:18:47 +0000 and resources/images/service_save.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/slide_close.png'
Binary files resources/images/slide_close.png 2010-09-14 18:18:47 +0000 and resources/images/slide_close.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/song_delete.png'
Binary files resources/images/song_delete.png 2010-09-14 18:18:47 +0000 and resources/images/song_delete.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/song_edit.png'
Binary files resources/images/song_edit.png 2010-09-14 18:18:47 +0000 and resources/images/song_edit.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/song_export.png'
Binary files resources/images/song_export.png 2010-09-14 18:18:47 +0000 and resources/images/song_export.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/song_new.png'
Binary files resources/images/song_new.png 2010-09-14 18:18:47 +0000 and resources/images/song_new.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/system_add.png'
Binary files resources/images/system_add.png 2010-09-14 18:18:47 +0000 and resources/images/system_add.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/system_live.png'
Binary files resources/images/system_live.png 2010-09-14 18:18:47 +0000 and resources/images/system_live.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/system_preview.png'
Binary files resources/images/system_preview.png 2010-09-14 18:18:47 +0000 and resources/images/system_preview.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/theme_delete.png'
Binary files resources/images/theme_delete.png 2010-09-14 18:18:47 +0000 and resources/images/theme_delete.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/theme_export.png'
Binary files resources/images/theme_export.png 2010-09-14 18:18:47 +0000 and resources/images/theme_export.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/theme_import.png'
Binary files resources/images/theme_import.png 2010-09-14 18:18:47 +0000 and resources/images/theme_import.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/tools_alert.png'
Binary files resources/images/tools_alert.png 2010-09-14 18:18:47 +0000 and resources/images/tools_alert.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/video_delete.png'
Binary files resources/images/video_delete.png 2010-09-14 18:18:47 +0000 and resources/images/video_delete.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/video_load.png'
Binary files resources/images/video_load.png 2010-09-14 18:18:47 +0000 and resources/images/video_load.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/wizard_createprojector.png'
Binary files resources/images/wizard_createprojector.png 2014-10-06 19:10:03 +0000 and resources/images/wizard_createprojector.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'resources/images/wizard_exportsong.bmp'
Binary files resources/images/wizard_exportsong.bmp 2011-01-27 15:13:11 +0000 and resources/images/wizard_exportsong.bmp 1970-01-01 00:00:00 +0000 differ
=== renamed file 'resources/images/wizard_importsong.bmp' => 'resources/images/wizard_song.bmp'
=== added file 'scripts/clean_up_resources.py'
--- scripts/clean_up_resources.py 1970-01-01 00:00:00 +0000
+++ scripts/clean_up_resources.py 2016-10-30 09:13:09 +0000
@@ -0,0 +1,99 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2016 OpenLP Developers #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
+
+import fnmatch
+import os
+
+from lxml import etree
+
+resource_path = os.path.join('..', 'resources', 'images')
+resource_file_path = os.path.join(resource_path, 'openlp-2.qrc')
+src_directory = os.path.join('..', 'openlp')
+
+RESOURCES_TO_IGNORE = [
+ 'openlp.svg',
+ 'OpenLP.ico',
+ 'openlp-2.qrc',
+ 'openlp-logo-16x16.png',
+ 'openlp-logo-32x32.png',
+ 'openlp-logo-48x48.png',
+ 'openlp-logo-64x64.png',
+ 'openlp-logo-128x128.png',
+ 'README.txt'
+]
+
+tree = etree.parse(resource_file_path)
+root = tree.getroot()
+
+print('Looking for unused resources listed in openlp-2.qrc')
+print('----------------------------------------------------------------')
+resources = root.findall('.//file')
+for current_dir, dirs, files in os.walk(src_directory):
+ for file_name in files:
+ if not fnmatch.fnmatch(file_name, '*.py'):
+ continue
+ file_path = os.path.join(current_dir, file_name)
+ with open(file_path) as source_file:
+ file_contents = source_file.read()
+ # Create a copy of the resources list so that we don't change the list while we're iterating through it!
+ for resource in list(resources):
+ if resource.text in file_contents:
+ resources.remove(resource)
+if resources:
+ print('Unused resources listed in openlp-2.qrc:')
+ print(*(x.text for x in resources), sep='\n')
+ print('----------------------------------------------------------------')
+ remove = None
+ while remove != 'yes' and remove != 'no':
+ remove = input('Would you like to remove these files from openlp-2.qrc? (yes/no)')
+ if remove == 'yes':
+ for resource in resources:
+ parent = resource.find('..')
+ parent.remove(resource)
+ tree.write(resource_file_path, encoding='utf8')
+else:
+ print('No unused resources listed in openlp-2.qrc')
+print('----------------------------------------------------------------')
+
+print('\nLooking for resource files which are not lited in openlp-2.qrc')
+print('----------------------------------------------------------------')
+resources = [x.text for x in root.findall('.//file')]
+removable_resources = []
+for resource_name in os.listdir(resource_path):
+ if resource_name not in RESOURCES_TO_IGNORE and resource_name not in resources:
+ removable_resources.append(resource_name)
+if removable_resources:
+ print('Resource files not listed in openlp-2.qrc:')
+ print(*removable_resources, sep='\n')
+ print('----------------------------------------------------------------')
+ remove = None
+ while remove != 'yes' and remove != 'no':
+ remove = input('Would you like to delete these files from the resource folder? (yes/no)')
+ print('----------------------------------------------------------------')
+ if remove == 'yes':
+ for resource in removable_resources:
+ resource_file = os.path.join(resource_path, resource)
+ print('Removing {file}'.format(file=resource_file))
+ os.remove(resource_file)
+else:
+ print('All resource files are listed!')
=== modified file 'tests/functional/openlp_core_lib/test_lib.py'
--- tests/functional/openlp_core_lib/test_lib.py 2016-08-09 06:24:04 +0000
+++ tests/functional/openlp_core_lib/test_lib.py 2016-10-30 09:13:09 +0000
@@ -189,16 +189,14 @@
"""
Test the build_icon() function with a QIcon instance
"""
- with patch('openlp.core.lib.QtGui') as MockedQtGui:
- # GIVEN: A mocked QIcon
- MockedQtGui.QIcon = MagicMock
- mocked_icon = MockedQtGui.QIcon()
-
- # WHEN: We pass a QIcon instance in
- result = build_icon(mocked_icon)
-
- # THEN: The result should be our mocked QIcon
- self.assertIs(mocked_icon, result, 'The result should be the mocked QIcon')
+ # GIVEN: An icon QIcon
+ icon = QtGui.QIcon()
+
+ # WHEN: We pass a QIcon instance in
+ result = build_icon(icon)
+
+ # THEN: The result should be the same icon as we passed in
+ self.assertIs(icon, result, 'The result should be the same icon as we passed in')
def test_build_icon_with_resource(self):
"""
@@ -230,6 +228,30 @@
# GIVEN: A set of mocked-out Qt classes
mocked_byte_array = MagicMock()
MockedQtCore.QByteArray.return_value = mocked_byte_array
+ mocked_buffer = MagicMock()
+ MockedQtCore.QBuffer.return_value = mocked_buffer
+ MockedQtCore.QIODevice.WriteOnly = 'writeonly'
+ mocked_image = MagicMock()
+
+ # WHEN: We convert an image to a byte array
+ result = image_to_byte(mocked_image, base_64=False)
+
+ # THEN: We should receive the mocked_buffer
+ MockedQtCore.QByteArray.assert_called_with()
+ MockedQtCore.QBuffer.assert_called_with(mocked_byte_array)
+ mocked_buffer.open.assert_called_with('writeonly')
+ mocked_image.save.assert_called_with(mocked_buffer, "PNG")
+ self.assertFalse(mocked_byte_array.toBase64.called)
+ self.assertEqual(mocked_byte_array, result, 'The mocked out byte array should be returned')
+
+ def test_image_to_byte_base_64(self):
+ """
+ Test the image_to_byte() function
+ """
+ with patch('openlp.core.lib.QtCore') as MockedQtCore:
+ # GIVEN: A set of mocked-out Qt classes
+ mocked_byte_array = MagicMock()
+ MockedQtCore.QByteArray.return_value = mocked_byte_array
mocked_byte_array.toBase64.return_value = QtCore.QByteArray(b'base64mock')
mocked_buffer = MagicMock()
MockedQtCore.QBuffer.return_value = mocked_buffer
=== modified file 'tests/functional/openlp_core_ui/test_settingsform.py'
--- tests/functional/openlp_core_ui/test_settingsform.py 2016-05-31 21:40:13 +0000
+++ tests/functional/openlp_core_ui/test_settingsform.py 2016-10-30 09:13:09 +0000
@@ -48,7 +48,7 @@
general_tab = MagicMock()
general_tab.tab_title = 'mock'
general_tab.tab_title_visible = 'Mock'
- general_tab.icon_path = ':/icon/openlp-logo-16x16.png'
+ general_tab.icon_path = ':/icon/openlp-logo.svg'
# WHEN: We insert the general tab
with patch.object(settings_form.stacked_layout, 'addWidget') as mocked_add_widget, \
@@ -86,14 +86,14 @@
general_tab = QtWidgets.QWidget(None)
general_tab.tab_title = 'mock-general'
general_tab.tab_title_visible = 'Mock General'
- general_tab.icon_path = ':/icon/openlp-logo-16x16.png'
+ general_tab.icon_path = ':/icon/openlp-logo.svg'
mocked_general_save = MagicMock()
general_tab.save = mocked_general_save
settings_form.insert_tab(general_tab, is_visible=True)
themes_tab = QtWidgets.QWidget(None)
themes_tab.tab_title = 'mock-themes'
themes_tab.tab_title_visible = 'Mock Themes'
- themes_tab.icon_path = ':/icon/openlp-logo-16x16.png'
+ themes_tab.icon_path = ':/icon/openlp-logo.svg'
mocked_theme_save = MagicMock()
themes_tab.save = mocked_theme_save
settings_form.insert_tab(themes_tab, is_visible=False)
@@ -114,7 +114,7 @@
general_tab = QtWidgets.QWidget(None)
general_tab.tab_title = 'mock'
general_tab.tab_title_visible = 'Mock'
- general_tab.icon_path = ':/icon/openlp-logo-16x16.png'
+ general_tab.icon_path = ':/icon/openlp-logo.svg'
settings_form.insert_tab(general_tab, is_visible=True)
with patch.object(settings_form.stacked_layout, 'count') as mocked_count:
@@ -133,14 +133,14 @@
general_tab = QtWidgets.QWidget(None)
general_tab.tab_title = 'mock-general'
general_tab.tab_title_visible = 'Mock General'
- general_tab.icon_path = ':/icon/openlp-logo-16x16.png'
+ general_tab.icon_path = ':/icon/openlp-logo.svg'
mocked_general_cancel = MagicMock()
general_tab.cancel = mocked_general_cancel
settings_form.insert_tab(general_tab, is_visible=True)
themes_tab = QtWidgets.QWidget(None)
themes_tab.tab_title = 'mock-themes'
themes_tab.tab_title_visible = 'Mock Themes'
- themes_tab.icon_path = ':/icon/openlp-logo-16x16.png'
+ themes_tab.icon_path = ':/icon/openlp-logo.svg'
mocked_theme_cancel = MagicMock()
themes_tab.cancel = mocked_theme_cancel
settings_form.insert_tab(themes_tab, is_visible=False)
Follow ups
