X-Git-Url: http://git.hcoop.net/clinton/Virtual-Jaguar-Rx.git/blobdiff_plain/024bfc4643b56158f3307049bf1bc30ba9376398..0e699c1255f04f5c332632eef475ebcef4200305:/src/gui/configdialog.cpp?ds=sidebyside

diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp
index e4bcbad..a665730 100644
--- a/src/gui/configdialog.cpp
+++ b/src/gui/configdialog.cpp
@@ -6,6 +6,7 @@
 //
 // JLH = James Hammons <jlhamm@acm.org>
 // JPM = Jean-Paul Mari <djipi.mari@gmail.com>
+//  RG = Richard Goedeken
 //
 // Who  When        What
 // ---  ----------  ------------------------------------------------------------
@@ -14,7 +15,9 @@
 // JLH  10/14/2011  Fixed possibly missing final slash in paths
 // JPM  06/06/2016  Visual Studio support
 // JPM  06/19/2016  Soft debugger support
-// JPM  09/  /2017  Added the Keybindings tab
+// JPM  09/  /2017  Added a Keybindings tab
+// JPM  09/03/2018  Added a Models & Bios tab
+//  RG   Jan./2021  Linux build fix
 //
 
 #include "configdialog.h"
@@ -23,13 +26,17 @@
 #include "controllertab.h"
 #include "controllerwidget.h"
 #include "generaltab.h"
-#include "KeyBindingsTab.h"
+#include "modelsbiostab.h"
+#include "keybindingstab.h"
 #include "settings.h"
 
 
 ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/) : QDialog(parent),
 tabWidget(new QTabWidget),
 generalTab(new GeneralTab(this)),
+#ifdef NEWMODELSBIOSHANDLER
+modelsbiosTab(new ModelsBiosTab),
+#endif
 controllerTab1(new ControllerTab(this)),
 keybindingsTab(new KeyBindingsTab(this))
 {
@@ -42,9 +49,12 @@ keybindingsTab(new KeyBindingsTab(this))
 //		alpineTab = new AlpineTab(this);
 
 	tabWidget->addTab(generalTab, tr("General"));
+#ifdef NEWMODELSBIOSHANDLER
+	tabWidget->addTab(modelsbiosTab, tr("Models and BIOS"));
+#endif
 	tabWidget->addTab(controllerTab1, tr("Controllers"));
 //	tabWidget->addTab(controllerTab2, tr("Controller #2"));
-	tabWidget->addTab(keybindingsTab, tr("Keybindings"));
+	tabWidget->addTab(keybindingsTab, tr("Key Bindings"));
 
 	if (vjs.hardwareTypeAlpine || vjs.softTypeDebugger)
 	{
@@ -78,12 +88,15 @@ ConfigDialog::~ConfigDialog()
 }
 
 
-// Load / Update the tabs dialog from the settings
+// Load & Update the tabs dialog from the settings
 void ConfigDialog::LoadDialogFromSettings(void)
 {
 	// General & Keybindings tab settings
 	generalTab->GetSettings();
 	keybindingsTab->GetSettings();
+#ifdef NEWMODELSBIOSHANDLER
+	modelsbiosTab->GetSettings();
+#endif
 
 	// Alpine tab settings (also needed by the Debugger)
 	if (vjs.hardwareTypeAlpine || vjs.softTypeDebugger)
@@ -114,11 +127,14 @@ void ConfigDialog::LoadDialogFromSettings(void)
 }
 
 
-// Save / Update the settings from the tabs dialog
+// Save & Update the settings from the tabs dialog
 void ConfigDialog::UpdateVJSettings(void)
 {
 	generalTab->SetSettings();
 	keybindingsTab->SetSettings();
+#ifdef NEWMODELSBIOSHANDLER
+	modelsbiosTab->SetSettings();
+#endif
 
 	if (vjs.hardwareTypeAlpine || vjs.softTypeDebugger)
 	{