OSDN Git Service

[UI][Qt] Revert befor commit.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Mon, 28 Dec 2015 06:33:19 +0000 (15:33 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Mon, 28 Dec 2015 06:33:19 +0000 (15:33 +0900)
[VM][FAMILYBASIC] Fix FTBFS.

source/src/qt/machines/babbage2nd/MainWindow.cpp
source/src/qt/machines/bmjr/MainWindow.cpp
source/src/qt/machines/ex80/MainWindow.cpp
source/src/vm/familybasic/familybasic.h

index 7e6238b..abaa1d0 100644 (file)
@@ -31,8 +31,8 @@ void META_MainWindow::retranslateUi(void)
        actionCapture_Screen->setText(QApplication::translate("MainWindow", "Capture Screen", 0));
        
        menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
-       //menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
-       menuMachine->setVisible(false);
+       menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
+       //menuMachine->setVisible(false);
    
        actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
        menuScreen->setTitle(QApplication::translate("MainWindow", "Screen", 0));
index af04803..1bc6441 100644 (file)
@@ -35,6 +35,7 @@ void META_MainWindow::retranslateUi(void)
 
        menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
        menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
+       //menuMachine->setVisible(false);
   
        menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
        actionHelp_AboutQt->setText(QApplication::translate("MainWindow", "About Qt", 0));
index 28a912d..42be7b4 100644 (file)
@@ -155,7 +155,8 @@ void META_MainWindow::retranslateUi(void)
 
        menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
        menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
-  
+       actionMouseEnable->setVisible(false);
+
        menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
        actionHelp_AboutQt->setText(QApplication::translate("MainWindow", "About Qt", 0));
 
index 192550e..74b24e6 100644 (file)
@@ -29,6 +29,7 @@
 #define USE_AUTO_KEY           5
 #define USE_AUTO_KEY_RELEASE   6
 #define USE_AUTO_KEY_NO_CAPS
+#define USE_JOYSTICK
 #define USE_STATE
 
 #include "../../common.h"