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
This commit is contained in:
swirl 2021-12-31 16:36:59 -05:00
parent 541e2f0d8d
commit 3f3c5ea247
No known key found for this signature in database
GPG Key ID: 46507311CD292A08
16 changed files with 47 additions and 298 deletions

View File

@ -24,6 +24,7 @@ endif()
##################################### Set CMake options ##################################### ##################################### Set CMake options #####################################
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/") set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")

View File

@ -1148,7 +1148,7 @@ void Application::setIconTheme(const QString& name)
QIcon Application::getThemedIcon(const QString& name) QIcon Application::getThemedIcon(const QString& name)
{ {
if(name == "logo") { if(name == "logo") {
return QIcon(":/logo.svg"); return QIcon(":/polymc.svg");
} }
return XdgIcon::fromTheme(name); return XdgIcon::fromTheme(name);
} }

View File

@ -40,7 +40,7 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(multimc); Q_INIT_RESOURCE(multimc);
Q_INIT_RESOURCE(backgrounds); Q_INIT_RESOURCE(backgrounds);
Q_INIT_RESOURCE(documents); Q_INIT_RESOURCE(documents);
Q_INIT_RESOURCE(logo); Q_INIT_RESOURCE(polymc);
Q_INIT_RESOURCE(pe_dark); Q_INIT_RESOURCE(pe_dark);
Q_INIT_RESOURCE(pe_light); Q_INIT_RESOURCE(pe_light);

View File

@ -9,6 +9,8 @@ set(Launcher_ConfigFile "polymc.cfg" PARENT_SCOPE)
set(Launcher_Git "https://github.com/PolyMC/PolyMC" PARENT_SCOPE) set(Launcher_Git "https://github.com/PolyMC/PolyMC" PARENT_SCOPE)
set(Launcher_Desktop "program_info/polymc.desktop" PARENT_SCOPE) set(Launcher_Desktop "program_info/polymc.desktop" PARENT_SCOPE)
set(Launcher_Branding_ICNS "program_info/Launcher.icns" PARENT_SCOPE) set(Launcher_Branding_ICNS "program_info/polymc.icns" PARENT_SCOPE)
set(Launcher_Branding_WindowsRC "program_info/launcher.rc" PARENT_SCOPE) set(Launcher_Branding_WindowsRC "program_info/polymc.rc" PARENT_SCOPE)
set(Launcher_Branding_LogoQRC "program_info/logo.qrc" PARENT_SCOPE) set(Launcher_Branding_LogoQRC "program_info/polymc.qrc" PARENT_SCOPE)
configure_file(polymc.desktop.in polymc.desktop)

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

View File

@ -3,3 +3,4 @@
This is PolyMC's program info which contains information about: This is PolyMC's program info which contains information about:
- Application name and logo (and branding in general) - Application name and logo (and branding in general)
- Various URLs and API endpoints - Various URLs and API endpoints
- Desktop file

View File

@ -1,18 +1,19 @@
#/bin/bash #/bin/bash
inkscape -w 16 -h 16 -o logo_16.png logo.svg inkscape -w 16 -h 16 -o polymc_16.png polymc.svg
inkscape -w 24 -h 24 -o logo_24.png logo.svg inkscape -w 24 -h 24 -o polymc_24.png polymc.svg
inkscape -w 32 -h 32 -o logo_32.png logo.svg inkscape -w 32 -h 32 -o polymc_32.png polymc.svg
inkscape -w 48 -h 48 -o logo_48.png logo.svg inkscape -w 48 -h 48 -o polymc_48.png polymc.svg
inkscape -w 64 -h 64 -o logo_64.png logo.svg inkscape -w 64 -h 64 -o polymc_64.png polymc.svg
inkscape -w 128 -h 128 -o logo_128.png logo.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 256 -h 256 -o polymc_256.png polymc.svg
inkscape -w 512 -h 512 -o logo_512.png logo.svg inkscape -w 512 -h 512 -o polymc_512.png polymc.svg
inkscape -w 1024 -h 1024 -o logo_1024.png logo.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

View File

