diff options
author | Piotr Brzeziński <piotr@centricular.com> | 2022-07-15 23:08:52 +0200 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.com> | 2022-07-16 10:44:19 +0200 |
commit | 887a188b2494e5638897f2b4ff6f7f6f1c74d500 (patch) | |
tree | 8cf44e20bbf4ba0e951b95221e32258a380d9aba | |
parent | 7ab9907c5f979d4a886de36a31a76b1bc9522ae4 (diff) |
osx: Fix installer logo display
Fixes logo position (no longer overlaps with installer content)
and correctly shows logo when dark mode is enabled.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/900>
-rw-r--r-- | cerbero/packages/osx/distribution.py | 4 | ||||
-rw-r--r-- | cerbero/packages/package.py | 9 | ||||
-rw-r--r-- | packages/gstreamer-1.0/background_dark.png | bin | 0 -> 24102 bytes |
3 files changed, 9 insertions, 4 deletions
diff --git a/cerbero/packages/osx/distribution.py b/cerbero/packages/osx/distribution.py index 4ae04e05..09ae1fc2 100644 --- a/cerbero/packages/osx/distribution.py +++ b/cerbero/packages/osx/distribution.py @@ -21,7 +21,8 @@ DISTRO_XML_TPL = '''\ <?xml version="1.0"?> <installer-gui-script minSpecVesion="1"> <options require-scripts="false"/> - <background align="left" file="%(background)s" scale="none"/> + <background alignment="bottomleft" file="%(background)s" scale="none"/> + <background-darkAqua alignment="bottomleft" file="%(background_dark)s" scale="none"/> <license file="%(license)s"/> <domains enable_anywhere="false" enable_currentUserHome="%(ehome)s" enable_localSystem="%(elocal)s"/> <title>%(title)s</title> @@ -67,6 +68,7 @@ class DistributionXML(object): def _fill_distro(self): return self.template % {'background': self.package.resources_background, + 'background_dark': self.package.resources_background_dark, 'license': self.package.resources_license_rtf, 'ehome': self.enable_user_home, 'elocal': self.enable_local_system, diff --git a/cerbero/packages/package.py b/cerbero/packages/package.py index 32cf15ba..5452dbcf 100644 --- a/cerbero/packages/package.py +++ b/cerbero/packages/package.py @@ -56,7 +56,7 @@ class PackageBase(object): @cvar resources_license: filename of the .txt license file @type resources_license: str @cvar resources_license_unwrapped: filename of the .txt license file - withouth the 80 chars wrapping + without the 80 chars wrapping @type resources_license_unwrapped: str @cvar resources_license_rtf: filename of .rtf license file @type resources_license_rtf: str @@ -64,8 +64,10 @@ class PackageBase(object): @type resources_icon: str @cvar resources_icon_icns: filename of the .icsn icon @type resources_icon_icns: str - @cvar resources_backgound = filename of the background image - @type resources_backgound = str + @cvar resources_background = filename of the background image + @type resources_background = str + @cvar resources_background_dark = filename of the dark mode background image + @type resources_background_dark = str @cvar resources_preinstall = filename for the pre-installation script @type resources_preinstall = str @cvar resources_postinstall = filename for the post-installation script @@ -99,6 +101,7 @@ class PackageBase(object): resources_icon = 'icon.ico' resources_icon_icns = 'icon.icns' resources_background = 'background.png' + resources_background_dark = 'background_dark.png' resources_preinstall = 'preinstall' resources_postinstall = 'postinstall' resources_postremove = 'postremove' diff --git a/packages/gstreamer-1.0/background_dark.png b/packages/gstreamer-1.0/background_dark.png Binary files differnew file mode 100644 index 00000000..66432e09 --- /dev/null +++ b/packages/gstreamer-1.0/background_dark.png |