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.
2022-01-09 13:51:46 -05:00
parent b515cb478e
commit e50d07f791
18 changed files with 9 additions and 97 deletions
--- 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
--- a/launcher/resources/OSX/OSX.qrc
+++ b/launcher/resources/OSX/OSX.qrc
@@ -23,7 +23,6 @@
        <file>scalable/new.svg</file>
        <file>scalable/news.svg</file>
        <file>scalable/notes.svg</file>
-        <file>scalable/patreon.svg</file>
        <file>scalable/proxy.svg</file>
        <file>scalable/refresh.svg</file>
        <file>scalable/resourcepacks.svg</file>
--- a/launcher/resources/flat/flat.qrc
+++ b/launcher/resources/flat/flat.qrc
@@ -26,7 +26,6 @@
        <file>scalable/news.svg</file>
        <file>scalable/notes.svg</file>
        <file>scalable/packages.svg</file>
-        <file>scalable/patreon.svg</file>
        <file>scalable/proxy.svg</file>
        <file>scalable/quickmods.svg</file>
        <file>scalable/reddit-alien.svg</file>
--- a/launcher/resources/iOS/iOS.qrc
+++ b/launcher/resources/iOS/iOS.qrc
@@ -23,7 +23,6 @@
        <file>scalable/new.svg</file>
        <file>scalable/news.svg</file>
        <file>scalable/notes.svg</file>
-        <file>scalable/patreon.svg</file>
        <file>scalable/proxy.svg</file>
        <file>scalable/refresh.svg</file>
        <file>scalable/resourcepacks.svg</file>
--- a/launcher/resources/multimc/multimc.qrc
+++ b/launcher/resources/multimc/multimc.qrc
@@ -77,14 +77,6 @@
        <!-- Custom commands. -->
        <file>scalable/custom-commands.svg</file>

-        <!-- Patron logo. (C) 2014 Patreon, Inc., http://www.patreon.com/toolbox?ftyp=media -->
-        <file>16x16/patreon.png</file>
-        <file>22x22/patreon.png</file>
-        <file>24x24/patreon.png</file>
-        <file>32x32/patreon.png</file>
-        <file>48x48/patreon.png</file>
-        <file>64x64/patreon.png</file>
-
        <!-- The cat button. Freeware, http://findicons.com/icon/73096/black_cat -->
        <file>16x16/cat.png</file>
        <file>22x22/cat.png</file>
--- a/launcher/resources/pe_blue/pe_blue.qrc
+++ b/launcher/resources/pe_blue/pe_blue.qrc
@@ -23,7 +23,6 @@
        <file>scalable/new.svg</file>
        <file>scalable/news.svg</file>
        <file>scalable/notes.svg</file>
-        <file>scalable/patreon.svg</file>
        <file>scalable/proxy.svg</file>
        <file>scalable/refresh.svg</file>
        <file>scalable/resourcepacks.svg</file>
--- a/launcher/resources/pe_colored/pe_colored.qrc
+++ b/launcher/resources/pe_colored/pe_colored.qrc
@@ -23,7 +23,6 @@
        <file>scalable/new.svg</file>
        <file>scalable/news.svg</file>
        <file>scalable/notes.svg</file>
-        <file>scalable/patreon.svg</file>
        <file>scalable/proxy.svg</file>
        <file>scalable/refresh.svg</file>
        <file>scalable/resourcepacks.svg</file>
--- a/launcher/resources/pe_dark/pe_dark.qrc
+++ b/launcher/resources/pe_dark/pe_dark.qrc
@@ -23,7 +23,6 @@
        <file>scalable/new.svg</file>
        <file>scalable/news.svg</file>
        <file>scalable/notes.svg</file>
-        <file>scalable/patreon.svg</file>
        <file>scalable/proxy.svg</file>
        <file>scalable/refresh.svg</file>
        <file>scalable/resourcepacks.svg</file>
--- a/launcher/resources/pe_light/pe_light.qrc
+++ b/launcher/resources/pe_light/pe_light.qrc
@@ -23,7 +23,6 @@
        <file>scalable/new.svg</file>
        <file>scalable/news.svg</file>
        <file>scalable/notes.svg</file>
-        <file>scalable/patreon.svg</file>
        <file>scalable/proxy.svg</file>
        <file>scalable/refresh.svg</file>
        <file>scalable/resourcepacks.svg</file>
@@ -37,4 +36,3 @@
        <file>scalable/worlds.svg</file>
    </qresource>
 </RCC>
-
--- 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"));
--- 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;
 };
