aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MultiMC.cpp3
-rw-r--r--MultiMC.manifest27
-rw-r--r--gui/dialogs/InstanceSettings.cpp16
-rw-r--r--gui/dialogs/InstanceSettings.ui26
-rw-r--r--gui/dialogs/SettingsDialog.cpp6
-rw-r--r--gui/dialogs/SettingsDialog.ui16
-rw-r--r--logic/BaseInstance.cpp5
-rw-r--r--mmc_updater/CMakeLists.txt8
-rw-r--r--mmc_updater/src/resources/updater.manifest27
-rw-r--r--mmc_updater/src/resources/updater.rc30
-rw-r--r--multimc.rc28
11 files changed, 105 insertions, 87 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp
index bf0d9d99..65c24087 100644
--- a/MultiMC.cpp
+++ b/MultiMC.cpp
@@ -319,9 +319,6 @@ void MultiMC::initGlobalSettings()
m_settings->registerSetting(new Setting("MinecraftWinWidth", 854));
m_settings->registerSetting(new Setting("MinecraftWinHeight", 480));
- // Auto login
- m_settings->registerSetting(new Setting("AutoLogin", false));
-
// Memory
m_settings->registerSetting(new Setting("MinMemAlloc", 512));
m_settings->registerSetting(new Setting("MaxMemAlloc", 1024));
diff --git a/MultiMC.manifest b/MultiMC.manifest
new file mode 100644
index 00000000..3acf8f7f
--- /dev/null
+++ b/MultiMC.manifest
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <assemblyIdentity name="MultiMC.Application.5" type="win32" version="5.0.0.0" />
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df" language="*"/>
+ </dependentAssembly>
+ </dependency>
+ <description>Custom Minecraft launcher for managing multiple installs.</description>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates app support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates app support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!--The ID below indicates app support for Windows Developer Preview / Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ </application>
+ </compatibility>
+</assembly> \ No newline at end of file
diff --git a/gui/dialogs/InstanceSettings.cpp b/gui/dialogs/InstanceSettings.cpp
index 641c7fab..e3f8a66b 100644
--- a/gui/dialogs/InstanceSettings.cpp
+++ b/gui/dialogs/InstanceSettings.cpp
@@ -98,18 +98,6 @@ void InstanceSettings::applySettings()
m_obj->reset("MinecraftWinHeight");
}
- // Auto Login
- bool login = ui->accountSettingsBox->isChecked();
- m_obj->set("OverrideLogin", login);
- if (login)
- {
- m_obj->set("AutoLogin", ui->autoLoginCheckBox->isChecked());
- }
- else
- {
- m_obj->reset("AutoLogin");
- }
-
// Memory
bool memory = ui->memoryGroupBox->isChecked();
m_obj->set("OverrideMemory", memory);
@@ -170,10 +158,6 @@ void InstanceSettings::loadSettings()
ui->windowWidthSpinBox->setValue(m_obj->get("MinecraftWinWidth").toInt());
ui->windowHeightSpinBox->setValue(m_obj->get("MinecraftWinHeight").toInt());
- // Auto Login
- ui->accountSettingsBox->setChecked(m_obj->get("OverrideLogin").toBool());
- ui->autoLoginCheckBox->setChecked(m_obj->get("AutoLogin").toBool());
-
// Memory
ui->memoryGroupBox->setChecked(m_obj->get("OverrideMemory").toBool());
ui->minMemSpinBox->setValue(m_obj->get("MinMemAlloc").toInt());
diff --git a/gui/dialogs/InstanceSettings.ui b/gui/dialogs/InstanceSettings.ui
index c4a7d6ed..9260caea 100644
--- a/gui/dialogs/InstanceSettings.ui
+++ b/gui/dialogs/InstanceSettings.ui
@@ -132,31 +132,6 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="accountSettingsBox">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="title">
- <string>Account Settings</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_6">
- <item>
- <widget class="QCheckBox" name="autoLoginCheckBox">
- <property name="text">
- <string>Login automatically when an instance icon is double clicked?</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
<spacer name="verticalSpacerMinecraft">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -411,7 +386,6 @@
<tabstop>consoleSettingsBox</tabstop>
<tabstop>showConsoleCheck</tabstop>
<tabstop>autoCloseConsoleCheck</tabstop>
- <tabstop>accountSettingsBox</tabstop>
<tabstop>memoryGroupBox</tabstop>
<tabstop>minMemSpinBox</tabstop>
<tabstop>maxMemSpinBox</tabstop>
diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp
index e7f537e3..b960483a 100644
--- a/gui/dialogs/SettingsDialog.cpp
+++ b/gui/dialogs/SettingsDialog.cpp
@@ -150,9 +150,6 @@ void SettingsDialog::applySettings(SettingsObject *s)
s->set("MinecraftWinWidth", ui->windowWidthSpinBox->value());
s->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
- // Auto Login
- s->set("AutoLogin", ui->autoLoginCheckBox->isChecked());
-
// Memory
s->set("MinMemAlloc", ui->minMemSpinBox->value());
s->set("MaxMemAlloc", ui->maxMemSpinBox->value());
@@ -202,9 +199,6 @@ void SettingsDialog::loadSettings(SettingsObject *s)
ui->windowWidthSpinBox->setValue(s->get("MinecraftWinWidth").toInt());
ui->windowHeightSpinBox->setValue(s->get("MinecraftWinHeight").toInt());
- // Auto Login
- ui->autoLoginCheckBox->setChecked(s->get("AutoLogin").toBool());
-
// Memory
ui->minMemSpinBox->setValue(s->get("MinMemAlloc").toInt());
ui->maxMemSpinBox->setValue(s->get("MaxMemAlloc").toInt());
diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index 0dbc8def..17320b48 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -262,22 +262,6 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="accountSettingsBox">
- <property name="title">
- <string>Account Settings</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QCheckBox" name="autoLoginCheckBox">
- <property name="text">
- <string>Login automatically when an instance icon is double clicked?</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
<spacer name="verticalSpacerMinecraft">
<property name="orientation">
<enum>Qt::Vertical</enum>
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp
index 6f8222b7..bc82fee1 100644
--- a/logic/BaseInstance.cpp
+++ b/logic/BaseInstance.cpp
@@ -85,11 +85,6 @@ BaseInstance::BaseInstance(BaseInstancePrivate *d_in, const QString &rootDir,
settings().registerSetting(
new OverrideSetting("PermGen", globalSettings->getSetting("PermGen")));
- // Auto login
- settings().registerSetting(new Setting("OverrideLogin", false));
- settings().registerSetting(
- new OverrideSetting("AutoLogin", globalSettings->getSetting("AutoLogin")));
-
// Console
settings().registerSetting(new Setting("OverrideConsole", false));
settings().registerSetting(
diff --git a/mmc_updater/CMakeLists.txt b/mmc_updater/CMakeLists.txt
index 61c8cd09..971ac153 100644
--- a/mmc_updater/CMakeLists.txt
+++ b/mmc_updater/CMakeLists.txt
@@ -9,6 +9,14 @@ include_directories(depends)
if (WIN32)
include_directories(depends/win32cpp)
+ # static all the things. The updater must have no dependencies, or it will fail.
+ if (MINGW)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++ -static")
+#set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -static-libgcc -s")
+#set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS} -static-libgcc -static-libstdc++ -s")
+ endif()
+
if(MSVC)
# - Link the updater binary statically with the Visual C++ runtime
# so that the executable can function standalone.
diff --git a/mmc_updater/src/resources/updater.manifest b/mmc_updater/src/resources/updater.manifest
new file mode 100644
index 00000000..cafc47d3
--- /dev/null
+++ b/mmc_updater/src/resources/updater.manifest
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <assemblyIdentity name="MultiMC.Updater.1" type="win32" version="1.0.0.0" />
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df" language="*"/>
+ </dependentAssembly>
+ </dependency>
+ <description>Software updater for MultiMC.</description>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates app support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates app support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!--The ID below indicates app support for Windows Developer Preview / Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ </application>
+ </compatibility>
+</assembly> \ No newline at end of file
diff --git a/mmc_updater/src/resources/updater.rc b/mmc_updater/src/resources/updater.rc
index 550970a8..9c7c5711 100644
--- a/mmc_updater/src/resources/updater.rc
+++ b/mmc_updater/src/resources/updater.rc
@@ -1,30 +1,30 @@
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+
IDI_APPICON ICON DISCARDABLE "updater.ico"
-1 VERSIONINFO
-FILEVERSION 0,0,1,0
-PRODUCTVERSION 1,0,1,0
-FILEFLAGSMASK 0X3FL
-FILEFLAGS 0X8L
-FILEOS 0X40004L
-FILETYPE 0X1
-FILESUBTYPE 0
+1 RT_MANIFEST "updater.manifest"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION 1,0,0,0
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "000004b0"
BEGIN
- VALUE "FileVersion", "0.0.1.0"
- VALUE "ProductVersion", "1.0.1.0"
- VALUE "OriginalFilename", "updater.exe"
- VALUE "InternalName", "updater.exe"
- VALUE "FileDescription", "Software Update Tool"
VALUE "CompanyName", "MultiMC Contributors"
+ VALUE "FileDescription", "Software Update Tool"
+ VALUE "FileVersion", "1.0.0.0"
VALUE "ProductName", "MultiMC Software Updater"
- VALUE "PrivateBuild", "Built by BuildBot"
+ VALUE "ProductVersion", "1.0"
END
END
BLOCK "VarFileInfo"
BEGIN
- VALUE "Translation", 0x0000, 0x04b0
+ VALUE "Translation", 0x0000, 0x04b0 // Unicode
END
END \ No newline at end of file
diff --git a/multimc.rc b/multimc.rc
index decf7d3a..2140e3f4 100644
--- a/multimc.rc
+++ b/multimc.rc
@@ -1 +1,29 @@
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+
IDI_ICON1 ICON DISCARDABLE "resources/icons/MultiMC.ico"
+1 RT_MANIFEST "MultiMC.manifest"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION 1,0,0,0
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "CompanyName", "MultiMC Contributors"
+ VALUE "FileDescription", "Minecraft Launcher"
+ VALUE "FileVersion", "1.0.0.0"
+ VALUE "ProductName", "MultiMC"
+ VALUE "ProductVersion", "5"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0000, 0x04b0 // Unicode
+ END
+END
generated by cgit (git 2.46.0) at 2025-06-05 08:14:46 +0000