fix: add missing placeholder text for account override
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:
parent
462e0ef56d
commit
6ff87f773b
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user