mirror of
https://github.com/MultiMC/MultiMC5.git
synced 2024-10-06 06:50:16 +00:00
SCRATCH pass initial parameters to the JavaSettingsWidget from outside
This commit is contained in:
parent
62e1bf327d
commit
19ab1251c2
@ -45,7 +45,13 @@ void JavaWizardPage::refresh()
|
|||||||
|
|
||||||
void JavaWizardPage::initializePage()
|
void JavaWizardPage::initializePage()
|
||||||
{
|
{
|
||||||
m_java_widget->initialize();
|
auto s = MMC->settings();
|
||||||
|
m_java_widget->initialize(
|
||||||
|
s->get("JavaPath").toString(),
|
||||||
|
s->get("MinMemAlloc").toInt(),
|
||||||
|
s->get("MaxMemAlloc").toInt(),
|
||||||
|
s->get("PermGen").toInt()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool JavaWizardPage::wantsRefreshButton()
|
bool JavaWizardPage::wantsRefreshButton()
|
||||||
|
@ -113,15 +113,15 @@ void JavaSettingsWidget::setupUi()
|
|||||||
retranslate();
|
retranslate();
|
||||||
}
|
}
|
||||||
|
|
||||||
void JavaSettingsWidget::initialize()
|
void JavaSettingsWidget::initialize(const QString& currentJavaPath, int minHeap, int maxHeap, int permGen)
|
||||||
{
|
{
|
||||||
m_versionWidget->initialize(MMC->javalist().get());
|
m_versionWidget->initialize(MMC->javalist().get());
|
||||||
m_versionWidget->setResizeOn(2);
|
m_versionWidget->setResizeOn(2);
|
||||||
auto s = MMC->settings();
|
|
||||||
// Memory
|
// Memory
|
||||||
observedMinMemory = s->get("MinMemAlloc").toInt();
|
observedMinMemory = minHeap;
|
||||||
observedMaxMemory = s->get("MaxMemAlloc").toInt();
|
observedMaxMemory = maxHeap;
|
||||||
observedPermGenMemory = s->get("PermGen").toInt();
|
observedPermGenMemory = permGen;
|
||||||
|
m_javaPathTextBox->setText(currentJavaPath);
|
||||||
m_minMemSpinBox->setValue(observedMinMemory);
|
m_minMemSpinBox->setValue(observedMinMemory);
|
||||||
m_maxMemSpinBox->setValue(observedMaxMemory);
|
m_maxMemSpinBox->setValue(observedMaxMemory);
|
||||||
m_permGenSpinBox->setValue(observedPermGenMemory);
|
m_permGenSpinBox->setValue(observedPermGenMemory);
|
||||||
|
@ -46,7 +46,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
void refresh();
|
void refresh();
|
||||||
void initialize();
|
void initialize(const QString& currentJavaPath, int minHeap, int maxHeap, int permGen);
|
||||||
ValidationStatus validate();
|
ValidationStatus validate();
|
||||||
void retranslate();
|
void retranslate();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user