0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
fn2006 2022-10-24 16:27:07 +01:00
parent 23e5773094
commit ecade0f510
13 changed files with 63 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/Application.cpp
View File

@ -301,11 +301,13 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
dataPath = foo.absolutePath();
adjustedBy = "Persistent data path";
/*
QDir polymcData(FS::PathCombine(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), "PolyMC"));
if (polymcData.exists()) {
dataPath = polymcData.absolutePath();
adjustedBy = "PolyMC data path";
}
*/
#ifdef Q_OS_LINUX
// TODO: this should be removed in a future version

17
launcher/resources/OSX/scalable/launcher.svg
View File

@ -25,8 +25,8 @@
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="12.697086"
inkscape:cx="24.966358"
inkscape:cy="30.558192"
inkscape:cx="35.638098"
inkscape:cy="31.345775"
inkscape:window-width="1920"
inkscape:window-height="994"
inkscape:window-x="0"
@ -72,13 +72,10 @@
clip-path="none"
transform="matrix(1.25,0,0,1.25,-8,-10.5)">
<path
id="path352"
id="path300"
style="fill:#8acb01"
inkscape:label="head"
d="M 8,16 H 32.03161 V 52 H 8 Z m 22.020351,0 H 56 V 47.200001 H 30.020351 Z m 1.153153,0 h 12 v 33.599998 h -12 z">
<title
id="title908">head</title>
</path>
d="m 8,16 c 0,12 0,24 0,36 8.010417,0 16.020833,0 24.03125,0 0,-0.8 0,-1.6 0,-2.4 3.714062,0 7.428125,0 11.142187,0 0,-0.8 0,-1.6 0,-2.4 4.275521,0 8.551042,0 12.826563,0 C 56,36.8 56,26.4 56,16 40,16 24,16 8,16 Z"
inkscape:label="head" />
<path
id="rect3493"
style="fill:#b0af8d;stroke-width:1.39562"
@ -90,9 +87,9 @@
d="M 19.960001,28 H 32.333299 V 40 H 19.960001 Z"
style="stroke-width:1.00871" />
<path
id="path928"
id="path352"
style="display:inline;fill:#3b3b3b;fill-opacity:1;stroke-width:1.00922"
d="M 32,27.999999 H 56 V 47.555555 H 32 Z m 0,0 h 12 v 22 H 32 Z"
d="m 32,28 c 0,7.333333 0,14.666667 0,22 4,0 8,0 12,0 0,-0.814583 0,-1.629167 0,-2.44375 4,0 8,0 12,0 C 56,41.0375 56,34.51875 56,28 48,28 40,28 32,28 Z"
inkscape:label="beak" />
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

17
launcher/resources/flat/scalable/launcher.svg
View File

@ -25,8 +25,8 @@
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="12.697086"
inkscape:cx="24.966358"
inkscape:cy="30.558192"
inkscape:cx="35.638098"
inkscape:cy="31.345775"
inkscape:window-width="1920"
inkscape:window-height="994"
inkscape:window-x="0"
@ -72,13 +72,10 @@
clip-path="none"
transform="matrix(1.25,0,0,1.25,-8,-10.5)">
<path
id="path352"
id="path300"
style="fill:#8acb01"
inkscape:label="head"
d="M 8,16 H 32.03161 V 52 H 8 Z m 22.020351,0 H 56 V 47.200001 H 30.020351 Z m 1.153153,0 h 12 v 33.599998 h -12 z">
<title
id="title908">head</title>
</path>
d="m 8,16 c 0,12 0,24 0,36 8.010417,0 16.020833,0 24.03125,0 0,-0.8 0,-1.6 0,-2.4 3.714062,0 7.428125,0 11.142187,0 0,-0.8 0,-1.6 0,-2.4 4.275521,0 8.551042,0 12.826563,0 C 56,36.8 56,26.4 56,16 40,16 24,16 8,16 Z"
inkscape:label="head" />
<path
id="rect3493"
style="fill:#b0af8d;stroke-width:1.39562"
@ -90,9 +87,9 @@
d="M 19.960001,28 H 32.333299 V 40 H 19.960001 Z"
style="stroke-width:1.00871" />
<path
id="path928"
id="path352"
style="display:inline;fill:#3b3b3b;fill-opacity:1;stroke-width:1.00922"
d="M 32,27.999999 H 56 V 47.555555 H 32 Z m 0,0 h 12 v 22 H 32 Z"
d="m 32,28 c 0,7.333333 0,14.666667 0,22 4,0 8,0 12,0 0,-0.814583 0,-1.629167 0,-2.44375 4,0 8,0 12,0 C 56,41.0375 56,34.51875 56,28 48,28 40,28 32,28 Z"
inkscape:label="beak" />
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

