NOISSUE finish up the obvious parts of debranding

This is not absolutely complete, but reasonably so
This commit is contained in:
Petr Mrázek 2021-10-20 23:06:21 +02:00
parent 5b3dffce62
commit d9b46289a1
7 changed files with 253 additions and 47 deletions

View File

@ -11,6 +11,7 @@ Config::Config()
LAUNCHER_COPYRIGHT = "@Launcher_Copyright@"; LAUNCHER_COPYRIGHT = "@Launcher_Copyright@";
LAUNCHER_DOMAIN = "@Launcher_Domain@"; LAUNCHER_DOMAIN = "@Launcher_Domain@";
LAUNCHER_CONFIGFILE = "@Launcher_ConfigFile@"; LAUNCHER_CONFIGFILE = "@Launcher_ConfigFile@";
LAUNCHER_GIT = "@Launcher_Git@";
USER_AGENT = "@Launcher_UserAgent@"; USER_AGENT = "@Launcher_UserAgent@";
USER_AGENT_UNCACHED = USER_AGENT + " (Uncached)"; USER_AGENT_UNCACHED = USER_AGENT + " (Uncached)";

View File

@ -13,6 +13,7 @@ public:
QString LAUNCHER_COPYRIGHT; QString LAUNCHER_COPYRIGHT;
QString LAUNCHER_DOMAIN; QString LAUNCHER_DOMAIN;
QString LAUNCHER_CONFIGFILE; QString LAUNCHER_CONFIGFILE;
QString LAUNCHER_GIT;
/// The major version number. /// The major version number.
int VERSION_MAJOR; int VERSION_MAJOR;

View File

@ -113,6 +113,12 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
"However, it should be abundantly clear that the project is a fork <b>without</b> implying that you have our blessing.</p>" "However, it should be abundantly clear that the project is a fork <b>without</b> implying that you have our blessing.</p>"
)); ));
QString urlText("<html><head/><body><p><a href=\"%1\">%1</a></p></body></html>");
ui->urlLabel->setText(urlText.arg(BuildConfig.LAUNCHER_GIT));
QString copyText("© 2012-2021 %1");
ui->copyLabel->setText(copyText.arg(BuildConfig.LAUNCHER_COPYRIGHT));
connect(ui->closeButton, SIGNAL(clicked()), SLOT(close())); connect(ui->closeButton, SIGNAL(clicked()), SLOT(close()));
connect(ui->aboutQt, &QPushButton::clicked, &QApplication::aboutQt); connect(ui->aboutQt, &QPushButton::clicked, &QApplication::aboutQt);

View File

@ -97,6 +97,60 @@
<string>About</string> <string>About</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QLabel" name="aboutLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A custom launcher that makes managing Minecraft easier by allowing you to have multiple instances of Minecraft at once.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="urlLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string notr="true">GIT URL</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="copyLabel">
<property name="font">
<font>
<pointsize>8</pointsize>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string notr="true">COPYRIGHT</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="versionLabel"> <widget class="QLabel" name="versionLabel">
<property name="text"> <property name="text">
@ -137,53 +191,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="aboutLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;MultiMC is a custom launcher that makes managing Minecraft easier by allowing you to have multiple instances of Minecraft at once.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="copyLabel">
<property name="font">
<font>
<pointsize>8</pointsize>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string>© 2012-2021 MultiMC Contributors</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="urlLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/MultiMC/MultiMC5&quot;&gt;https://github.com/MultiMC/MultiMC5&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">

View File

@ -10,6 +10,9 @@
<file alias="32x32/flame.png">32x32/instances/flame.png</file> <file alias="32x32/flame.png">32x32/instances/flame.png</file>
<file alias="128x128/flame.png">128x128/instances/flame.png</file> <file alias="128x128/flame.png">128x128/instances/flame.png</file>
<!-- launcher settings page -->
<file>scalable/launcher.svg</file>
<!-- technic logo icon --> <!-- technic logo icon -->
<file>scalable/technic.svg</file> <file>scalable/technic.svg</file>

View File

