Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/packaging-osx-2.6 into lp:openlp/packaging.
Requested reviews: Daniel Borges (danielborges93) OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/packaging-osx-2.6/+merge/324899 Change icons, logos and artwork for 2.6 builds on macOS -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/packaging-osx-2.6 into lp:openlp/packaging.
=== removed file 'osx/DmgImageIcon.png' Binary files osx/DmgImageIcon.png 2012-06-09 19:02:47 +0000 and osx/DmgImageIcon.png 1970-01-01 00:00:00 +0000 differ === removed file 'osx/DmgImageInstallBackgroundClean.png' Binary files osx/DmgImageInstallBackgroundClean.png 2012-06-09 19:02:47 +0000 and osx/DmgImageInstallBackgroundClean.png 1970-01-01 00:00:00 +0000 differ === added file 'osx/OpenLP-Background.tiff' Binary files osx/OpenLP-Background.tiff 1970-01-01 00:00:00 +0000 and osx/OpenLP-Background.tiff 2017-06-01 05:15:09 +0000 differ === modified file 'osx/OpenLP.icns' Binary files osx/OpenLP.icns 2012-06-09 19:02:47 +0000 and osx/OpenLP.icns 2017-06-01 05:15:09 +0000 differ === modified file 'osx/config.ini.default' --- osx/config.ini.default 2016-09-24 21:46:19 +0000 +++ osx/config.ini.default 2017-06-01 05:15:09 +0000 @@ -1,18 +1,19 @@ [executables] -sphinx = sphinx-build-3.4 -pyinstaller = %(projects)s/../pyinstaller/pyinstaller.py +sphinx = sphinx-build-3.5 +pyinstaller = /opt/local/Library/Frameworks/Python.framework/Versions/3.5/bin/pyinstaller lrelease = /opt/local/libexec/qt5/bin/lrelease dmgbuild = dmgbuild mudrawbin = mudraw mutoolbin = mutool [paths] -branch = %(projects)s/trunk -documentation = %(projects)s/documentation -app_icon = %(here)s/OpenLP.icns +branch = path/to/openlp/trunk +documentation = path/to/openlp/documentation +icon = %(here)s/OpenLP.icns bundle_info = %(here)s/Info.plist hooks = %(here)s/../pyinstaller-hooks -dmg_settings = %(here)s/dmg-settings.py +dmg_settings = %(here)s/settings.py +license = %(here)s/LICENSE.txt [transifex] username = === removed file 'osx/dmg-background-new-with-icons.png' Binary files osx/dmg-background-new-with-icons.png 2016-09-24 21:46:19 +0000 and osx/dmg-background-new-with-icons.png 1970-01-01 00:00:00 +0000 differ === removed file 'osx/dmg-background-new.png' Binary files osx/dmg-background-new.png 2016-09-24 21:46:19 +0000 and osx/dmg-background-new.png 1970-01-01 00:00:00 +0000 differ === removed file 'osx/dmg-background.png' Binary files osx/dmg-background.png 2016-09-24 21:46:19 +0000 and osx/dmg-background.png 1970-01-01 00:00:00 +0000 differ === removed file 'osx/dmg-settings-new.py' --- osx/dmg-settings-new.py 2016-09-24 21:46:19 +0000 +++ osx/dmg-settings-new.py 1970-01-01 00:00:00 +0000 @@ -1,27 +0,0 @@ -import os - -# This is the settings file for building the DMG. Run dmgbuild like so: -# $ dmgbuild -s dmg-settings.py -D size=<size>,app=<path/to/OpenLP.app> "OpenLP" OpenLP-{version}.dmg - -HERE = os.getcwd() - -format = 'UDBZ' -size = '600M' -files = [defines.get('app', '/Applications/OpenLP.app')] -symlinks = { 'Applications': '/Applications' } -badge_icon = os.path.join(HERE, 'openlp-logo-new.icns') -icon_locations = { - 'OpenLP.app': (160, 200), - 'Applications': (550, 200) -} -background = os.path.join(HERE, 'dmg-background-new.png') -window_rect = ((100, 100), (700, 457)) -default_view = 'icon-view' -show_icon_preview = False -arrange_by = None -scroll_position = (0, 0) -grid_offset = (0, 0) -grid_spacing = 100 -label_pos = 'bottom' # or 'right' -text_size = 16 -icon_size = 128 === removed file 'osx/dmg-settings.py' --- osx/dmg-settings.py 2016-09-24 21:46:19 +0000 +++ osx/dmg-settings.py 1970-01-01 00:00:00 +0000 @@ -1,27 +0,0 @@ -import os - -# This is the settings file for building the DMG. Run dmgbuild like so: -# $ dmgbuild -s dmg-settings.py -D size=<size>,app=<path/to/OpenLP.app> "OpenLP" OpenLP-{version}.dmg - -HERE = os.getcwd() - -format = 'UDZO' -size = defines.get('size', '600M') -files = [defines.get('app', '/Applications/OpenLP.app')] -symlinks = { 'Applications': '/Applications' } -badge_icon = defines.get('icon', 'OpenLP.icns') -icon_locations = { - 'OpenLP.app': (160, 200), - 'Applications': (550, 200) -} -background = os.path.join(HERE, 'dmg-background.png') -window_rect = ((100, 100), (700, 460)) -default_view = 'icon-view' -show_icon_preview = False -arrange_by = None -scroll_position = (0, 0) -grid_offset = (0, 0) -grid_spacing = 100 -label_pos = 'bottom' # or 'right' -text_size = 16 -icon_size = 128 === removed file 'osx/openlp-logo-new.icns' Binary files osx/openlp-logo-new.icns 2016-09-24 21:46:19 +0000 and osx/openlp-logo-new.icns 1970-01-01 00:00:00 +0000 differ === removed file 'osx/openlp-logo-new.png' Binary files osx/openlp-logo-new.png 2016-05-03 20:04:45 +0000 and osx/openlp-logo-new.png 1970-01-01 00:00:00 +0000 differ === added file 'osx/settings.py' --- osx/settings.py 1970-01-01 00:00:00 +0000 +++ osx/settings.py 2017-06-01 05:15:09 +0000 @@ -0,0 +1,25 @@ +import os + +# This is the settings file for building the DMG. Run dmgbuild like so: +# $ dmgbuild -s dmg-settings.py -D size=<size>,app=<path/to/OpenLP.app> "OpenLP" OpenLP-{version}.dmg + +HERE = os.getcwd() + +format = 'UDBZ' +size = '600M' +files = [defines.get('app', '/Applications/OpenLP.app')] +symlinks = { 'Applications': '/Applications' } +badge_icon = os.path.join(HERE, 'OpenLP.icns') +icon_locations = { + 'OpenLP.app': (130, 110), + 'Applications': (400, 110) +} +background = os.path.join(HERE, 'OpenLP-Background.tiff') +window_rect = ((100, 100), (530, 360)) +default_view = 'icon-view' +show_icon_preview = False +arrange_by = None +grid_offset = (0, 0) +label_pos = 'bottom' # or 'right' +text_size = 16 +icon_size = 128
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp