mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-19 01:53:22 +02:00
Merge pull request #2069 from wwylele/fix-birthday
Qt: fix birthday combo box updating
This commit is contained in:
commit
f4bb89ce73
@ -18,9 +18,9 @@ ConfigureSystem::ConfigureSystem(QWidget *parent) :
|
|||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
ui(new Ui::ConfigureSystem) {
|
ui(new Ui::ConfigureSystem) {
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
this->setConfiguration();
|
|
||||||
|
|
||||||
connect(ui->combo_birthmonth, SIGNAL(currentIndexChanged(int)), SLOT(updateBirthdayComboBox(int)));
|
connect(ui->combo_birthmonth, SIGNAL(currentIndexChanged(int)), SLOT(updateBirthdayComboBox(int)));
|
||||||
|
|
||||||
|
this->setConfiguration();
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigureSystem::~ConfigureSystem() {
|
ConfigureSystem::~ConfigureSystem() {
|
||||||
@ -60,6 +60,7 @@ void ConfigureSystem::ReadSystemSettings() {
|
|||||||
// set birthday
|
// set birthday
|
||||||
std::tie(birthmonth, birthday) = Service::CFG::GetBirthday();
|
std::tie(birthmonth, birthday) = Service::CFG::GetBirthday();
|
||||||
ui->combo_birthmonth->setCurrentIndex(birthmonth - 1);
|
ui->combo_birthmonth->setCurrentIndex(birthmonth - 1);
|
||||||
|
updateBirthdayComboBox(birthmonth - 1); // explicitly update it because the signal from setCurrentIndex is not reliable
|
||||||
ui->combo_birthday->setCurrentIndex(birthday - 1);
|
ui->combo_birthday->setCurrentIndex(birthday - 1);
|
||||||
|
|
||||||
// set system language
|
// set system language
|
||||||
|
Loading…
Reference in New Issue
Block a user