From: K.Ohta <whatisthis.sowhat@gmail.com>
Date: Fri, 26 Jun 2015 23:48:31 +0000 (+0900)
Subject: [Qt] Fix OOPs on PC-8801MA/PC-8001mk2 SR.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6f351ecb5f4c2b44c87c0d797c077bcbe772a4ce;p=csp-qt%2Fcommon_source_project-fm7.git

[Qt] Fix OOPs on PC-8801MA/PC-8001mk2 SR.
---

diff --git a/source/build-cmake/pc8001sr/CMakeLists.txt b/source/build-cmake/pc8001sr/CMakeLists.txt
index 03f391c03..735037130 100644
--- a/source/build-cmake/pc8001sr/CMakeLists.txt
+++ b/source/build-cmake/pc8001sr/CMakeLists.txt
@@ -76,13 +76,14 @@ if(BUILD_PC8001SR)
   set(VMFILES ${VMFILES}
               upd1990a.cpp
   )
-  
+  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/pc8001mk2sr.qrc)
 elseif(BUILD_PC8801MA)
   set(EXEC_TARGET emupc8801ma)
   add_definitions(-D_PC8801MA)
   set(VMFILES ${VMFILES}
               upd1990a.cpp
   )
+  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/pc8801ma.qrc)
 endif()
 
 add_definitions(-DPC88_EXRAM_BANKS=${PC88_EXTRAM_PAGES})
diff --git a/source/build-cmake/pc8801ma/CMakeLists.txt b/source/build-cmake/pc8801ma/CMakeLists.txt
index a3c9886a2..1fc106675 100644
--- a/source/build-cmake/pc8801ma/CMakeLists.txt
+++ b/source/build-cmake/pc8801ma/CMakeLists.txt
@@ -74,8 +74,8 @@ add_definitions(-D_CONFIGURE_WITH_CMAKE)
 if(BUILD_PC8001SR)
   set(EXEC_TARGET emupc8001sr)
   add_definitions(-D_PC8001SR)
-  set(VMFILES ${VMFILES}
-  )
+  set(VMFILES ${VMFILES}  )
+  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/pc8001mk2sr.qrc)
   
 elseif(BUILD_PC8801MA)
   set(EXEC_TARGET emupc8801ma)
@@ -83,6 +83,7 @@ elseif(BUILD_PC8801MA)
   set(VMFILES ${VMFILES}
               upd1990a.cpp
   )
+  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/pc8801ma.qrc)
 endif()
 
 add_definitions(-DPC88_EXRAM_BANKS=${PC88_EXTRAM_PAGES})
diff --git a/source/src/qt/pc8801ma/MainWindow.cpp b/source/src/qt/pc8801ma/MainWindow.cpp
index d35405470..3d864e94c 100644
--- a/source/src/qt/pc8801ma/MainWindow.cpp
+++ b/source/src/qt/pc8801ma/MainWindow.cpp
@@ -93,8 +93,10 @@ void META_MainWindow::retranslateUi(void)
   menuCpuType->setTitle("CPU Frequency");
   actionCpuType[0]->setText(QString::fromUtf8("8MHz"));
   actionCpuType[1]->setText(QString::fromUtf8("4MHz"));
-  actionCpuType[3]->setText(QString::fromUtf8("8MHz (FE2/MC)"));
+  actionCpuType[2]->setText(QString::fromUtf8("8MHz (FE2/MC)"));
 #else // _PC8001SR
+  menuCpuType->setTitle("CPU Frequency");
+  actionCpuType[0]->setText(QString::fromUtf8("4MHz"));
   //menuCpuType->setVisible(false);
   //actionCpuType[0]->setVisible(false);
 #endif
@@ -162,9 +164,11 @@ void META_MainWindow::setupUI_Emu(void)
 	actionMemoryWait = new Action_Control_88(this);
 	actionMemoryWait->setCheckable(true);
 	actionMemoryWait->setVisible(true);
+	actionMemoryWait->setChecked(false);
+   
 	menuMachine->addAction(actionMemoryWait);
 	if((config.dipswitch & 0x0001) != 0) actionMemoryWait->setChecked(true);
-	connect(actionMemoryWait, SIGNAL(triggered()),
+	connect(actionMemoryWait, SIGNAL(toggled(bool)),
 		actionMemoryWait->pc88_binds, SLOT(do_set_memory_wait(bool)));
 	connect(actionMemoryWait->pc88_binds, SIGNAL(sig_set_dipsw(int, bool)),
 		 this, SLOT(set_dipsw(int, bool)));