Date: Sun, 9 Jan 2022 13:51:46 -0500
Subject: [PATCH] remove patreon stuff
Closes: #22
Update to 1.0.5
Remove "Forking/Redistribution" tab in About (why is it even there?)
Metainfo now corresponds to version
add discord
Completely removed Patreon.
---
CMakeLists.txt | 6 +--
launcher/resources/OSX/OSX.qrc | 1 -
launcher/resources/flat/flat.qrc | 1 -
launcher/resources/iOS/iOS.qrc | 1 -
launcher/resources/multimc/multimc.qrc | 8 ----
launcher/resources/pe_blue/pe_blue.qrc | 1 -
launcher/resources/pe_colored/pe_colored.qrc | 1 -
launcher/resources/pe_dark/pe_dark.qrc | 1 -
launcher/resources/pe_light/pe_light.qrc | 2 -
launcher/ui/MainWindow.cpp | 14 ------
launcher/ui/MainWindow.h | 3 +-
launcher/ui/dialogs/AboutDialog.cpp | 40 +-----------------
launcher/ui/dialogs/AboutDialog.h | 9 +---
launcher/ui/dialogs/AboutDialog.ui | 15 -------
program_info/CMakeLists.txt | 1 +
....xml => org.polymc.PolyMC.metainfo.xml.in} | 2 +-
program_info/polymc.icns | Bin 33406 -> 272578 bytes
program_info/polymc.ico | Bin 15086 -> 102134 bytes
18 files changed, 9 insertions(+), 97 deletions(-)
rename program_info/{org.polymc.PolyMC.metainfo.xml => org.polymc.PolyMC.metainfo.xml.in} (97%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d3e8bab..2af0aa71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@ set(Launcher_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fet
######## Set version numbers ########
set(Launcher_VERSION_MAJOR 1)
set(Launcher_VERSION_MINOR 0)
-set(Launcher_VERSION_HOTFIX 3)
+set(Launcher_VERSION_HOTFIX 5)
# Build number
set(Launcher_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
@@ -81,7 +81,7 @@ set(Launcher_MSA_CLIENT_ID "17b47edd-c884-4997-926d-9e7f9a6b4647" CACHE STRING "
set(Launcher_BUG_TRACKER_URL "https://github.com/PolyMC/PolyMC/issues" CACHE STRING "URL for the bug tracker.")
# Discord URL
-set(Launcher_DISCORD_URL "" CACHE STRING "URL for the Discord guild.")
+set(Launcher_DISCORD_URL "https://discord.gg/Z52pwxWCHP" CACHE STRING "URL for the Discord guild.")
# Subreddit URL
set(Launcher_SUBREDDIT_URL "" CACHE STRING "URL for the subreddit.")
@@ -212,7 +212,7 @@ elseif(Launcher_LAYOUT_REAL STREQUAL "lin-system")
SET(Launcher_APP_BINARY_DEFS "-DMULTIMC_JARS_LOCATION=${CMAKE_INSTALL_PREFIX}/${JARS_DEST_DIR}" "-DLAUNCHER_LINUX_DATADIR")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_Desktop} DESTINATION ${Launcher_DESKTOP_DEST_DIR})
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_MetaInfo} DESTINATION ${Launcher_METAINFO_DEST_DIR})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_MetaInfo} DESTINATION ${Launcher_METAINFO_DEST_DIR})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_SVG} DESTINATION ${Launcher_ICON_DEST_DIR})
# install as bundle with no dependencies included
diff --git a/launcher/resources/OSX/OSX.qrc b/launcher/resources/OSX/OSX.qrc
index b85313e1..3eca8e19 100644
--- a/launcher/resources/OSX/OSX.qrc
+++ b/launcher/resources/OSX/OSX.qrc
@@ -23,7 +23,6 @@
scalable/new.svg
scalable/news.svg
scalable/notes.svg
- scalable/patreon.svg
scalable/proxy.svg
scalable/refresh.svg
scalable/resourcepacks.svg
diff --git a/launcher/resources/flat/flat.qrc b/launcher/resources/flat/flat.qrc
index a888f6d4..d2b752b1 100644
--- a/launcher/resources/flat/flat.qrc
+++ b/launcher/resources/flat/flat.qrc
@@ -26,7 +26,6 @@
scalable/news.svg
scalable/notes.svg
scalable/packages.svg
- scalable/patreon.svg
scalable/proxy.svg
scalable/quickmods.svg
scalable/reddit-alien.svg
diff --git a/launcher/resources/iOS/iOS.qrc b/launcher/resources/iOS/iOS.qrc
index 5eec744c..f05cd67c 100644
--- a/launcher/resources/iOS/iOS.qrc
+++ b/launcher/resources/iOS/iOS.qrc
@@ -23,7 +23,6 @@
scalable/new.svg
scalable/news.svg
scalable/notes.svg
- scalable/patreon.svg
scalable/proxy.svg
scalable/refresh.svg
scalable/resourcepacks.svg
diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc
index 5b36cb3d..58b1d763 100644
--- a/launcher/resources/multimc/multimc.qrc
+++ b/launcher/resources/multimc/multimc.qrc
@@ -77,14 +77,6 @@
scalable/custom-commands.svg
-
- 16x16/patreon.png
- 22x22/patreon.png
- 24x24/patreon.png
- 32x32/patreon.png
- 48x48/patreon.png
- 64x64/patreon.png
-
16x16/cat.png
22x22/cat.png
diff --git a/launcher/resources/pe_blue/pe_blue.qrc b/launcher/resources/pe_blue/pe_blue.qrc
index c78d21ad..456963b7 100644
--- a/launcher/resources/pe_blue/pe_blue.qrc
+++ b/launcher/resources/pe_blue/pe_blue.qrc
@@ -23,7 +23,6 @@
scalable/new.svg
scalable/news.svg
scalable/notes.svg
- scalable/patreon.svg
scalable/proxy.svg
scalable/refresh.svg
scalable/resourcepacks.svg
diff --git a/launcher/resources/pe_colored/pe_colored.qrc b/launcher/resources/pe_colored/pe_colored.qrc
index abe2cdb4..92a78b5c 100644
--- a/launcher/resources/pe_colored/pe_colored.qrc
+++ b/launcher/resources/pe_colored/pe_colored.qrc
@@ -23,7 +23,6 @@
scalable/new.svg
scalable/news.svg
scalable/notes.svg
- scalable/patreon.svg
scalable/proxy.svg
scalable/refresh.svg
scalable/resourcepacks.svg
diff --git a/launcher/resources/pe_dark/pe_dark.qrc b/launcher/resources/pe_dark/pe_dark.qrc
index 03ae7ef9..929b310d 100644
--- a/launcher/resources/pe_dark/pe_dark.qrc
+++ b/launcher/resources/pe_dark/pe_dark.qrc
@@ -23,7 +23,6 @@
scalable/new.svg
scalable/news.svg
scalable/notes.svg
- scalable/patreon.svg
scalable/proxy.svg
scalable/refresh.svg
scalable/resourcepacks.svg
diff --git a/launcher/resources/pe_light/pe_light.qrc b/launcher/resources/pe_light/pe_light.qrc
index 93d00205..25fde872 100644
--- a/launcher/resources/pe_light/pe_light.qrc
+++ b/launcher/resources/pe_light/pe_light.qrc
@@ -23,7 +23,6 @@
scalable/new.svg
scalable/news.svg
scalable/notes.svg
- scalable/patreon.svg
scalable/proxy.svg
scalable/refresh.svg
scalable/resourcepacks.svg
@@ -37,4 +36,3 @@
scalable/worlds.svg
-
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index b06f3d5a..3dcc8ee9 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -201,7 +201,6 @@ public:
//TranslatedAction actionRefresh;
TranslatedAction actionCheckUpdate;
TranslatedAction actionSettings;
- TranslatedAction actionPatreon;
TranslatedAction actionMoreNews;
TranslatedAction actionManageAccounts;
TranslatedAction actionLaunchInstance;
@@ -400,14 +399,6 @@ public:
mainToolBar->addSeparator();
- actionPatreon = TranslatedAction(MainWindow);
- actionPatreon->setObjectName(QStringLiteral("actionPatreon"));
- actionPatreon->setIcon(APPLICATION->getThemedIcon("patreon"));
- actionPatreon.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Support %1"));
- actionPatreon.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the %1 Patreon page."));
- all_actions.append(&actionPatreon);
- mainToolBar->addAction(actionPatreon);
-
actionCAT = TranslatedAction(MainWindow);
actionCAT->setObjectName(QStringLiteral("actionCAT"));
actionCAT->setCheckable(true);
@@ -1694,11 +1685,6 @@ void MainWindow::on_actionReportBug_triggered()
DesktopServices::openUrl(QUrl(BuildConfig.BUG_TRACKER_URL));
}
-void MainWindow::on_actionPatreon_triggered()
-{
- DesktopServices::openUrl(QUrl("https://www.patreon.com/multimc"));
-}
-
void MainWindow::on_actionMoreNews_triggered()
{
DesktopServices::openUrl(QUrl("https://multimc.org/posts.html"));
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index e462c524..f6940ab0 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -109,8 +109,6 @@ private slots:
void on_actionReportBug_triggered();
- void on_actionPatreon_triggered();
-
void on_actionMoreNews_triggered();
void newsButtonClicked();
@@ -223,3 +221,4 @@ private:
// managed by the application object
Task *m_versionLoadTask = nullptr;
};
+
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index 9795c38b..2ba34f1a 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -26,9 +26,8 @@
namespace {
// Credits
// This is a hack, but I can't think of a better way to do this easily without screwing with QTextDocument...
-QString getCreditsHtml(QStringList patrons)
+QString getCreditsHtml()
{
- QString patronsHeading = QObject::tr("Patrons", "About Credits");
QString output;
QTextStream stream(&output);
stream.setCodec(QTextCodec::codecForName("UTF-8"));
@@ -50,13 +49,6 @@ QString getCreditsHtml(QStringList patrons)
stream << "Zeker Zhayard <@Zeker_Zhayard>
\n";
stream << "
\n";
- if(!patrons.isEmpty()) {
- stream << "" << QObject::tr("Patrons", "About Credits") << "
\n";
- for (QString patron : patrons)
- {
- stream << "" << patron << "
\n";
- }
- }
stream << "\n";
return output;
}
@@ -80,7 +72,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
setWindowTitle(tr("About %1").arg(launcherName));
- QString chtml = getCreditsHtml(QStringList());
+ QString chtml = getCreditsHtml();
ui->creditsText->setHtml(chtml);
QString lhtml = getLicenseHtml();
@@ -104,15 +96,6 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
else
ui->channelLabel->setVisible(false);
- ui->redistributionText->setHtml(tr(
-"We keep MultiMC open source because we think it's important to be able to see the source code for a project like this, and we do so using the Apache license.
\n"
-"Part of the reason for using the Apache license is we don't want people using the "MultiMC" name when redistributing the project. "
-"This means people must take the time to go through the source code and remove all references to "MultiMC", including but not limited to the project "
-"icon and the title of windows, (no MultiMC-fork in the title).
\n"
-"The Apache license covers reasonable use for the name - a mention of the project's origins in the About dialog and the license is acceptable. "
-"However, it should be abundantly clear that the project is a fork without implying that you have our blessing.
"
- ));
-
QString urlText("