mirror of
https://github.com/UltimMC/Launcher.git
synced 2025-12-14 12:37:23 +00:00
Compare commits
1 Commits
feature/bu
...
feature/up
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f26fff8d0 |
@@ -45,13 +45,7 @@ void JavaWizardPage::refresh()
|
|||||||
|
|
||||||
void JavaWizardPage::initializePage()
|
void JavaWizardPage::initializePage()
|
||||||
{
|
{
|
||||||
auto s = MMC->settings();
|
m_java_widget->initialize();
|
||||||
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(const QString& currentJavaPath, int minHeap, int maxHeap, int permGen)
|
void JavaSettingsWidget::initialize()
|
||||||
{
|
{
|
||||||
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 = minHeap;
|
observedMinMemory = s->get("MinMemAlloc").toInt();
|
||||||
observedMaxMemory = maxHeap;
|
observedMaxMemory = s->get("MaxMemAlloc").toInt();
|
||||||
observedPermGenMemory = permGen;
|
observedPermGenMemory = s->get("PermGen").toInt();
|
||||||
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(const QString& currentJavaPath, int minHeap, int maxHeap, int permGen);
|
void initialize();
|
||||||
ValidationStatus validate();
|
ValidationStatus validate();
|
||||||
void retranslate();
|
void retranslate();
|
||||||
|
|
||||||
|
|||||||
Submodule libraries/libnbtplusplus updated: 92f8d57227...508eda8316
Reference in New Issue
Block a user