diff --git a/src/qt/qt_settingsdisplay.cpp b/src/qt/qt_settingsdisplay.cpp index 9aa7ff6f2..86d5f550c 100644 --- a/src/qt/qt_settingsdisplay.cpp +++ b/src/qt/qt_settingsdisplay.cpp @@ -17,8 +17,11 @@ #include "qt_settingsdisplay.hpp" #include "ui_qt_settingsdisplay.h" +#include "qt_util.hpp" + #include #include +#include extern "C" { #include <86box/86box.h> @@ -42,6 +45,9 @@ SettingsDisplay::SettingsDisplay(QWidget *parent) for (uint8_t i = 0; i < GFXCARD_MAX; i ++) videoCard[i] = gfxcard[i]; + + ui->lineEdit->setFilter(tr("EDID") % util::DlgFilter({ "bin", "dat", "edid" }) % tr("All files") % util::DlgFilter({ "*" }, true)); + onCurrentMachineChanged(machine); } @@ -333,10 +339,10 @@ void SettingsDisplay::on_radioButtonCustom_clicked() void SettingsDisplay::on_pushButtonExportDefault_clicked() { - auto str = QFileDialog::getSaveFileName(this, tr("Export")); + auto str = QFileDialog::getSaveFileName(this, tr("Export EDID...")); if (!str.isEmpty()) { QFile file(str); - if (file.open(QFile::ReadOnly)) { + if (file.open(QFile::WriteOnly)) { ssize_t size = 0; auto bytes = ddc_create_default_edid(&size); file.write((char*)bytes, size); diff --git a/src/qt/qt_settingsdisplay.ui b/src/qt/qt_settingsdisplay.ui index f295a6206..5a796d35b 100644 --- a/src/qt/qt_settingsdisplay.ui +++ b/src/qt/qt_settingsdisplay.ui @@ -7,13 +7,13 @@ 0 0 400 - 399 + 466 Form - + 0 @@ -26,45 +26,10 @@ 0 - - + + - Configure - - - - - - - Configure - - - - - - - Configure - - - - - - - IBM 8514/A Graphics - - - - - - - IBM PS/55 Display Adapter Graphics - - - - - - - XGA Graphics + Voodoo 1 or 2 Graphics @@ -75,16 +40,10 @@ - - - - - 0 - 0 - - - - 30 + + + + IBM 8514/A Graphics @@ -101,10 +60,10 @@ - - + + - Voodoo 1 or 2 Graphics + Configure @@ -115,6 +74,102 @@ + + + + + 0 + 0 + + + + Monitor EDID + + + + + + + + Default + + + + + + + + 0 + 0 + + + + Export... + + + + + + + + + QLayout::SizeConstraint::SetNoConstraint + + + + + Custom + + + + + + + + 0 + 0 + + + + + + + + + + + + + + 0 + 0 + + + + 30 + + + + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + + + + + Configure + + + @@ -128,19 +183,6 @@ - - - - - 0 - 0 - - - - 30 - - - @@ -154,53 +196,48 @@ - - - - Qt::Orientation::Vertical + + + + Configure - - - 20 - 40 - - - + - - - - Monitor EDID + + + + + 0 + 0 + + + + 30 + + + + + + + XGA Graphics + + + + + + + IBM PS/55 Display Adapter Graphics + + + + + + + + 0 + 0 + - - - QLayout::SizeConstraint::SetFixedSize - - - - - Default - - - - - - - Export... - - - - - - - Custom - - - - - - -