From 65dce2627f806d70779aeec6213520ce3dc7381c Mon Sep 17 00:00:00 2001
From: CalciteM Team <calcitem@outlook.com>
Date: Wed, 4 Sep 2019 22:53:41 +0800
Subject: [PATCH] AppUI: Merge two pro and ui files

---
 millwindow.ui => app.ui  |  72 ++++++-------
 gamewindow.ui            | 228 ++++++++++++++++++++++++++++++++++-----
 mill.pro                 |  78 --------------
 millgame.pro             | 163 ++++++++++++++--------------
 src/ui/qt/gamewindow.cpp |   9 ++
 src/ui/qt/gamewindow.h   |   4 -
 6 files changed, 327 insertions(+), 227 deletions(-)
 rename millwindow.ui => app.ui (95%)
 delete mode 100644 mill.pro

diff --git a/millwindow.ui b/app.ui
similarity index 95%
rename from millwindow.ui
rename to app.ui
index 8b308bc6..eeace4c1 100644
--- a/millwindow.ui
+++ b/app.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>491</width>
-    <height>418</height>
+    <height>432</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -32,7 +32,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="ninechesswindow.qrc">
+         <iconset resource="gamewindow.qrc">
           <normaloff>:/icon/resources/icon/ic_reply_black_48dp.png</normaloff>:/icon/resources/icon/ic_reply_black_48dp.png</iconset>
         </property>
        </widget>
@@ -56,7 +56,7 @@
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="ninechesswindow.qrc">
+         <iconset resource="gamewindow.qrc">
           <normaloff>:/icon/resources/icon/ic_menu_black_48dp.png</normaloff>:/icon/resources/icon/ic_menu_black_48dp.png</iconset>
         </property>
        </widget>
@@ -123,7 +123,7 @@
          <string>新局</string>
         </property>
         <property name="icon">
-         <iconset resource="ninechesswindow.qrc">
+         <iconset resource="gamewindow.qrc">
           <normaloff>:/icon/resources/icon/ic_radio_button_on_black_48dp.png</normaloff>:/icon/resources/icon/ic_radio_button_on_black_48dp.png</iconset>
         </property>
         <property name="iconSize">
@@ -152,7 +152,7 @@
          <string>认输</string>
         </property>
         <property name="icon">
-         <iconset resource="ninechesswindow.qrc">
+         <iconset resource="gamewindow.qrc">
           <normaloff>:/icon/resources/icon/ic_flag_black_48dp.png</normaloff>:/icon/resources/icon/ic_flag_black_48dp.png</iconset>
         </property>
         <property name="iconSize">
@@ -178,7 +178,7 @@
          <string>悔棋</string>
         </property>
         <property name="icon">
-         <iconset resource="ninechesswindow.qrc">
+         <iconset resource="gamewindow.qrc">
           <normaloff>:/icon/resources/icon/ic_reply_black_48dp.png</normaloff>:/icon/resources/icon/ic_reply_black_48dp.png</iconset>
         </property>
         <property name="iconSize">
@@ -206,7 +206,7 @@
          <string>提示</string>
         </property>
         <property name="icon">
-         <iconset resource="ninechesswindow.qrc">
+         <iconset resource="gamewindow.qrc">
           <normaloff>:/icon/resources/icon/ic_visibility_black_48dp.png</normaloff>:/icon/resources/icon/ic_visibility_black_48dp.png</iconset>
         </property>
         <property name="iconSize">
@@ -227,7 +227,7 @@
      <x>0</x>
      <y>0</y>
      <width>491</width>
-     <height>17</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_F">
@@ -417,7 +417,7 @@
               <string/>
              </property>
              <property name="pixmap">
-              <pixmap resource="ninechesswindow.qrc">:/icon/resources/icon/Black.png</pixmap>
+              <pixmap resource="gamewindow.qrc">:/icon/resources/icon/Black.png</pixmap>
              </property>
              <property name="alignment">
               <set>Qt::AlignCenter</set>
