CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into macos-drag-n-drop

Browse Source
This commit is contained in:
Sefa Eyeoglu
2022-11-04 18:30:42 +01:00
parent a241d3f187 8f045af867
commit 21a7af535c
158 changed files with 1328 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
program_info/CMakeLists.txt
View File

@ -15,12 +15,14 @@ set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
set(Launcher_Copyright "Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors \\n© 2012-2021 MultiMC Contributors")
set(Launcher_Copyright_Mac "Prism Launcher Contributors, © 2021-2022 PolyMC Contributors and © 2012-2021 MultiMC Contributors" PARENT_SCOPE)
set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE)
set(Launcher_Domain "prismlauncher.org" PARENT_SCOPE)
set(Launcher_UserAgent "${Launcher_CommonName}/${Launcher_VERSION_NAME}" PARENT_SCOPE)
set(Launcher_ConfigFile "prismlauncher.cfg" PARENT_SCOPE)
set(Launcher_Git "https://github.com/PrismLauncher/PrismLauncher" PARENT_SCOPE)
set(Launcher_DesktopFileName "org.prismlauncher.PrismLauncher.desktop" PARENT_SCOPE)
set(Launcher_SVGFileName "org.prismlauncher.PrismLauncher.svg" PARENT_SCOPE)
set(Launcher_Desktop "program_info/org.prismlauncher.PrismLauncher.desktop" PARENT_SCOPE)
set(Launcher_mrpack_MIMEInfo "program_info/modrinth-mrpack-mime.xml" PARENT_SCOPE)

86
program_info/genicons.sh
View File