@ -0,0 +1,187 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
version="1.1"
width="32"
height="32"
id="svg2"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
sodipodi:docname="launcher.svg"
inkscape:export-filename="/home/peterix/minecraft/src/MultiMC5/application/resources/multimc/64x64/status-running.png"
inkscape:export-xdpi="180"
inkscape:export-ydpi="180"
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/">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1502"
inkscape:window-height="1405"
id="namedview32"
showgrid="true"
inkscape:snap-bbox="true"
inkscape:bbox-nodes="false"
inkscape:bbox-paths="false"
inkscape:snap-bbox-midpoints="false"
inkscape:snap-bbox-edge-midpoints="false"
inkscape:object-paths="true"
inkscape:snap-intersection-paths="true"
inkscape:object-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="false"
inkscape:zoom="29.5"
inkscape:cx="7.9152543"
inkscape:cy="16.576271"
inkscape:window-x="2015"
inkscape:window-y="586"
inkscape:window-maximized="0"
inkscape:current-layer="layer1"
inkscape:pagecheckerboard="0">
<inkscape:grid
type="xygrid"
id="grid4160"
spacingx="0.5"
spacingy="0.5"
empspacing="8" />
</sodipodi:namedview>
<defs
id="defs4">
<linearGradient
id="linearGradient4162">
<stop
offset="0"
style="stop-color:#0071f1;stop-opacity:1"
id="stop4164" />
<stop
offset="1"
style="stop-color:#007ec3;stop-opacity:1"
id="stop4166" />
</linearGradient>
<linearGradient
id="linearGradient3827">
<stop
id="stop3829"
style="stop-color:#b80000;stop-opacity:1"
offset="0" />
<stop
id="stop3831"
style="stop-color:#600000;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient3801">
<stop
id="stop3803"
style="stop-color:#f1ab00;stop-opacity:1"
offset="0" />
<stop
id="stop3805"
style="stop-color:#c39a00;stop-opacity:1"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient3005">
<stop
id="stop3007"
style="stop-color:#ffffff;stop-opacity:1"
offset="0" />
<stop
id="stop3781"
style="stop-color:#ffffff;stop-opacity:0.49803922"
offset="0.8142857" />
<stop
id="stop3009"
style="stop-color:#ffffff;stop-opacity:0"
offset="1" />
</linearGradient>
<filter
color-interpolation-filters="sRGB"
id="filter3797">
<feGaussianBlur
id="feGaussianBlur3799"
stdDeviation="0.52592593" />
</filter>
<radialGradient
cx="3.9371533"
cy="7.5016646"
r="2.5"
fx="3.9371533"
fy="7.5016646"
id="radialGradient3807"
xlink:href="#linearGradient4162"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.4496779,1.5407764,-0.90127514,0.84794135,4.9906134,-4.9255796)" />
<radialGradient
cx="3.9371533"
cy="7.5016646"
r="2.5"
fx="3.9371533"
fy="7.5016646"
id="radialGradient3823"
xlink:href="#linearGradient3827"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.4496779,1.5407764,-0.90127514,0.84794135,4.9906134,-4.9255796)" />
<radialGradient
cx="3.9371533"
cy="7.5016646"
r="2.5"
fx="3.9371533"
fy="7.5016646"
id="radialGradient3786"
xlink:href="#linearGradient3801"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.4496779,1.5407764,-0.90127514,0.84794135,4.9906134,-4.9255796)" />
</defs>
<metadata
id="metadata7">
<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
transform="translate(0,-1020.3622)"
id="layer1">
<path
d="m 8,9.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
transform="matrix(6.4,0,0,6.4,-19.2,975.5622)"
id="path2997"
style="color:#000000;fill:url(#radialGradient3807);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
d="M 31,16 A 15,15 0 1 1 1,16 15,15 0 1 1 31,16 z"
transform="matrix(0.93333333,0,0,0.93333444,1.0666666,1021.4288)"
id="path2999"
style="color:#000000;fill:#009cff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<g
id="g4187">
<path
inkscape:connector-curvature="0"
id="path4168"
d="m 10.455414,1028.3241 0,16.0761 L 24,1036.3622 Z"
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.95251006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
style="opacity:0.54887217;fill:#ffffff;stroke:none"
id="path3809-3"
d="m 10.5,1044.3622 0,-16 13.5,8 z" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 6.0 KiB

View File

@ -11,6 +11,7 @@ set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
set(Launcher_DisplayName "${Launcher_CommonName} 5" PARENT_SCOPE) set(Launcher_DisplayName "${Launcher_CommonName} 5" PARENT_SCOPE)
set(Launcher_UserAgent "${Launcher_CommonName}/5.0" PARENT_SCOPE) set(Launcher_UserAgent "${Launcher_CommonName}/5.0" PARENT_SCOPE)
set(Launcher_ConfigFile "devlauncher.cfg" PARENT_SCOPE) set(Launcher_ConfigFile "devlauncher.cfg" PARENT_SCOPE)
set(Launcher_Git "https://github.com/MultiMC/MultiMC5" PARENT_SCOPE)
set(Launcher_Branding_ICNS "notsecrets/Launcher.icns" PARENT_SCOPE) set(Launcher_Branding_ICNS "notsecrets/Launcher.icns" PARENT_SCOPE)
set(Launcher_Branding_WindowsRC "notsecrets/launcher.rc" PARENT_SCOPE) set(Launcher_Branding_WindowsRC "notsecrets/launcher.rc" PARENT_SCOPE)