@ -1,271 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="68.26667"
height="68.26667"
id="svg4427"
version="1.1"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
sodipodi:docname="logo.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs
id="defs4429">
<linearGradient
id="linearGradient5668"
inkscape:collect="always">
<stop
id="stop5670"
offset="0"
style="stop-color:#75b54b;stop-opacity:1;" />
<stop
id="stop5672"
offset="1"
style="stop-color:#75b54b;stop-opacity:0.6" />
</linearGradient>
<linearGradient
id="linearGradient5084"
inkscape:collect="always">
<stop
id="stop5086"
offset="0"
style="stop-color:#000000;stop-opacity:0.8" />
<stop
id="stop5088"
offset="1"
style="stop-color:#000000;stop-opacity:0.35" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5668"
id="linearGradient5072"
x1="6.7342591"
y1="28.510933"
x2="50.506943"
y2="61.773685"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-0.01532073,-0.00938002)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5084"
id="linearGradient5082"
x1="14.312115"
y1="9.7948904"
x2="44.097023"
y2="82.973114"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5668"
id="linearGradient3281"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-0.01532073,-0.00938002)"
x1="6.7342591"
y1="28.510933"
x2="50.506943"
y2="61.773685" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5668"
id="linearGradient3283"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-0.01532073,-0.00938002)"
x1="6.7342591"
y1="28.510933"
x2="50.506943"
y2="61.773685" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5084"
id="linearGradient3288"
gradientUnits="userSpaceOnUse"
x1="14.312115"
y1="9.7948904"
x2="44.097023"
y2="82.973114" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5084"
id="linearGradient3290"
gradientUnits="userSpaceOnUse"
x1="14.312115"
y1="9.7948904"
x2="44.097023"
y2="82.973114" />
<linearGradient
inkscape:collect="always"
id="linearGradient5580">
<stop
style="stop-color:#000000;stop-opacity:0.0627451"
offset="0"
id="stop5576" />
<stop
style="stop-color:#252424;stop-opacity:0.58823532"
offset="1"
id="stop5578" />
</linearGradient>
<linearGradient
id="linearGradient3999"
inkscape:collect="always">
<stop
id="stop3995"
offset="0"
style="stop-color:#777777;stop-opacity:1" />
<stop
id="stop3997"
offset="1"
style="stop-color:#4f4e4e;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient2727"
inkscape:collect="always">
<stop
id="stop2723"
offset="0"
style="stop-color:#7f8080;stop-opacity:1" />
<stop
id="stop2725"
offset="1"
style="stop-color:#404040;stop-opacity:1" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2727"
id="linearGradient2050"
gradientUnits="userSpaceOnUse"
x1="36.546478"
y1="33.80484"
x2="86.415741"
y2="97.065842"
gradientTransform="translate(-0.0016031,-4.5764148e-4)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3999"
id="radialGradient2052"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-0.00142193,-4.5702768e-4)"
cx="34.133331"
cy="34.133335"
fx="34.133331"
fy="34.133335"
r="29.866665" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5580"
id="linearGradient2140"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-0.0010513,-9.083059e-4)"
x1="29.866674"
y1="29.867579"
x2="38.400005"
y2="38.400913" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="8.0000001"
inkscape:cx="-15.9375"
inkscape:cy="15.75"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="3840"
inkscape:window-height="2129"
inkscape:window-x="1200"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:snap-bbox="true"
inkscape:bbox-paths="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:bbox-nodes="true"
inkscape:snap-bbox-midpoints="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="false"
inkscape:snap-intersection-paths="true"
inkscape:object-paths="true"
inkscape:snap-object-midpoints="true"
inkscape:snap-text-baseline="true"
inkscape:snap-center="true"
inkscape:pagecheckerboard="0">
<inkscape:grid
type="xygrid"
id="grid4446"
empspacing="16"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
spacingx="4.2666667"
spacingy="4.2666667"
originx="0"
originy="0" />
</sodipodi:namedview>
<metadata
id="metadata4432">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g2048"
transform="translate(9.113e-4,0.00104183)">
<rect
rx="8.5333338"
ry="8.5333338"
style="fill:url(#linearGradient2050);fill-opacity:1;stroke:none;stroke-width:17.0667"
id="rect2026"
width="68.266998"
height="68.26667"
x="-0.0016037956"
y="-0.00045376646" />
<rect
rx="4.2666626"
y="4.2662144"
x="4.2652307"
height="59.733334"
width="59.73333"
id="rect2028"
style="opacity:0.5;fill:url(#radialGradient2052);fill-opacity:1;stroke:none;stroke-width:14.9333"
ry="4.2666669" />
<path
style="opacity:1;fill:url(#linearGradient2140);fill-opacity:1;stroke:none;stroke-width:17.06666756"
d="m 8.5322887,-9.083059e-4 c -4.72747,0 -8.5332,3.8057359059 -8.5332,8.5332029059 V 59.731515 c 0,4.727467 3.80573,8.535156 8.5332,8.535156 H 59.731502 c 4.72747,0 8.5332,-3.807689 8.5332,-8.535156 V 8.5322946 c 0,-4.727467 -3.80573,-8.5332029059 -8.5332,-8.5332029059 z m 0,4.2675779059 H 59.731502 c 2.36373,0 4.26758,1.901892 4.26758,4.265625 V 59.731515 c 0,2.363733 -1.90385,4.267578 -4.26758,4.267578 H 8.5322887 c -2.36373,0 -4.26758,-1.903845 -4.26758,-4.267578 V 8.5322946 c 0,-2.363733 1.90385,-4.265625 4.26758,-4.265625 z"
id="path2046"
inkscape:connector-curvature="0" />
</g>
<path
style="fill:#000000;fill-opacity:0.494118;fill-rule:evenodd;stroke:none;stroke-width:0.999996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 17.343575,15.030602 -1e-6,43.517002 38.229105,-21.758501 z"
id="path1382"
sodipodi:nodetypes="cccc" />
<path
style="fill:#00ff66;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.999996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 16.888808,11.986385 -1e-6,43.517003 38.229104,-21.758501 z"
id="path1059"
sodipodi:nodetypes="cccc" />
<path
id="path13539"
style="fill:#ff00ff;fill-opacity:0.992157;fill-rule:evenodd;stroke:none;stroke-width:0.999996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 19.576616,50.882478 C 29.612077,45.170295 39.647539,39.458112 49.682999,33.745928 39.647539,28.032869 29.612077,22.319811 19.576616,16.606753 c 0,11.425241 0,22.850484 0,34.275725 z" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 8.9 KiB

