[VM][General][Qt] Merge upstream 2015-12-31.

[csp-qt/common_source_project-fm7.git] / source / src / qt / machines / j3100 / MainWindow.cpp

diff --git a/source/src/qt/machines/j3100/MainWindow.cpp b/source/src/qt/machines/j3100/MainWindow.cpp
index 54434c8..ff3dab2 100644 (file)
--- a/source/src/qt/machines/j3100/MainWindow.cpp
+++ b/source/src/qt/machines/j3100/MainWindow.cpp
@@ -17,42 +17,40 @@
 
 void META_MainWindow::setupUI_Emu(void)
 {
-   int i;
-   QString tmps;
-   
+       int i;
+       QString tmps;
 }
 
 void META_MainWindow::retranslateUi(void)
 {
-  int i;
+       int i;
    
-  retranslateControlMenu("",  false);
-  retranslateFloppyMenu(0, 1);
-  retranslateFloppyMenu(1, 2);
-  retranslateSoundMenu();
-  retranslateScreenMenu();
+       retranslateControlMenu("",  false);
+       retranslateFloppyMenu(0, 1);
+       retranslateFloppyMenu(1, 2);
+       retranslateSoundMenu();
+       retranslateScreenMenu();
+       retranslateMachineMenu();
        retranslateUI_Help();
    
-  this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
-  
+       this->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0));
+    
+       actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
   
-  actionAbout->setText(QApplication::translate("MainWindow", "About...", 0));
-  
-
-  menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
-  menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
+       menuEmulator->setTitle(QApplication::translate("MainWindow", "Emulator", 0));
+       menuMachine->setTitle(QApplication::translate("MainWindow", "Machine", 0));
   
-  menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
+       menuHELP->setTitle(QApplication::translate("MainWindow", "HELP", 0));
        actionHelp_AboutQt->setText(QApplication::translate("MainWindow", "About Qt", 0));
-   // Set Labels
+       // Set Labels
 } // retranslateUi
 
 
 
 META_MainWindow::META_MainWindow(QWidget *parent) : Ui_MainWindow(parent)
 {
-   setupUI_Emu();
-   retranslateUi();
+       setupUI_Emu();
+       retranslateUi();
 }