17
launcher/resources/iOS/scalable/launcher.svg
View File

@ -25,8 +25,8 @@
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="12.697086"
inkscape:cx="24.966358"
inkscape:cy="30.558192"
inkscape:cx="35.638098"
inkscape:cy="31.345775"
inkscape:window-width="1920"
inkscape:window-height="994"
inkscape:window-x="0"
@ -72,13 +72,10 @@
clip-path="none"
transform="matrix(1.25,0,0,1.25,-8,-10.5)">
<path
id="path352"
id="path300"
style="fill:#8acb01"
inkscape:label="head"
d="M 8,16 H 32.03161 V 52 H 8 Z m 22.020351,0 H 56 V 47.200001 H 30.020351 Z m 1.153153,0 h 12 v 33.599998 h -12 z">
<title
id="title908">head</title>
</path>
d="m 8,16 c 0,12 0,24 0,36 8.010417,0 16.020833,0 24.03125,0 0,-0.8 0,-1.6 0,-2.4 3.714062,0 7.428125,0 11.142187,0 0,-0.8 0,-1.6 0,-2.4 4.275521,0 8.551042,0 12.826563,0 C 56,36.8 56,26.4 56,16 40,16 24,16 8,16 Z"
inkscape:label="head" />
<path
id="rect3493"
style="fill:#b0af8d;stroke-width:1.39562"
@ -90,9 +87,9 @@
d="M 19.960001,28 H 32.333299 V 40 H 19.960001 Z"
style="stroke-width:1.00871" />
<path
id="path928"
id="path352"
style="display:inline;fill:#3b3b3b;fill-opacity:1;stroke-width:1.00922"
d="M 32,27.999999 H 56 V 47.555555 H 32 Z m 0,0 h 12 v 22 H 32 Z"
d="m 32,28 c 0,7.333333 0,14.666667 0,22 4,0 8,0 12,0 0,-0.814583 0,-1.629167 0,-2.44375 4,0 8,0 12,0 C 56,41.0375 56,34.51875 56,28 48,28 40,28 32,28 Z"
inkscape:label="beak" />
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

17
launcher/resources/multimc/scalable/launcher.svg
View File

@ -25,8 +25,8 @@
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="12.697086"
inkscape:cx="24.966358"
inkscape:cy="30.558192"
inkscape:cx="35.638098"
inkscape:cy="31.345775"
inkscape:window-width="1920"
inkscape:window-height="994"
inkscape:window-x="0"
@ -72,13 +72,10 @@
clip-path="none"
transform="matrix(1.25,0,0,1.25,-8,-10.5)">
<path
id="path352"
id="path300"
style="fill:#8acb01"
inkscape:label="head"
d="M 8,16 H 32.03161 V 52 H 8 Z m 22.020351,0 H 56 V 47.200001 H 30.020351 Z m 1.153153,0 h 12 v 33.599998 h -12 z">
<title
id="title908">head</title>
</path>
d="m 8,16 c 0,12 0,24 0,36 8.010417,0 16.020833,0 24.03125,0 0,-0.8 0,-1.6 0,-2.4 3.714062,0 7.428125,0 11.142187,0 0,-0.8 0,-1.6 0,-2.4 4.275521,0 8.551042,0 12.826563,0 C 56,36.8 56,26.4 56,16 40,16 24,16 8,16 Z"
inkscape:label="head" />
<path
id="rect3493"
style="fill:#b0af8d;stroke-width:1.39562"
@ -90,9 +87,9 @@
d="M 19.960001,28 H 32.333299 V 40 H 19.960001 Z"
style="stroke-width:1.00871" />
<path
id="path928"
id="path352"
style="display:inline;fill:#3b3b3b;fill-opacity:1;stroke-width:1.00922"
d="M 32,27.999999 H 56 V 47.555555 H 32 Z m 0,0 h 12 v 22 H 32 Z"
d="m 32,28 c 0,7.333333 0,14.666667 0,22 4,0 8,0 12,0 0,-0.814583 0,-1.629167 0,-2.44375 4,0 8,0 12,0 C 56,41.0375 56,34.51875 56,28 48,28 40,28 32,28 Z"
inkscape:label="beak" />
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

