diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b89ff6b..dc11e5cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@ endif()
##################################### Set CMake options #####################################
set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index cbfdcbe2..2d0c0834 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1148,7 +1148,7 @@ void Application::setIconTheme(const QString& name)
QIcon Application::getThemedIcon(const QString& name)
{
if(name == "logo") {
- return QIcon(":/logo.svg");
+ return QIcon(":/polymc.svg");
}
return XdgIcon::fromTheme(name);
}
diff --git a/launcher/main.cpp b/launcher/main.cpp
index aabb5a06..8b572743 100644
--- a/launcher/main.cpp
+++ b/launcher/main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(multimc);
Q_INIT_RESOURCE(backgrounds);
Q_INIT_RESOURCE(documents);
- Q_INIT_RESOURCE(logo);
+ Q_INIT_RESOURCE(polymc);
Q_INIT_RESOURCE(pe_dark);
Q_INIT_RESOURCE(pe_light);
diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt
index dd120ab3..840c3fa2 100644
--- a/program_info/CMakeLists.txt
+++ b/program_info/CMakeLists.txt
@@ -9,6 +9,8 @@ set(Launcher_ConfigFile "polymc.cfg" PARENT_SCOPE)
set(Launcher_Git "https://github.com/PolyMC/PolyMC" PARENT_SCOPE)
set(Launcher_Desktop "program_info/polymc.desktop" PARENT_SCOPE)
-set(Launcher_Branding_ICNS "program_info/Launcher.icns" PARENT_SCOPE)
-set(Launcher_Branding_WindowsRC "program_info/launcher.rc" PARENT_SCOPE)
-set(Launcher_Branding_LogoQRC "program_info/logo.qrc" PARENT_SCOPE)
+set(Launcher_Branding_ICNS "program_info/polymc.icns" PARENT_SCOPE)
+set(Launcher_Branding_WindowsRC "program_info/polymc.rc" PARENT_SCOPE)
+set(Launcher_Branding_LogoQRC "program_info/polymc.qrc" PARENT_SCOPE)
+
+configure_file(polymc.desktop.in polymc.desktop)
diff --git a/program_info/Launcher.icns b/program_info/Launcher.icns
deleted file mode 100644
index 951b74fc..00000000
Binary files a/program_info/Launcher.icns and /dev/null differ
diff --git a/program_info/Launcher.ico b/program_info/Launcher.ico
deleted file mode 100644
index 9308958f..00000000
Binary files a/program_info/Launcher.ico and /dev/null differ
diff --git a/program_info/README.md b/program_info/README.md
index 01c4d02b..1e805d4a 100644
--- a/program_info/README.md
+++ b/program_info/README.md
@@ -3,3 +3,4 @@
This is PolyMC's program info which contains information about:
- Application name and logo (and branding in general)
- Various URLs and API endpoints
+- Desktop file
diff --git a/program_info/genicons.sh b/program_info/genicons.sh
index e6f704f9..2ed39129 100755
--- a/program_info/genicons.sh
+++ b/program_info/genicons.sh
@@ -1,18 +1,19 @@
#/bin/bash
-inkscape -w 16 -h 16 -o logo_16.png logo.svg
-inkscape -w 24 -h 24 -o logo_24.png logo.svg
-inkscape -w 32 -h 32 -o logo_32.png logo.svg
-inkscape -w 48 -h 48 -o logo_48.png logo.svg
-inkscape -w 64 -h 64 -o logo_64.png logo.svg
-inkscape -w 128 -h 128 -o logo_128.png logo.svg
+inkscape -w 16 -h 16 -o polymc_16.png polymc.svg
+inkscape -w 24 -h 24 -o polymc_24.png polymc.svg
+inkscape -w 32 -h 32 -o polymc_32.png polymc.svg
+inkscape -w 48 -h 48 -o polymc_48.png polymc.svg
+inkscape -w 64 -h 64 -o polymc_64.png polymc.svg
+inkscape -w 128 -h 128 -o polymc_128.png polymc.svg
-convert logo_128.png logo_64.png logo_48.png logo_32.png logo_24.png logo_16.png Launcher.ico
+convert polymc_128.png polymc_64.png polymc_48.png polymc_32.png polymc_24.png polymc_16.png polymc.ico
-inkscape -w 256 -h 256 -o logo_256.png logo.svg
-inkscape -w 512 -h 512 -o logo_512.png logo.svg
-inkscape -w 1024 -h 1024 -o logo_1024.png logo.svg
+inkscape -w 256 -h 256 -o polymc_256.png polymc.svg
+inkscape -w 512 -h 512 -o polymc_512.png polymc.svg
+inkscape -w 1024 -h 1024 -o polymc_1024.png polymc.svg
-png2icns Launcher.icns logo_1024.png logo_512.png logo_256.png logo_128.png logo_32.png logo_16.png
+png2icns polymc.icns polymc_1024.png polymc_512.png polymc_256.png polymc_128.png polymc_32.png polymc_16.png
-rm -f logo_*.png
+rm -f polymc_*.png
+rm -rf polymc.iconset
diff --git a/program_info/logo.svg b/program_info/logo.svg
deleted file mode 100644
index a1c8e439..00000000
--- a/program_info/logo.svg
+++ /dev/null
@@ -1,271 +0,0 @@
-
-
-
-
diff --git a/program_info/polymc.desktop b/program_info/polymc.desktop.in
similarity index 89%
rename from program_info/polymc.desktop
rename to program_info/polymc.desktop.in
index 835ef6e1..1549cb9b 100644
--- a/program_info/polymc.desktop
+++ b/program_info/polymc.desktop.in
@@ -4,7 +4,7 @@ Name=PolyMC
Comment=A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
Type=Application
Terminal=false
-Exec=polymc
+Exec=@Launcher_APP_BINARY_NAME@
StartupNotify=true
Icon=polymc
Categories=Game;
diff --git a/program_info/polymc.icns b/program_info/polymc.icns
new file mode 100644
index 00000000..33a5c520
Binary files /dev/null and b/program_info/polymc.icns differ
diff --git a/program_info/polymc.ico b/program_info/polymc.ico
new file mode 100644
index 00000000..9341547a
Binary files /dev/null and b/program_info/polymc.ico differ
diff --git a/program_info/Launcher.manifest b/program_info/polymc.manifest
similarity index 93%
rename from program_info/Launcher.manifest
rename to program_info/polymc.manifest
index 0ee781ee..f1fe63ce 100644
--- a/program_info/Launcher.manifest
+++ b/program_info/polymc.manifest
@@ -1,6 +1,6 @@
-
+
@@ -26,6 +26,6 @@
-
+
diff --git a/program_info/logo.qrc b/program_info/polymc.qrc
similarity index 72%
rename from program_info/logo.qrc
rename to program_info/polymc.qrc
index f1da6fe6..ea238945 100644
--- a/program_info/logo.qrc
+++ b/program_info/polymc.qrc
@@ -1,8 +1,6 @@
- logo.svg
+ polymc.svg
-
-
diff --git a/program_info/launcher.rc b/program_info/polymc.rc
similarity index 73%
rename from program_info/launcher.rc
rename to program_info/polymc.rc
index f84104fb..08c21a41 100644
--- a/program_info/launcher.rc
+++ b/program_info/polymc.rc
@@ -3,8 +3,8 @@
#endif
#include
-IDI_ICON1 ICON DISCARDABLE "Launcher.ico"
-1 RT_MANIFEST "Launcher.manifest"
+IDI_ICON1 ICON DISCARDABLE "polymc.ico"
+1 RT_MANIFEST "polymc.manifest"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,0
@@ -15,10 +15,10 @@ BEGIN
BEGIN
BLOCK "000004b0"
BEGIN
- VALUE "CompanyName", "MultiMC Contributors"
+ VALUE "CompanyName", "MultiMC & PolyMC Contributors"
VALUE "FileDescription", "A Minecraft Launcher"
VALUE "FileVersion", "1.0.0.0"
- VALUE "ProductName", "Launcher"
+ VALUE "ProductName", "PolyMC"
VALUE "ProductVersion", "5"
END
END
diff --git a/program_info/polymc.svg b/program_info/polymc.svg
new file mode 100644
index 00000000..c57e8f2f
--- /dev/null
+++ b/program_info/polymc.svg
@@ -0,0 +1,17 @@
+
+