diff --git a/osx/DmgImageIcon.png b/osx/DmgImageIcon.png deleted file mode 100644 index 85457d8..0000000 Binary files a/osx/DmgImageIcon.png and /dev/null differ diff --git a/osx/DmgImageInstallBackgroundClean.png b/osx/DmgImageInstallBackgroundClean.png deleted file mode 100755 index 1008621..0000000 Binary files a/osx/DmgImageInstallBackgroundClean.png and /dev/null differ diff --git a/osx/OpenLP.icns b/osx/OpenLP.icns index 6066b11..689ea8c 100644 Binary files a/osx/OpenLP.icns and b/osx/OpenLP.icns differ diff --git a/osx/config.ini.default b/osx/config.ini.default index c045080..71828a7 100644 --- a/osx/config.ini.default +++ b/osx/config.ini.default @@ -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 = diff --git a/osx/dmg-background-new-with-icons.png b/osx/dmg-background-new-with-icons.png deleted file mode 100644 index 3071a00..0000000 Binary files a/osx/dmg-background-new-with-icons.png and /dev/null differ diff --git a/osx/dmg-background-new.png b/osx/dmg-background-new.png deleted file mode 100644 index de774e1..0000000 Binary files a/osx/dmg-background-new.png and /dev/null differ diff --git a/osx/dmg-background.png b/osx/dmg-background.png deleted file mode 100644 index ab2e63e..0000000 Binary files a/osx/dmg-background.png and /dev/null differ diff --git a/osx/dmg-settings-new.py b/osx/dmg-settings-new.py deleted file mode 100644 index 983cea5..0000000 --- a/osx/dmg-settings-new.py +++ /dev/null @@ -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=,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 diff --git a/osx/dmg-settings.py b/osx/dmg-settings.py deleted file mode 100644 index abe7acb..0000000 --- a/osx/dmg-settings.py +++ /dev/null @@ -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=,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 diff --git a/osx/openlp-logo-new.icns b/osx/openlp-logo-new.icns deleted file mode 100644 index c73dd34..0000000 Binary files a/osx/openlp-logo-new.icns and /dev/null differ diff --git a/osx/openlp-logo-new.png b/osx/openlp-logo-new.png deleted file mode 100644 index 7185fd5..0000000 Binary files a/osx/openlp-logo-new.png and /dev/null differ