ui: Disable add-on voodoo when main voodoo is selected
This commit is contained in:
@@ -139,6 +139,7 @@ SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index)
|
|||||||
if (index < 0) {
|
if (index < 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
static QRegularExpression voodooRegex("3dfx|voodoo|banshee", QRegularExpression::CaseInsensitiveOption);
|
||||||
auto curVideoCard_2 = videoCard[1];
|
auto curVideoCard_2 = videoCard[1];
|
||||||
videoCard[0] = ui->comboBoxVideo->currentData().toInt();
|
videoCard[0] = ui->comboBoxVideo->currentData().toInt();
|
||||||
if (videoCard[0] == VID_INTERNAL)
|
if (videoCard[0] == VID_INTERNAL)
|
||||||
@@ -207,6 +208,25 @@ SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index)
|
|||||||
ui->comboBoxVideoSecondary->setCurrentIndex(0);
|
ui->comboBoxVideoSecondary->setCurrentIndex(0);
|
||||||
ui->pushButtonConfigureSecondary->setEnabled(false);
|
ui->pushButtonConfigureSecondary->setEnabled(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Is the currently selected video card a voodoo?
|
||||||
|
if (ui->comboBoxVideo->currentText().contains(voodooRegex)) {
|
||||||
|
// Get the name of the video card currently in use
|
||||||
|
const device_t *video_dev = video_card_getdevice(gfxcard[0]);
|
||||||
|
const QString currentVideoName = DeviceConfig::DeviceName(video_dev, video_get_internal_name(gfxcard[0]), 1);
|
||||||
|
// Is it a voodoo?
|
||||||
|
const bool currentCardIsVoodoo = currentVideoName.contains(voodooRegex);
|
||||||
|
// Don't uncheck if
|
||||||
|
// * Current card is voodoo
|
||||||
|
// * Add-on voodoo was manually overridden in config
|
||||||
|
if (ui->checkBoxVoodoo->isChecked() && !currentCardIsVoodoo) {
|
||||||
|
// Otherwise, uncheck the add-on voodoo when a main voodoo is selected
|
||||||
|
ui->checkBoxVoodoo->setCheckState(Qt::Unchecked);
|
||||||
|
}
|
||||||
|
ui->checkBoxVoodoo->setDisabled(true);
|
||||||
|
} else {
|
||||||
|
ui->checkBoxVoodoo->setDisabled(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
@@ -61,15 +61,15 @@
|
|||||||
</item>
|
</item>
|
||||||
<item row="1" column="0" colspan="2">
|
<item row="1" column="0" colspan="2">
|
||||||
<widget class="QComboBox" name="comboBoxVideo">
|
<widget class="QComboBox" name="comboBoxVideo">
|
||||||
<property name="maxVisibleItems">
|
|
||||||
<number>30</number>
|
|
||||||
</property>
|
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="maxVisibleItems">
|
||||||
|
<number>30</number>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="2">
|
<item row="4" column="2">
|
||||||
@@ -102,7 +102,7 @@
|
|||||||
<item row="4" column="0" colspan="2">
|
<item row="4" column="0" colspan="2">
|
||||||
<widget class="QCheckBox" name="checkBoxVoodoo">
|
<widget class="QCheckBox" name="checkBoxVoodoo">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Voodoo Graphics</string>
|
<string>Voodoo 1 or 2 Graphics</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -122,15 +122,15 @@
|
|||||||
</item>
|
</item>
|
||||||
<item row="3" column="0" colspan="2">
|
<item row="3" column="0" colspan="2">
|
||||||
<widget class="QComboBox" name="comboBoxVideoSecondary">
|
<widget class="QComboBox" name="comboBoxVideoSecondary">
|
||||||
<property name="maxVisibleItems">
|
|
||||||
<number>30</number>
|
|
||||||
</property>
|
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="maxVisibleItems">
|
||||||
|
<number>30</number>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="7" column="0" colspan="3">
|
<item row="7" column="0" colspan="3">
|
||||||
|
|||||||
Reference in New Issue
Block a user