Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing AppImage Icon for Chrome OS #3803

Merged
merged 7 commits into from
Oct 29, 2020
Merged

Fixing AppImage Icon for Chrome OS #3803

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fc20838
Another experimental AppImage icon change... for better support of Ap…
jonoomph Oct 28, 2020
7085fb8
Another experimental AppImage icon change... for better support of Ap…
jonoomph Oct 28, 2020
e81ea3e
Copying all icons into AppImage... into correct XDG Freedesktop icon …
jonoomph Oct 28, 2020
e96a646
Fixed icon path
jonoomph Oct 28, 2020
b8f752d
Fixed icon path
jonoomph Oct 28, 2020
ef69b5f
Removing unneeded mdir -p
jonoomph Oct 29, 2020
dcbd770
Renaming the .desktop file == the AppImage app name (which is require…
jonoomph Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions installer/build-server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,35 +327,51 @@ def parse_version_info(version_path):
# Recursively create AppDir /usr folder
os.makedirs(os.path.join(app_dir_path, "usr"), exist_ok=True)

# Install program icon
shutil.copyfile(os.path.join(PATH, "xdg", "openshot-qt.svg"),
os.path.join(app_dir_path, "openshot-qt.svg"))

# Install .DirIcon AppImage icon (used on some distros such as Chrome OS)
# XDG Freedesktop icon paths
icons = [ ("scalable", os.path.join(PATH, "xdg", "openshot-qt.svg")),
("64x64", os.path.join(PATH, "xdg", "icon", "64", "openshot-qt.png")),
("128x128", os.path.join(PATH, "xdg", "icon", "128", "openshot-qt.png")),
("256x256", os.path.join(PATH, "xdg", "icon", "256", "openshot-qt.png")),
("512x512", os.path.join(PATH, "xdg", "icon", "512", "openshot-qt.png")),
]

# Copy desktop icons
icon_theme_path = os.path.join(app_dir_path, "usr", "share", "icons", "hicolor")

# Copy each icon
for icon_size, icon_path in icons:
dest_icon_path = os.path.join(icon_theme_path, icon_size, "apps", os.path.split(icon_path)[-1])
os.makedirs(os.path.split(dest_icon_path)[0], exist_ok=True)
shutil.copyfile(icon_path, dest_icon_path)

# Install .DirIcon AppImage icon (256x256)
# See: https://docs.appimage.org/reference/appdir.html
shutil.copyfile(os.path.join(PATH, "xdg", "icon", "256", "openshot-qt.png"),
os.path.join(app_dir_path, ".DirIcon"))
shutil.copyfile(icons[3][1], os.path.join(app_dir_path, ".DirIcon"))

# Install program icon
shutil.copyfile(icons[0][1], os.path.join(app_dir_path, "openshot-qt.svg"))

dest = os.path.join(app_dir_path, "usr", "share", "pixmaps")
os.makedirs(dest, exist_ok=True)

shutil.copyfile(os.path.join(PATH, "xdg", "openshot-qt.svg"),
os.path.join(dest, "openshot-qt.svg"))
# Copy pixmaps (as a 64x64 PNG & SVG)
shutil.copyfile(icons[0][1], os.path.join(dest, "openshot-qt.svg"))
shutil.copyfile(icons[1][1], os.path.join(dest, "openshot-qt.png"))

# Install MIME handler
dest = os.path.join(app_dir_path, "usr", "share", "mime", "packages")
os.makedirs(dest, exist_ok=True)

shutil.copyfile(os.path.join(PATH, "xdg", "org.openshot.OpenShot.xml"),
os.path.join(dest, "org.openshot.OpenShot.xml"))
os.path.join(dest, "openshot-qt.xml"))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AppImage interprets the .desktop file name as the APP name, and uses it to install icons, etc... So it must match.


# Copy the entire frozen app
shutil.copytree(os.path.join(PATH, "build", exe_dir),
os.path.join(app_dir_path, "usr", "bin"))

# Copy .desktop file, replacing Exec= commandline
desk_in = os.path.join(PATH, "xdg", "org.openshot.OpenShot.desktop")
desk_out = os.path.join(app_dir_path, "org.openshot.OpenShot.desktop")
desk_out = os.path.join(app_dir_path, "openshot-qt.desktop")
with open(desk_in, "r") as inf, open(desk_out, "w") as outf:
for line in inf:
if line.startswith("Exec="):
Expand Down