17
launcher/resources/pe_blue/scalable/launcher.svg
View File

@ -25,8 +25,8 @@
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="12.697086"
inkscape:cx="24.966358"
inkscape:cy="30.558192"
inkscape:cx="35.638098"
inkscape:cy="31.345775"
inkscape:window-width="1920"
inkscape:window-height="994"
inkscape:window-x="0"
@ -72,13 +72,10 @@
clip-path="none"
transform="matrix(1.25,0,0,1.25,-8,-10.5)">
<path
id="path352"
id="path300"
style="fill:#8acb01"
inkscape:label="head"
d="M 8,16 H 32.03161 V 52 H 8 Z m 22.020351,0 H 56 V 47.200001 H 30.020351 Z m 1.153153,0 h 12 v 33.599998 h -12 z">
<title
id="title908">head</title>
</path>
d="m 8,16 c 0,12 0,24 0,36 8.010417,0 16.020833,0 24.03125,0 0,-0.8 0,-1.6 0,-2.4 3.714062,0 7.428125,0 11.142187,0 0,-0.8 0,-1.6 0,-2.4 4.275521,0 8.551042,0 12.826563,0 C 56,36.8 56,26.4 56,16 40,16 24,16 8,16 Z"
inkscape:label="head" />
<path
id="rect3493"
style="fill:#b0af8d;stroke-width:1.39562"
@ -90,9 +87,9 @@
d="M 19.960001,28 H 32.333299 V 40 H 19.960001 Z"
style="stroke-width:1.00871" />
<path
id="path928"
id="path352"
style="display:inline;fill:#3b3b3b;fill-opacity:1;stroke-width:1.00922"
d="M 32,27.999999 H 56 V 47.555555 H 32 Z m 0,0 h 12 v 22 H 32 Z"
d="m 32,28 c 0,7.333333 0,14.666667 0,22 4,0 8,0 12,0 0,-0.814583 0,-1.629167 0,-2.44375 4,0 8,0 12,0 C 56,41.0375 56,34.51875 56,28 48,28 40,28 32,28 Z"
inkscape:label="beak" />
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

17
launcher/resources/pe_colored/scalable/launcher.svg
View File

