[UI][Qt][PC9801][PASOPIA] Fix FTBFSs.

diff --git a/source/src/qt/gui/menu_binary.cpp b/source/src/qt/gui/menu_binary.cpp
index e06050e..77dd51b 100644 (file)
--- a/source/src/qt/gui/menu_binary.cpp
+++ b/source/src/qt/gui/menu_binary.cpp
@@ -92,10 +92,14 @@ void Menu_BinaryClass::connect_menu_device_sub(void)
 {
 #ifdef USE_BINARY_FILE1
        int ii;
+# if !defined(_PASOPIA7) && !defined(_PASOPIA)
        this->addAction(action_saving);
        this->addSeparator();
        this->addAction(menu_history_save->menuAction());
-
+# else
+       action_saving->setVisible(false);
+       menu_history_save->setVisible(false);
+# endif   
        action_eject->setVisible(false);
        for(ii = 0; ii < MAX_HISTORY; ii++) {
                connect(action_recent_save_list[ii], SIGNAL(triggered()),

diff --git a/source/src/qt/pasopia/MainWindow.cpp b/source/src/qt/pasopia/MainWindow.cpp
index cb7d717..18dd680 100644 (file)
--- a/source/src/qt/pasopia/MainWindow.cpp
+++ b/source/src/qt/pasopia/MainWindow.cpp
@@ -13,7 +13,7 @@
 #include "commonclasses.h"
 #include "menuclasses.h"
 #include "qt_main.h"
-
+#include "menu_binary.h"
 
 void META_MainWindow::setupUI_Emu(void)
 {
@@ -39,8 +39,7 @@ void META_MainWindow::retranslateUi(void)
 
 #if defined(_PASOPIA)
        retranslateBinaryMenu(0, 1);
-       menuBIN[0]->setTitle(QApplication::translate("MainWindow", "RAMPAC", 0));
-       actionSave_BIN[0]->setVisible(false);
+       menu_BINs[0]->setTitle(QApplication::translate("MainWindow", "RAMPAC", 0));
        menuBootMode->setTitle("BOOT Mode");
        actionBootMode[0]->setText(QString::fromUtf8("T-BASIC Ver 1.0"));
        actionBootMode[1]->setText(QString::fromUtf8("T-BASIC Ver 1.1"));
@@ -55,12 +54,11 @@ void META_MainWindow::retranslateUi(void)
 
 #elif defined(_PASOPIA7)
        retranslateBinaryMenu(0, 1);
-       menuBIN[0]->setTitle(QApplication::translate("MainWindow", "RAMPAC1", 0));
-       actionSave_BIN[0]->setVisible(false);
+       menu_BINs[0]->setTitle(QApplication::translate("MainWindow", "RAMPAC1", 0));
+       //actionSave_BIN[0]->setVisible(false);
        retranslateBinaryMenu(1, 2);
-       menuBIN[1]->setTitle(QApplication::translate("MainWindow", "RAMPAC2", 0));
-       actionSave_BIN[1]->setVisible(false);
-
+       menu_BINs[1]->setTitle(QApplication::translate("MainWindow", "RAMPAC2", 0));
+       //actionSave_BIN[1]->setVisible(false);
 #endif
        this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
   

diff --git a/source/src/qt/pc9801/MainWindow.cpp b/source/src/qt/pc9801/MainWindow.cpp
index e0bda54..4046ae7 100644 (file)
--- a/source/src/qt/pc9801/MainWindow.cpp
+++ b/source/src/qt/pc9801/MainWindow.cpp
@@ -13,6 +13,7 @@
 #include "menuclasses.h"
 #include "emu.h"
 #include "qt_main.h"
+#include "menu_disk.h"
 
 //QT_BEGIN_NAMESPACE
 
@@ -66,16 +67,16 @@ void META_MainWindow::retranslateUi(void)
 #endif
 #if defined(_PC9801) || defined(_PC9801E)
    // Drive 3,4
-   menuFD[2]->setTitle(QApplication::translate("MainWindow", "2DD-1", 0));
-   menuFD[3]->setTitle(QApplication::translate("MainWindow", "2DD-2", 0));
+   menu_fds[2]->setTitle(QApplication::translate("MainWindow", "2DD-1", 0));
+   menu_fds[3]->setTitle(QApplication::translate("MainWindow", "2DD-2", 0));
    // Drive 5, 6
-   menuFD[4]->setTitle(QApplication::translate("MainWindow", "2D-1", 0));
-   menuFD[5]->setTitle(QApplication::translate("MainWindow", "2D-2", 0));
+   menu_fds[4]->setTitle(QApplication::translate("MainWindow", "2D-1", 0));
+   menu_fds[5]->setTitle(QApplication::translate("MainWindow", "2D-2", 0));
 #elif defined(_PC98DO)
-   menuFD[0]->setTitle(QApplication::translate("MainWindow", "PC98-1", 0));
-   menuFD[1]->setTitle(QApplication::translate("MainWindow", "PC98-2", 0));
-   menuFD[2]->setTitle(QApplication::translate("MainWindow", "PC88-1", 0));
-   menuFD[3]->setTitle(QApplication::translate("MainWindow", "PC88-2", 0));
+   menu_fds[0]->setTitle(QApplication::translate("MainWindow", "PC98-1", 0));
+   menu_fds[1]->setTitle(QApplication::translate("MainWindow", "PC98-2", 0));
+   menu_fds[2]->setTitle(QApplication::translate("MainWindow", "PC88-1", 0));
+   menu_fds[3]->setTitle(QApplication::translate("MainWindow", "PC88-2", 0));
 #endif
    
 #if defined(USE_TAPE)