Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3896 from jamierocks/mib-suffix

Browse Source 
NOISSUE Use MiB suffix for Java memory options
This commit is contained in:
Petr Mrázek 2021-06-25 12:27:57 +02:00 committed by GitHub
commit dc3a4cebce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/pages/global/JavaPage.cpp
View File

@ -37,8 +37,8 @@ JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
ui->setupUi(this); ui->setupUi(this);
ui->tabWidget->tabBar()->hide(); ui->tabWidget->tabBar()->hide();
auto sysMB = Sys::getSystemRam() / Sys::megabyte; auto sysMiB = Sys::getSystemRam() / Sys::mebibyte;
ui->maxMemSpinBox->setMaximum(sysMB); ui->maxMemSpinBox->setMaximum(sysMiB);
loadSettings(); loadSettings();
} }

6
application/pages/global/JavaPage.ui
View File

@ -51,7 +51,7 @@
<string>The maximum amount of memory Minecraft is allowed to use.</string> <string>The maximum amount of memory Minecraft is allowed to use.</string>
</property> </property>
<property name="suffix"> <property name="suffix">
<string notr="true"> MB</string> <string notr="true"> MiB</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>128</number> <number>128</number>
@ -87,7 +87,7 @@
<string>The amount of memory Minecraft is started with.</string> <string>The amount of memory Minecraft is started with.</string>
</property> </property>
<property name="suffix"> <property name="suffix">
<string notr="true"> MB</string> <string notr="true"> MiB</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>128</number> <number>128</number>
@ -116,7 +116,7 @@
<string>The amount of memory available to store loaded Java classes.</string> <string>The amount of memory available to store loaded Java classes.</string>
</property> </property>
<property name="suffix"> <property name="suffix">
<string notr="true"> MB</string> <string notr="true"> MiB</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>64</number> <number>64</number>

2
application/pages/instance/InstanceSettingsPage.cpp
View File

@ -19,7 +19,7 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
{ {
m_settings = inst->settings(); m_settings = inst->settings();
ui->setupUi(this); ui->setupUi(this);
auto sysMB = Sys::getSystemRam() / Sys::megabyte; auto sysMB = Sys::getSystemRam() / Sys::mebibyte;
ui->maxMemSpinBox->setMaximum(sysMB); ui->maxMemSpinBox->setMaximum(sysMB);
connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked); connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked);
connect(MMC, &MultiMC::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings); connect(MMC, &MultiMC::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);

6
application/pages/instance/InstanceSettingsPage.ui
View File

@ -116,7 +116,7 @@
<string>The maximum amount of memory Minecraft is allowed to use.</string> <string>The maximum amount of memory Minecraft is allowed to use.</string>
</property> </property>
<property name="suffix"> <property name="suffix">
<string notr="true"> MB</string> <string notr="true"> MiB</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>128</number> <number>128</number>
@ -138,7 +138,7 @@
<string>The amount of memory Minecraft is started with.</string> <string>The amount of memory Minecraft is started with.</string>
</property> </property>
<property name="suffix"> <property name="suffix">
<string notr="true"> MB</string> <string notr="true"> MiB</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>128</number> <number>128</number>
@ -160,7 +160,7 @@
<string>The amount of memory available to store loaded Java classes.</string> <string>The amount of memory available to store loaded Java classes.</string>
</property> </property>
<property name="suffix"> <property name="suffix">
<string notr="true"> MB</string> <string notr="true"> MiB</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>64</number> <number>64</number>

2
application/widgets/JavaSettingsWidget.cpp
View File

@ -19,7 +19,7 @@
JavaSettingsWidget::JavaSettingsWidget(QWidget* parent) : QWidget(parent) JavaSettingsWidget::JavaSettingsWidget(QWidget* parent) : QWidget(parent)
{ {
m_availableMemory = Sys::getSystemRam() / Sys::megabyte; m_availableMemory = Sys::getSystemRam() / Sys::mebibyte;
goodIcon = MMC->getThemedIcon("status-good"); goodIcon = MMC->getThemedIcon("status-good");
yellowIcon = MMC->getThemedIcon("status-yellow"); yellowIcon = MMC->getThemedIcon("status-yellow");

2
libraries/systeminfo/include/sys.h
View File

@ -3,7 +3,7 @@
namespace Sys namespace Sys
{ {
const uint64_t megabyte = 1024ull * 1024ull; const uint64_t mebibyte = 1024ull * 1024ull;
struct KernelInfo struct KernelInfo
{ {
QString kernelName; QString kernelName;