• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).


Commit MetaInfo

Revision38236e3a4f584c742ff24d919eba3171aaeff8e9 (tree)
Time2018-05-28 20:31:49
AuthorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[VM][UI][Qt] Fix FTBFSs.

Change Summary

Incremental Difference

--- a/source/build-cmake/cmake/config_emufmr50.cmake
+++ b/source/build-cmake/cmake/config_emufmr50.cmake
@@ -40,6 +40,7 @@ set(VMFILES_LIB
4040 # scsi_hdd.cpp
4141 noise.cpp
4242 disk.cpp
43+ harddisk.cpp
4344 )
4445
4546 set(BUILD_SHARED_LIBS OFF)
--- a/source/build-cmake/cmake/config_emupc9801.cmake
+++ b/source/build-cmake/cmake/config_emupc9801.cmake
@@ -117,8 +117,8 @@ elseif(BUILD_PC9801VX)
117117 set(EXEC_TARGET emupc9801vx)
118118 set(VMFILES ${VMFILES}
119119 scsi_host.cpp
120- scsi_dev.cpp
121- scsi_hdd.cpp
120+ scsi_dev.cpp
121+ scsi_hdd.cpp
122122 )
123123 set(VMFILES_LIB
124124 not.cpp
--- a/source/build-cmake/cmake/config_mz2500.cmake
+++ b/source/build-cmake/cmake/config_mz2500.cmake
@@ -13,12 +13,19 @@ set(WITH_MOUSE ON)
1313 set(FLAG_USE_Z80 ON)
1414 set(VMFILES_2500
1515 w3100a.cpp
16+
17+ scsi_host.cpp
18+ scsi_dev.cpp;
19+ scsi_hdd.cpp
20+
1621 )
1722 set(VMFILES_LIB_2500
1823 ls393.cpp
1924 rp5c01.cpp
2025 ym2203.cpp
2126 z80sio.cpp
27+
28+ harddisk.cpp
2229 )
2330
2431 set(VMFILES_BASE
@@ -27,7 +34,7 @@ set(VMFILES_BASE
2734 event.cpp
2835 memory.cpp
2936 io.cpp
30-
37+
3138 )
3239 set(VMFILES_LIB
3340 noise.cpp
@@ -109,13 +116,6 @@ set(USE_FMGEN OFF)
109116
110117 endif()
111118
112-if(BUILD_MZ80A)
113-set(VMFILES ${VMFILES}
114- mb8877.cpp
115- disk.cpp
116- io.cpp )
117-#add_definitions(-DSUPPORT_MZ80AIF)
118-endif()
119119
120120
121121
--- a/source/build-cmake/cmake/config_x1.cmake
+++ b/source/build-cmake/cmake/config_x1.cmake
@@ -16,6 +16,10 @@ set(VMFILES
1616 event.cpp
1717 io.cpp
1818 mz1p17.cpp
19+
20+ scsi_host.cpp
21+ scsi_dev.cpp
22+ scsi_hdd.cpp
1923 )
2024 set(VMFILES_LIB
2125 noise.cpp
@@ -34,6 +38,7 @@ set(VMFILES_LIB
3438
3539 disk.cpp
3640 prnfile.cpp
41+ harddisk.cpp
3742 )
3843 set(FLAG_USE_MCS48 ON)
3944 set(FLAG_USE_Z80 ON)
--- a/source/src/qt/gui/commonclasses.h
+++ b/source/src/qt/gui/commonclasses.h
@@ -119,7 +119,7 @@ public slots:
119119 void on_recent_cart(void);
120120 void do_save_as_movie(void);
121121 void do_stop_saving_movie(void);
122-
122+ void do_set_monitor_type();
123123 signals:
124124 int on_boot_mode(int);
125125 int on_cpu_type(int);
@@ -175,6 +175,8 @@ signals:
175175 int sig_screen_size(int, int);
176176 int sig_screen_multiply(float);
177177
178+ int sig_monitor_type(int);
179+
178180 signals:
179181 int sig_stop_record_movie();
180182 int sig_start_record_movie(int);
--- a/source/src/qt/gui/mainwidget_base.h
+++ b/source/src/qt/gui/mainwidget_base.h
@@ -309,6 +309,7 @@ private:
309309 void ConfigDriveType(void);
310310 void ConfigSoundDeviceType(void);
311311 void ConfigPrinterType(void);
312+ void ConfigMonitorType(void);
312313
313314 // About Status bar
314315 int Calc_OSD_Wfactor(void);
@@ -399,6 +400,10 @@ protected:
399400 class Action_Control *actionStop_Record_Movie;
400401 class Action_Control *action_SetupMovie; // 15, 24, 30, 60
401402
403+ QMenu *menuMonitorType;
404+ QActionGroup *actionGroup_MonitorType;
405+ Action_Control *actionMonitorType[16];
406+
402407 // Menus
403408 QMenu *menuControl;
404409 QMenu *menuState;
--- a/source/src/qt/gui/menu_control.cpp
+++ b/source/src/qt/gui/menu_control.cpp
@@ -14,6 +14,10 @@
1414 #include "menu_flags.h"
1515
1616 //extern USING_FLAGS *using_flags;
17+void Object_Menu_Control::do_set_monitor_type()
18+{
19+ emit sig_monitor_type(getValue1());
20+}
1721
1822 void Object_Menu_Control::set_boot_mode(void) {
1923 emit on_boot_mode(bindValue);
--- a/source/src/qt/gui/menu_main.cpp
+++ b/source/src/qt/gui/menu_main.cpp
@@ -528,7 +528,8 @@ void Ui_MainWindowBase::setupUi(void)
528528 ConfigDriveType();
529529 ConfigSoundDeviceType();
530530 ConfigPrinterType();
531-
531+ ConfigMonitorType();
532+
532533 if(!using_flags->is_without_sound()) {
533534 menuSound = new QMenu(menubar);
534535 menuSound->setObjectName(QString::fromUtf8("menuSound"));
@@ -803,6 +804,7 @@ void Ui_MainWindowBase::retranslateEmulatorMenu(void)
803804 if(using_flags->is_use_sound_files_relay()) {
804805 action_SoundFilesRelay->setText(QApplication::translate("MenuEmulator", "Sound CMT Relay and Buttons", 0));
805806 action_SoundFilesRelay->setToolTip(QApplication::translate("MenuEmulator", "Enable CMT relay's sound and buttons's sounds.\nNeeds sound file.\nSee HELP->READMEs->Bios and Key assigns", 0));
807+ if(using_flags->is_tape_binary_only()) action_SoundFilesRelay->setEnabled(false);
806808 }
807809 menuDevLogToConsole->setTitle(QApplication::translate("MenuEmulator", "Per Device", 0));
808810 #if !defined(Q_OS_WIN)
@@ -899,6 +901,32 @@ void Ui_MainWindowBase::CreateEmulatorMenu(void)
899901 menuEmulator->addAction(action_SetupMovie);
900902 }
901903
904+void Ui_MainWindowBase::ConfigMonitorType(void)
905+{
906+ if(using_flags->get_use_monitor_type() > 0) {
907+ int ii;
908+ menuMonitorType = new QMenu(menuMachine);
909+ menuMonitorType->setObjectName(QString::fromUtf8("menuControl_MonitorType"));
910+ menuMachine->addAction(menuMonitorType->menuAction());
911+
912+ actionGroup_MonitorType = new QActionGroup(this);
913+ actionGroup_MonitorType->setExclusive(true);
914+ for(ii = 0; ii < using_flags->get_use_monitor_type(); ii++) {
915+ actionMonitorType[ii] = new Action_Control(this, using_flags);
916+ actionGroup_MonitorType->addAction(actionMonitorType[ii]);
917+ actionMonitorType[ii]->setCheckable(true);
918+ actionMonitorType[ii]->setVisible(true);
919+ actionMonitorType[ii]->binds->setValue1(ii);
920+ if(using_flags->get_config_ptr()->monitor_type == ii) actionMonitorType[ii]->setChecked(true);
921+ menuMonitorType->addAction(actionMonitorType[ii]);
922+ connect(actionMonitorType[ii], SIGNAL(triggered()),
923+ actionMonitorType[ii]->binds, SLOT(do_set_monitor_type()));
924+ connect(actionMonitorType[ii]->binds, SIGNAL(sig_monitor_type(int)),
925+ this, SLOT(set_monitor_type(int)));
926+ }
927+ }
928+}
929+
902930 void Ui_MainWindowBase::ConfigEmulatorMenu(void)
903931 {
904932 int i;
@@ -1233,6 +1261,14 @@ void Ui_MainWindowBase::retranslateMachineMenu(void)
12331261 actionPrintDevice[i]->setText(QApplication::translate("MenuMachine", "Not Connect", 0));
12341262 actionPrintDevice[i]->setToolTip(QApplication::translate("MenuMachine", "None devices connect to printer port.", 0));
12351263 }
1264+ if(using_flags->get_use_monitor_type() > 0) {
1265+ menuMonitorType->setTitle("Monitor Type");
1266+ menuMonitorType->setToolTipsVisible(true);
1267+ for(int ii = 0; ii < using_flags->get_use_monitor_type(); ii++) {
1268+ tmps = QString::fromUtf8("Monitor %1").arg(ii + 1);
1269+ actionMonitorType[ii]->setText(tmps);
1270+ }
1271+ }
12361272 }
12371273 void Ui_MainWindowBase::retranslateUi(void)
12381274 {
--- a/source/src/qt/gui/menu_sound.cpp
+++ b/source/src/qt/gui/menu_sound.cpp
@@ -205,7 +205,11 @@ void Ui_MainWindowBase::retranslateSoundMenu(void)
205205 actionSoundStrictRendering->setToolTip(QApplication::translate("MenuSound", "Rendering per a sample.Select to slower, but accurate rendering sound.", 0));
206206 actionSoundPlayTape->setText(QApplication::translate("MenuSound", "Play CMT sound", 0));
207207 actionSoundPlayTape->setToolTip(QApplication::translate("MenuSound", "Play sound from CMTs.", 0));
208-
208+
209+ if(using_flags->is_tape_binary_only()) {
210+ actionSoundPlayTape->setEnabled(false);
211+ }
212+
209213 menuSound->setTitle(QApplication::translate("MenuSound", "Sound", 0));
210214 menuOutput_Frequency->setTitle(QApplication::translate("MenuSound", "Output Frequency", 0));
211215 menuSound_Latency->setTitle(QApplication::translate("MenuSound", "Sound Latency", 0));
--- a/source/src/qt/gui/util_hdd.cpp
+++ b/source/src/qt/gui/util_hdd.cpp
@@ -77,11 +77,11 @@ void Ui_MainWindowBase::retranslateHardDiskMenu(int drv, int basedrv)
7777 void Ui_MainWindowBase::retranslateHardDiskMenu(int drv, int basedrv, QString specName)
7878 {
7979 QString drive_name;
80- drive_name = QString::fromUtf8("[") + QString::number(basedrv) + QString::fromUtf8(":] ");
81- drive_name = drive_name + specName;
80+ drive_name = QString::fromUtf8(":");
81+ drive_name = specName + drive_name;
8282 //drive_name += QString::number(basedrv);
8383
84- if((drv < 0) || (drv >= using_flags->get_max_drive())) return;
84+ if((drv < 0) || (drv >= using_flags->get_max_hdd())) return;
8585 menu_hdds[drv]->setTitle(QApplication::translate("MenuMedia", drive_name.toUtf8().constData() , 0));
8686 menu_hdds[drv]->retranslateUi();
8787 }
--- a/source/src/qt/machines/fm7/MainWindow.cpp
+++ b/source/src/qt/machines/fm7/MainWindow.cpp
@@ -186,19 +186,6 @@ void Object_Menu_Control_7::do_set_cyclesteal(bool flag)
186186 emit sig_emu_update_config();
187187 }
188188 #endif
189-#if defined(USE_GREEN_DISPLAY)
190-void Object_Menu_Control_7::do_set_green_display(bool flag)
191-{
192-#if defined(USE_MONITOR_TYPE)
193- if(flag) {
194- config.monitor_type = FM7_MONITOR_GREEN;
195- } else {
196- config.monitor_type = FM7_MONITOR_STANDARD;
197- }
198-#endif
199-
200-}
201-#endif
202189 void Object_Menu_Control_7::do_set_hsync(bool flag)
203190 {
204191 if(flag) {
@@ -590,9 +577,12 @@ void META_MainWindow::retranslateUi(void)
590577 menuMouseType->setToolTipsVisible(true);
591578 # endif
592579 #endif
580+
593581 #if defined(USE_MONITOR_TYPE) && defined(USE_GREEN_DISPLAY)
594- action_GreenDisplay->setText(QApplication::translate("Machine", "Green Display (need reset)", 0));
595- action_GreenDisplay->setToolTip(QApplication::translate("Machine", "Using ancient \"Green Display\" to display.\nChanges will be applied at reset, not immediately.", 0));
582+ actionMonitorType[0]->setText(QApplication::translate("Machine", "Color Display (need reset)", 0));
583+ actionMonitorType[0]->setToolTip(QApplication::translate("Machine", "Using color display.\nChanges will be applied at reset, not immediately.", 0));
584+ actionMonitorType[1]->setText(QApplication::translate("Machine", "Green Display (need reset)", 0));
585+ actionMonitorType[1]->setToolTip(QApplication::translate("Machine", "Using ancient \"Green Display\" to display.\nChanges will be applied at reset, not immediately.", 0));
596586 #endif
597587 #if defined(WITH_Z80)
598588 actionZ80CARD_ON->setText(QApplication::translate("Machine", "Connect Z80 CARD", 0));
@@ -803,15 +793,6 @@ void META_MainWindow::setupUI_Emu(void)
803793 connect(action_1MFloppy, SIGNAL(toggled(bool)),
804794 action_1MFloppy->fm7_binds, SLOT(do_set_1MFloppy(bool)));
805795 # endif
806-# if defined(USE_GREEN_DISPLAY) && defined(USE_MONITOR_TYPE)
807- action_GreenDisplay = new Action_Control_7(this, using_flags);
808- menuMachine->addAction(action_GreenDisplay);
809- action_GreenDisplay->setCheckable(true);
810- action_GreenDisplay->setVisible(true);
811- if(config.monitor_type == FM7_MONITOR_GREEN) action_GreenDisplay->setChecked(true);
812- connect(action_GreenDisplay, SIGNAL(toggled(bool)), action_GreenDisplay->fm7_binds, SLOT(do_set_green_display(bool)));
813- connect(action_GreenDisplay->fm7_binds, SIGNAL(sig_emu_update_config()), this, SLOT(do_emu_update_config()));
814-#endif
815796 uint32_t tmpv = config.dipswitch & (FM7_DIPSW_SELECT_5_OR_8KEY | FM7_DIPSW_AUTO_5_OR_8KEY);
816797
817798 menuAuto5_8Key = new QMenu(menuMachine);
--- a/source/src/qt/machines/fm7/menuclasses.h
+++ b/source/src/qt/machines/fm7/menuclasses.h
@@ -41,9 +41,6 @@ public slots:
4141 # else
4242 void do_set_cyclesteal(bool flag);
4343 # endif
44-#if defined(USE_GREEN_DISPLAY)
45- void do_set_green_display(bool);
46-#endif
4744 #if defined(CAPABLE_JCOMMCARD)
4845 void do_set_jcommcard(bool flag);
4946 #endif
@@ -92,9 +89,6 @@ protected:
9289 #if defined(CAPABLE_DICTROM) && !defined(_FM77AV40EX) && !defined(_FM77AV40SX)
9390 class Action_Control_7 *actionDictCard;
9491 #endif
95-#if defined(USE_GREEN_DISPLAY)
96- class Action_Control_7 *action_GreenDisplay;
97-#endif
9892 QActionGroup *actionGroup_Auto_5_8key;
9993 QMenu *menuAuto5_8Key;
10094 class Action_Control_7 *action_Neither_5_or_8key;
--- a/source/src/qt/machines/hc20/MainWindow.cpp
+++ b/source/src/qt/machines/hc20/MainWindow.cpp
@@ -83,9 +83,6 @@ void META_MainWindow::retranslateUi(void)
8383 action_Emu_DipSw[2]->setText(QApplication::translate("Machine", "Dip Switch 3", 0));
8484 action_Emu_DipSw[3]->setText(QApplication::translate("MainWindow", "Dip Switch 4", 0));
8585
86- if(actionSoundPlayTape != NULL) actionSoundPlayTape->setEnabled(false); // OK?
87- if(action_SoundFilesRelay != NULL) action_SoundFilesRelay->setEnabled(false); // OK?
88-
8986 #ifdef USE_DEBUGGER
9087 actionDebugger[1]->setText(QApplication::translate("MainWindow", "TF-20 CPU", 0));
9188 actionDebugger[0]->setVisible(true);
--- a/source/src/qt/machines/msx/MainWindow.cpp
+++ b/source/src/qt/machines/msx/MainWindow.cpp
@@ -9,6 +9,9 @@
99
1010 #include <QVariant>
1111 #include <QtGui>
12+#include <QApplication>
13+#include <QMenu>
14+
1215 #include "commonclasses.h"
1316 #include "menuclasses.h"
1417 #include "emu.h"
--- a/source/src/qt/machines/multi8/MainWindow.cpp
+++ b/source/src/qt/machines/multi8/MainWindow.cpp
@@ -25,8 +25,6 @@ void META_MainWindow::retranslateUi(void)
2525 {
2626 Ui_MainWindowBase::retranslateUi();
2727 retranslateControlMenu("System Reset", false);
28- if(action_SoundFilesRelay != NULL) action_SoundFilesRelay->setEnabled(false);
29- if(action_SoundPlayTape != NULL) action_SoundPlayTape->setEnabled(false);
3028 #ifdef USE_DEBUGGER
3129 actionDebugger[0]->setVisible(true);
3230 actionDebugger[1]->setVisible(false);
--- a/source/src/qt/machines/mz2500/MainWindow.cpp
+++ b/source/src/qt/machines/mz2500/MainWindow.cpp
@@ -34,21 +34,7 @@ Object_Menu_Control_MZ25::Object_Menu_Control_MZ25(QObject *parent, USING_FLAGS
3434 Object_Menu_Control_MZ25::~Object_Menu_Control_MZ25(){
3535 }
3636
37-void Object_Menu_Control_MZ25::do_set_monitor_type(void)
38-{
39-#if defined(USE_MONITOR_TYPE)
40- int n = getValue1();
41- if(n < 0) return;
42- if(n >= USE_MONITOR_TYPE) return;
43- config.monitor_type = n;
44- emit sig_update_config();
45-#endif
46-}
4737
48-void META_MainWindow::do_mz25_update_config(void)
49-{
50- emit sig_emu_update_config();
51-}
5238
5339 void META_MainWindow::setupUI_Emu(void)
5440 {
@@ -56,23 +42,6 @@ void META_MainWindow::setupUI_Emu(void)
5642 #ifdef USE_CPU_TYPE
5743 ConfigCPUTypes(USE_CPU_TYPE);
5844 #endif
59-#if defined(USE_MONITOR_TYPE)
60- menuDisplayType = new QMenu(this);
61- actionGroup_DisplayType = new QActionGroup(this);
62- actionGroup_DisplayType->setExclusive(true);
63- for(int i = 0; i < USE_MONITOR_TYPE; i++) {
64- action_DisplayType[i] = new Action_Control_MZ2500(this, using_flags);
65- action_DisplayType[i]->setCheckable(true);
66- action_DisplayType[i]->setVisible(true);
67- action_DisplayType[i]->mz25_binds->setValue1(i);
68- actionGroup_DisplayType->addAction(action_DisplayType[i]);
69- if(config.monitor_type == i) action_DisplayType[i]->setChecked(true);
70- connect(action_DisplayType[i], SIGNAL(triggered()), action_DisplayType[i]->mz25_binds, SLOT(do_set_monitor_type()));
71- connect(action_DisplayType[i]->mz25_binds, SIGNAL(sig_update_config()), this, SLOT(do_mz25_update_config()));
72- menuDisplayType->addAction(action_DisplayType[i]);
73- }
74- menuMachine->addAction(menuDisplayType->menuAction());
75-#endif
7645
7746 }
7847
@@ -110,22 +79,21 @@ void META_MainWindow::retranslateUi(void)
11079 #endif
11180 #endif
11281 #if defined(USE_MONITOR_TYPE)
113- menuDisplayType->setTitle(QApplication::translate("MachineMZ2500", "Monitor Type:", 0));
11482 #if defined(_MZ2500)
115- action_DisplayType[0]->setText(QApplication::translate("MachineMZ2500", "400Lines, Analog.", 0));
116- action_DisplayType[1]->setText(QApplication::translate("MachineMZ2500", "400Lines, Digital.", 0));
117- action_DisplayType[2]->setText(QApplication::translate("MachineMZ2500", "200Lines, Analog.", 0));
118- action_DisplayType[3]->setText(QApplication::translate("MachineMZ2500", "200Lines, Digital.", 0));
83+ actionMonitorType[0]->setText(QApplication::translate("MachineMZ2500", "400Lines, Analog.", 0));
84+ actionMonitorType[1]->setText(QApplication::translate("MachineMZ2500", "400Lines, Digital.", 0));
85+ actionMonitorType[2]->setText(QApplication::translate("MachineMZ2500", "200Lines, Analog.", 0));
86+ actionMonitorType[3]->setText(QApplication::translate("MachineMZ2500", "200Lines, Digital.", 0));
11987 #elif defined(_MZ2200)
120- action_DisplayType[0]->setText(QApplication::translate("MachineMZ2500", "Color.", 0));
121- action_DisplayType[1]->setText(QApplication::translate("MachineMZ2500", "Green.", 0));
122- action_DisplayType[2]->setText(QApplication::translate("MachineMZ2500", "Both Color and Green.", 0));
123- action_DisplayType[3]->setText(QApplication::translate("MachineMZ2500", "Both Green and Color.", 0));
88+ actionMonitorType[0]->setText(QApplication::translate("MachineMZ2500", "Color.", 0));
89+ actionMonitorType[1]->setText(QApplication::translate("MachineMZ2500", "Green.", 0));
90+ actionMonitorType[2]->setText(QApplication::translate("MachineMZ2500", "Both Color and Green.", 0));
91+ actionMonitorType[3]->setText(QApplication::translate("MachineMZ2500", "Both Green and Color.", 0));
12492 #elif defined(_MZ80B)
125- action_DisplayType[0]->setText(QApplication::translate("MachineMZ2500", "Green Monitor.", 0));
126- action_DisplayType[1]->setText(QApplication::translate("MachineMZ2500", "Color Monitor (PIO-3039).", 0));
127- action_DisplayType[2]->setText(QApplication::translate("MachineMZ2500", "Both Green and Color (PIO-3039).", 0));
128- action_DisplayType[3]->setText(QApplication::translate("MachineMZ2500", "Both Color (PIO-3039) and Green.", 0));
93+ actionMonitorType[0]->setText(QApplication::translate("MachineMZ2500", "Green Monitor.", 0));
94+ actionMonitorType[1]->setText(QApplication::translate("MachineMZ2500", "Color Monitor (PIO-3039).", 0));
95+ actionMonitorType[2]->setText(QApplication::translate("MachineMZ2500", "Both Green and Color (PIO-3039).", 0));
96+ actionMonitorType[3]->setText(QApplication::translate("MachineMZ2500", "Both Color (PIO-3039) and Green.", 0));
12997 #endif
13098 #endif
13199 #if defined(USE_DEBUGGER)
--- a/source/src/qt/machines/mz2500/menuclasses.h
+++ b/source/src/qt/machines/mz2500/menuclasses.h
@@ -2,6 +2,7 @@
22 #ifndef _CSP_QT_MENUCLASSES_H
33 #define _CSP_QT_MENUCLASSES_H
44
5+#include "commonclasses.h"
56 #include "mainwidget.h"
67 // This extends class CSP_MainWindow as Ui_MainWindow.
78 // You may use this as
@@ -20,7 +21,6 @@ public:
2021 signals:
2122 int sig_update_config();
2223 public slots:
23- void do_set_monitor_type(void);
2424 };
2525
2626 class Action_Control_MZ25 : public Action_Control
@@ -47,7 +47,6 @@ public:
4747 META_MainWindow(USING_FLAGS *p, CSP_Logger *logger, QWidget *parent = 0);
4848 ~META_MainWindow();
4949 public slots:
50- void do_mz25_update_config(void);
5150
5251 };
5352
--- a/source/src/qt/machines/mz3500/MainWindow.cpp
+++ b/source/src/qt/machines/mz3500/MainWindow.cpp
@@ -43,22 +43,6 @@ void Object_Menu_Control_MZ3500::set_dipsw(bool flag)
4343 emit sig_dipsw(getValue1(), flag);
4444 }
4545
46-void Object_Menu_Control_MZ3500::do_set_monitor_type(void)
47-{
48-#if defined(USE_MONITOR_TYPE)
49- int n = getValue1();
50- if(n < 0) return;
51- if(n >= USE_MONITOR_TYPE) return;
52- config.monitor_type = n;
53- emit sig_update_config();
54-#endif
55-}
56-
57-void META_MainWindow::do_mz35_update_config(void)
58-{
59- emit sig_emu_update_config();
60-}
61-
6246 void META_MainWindow::setupUI_Emu(void)
6347 {
6448 int i;
@@ -93,23 +77,6 @@ void META_MainWindow::setupUI_Emu(void)
9377 if(((1 << 7) & config.dipswitch) != 0) action_Emu_DipSw[1]->setChecked(true);
9478 if(((1 << 8) & config.dipswitch) != 0) action_Emu_DipSw[2]->setChecked(true);
9579
96-#if defined(USE_MONITOR_TYPE)
97- menuDisplayType = new QMenu(this);
98- actionGroup_DisplayType = new QActionGroup(this);
99- actionGroup_DisplayType->setExclusive(true);
100- for(int i = 0; i < USE_MONITOR_TYPE; i++) {
101- action_DisplayType[i] = new Action_Control_MZ3500(this, using_flags);
102- action_DisplayType[i]->setCheckable(true);
103- action_DisplayType[i]->setVisible(true);
104- action_DisplayType[i]->mz_binds->setValue1(i);
105- actionGroup_DisplayType->addAction(action_DisplayType[i]);
106- if(config.monitor_type == i) action_DisplayType[i]->setChecked(true);
107- connect(action_DisplayType[i], SIGNAL(triggered()), action_DisplayType[i]->mz_binds, SLOT(do_set_monitor_type()));
108- connect(action_DisplayType[i]->mz_binds, SIGNAL(sig_update_config()), this, SLOT(do_mz35_update_config()));
109- menuDisplayType->addAction(action_DisplayType[i]);
110- }
111- menuMachine->addAction(menuDisplayType->menuAction());
112-#endif
11380 }
11481
11582 void META_MainWindow::retranslateUi(void)
@@ -128,11 +95,10 @@ void META_MainWindow::retranslateUi(void)
12895 actionPrintDevice[1]->setText(QApplication::translate("MainWindow", "MZ-1P17", 0));
12996 actionPrintDevice[1]->setToolTip(QApplication::translate("MainWindow", "Sharp MZ-1P17 kanji thermal printer.", 0));
13097 #if defined(USE_MONITOR_TYPE)
131- menuDisplayType->setTitle(QApplication::translate("MachineMZ2500", "Monitor Type:", 0));
132- action_DisplayType[0]->setText(QApplication::translate("MachineMZ2500", "400Lines, Analog.", 0));
133- action_DisplayType[1]->setText(QApplication::translate("MachineMZ2500", "400Lines, Digital.", 0));
134- action_DisplayType[2]->setText(QApplication::translate("MachineMZ2500", "200Lines, Analog.", 0));
135- action_DisplayType[3]->setText(QApplication::translate("MachineMZ2500", "200Lines, Digital.", 0));
98+ actionMonitorType[0]->setText(QApplication::translate("MachineMZ2500", "400Lines, Analog.", 0));
99+ actionMonitorType[1]->setText(QApplication::translate("MachineMZ2500", "400Lines, Digital.", 0));
100+ actionMonitorType[2]->setText(QApplication::translate("MachineMZ2500", "200Lines, Analog.", 0));
101+ actionMonitorType[3]->setText(QApplication::translate("MachineMZ2500", "200Lines, Digital.", 0));
136102 #endif
137103 #if defined(USE_DEBUGGER)
138104 actionDebugger[0]->setVisible(true);
--- a/source/src/qt/machines/mz3500/menuclasses.h
+++ b/source/src/qt/machines/mz3500/menuclasses.h
@@ -21,7 +21,6 @@ signals:
2121 int sig_update_config();
2222 public slots:
2323 void set_dipsw(bool);
24- void do_set_monitor_type(void);
2524 };
2625
2726 class Action_Control_MZ3500 : public Action_Control
@@ -45,15 +44,10 @@ protected:
4544 QActionGroup *actionGroup_DipSw;
4645 Action_Control_MZ3500 *action_Emu_DipSw[3];
4746
48- QMenu *menuDisplayType;
49- QActionGroup *actionGroup_DisplayType;
50-
51- Action_Control_MZ3500 *action_DisplayType[4];
5247 public:
5348 META_MainWindow(USING_FLAGS *p, CSP_Logger *logger, QWidget *parent = 0);
5449 ~META_MainWindow();
5550 public slots:
56- void do_mz35_update_config(void);
5751 };
5852
5953 QT_END_NAMESPACE
--- a/source/src/qt/machines/mz700/MainWindow.cpp
+++ b/source/src/qt/machines/mz700/MainWindow.cpp
@@ -38,19 +38,6 @@ Object_Menu_Control_MZ700::Object_Menu_Control_MZ700(QObject *parent, USING_FLAG
3838 Object_Menu_Control_MZ700::~Object_Menu_Control_MZ700(){
3939 }
4040
41-void Object_Menu_Control_MZ700::do_monitor_type(void)
42-{
43- emit sig_monitor_type(getValue1());
44-}
45-
46-void META_MainWindow::set_monitor_type(int num)
47-{
48-#ifdef USE_MONITOR_TYPE
49- if((num < 0) || (num >= USE_MONITOR_TYPE)) return;
50- config.monitor_type = num;
51- this->do_emu_update_config();
52-#endif
53-}
5441
5542 void META_MainWindow::do_set_pcg(bool flag)
5643 {
@@ -76,30 +63,6 @@ void META_MainWindow::setupUI_Emu(void)
7663 #if defined(USE_BOOT_MODE)
7764 ConfigCPUBootMode(USE_BOOT_MODE);
7865 #endif
79-#if defined(USE_MONITOR_TYPE)
80- {
81- int ii;
82- menuMonitorType = new QMenu(menuMachine);
83- menuMonitorType->setObjectName(QString::fromUtf8("menuControl_MonitorType"));
84- menuMachine->addAction(menuMonitorType->menuAction());
85-
86- actionGroup_MonitorType = new QActionGroup(this);
87- actionGroup_MonitorType->setExclusive(true);
88- for(ii = 0; ii < USE_MONITOR_TYPE; ii++) {
89- actionMonitorType[ii] = new Action_Control_MZ700(this, using_flags);
90- actionGroup_MonitorType->addAction(actionMonitorType[ii]);
91- actionMonitorType[ii]->setCheckable(true);
92- actionMonitorType[ii]->setVisible(true);
93- actionMonitorType[ii]->mz_binds->setValue1(ii);
94- if(config.monitor_type == ii) actionMonitorType[ii]->setChecked(true);
95- menuMonitorType->addAction(actionMonitorType[ii]);
96- connect(actionMonitorType[ii], SIGNAL(triggered()),
97- actionMonitorType[ii]->mz_binds, SLOT(do_monitor_type()));
98- connect(actionMonitorType[ii]->mz_binds, SIGNAL(sig_monitor_type(int)),
99- this, SLOT(set_monitor_type(int)));
100- }
101- }
102-#endif
10366
10467 }
10568
--- a/source/src/qt/machines/mz700/menuclasses.h
+++ b/source/src/qt/machines/mz700/menuclasses.h
@@ -16,9 +16,6 @@ public:
1616 Object_Menu_Control_MZ700(QObject *parent, USING_FLAGS *p);
1717 ~Object_Menu_Control_MZ700();
1818 signals:
19- void sig_monitor_type(int);
20-public slots:
21- void do_monitor_type(void);
2219 };
2320
2421 class Action_Control_MZ700 : public Action_Control
@@ -40,18 +37,12 @@ protected:
4037 #if defined(_MZ700)
4138 QAction *action_PCG700;
4239 #endif
43-#if defined(USE_MONITOR_TYPE)
44- QActionGroup *actionGroup_MonitorType;
45- QMenu *menuMonitorType;
46- class Action_Control_MZ700 *actionMonitorType[USE_MONITOR_TYPE];
47-#endif
4840 void setupUI_Emu(void);
4941 void retranslateUi(void);
5042 public:
5143 META_MainWindow(USING_FLAGS *p, CSP_Logger *logger, QWidget *parent = 0);
5244 ~META_MainWindow();
5345 public slots:
54- void set_monitor_type(int);
5546 void do_set_pcg(bool flag);
5647 signals:
5748 };
--- a/source/src/qt/machines/mz80k/MainWindow.cpp
+++ b/source/src/qt/machines/mz80k/MainWindow.cpp
@@ -41,21 +41,6 @@ void Object_Menu_Control_MZ80::set_dipsw(bool flag)
4141 emit sig_dipsw(getValue1(), flag);
4242 }
4343
44-void Object_Menu_Control_MZ80::do_set_monitor_type(void)
45-{
46-#if defined(USE_MONITOR_TYPE)
47- int n = getValue1();
48- if(n < 0) return;
49- if(n >= USE_MONITOR_TYPE) return;
50- config.monitor_type = n;
51- emit sig_update_config();
52-#endif
53-}
54-
55-void META_MainWindow::do_mz_update_config(void)
56-{
57- emit sig_emu_update_config();
58-}
5944
6045 void META_MainWindow::setupUI_Emu(void)
6146 {
@@ -75,23 +60,6 @@ void META_MainWindow::setupUI_Emu(void)
7560 connect(action_Emu_DipSw->mz_binds, SIGNAL(sig_dipsw(int, bool)),
7661 this, SLOT(set_dipsw(int, bool)));
7762
78-#if defined(USE_MONITOR_TYPE)
79- menuDisplayType = new QMenu(this);
80- actionGroup_DisplayType = new QActionGroup(this);
81- actionGroup_DisplayType->setExclusive(true);
82- for(int i = 0; i < USE_MONITOR_TYPE; i++) {
83- action_DisplayType[i] = new Action_Control_MZ80(this, using_flags);
84- action_DisplayType[i]->setCheckable(true);
85- action_DisplayType[i]->setVisible(true);
86- action_DisplayType[i]->mz_binds->setValue1(i);
87- actionGroup_DisplayType->addAction(action_DisplayType[i]);
88- if(config.monitor_type == i) action_DisplayType[i]->setChecked(true);
89- connect(action_DisplayType[i], SIGNAL(triggered()), action_DisplayType[i]->mz_binds, SLOT(do_set_monitor_type()));
90- connect(action_DisplayType[i]->mz_binds, SIGNAL(sig_update_config()), this, SLOT(do_mz_update_config()));
91- menuDisplayType->addAction(action_DisplayType[i]);
92- }
93- menuMachine->addAction(menuDisplayType->menuAction());
94-#endif
9563 }
9664
9765 void META_MainWindow::retranslateUi(void)
@@ -127,11 +95,10 @@ void META_MainWindow::retranslateUi(void)
12795 actionDriveType[1]->setText(QApplication::translate("MachineMZ80K", "2DD", 0));
12896 #endif
12997 #if defined(USE_MONITOR_TYPE)
130- menuDisplayType->setTitle(QApplication::translate("MachineMZ80K", "Monitor Type", 0));
131- action_DisplayType[0]->setText(QApplication::translate("MachineMZ80K", "WHITE (MZ-80K)", 0));
132- action_DisplayType[0]->setToolTip(QApplication::translate("MachineMZ80K", "Using MZ-80K's B&W DISPLAY.", 0));
133- action_DisplayType[1]->setText(QApplication::translate("MachineMZ80K", "GREEN (MZ-80C)", 0));
134- action_DisplayType[1]->setToolTip(QApplication::translate("MachineMZ80K", "Using MZ-80C's GREEN DISPLAY.", 0));
98+ actionMonitorType[0]->setText(QApplication::translate("MachineMZ80K", "WHITE (MZ-80K)", 0));
99+ actionMonitorType[0]->setToolTip(QApplication::translate("MachineMZ80K", "Using MZ-80K's B&W DISPLAY.", 0));
100+ actionMonitorType[1]->setText(QApplication::translate("MachineMZ80K", "GREEN (MZ-80C)", 0));
101+ actionMonitorType[1]->setToolTip(QApplication::translate("MachineMZ80K", "Using MZ-80C's GREEN DISPLAY.", 0));
135102 #endif
136103
137104 #ifdef USE_DEBUGGER
--- a/source/src/qt/machines/mz80k/menuclasses.h
+++ b/source/src/qt/machines/mz80k/menuclasses.h
@@ -22,7 +22,6 @@ signals:
2222 int sig_update_config();
2323 public slots:
2424 void set_dipsw(bool);
25- void do_set_monitor_type(void);
2625 };
2726
2827 class Action_Control_MZ80 : public Action_Control
@@ -39,11 +38,7 @@ class Ui_MainWindow;
3938 class META_MainWindow : public Ui_MainWindow {
4039 Q_OBJECT
4140 protected:
42- QMenu *menuDisplayType;
43- QActionGroup *actionGroup_DisplayType;
44-
4541 Action_Control_MZ80 *action_Emu_DipSw;
46- Action_Control_MZ80 *action_DisplayType[4];
4742
4843 void setupUI_Emu(void);
4944 void retranslateUi(void);
@@ -51,7 +46,6 @@ public:
5146 META_MainWindow(USING_FLAGS *p, CSP_Logger *logger, QWidget *parent = 0);
5247 ~META_MainWindow();
5348 public slots:
54- void do_mz_update_config(void);
5549 };
5650
5751 QT_END_NAMESPACE
--- a/source/src/qt/machines/pc100/MainWindow.cpp
+++ b/source/src/qt/machines/pc100/MainWindow.cpp
@@ -33,44 +33,12 @@ Object_Menu_Control_PC100::Object_Menu_Control_PC100(QObject *parent, USING_FLAG
3333 Object_Menu_Control_PC100::~Object_Menu_Control_PC100(){
3434 }
3535
36-void Object_Menu_Control_PC100::do_set_monitor_type(void)
37-{
38-#if defined(USE_MONITOR_TYPE)
39- int n = getValue1();
40- if(n < 0) return;
41- if(n >= USE_MONITOR_TYPE) return;
42- config.monitor_type = n;
43- emit sig_update_config();
44-#endif
45-}
46-
47-void META_MainWindow::do_pc100_update_config(void)
48-{
49- emit sig_emu_update_config();
50-}
5136
5237 void META_MainWindow::setupUI_Emu(void)
5338 {
5439 int i;
5540 QString tmps;
5641 menuMachine->setVisible(true);
57-#if defined(USE_MONITOR_TYPE)
58- menuDisplayType = new QMenu(this);
59- actionGroup_DisplayType = new QActionGroup(this);
60- actionGroup_DisplayType->setExclusive(true);
61- for(int i = 0; i < USE_MONITOR_TYPE; i++) {
62- action_DisplayType[i] = new Action_Control_PC100(this, using_flags);
63- action_DisplayType[i]->setCheckable(true);
64- action_DisplayType[i]->setVisible(true);
65- action_DisplayType[i]->pc100_binds->setValue1(i);
66- actionGroup_DisplayType->addAction(action_DisplayType[i]);
67- if(config.monitor_type == i) action_DisplayType[i]->setChecked(true);
68- connect(action_DisplayType[i], SIGNAL(triggered()), action_DisplayType[i]->pc100_binds, SLOT(do_set_monitor_type()));
69- connect(action_DisplayType[i]->pc100_binds, SIGNAL(sig_update_config()), this, SLOT(do_pc100_update_config()));
70- menuDisplayType->addAction(action_DisplayType[i]);
71- }
72- menuMachine->addAction(menuDisplayType->menuAction());
73-#endif
7442 }
7543
7644 void META_MainWindow::retranslateUi(void)
@@ -83,10 +51,10 @@ void META_MainWindow::retranslateUi(void)
8351 actionDriveType[1]->setText(QApplication::translate("MachinePC100", "2DD", 0));
8452 #endif
8553 #if defined(USE_MONITOR_TYPE)
86- action_DisplayType[0]->setText(QApplication::translate("Machine", "Horizonal", 0));
87- action_DisplayType[0]->setToolTip(QApplication::translate("Machine", "Use DISPLAY as horizonal.", 0));
88- action_DisplayType[1]->setText(QApplication::translate("Machine", "Vertical", 0));
89- action_DisplayType[1]->setToolTip(QApplication::translate("Machine", "Use DISPLAY as vertical.", 0));
54+ actionMonitorType[0]->setText(QApplication::translate("Machine", "Horizonal", 0));
55+ actionMonitorType[0]->setToolTip(QApplication::translate("Machine", "Use DISPLAY as horizonal.", 0));
56+ actionMonitorType[1]->setText(QApplication::translate("Machine", "Vertical", 0));
57+ actionMonitorType[1]->setToolTip(QApplication::translate("Machine", "Use DISPLAY as vertical.", 0));
9058 #endif
9159 #if defined(USE_DEBUGGER)
9260 actionDebugger[0]->setVisible(true);
--- a/source/src/qt/machines/pc100/menuclasses.h
+++ b/source/src/qt/machines/pc100/menuclasses.h
@@ -23,7 +23,6 @@ public:
2323 signals:
2424 int sig_update_config();
2525 public slots:
26- void do_set_monitor_type(void);
2726 };
2827
2928 class Action_Control_PC100 : public Action_Control
@@ -40,9 +39,6 @@ class QActionGroup;
4039 class META_MainWindow : public Ui_MainWindow {
4140 Q_OBJECT
4241 protected:
43- QMenu *menuDisplayType;
44- QActionGroup *actionGroup_DisplayType;
45- Action_Control_PC100 *action_DisplayTypp[4];
4642
4743 void setupUI_Emu(void);
4844 void retranslateUi(void);
@@ -50,7 +46,6 @@ public:
5046 META_MainWindow(USING_FLAGS *p, CSP_Logger *logger, QWidget *parent = 0);
5147 ~META_MainWindow();
5248 public slots:
53- void do_pc100_update_config(void);
5449 };
5550
5651 QT_END_NAMESPACE
--- a/source/src/qt/machines/pc8801/MainWindow.cpp
+++ b/source/src/qt/machines/pc8801/MainWindow.cpp
@@ -30,11 +30,6 @@ Object_Menu_Control_88::~Object_Menu_Control_88()
3030 {
3131 }
3232
33-void Object_Menu_Control_88::do_set_display_mode(void)
34-{
35- emit sig_display_mode(getValue1());
36-}
37-
3833
3934 void Object_Menu_Control_88::do_set_memory_wait(bool flag)
4035 {
@@ -189,15 +184,12 @@ void META_MainWindow::retranslateUi(void)
189184 actionPrintDevice[1]->setToolTip(QApplication::translate("MenuPC88", "NEC PC-PR201 kanji serial printer.", 0));
190185 actionPrintDevice[1]->setEnabled(false);
191186 #endif
192- if(actionSoundPlayTape != NULL) actionSoundPlayTape->setEnabled(false);
193- if(action_SoundFilesRelay != NULL) action_SoundFilesRelay->setEnabled(false);
194187
195188 actionMemoryWait->setText(QApplication::translate("MenuPC88", "Wait Memory", 0));
196189 actionMemoryWait->setToolTip(QApplication::translate("MenuPC88", "Simulate waiting memory.", 0));
197190 #if defined(USE_MONITOR_TYPE)
198- menu_Emu_DisplayMode->setTitle(QApplication::translate("MenuPC88", "Display Mode", 0));
199- action_Emu_DisplayMode[0]->setText(QApplication::translate("MenuPC88", "High Resolution", 0));
200- action_Emu_DisplayMode[1]->setText(QApplication::translate("MenuPC88", "Standard", 0));
191+ actionMonitorType[0]->setText(QApplication::translate("MenuPC88", "High Resolution", 0));
192+ actionMonitorType[1]->setText(QApplication::translate("MenuPC88", "Standard", 0));
201193 #endif
202194 // End.
203195 // Set Labels
@@ -227,31 +219,6 @@ void META_MainWindow::setupUI_Emu(void)
227219 actionMemoryWait->pc88_binds, SLOT(do_set_memory_wait(bool)));
228220 connect(actionMemoryWait->pc88_binds, SIGNAL(sig_set_dipsw(int, bool)),
229221 this, SLOT(set_dipsw(int, bool)));
230-#if defined(USE_MONITOR_TYPE)
231- menu_Emu_DisplayMode = new QMenu(menuMachine);
232- menu_Emu_DisplayMode->setObjectName(QString::fromUtf8("menu_DisplayMode"));
233-
234- actionGroup_DisplayMode = new QActionGroup(this);
235- actionGroup_DisplayMode->setObjectName(QString::fromUtf8("actionGroup_DisplayMode"));
236- actionGroup_DisplayMode->setExclusive(true);
237- menuMachine->addAction(menu_Emu_DisplayMode->menuAction());
238- for(int i = 0; i < USE_MONITOR_TYPE; i++) {
239- action_Emu_DisplayMode[i] = new Action_Control_88(this, using_flags);
240- action_Emu_DisplayMode[i]->setCheckable(true);
241- action_Emu_DisplayMode[i]->pc88_binds->setValue1(i);
242- if(i == config.monitor_type) action_Emu_DisplayMode[i]->setChecked(true); // Need to write configure
243- }
244- action_Emu_DisplayMode[0]->setObjectName(QString::fromUtf8("action_Emu_DisplayMode_High"));
245- action_Emu_DisplayMode[1]->setObjectName(QString::fromUtf8("action_Emu_DisplayMode_Standard"));
246- for(int i = 0; i < 2; i++) {
247- menu_Emu_DisplayMode->addAction(action_Emu_DisplayMode[i]);
248- actionGroup_DisplayMode->addAction(action_Emu_DisplayMode[i]);
249- connect(action_Emu_DisplayMode[i], SIGNAL(triggered()),
250- action_Emu_DisplayMode[i]->pc88_binds, SLOT(do_set_display_mode()));
251- connect(action_Emu_DisplayMode[i]->pc88_binds, SIGNAL(sig_display_mode(int)),
252- this, SLOT(set_monitor_type(int)));
253- }
254-#endif
255222
256223 }
257224
--- a/source/src/qt/machines/pc8801/menuclasses.h
+++ b/source/src/qt/machines/pc8801/menuclasses.h
@@ -16,11 +16,8 @@ class Object_Menu_Control_88: public Object_Menu_Control
1616 Object_Menu_Control_88(QObject *parent, USING_FLAGS *p);
1717 ~Object_Menu_Control_88();
1818 signals:
19- int sig_display_mode(int);
2019 public slots:
2120 void do_set_memory_wait(bool);
22- void do_set_display_mode();
23-
2421 };
2522
2623 class Action_Control_88 : public Action_Control
@@ -41,12 +38,7 @@ class META_MainWindow : public Ui_MainWindow {
4138 Q_OBJECT
4239 protected:
4340 int config_sound_device_type;
44- QActionGroup *actionGroup_DisplayMode;
4541 class Action_Control_88 *actionMemoryWait; //
46-#if defined(USE_MONITOR_TYPE)
47- QMenu *menu_Emu_DisplayMode;
48- class Action_Control_88 *action_Emu_DisplayMode[USE_MONITOR_TYPE]; // 0=Hi / 1 = Lo
49-#endif
5042 void setupUI_Emu(void);
5143 void retranslateUi(void);
5244 public:
--- a/source/src/qt/machines/pc9801/MainWindow.cpp
+++ b/source/src/qt/machines/pc9801/MainWindow.cpp
@@ -34,11 +34,6 @@ void Object_Menu_Control_98::do_set_memory_wait(bool flag)
3434 emit sig_set_dipsw(0, flag);
3535 }
3636
37-void Object_Menu_Control_98::do_set_display_mode(void)
38-{
39- emit sig_display_mode(getValue1());
40-}
41-
4237
4338 Action_Control_98::Action_Control_98(QObject *parent, USING_FLAGS *p) : Action_Control(parent, p)
4439 {
@@ -58,10 +53,6 @@ void META_MainWindow::retranslateUi(void)
5853 Ui_MainWindowBase::retranslateUi();
5954 retranslateControlMenu(title, false);
6055
61-#if defined(SUPPORT_CMT_IF) || defined(_PC98DO) || defined(_PC98DOPLUS)
62- if(actionSoundPlayTape != NULL) actionSoundPlayTape->setEnabled(false);
63- if(action_SoundFilesRelay != NULL) action_SoundFilesRelay->setEnabled(false);
64-#endif
6556 #if defined(_PC9801) || defined(_PC9801E)
6657 // Drive 3,4
6758 menu_fds[2]->setTitle(QApplication::translate("MainWindow", "2DD-1", 0));
@@ -162,9 +153,8 @@ void META_MainWindow::retranslateUi(void)
162153 #endif
163154 #endif
164155 #ifdef USE_MONITOR_TYPE
165- menu_Emu_DisplayMode->setTitle(QApplication::translate("MainWindow", "Display Mode", 0));
166- action_Emu_DisplayMode[0]->setText(QApplication::translate("MainWindow", "High Resolution", 0));
167- action_Emu_DisplayMode[1]->setText(QApplication::translate("MainWindow", "Standard Resolution", 0));
156+ actionMonitorType[0]->setText(QApplication::translate("MainWindow", "High Resolution", 0));
157+ actionMonitorType[1]->setText(QApplication::translate("MainWindow", "Standard Resolution", 0));
168158 #endif
169159 } // retranslateUi
170160
@@ -189,31 +179,6 @@ void META_MainWindow::setupUI_Emu(void)
189179 #ifdef USE_BOOT_MODE
190180 ConfigCPUBootMode(USE_BOOT_MODE);
191181 #endif
192-#ifdef USE_MONITOR_TYPE
193- menu_Emu_DisplayMode = new QMenu(menuMachine);
194- menu_Emu_DisplayMode->setObjectName(QString::fromUtf8("menu_DisplayMode"));
195-
196- actionGroup_DisplayMode = new QActionGroup(this);
197- actionGroup_DisplayMode->setObjectName(QString::fromUtf8("actionGroup_DisplayMode"));
198- actionGroup_DisplayMode->setExclusive(true);
199- menuMachine->addAction(menu_Emu_DisplayMode->menuAction());
200- for(int i = 0; i < USE_MONITOR_TYPE; i++) {
201- action_Emu_DisplayMode[i] = new Action_Control_98(this, using_flags);
202- action_Emu_DisplayMode[i]->setCheckable(true);
203- action_Emu_DisplayMode[i]->pc98_binds->setValue1(i);
204- if(i == config.monitor_type) action_Emu_DisplayMode[i]->setChecked(true); // Need to write configure
205- }
206- action_Emu_DisplayMode[0]->setObjectName(QString::fromUtf8("action_Emu_DisplayMode_High"));
207- action_Emu_DisplayMode[1]->setObjectName(QString::fromUtf8("action_Emu_DisplayMode_Standard"));
208- for(int i = 0; i < USE_MONITOR_TYPE; i++) {
209- menu_Emu_DisplayMode->addAction(action_Emu_DisplayMode[i]);
210- actionGroup_DisplayMode->addAction(action_Emu_DisplayMode[i]);
211- connect(action_Emu_DisplayMode[i], SIGNAL(triggered()),
212- action_Emu_DisplayMode[i]->pc98_binds, SLOT(do_set_display_mode()));
213- connect(action_Emu_DisplayMode[i]->pc98_binds, SIGNAL(sig_display_mode(int)),
214- this, SLOT(set_monitor_type(int)));
215- }
216-#endif
217182
218183 }
219184
--- a/source/src/qt/machines/pc9801/menuclasses.h
+++ b/source/src/qt/machines/pc9801/menuclasses.h
@@ -19,10 +19,8 @@ public:
1919 signals:
2020 int sig_sound_device(int);
2121 int sig_device_type(int);
22- void sig_display_mode(int);
2322 public slots:
2423 void do_set_memory_wait(bool);
25- void do_set_display_mode(void);
2624 };
2725
2826 class Action_Control_98 : public Action_Control
@@ -48,11 +46,6 @@ protected:
4846 #endif
4947 void setupUI_Emu(void);
5048 void retranslateUi(void);
51-#if defined(USE_MONITOR_TYPE)
52- QActionGroup *actionGroup_DisplayMode;
53- class Action_Control_98 *action_Emu_DisplayMode[USE_MONITOR_TYPE]; // 0=Hi / 1 = Lo
54- QMenu *menu_Emu_DisplayMode;
55-#endif
5649 public:
5750 META_MainWindow(USING_FLAGS *p, CSP_Logger *logger, QWidget *parent = 0);
5851 ~META_MainWindow();
--- a/source/src/qt/machines/pv2000/MainWindow.cpp
+++ b/source/src/qt/machines/pv2000/MainWindow.cpp
@@ -25,10 +25,6 @@ void META_MainWindow::retranslateUi(void)
2525 {
2626 Ui_MainWindowBase::retranslateUi();
2727 retranslateControlMenu("System Reset", false);
28-#if defined(USE_TAPE)
29- if(actionSoundPlayTape != NULL) actionSoundPlayTape->setEnabled(false);
30- if(action_SoundFilesRelay != NULL) action_SoundFilesRelay->setEnabled(false);
31-#endif
3228 #ifdef USE_DEBUGGER
3329 actionDebugger[0]->setVisible(true);
3430 actionDebugger[1]->setVisible(false);
--- a/source/src/qt/machines/x1/MainWindow.cpp
+++ b/source/src/qt/machines/x1/MainWindow.cpp
@@ -34,45 +34,13 @@ Object_Menu_Control_X1::Object_Menu_Control_X1(QObject *parent, USING_FLAGS *p)
3434 Object_Menu_Control_X1::~Object_Menu_Control_X1(){
3535 }
3636
37-#if !defined(_X1)
38-void Object_Menu_Control_X1::do_set_display_mode(void)
39-{
40- emit sig_display_mode(getValue1());
41-}
42-#endif
4337
4438 extern config_t config;
4539
4640 void META_MainWindow::setupUI_Emu(void)
4741 {
4842 int i;
49-# if !defined(_X1)
50- menu_Emu_DisplayMode = new QMenu(menuMachine);
51- menu_Emu_DisplayMode->setObjectName(QString::fromUtf8("menu_DisplayMode"));
52-
53- actionGroup_DisplayMode = new QActionGroup(this);
54- actionGroup_DisplayMode->setObjectName(QString::fromUtf8("actionGroup_DisplayMode"));
55- actionGroup_DisplayMode->setExclusive(true);
56- menuMachine->addAction(menu_Emu_DisplayMode->menuAction());
57- for(i = 0; i < 2; i++) {
58- action_Emu_DisplayMode[i] = new Action_Control_X1(this, using_flags);
59- action_Emu_DisplayMode[i]->setCheckable(true);
60- action_Emu_DisplayMode[i]->x1_binds->setValue1(i);
61- if(i == config.monitor_type) action_Emu_DisplayMode[i]->setChecked(true); // Need to write configure
62- }
63-
64- action_Emu_DisplayMode[0]->setObjectName(QString::fromUtf8("action_Emu_DisplayMode_High"));
65- action_Emu_DisplayMode[1]->setObjectName(QString::fromUtf8("action_Emu_DisplayMode_Standard"));
66- for(i = 0; i < 2; i++) {
67- menu_Emu_DisplayMode->addAction(action_Emu_DisplayMode[i]);
68- actionGroup_DisplayMode->addAction(action_Emu_DisplayMode[i]);
69- connect(action_Emu_DisplayMode[i], SIGNAL(triggered()),
70- action_Emu_DisplayMode[i]->x1_binds, SLOT(do_set_display_mode()));
71- connect(action_Emu_DisplayMode[i]->x1_binds, SIGNAL(sig_display_mode(int)),
72- this, SLOT(set_monitor_type(int)));
73- }
74-#endif
75-
43+
7644 }
7745
7846 void META_MainWindow::retranslateUi(void)
@@ -91,12 +59,14 @@ void META_MainWindow::retranslateUi(void)
9159 actionSoundDevice[1]->setText(QApplication::translate("MachineX1", "CZ-8BS1 Single", 0));
9260 actionSoundDevice[2]->setText(QApplication::translate("MachineX1", "CZ-8BS1 Double", 0));
9361
94-#if !defined(_X1)
95- menu_Emu_DisplayMode->setTitle(QApplication::translate("MachineX1", "Display Mode", 0));
96- action_Emu_DisplayMode[0]->setText(QApplication::translate("MachineX1", "High Resolution (400line)", 0));
97- action_Emu_DisplayMode[1]->setText(QApplication::translate("MachineX1", "Standarsd Resolution (200line)", 0));
62+#if defined(_X1)
63+ menuMonitorType->deleteLater();
64+ //menuMonitorType->setVisible(false);
65+ //actionMonitorType[0]->setVisible(false);
66+ //actionMonitorType[1]->setVisible(false);
9867 #else
99- menu_Emu_DisplayMode->setVisible(false);
68+ actionMonitorType[0]->setText(QApplication::translate("MachineX1", "High Resolution (400line)", 0));
69+ actionMonitorType[1]->setText(QApplication::translate("MachineX1", "Standarsd Resolution (200line)", 0));
10070 #endif
10171 #if defined(USE_KEYBOARD_TYPE)
10272 menuKeyboardType->setTitle(QApplication::translate("MachineX1", "Keyboard Mode", 0));
--- a/source/src/qt/machines/yis/MainWindow.cpp
+++ b/source/src/qt/machines/yis/MainWindow.cpp
@@ -32,10 +32,6 @@ Object_Menu_Control_YIS::~Object_Menu_Control_YIS()
3232 {
3333 }
3434
35-void Object_Menu_Control_YIS::do_set_display_mode(void)
36-{
37- emit sig_display_mode(getValue1());
38-}
3935
4036 Action_Control_YIS::Action_Control_YIS(QObject *parent, USING_FLAGS *p) : Action_Control(parent, p)
4137 {
@@ -55,10 +51,9 @@ void META_MainWindow::retranslateUi(void)
5551 retranslateControlMenu("", false);
5652 // Set Labels
5753 #ifdef USE_MONITOR_TYPE
58- menu_Emu_DisplayMode->setTitle(QApplication::translate("MainWindow", "Display Mode", 0));
59- action_Emu_DisplayMode[0]->setText(QApplication::translate("MainWindow", "PU-1-10", 0));
60- action_Emu_DisplayMode[1]->setText(QApplication::translate("MainWindow", "PU-1-20", 0));
61- action_Emu_DisplayMode[2]->setText(QApplication::translate("MainWindow", "PU-10", 0));
54+ actionMonitorType[0]->setText(QApplication::translate("MainWindow", "PU-1-10", 0));
55+ actionMonitorType[1]->setText(QApplication::translate("MainWindow", "PU-1-20", 0));
56+ actionMonitorType[2]->setText(QApplication::translate("MainWindow", "PU-10", 0));
6257 #endif
6358 #ifdef USE_DEBUGGER
6459 actionDebugger[0]->setVisible(true);
@@ -71,32 +66,6 @@ void META_MainWindow::retranslateUi(void)
7166
7267 void META_MainWindow::setupUI_Emu(void)
7368 {
74-#ifdef USE_MONITOR_TYPE
75- menu_Emu_DisplayMode = new QMenu(menuMachine);
76- menu_Emu_DisplayMode->setObjectName(QString::fromUtf8("menu_DisplayMode"));
77-
78- actionGroup_DisplayMode = new QActionGroup(this);
79- actionGroup_DisplayMode->setObjectName(QString::fromUtf8("actionGroup_DisplayMode"));
80- actionGroup_DisplayMode->setExclusive(true);
81- menuMachine->addAction(menu_Emu_DisplayMode->menuAction());
82- for(int i = 0; i < USE_MONITOR_TYPE; i++) {
83- action_Emu_DisplayMode[i] = new Action_Control_YIS(this, using_flags);
84- action_Emu_DisplayMode[i]->setCheckable(true);
85- action_Emu_DisplayMode[i]->yis_binds->setValue1(i);
86- if(i == config.monitor_type) action_Emu_DisplayMode[i]->setChecked(true); // Need to write configure
87- }
88- action_Emu_DisplayMode[0]->setObjectName(QString::fromUtf8("action_Emu_Display_PU_1_10"));
89- action_Emu_DisplayMode[1]->setObjectName(QString::fromUtf8("action_Emu_Display_PU_1_20"));
90- action_Emu_DisplayMode[2]->setObjectName(QString::fromUtf8("action_Emu_Display_PU_10"));
91- for(int i = 0; i < USE_MONITOR_TYPE; i++) {
92- menu_Emu_DisplayMode->addAction(action_Emu_DisplayMode[i]);
93- actionGroup_DisplayMode->addAction(action_Emu_DisplayMode[i]);
94- connect(action_Emu_DisplayMode[i], SIGNAL(triggered()),
95- action_Emu_DisplayMode[i]->yis_binds, SLOT(do_set_display_mode()));
96- connect(action_Emu_DisplayMode[i]->yis_binds, SIGNAL(sig_display_mode(int)),
97- this, SLOT(set_monitor_type(int)));
98- }
99-#endif
10069 }
10170
10271
--- a/source/src/qt/machines/yis/menuclasses.h
+++ b/source/src/qt/machines/yis/menuclasses.h
@@ -17,9 +17,7 @@ public:
1717 Object_Menu_Control_YIS(QObject *parent, USING_FLAGS *p);
1818 ~Object_Menu_Control_YIS();
1919 signals:
20- void sig_display_mode(int);
2120 public slots:
22- void do_set_display_mode(void);
2321 };
2422
2523 class Action_Control_YIS : public Action_Control
@@ -40,12 +38,6 @@ class META_MainWindow : public Ui_MainWindow {
4038 protected:
4139 QActionGroup *actionGroup_SoundDevice;
4240 QMenu *menu_Emu_SoundDevice;
43-#if defined(USE_MONITOR_TYPE)
44- QActionGroup *actionGroup_DisplayMode;
45- class Action_Control_YIS *action_Emu_DisplayMode[USE_MONITOR_TYPE]; // 0=Hi / 1 = Lo
46- QMenu *menu_Emu_DisplayMode;
47-#endif
48-
4941 void setupUI_Emu(void);
5042 void retranslateUi(void);
5143 public:
--- a/source/src/vm/scsi_host.h
+++ b/source/src/vm/scsi_host.h
@@ -13,7 +13,8 @@
1313 #include "vm.h"
1414 #include "../emu.h"
1515 #include "device.h"
16-
16+//class EMU;
17+//class VM;
1718 class SCSI_HOST : public DEVICE
1819 {
1920 private:
--- a/source/src/vm/x1/CMakeLists.txt
+++ b/source/src/vm/x1/CMakeLists.txt
@@ -13,6 +13,8 @@ add_library(vm_x1
1313 memory.cpp
1414 mouse.cpp
1515 psub.cpp
16+ sasi.cpp
1617 sub.cpp
18+
1719 x1.cpp
18-)
\ No newline at end of file
20+)
Show on old repository browser