mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-07-05 04:18:53 +00:00
Code Issues Projects Releases Wiki Activity

SCRATCH pass initial parameters to the JavaSettingsWidget from outside

Browse Source
This commit is contained in:
Petr Mrázek 2018-02-23 01:10:28 +01:00
parent 62e1bf327d
commit 19ab1251c2
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/setupwizard/JavaWizardPage.cpp
View File

@ -45,7 +45,13 @@ void JavaWizardPage::refresh()
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()

10
application/widgets/JavaSettingsWidget.cpp
View File

@ -113,15 +113,15 @@ void JavaSettingsWidget::setupUi()
retranslate();
}
void JavaSettingsWidget::initialize()
void JavaSettingsWidget::initialize(const QString& currentJavaPath, int minHeap, int maxHeap, int permGen)
{
m_versionWidget->initialize(MMC->javalist().get());
m_versionWidget->setResizeOn(2);
auto s = MMC->settings();
// Memory
observedMinMemory = s->get("MinMemAlloc").toInt();
observedMaxMemory = s->get("MaxMemAlloc").toInt();
observedPermGenMemory = s->get("PermGen").toInt();
observedMinMemory = minHeap;
observedMaxMemory = maxHeap;
observedPermGenMemory = permGen;
m_javaPathTextBox->setText(currentJavaPath);
m_minMemSpinBox->setValue(observedMinMemory);
m_maxMemSpinBox->setValue(observedMaxMemory);
m_permGenSpinBox->setValue(observedPermGenMemory);

2
application/widgets/JavaSettingsWidget.h
View File

@ -46,7 +46,7 @@ public:
};
void refresh();
void initialize();
void initialize(const QString& currentJavaPath, int minHeap, int maxHeap, int permGen);
ValidationStatus validate();
void retranslate();