@@ -498,7 +498,7 @@
               <string/>
              </property>
              <property name="pixmap">
-              <pixmap resource="ninechesswindow.qrc">:/icon/resources/icon/White.png</pixmap>
+              <pixmap resource="gamewindow.qrc">:/icon/resources/icon/White.png</pixmap>
              </property>
              <property name="alignment">
               <set>Qt::AlignCenter</set>
@@ -641,7 +641,7 @@
               <string/>
              </property>
              <property name="pixmap">
-              <pixmap resource="ninechesswindow.qrc">:/icon/resources/icon/Help.png</pixmap>
+              <pixmap resource="gamewindow.qrc">:/icon/resources/icon/Help.png</pixmap>
              </property>
             </widget>
            </item>
@@ -685,7 +685,7 @@
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionNew_N">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/DocumentHS.png</normaloff>:/icon/resources/icon/DocumentHS.png</iconset>
    </property>
    <property name="text">
@@ -700,7 +700,7 @@
   </action>
   <action name="actionOpen_O">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/OpenHS.png</normaloff>:/icon/resources/icon/OpenHS.png</iconset>
    </property>
    <property name="text">
@@ -712,7 +712,7 @@
   </action>
   <action name="actionSave_S">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/SaveHS.png</normaloff>:/icon/resources/icon/SaveHS.png</iconset>
    </property>
    <property name="text">
@@ -724,7 +724,7 @@
   </action>
   <action name="actionSaveAs_A">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/SaveHS.png</normaloff>:/icon/resources/icon/SaveHS.png</iconset>
    </property>
    <property name="text">
@@ -741,7 +741,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/EditTableHS.png</normaloff>:/icon/resources/icon/EditTableHS.png</iconset>
    </property>
    <property name="text">
@@ -750,7 +750,7 @@
   </action>
   <action name="actionFlip_F">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/FlipVerticalHS.png</normaloff>:/icon/resources/icon/FlipVerticalHS.png</iconset>
    </property>
    <property name="text">
@@ -759,7 +759,7 @@
   </action>
   <action name="actionMirror_M">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/FlipHorizontalHS.png</normaloff>:/icon/resources/icon/FlipHorizontalHS.png</iconset>
    </property>
    <property name="text">
@@ -768,7 +768,7 @@
   </action>
   <action name="actionTurnRight_R">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/RightHS.png</normaloff>:/icon/resources/icon/RightHS.png</iconset>
    </property>
    <property name="text">
@@ -780,7 +780,7 @@
   </action>
   <action name="actionTurnLeftt_L">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/LeftHS.png</normaloff>:/icon/resources/icon/LeftHS.png</iconset>
    </property>
    <property name="text">
@@ -798,7 +798,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Invert.png</normaloff>:/icon/resources/icon/Invert.png</iconset>
    </property>
    <property name="text">
@@ -807,7 +807,7 @@
   </action>
   <action name="actionBegin_S">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/First.png</normaloff>:/icon/resources/icon/First.png</iconset>
    </property>
    <property name="text">
@@ -822,7 +822,7 @@
   </action>
   <action name="actionPrevious_B">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Previous.png</normaloff>:/icon/resources/icon/Previous.png</iconset>
    </property>
    <property name="text">
@@ -834,7 +834,7 @@
   </action>
   <action name="actionNext_F">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Next.png</normaloff>:/icon/resources/icon/Next.png</iconset>
    </property>
    <property name="text">
@@ -849,7 +849,7 @@
   </action>
   <action name="actionEnd_E">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Last.png</normaloff>:/icon/resources/icon/Last.png</iconset>
    </property>
    <property name="text">
@@ -864,7 +864,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Play.png</normaloff>:/icon/resources/icon/Play.png</iconset>
    </property>
    <property name="text">
@@ -876,7 +876,7 @@
   </action>
   <action name="actionGiveUp_G">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/BreakpointHS.png</normaloff>:/icon/resources/icon/BreakpointHS.png</iconset>
    </property>
    <property name="text">
