summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-01-09 01:39:51 +0100
committerPetr Mrázek <peterix@gmail.com>2016-01-09 01:39:51 +0100
commit1f0e76a3c1fe9dfb702adbd8a1357abe06e22c35 (patch)
tree084447cdad1527695ec9a81ef5ce9d637a5474a7
parentd8b1ae38fb8b9277597983040888eb0e32400ee9 (diff)
downloadMultiMC-1f0e76a3c1fe9dfb702adbd8a1357abe06e22c35.tar
MultiMC-1f0e76a3c1fe9dfb702adbd8a1357abe06e22c35.tar.gz
MultiMC-1f0e76a3c1fe9dfb702adbd8a1357abe06e22c35.tar.lz
MultiMC-1f0e76a3c1fe9dfb702adbd8a1357abe06e22c35.tar.xz
MultiMC-1f0e76a3c1fe9dfb702adbd8a1357abe06e22c35.zip
GH-1397 add discord icon to MultiMC toolbar
Diffstat
-rw-r--r--CMakeLists.txt4
-rw-r--r--application/MainWindow.cpp12
-rw-r--r--application/MainWindow.h2
-rw-r--r--application/resources/multimc/multimc.qrc3
-rw-r--r--application/resources/multimc/scalable/discord.svg108
5 files changed, 127 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73f3d1d9..f95c53c4 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 c977715b..4673ca9f 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", "<html><head/><body><p align=\"center\">It's a fluffy kitty :3</p></body></html>", 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 0a6167bc..17de6966 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 1300bdd7..6a625080 100644
--- a/application/resources/multimc/multimc.qrc
+++ b/application/resources/multimc/multimc.qrc
@@ -233,5 +233,8 @@
<!-- placeholder when loading screenshot images -->
<file>scalable/screenshot-placeholder.svg</file>
+
+ <!-- discord logo icon thing. from discord. traced from bitmap -->
+ <file>scalable/discord.svg</file>
</qresource>
</RCC>
diff --git a/application/resources/multimc/scalable/discord.svg b/application/resources/multimc/scalable/discord.svg
new file mode 100644
index 00000000..067be1e8
--- /dev/null
+++ b/application/resources/multimc/scalable/discord.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="128mm"
+ height="128mm"
+ viewBox="0 0 453.54331 453.54331"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="discord.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4166">
+ <stop
+ style="stop-color:#7593d7;stop-opacity:1"
+ offset="0"
+ id="stop4168" />
+ <stop
+ style="stop-color:#4f6aa3;stop-opacity:1"
+ offset="1"
+ id="stop4170" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4166"
+ id="linearGradient4174"
+ x1="351.42856"
+ y1="513.79077"
+ x2="351.42856"
+ y2="943.79077"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(24.999996,-5.8267714e-6)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.98994949"
+ inkscape:cx="249.4082"
+ inkscape:cy="153.28604"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:snap-nodes="true"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="false"
+ inkscape:snap-bbox-edge-midpoints="false"
+ inkscape:bbox-nodes="true"
+ inkscape:snap-bbox-midpoints="false"
+ inkscape:snap-page="true"
+ inkscape:window-width="1911"
+ inkscape:window-height="2120"
+ inkscape:window-x="2970"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4155" />
+ </sodipodi:namedview>
+ <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" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-1.4285583,-500.24745)">
+ <path
+ style="fill:url(#linearGradient4174);fill-opacity:1;fill-rule:evenodd"
+ d="m 73.928594,513.79076 a 37.5,37.5 0 0 0 -37.36914,34.88476 l -0.13086,0.11524 0,2.5 0,302.5 0.11914,0.11914 a 37.5,37.5 0 0 0 -0.11914,2.38086 37.5,37.5 0 0 0 37.5,37.5 37.5,37.5 0 0 0 2.41406,-0.0859 l 0.0859,0.0859 250.000006,0 -10,-40 100,90 0,-392.5 0,-2.5 -0.0918,-0.0918 a 37.5,37.5 0 0 0 -34.77734,-34.77734 l -0.13086,-0.13086 -2.5,0 -302.500006,0 -0.13477,0.11914 a 37.5,37.5 0 0 0 -2.36523,-0.11914 z"
+ id="path4157"
+ inkscape:connector-curvature="0" />
+ <path
+ style="opacity:1;fill:#ffffff;fill-rule:evenodd"
+ d="m 262.51367,111.60742 -3.53515,4.79688 c 20.92905,7.8755 41.53825,15.82838 52.90625,26.01172 -54.51023,-27.29925 -111.94069,-29.57156 -173.11524,0.25195 13.83558,-12.04023 34.12183,-19.9521 56.31641,-26.64258 l -2.39844,-3.78711 c -19.87573,2.47189 -39.74673,4.97961 -57.48273,19.75608 -1.26426,1.0533 -2.43875,1.7112 -3.75946,3.35134 -1.04157,1.68882 -1.47654,2.94289 -2.20384,4.4259 -16.51968,33.6846 -29.13904,71.47893 -29.23561,122.47449 13.7929,19.97074 35.85963,31.20604 66.79492,33.08203 l 14.01563,-19.0664 c -16.32939,-4.839 -28.63498,-12.99042 -36.86914,-24.4961 68.24127,41.30702 122.04171,25.27927 169.32617,-0.50585 -10.12692,12.60017 -23.08016,21.50538 -39.39649,26.01171 l 14.52149,17.80469 c 31.64413,-2.6726 53.44205,-13.71547 66.03906,-32.57812 -1.25854,-42.6757 -9.40904,-79.47015 -23.71494,-111.01207 -2.51316,-5.54105 -4.27674,-11.49413 -8.10537,-16.14028 -3.45571,-4.1936 -7.96544,-7.13252 -12.90109,-9.9657 -12.42806,-7.13399 -28.6789,-11.32721 -47.20243,-13.77258 z m -76.00195,82.42383 c 12.33462,8e-5 22.33381,10.55717 22.33398,23.58008 -1.7e-4,13.02291 -9.99936,23.58 -22.33398,23.58008 -12.33462,-7e-5 -22.33382,-10.55716 -22.33399,-23.58008 1.7e-4,-13.02292 9.99937,-23.58001 22.33399,-23.58008 z m 79.54883,0 c 12.33462,8e-5 22.33381,10.55717 22.33398,23.58008 -1.7e-4,13.02291 -9.99936,23.58 -22.33398,23.58008 -12.33462,-7e-5 -22.33382,-10.55716 -22.33399,-23.58008 1.7e-4,-13.02292 9.99937,-23.58001 22.33399,-23.58008 z"
+ transform="translate(1.4285583,500.24745)"
+ id="path4176"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccscsccccccccsasccccccccccc" />
+ </g>
+</svg>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 03:08:01 +0000