jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 00:54:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: remove ReleaseChannel keeping track of its own indexes (#5366)

Browse source
This commit is contained in:
RickyRister 2024-12-28 15:51:37 -08:00 • committed by GitHub
parent c8d49b5bf9
commit 25d21a3da6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cockatrice/src/dialogs/dlg_settings.cpp
View file

@ -174,8 +174,9 @@ GeneralSettingsPage::GeneralSettingsPage()
GeneralSettingsPage::retranslateUi();
// connect the ReleaseChannel combo box only after the entries are inserted in retranslateUi
connect(&updateReleaseChannelBox, SIGNAL(currentIndexChanged(int)), &settings, SLOT(setUpdateReleaseChannel(int)));
updateReleaseChannelBox.setCurrentIndex(settings.getUpdateReleaseChannel()->getIndex());
connect(&updateReleaseChannelBox, SIGNAL(currentIndexChanged(int)), &settings,
SLOT(setUpdateReleaseChannelIndex(int)));
updateReleaseChannelBox.setCurrentIndex(settings.getUpdateReleaseChannelIndex());
setLayout(mainLayout);
}
@ -309,7 +310,7 @@ void GeneralSettingsPage::retranslateUi()
int oldIndex = updateReleaseChannelBox.currentIndex();
updateReleaseChannelBox.clear();
for (ReleaseChannel *chan : settings.getUpdateReleaseChannels()) {
updateReleaseChannelBox.insertItem(chan->getIndex(), tr(chan->getName().toUtf8()));
updateReleaseChannelBox.addItem(tr(chan->getName().toUtf8()));
}
updateReleaseChannelBox.setCurrentIndex(oldIndex);
}