@ -25,8 +25,8 @@
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="12.697086"
inkscape:cx="24.966358"
inkscape:cy="30.558192"
inkscape:cx="35.638098"
inkscape:cy="31.345775"
inkscape:window-width="1920"
inkscape:window-height="994"
inkscape:window-x="0"
@ -72,13 +72,10 @@
clip-path="none"
transform="matrix(1.25,0,0,1.25,-8,-10.5)">
<path
id="path352"
id="path300"
style="fill:#8acb01"
inkscape:label="head"
d="M 8,16 H 32.03161 V 52 H 8 Z m 22.020351,0 H 56 V 47.200001 H 30.020351 Z m 1.153153,0 h 12 v 33.599998 h -12 z">
<title
id="title908">head</title>
</path>
d="m 8,16 c 0,12 0,24 0,36 8.010417,0 16.020833,0 24.03125,0 0,-0.8 0,-1.6 0,-2.4 3.714062,0 7.428125,0 11.142187,0 0,-0.8 0,-1.6 0,-2.4 4.275521,0 8.551042,0 12.826563,0 C 56,36.8 56,26.4 56,16 40,16 24,16 8,16 Z"
inkscape:label="head" />
<path
id="rect3493"
style="fill:#b0af8d;stroke-width:1.39562"
@ -90,9 +87,9 @@
d="M 19.960001,28 H 32.333299 V 40 H 19.960001 Z"
style="stroke-width:1.00871" />
<path
id="path928"
id="path352"
style="display:inline;fill:#3b3b3b;fill-opacity:1;stroke-width:1.00922"
d="M 32,27.999999 H 56 V 47.555555 H 32 Z m 0,0 h 12 v 22 H 32 Z"
d="m 32,28 c 0,7.333333 0,14.666667 0,22 4,0 8,0 12,0 0,-0.814583 0,-1.629167 0,-2.44375 4,0 8,0 12,0 C 56,41.0375 56,34.51875 56,28 48,28 40,28 32,28 Z"
inkscape:label="beak" />
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

17
launcher/resources/pe_dark/scalable/launcher.svg
View File

@ -25,8 +25,8 @@
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="12.697086"
inkscape:cx="24.966358"
inkscape:cy="30.558192"
inkscape:cx="35.638098"
inkscape:cy="31.345775"
inkscape:window-width="1920"
inkscape:window-height="994"
inkscape:window-x="0"
@ -72,13 +72,10 @@
clip-path="none"
transform="matrix(1.25,0,0,1.25,-8,-10.5)">
<path
id="path352"
id="path300"
style="fill:#8acb01"
inkscape:label="head"
d="M 8,16 H 32.03161 V 52 H 8 Z m 22.020351,0 H 56 V 47.200001 H 30.020351 Z m 1.153153,0 h 12 v 33.599998 h -12 z">
<title
id="title908">head</title>
</path>
d="m 8,16 c 0,12 0,24 0,36 8.010417,0 16.020833,0 24.03125,0 0,-0.8 0,-1.6 0,-2.4 3.714062,0 7.428125,0 11.142187,0 0,-0.8 0,-1.6 0,-2.4 4.275521,0 8.551042,0 12.826563,0 C 56,36.8 56,26.4 56,16 40,16 24,16 8,16 Z"
inkscape:label="head" />
<path
id="rect3493"
style="fill:#b0af8d;stroke-width:1.39562"
@ -90,9 +87,9 @@
d="M 19.960001,28 H 32.333299 V 40 H 19.960001 Z"
style="stroke-width:1.00871" />
<path
id="path928"
id="path352"
style="display:inline;fill:#3b3b3b;fill-opacity:1;stroke-width:1.00922"
d="M 32,27.999999 H 56 V 47.555555 H 32 Z m 0,0 h 12 v 22 H 32 Z"
d="m 32,28 c 0,7.333333 0,14.666667 0,22 4,0 8,0 12,0 0,-0.814583 0,-1.629167 0,-2.44375 4,0 8,0 12,0 C 56,41.0375 56,34.51875 56,28 48,28 40,28 32,28 Z"
inkscape:label="beak" />
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

17
launcher/resources/pe_light/scalable/launcher.svg
View File

