From d9b46289a1b9eec5bda19bd168750afba23a9ca4 Mon Sep 17 00:00:00 2001
From: Petr Mrázek
Date: Wed, 20 Oct 2021 23:06:21 +0200
Subject: NOISSUE finish up the obvious parts of debranding
This is not absolutely complete, but reasonably so
---
buildconfig/BuildConfig.cpp.in | 1 +
buildconfig/BuildConfig.h | 1 +
launcher/dialogs/AboutDialog.cpp | 6 +
launcher/dialogs/AboutDialog.ui | 69 +++++----
launcher/resources/multimc/multimc.qrc | 3 +
launcher/resources/multimc/scalable/launcher.svg | 187 +++++++++++++++++++++++
notsecrets/CMakeLists.txt | 1 +
7 files changed, 237 insertions(+), 31 deletions(-)
create mode 100644 launcher/resources/multimc/scalable/launcher.svg
diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in
index 40940793..9e449aec 100644
--- a/buildconfig/BuildConfig.cpp.in
+++ b/buildconfig/BuildConfig.cpp.in
@@ -11,6 +11,7 @@ Config::Config()
LAUNCHER_COPYRIGHT = "@Launcher_Copyright@";
LAUNCHER_DOMAIN = "@Launcher_Domain@";
LAUNCHER_CONFIGFILE = "@Launcher_ConfigFile@";
+ LAUNCHER_GIT = "@Launcher_Git@";
USER_AGENT = "@Launcher_UserAgent@";
USER_AGENT_UNCACHED = USER_AGENT + " (Uncached)";
diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h
index 641bd602..ac05f288 100644
--- a/buildconfig/BuildConfig.h
+++ b/buildconfig/BuildConfig.h
@@ -13,6 +13,7 @@ public:
QString LAUNCHER_COPYRIGHT;
QString LAUNCHER_DOMAIN;
QString LAUNCHER_CONFIGFILE;
+ QString LAUNCHER_GIT;
/// The major version number.
int VERSION_MAJOR;
diff --git a/launcher/dialogs/AboutDialog.cpp b/launcher/dialogs/AboutDialog.cpp
index a4d30c3c..0c3f07db 100644
--- a/launcher/dialogs/AboutDialog.cpp
+++ b/launcher/dialogs/AboutDialog.cpp
@@ -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 without implying that you have our blessing."
));
+ QString urlText("%1
");
+ 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->aboutQt, &QPushButton::clicked, &QApplication::aboutQt);
diff --git a/launcher/dialogs/AboutDialog.ui b/launcher/dialogs/AboutDialog.ui
index 6dcc6ff4..422e877b 100644
--- a/launcher/dialogs/AboutDialog.ui
+++ b/launcher/dialogs/AboutDialog.ui
@@ -98,19 +98,30 @@
-
-
+
+
+ true
+
- Version:
+ <html><head/><body><p>A custom launcher that makes managing Minecraft easier by allowing you to have multiple instances of Minecraft at once.</p></body></html>
Qt::AlignCenter
+
+ true
+
-
-
+
+
+
+ 10
+
+
- Platform:
+ GIT URL
Qt::AlignCenter
@@ -118,9 +129,15 @@
-
-
+
+
+
+ 8
+ true
+
+
- Build Number:
+ COPYRIGHT
Qt::AlignCenter
@@ -128,9 +145,16 @@
-
-
+
+
+ Qt::Horizontal
+
+
+
+ -
+
- Channel:
+ Version:
Qt::AlignCenter
@@ -138,31 +162,19 @@
-
-
-
- true
-
+
- <html><head/><body><p>MultiMC is a custom launcher that makes managing Minecraft easier by allowing you to have multiple instances of Minecraft at once.</p></body></html>
+ Platform:
Qt::AlignCenter
-
- true
-
-
-
-
-
- 8
- true
-
-
+
- © 2012-2021 MultiMC Contributors
+ Build Number:
Qt::AlignCenter
@@ -170,14 +182,9 @@
-
-
-
-
- 10
-
-
+
- <html><head/><body><p><a href="https://github.com/MultiMC/MultiMC5">https://github.com/MultiMC/MultiMC5</a></p></body></html>
+ Channel:
Qt::AlignCenter
diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc
index 5fb9ccf0..5b36cb3d 100644
--- a/launcher/resources/multimc/multimc.qrc
+++ b/launcher/resources/multimc/multimc.qrc
@@ -10,6 +10,9 @@
32x32/instances/flame.png
128x128/instances/flame.png
+
+ scalable/launcher.svg
+
scalable/technic.svg
diff --git a/launcher/resources/multimc/scalable/launcher.svg b/launcher/resources/multimc/scalable/launcher.svg
new file mode 100644
index 00000000..42a056d6
--- /dev/null
+++ b/launcher/resources/multimc/scalable/launcher.svg
@@ -0,0 +1,187 @@
+
+
+
+
diff --git a/notsecrets/CMakeLists.txt b/notsecrets/CMakeLists.txt
index f12b5274..2369d046 100644
--- a/notsecrets/CMakeLists.txt
+++ b/notsecrets/CMakeLists.txt
@@ -11,6 +11,7 @@ set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
set(Launcher_DisplayName "${Launcher_CommonName} 5" PARENT_SCOPE)
set(Launcher_UserAgent "${Launcher_CommonName}/5.0" 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_WindowsRC "notsecrets/launcher.rc" PARENT_SCOPE)
--
cgit