From 70620d51374d677bd6cafc21b470446696c9e0a0 Mon Sep 17 00:00:00 2001
From: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Date: Sun, 4 Dec 2022 12:45:36 +0100
Subject: [PATCH 1/4] feat: add a proper server icon
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
---
.../resources/breeze_dark/breeze_dark.qrc | 1 +
.../resources/breeze_dark/scalable/server.svg | 13 +
.../resources/breeze_light/breeze_light.qrc | 1 +
.../breeze_light/scalable/server.svg | 13 +
launcher/resources/flat/flat.qrc | 1 +
launcher/resources/flat/scalable/server.svg | 1 +
launcher/resources/flat_white/flat_white.qrc | 1 +
.../resources/flat_white/scalable/server.svg | 1 +
launcher/resources/multimc/multimc.qrc | 1 +
.../resources/multimc/scalable/server.svg | 9764 +++++++++++++++++
launcher/ui/pages/instance/ServersPage.h | 2 +-
11 files changed, 9798 insertions(+), 1 deletion(-)
create mode 100644 launcher/resources/breeze_dark/scalable/server.svg
create mode 100644 launcher/resources/breeze_light/scalable/server.svg
create mode 100644 launcher/resources/flat/scalable/server.svg
create mode 100644 launcher/resources/flat_white/scalable/server.svg
create mode 100644 launcher/resources/multimc/scalable/server.svg
diff --git a/launcher/resources/breeze_dark/breeze_dark.qrc b/launcher/resources/breeze_dark/breeze_dark.qrc
index 97434abc..79707828 100644
--- a/launcher/resources/breeze_dark/breeze_dark.qrc
+++ b/launcher/resources/breeze_dark/breeze_dark.qrc
@@ -40,5 +40,6 @@
scalable/export.svg
scalable/rename.svg
scalable/launch.svg
+ scalable/server.svg
diff --git a/launcher/resources/breeze_dark/scalable/server.svg b/launcher/resources/breeze_dark/scalable/server.svg
new file mode 100644
index 00000000..7d9af3e7
--- /dev/null
+++ b/launcher/resources/breeze_dark/scalable/server.svg
@@ -0,0 +1,13 @@
+
diff --git a/launcher/resources/breeze_light/breeze_light.qrc b/launcher/resources/breeze_light/breeze_light.qrc
index 6d868b18..ae8dbf3b 100644
--- a/launcher/resources/breeze_light/breeze_light.qrc
+++ b/launcher/resources/breeze_light/breeze_light.qrc
@@ -40,5 +40,6 @@
scalable/export.svg
scalable/rename.svg
scalable/launch.svg
+ scalable/server.svg
diff --git a/launcher/resources/breeze_light/scalable/server.svg b/launcher/resources/breeze_light/scalable/server.svg
new file mode 100644
index 00000000..52d7dd7d
--- /dev/null
+++ b/launcher/resources/breeze_light/scalable/server.svg
@@ -0,0 +1,13 @@
+
diff --git a/launcher/resources/flat/flat.qrc b/launcher/resources/flat/flat.qrc
index a846bd2d..cadf8736 100644
--- a/launcher/resources/flat/flat.qrc
+++ b/launcher/resources/flat/flat.qrc
@@ -47,6 +47,7 @@
scalable/tag.svg
scalable/export.svg
scalable/rename.svg
+ scalable/server.svg
scalable/launch.svg
diff --git a/launcher/resources/flat/scalable/server.svg b/launcher/resources/flat/scalable/server.svg
new file mode 100644
index 00000000..49c22b38
--- /dev/null
+++ b/launcher/resources/flat/scalable/server.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/launcher/resources/flat_white/flat_white.qrc b/launcher/resources/flat_white/flat_white.qrc
index b0759d8f..2701462f 100644
--- a/launcher/resources/flat_white/flat_white.qrc
+++ b/launcher/resources/flat_white/flat_white.qrc
@@ -48,5 +48,6 @@
scalable/rename.svg
scalable/tag.svg
scalable/launch.svg
+ scalable/server.svg
diff --git a/launcher/resources/flat_white/scalable/server.svg b/launcher/resources/flat_white/scalable/server.svg
new file mode 100644
index 00000000..f41db1b2
--- /dev/null
+++ b/launcher/resources/flat_white/scalable/server.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc
index 42b496da..9712698d 100644
--- a/launcher/resources/multimc/multimc.qrc
+++ b/launcher/resources/multimc/multimc.qrc
@@ -346,5 +346,6 @@
scalable/export.svg
scalable/launch.svg
+ scalable/server.svg
diff --git a/launcher/resources/multimc/scalable/server.svg b/launcher/resources/multimc/scalable/server.svg
new file mode 100644
index 00000000..c6a957b3
--- /dev/null
+++ b/launcher/resources/multimc/scalable/server.svg
@@ -0,0 +1,9764 @@
+
+
+
+
\ No newline at end of file
diff --git a/launcher/ui/pages/instance/ServersPage.h b/launcher/ui/pages/instance/ServersPage.h
index 37399d49..ee63353a 100644
--- a/launcher/ui/pages/instance/ServersPage.h
+++ b/launcher/ui/pages/instance/ServersPage.h
@@ -68,7 +68,7 @@ public:
}
virtual QIcon icon() const override
{
- return APPLICATION->getThemedIcon("unknown_server");
+ return APPLICATION->getThemedIcon("server");
}
virtual QString id() const override
{
From 263a72879dd422e47ceeb8c49bba53db60c73c7a Mon Sep 17 00:00:00 2001
From: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Date: Sun, 4 Dec 2022 12:50:40 +0100
Subject: [PATCH 2/4] fix: oyxgen is lgpl3!
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
---
COPYING.md | 25 +++++++++++++++++++++++++
launcher/resources/multimc/multimc.qrc | 18 +++++++++---------
2 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/COPYING.md b/COPYING.md
index dde3c727..75a5c0eb 100644
--- a/COPYING.md
+++ b/COPYING.md
@@ -415,3 +415,28 @@
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see .
+
+## Oxygen Icons
+
+ The Oxygen Icon Theme
+ Copyright (C) 2007 Nuno Pinheiro
+ Copyright (C) 2007 David Vignoni
+ Copyright (C) 2007 David Miller
+ Copyright (C) 2007 Johann Ollivier Lapeyre
+ Copyright (C) 2007 Kenneth Wimer
+ Copyright (C) 2007 Riccardo Iaconelli
+
+ and others
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see .
diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc
index 9712698d..2c00f28f 100644
--- a/launcher/resources/multimc/multimc.qrc
+++ b/launcher/resources/multimc/multimc.qrc
@@ -28,14 +28,14 @@
scalable/java.svg
-
+
16x16/star.png
24x24/star.png
32x32/star.png
48x48/star.png
64x64/star.png
-
+
16x16/worlds.png
22x22/worlds.png
32x32/worlds.png
@@ -84,7 +84,7 @@
48x48/cat.png
64x64/cat.png
-
+
scalable/centralmods.svg
16x16/centralmods.png
22x22/centralmods.png
@@ -162,25 +162,25 @@
64x64/status-running.png
scalable/status-running.svg
-
+
16x16/loadermods.png
24x24/loadermods.png
32x32/loadermods.png
64x64/loadermods.png
-
+
16x16/jarmods.png
24x24/jarmods.png
32x32/jarmods.png
64x64/jarmods.png
-
+
16x16/coremods.png
24x24/coremods.png
32x32/coremods.png
64x64/coremods.png
-
+
16x16/resourcepacks.png
24x24/resourcepacks.png
32x32/resourcepacks.png
@@ -189,7 +189,7 @@
128x128/shaderpacks.png
-
+
16x16/refresh.png
22x22/refresh.png
32x32/refresh.png
@@ -338,7 +338,7 @@
scalable/instances/fox_legacy.svg
scalable/instances/bee_legacy.svg
-
+
scalable/delete.svg
scalable/tag.svg
scalable/rename.svg
From 2462b8e524a62eedd367c7cade06991f4631cc8d Mon Sep 17 00:00:00 2001
From: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Date: Sun, 4 Dec 2022 13:30:24 +0100
Subject: [PATCH 3/4] feat+fix: better flat icon
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
---
launcher/resources/flat/scalable/server.svg | 45 ++++++++++++++++++++-
1 file changed, 44 insertions(+), 1 deletion(-)
diff --git a/launcher/resources/flat/scalable/server.svg b/launcher/resources/flat/scalable/server.svg
index 49c22b38..c1d09d29 100644
--- a/launcher/resources/flat/scalable/server.svg
+++ b/launcher/resources/flat/scalable/server.svg
@@ -1 +1,44 @@
-
\ No newline at end of file
+
+
From aceafb28f6bc972d89b5431b0295f28248eee905 Mon Sep 17 00:00:00 2001
From: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Date: Sun, 4 Dec 2022 21:29:00 +0100
Subject: [PATCH 4/4] feat: add server icon to simple colored icons too
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Co-Authored-By: leo78913
---
launcher/resources/pe_blue/pe_blue.qrc | 1 +
launcher/resources/pe_blue/scalable/server.svg | 1 +
launcher/resources/pe_colored/pe_colored.qrc | 1 +
launcher/resources/pe_colored/scalable/server.svg | 1 +
launcher/resources/pe_dark/pe_dark.qrc | 1 +
launcher/resources/pe_dark/scalable/server.svg | 1 +
launcher/resources/pe_light/pe_light.qrc | 1 +
launcher/resources/pe_light/scalable/server.svg | 1 +
8 files changed, 8 insertions(+)
create mode 100644 launcher/resources/pe_blue/scalable/server.svg
create mode 100644 launcher/resources/pe_colored/scalable/server.svg
create mode 100644 launcher/resources/pe_dark/scalable/server.svg
create mode 100644 launcher/resources/pe_light/scalable/server.svg
diff --git a/launcher/resources/pe_blue/pe_blue.qrc b/launcher/resources/pe_blue/pe_blue.qrc
index 639675f0..1b2b6291 100644
--- a/launcher/resources/pe_blue/pe_blue.qrc
+++ b/launcher/resources/pe_blue/pe_blue.qrc
@@ -40,5 +40,6 @@
scalable/rename.svg
scalable/launch.svg
scalable/shortcut.svg
+ scalable/server.svg
diff --git a/launcher/resources/pe_blue/scalable/server.svg b/launcher/resources/pe_blue/scalable/server.svg
new file mode 100644
index 00000000..85fa6dcf
--- /dev/null
+++ b/launcher/resources/pe_blue/scalable/server.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/launcher/resources/pe_colored/pe_colored.qrc b/launcher/resources/pe_colored/pe_colored.qrc
index fac58da8..084fca93 100644
--- a/launcher/resources/pe_colored/pe_colored.qrc
+++ b/launcher/resources/pe_colored/pe_colored.qrc
@@ -40,5 +40,6 @@
scalable/rename.svg
scalable/launch.svg
scalable/shortcut.svg
+ scalable/server.svg
diff --git a/launcher/resources/pe_colored/scalable/server.svg b/launcher/resources/pe_colored/scalable/server.svg
new file mode 100644
index 00000000..60b469ea
--- /dev/null
+++ b/launcher/resources/pe_colored/scalable/server.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/launcher/resources/pe_dark/pe_dark.qrc b/launcher/resources/pe_dark/pe_dark.qrc
index c0c6ee6c..5c49b75a 100644
--- a/launcher/resources/pe_dark/pe_dark.qrc
+++ b/launcher/resources/pe_dark/pe_dark.qrc
@@ -40,5 +40,6 @@
scalable/rename.svg
scalable/launch.svg
scalable/shortcut.svg
+ scalable/server.svg
diff --git a/launcher/resources/pe_dark/scalable/server.svg b/launcher/resources/pe_dark/scalable/server.svg
new file mode 100644
index 00000000..493d8d87
--- /dev/null
+++ b/launcher/resources/pe_dark/scalable/server.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/launcher/resources/pe_light/pe_light.qrc b/launcher/resources/pe_light/pe_light.qrc
index bd6a2496..a8e3f157 100644
--- a/launcher/resources/pe_light/pe_light.qrc
+++ b/launcher/resources/pe_light/pe_light.qrc
@@ -40,5 +40,6 @@
scalable/rename.svg
scalable/launch.svg
scalable/shortcut.svg
+ scalable/server.svg
diff --git a/launcher/resources/pe_light/scalable/server.svg b/launcher/resources/pe_light/scalable/server.svg
new file mode 100644
index 00000000..61acb6a2
--- /dev/null
+++ b/launcher/resources/pe_light/scalable/server.svg
@@ -0,0 +1 @@
+
\ No newline at end of file