Compare commits

..

3 Commits

Author SHA1 Message Date
Petr Mrázek
19ab1251c2 SCRATCH pass initial parameters to the JavaSettingsWidget from outside 2019-07-13 23:40:28 +02:00
Petr Mrázek
62e1bf327d Merge pull request #2740 from jturnism/patch-1
Update changelog.md
2019-07-12 08:19:20 +02:00
Joseph Turner
280e0e6e36 Update changelog.md
Just installing "qt5-qtbase" on Fedora 30 does not allow MultiMC to run. It still needs "libQt5Widgets.so.5" and by running "dnf whatprovides" it tells me "qt5-qtbase-gui" provides that file and also pulls in "qt5-qtbase" as a dependency if not already installed. I am assuming this is the same situation for CentOS/RHEL
2019-07-11 21:00:55 -05:00
4 changed files with 15 additions and 9 deletions

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()

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);

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();

View File

@@ -12,7 +12,7 @@ Make sure you have the following packages before you update:
- Arch: `qt5-base`
- Debian/Ubuntu: `qt5-default`
- CentOS/RHEL: `qt5-qtbase`
- CentOS/RHEL/Fedora: `qt5-qtbase-gui`
- Suse: `libqt5-qtbase`
MultiMC on linux is built with Qt 5.4 and older versions of Qt will not work.
@@ -1170,4 +1170,4 @@ Long time coming, this release brought a lot of incremental improvements and fix
- Added additional information to the about dialog.
## MultiMC 0.0
- Initial release.
- Initial release.