[UI][Qt] Buildable with before changes.

diff --git a/source/src/qt/gui/mainwidget_base.h b/source/src/qt/gui/mainwidget_base.h
index 724ffbe..1e4783b 100644 (file)
--- a/source/src/qt/gui/mainwidget_base.h
+++ b/source/src/qt/gui/mainwidget_base.h
@@ -346,6 +346,7 @@ private:
        void ConfigDeviceType(void);
        void ConfigKeyboardType(void);
        void ConfigJoystickType(void);
+       void ConfigMachineFeatures(void);
        void ConfigMouseType(void);
        void ConfigDriveType(void);
        void ConfigSoundDeviceType(void);
@@ -479,6 +480,9 @@ protected:
        QMenu *menuHELP;
        QMenu *menuHelp_Readme;
        QMenu *menuHelp_Histories;
+
+       QMenu *menuMachineFeatures[32];
+       
        Menu_FDClass *menu_fds[16];
        Menu_QDClass *menu_QDs[8];
        Menu_CMTClass *menu_CMT[8];
@@ -764,7 +768,7 @@ public slots:
        void do_block_task();
        void do_unblock_task();
 
-       void do_select_machine_feature(int devnum, uint32_t value);
+       void do_set_machine_feature(int devnum, uint32_t value);
 
        void do_start_emu_thread();
        void do_start_draw_thread();

diff --git a/source/src/qt/gui/menu_main.cpp b/source/src/qt/gui/menu_main.cpp
index a6be8d3..3b8d0d1 100644 (file)
--- a/source/src/qt/gui/menu_main.cpp
+++ b/source/src/qt/gui/menu_main.cpp
@@ -629,6 +629,7 @@ void Ui_MainWindowBase::setupUi(void)
        ConfigSoundDeviceType();
        ConfigPrinterType();
        ConfigMonitorType();
+       ConfigMachineFeatures();
        
        if(!using_flags->is_without_sound()) {
                menuSound = createMenuNode(menubar, QString::fromUtf8("menuSound"));

diff --git a/source/src/qt/machines/fmtowns/MainWindow.cpp b/source/src/qt/machines/fmtowns/MainWindow.cpp
index d5333d2..a84de7c 100644 (file)
--- a/source/src/qt/machines/fmtowns/MainWindow.cpp
+++ b/source/src/qt/machines/fmtowns/MainWindow.cpp
@@ -48,8 +48,8 @@ void META_MainWindow::retranslateUi(void)
        actionSpecial_Reset[11]->setText(QApplication::translate("Machine", "Reset with DEBUG", 0));
        actionSpecial_Reset[11]->setToolTip(QApplication::translate("Machine", "Reset with DEBUGGING MODE", 0));
 
-       menuMAchineFeatures[0]->setTitle(QApplication::translate("Machine", "Joystick Port #1", 0));
-       menuMAchineFeatures[1]->setTitle(QApplication::translate("Machine", "Joystick Port #2", 0));
+       menuMachineFeatures[0]->setTitle(QApplication::translate("Machine", "Joystick Port #1", 0));
+       menuMachineFeatures[1]->setTitle(QApplication::translate("Machine", "Joystick Port #2", 0));
 #if defined(USE_MACHINE_FEATURES)
        for(int i = 0; i < 2; i++) {
                actionJOYPORT_TYPE[i][0]->setText(QApplication::translate("Machine", "none", 0));
@@ -108,7 +108,6 @@ void META_MainWindow::setupUI_Emu(void)
                actionGroup_JOYPortType[i] = new QActionGroup(this);
                actionGroup_JOYPortType[i]->setExclusive(true);
                actionGroup_JOYPortType[i]->setObjectName(QString("actionGroupJOYPort%1").arg(i + 1));
-               menuMachineFeatures[i]->addAction(actionGroup_JOYPortType[i]);
                for(int j = 0; j < 8; j++) {
                        actionJOYPORT_TYPE[i][j] = new Action_Control(this, using_flags);
                        actionJOYPORT_TYPE[i][j]->setCheckable(true);
@@ -121,6 +120,7 @@ void META_MainWindow::setupUI_Emu(void)
                        actionJOYPORT_TYPE[i][j]->binds->setNumber(i);
                        actionJOYPORT_TYPE[i][j]->binds->setValue1(j);
                        actionGroup_JOYPortType[i]->addAction(actionJOYPORT_TYPE[i][j]);
+                       menuMachineFeatures[i]->addAction(actionJOYPORT_TYPE[i][j]);
                        connect(actionJOYPORT_TYPE[i][j], SIGNAL(triggered()),
                                        actionJOYPORT_TYPE[i][j]->binds, SLOT(do_select_machine_feature_single()));
                        connect(actionJOYPORT_TYPE[i][j]->binds,
@@ -131,10 +131,12 @@ void META_MainWindow::setupUI_Emu(void)
                        actionJOYPORT_TYPE[i][j]->setVisible(true);
                }
        }
+       /*
        for(int i = 2; i < 6; i++) {
                menuMachineFeatures[i]->setVisible(false);
                menuMachineFeatures[i]->setEnabled(false);
        }               
+       */
 #endif
 }