feat: Replacing .icon and package signatures

XMuli · Jan 28, 2024 · c2c5681 · c2c5681
1 parent c5076a6
commit c2c5681
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 49 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,9 +20,8 @@ cmake_minimum_required(VERSION 3.5)
 
 set(project_name ChineseChess)
 set(project_version_major 6)
-set(project_version_minor 2)
-set(project_version_path 0)
-set(project_version ${project_version_major}.${project_version_minor}.${project_version_path})
+set(project_version_minor 3)
+set(project_version ${project_version_major}.${project_version_minor})
 project(${project_name} VERSION ${project_version} LANGUAGES CXX)
 
 add_definitions(-DXBUILD_TIME="2023.12.14")

diff --git a/ChessBoard.h b/ChessBoard.h
@@ -2,6 +2,7 @@
 // SPDX-FileCopyrightText: 2019-2024 XMuli & Contributors
 // SPDX-GitHub: https://github.com/XMuli/ChineseChess
 // SPDX-Author: XMuli <[email protected]>
+
 #ifndef CHESSBOARD_H
 #define CHESSBOARD_H
 

diff --git a/ChooseMainWindow.cpp b/ChooseMainWindow.cpp
@@ -12,10 +12,9 @@
 #include <QVBoxLayout>
 
 ChooseMainWindow::ChooseMainWindow(QWidget *parent) : QDialog(parent)