View File

@ -4,7 +4,7 @@ Name=PolyMC
Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
Type=Application Type=Application
Terminal=false Terminal=false
Exec=polymc Exec=@Launcher_APP_BINARY_NAME@
StartupNotify=true StartupNotify=true
Icon=polymc Icon=polymc
Categories=Game; Categories=Game;

BIN
program_info/polymc.icns Normal file

Binary file not shown.

BIN
program_info/polymc.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 KiB

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity name="MultiMC.Application.5" type="win32" version="5.0.0.0" /> <assemblyIdentity name="PolyMC.Application.5" type="win32" version="5.0.0.0" />
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security> <security>
<requestedPrivileges> <requestedPrivileges>

View File

@ -1,8 +1,6 @@
<!DOCTYPE RCC> <!DOCTYPE RCC>
<RCC version="1.0"> <RCC version="1.0">
<qresource prefix="/"> <qresource prefix="/">
<file>logo.svg</file> <file>polymc.svg</file>
</qresource> </qresource>
</RCC> </RCC>

View File

@ -3,8 +3,8 @@
#endif #endif
#include <windows.h> #include <windows.h>
IDI_ICON1 ICON DISCARDABLE "Launcher.ico" IDI_ICON1 ICON DISCARDABLE "polymc.ico"
1 RT_MANIFEST "Launcher.manifest" 1 RT_MANIFEST "polymc.manifest"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,0 FILEVERSION 1,0,0,0
@ -15,10 +15,10 @@ BEGIN
BEGIN BEGIN
BLOCK "000004b0" BLOCK "000004b0"
BEGIN BEGIN
VALUE "CompanyName", "MultiMC Contributors" VALUE "CompanyName", "MultiMC & PolyMC Contributors"
VALUE "FileDescription", "A Minecraft Launcher" VALUE "FileDescription", "A Minecraft Launcher"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
VALUE "ProductName", "Launcher" VALUE "ProductName", "PolyMC"
VALUE "ProductVersion", "5" VALUE "ProductVersion", "5"
END END
END END

17
program_info/polymc.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 47 KiB