From ecade0f510dfc66e13881398c5200fb62c4606bc Mon Sep 17 00:00:00 2001 From: fn2006 Date: Mon, 24 Oct 2022 16:27:07 +0100 Subject: [PATCH] small fixes --- launcher/Application.cpp | 2 ++ launcher/resources/OSX/scalable/launcher.svg | 17 +++++++---------- launcher/resources/flat/scalable/launcher.svg | 17 +++++++---------- launcher/resources/iOS/scalable/launcher.svg | 17 +++++++---------- .../resources/multimc/scalable/launcher.svg | 17 +++++++---------- .../resources/pe_blue/scalable/launcher.svg | 17 +++++++---------- .../pe_colored/scalable/launcher.svg | 17 +++++++---------- .../resources/pe_dark/scalable/launcher.svg | 17 +++++++---------- .../resources/pe_light/scalable/launcher.svg | 17 +++++++---------- program_info/CMakeLists.txt | 6 +++--- program_info/pollymc.ico | Bin 102134 -> 102134 bytes program_info/pollymc.rc.in | 2 +- program_info/prismlauncher.qrc | 2 +- 13 files changed, 63 insertions(+), 85 deletions(-) diff --git a/launcher/Application.cpp b/launcher/Application.cpp index a9274260..fe14de93 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -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 diff --git a/launcher/resources/OSX/scalable/launcher.svg b/launcher/resources/OSX/scalable/launcher.svg index 64c6d335..64f8da74 100644 --- a/launcher/resources/OSX/scalable/launcher.svg +++ b/launcher/resources/OSX/scalable/launcher.svg @@ -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)"> - head - + 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" /> diff --git a/launcher/resources/flat/scalable/launcher.svg b/launcher/resources/flat/scalable/launcher.svg index 64c6d335..64f8da74 100644 --- a/launcher/resources/flat/scalable/launcher.svg +++ b/launcher/resources/flat/scalable/launcher.svg @@ -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)"> - head - + 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" /> diff --git a/launcher/resources/iOS/scalable/launcher.svg b/launcher/resources/iOS/scalable/launcher.svg index 64c6d335..64f8da74 100644 --- a/launcher/resources/iOS/scalable/launcher.svg +++ b/launcher/resources/iOS/scalable/launcher.svg @@ -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)"> - head - + 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" /> diff --git a/launcher/resources/multimc/scalable/launcher.svg b/launcher/resources/multimc/scalable/launcher.svg index 64c6d335..64f8da74 100644 --- a/launcher/resources/multimc/scalable/launcher.svg +++ b/launcher/resources/multimc/scalable/launcher.svg @@ -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)"> - head - + 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" /> diff --git a/launcher/resources/pe_blue/scalable/launcher.svg b/launcher/resources/pe_blue/scalable/launcher.svg index 64c6d335..64f8da74 100644 --- a/launcher/resources/pe_blue/scalable/launcher.svg +++ b/launcher/resources/pe_blue/scalable/launcher.svg @@ -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)"> - head - + 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" /> diff --git a/launcher/resources/pe_colored/scalable/launcher.svg b/launcher/resources/pe_colored/scalable/launcher.svg index 64c6d335..64f8da74 100644 --- a/launcher/resources/pe_colored/scalable/launcher.svg +++ b/launcher/resources/pe_colored/scalable/launcher.svg @@ -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)"> - head - + 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" /> diff --git a/launcher/resources/pe_dark/scalable/launcher.svg b/launcher/resources/pe_dark/scalable/launcher.svg index 64c6d335..64f8da74 100644 --- a/launcher/resources/pe_dark/scalable/launcher.svg +++ b/launcher/resources/pe_dark/scalable/launcher.svg @@ -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)"> - head - + 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" /> diff --git a/launcher/resources/pe_light/scalable/launcher.svg b/launcher/resources/pe_light/scalable/launcher.svg index 64c6d335..64f8da74 100644 --- a/launcher/resources/pe_light/scalable/launcher.svg +++ b/launcher/resources/pe_light/scalable/launcher.svg @@ -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)"> - head - + 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" /> diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt index ec87a6f5..686a4918 100644 --- a/program_info/CMakeLists.txt +++ b/program_info/CMakeLists.txt @@ -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) diff --git a/program_info/pollymc.ico b/program_info/pollymc.ico index 8664059efd36a4569f7eee868928b9e1d7c74fdd..5f4e0413d8b23151fe5c36bd01b3fcaa8926ab02 100644 GIT binary patch delta 2010 zcmex1m+jkJwhf$i^>?kUt?7>c|NqYb!J9iAx|B8xC9c^}&vd%GgB;9$qPsh0=i(#e z;)ZowbbyYTII(g2K4HcR#_eVzjJ7P+4tC!y$;8{&Niuq}Z~rdOXfIGNTNL(Rwj+)1 z7#hagw;C{V@ztN{EN2)%Tu*Py5h)Cu(zfrlXG{}_Jk^!Yc)IH@F<9g9)Ms^@*8V0A zZ?6ep)MGX<^Kg1#?CW}s7_6HZST{Ydn^9u&Dm9tyd?AbJvt6y2(Uwup-RZ1eod0Ybcza_B<55;?ok;Kh+KB<=;O&i7j6KZt zSlx=t57ZJz0%vn8~bz^r(1O~{#8EJ?aOq!YbFeb?OJp)ecQ5|Fx}&d+s{17cxVDc|NqYb!J9iAx|B8xC9c^}&v3f4fgH?ss;fC}=b{7T z;)ZowbbyYTII(g2K4HcR#_eVzjJ7P+cD6q)$;8{&Niuq}Z~rdOXfIGNmlyJ1t~r_R z7#hagw;C{V@zs+Vw&cVIHa%oVE;hr65ksUfa7x?0*Pby=Ao6r~0psbe2gG2F!&6?= zZC?AEIJ~_kfKiXxz|_;}jB+Le;K!THZUGzG(OQO0}4xY?7VN@jHsQ9)}!NwZQJ-J_UTMt z*TiTbVU`rSSuf6a1u`}XaF3nXCo!F`nbAes)XVv%PMm)gI#$o|-JaXbXvl0}7~uBb zAk>p63@kg-x1Vcce8?D&!`0}%Ad3$)dt;vt<8-So#=pvEIs=$abuWP7(A|s9rfpk# z2ZlR0ZseWVCo{dQn^9NT%lWx>N>B(4Yi5M&Y~R++n82t442S - org.prismlauncher.PrismLauncher.svg + org.fn2006.PollyMC.svg