From 1f0e76a3c1fe9dfb702adbd8a1357abe06e22c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?=
Date: Sat, 9 Jan 2016 01:39:51 +0100
Subject: [PATCH] GH-1397 add discord icon to MultiMC toolbar
---
CMakeLists.txt | 4 +-
application/MainWindow.cpp | 12 ++
application/MainWindow.h | 2 +
application/resources/multimc/multimc.qrc | 3 +
.../resources/multimc/scalable/discord.svg | 108 ++++++++++++++++++
5 files changed, 127 insertions(+), 2 deletions(-)
create mode 100644 application/resources/multimc/scalable/discord.svg
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73f3d1d93..f95c53c4c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,11 +35,11 @@ set(CMAKE_JAVA_TARGET_OUTPUT_DIR ${PROJECT_BINARY_DIR}/jars)
######## Set compiler flags ########
set(CMAKE_CXX_STANDARD_REQUIRED true)
set(CMAKE_C_STANDARD_REQUIRED true)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 11)
set(CMAKE_C_STANDARD 11)
include(Coverage)
include(GenerateExportHeader)
-set(CMAKE_CXX_FLAGS " -Wall ${CMAKE_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS " -Wall -D_GLIBCXX_USE_CXX11_ABI=0 ${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type")
# cmake code needed for the coverity scan upload
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index c977715be..4673ca9f9 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -116,6 +116,7 @@ public:
QAction *actionConfig_Folder;
QAction *actionCAT;
QAction *actionREDDIT;
+ QAction *actionDISCORD;
QAction *actionCopyInstance;
QAction *actionManageAccounts;
QAction *actionLaunchInstanceOffline;
@@ -200,6 +201,9 @@ public:
actionREDDIT = new QAction(MainWindow);
actionREDDIT->setObjectName(QStringLiteral("actionREDDIT"));
actionREDDIT->setIcon(MMC->getThemedIcon("reddit-alien"));
+ actionDISCORD = new QAction(MainWindow);
+ actionDISCORD->setObjectName(QStringLiteral("actionDISCORD"));
+ actionDISCORD->setIcon(MMC->getThemedIcon("discord"));
actionCopyInstance = new QAction(MainWindow);
actionCopyInstance->setObjectName(QStringLiteral("actionCopyInstance"));
actionCopyInstance->setIcon(MMC->getThemedIcon("copy"));
@@ -267,6 +271,7 @@ public:
mainToolBar->addSeparator();
mainToolBar->addAction(actionPatreon);
mainToolBar->addAction(actionREDDIT);
+ mainToolBar->addAction(actionDISCORD);
mainToolBar->addAction(actionCAT);
instanceToolBar->addAction(actionChangeInstIcon);
instanceToolBar->addAction(actionLaunchInstance);
@@ -358,6 +363,8 @@ public:
actionCAT->setToolTip(QApplication::translate("MainWindow", "It's a fluffy kitty :3
", 0));
actionREDDIT->setText(QApplication::translate("MainWindow", "Reddit", 0));
actionREDDIT->setToolTip(QApplication::translate("MainWindow", "Open MultiMC subreddit", 0));
+ actionDISCORD->setText(QApplication::translate("MainWindow", "Discord", 0));
+ actionDISCORD->setToolTip(QApplication::translate("MainWindow", "Open MultiMC discord voice chat", 0));
actionCopyInstance->setText(QApplication::translate("MainWindow", "Copy Instance", 0));
actionCopyInstance->setToolTip(QApplication::translate("MainWindow", "Copy the selected instance.", 0));
actionCopyInstance->setStatusTip(QApplication::translate("MainWindow", "Add a new instance.", 0));
@@ -1200,6 +1207,11 @@ void MainWindow::on_actionREDDIT_triggered()
DesktopServices::openUrl(QUrl("https://www.reddit.com/r/MultiMC/"));
}
+void MainWindow::on_actionDISCORD_triggered()
+{
+ DesktopServices::openUrl(QUrl("https://discord.gg/0k2zsXGNHs0fE4Wm"));
+}
+
void MainWindow::on_actionCopyInstance_triggered()
{
if (!m_selectedInstance)
diff --git a/application/MainWindow.h b/application/MainWindow.h
index 0a6167bc9..17de6966f 100644
--- a/application/MainWindow.h
+++ b/application/MainWindow.h
@@ -63,6 +63,8 @@ private slots:
void on_actionREDDIT_triggered();
+ void on_actionDISCORD_triggered();
+
void on_actionCopyInstance_triggered();
void on_actionChangeInstGroup_triggered();
diff --git a/application/resources/multimc/multimc.qrc b/application/resources/multimc/multimc.qrc
index 1300bdd73..6a6250803 100644
--- a/application/resources/multimc/multimc.qrc
+++ b/application/resources/multimc/multimc.qrc
@@ -233,5 +233,8 @@
scalable/screenshot-placeholder.svg
+
+
+ scalable/discord.svg
diff --git a/application/resources/multimc/scalable/discord.svg b/application/resources/multimc/scalable/discord.svg
new file mode 100644
index 000000000..067be1e82
--- /dev/null
+++ b/application/resources/multimc/scalable/discord.svg
@@ -0,0 +1,108 @@
+
+
+
+