6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-25 03:32:01 +00:00
Code Issues Projects Releases Wiki Activity

Ensures display selection is preserved in the app settings.

Browse Source
This commit is contained in:
Thomas Harte 2020-06-27 16:26:39 -04:00
parent c982c78285
commit afb835398f
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
OSBindings/Qt/mainwindow.cpp
View File

@ -352,50 +352,51 @@ void MainWindow::launchMachine() {
// Update the window title. TODO: clearly I need a proper functional solution for the window title. // Update the window title. TODO: clearly I need a proper functional solution for the window title.
setWindowTitle(QString::fromStdString(longMachineName)); setWindowTitle(QString::fromStdString(longMachineName));
// TODO: add machine-specific UI.
// Add machine-specific UI.
const std::string settingsPrefix = Machine::ShortNameForTargetMachine(machineType);
switch(machineType) { switch(machineType) {
case Analyser::Machine::AmstradCPC: case Analyser::Machine::AmstradCPC:
addDisplayMenu("Television", "", "", "Monitor"); addDisplayMenu(settingsPrefix, "Television", "", "", "Monitor");
break; break;
case Analyser::Machine::AppleII: case Analyser::Machine::AppleII:
addDisplayMenu("Colour", "Monochrome", "", ""); addDisplayMenu(settingsPrefix, "Colour", "Monochrome", "", "");
break; break;
case Analyser::Machine::AtariST: case Analyser::Machine::AtariST:
addDisplayMenu("Television", "", "", "Monitor"); addDisplayMenu(settingsPrefix, "Television", "", "", "Monitor");
break; break;
case Analyser::Machine::ColecoVision: case Analyser::Machine::ColecoVision:
addDisplayMenu("Composite", "", "S-Video", ""); addDisplayMenu(settingsPrefix, "Composite", "", "S-Video", "");
break; break;
case Analyser::Machine::Vic20: case Analyser::Machine::Vic20:
addDisplayMenu("Composite", "", "S-Video", ""); addDisplayMenu(settingsPrefix, "Composite", "", "S-Video", "");
break; break;
case Analyser::Machine::Electron: case Analyser::Machine::Electron:
addDisplayMenu("Composite", "", "S-Video", "RGB"); addDisplayMenu(settingsPrefix, "Composite", "", "S-Video", "RGB");
break; break;
case Analyser::Machine::MasterSystem: case Analyser::Machine::MasterSystem:
addDisplayMenu("Composite", "", "S-Video", "SCART"); addDisplayMenu(settingsPrefix, "Composite", "", "S-Video", "SCART");
break; break;
case Analyser::Machine::MSX: case Analyser::Machine::MSX:
addDisplayMenu("Composite", "", "S-Video", "SCART"); addDisplayMenu(settingsPrefix, "Composite", "", "S-Video", "SCART");
break; break;
case Analyser::Machine::Oric: case Analyser::Machine::Oric:
addDisplayMenu("Composite", "", "", "SCART"); addDisplayMenu(settingsPrefix, "Composite", "", "", "SCART");
break; break;
default: break; default: break;
} }
} }
void MainWindow::addDisplayMenu(const std::string &compositeColour, const std::string &compositeMono, const std::string &svideo, const std::string &rgb) { void MainWindow::addDisplayMenu(const std::string &machinePrefix, const std::string &compositeColour, const std::string &compositeMono, const std::string &svideo, const std::string &rgb) {
// Create a display menu. // Create a display menu.
displayMenu = menuBar()->addMenu(tr("&Display")); displayMenu = menuBar()->addMenu(tr("&Display"));
@ -419,9 +420,21 @@ void MainWindow::addDisplayMenu(const std::string &compositeColour, const std::s
#undef Add #undef Add
// TODO: use the existing machine configuration and/or settings to determine what is currently ticked. // Get the machine's default setting.
auto options = machine->configurable_device()->get_options(); auto options = machine->configurable_device()->get_options();
Configurable::Display defaultDisplay = Configurable::Display::RGB;//Reflection::get<Configurable::Display>(*options, "output"); auto defaultDisplay = Reflection::get<Configurable::Display>(*options, "output");
// Check whether there's an alternative selection in the user settings. If so, apply it.
Settings settings;
const auto settingName = QString::fromStdString(machinePrefix + ".displayType");
if(settings.contains(settingName)) {
auto userSelectedDisplay = Configurable::Display(settings.value(settingName).toInt());
if(userSelectedDisplay != defaultDisplay) {
defaultDisplay = userSelectedDisplay;
Reflection::set(*options, "output", int(userSelectedDisplay));
machine->configurable_device()->set_options(options);
}
}
// Add actions to the generated options. // Add actions to the generated options.
size_t index = 0; size_t index = 0;
@ -446,6 +459,9 @@ void MainWindow::addDisplayMenu(const std::string &compositeColour, const std::s
auto options = machine->configurable_device()->get_options(); auto options = machine->configurable_device()->get_options();
Reflection::set(*options, "output", int(displaySelection)); Reflection::set(*options, "output", int(displaySelection));
machine->configurable_device()->set_options(options); machine->configurable_device()->set_options(options);
Settings settings;
settings.setValue(settingName, int(displaySelection));
}); });
} }
} }

2
OSBindings/Qt/mainwindow.h
View File

@ -101,7 +101,7 @@ class MainWindow : public QMainWindow, public Outputs::Speaker::Speaker::Delegat
void deleteMachine(); void deleteMachine();
QMenu *displayMenu = nullptr; QMenu *displayMenu = nullptr;
void addDisplayMenu(const std::string &compositeColour, const std::string &compositeMono, const std::string &svideo, const std::string &rgb); void addDisplayMenu(const std::string &machinePrefix, const std::string &compositeColour, const std::string &compositeMono, const std::string &svideo, const std::string &rgb);
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H