From bc6d1b5304f715ad0d8be27efd6630f820572da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 6 Aug 2016 15:39:29 +0200 Subject: GH-338, GH-513, GH-700 Unify edit instance with console window * The resulting instance window can be closed at any point. * Main window is kept open and running instances are marked with a badge. * Multiple instances can now run from the same MultiMC - it's even more **multi** now. * MultiMC can be entirely closed, keeping Minecraft(s) running. --- application/resources/instances/instances.qrc | 1 + application/resources/instances/status-running.png | Bin 0 -> 1059 bytes .../resources/multimc/16x16/status-running.png | Bin 0 -> 675 bytes .../resources/multimc/22x22/status-running.png | Bin 0 -> 957 bytes .../resources/multimc/24x24/status-running.png | Bin 0 -> 1059 bytes .../resources/multimc/32x32/status-running.png | Bin 0 -> 1425 bytes .../resources/multimc/48x48/status-running.png | Bin 0 -> 2288 bytes .../resources/multimc/64x64/status-running.png | Bin 0 -> 3178 bytes application/resources/multimc/multimc.qrc | 9 + .../resources/multimc/scalable/status-running.svg | 187 +++++++++++++++++++++ 10 files changed, 197 insertions(+) create mode 100644 application/resources/instances/status-running.png create mode 100644 application/resources/multimc/16x16/status-running.png create mode 100644 application/resources/multimc/22x22/status-running.png create mode 100644 application/resources/multimc/24x24/status-running.png create mode 100644 application/resources/multimc/32x32/status-running.png create mode 100644 application/resources/multimc/48x48/status-running.png create mode 100644 application/resources/multimc/64x64/status-running.png create mode 100644 application/resources/multimc/scalable/status-running.svg (limited to 'application/resources') diff --git a/application/resources/instances/instances.qrc b/application/resources/instances/instances.qrc index 09ae25d0..b1f1bb4d 100644 --- a/application/resources/instances/instances.qrc +++ b/application/resources/instances/instances.qrc @@ -37,6 +37,7 @@ enderman.png herobrine.png derp.png + status-running.png updateavailable.png diff --git a/application/resources/instances/status-running.png b/application/resources/instances/status-running.png new file mode 100644 index 00000000..ecd64451 Binary files /dev/null and b/application/resources/instances/status-running.png differ diff --git a/application/resources/multimc/16x16/status-running.png b/application/resources/multimc/16x16/status-running.png new file mode 100644 index 00000000..a4c42e39 Binary files /dev/null and b/application/resources/multimc/16x16/status-running.png differ diff --git a/application/resources/multimc/22x22/status-running.png b/application/resources/multimc/22x22/status-running.png new file mode 100644 index 00000000..0dffba18 Binary files /dev/null and b/application/resources/multimc/22x22/status-running.png differ diff --git a/application/resources/multimc/24x24/status-running.png b/application/resources/multimc/24x24/status-running.png new file mode 100644 index 00000000..ecd64451 Binary files /dev/null and b/application/resources/multimc/24x24/status-running.png differ diff --git a/application/resources/multimc/32x32/status-running.png b/application/resources/multimc/32x32/status-running.png new file mode 100644 index 00000000..f561f01a Binary files /dev/null and b/application/resources/multimc/32x32/status-running.png differ diff --git a/application/resources/multimc/48x48/status-running.png b/application/resources/multimc/48x48/status-running.png new file mode 100644 index 00000000..b8c0bf7c Binary files /dev/null and b/application/resources/multimc/48x48/status-running.png differ diff --git a/application/resources/multimc/64x64/status-running.png b/application/resources/multimc/64x64/status-running.png new file mode 100644 index 00000000..38afda0f Binary files /dev/null and b/application/resources/multimc/64x64/status-running.png differ diff --git a/application/resources/multimc/multimc.qrc b/application/resources/multimc/multimc.qrc index 3f7c5e8f..86b472d8 100644 --- a/application/resources/multimc/multimc.qrc +++ b/application/resources/multimc/multimc.qrc @@ -150,6 +150,15 @@ 48x48/status-yellow.png 64x64/status-yellow.png + + 16x16/status-running.png + 24x24/status-running.png + 22x22/status-running.png + 32x32/status-running.png + 48x48/status-running.png + 64x64/status-running.png + scalable/status-running.svg + 16x16/loadermods.png 24x24/loadermods.png diff --git a/application/resources/multimc/scalable/status-running.svg b/application/resources/multimc/scalable/status-running.svg new file mode 100644 index 00000000..18209940 --- /dev/null +++ b/application/resources/multimc/scalable/status-running.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + -- cgit v1.2.3