@ -25,8 +25,8 @@
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="12.697086"
inkscape:cx="24.966358"
inkscape:cy="30.558192"
inkscape:cx="35.638098"
inkscape:cy="31.345775"
inkscape:window-width="1920"
inkscape:window-height="994"
inkscape:window-x="0"
@ -72,13 +72,10 @@
clip-path="none"
transform="matrix(1.25,0,0,1.25,-8,-10.5)">
<path
id="path352"
id="path300"
style="fill:#8acb01"
inkscape:label="head"
d="M 8,16 H 32.03161 V 52 H 8 Z m 22.020351,0 H 56 V 47.200001 H 30.020351 Z m 1.153153,0 h 12 v 33.599998 h -12 z">
<title
id="title908">head</title>
</path>
d="m 8,16 c 0,12 0,24 0,36 8.010417,0 16.020833,0 24.03125,0 0,-0.8 0,-1.6 0,-2.4 3.714062,0 7.428125,0 11.142187,0 0,-0.8 0,-1.6 0,-2.4 4.275521,0 8.551042,0 12.826563,0 C 56,36.8 56,26.4 56,16 40,16 24,16 8,16 Z"
inkscape:label="head" />
<path
id="rect3493"
style="fill:#b0af8d;stroke-width:1.39562"
@ -90,9 +87,9 @@
d="M 19.960001,28 H 32.333299 V 40 H 19.960001 Z"
style="stroke-width:1.00871" />
<path
id="path928"
id="path352"
style="display:inline;fill:#3b3b3b;fill-opacity:1;stroke-width:1.00922"
d="M 32,27.999999 H 56 V 47.555555 H 32 Z m 0,0 h 12 v 22 H 32 Z"
d="m 32,28 c 0,7.333333 0,14.666667 0,22 4,0 8,0 12,0 0,-0.814583 0,-1.629167 0,-2.44375 4,0 8,0 12,0 C 56,41.0375 56,34.51875 56,28 48,28 40,28 32,28 Z"
inkscape:label="beak" />
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

6
program_info/CMakeLists.txt
View File

@ -14,7 +14,7 @@ set(Launcher_DisplayName "PollyMC")
set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
set(Launcher_Copyright "© 2022 PollyMC Contributors\\n© 2021-2022 PolyMC Contributors\\n© 2012-2021 MultiMC Contributors")
set(Launcher_Copyright "© 2022 PollyMC Contributors\\n© 2021-2022 Prism Launcher Contributors\\n© 2012-2021 MultiMC Contributors")
set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE)
set(Launcher_Domain "" PARENT_SCOPE)
set(Launcher_UserAgent "PrismLauncher/${Launcher_RELEASE_VERSION_NAME}" PARENT_SCOPE)
@ -25,11 +25,11 @@ set(Launcher_DesktopFileName "org.fn2006.PollyMC.desktop" PARENT_SCOPE)
set(Launcher_Desktop "program_info/org.fn2006.PollyMC.desktop" PARENT_SCOPE)
set(Launcher_MetaInfo "program_info/org.fn2006.PollyMC.metainfo.xml" PARENT_SCOPE)
set(Launcher_SVG "program_info/org.fn2006.PollyMC.svg" PARENT_SCOPE)
set(Launcher_Branding_ICNS "program_info/polymc.icns" PARENT_SCOPE)
set(Launcher_Branding_ICNS "program_info/prismlauncher.icns" PARENT_SCOPE)
set(Launcher_Branding_ICO "program_info/pollymc.ico")
set(Launcher_Branding_ICO "${Launcher_Branding_ICO}" PARENT_SCOPE)
set(Launcher_Branding_WindowsRC "program_info/pollymc.rc" PARENT_SCOPE)
set(Launcher_Branding_LogoQRC "program_info/polymc.qrc" PARENT_SCOPE)
set(Launcher_Branding_LogoQRC "program_info/prismlauncher.qrc" PARENT_SCOPE)
set(Launcher_Portable_File "program_info/portable.txt" PARENT_SCOPE)

BIN
program_info/pollymc.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

2
program_info/pollymc.rc.in
View File

@ -15,7 +15,7 @@ BEGIN
BEGIN
BLOCK "000004b0"
BEGIN
VALUE "CompanyName", "MultiMC & PolyMC & PollyMC Contributors"
VALUE "CompanyName", "MultiMC & Prism Launcher & PollyMC Contributors"
VALUE "FileDescription", "PollyMC"
VALUE "FileVersion", "@Launcher_VERSION_NAME4@"
VALUE "ProductName", "PollyMC"

2
program_info/prismlauncher.qrc
View File

@ -1,6 +1,6 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource prefix="/">
<file>org.prismlauncher.PrismLauncher.svg</file>
<file>org.fn2006.PollyMC.svg</file>
</qresource>
</RCC>