Change icons, logos and artwork for 2.6 builds on macOS

bzr-revno: 37

osx/config.ini.default

@@ -1,18 +1,19 @@
 [executables]
-sphinx = sphinx-build-3.4
+sphinx = sphinx-build-3.5
-pyinstaller = %(projects)s/../pyinstaller/pyinstaller.py
+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
+branch = path/to/openlp/trunk
-documentation = %(projects)s/documentation
+documentation = path/to/openlp/documentation
-app_icon = %(here)s/OpenLP.icns
+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 =

osx/dmg-settings.py

@@ -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

osx/settings.py

@@ -9,19 +9,17 @@ format = 'UDBZ'
 size = '600M'
 files = [defines.get('app', '/Applications/OpenLP.app')]
 symlinks = { 'Applications': '/Applications' }
-badge_icon = os.path.join(HERE, 'openlp-logo-new.icns')
+badge_icon = os.path.join(HERE, 'OpenLP.icns')
 icon_locations = {
-    'OpenLP.app': (160, 200),
+    'OpenLP.app': (130, 110),
-    'Applications': (550, 200)
+    'Applications': (400, 110)
 }
-background = os.path.join(HERE, 'dmg-background-new.png')
+background = os.path.join(HERE, 'OpenLP-Background.tiff')
-window_rect = ((100, 100), (700, 457))
+window_rect = ((100, 100), (530, 360))
 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