@@ -902,7 +902,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/FullScreenHS.png</normaloff>:/icon/resources/icon/FullScreenHS.png</iconset>
    </property>
    <property name="text">
@@ -920,7 +920,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Web.png</normaloff>:/icon/resources/icon/Web.png</iconset>
    </property>
    <property name="text">
@@ -932,7 +932,7 @@
   </action>
   <action name="actionEngine_E">
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/OptionsHS.png</normaloff>:/icon/resources/icon/OptionsHS.png</iconset>
    </property>
    <property name="text">
@@ -950,7 +950,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Black.png</normaloff>:/icon/resources/icon/Black.png</iconset>
    </property>
    <property name="text">
@@ -965,7 +965,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/White.png</normaloff>:/icon/resources/icon/White.png</iconset>
    </property>
    <property name="text">
@@ -980,7 +980,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/PrimaryKeyHS.png</normaloff>:/icon/resources/icon/PrimaryKeyHS.png</iconset>
    </property>
    <property name="text">
@@ -1053,7 +1053,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Help.png</normaloff>:/icon/resources/icon/Help.png</iconset>
    </property>
    <property name="text">
@@ -1068,7 +1068,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="ninechesswindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/HomeHS.png</normaloff>:/icon/resources/icon/HomeHS.png</iconset>
    </property>
    <property name="text">
@@ -1104,7 +1104,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="ninechesswindow.qrc"/>
+  <include location="gamewindow.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/gamewindow.ui b/gamewindow.ui
index 10104e2b..9ee96890 100644
--- a/gamewindow.ui
+++ b/gamewindow.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>491</width>
-    <height>418</height>
+    <height>432</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -24,6 +24,63 @@
     <bool>false</bool>
    </property>
    <layout class="QVBoxLayout" name="verticalLayout_3">
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout_6">
+      <item>
+       <widget class="QPushButton" name="pushButton_back">
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="gamewindow.qrc">
+          <normaloff>:/icon/resources/icon/ic_reply_black_48dp.png</normaloff>:/icon/resources/icon/ic_reply_black_48dp.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButton_option">
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="gamewindow.qrc">
+          <normaloff>:/icon/resources/icon/ic_menu_black_48dp.png</normaloff>:/icon/resources/icon/ic_menu_black_48dp.png</iconset>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <item>
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>玩家:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>电脑:</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
     <item>
      <widget class="GameView" name="gameView">
       <property name="sizePolicy">
@@ -49,6 +106,119 @@
       </property>
      </widget>
     </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QPushButton" name="pushButton_newGame">
+        <property name="font">
+         <font>
+          <family>黑体</family>
+          <pointsize>12</pointsize>
+         </font>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">color: rgb(0, 0, 127);</string>
+        </property>
+        <property name="text">
+         <string>新局</string>
+        </property>
+        <property name="icon">
+         <iconset resource="gamewindow.qrc">
+          <normaloff>:/icon/resources/icon/ic_radio_button_on_black_48dp.png</normaloff>:/icon/resources/icon/ic_radio_button_on_black_48dp.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
+        </property>
+        <property name="flat">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButton_giveUp">
+        <property name="font">
+         <font>
+          <family>黑体</family>
+          <pointsize>12</pointsize>
+         </font>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">color: rgb(0, 0, 127);</string>
+        </property>
+        <property name="text">
+         <string>认输</string>
+        </property>
+        <property name="icon">
+         <iconset resource="gamewindow.qrc">
+          <normaloff>:/icon/resources/icon/ic_flag_black_48dp.png</normaloff>:/icon/resources/icon/ic_flag_black_48dp.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButton_retractMove">
+        <property name="font">
+         <font>
+          <family>黑体</family>
+          <pointsize>12</pointsize>
+         </font>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">color: rgb(0, 0, 127);</string>
+        </property>
+        <property name="text">
+         <string>悔棋</string>
+        </property>
+        <property name="icon">
+         <iconset resource="gamewindow.qrc">
+          <normaloff>:/icon/resources/icon/ic_reply_black_48dp.png</normaloff>:/icon/resources/icon/ic_reply_black_48dp.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButton_hint">
+        <property name="font">
+         <font>
+          <family>黑体</family>
+          <pointsize>12</pointsize>
+          <strikeout>false</strikeout>
+          <stylestrategy>PreferDefault</stylestrategy>
+         </font>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">color: rgb(0, 0, 127);</string>
+        </property>
+        <property name="text">
+         <string>提示</string>
+        </property>
+        <property name="icon">
+         <iconset resource="gamewindow.qrc">
+          <normaloff>:/icon/resources/icon/ic_visibility_black_48dp.png</normaloff>:/icon/resources/icon/ic_visibility_black_48dp.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
@@ -247,7 +417,7 @@
               <string/>
              </property>
              <property name="pixmap">
