From ed63dbfaaf93667415cc2a207fff196eada717ba Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Tue, 20 Feb 2018 03:05:42 +0900 Subject: [PATCH] [UI][Qt][FM7] Add "SYNC TO HSYNC" entry also FM-7/77/8. --- source/src/qt/machines/fm7/MainWindow.cpp | 9 +++------ source/src/qt/machines/fm7/menuclasses.h | 8 ++++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/source/src/qt/machines/fm7/MainWindow.cpp b/source/src/qt/machines/fm7/MainWindow.cpp index 89dda15b1..9249b5510 100644 --- a/source/src/qt/machines/fm7/MainWindow.cpp +++ b/source/src/qt/machines/fm7/MainWindow.cpp @@ -184,7 +184,6 @@ void Object_Menu_Control_7::do_set_cyclesteal(bool flag) } #endif -#if defined(_FM77AV_VARIANTS) void Object_Menu_Control_7::do_set_hsync(bool flag) { if(flag) { @@ -193,7 +192,6 @@ void Object_Menu_Control_7::do_set_hsync(bool flag) config.dipswitch = config.dipswitch & ~FM7_DIPSW_SYNC_TO_HSYNC; } } -#endif void Action_Control_7::do_set_frameskip() { @@ -351,10 +349,10 @@ void META_MainWindow::retranslateUi(void) actionFrameSkip[1]->setText(QApplication::translate("Machine", "1 Frame", 0)); actionFrameSkip[2]->setText(QApplication::translate("Machine", "2 Frames", 0)); actionFrameSkip[3]->setText(QApplication::translate("Machine", "3 Frames", 0)); -#if defined(_FM77AV_VARIANTS) + actionSyncToHsync->setText(QApplication::translate("Machine", "Sync to HSYNC", 0)); actionSyncToHsync->setToolTip(QApplication::translate("Machine", "Emulate display syncing to HSYNC.\nExpect to emulate more accurate.", 0)); -#endif + #if defined(_FM77AV_VARIANTS) || defined(_FM77_VARIANTS) || defined(_FM8) menuCpuType->setTitle(QApplication::translate("Machine", "CPU Frequency (hack)", 0)); #else @@ -752,7 +750,6 @@ void META_MainWindow::setupUI_Emu(void) connect(actionCycleSteal->fm7_binds, SIGNAL(sig_emu_update_config()), this, SLOT(do_emu_update_config())); #endif -#if defined(_FM77AV_VARIANTS) actionSyncToHsync = new Action_Control_7(this, using_flags); menuMachine->addAction(actionSyncToHsync); actionSyncToHsync->setCheckable(true); @@ -760,7 +757,7 @@ void META_MainWindow::setupUI_Emu(void) if((config.dipswitch & FM7_DIPSW_SYNC_TO_HSYNC) != 0) actionSyncToHsync->setChecked(true); connect(actionSyncToHsync, SIGNAL(toggled(bool)), actionSyncToHsync->fm7_binds, SLOT(do_set_hsync(bool))); -#endif + #if defined(CAPABLE_DICTROM) && !defined(_FM77AV40EX) && !defined(_FM77AV40SX) actionDictCard = new Action_Control_7(this, using_flags); menuMachine->addAction(actionDictCard); diff --git a/source/src/qt/machines/fm7/menuclasses.h b/source/src/qt/machines/fm7/menuclasses.h index 256eaddae..a6430eacb 100644 --- a/source/src/qt/machines/fm7/menuclasses.h +++ b/source/src/qt/machines/fm7/menuclasses.h @@ -26,9 +26,9 @@ public slots: void do_set_z80_firq(bool flag); void do_set_z80_nmi(bool flag); # endif -# if defined(_FM77AV_VARIANTS) + void do_set_hsync(bool flag); -# endif + # if defined(_FM8) || defined(_FM7) || defined(_FMNEW7) void do_set_kanji_rom(bool flag); void do_set_320kFloppy(bool flag); @@ -83,9 +83,9 @@ protected: # else class Action_Control_7 *actionCycleSteal; # endif -# if defined(_FM77AV_VARIANTS) + class Action_Control_7 *actionSyncToHsync; -# endif + #if defined(CAPABLE_DICTROM) && !defined(_FM77AV40EX) && !defined(_FM77AV40SX) class Action_Control_7 *actionDictCard; #endif -- 2.11.0