@ -1,39 +1,73 @@
#/bin/bash
#!/bin/bash
# ICO
svg2png() {
input_file="$1"
output_file="$2"
width="$3"
height="$4"
inkscape -w 16 -h 16 -o prismlauncher_16.png org.prismlauncher.PrismLauncher.svg
inkscape -w 24 -h 24 -o prismlauncher_24.png org.prismlauncher.PrismLauncher.svg
inkscape -w 32 -h 32 -o prismlauncher_32.png org.prismlauncher.PrismLauncher.svg
inkscape -w 48 -h 48 -o prismlauncher_48.png org.prismlauncher.PrismLauncher.svg
inkscape -w 64 -h 64 -o prismlauncher_64.png org.prismlauncher.PrismLauncher.svg
inkscape -w 128 -h 128 -o prismlauncher_128.png org.prismlauncher.PrismLauncher.svg
inkscape -w "$width" -h "$height" -o "$output_file" "$input_file"
}
convert prismlauncher_128.png prismlauncher_64.png prismlauncher_48.png prismlauncher_32.png prismlauncher_24.png prismlauncher_16.png prismlauncher.ico
sipsresize() {
input_file="$1"
output_file="$2"
width="$3"
height="$4"
rm -f prismlauncher_*.png
sips -z "$width" "$height" "$input_file" --out "$output_file"
}
inkscape -w 1024 -h 1024 -o prismlauncher_1024.png org.prismlauncher.PrismLauncher.bigsur.svg
if command -v "inkscape" && command -v "icotool"; then
# Windows ICO
d=$(mktemp -d)
mkdir prismlauncher.iconset
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_16.png" 16 16
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_24.png" 24 24
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_32.png" 32 32
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_48.png" 48 48
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_64.png" 64 64
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_128.png" 128 128
svg2png org.prismlauncher.PrismLauncher.svg "$d/prismlauncher_256.png" 256 256
sips -z 16 16 prismlauncher_1024.png --out prismlauncher.iconset/icon_16x16.png
sips -z 32 32 prismlauncher_1024.png --out prismlauncher.iconset/icon_16x16@2x.png
sips -z 32 32 prismlauncher_1024.png --out prismlauncher.iconset/icon_32x32.png
sips -z 64 64 prismlauncher_1024.png --out prismlauncher.iconset/icon_32x32@2x.png
sips -z 128 128 prismlauncher_1024.png --out prismlauncher.iconset/icon_128x128.png
sips -z 256 256 prismlauncher_1024.png --out prismlauncher.iconset/icon_128x128@2x.png
sips -z 256 256 prismlauncher_1024.png --out prismlauncher.iconset/icon_256x256.png
sips -z 512 512 prismlauncher_1024.png --out prismlauncher.iconset/icon_256x256@2x.png
sips -z 512 512 prismlauncher_1024.png --out prismlauncher.iconset/icon_512x512.png
cp prismlauncher_1024.png prismlauncher.iconset/icon_512x512@2x.png
rm prismlauncher.ico && icotool -o prismlauncher.ico -c \
"$d/prismlauncher_256.png" \
"$d/prismlauncher_128.png" \
"$d/prismlauncher_64.png" \
"$d/prismlauncher_48.png" \
"$d/prismlauncher_32.png" \
"$d/prismlauncher_24.png" \
"$d/prismlauncher_16.png"
else
echo "ERROR: Windows icons were NOT generated!" >&2
echo "ERROR: requires inkscape and icotool in PATH"
fi
iconutil -c icns prismlauncher.iconset
if command -v "inkscape" && command -v "sips" && command -v "iconutil"; then
# macOS ICNS
d=$(mktemp -d)
rm -f prismlauncher_*.png
rm -rf prismlauncher.iconset
d="$d/prismlauncher.iconset"
mkdir -p "$d"
svg2png org.prismlauncher.PrismLauncher.bigsur.svg "$d/icon_512x512@2x.png" 1024 1024
sipsresize "$d/icon_512x512@2.png" "$d/icon_16x16.png" 16 16
sipsresize "$d/icon_512x512@2.png" "$d/icon_16x16@2.png" 32 32
sipsresize "$d/icon_512x512@2.png" "$d/icon_32x32.png" 32 32
sipsresize "$d/icon_512x512@2.png" "$d/icon_32x32@2.png" 64 64
sipsresize "$d/icon_512x512@2.png" "$d/icon_128x128.png" 128 128
sipsresize "$d/icon_512x512@2.png" "$d/icon_128x128@2.png" 256 256
sipsresize "$d/icon_512x512@2.png" "$d/icon_256x256.png" 256 256
sipsresize "$d/icon_512x512@2.png" "$d/icon_256x256@2.png" 512 512
iconutil -c icns "$d"
else
echo "ERROR: macOS icons were NOT generated!" >&2
echo "ERROR: requires inkscape, sips and iconutil in PATH"
fi
# replace icon in themes
for dir in ../launcher/resources/*/scalable
do
cp -v org.prismlauncher.PrismLauncher.svg $dir/launcher.svg
cp -v org.prismlauncher.PrismLauncher.svg "$dir/launcher.svg"
done

3
program_info/prismlauncher.6.scd
View File

@ -26,6 +26,9 @@ Here are the current features of Prism Launcher.
*-l, --launch*=INSTANCE_ID
Launch the instance specified by INSTANCE_ID.
*--show*=INSTANCE_ID
Show the configuration window of the instance specified by INSTANCE_ID.
*--alive*
Write a small 'live.check' file after Prism Launcher starts.

BIN
program_info/prismlauncher.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 364 KiB

2
program_info/prismlauncher.manifest.in
View File

@ -10,7 +10,7 @@
</trustInfo>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df" language="*"/>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
</dependentAssembly>
</dependency>
<description>Custom Minecraft launcher for managing multiple installs.</description>

4
program_info/win_install.nsi.in
View File

@ -4,7 +4,7 @@
Unicode true
Name "@Launcher_CommonName@"
Name "@Launcher_DisplayName@"
InstallDir "$LOCALAPPDATA\Programs\@Launcher_CommonName@"
InstallDirRegKey HKCU "Software\@Launcher_CommonName@" "InstallDir"
RequestExecutionLevel user
@ -113,7 +113,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@
;--------------------------------
; The stuff to install
Section "@Launcher_CommonName@"
Section "@Launcher_DisplayName@"
SectionIn RO