-              <pixmap resource="millgamewindow.qrc">:/icon/resources/icon/Black.png</pixmap>
+              <pixmap resource="gamewindow.qrc">:/icon/resources/icon/Black.png</pixmap>
              </property>
              <property name="alignment">
               <set>Qt::AlignCenter</set>
@@ -328,7 +498,7 @@
               <string/>
              </property>
              <property name="pixmap">
-              <pixmap resource="millgamewindow.qrc">:/icon/resources/icon/White.png</pixmap>
+              <pixmap resource="gamewindow.qrc">:/icon/resources/icon/White.png</pixmap>
              </property>
              <property name="alignment">
               <set>Qt::AlignCenter</set>
@@ -471,7 +641,7 @@
               <string/>
              </property>
              <property name="pixmap">
-              <pixmap resource="millgamewindow.qrc">:/icon/resources/icon/Help.png</pixmap>
+              <pixmap resource="gamewindow.qrc">:/icon/resources/icon/Help.png</pixmap>
              </property>
             </widget>
            </item>
@@ -515,7 +685,7 @@
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionNew_N">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/DocumentHS.png</normaloff>:/icon/resources/icon/DocumentHS.png</iconset>
    </property>
    <property name="text">
@@ -530,7 +700,7 @@
   </action>
   <action name="actionOpen_O">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/OpenHS.png</normaloff>:/icon/resources/icon/OpenHS.png</iconset>
    </property>
    <property name="text">
@@ -542,7 +712,7 @@
   </action>
   <action name="actionSave_S">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/SaveHS.png</normaloff>:/icon/resources/icon/SaveHS.png</iconset>
    </property>
    <property name="text">
@@ -554,7 +724,7 @@
   </action>
   <action name="actionSaveAs_A">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/SaveHS.png</normaloff>:/icon/resources/icon/SaveHS.png</iconset>
    </property>
    <property name="text">
@@ -571,7 +741,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/EditTableHS.png</normaloff>:/icon/resources/icon/EditTableHS.png</iconset>
    </property>
    <property name="text">
@@ -580,7 +750,7 @@
   </action>
   <action name="actionFlip_F">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/FlipVerticalHS.png</normaloff>:/icon/resources/icon/FlipVerticalHS.png</iconset>
    </property>
    <property name="text">
@@ -589,7 +759,7 @@
   </action>
   <action name="actionMirror_M">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/FlipHorizontalHS.png</normaloff>:/icon/resources/icon/FlipHorizontalHS.png</iconset>
    </property>
    <property name="text">
@@ -598,7 +768,7 @@
   </action>
   <action name="actionTurnRight_R">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/RightHS.png</normaloff>:/icon/resources/icon/RightHS.png</iconset>
    </property>
    <property name="text">
@@ -610,7 +780,7 @@
   </action>
   <action name="actionTurnLeftt_L">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/LeftHS.png</normaloff>:/icon/resources/icon/LeftHS.png</iconset>
    </property>
    <property name="text">
@@ -628,7 +798,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Invert.png</normaloff>:/icon/resources/icon/Invert.png</iconset>
    </property>
    <property name="text">
