Merge branch 'release/v1.1'

alphagocc · Feb 11, 2018 · fb4189e · fb4189e
2 parents d71ad06 + 45ec6bd
commit fb4189e
Show file tree

Hide file tree

Showing 20 changed files with 1,441 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/FiveChess.cpp b/FiveChess.cpp
@@ -2,17 +2,26 @@
 #include "ui_FiveChess.h"
 #include "battlegui.h"
 #include "waitdialog.h"
+#include "stdafx.h"
 #include <QDebug>
+#include <QLocale>
 
 FiveChess::FiveChess(QWidget *parent) :
-    QMainWindow(parent),
-    ui(new Ui::FiveChess)
+	QMainWindow(parent),
+	ui(new Ui::FiveChess)
 {
-    ui->setupUi(this);
-    QObject::connect(ui->pushButtonNew,ui->pushButtonNew->clicked,this,newFiveChessGame);
-    QObject::connect(ui->pushButtonLoad,ui->pushButtonLoad->clicked,this,loadFiveChessGame);
+	ui->setupUi(this);
+	QObject::connect(ui->pushButtonNew, &QPushButton::clicked, this, &FiveChess::newFiveChessGame);
+	QObject::connect(ui->pushButtonLoad, &QPushButton::clicked, this, &FiveChess::loadFiveChessGame);
+	connect(ui->actionEnglish, &QAction::triggered, this, [&] {
+		translateUi(QLocale::UnitedStates);
+		qDebug() << "!!#3" << endl;
+	});
+	connect(ui->actionChinese, &QAction::triggered, this, [&] {
+		translateUi(QLocale::China);
+		qDebug() << "!!#zh_cn" << endl;
+	});
 }
-
 FiveChess::~FiveChess()
 {
     delete ui;
@@ -23,6 +32,7 @@ void FiveChess::newFiveChessGame()
     hide();
     battleGui *gameGui = new battleGui();
     gameGui->setData(chessBoardData);
+	gameGui->setTranslator(tsor);
     gameGui->show();
 }
 
@@ -44,3 +54,22 @@ void FiveChess::setData(chessBoardData_Process *data)
     this->chessBoardData=data;
     qDebug()<<"SetData0!"<<data<<endl;
 }
+
+void FiveChess::translateUi(int value)
+{
+	switch (value)
+	{
+	case QLocale::China: {
+		tsor->load(":/lang/zh_CN.qm");
+		break;
+	}
+	case QLocale::UnitedStates: {
+		tsor->load(":/lang/en_US.qm");
+		break;
+	}
+	default: {
+		break;
+	}
+	}
+	ui->retranslateUi(this);
+}
diff --git a/FiveChess.h b/FiveChess.h
@@ -3,6 +3,7 @@
 
 #include <QMainWindow>
 #include "chessboarddata_process.h"
+#include <QTranslator>
 
 namespace Ui {
 class FiveChess;
@@ -18,13 +19,15 @@ class FiveChess : public QMainWindow
 
 private:
     Ui::FiveChess *ui;
-
+	QTranslator *tsor;
 public slots:
     void newFiveChessGame();
     void loadFiveChessGame();
 public :
     chessBoardData_Process *chessBoardData;
     void setData(chessBoardData_Process*data);
+	void translateUi(int value);
+	void setTranslator(QTranslator *tsor) { this->tsor = tsor; }
 };
 
 #endif // FIVECHESS_H
diff --git a/FiveChess.pro b/FiveChess.pro
@@ -48,3 +48,7 @@ RESOURCES += \
     fivechessresources.qrc
 
 ICON += Resources/ICO.ico
+
+TRANSLATIONS += zh_CN.ts \
+    en_US.ts
+
diff --git a/FiveChess.pro.user b/FiveChess.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.4.1, 2018-01-23T19:36:28. -->
+<!-- Written by QtCreator 4.4.1, 2018-01-26T14:55:05. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/FiveChess.ui b/FiveChess.ui
@@ -11,10 +11,10 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>FiveChess</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="fivechessresources.qrc">
     <normaloff>:/ico/Resources/ICO.ico</normaloff>
     <normalon>:/ico/Resources/ICO.ico</normalon>
     <disabledoff>:/ico/Resources/ICO.ico</disabledoff>
@@ -35,7 +35,7 @@
        </sizepolicy>
       </property>
       <property name="text">
-       <string>新游戏</string>
+       <string>New Game</string>
       </property>
      </widget>
     </item>
@@ -48,7 +48,7 @@
        </sizepolicy>
       </property>
       <property name="text">
-       <string>载入</string>
+       <string>Load Game</string>
       </property>
      </widget>
     </item>
@@ -60,7 +60,7 @@
        </font>
       </property>
       <property name="text">
-       <string>五子棋小游戏</string>
+       <string>FiveChess</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignCenter</set>
@@ -78,10 +78,36 @@
      <height>23</height>
     </rect>
    </property>
+   <widget class="QMenu" name="menuLang">
+    <property name="title">
+     <string>Language</string>
+    </property>
+    <addaction name="actionEnglish"/>
+    <addaction name="actionChinese"/>
+   </widget>
+   <widget class="QMenu" name="menuAbout">
+    <property name="title">
+     <string>About</string>
+    </property>
+   </widget>
+   <addaction name="menuLang"/>
+   <addaction name="menuAbout"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
+  <action name="actionEnglish">
+   <property name="text">
+    <string>English</string>
+   </property>
+  </action>
+  <action name="actionChinese">
+   <property name="text">
+    <string>Chinese</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+  <include location="fivechessresources.qrc"/>
+ </resources>
  <connections/>
 </ui>