From 5ee4fb3522ea2bb66ad49e1cdd91140b8d5c6a00 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 11 Nov 2022 15:02:08 +0100
Subject: feat: validate maximum memory allocation

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 launcher/ui/pages/global/JavaPage.cpp | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'launcher/ui/pages/global/JavaPage.cpp')

diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index 2cee15bf..00c06cff 100644
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@@ -58,9 +58,8 @@ JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
     ui->setupUi(this);
     ui->tabWidget->tabBar()->hide();
 
-    auto sysMiB = Sys::getSystemRam() / Sys::mebibyte;
-    ui->maxMemSpinBox->setMaximum(sysMiB);
     loadSettings();
+    updateThresholds();
 }
 
 JavaPage::~JavaPage()
@@ -177,6 +176,11 @@ void JavaPage::on_javaTestBtn_clicked()
     checker->run();
 }
 
+void JavaPage::on_maxMemSpinBox_valueChanged(int i)
+{
+    updateThresholds();
+}
+
 void JavaPage::checkerFinished()
 {
     checker.reset();
@@ -186,3 +190,20 @@ void JavaPage::retranslate()
 {
     ui->retranslateUi(this);
 }
+
+void JavaPage::updateThresholds()
+{
+    auto sysMiB = Sys::getSystemRam() / Sys::mebibyte;
+    unsigned int maxMem = ui->maxMemSpinBox->value();
+
+    if (maxMem >= sysMiB) {
+        ui->labelMaxMemIcon->setText(u8"✘");
+        ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation exceeds your system memory capacity."));
+    } else if (maxMem > (sysMiB * 0.9)) {
+        ui->labelMaxMemIcon->setText(u8"⚠");
+        ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation approaches your system memory capacity."));
+    } else {
+        ui->labelMaxMemIcon->setText(u8"✔");
+        ui->labelMaxMemIcon->setToolTip("");
+    }
+}
-- 
cgit 


From cabd887866929103f635a2640589ce95570f8573 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 11 Nov 2022 15:22:16 +0100
Subject: feat: use icons to show memory allocation state

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 launcher/ui/pages/global/JavaPage.cpp               | 15 ++++++++++++---
 launcher/ui/pages/instance/InstanceSettingsPage.cpp | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'launcher/ui/pages/global/JavaPage.cpp')

diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index 00c06cff..81dd4cc1 100644
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@@ -196,14 +196,23 @@ void JavaPage::updateThresholds()
     auto sysMiB = Sys::getSystemRam() / Sys::mebibyte;
     unsigned int maxMem = ui->maxMemSpinBox->value();
 
+    QString iconName;
+
     if (maxMem >= sysMiB) {
-        ui->labelMaxMemIcon->setText(u8"✘");
+        iconName = "status-bad";
         ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation exceeds your system memory capacity."));
     } else if (maxMem > (sysMiB * 0.9)) {
-        ui->labelMaxMemIcon->setText(u8"⚠");
+        iconName = "status-yellow";
         ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation approaches your system memory capacity."));
     } else {
-        ui->labelMaxMemIcon->setText(u8"✔");
+        iconName = "status-good";
         ui->labelMaxMemIcon->setToolTip("");
     }
+
+    {
+        auto height = ui->labelMaxMemIcon->fontInfo().pixelSize();
+        QIcon icon = APPLICATION->getThemedIcon(iconName);
+        QPixmap pix = icon.pixmap(height, height);
+        ui->labelMaxMemIcon->setPixmap(pix);
+    }
 }
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index 50039e87..af2ba7c8 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -458,14 +458,23 @@ void InstanceSettingsPage::updateThresholds()
     auto sysMiB = Sys::getSystemRam() / Sys::mebibyte;
     unsigned int maxMem = ui->maxMemSpinBox->value();
 
+    QString iconName;
+
     if (maxMem >= sysMiB) {
-        ui->labelMaxMemIcon->setText(u8"✘");
+        iconName = "status-bad";
         ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation exceeds your system memory capacity."));
     } else if (maxMem > (sysMiB * 0.9)) {
-        ui->labelMaxMemIcon->setText(u8"⚠");
+        iconName = "status-yellow";
         ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation approaches your system memory capacity."));
     } else {
-        ui->labelMaxMemIcon->setText(u8"✔");
+        iconName = "status-good";
         ui->labelMaxMemIcon->setToolTip("");
     }
+
+    {
+        auto height = ui->labelMaxMemIcon->fontInfo().pixelSize();
+        QIcon icon = APPLICATION->getThemedIcon(iconName);
+        QPixmap pix = icon.pixmap(height, height);
+        ui->labelMaxMemIcon->setPixmap(pix);
+    }
 }
-- 
cgit