@@ -637,7 +807,7 @@
   </action>
   <action name="actionBegin_S">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/First.png</normaloff>:/icon/resources/icon/First.png</iconset>
    </property>
    <property name="text">
@@ -652,7 +822,7 @@
   </action>
   <action name="actionPrevious_B">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Previous.png</normaloff>:/icon/resources/icon/Previous.png</iconset>
    </property>
    <property name="text">
@@ -664,7 +834,7 @@
   </action>
   <action name="actionNext_F">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Next.png</normaloff>:/icon/resources/icon/Next.png</iconset>
    </property>
    <property name="text">
@@ -679,7 +849,7 @@
   </action>
   <action name="actionEnd_E">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Last.png</normaloff>:/icon/resources/icon/Last.png</iconset>
    </property>
    <property name="text">
@@ -694,7 +864,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Play.png</normaloff>:/icon/resources/icon/Play.png</iconset>
    </property>
    <property name="text">
@@ -706,7 +876,7 @@
   </action>
   <action name="actionGiveUp_G">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/BreakpointHS.png</normaloff>:/icon/resources/icon/BreakpointHS.png</iconset>
    </property>
    <property name="text">
@@ -732,7 +902,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/FullScreenHS.png</normaloff>:/icon/resources/icon/FullScreenHS.png</iconset>
    </property>
    <property name="text">
@@ -750,7 +920,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Web.png</normaloff>:/icon/resources/icon/Web.png</iconset>
    </property>
    <property name="text">
@@ -762,7 +932,7 @@
   </action>
   <action name="actionEngine_E">
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/OptionsHS.png</normaloff>:/icon/resources/icon/OptionsHS.png</iconset>
    </property>
    <property name="text">
@@ -780,7 +950,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Black.png</normaloff>:/icon/resources/icon/Black.png</iconset>
    </property>
    <property name="text">
@@ -795,7 +965,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/White.png</normaloff>:/icon/resources/icon/White.png</iconset>
    </property>
    <property name="text">
@@ -810,7 +980,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/PrimaryKeyHS.png</normaloff>:/icon/resources/icon/PrimaryKeyHS.png</iconset>
    </property>
    <property name="text">
@@ -883,7 +1053,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/Help.png</normaloff>:/icon/resources/icon/Help.png</iconset>
    </property>
    <property name="text">
@@ -898,7 +1068,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="millgamewindow.qrc">
+    <iconset resource="gamewindow.qrc">
      <normaloff>:/icon/resources/icon/HomeHS.png</normaloff>:/icon/resources/icon/HomeHS.png</iconset>
    </property>
    <property name="text">
