80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2992 from Cacodemon345/qt-settings

Browse Source 
qt_settingsdisplay: Changes are not lost on machine switch anymore
This commit is contained in:
Jasmine Iwanek
2022-12-25 00:30:39 -05:00
committed by GitHub
parent 9662baa908 a2dcf9e12f
commit d12c3e4dce
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/qt/qt_settingsdisplay.cpp
View File

@@ -36,6 +36,8 @@ SettingsDisplay::SettingsDisplay(QWidget *parent)
{ {
ui->setupUi(this); ui->setupUi(this);
videoCard = gfxcard;
videoCard_2 = gfxcard_2;
onCurrentMachineChanged(machine); onCurrentMachineChanged(machine);
} }
@@ -59,6 +61,7 @@ SettingsDisplay::onCurrentMachineChanged(int machineId)
{ {
// win_settings_video_proc, WM_INITDIALOG // win_settings_video_proc, WM_INITDIALOG
this->machineId = machineId; this->machineId = machineId;
auto curVideoCard = videoCard;
auto *model = ui->comboBoxVideo->model(); auto *model = ui->comboBoxVideo->model();
auto removeRows = model->rowCount(); auto removeRows = model->rowCount();
@@ -80,7 +83,7 @@ SettingsDisplay::onCurrentMachineChanged(int machineId)
if (video_card_available(c) && device_is_valid(video_dev, machineId)) { if (video_card_available(c) && device_is_valid(video_dev, machineId)) {
int row = Models::AddEntry(model, name, c); int row = Models::AddEntry(model, name, c);
if (c == gfxcard) { if (c == curVideoCard) {
selectedRow = row - removeRows; selectedRow = row - removeRows;
} }
} }
@@ -133,7 +136,8 @@ SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index)
if (index < 0) { if (index < 0) {
return; return;
} }
int videoCard = ui->comboBoxVideo->currentData().toInt(); auto curVideoCard_2 = videoCard_2;
videoCard = ui->comboBoxVideo->currentData().toInt();
ui->pushButtonConfigure->setEnabled(video_card_has_config(videoCard) > 0); ui->pushButtonConfigure->setEnabled(video_card_has_config(videoCard) > 0);
bool machineHasPci = machine_has_bus(machineId, MACHINE_BUS_PCI) > 0; bool machineHasPci = machine_has_bus(machineId, MACHINE_BUS_PCI) > 0;
@@ -176,14 +180,14 @@ SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index)
if (video_card_available(c) && device_is_valid(video_dev, machineId) && !(video_card_get_flags(c) == video_card_get_flags(videoCard))) { if (video_card_available(c) && device_is_valid(video_dev, machineId) && !(video_card_get_flags(c) == video_card_get_flags(videoCard))) {
ui->comboBoxVideoSecondary->addItem(name, c); ui->comboBoxVideoSecondary->addItem(name, c);
if (c == gfxcard_2) if (c == curVideoCard_2)
ui->comboBoxVideoSecondary->setCurrentIndex(ui->comboBoxVideoSecondary->count() - 1); ui->comboBoxVideoSecondary->setCurrentIndex(ui->comboBoxVideoSecondary->count() - 1);
} }
c++; c++;
} }
if (gfxcard_2 == 0 || (machine_has_flags(machineId, MACHINE_VIDEO_ONLY) > 0)) { if (videoCard_2 == 0 || (machine_has_flags(machineId, MACHINE_VIDEO_ONLY) > 0)) {
ui->comboBoxVideoSecondary->setCurrentIndex(0); ui->comboBoxVideoSecondary->setCurrentIndex(0);
ui->pushButtonConfigureSecondary->setEnabled(false); ui->pushButtonConfigureSecondary->setEnabled(false);
} }
@@ -208,8 +212,8 @@ SettingsDisplay::on_comboBoxVideoSecondary_currentIndexChanged(int index)
ui->pushButtonConfigureSecondary->setEnabled(false); ui->pushButtonConfigureSecondary->setEnabled(false);
return; return;
} }
int videoCard = ui->comboBoxVideoSecondary->currentData().toInt(); videoCard_2 = ui->comboBoxVideoSecondary->currentData().toInt();
ui->pushButtonConfigureSecondary->setEnabled(index != 0 && video_card_has_config(videoCard) > 0); ui->pushButtonConfigureSecondary->setEnabled(index != 0 && video_card_has_config(videoCard_2) > 0);
} }
void void

4
src/qt/qt_settingsdisplay.hpp
View File

@@ -35,7 +35,9 @@ private slots:
private: private:
Ui::SettingsDisplay *ui; Ui::SettingsDisplay *ui;
int machineId = 0; int machineId = 0;
int videoCard = 0;
int videoCard_2 = 0;
}; };
#endif // QT_SETTINGSDISPLAY_HPP #endif // QT_SETTINGSDISPLAY_HPP