+
--- 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 << "<p>Zeker Zhayard &lt;<a href='https://twitter.com/zeker_zhayard'>@Zeker_Zhayard</a>&gt;</p>\n";
    stream << "<br />\n";

-    if(!patrons.isEmpty()) {
-        stream << "<h3>" << QObject::tr("Patrons", "About Credits") << "</h3>\n";
-        for (QString patron : patrons)
-        {
-            stream << "<p>" << patron << "</p>\n";
-        }
-    }
    stream << "</center>\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(
-"<p>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.</p>\n"
-"<p>Part of the reason for using the Apache license is we don't want people using the &quot;MultiMC&quot; name when redistributing the project. "
-"This means people must take the time to go through the source code and remove all references to &quot;MultiMC&quot;, including but not limited to the project "
-"icon and the title of windows, (no <b>MultiMC-fork</b> in the title).</p>\n"
-"<p>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 <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));

@@ -122,28 +105,9 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
    connect(ui->closeButton, SIGNAL(clicked()), SLOT(close()));

    connect(ui->aboutQt, &QPushButton::clicked, &QApplication::aboutQt);
-
-    loadPatronList();
 }

 AboutDialog::~AboutDialog()
 {
    delete ui;
 }
-
-void AboutDialog::loadPatronList()
-{
-    netJob = new NetJob("Patreon Patron List", APPLICATION->network());
-    netJob->addNetAction(Net::Download::makeByteArray(QUrl("https://files.multimc.org/patrons.txt"), &dataSink));
-    connect(netJob.get(), &NetJob::succeeded, this, &AboutDialog::patronListLoaded);
-    netJob->start();
-}
-
-void AboutDialog::patronListLoaded()
-{
-    QString patronListStr(dataSink);
-    dataSink.clear();
-    QString html = getCreditsHtml(patronListStr.split("\n", QString::SkipEmptyParts));
-    ui->creditsText->setHtml(html);
-}
-
--- a/launcher/ui/dialogs/AboutDialog.h
+++ b/launcher/ui/dialogs/AboutDialog.h
@@ -31,17 +31,10 @@ public:
    explicit AboutDialog(QWidget *parent = 0);
    ~AboutDialog();

-public
-slots:
-    /// Starts loading a list of Patreon patrons.
-    void loadPatronList();
-    
-    /// Slot for when the patron list loads successfully.
-    void patronListLoaded();
-
 private:
    Ui::AboutDialog *ui;

    NetJob::Ptr netJob;
    QByteArray dataSink;
 };
+
--- a/launcher/ui/dialogs/AboutDialog.ui
+++ b/launcher/ui/dialogs/AboutDialog.ui
@@ -251,20 +251,6 @@
       </item>
      </layout>
     </widget>
-     <widget class="QWidget" name="forkingTab">
-      <attribute name="title">
-       <string>Forking/Redistribution</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <item>
-        <widget class="QTextEdit" name="redistributionText">
-         <property name="textInteractionFlags">
-          <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
    </widget>
   </item>
   <item>
@@ -307,7 +293,6 @@
  <tabstop>tabWidget</tabstop>
  <tabstop>creditsText</tabstop>
  <tabstop>licenseText</tabstop>
-  <tabstop>redistributionText</tabstop>
  <tabstop>aboutQt</tabstop>
  <tabstop>closeButton</tabstop>
 </tabstops>
--- a/program_info/CMakeLists.txt
+++ b/program_info/CMakeLists.txt
@@ -16,3 +16,4 @@ set(Launcher_Branding_WindowsRC "program_info/polymc.rc" PARENT_SCOPE)
 set(Launcher_Branding_LogoQRC "program_info/polymc.qrc" PARENT_SCOPE)

 configure_file(org.polymc.PolyMC.desktop.in org.polymc.PolyMC.desktop)
+configure_file(org.polymc.PolyMC.metainfo.xml.in org.polymc.PolyMC.metainfo.xml)
--- a/program_info/org.polymc.PolyMC.metainfo.xml.in
+++ b/program_info/org.polymc.PolyMC.metainfo.xml.in
@@ -38,7 +38,7 @@
    </screenshot>
  </screenshots>
  <releases>
-    <release version="1.0.2" date="2022-01-01" />
+    <release version="@Launcher_RELEASE_VERSION_NAME@" date="2022-01-01" />
  </releases>
  <content_rating type="oars-1.0">
    <content_attribute id="violence-cartoon">moderate</content_attribute>
--- a/program_info/polymc.icns
+++ b/program_info/polymc.icns
--- a/program_info/polymc.ico
+++ b/program_info/polymc.ico