-
 {
-    this->setWindowTitle("选择游戏方式");
-    this->setFixedSize(250,120);
+    this->setWindowTitle(QString("选择游戏方式 %1").arg(XPROJECT_VERSION));
+    this->setFixedSize(360, 160);
     this->setWindowIcon(QIcon(":/images/chess.svg"));
 
     QVBoxLayout* lay = new QVBoxLayout(this);
@@ -28,7 +27,7 @@ ChooseMainWindow::ChooseMainWindow(QWidget *parent) : QDialog(parent)
         this->hide();
         m_pAgainstYourself = new ChessBoard();
         m_pAgainstYourself->showNetworkGui(false);
-        m_pAgainstYourself->setWindowTitle("玩家自己对战");
+        m_pAgainstYourself->setWindowTitle(QString("玩家自己对战 %1").arg(XPROJECT_VERSION));
         m_pAgainstYourself->show();
 
         //返回主窗口
@@ -44,7 +43,7 @@ ChooseMainWindow::ChooseMainWindow(QWidget *parent) : QDialog(parent)
 
         m_pMachineGame = new MachineGame();
         m_pMachineGame->showNetworkGui(false);
-        m_pMachineGame->setWindowTitle("玩家和AI对战");
+        m_pMachineGame->setWindowTitle(QString("玩家和AI对战 %1").arg(XPROJECT_VERSION));
         m_pMachineGame->show();
 
         //返回主窗口
@@ -73,7 +72,7 @@ ChooseMainWindow::ChooseMainWindow(QWidget *parent) : QDialog(parent)
 
         m_pNetworkGame = new NetworkGame(bServer);
         m_pNetworkGame->showNetworkGui(true);
-        const QString& title = QString("双人网络对战 [%1]").arg(bServer ? "服务器 - 红方" : "客户端 - 黑方") ;
+        const QString& title = QString("双人网络对战 [%1] [%2]").arg(bServer ? "服务器 - 红方" : "客户端 - 黑方").arg(XPROJECT_VERSION) ;
         m_pNetworkGame->setWindowTitle(title);
         m_pNetworkGame->show();
 

diff --git a/README.md b/README.md
@@ -20,36 +20,6 @@
 
 <br>
 
-# linglong-玲珑适配
-
-### update: 2023.11.02
-
-本次适配都是在 Deepin V23.02  环境下适配成功；
-
-```cpp
-// 编译项目的环境
-sudo apt install gcc g++ cmake git tree qtcreator qtbase5-dev qttools5-dev-tools qttools5-dev libqt5x11extras5-dev libqt5svg5-dev libqt5xml5 
-// 适配玲珑包的环境
-sudo apt install linglong-builder
-
-// 进入源码的根目录下的 tech.xmuli.flipped 文件夹，执行如下适配命令
-ll-builder build
-
-// Note:，第一次执行安装会很慢，发现和网络有关，linglong 自生会下载很多东西；稍等即可编译成功。但实测发现项目使用 git submodule 引入三方开源库，而 玲珑脚本自生没有处理这这一部分，会导致编译失败。若此原因和项目自生无关。
-
-
-```
-
-#### Note:
-
-- 整个项目的编译和玲珑适包配是在 Deepin V23.2 中实现，成功编译和运行；若是单独编译，在Windows、MacOS、Linux 下都是成功编译、运行、打包的，成品下载和体验可。
-  - GitHub : [https://github.com/XMuli/ChineseChess](https://github.com/XMuli/ChineseChess)    | [gitee 镜像](https://gitee.com/XMuli/ChineseChess)
-
-REF：
-
-- [https://linglong.dev/guide/ll-builder/build.html](https://linglong.dev/guide/ll-builder/build.html)
-- [https://atomgit.com/linglong](https://atomgit.com/linglong)
-
 
 
 ## characteristic
@@ -127,7 +97,7 @@ REF：
 
 <img src="https://cdn.jsdelivr.net/gh/xmuli/xmuliPic@pic/2021/ChineChess.gif" width="90%"/>
 
-<img src="https://cdn.jsdelivr.net/gh/xmuli/xmuliPic@pic/2021/20211229011429.png" width="90%"/>
+<img src="https://fastly.jsdelivr.net/gh/XMuli/xmuliPic@pic/2024/202401282117185.png" width="80%"/>
 
 <br>
 
@@ -220,12 +190,18 @@ Thanks for the contributions submitted by the friends 🥳🥳:
           <img src="https://cdn.jsdelivr.net/gh/XMuli/xmuliPic@pic/2022/71036629.png" width="50px"><br>
           <sub>ryanfortner</sub>
         </a>
+       <th align="center" style="width: 80px;">
+        <a href="https://github.com/zjuyk">
+          <img src="https://fastly.jsdelivr.net/gh/XMuli/xmuliPic@pic/2024/202401282118007.png" width="50px"><br>
+          <sub>zjuyk</sub>
+        </a>
      </tr>
   </thead>
 </table>
 
 
-<br>
+
+
 
 If it helps you, or find it useful, <font color=#FE7207  size=4 face="幼圆">you can click on the item's <font color=#D0087E size=4 face="幼圆">**⭐Star** **🍴 Fork** </font> of the two icons, conveniently lift the hand between, said a point of praise the hand,</font> There is a fragrance in your hand；The next best thing is to buy me a cold Coke.
 

diff --git a/README.zh_CN.md b/README.zh_CN.md
@@ -94,7 +94,7 @@
 
 <img src="https://cdn.jsdelivr.net/gh/xmuli/xmuliPic@pic/2021/ChineChess.gif" width="90%"/>
 
-<img src="https://cdn.jsdelivr.net/gh/xmuli/xmuliPic@pic/2021/20211229011429.png" width="90%"/>
+<img src="https://fastly.jsdelivr.net/gh/XMuli/xmuliPic@pic/2024/202401282117185.png" width="80%"/>
 
 <br>
 
@@ -175,17 +175,23 @@
           <img src="https://cdn.jsdelivr.net/gh/xmuli/xmuliPic@pic/2021/20211227232947.png" width="50px"><br>
           <sub>hmsjy2017</sub>
         </a>
-     </tr>
+    </tr>
          <th align="center" style="width: 80px;">
         <a href="https://github.com/ryanfortner">
           <img src="https://cdn.jsdelivr.net/gh/XMuli/xmuliPic@pic/2022/71036629.png" width="50px"><br>
           <sub>ryanfortner</sub>
         </a>
+       <th align="center" style="width: 80px;">
+        <a href="https://github.com/zjuyk">
+          <img src="https://fastly.jsdelivr.net/gh/XMuli/xmuliPic@pic/2024/202401282118007.png" width="50px"><br>
+          <sub>zjuyk</sub>
+        </a>
      </tr>
   </thead>
 </table>
 
 
+
 <br>
 
 若是帮助到了你，或者觉得有用，<font color=#FE7207  size=4 face="幼圆">可以点击该项目的的 <font color=#D0087E size=4 face="幼圆">**⭐Star** </font>和<font color=#D0087E size=4 face="幼圆">**🍴 Fork**</font> 的两个图标，方便抬手之间，表示点个赞，手有余香，</font>其次才是一份冰的肥宅快乐水。

diff --git a/resources/images/Alipay.png b/resources/images/Alipay.png
diff --git a/resources/images/WeChat.png b/resources/images/WeChat.png
diff --git a/resources/logo/logo.ico b/resources/logo/logo.ico
diff --git a/resources/res.qrc b/resources/res.qrc
@@ -1,11 +1,9 @@
 <RCC>
     <qresource prefix="/">
         <file>images/5abc.png</file>
-        <file>images/Alipay.png</file>
         <file>images/b.jpg</file>
         <file>images/background.jpg</file>
         <file>images/chess.svg</file>
-        <file>images/WeChat.png</file>
         <file>images/win.jpg</file>
         <file>sound/backChess.wav</file>
         <file>sound/eatChess.wav</file>

diff --git a/setup_package_user.iss b/setup_package_user.iss
@@ -2,16 +2,16 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 #pragma parseroption -p
 #define MyAppName "ChineseChess"
-#define MyAppVersion "6.2.0"
+#define MyAppVersion "6.3"
 #define MyAppPublisher "XMuli Teams"
 #define MyAppCompany "XMuli"
 #define MyAppURL "https://chinesechess.xmuli.tech"
 #define MyAppExeName "ChineseChess.exe"                     
-#define MyArchitecture "x64"   ; x64    x86
-#define MyCOMPILER_ID "  msvc"   ; mingw  msvc
+#define MyArchitecture "x86"   ; x64    x86
+#define MyCOMPILER_ID "mingw"   ; mingw  msvc
 #define MySrc "."
 #define MyBinDir "bin"         ; 相对于 .iss 文件的路径
-#define MyOutputDir "../Archived"
+#define MyOutputDir "./"
 #define MyGUID "{AF8B402E-8395-42E8-A55D-B34D45F7BDB3}"
 
 [Setup]