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

fix: add missing placeholder text for account override

Browse Source 
Also changes the "No accounts available" message to be placeholder text
instead of a combobox item, if the current Qt version supports it.

Signed-off-by: Lenny McLennington <lenny@sneed.church>
This commit is contained in:
Lenny McLennington 2022-11-17 02:13:59 +00:00
parent 462e0ef56d
commit 6ff87f773b
No known key found for this signature in database
GPG Key ID: F0467078ECA45FCB
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/ui/pages/instance/InstanceSettingsPage.cpp
View File

@ -62,6 +62,11 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
m_settings = inst->settings(); m_settings = inst->settings();
m_accounts = APPLICATION->accounts(); m_accounts = APPLICATION->accounts();
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
// This would just be set in the .ui file, if only Qt's uic would just ignore propreties that don't exist. SAD!
ui->accountComboBox->setPlaceholderText(tr("No account selected"));
#endif
auto sysMB = Sys::getSystemRam() / Sys::mebibyte; 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);
@ -413,7 +418,12 @@ void InstanceSettingsPage::loadSettings()
} }
ui->accountComboBox->setCurrentIndex(index); ui->accountComboBox->setCurrentIndex(index);
} else { } else {
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
ui->accountComboBox->setPlaceholderText(tr("No accounts available"));
ui->accountComboBox->setCurrentIndex(-1);
#else
ui->accountComboBox->addItem(tr("No accounts available")); ui->accountComboBox->addItem(tr("No accounts available"));
#endif
ui->accountComboBox->setDisabled(true); ui->accountComboBox->setDisabled(true);
} }