From 3f3c5ea247dcd4793e117238af3bed50614d4961 Mon Sep 17 00:00:00 2001 From: swirl Date: Fri, 31 Dec 2021 16:36:59 -0500 Subject: Rebranding logo add temporary Ouroboros logo, thanks Lenny for vectorizing change logo file names Desktop file now includes proper exec using the app binary name fix genicons for use with libicns --- program_info/CMakeLists.txt | 8 +- program_info/Launcher.icns | Bin 304757 -> 0 bytes program_info/Launcher.ico | Bin 102134 -> 0 bytes program_info/Launcher.manifest | 31 ----- program_info/README.md | 1 + program_info/genicons.sh | 25 ++-- program_info/launcher.rc | 29 ----- program_info/logo.qrc | 8 -- program_info/logo.svg | 271 ----------------------------------------- program_info/polymc.desktop | 11 -- program_info/polymc.desktop.in | 11 ++ program_info/polymc.icns | Bin 0 -> 415743 bytes program_info/polymc.ico | Bin 0 -> 102134 bytes program_info/polymc.manifest | 31 +++++ program_info/polymc.qrc | 6 + program_info/polymc.rc | 29 +++++ program_info/polymc.svg | 17 +++ 17 files changed, 113 insertions(+), 365 deletions(-) delete mode 100644 program_info/Launcher.icns delete mode 100644 program_info/Launcher.ico delete mode 100644 program_info/Launcher.manifest delete mode 100644 program_info/launcher.rc delete mode 100644 program_info/logo.qrc delete mode 100644 program_info/logo.svg delete mode 100644 program_info/polymc.desktop create mode 100644 program_info/polymc.desktop.in create mode 100644 program_info/polymc.icns create mode 100644 program_info/polymc.ico create mode 100644 program_info/polymc.manifest create mode 100644 program_info/polymc.qrc create mode 100644 program_info/polymc.rc create mode 100644 program_info/polymc.svg (limited to 'program_info') diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt index dd120ab3..840c3fa2 100644 --- a/program_info/CMakeLists.txt +++ b/program_info/CMakeLists.txt @@ -9,6 +9,8 @@ set(Launcher_ConfigFile "polymc.cfg" PARENT_SCOPE) set(Launcher_Git "https://github.com/PolyMC/PolyMC" PARENT_SCOPE) set(Launcher_Desktop "program_info/polymc.desktop" PARENT_SCOPE) -set(Launcher_Branding_ICNS "program_info/Launcher.icns" PARENT_SCOPE) -set(Launcher_Branding_WindowsRC "program_info/launcher.rc" PARENT_SCOPE) -set(Launcher_Branding_LogoQRC "program_info/logo.qrc" PARENT_SCOPE) +set(Launcher_Branding_ICNS "program_info/polymc.icns" PARENT_SCOPE) +set(Launcher_Branding_WindowsRC "program_info/polymc.rc" PARENT_SCOPE) +set(Launcher_Branding_LogoQRC "program_info/polymc.qrc" PARENT_SCOPE) + +configure_file(polymc.desktop.in polymc.desktop) diff --git a/program_info/Launcher.icns b/program_info/Launcher.icns deleted file mode 100644 index 951b74fc..00000000 Binary files a/program_info/Launcher.icns and /dev/null differ diff --git a/program_info/Launcher.ico b/program_info/Launcher.ico deleted file mode 100644 index 9308958f..00000000 Binary files a/program_info/Launcher.ico and /dev/null differ diff --git a/program_info/Launcher.manifest b/program_info/Launcher.manifest deleted file mode 100644 index 0ee781ee..00000000 --- a/program_info/Launcher.manifest +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - Custom Minecraft launcher for managing multiple installs. - - - - - - - - - - - - - - - diff --git a/program_info/README.md b/program_info/README.md index 01c4d02b..1e805d4a 100644 --- a/program_info/README.md +++ b/program_info/README.md @@ -3,3 +3,4 @@ This is PolyMC's program info which contains information about: - Application name and logo (and branding in general) - Various URLs and API endpoints +- Desktop file diff --git a/program_info/genicons.sh b/program_info/genicons.sh index e6f704f9..2ed39129 100755 --- a/program_info/genicons.sh +++ b/program_info/genicons.sh @@ -1,18 +1,19 @@ #/bin/bash -inkscape -w 16 -h 16 -o logo_16.png logo.svg -inkscape -w 24 -h 24 -o logo_24.png logo.svg -inkscape -w 32 -h 32 -o logo_32.png logo.svg -inkscape -w 48 -h 48 -o logo_48.png logo.svg -inkscape -w 64 -h 64 -o logo_64.png logo.svg -inkscape -w 128 -h 128 -o logo_128.png logo.svg +inkscape -w 16 -h 16 -o polymc_16.png polymc.svg +inkscape -w 24 -h 24 -o polymc_24.png polymc.svg +inkscape -w 32 -h 32 -o polymc_32.png polymc.svg +inkscape -w 48 -h 48 -o polymc_48.png polymc.svg +inkscape -w 64 -h 64 -o polymc_64.png polymc.svg +inkscape -w 128 -h 128 -o polymc_128.png polymc.svg -convert logo_128.png logo_64.png logo_48.png logo_32.png logo_24.png logo_16.png Launcher.ico +convert polymc_128.png polymc_64.png polymc_48.png polymc_32.png polymc_24.png polymc_16.png polymc.ico -inkscape -w 256 -h 256 -o logo_256.png logo.svg -inkscape -w 512 -h 512 -o logo_512.png logo.svg -inkscape -w 1024 -h 1024 -o logo_1024.png logo.svg +inkscape -w 256 -h 256 -o polymc_256.png polymc.svg +inkscape -w 512 -h 512 -o polymc_512.png polymc.svg +inkscape -w 1024 -h 1024 -o polymc_1024.png polymc.svg -png2icns Launcher.icns logo_1024.png logo_512.png logo_256.png logo_128.png logo_32.png logo_16.png +png2icns polymc.icns polymc_1024.png polymc_512.png polymc_256.png polymc_128.png polymc_32.png polymc_16.png -rm -f logo_*.png +rm -f polymc_*.png +rm -rf polymc.iconset diff --git a/program_info/launcher.rc b/program_info/launcher.rc deleted file mode 100644 index f84104fb..00000000 --- a/program_info/launcher.rc +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include - -IDI_ICON1 ICON DISCARDABLE "Launcher.ico" -1 RT_MANIFEST "Launcher.manifest" - -VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,0,0,0 -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_APP -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "CompanyName", "MultiMC Contributors" - VALUE "FileDescription", "A Minecraft Launcher" - VALUE "FileVersion", "1.0.0.0" - VALUE "ProductName", "Launcher" - VALUE "ProductVersion", "5" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0000, 0x04b0 // Unicode - END -END diff --git a/program_info/logo.qrc b/program_info/logo.qrc deleted file mode 100644 index f1da6fe6..00000000 --- a/program_info/logo.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - - logo.svg - - - - diff --git a/program_info/logo.svg b/program_info/logo.svg deleted file mode 100644 index a1c8e439..00000000 --- a/program_info/logo.svg +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/program_info/polymc.desktop b/program_info/polymc.desktop deleted file mode 100644 index 835ef6e1..00000000 --- a/program_info/polymc.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=PolyMC -Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. -Type=Application -Terminal=false -Exec=polymc -StartupNotify=true -Icon=polymc -Categories=Game; -Keywords=game;minecraft;launcher; diff --git a/program_info/polymc.desktop.in b/program_info/polymc.desktop.in new file mode 100644 index 00000000..1549cb9b --- /dev/null +++ b/program_info/polymc.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=PolyMC +Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. +Type=Application +Terminal=false +Exec=@Launcher_APP_BINARY_NAME@ +StartupNotify=true +Icon=polymc +Categories=Game; +Keywords=game;minecraft;launcher; diff --git a/program_info/polymc.icns b/program_info/polymc.icns new file mode 100644 index 00000000..33a5c520 Binary files /dev/null and b/program_info/polymc.icns differ diff --git a/program_info/polymc.ico b/program_info/polymc.ico new file mode 100644 index 00000000..9341547a Binary files /dev/null and b/program_info/polymc.ico differ diff --git a/program_info/polymc.manifest b/program_info/polymc.manifest new file mode 100644 index 00000000..f1fe63ce --- /dev/null +++ b/program_info/polymc.manifest @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + Custom Minecraft launcher for managing multiple installs. + + + + + + + + + + + + + + + diff --git a/program_info/polymc.qrc b/program_info/polymc.qrc new file mode 100644 index 00000000..ea238945 --- /dev/null +++ b/program_info/polymc.qrc @@ -0,0 +1,6 @@ + + + + polymc.svg + + diff --git a/program_info/polymc.rc b/program_info/polymc.rc new file mode 100644 index 00000000..08c21a41 --- /dev/null +++ b/program_info/polymc.rc @@ -0,0 +1,29 @@ +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif +#include + +IDI_ICON1 ICON DISCARDABLE "polymc.ico" +1 RT_MANIFEST "polymc.manifest" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION 1,0,0,0 +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_APP +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "CompanyName", "MultiMC & PolyMC Contributors" + VALUE "FileDescription", "A Minecraft Launcher" + VALUE "FileVersion", "1.0.0.0" + VALUE "ProductName", "PolyMC" + VALUE "ProductVersion", "5" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0000, 0x04b0 // Unicode + END +END diff --git a/program_info/polymc.svg b/program_info/polymc.svg new file mode 100644 index 00000000..c57e8f2f --- /dev/null +++ b/program_info/polymc.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + -- cgit