@@ -934,7 +1104,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="millgamewindow.qrc"/>
+  <include location="gamewindow.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/mill.pro b/mill.pro
deleted file mode 100644
index 7d617749..00000000
--- a/mill.pro
+++ /dev/null
@@ -1,78 +0,0 @@
-QT       += core gui \
-            multimedia
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-TARGET = mill
-TEMPLATE = app
-
-CONFIG += warn_off
-
-INCLUDEPATH += src
-INCLUDEPATH += include
-
-SOURCES += \
-    src/client.cpp \
-    src/main.cpp \
-    src/boarditem.cpp \
-    src/gamecontroller.cpp \
-    src/gamescene.cpp \
-    src/gameview.cpp \
-    src/ninechess.cpp \
-    src/ninechessai_ab.cpp \
-    src/ninechesswindow.cpp \
-    src/pieceitem.cpp \
-    src/aithread.cpp \
-    src/server.cpp
-
-HEADERS  += \
-    include/config.h \
-    include/version.h \
-    include/version.h.template \
-    src/HashNode.h \
-    src/MemoryPool.h \
-    src/MemoryPool.tcc \
-    src/StackAlloc.h \
-    src/boarditem.h \
-    src/client.h \
-    src/gamecontroller.h \
-    src/gamescene.h \
-    src/gameview.h \
-    src/graphicsconst.h \
-    src/hashMap.h \
-    src/ninechess.h \
-    src/ninechessai_ab.h \
-    src/ninechesswindow.h \
-    src/pieceitem.h \
-    src/manuallistview.h \
-    src/aithread.h \
-    src/server.h \
-    src/zobrist.h
-
-FORMS    += \
-    millwindow.ui
-
-RESOURCES += \
-    ninechesswindow.qrc
-
-DISTFILES += \
-    NineChess.rc \
-    ../Readme.md \
-    ../Sample.txt \
-    ../History.txt \
-    ../Licence.txt \
-    version.sh
-
-RC_FILE += NineChess.rc
-
-# Mobile App support
-DEFINES += MOBILE_APP_UI
-
-# With C++17 support
-greaterThan(QT_MAJOR_VERSION, 4) {
-CONFIG += c++17
-#QMAKE_CXXFLAGS += -O0 -g3 -fsanitize=leak -fno-omit-frame-pointer
-#QMAKE_LFLAGS += -fsanitize=leak
-} else {
-QMAKE_CXXFLAGS += -std=c++0x
-}
diff --git a/millgame.pro b/millgame.pro
index 6f6b647e..4952ee18 100644
--- a/millgame.pro
+++ b/millgame.pro
@@ -1,80 +1,83 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2015-11-03T22:30:34
-#
-#-------------------------------------------------
-
-QT       += core gui \
-            multimedia
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-TARGET = MillGame
-TEMPLATE = app
-
-CONFIG += warn_off
-
-INCLUDEPATH += include
-INCLUDEPATH += src/base
-INCLUDEPATH += src/ai
-INCLUDEPATH += src/game
-INCLUDEPATH += src/ui/qt
-
-SOURCES += \
-    src/game/millgame.cpp \
-    src/main.cpp \
-    src/base/thread.cpp \
-    src/ai/search.cpp \
-    src/ui/qt/gamewindow.cpp \
-    src/ui/qt/pieceitem.cpp \
-    src/ui/qt/server.cpp \
-    src/ui/qt/boarditem.cpp \
-    src/ui/qt/gamecontroller.cpp \
-    src/ui/qt/gamescene.cpp \
-    src/ui/qt/gameview.cpp \
-    src/ui/qt/client.cpp
-
-HEADERS  += \
-    include/config.h \
-    include/version.h \
-    include/version.h.template \
-    src/base/HashNode.h \
-    src/base/hashMap.h \
-    src/base/MemoryPool.h \
-    src/base/MemoryPool.tcc \
-    src/base/stackalloc.h \
-    src/base/thread.h \
-    src/ai/search.h \
-    src/ai/zobrist.h \
-    src/game/millgame.h \
-    src/ui/qt/client.h \
-    src/ui/qt/gamecontroller.h \
-    src/ui/qt/gamescene.h \
-    src/ui/qt/gameview.h \
-    src/ui/qt/gamewindow.h \
-    src/ui/qt/graphicsconst.h \
-    src/ui/qt/pieceitem.h \
-    src/ui/qt/manuallistview.h \
-    src/ui/qt/server.h \
-    src/ui/qt/boarditem.h
-
-FORMS    += \
-    gamewindow.ui
-
-RESOURCES += \
-    gamewindow.qrc
-
-DISTFILES += \
-    MillGame.rc \
-    version.sh
-
-RC_FILE += millgame.rc
-
-# With C++17 support
-greaterThan(QT_MAJOR_VERSION, 4) {
-CONFIG += c++17
-#QMAKE_CXXFLAGS += -O0 -g3 -fsanitize=leak -fno-omit-frame-pointer
-#QMAKE_LFLAGS += -fsanitize=leak
-} else {
-QMAKE_CXXFLAGS += -std=c++0x
-}
+#-------------------------------------------------
+#
+# Project created by QtCreator 2015-11-03T22:30:34
+#
+#-------------------------------------------------
+
+QT       += core gui \
+            multimedia
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = MillGame
+TEMPLATE = app
+
+CONFIG += warn_off
+
+INCLUDEPATH += include
+INCLUDEPATH += src/base
+INCLUDEPATH += src/ai
+INCLUDEPATH += src/game
+INCLUDEPATH += src/ui/qt
+
+SOURCES += \
+    src/game/millgame.cpp \
+    src/main.cpp \
+    src/base/thread.cpp \
+    src/ai/search.cpp \
+    src/ui/qt/gamewindow.cpp \
+    src/ui/qt/pieceitem.cpp \
+    src/ui/qt/server.cpp \
+    src/ui/qt/boarditem.cpp \
+    src/ui/qt/gamecontroller.cpp \
+    src/ui/qt/gamescene.cpp \
+    src/ui/qt/gameview.cpp \
+    src/ui/qt/client.cpp
+
+HEADERS  += \
+    include/config.h \
+    include/version.h \
+    include/version.h.template \
+    src/base/HashNode.h \
+    src/base/hashMap.h \
+    src/base/MemoryPool.h \
+    src/base/MemoryPool.tcc \
+    src/base/stackalloc.h \
+    src/base/thread.h \
+    src/ai/search.h \
+    src/ai/zobrist.h \
+    src/game/millgame.h \
+    src/ui/qt/client.h \
+    src/ui/qt/gamecontroller.h \
+    src/ui/qt/gamescene.h \
+    src/ui/qt/gameview.h \
+    src/ui/qt/gamewindow.h \
+    src/ui/qt/graphicsconst.h \
+    src/ui/qt/pieceitem.h \
+    src/ui/qt/manuallistview.h \
+    src/ui/qt/server.h \
+    src/ui/qt/boarditem.h
+
+FORMS    += \
+    gamewindow.ui
+
+RESOURCES += \
+    gamewindow.qrc
+
+DISTFILES += \
+    MillGame.rc \
+    version.sh
+
+RC_FILE += millgame.rc
+
+# Mobile App support
+#DEFINES += MOBILE_APP_UI
+
+# With C++17 support
+greaterThan(QT_MAJOR_VERSION, 4) {
+CONFIG += c++17
+#QMAKE_CXXFLAGS += -O0 -g3 -fsanitize=leak -fno-omit-frame-pointer
+#QMAKE_LFLAGS += -fsanitize=leak
+} else {
+QMAKE_CXXFLAGS += -std=c++0x
+}
diff --git a/src/ui/qt/gamewindow.cpp b/src/ui/qt/gamewindow.cpp
index 8244594b..b34a13e9 100644
--- a/src/ui/qt/gamewindow.cpp
+++ b/src/ui/qt/gamewindow.cpp
@@ -324,6 +324,15 @@ void MillGameWindow::initialize()
 #else /* MOBILE_APP_UI */
     int h = QApplication::desktop()->height();
     this->resize(QSize(h * 3/4, h * 3/4));
+
+    ui.pushButton_back->setVisible(false);
+    ui.pushButton_option->setVisible(false);
+    ui.label_2->setVisible(false);
+    ui.label->setVisible(false);
+    ui.pushButton_newGame->setVisible(false);
+    ui.pushButton_giveUp->setVisible(false);
+    ui.pushButton_retractMove->setVisible(false);
+    ui.pushButton_hint->setVisible(false);
 #endif /* MOBILE_APP_UI */
 
     // 窗口最大化
diff --git a/src/ui/qt/gamewindow.h b/src/ui/qt/gamewindow.h
index 863d4af3..a08b1273 100644
--- a/src/ui/qt/gamewindow.h
+++ b/src/ui/qt/gamewindow.h
@@ -30,11 +30,7 @@
 
 #include "config.h"
 
-#ifdef MOBILE_APP_UI
-#include "ui_millwindow.h"
-#else
 #include "ui_gamewindow.h"
-#endif
 
 #include "server.h"
 #include "client.h"