v1.0

alien-wxr-xx · Mar 7, 2019 · ccae0ad · ccae0ad
1 parent 0877249
commit ccae0ad
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 68 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/PentaZen.pro b/PentaZen.pro
@@ -25,19 +25,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 CONFIG += c++11
 
 SOURCES += \
-        main.cpp \
-    ui/chessboard.cpp \
-    ui/xrhall.cpp \
-    ui/xrroom.cpp \
-    ui/xrtemp.cpp \
-    main.cpp \
-    engine/board.c \
-    engine/book.c \
-    engine/pair.c \
-    engine/search.c \
-    engine/table.c \
-    engine/tree.c \
-    engine/uiinc.c \
     ui/chessboard.cpp \
     ui/xrhall.cpp \
     ui/xrroom.cpp \
@@ -52,21 +39,6 @@ SOURCES += \
     engine/uiinc.c
 
 HEADERS += \
-    engine/board.h \
-    engine/book.h \
-    engine/key.h \
-    engine/macro.h \
-    engine/mvlist.h \
-    engine/pair.h \
-    engine/pattern.h \
-    engine/search.h \
-    engine/table.h \
-    engine/tree.h \
-    engine/uiinc.h \
-    ui/chessboard.h \
-    ui/xrhall.h \
-    ui/xrroom.h \
-    ui/xrtemp.h \
     engine/board.h \
     engine/book.h \
     engine/key.h \
@@ -84,12 +56,17 @@ HEADERS += \
     ui/xrtemp.h
 
 FORMS += \
-    ui/xrhall.ui \
-    ui/xrroom.ui \
     ui/xrhall.ui \
     ui/xrroom.ui
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
+
+RESOURCES += \
+    resources/myicon.qrc
+
+DISTFILES += \
+    resources/restartV2.icns \
+    resources/undoV2.icns
diff --git a/resources/.DS_Store b/resources/.DS_Store
diff --git a/resources/myicon.qrc b/resources/myicon.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/myimages">
+        <file>restartV2.icns</file>
+        <file>undoV2.icns</file>
+    </qresource>
+</RCC>
diff --git a/resources/restartV2.icns b/resources/restartV2.icns
diff --git a/resources/undoV2.icns b/resources/undoV2.icns
diff --git a/ui/xrhall.cpp b/ui/xrhall.cpp
@@ -1,7 +1,7 @@
 #include "xrhall.h"
 #include "ui_xrhall.h"
-#include "Kernel/uiinc.h"
-#include "Kernel/macro.h"
+#include "engine/uiinc.h"
+#include "engine/macro.h"
 
 xrHall::xrHall(QWidget *parent) :
     QWidget(parent),
@@ -11,9 +11,9 @@ xrHall::xrHall(QWidget *parent) :
 
     initialize();
 
-    this->setWindowTitle("Welcome to SunGomoku!");
+    this->setWindowTitle("Welcome to PentaZen!");
 
-    vtext = "AI v1.1.4, UI v1.4.1";
+    vtext = "AI v1.0.0, UI v1.0.0";
     ui->versionLabel->setText(vtext);
     ui->versionLabel->setAlignment(Qt::AlignCenter);
 

diff --git a/ui/xrhall.ui b/ui/xrhall.ui
@@ -6,25 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>502</width>
-    <height>340</height>
+    <width>366</width>
+    <height>136</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0" colspan="4">
-    <widget class="QLabel" name="logoLabel">
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;img src=&quot;:/myimages/bigLogo.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="2" colspan="2">
+   <item row="3" column="1" colspan="2">
     <widget class="QLabel" name="versionLabel">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -40,7 +30,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1" rowspan="2">
+   <item row="5" column="1">
     <layout class="QVBoxLayout" name="whoFirstLayout">
      <item>
       <widget class="QRadioButton" name="black">
@@ -70,7 +60,20 @@
      </item>
     </layout>
    </item>
-   <item row="5" column="2">
+   <item row="4" column="2" rowspan="2">
+    <widget class="QPushButton" name="startButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>开始</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
     <widget class="QComboBox" name="modelBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -90,19 +93,6 @@
      </item>
     </widget>
    </item>
-   <item row="5" column="3">
-    <widget class="QPushButton" name="startButton">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>开始</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>

diff --git a/ui/xrroom.cpp b/ui/xrroom.cpp
@@ -1,7 +1,7 @@
 #include "xrroom.h"
 #include "ui_xrroom.h"
-#include "Kernel/uiinc.h"
-#include "Kernel/macro.h"
+#include "engine/uiinc.h"
+#include "engine/macro.h"
 
 #include <QLabel>
 #include <QPainter>

diff --git a/ui/xrroom.ui b/ui/xrroom.ui
@@ -34,7 +34,7 @@
      <x>0</x>
      <y>0</y>
      <width>640</width>
-     <height>21</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuOption">
@@ -70,7 +70,7 @@
   </widget>
   <action name="actionRestart">
    <property name="icon">
-    <iconset resource="myicon.qrc">
+    <iconset resource="../resources/myicon.qrc">
      <normaloff>:/myimages/restartV2.icns</normaloff>:/myimages/restartV2.icns</iconset>
    </property>
    <property name="text">
@@ -99,7 +99,7 @@
   </action>
   <action name="actionUndo">
    <property name="icon">
-    <iconset resource="myicon.qrc">
+    <iconset resource="../resources/myicon.qrc">
      <normaloff>:/myimages/undoV2.icns</normaloff>:/myimages/undoV2.icns</iconset>
    </property>
    <property name="text">
@@ -111,7 +111,7 @@
   </action>
  </widget>
  <resources>
-  <include location="myicon.qrc"/>
+  <include location="../resources/myicon.qrc"/>
  </resources>
  <connections/>
 </ui>