Remove obsolete auto login option.
This commit is contained in:
parent
dff00a6d2a
commit
be8dba9ee2
@ -319,9 +319,6 @@ void MultiMC::initGlobalSettings()
|
|||||||
m_settings->registerSetting(new Setting("MinecraftWinWidth", 854));
|
m_settings->registerSetting(new Setting("MinecraftWinWidth", 854));
|
||||||
m_settings->registerSetting(new Setting("MinecraftWinHeight", 480));
|
m_settings->registerSetting(new Setting("MinecraftWinHeight", 480));
|
||||||
|
|
||||||
// Auto login
|
|
||||||
m_settings->registerSetting(new Setting("AutoLogin", false));
|
|
||||||
|
|
||||||
// Memory
|
// Memory
|
||||||
m_settings->registerSetting(new Setting("MinMemAlloc", 512));
|
m_settings->registerSetting(new Setting("MinMemAlloc", 512));
|
||||||
m_settings->registerSetting(new Setting("MaxMemAlloc", 1024));
|
m_settings->registerSetting(new Setting("MaxMemAlloc", 1024));
|
||||||
|
@ -98,18 +98,6 @@ void InstanceSettings::applySettings()
|
|||||||
m_obj->reset("MinecraftWinHeight");
|
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
|
// Memory
|
||||||
bool memory = ui->memoryGroupBox->isChecked();
|
bool memory = ui->memoryGroupBox->isChecked();
|
||||||
m_obj->set("OverrideMemory", memory);
|
m_obj->set("OverrideMemory", memory);
|
||||||
@ -170,10 +158,6 @@ void InstanceSettings::loadSettings()
|
|||||||
ui->windowWidthSpinBox->setValue(m_obj->get("MinecraftWinWidth").toInt());
|
ui->windowWidthSpinBox->setValue(m_obj->get("MinecraftWinWidth").toInt());
|
||||||
ui->windowHeightSpinBox->setValue(m_obj->get("MinecraftWinHeight").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
|
// Memory
|
||||||
ui->memoryGroupBox->setChecked(m_obj->get("OverrideMemory").toBool());
|
ui->memoryGroupBox->setChecked(m_obj->get("OverrideMemory").toBool());
|
||||||
ui->minMemSpinBox->setValue(m_obj->get("MinMemAlloc").toInt());
|
ui->minMemSpinBox->setValue(m_obj->get("MinMemAlloc").toInt());
|
||||||
|
@ -131,31 +131,6 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</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>
|
<item>
|
||||||
<spacer name="verticalSpacerMinecraft">
|
<spacer name="verticalSpacerMinecraft">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
@ -411,7 +386,6 @@
|
|||||||
<tabstop>consoleSettingsBox</tabstop>
|
<tabstop>consoleSettingsBox</tabstop>
|
||||||
<tabstop>showConsoleCheck</tabstop>
|
<tabstop>showConsoleCheck</tabstop>
|
||||||
<tabstop>autoCloseConsoleCheck</tabstop>
|
<tabstop>autoCloseConsoleCheck</tabstop>
|
||||||
<tabstop>accountSettingsBox</tabstop>
|
|
||||||
<tabstop>memoryGroupBox</tabstop>
|
<tabstop>memoryGroupBox</tabstop>
|
||||||
<tabstop>minMemSpinBox</tabstop>
|
<tabstop>minMemSpinBox</tabstop>
|
||||||
<tabstop>maxMemSpinBox</tabstop>
|
<tabstop>maxMemSpinBox</tabstop>
|
||||||
|
@ -150,9 +150,6 @@ void SettingsDialog::applySettings(SettingsObject *s)
|
|||||||
s->set("MinecraftWinWidth", ui->windowWidthSpinBox->value());
|
s->set("MinecraftWinWidth", ui->windowWidthSpinBox->value());
|
||||||
s->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
|
s->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
|
||||||
|
|
||||||
// Auto Login
|
|
||||||
s->set("AutoLogin", ui->autoLoginCheckBox->isChecked());
|
|
||||||
|
|
||||||
// Memory
|
// Memory
|
||||||
s->set("MinMemAlloc", ui->minMemSpinBox->value());
|
s->set("MinMemAlloc", ui->minMemSpinBox->value());
|
||||||
s->set("MaxMemAlloc", ui->maxMemSpinBox->value());
|
s->set("MaxMemAlloc", ui->maxMemSpinBox->value());
|
||||||
@ -202,9 +199,6 @@ void SettingsDialog::loadSettings(SettingsObject *s)
|
|||||||
ui->windowWidthSpinBox->setValue(s->get("MinecraftWinWidth").toInt());
|
ui->windowWidthSpinBox->setValue(s->get("MinecraftWinWidth").toInt());
|
||||||
ui->windowHeightSpinBox->setValue(s->get("MinecraftWinHeight").toInt());
|
ui->windowHeightSpinBox->setValue(s->get("MinecraftWinHeight").toInt());
|
||||||
|
|
||||||
// Auto Login
|
|
||||||
ui->autoLoginCheckBox->setChecked(s->get("AutoLogin").toBool());
|
|
||||||
|
|
||||||
// Memory
|
// Memory
|
||||||
ui->minMemSpinBox->setValue(s->get("MinMemAlloc").toInt());
|
ui->minMemSpinBox->setValue(s->get("MinMemAlloc").toInt());
|
||||||
ui->maxMemSpinBox->setValue(s->get("MaxMemAlloc").toInt());
|
ui->maxMemSpinBox->setValue(s->get("MaxMemAlloc").toInt());
|
||||||
|
@ -261,22 +261,6 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</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>
|
<item>
|
||||||
<spacer name="verticalSpacerMinecraft">
|
<spacer name="verticalSpacerMinecraft">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
@ -85,11 +85,6 @@ BaseInstance::BaseInstance(BaseInstancePrivate *d_in, const QString &rootDir,
|
|||||||
settings().registerSetting(
|
settings().registerSetting(
|
||||||
new OverrideSetting("PermGen", globalSettings->getSetting("PermGen")));
|
new OverrideSetting("PermGen", globalSettings->getSetting("PermGen")));
|
||||||
|
|
||||||
// Auto login
|
|
||||||
settings().registerSetting(new Setting("OverrideLogin", false));
|
|
||||||
settings().registerSetting(
|
|
||||||
new OverrideSetting("AutoLogin", globalSettings->getSetting("AutoLogin")));
|
|
||||||
|
|
||||||
// Console
|
// Console
|
||||||
settings().registerSetting(new Setting("OverrideConsole", false));
|
settings().registerSetting(new Setting("OverrideConsole", false));
|
||||||
settings().registerSetting(
|
settings().registerSetting(
|
||||||
|
Loading…
Reference in New Issue
Block a user