Merge branch 'master' of https://github.com/ljzloser/Solvable-Minesweeper

Author: ljzloser

.github/workflows/python-app.yml

@@ -1,6 +1,3 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
 name: Build Metaminesweeper
 
 on:
@@ -14,91 +11,63 @@ on:
     branches:
       - main
       - master
-    tags:
-      - '*'
   workflow_dispatch:
 
 jobs:
   build:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v4
-
-
-    - name: Install Qt
-      uses: jurplel/install-qt-action@v3
-
-    - name: transform qrc to py with pyrcc5
-      run: |
-        lrelease src/ui/en_US.ts -qm en_US.qm
-        lrelease src/ui/de_DE.ts -qm de_DE.qm
-        lrelease src/ui/pl_PL.ts -qm pl_PL.qm
-
-
-    - name: Set up Python 3.12
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.12'
-
-    - name: Install Python dependencies
-      run: |
-        python -V
-        python -m pip install --upgrade pip
-        pip install flake8 pyinstaller==4.10
-        pip install -r requirements.txt
-
-
-    # - name: transform ui to py with pyuic5
-    #   run: |
-    #     cd uiFiles
-    #     pyuic5 -o ui_gameSettings.py ui_gs.ui
-    #     pyuic5 -o ui_gameSettingShortcuts.py ui_gs_shortcuts.ui
-    #     pyuic5 -o ui_defined_parameter.py ui_defined_parameter.ui
-    #     pyuic5 -o ui_mine_num_bar.py ui_mine_num_bar.ui
-    #     cd ..
-    #     md src/ui
-    #     cp uiFiles/ui_gameSettings.py src/ui/ui_gameSettings.py
-    #     cp uiFiles/ui_gameSettingShortcuts.py src/ui/ui_gameSettingShortcuts.py
-    #     cp uiFiles/ui_defined_parameter.py src/ui/ui_defined_parameter.py
-    #     cp uiFiles/ui_mine_num_bar.py src/ui/ui_mine_num_bar.py
-
-    # - name: transform qrc to py with pyrcc5
-    #   run: |
-    #     cd src
-    #     pyrcc5 src_help_pic.qrc -o src_help_pic_rc.py
-    #     cd ..
-
-        
-    - name: Generate metaminesweeper_checksum.pyd
-      run: |
-        pip install cython
-        cd package_tool
-        python setup.py build_ext --inplace
-        ren *.pyd metaminesweeper_checksum.pyd
-        cd ..
-        move package_tool/metaminesweeper_checksum.pyd src/metaminesweeper_checksum.pyd
-        del src/metaminesweeper_checksum.py
-
-
-    - name: Package with PyInstaller
-      run: |
-        # pyinstaller --icon "./src/media/cat.ico" --noconsole --noconfirm --clean --add-data "./src/media/*:./media" --add-data "./src/de_DE.qm:." --add-data "./src/pl_PL.qm:." --add-data "./src/en_US.qm:." --paths src --name metaminesweeper src/main.py
-        pyinstaller --icon "./src/media/cat.ico" --noconsole --noconfirm --clean --add-data "./src/media/*:./media" --add-data "./de_DE.qm:." --add-data "./pl_PL.qm:." --add-data "./en_US.qm:." --paths src --name metaminesweeper src/main.py
-        
-
-
-    - name: Move media and qm files
-      run: |
-        move dist/metaminesweeper/_internal/media dist/metaminesweeper/media
-        move dist/metaminesweeper/_internal/en_US.qm dist/metaminesweeper/en_US.qm
-        move dist/metaminesweeper/_internal/de_DE.qm dist/metaminesweeper/de_DE.qm
-        move dist/metaminesweeper/_internal/pl_PL.qm dist/metaminesweeper/pl_PL.qm
-
-    # upload the result package as an artifact
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v4
-      if: success()
-      with:
-        name: Metaminesweeper-snapshot
-        path: dist/
+      - uses: actions/checkout@v4
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+
+      - name: Generate translation qm files
+        run: |
+          lrelease src/ui/en_US.ts -qm src/en_US.qm
+          lrelease src/ui/de_DE.ts -qm src/de_DE.qm
+          lrelease src/ui/pl_PL.ts -qm src/pl_PL.qm
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.12"
+
+      - name: Install Python dependencies
+        run: |
+          python -V
+          python -m pip install --upgrade pip
+          pip install flake8 pyinstaller>=6.19.0 cython
+          pip install -r requirements.txt
+
+      - name: Generate metaminesweeper_checksum.pyd
+        run: |
+          cd package_tool
+          python setup.py build_ext --inplace
+          ren *.pyd metaminesweeper_checksum.pyd
+          cd ..
+          move package_tool\metaminesweeper_checksum.pyd src\metaminesweeper_checksum.pyd
+          del src\metaminesweeper_checksum.py
+
+      - name: Package with PyInstaller
+        run: |
+          pyinstaller `
+            --icon src/media/cat.ico `
+            --noconsole `
+            --noconfirm `
+            --clean `
+            --paths src `
+            --name metaminesweeper `
+            --add-data "src/media;media" `
+            --add-data "src/en_US.qm;." `
+            --add-data "src/de_DE.qm;." `
+            --add-data "src/pl_PL.qm;." `
+            src/main.py
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        if: success()
+        with:
+          name: Metaminesweeper-snapshot
+          path: dist/

.gitignore

@@ -169,3 +169,6 @@ old/
 src/plugins/*/*.json
 src/plugins/*/*.db
 .vscode/
+src/history.db
+history_show_fields.json
+src/out.json

Metaminesweeper.iss

@@ -6,7 +6,7 @@
 ; 程序名称
 #define MyAppName "Metasweeper"
 ; 程序版本
-#define MyAppVersion "3.2.1"
+#define MyAppVersion "3.2.2"
 ; 发行商
 #define MyAppPublisher "eee555"
 ; 官网

README.md

@@ -4,9 +4,10 @@
 
 - 包含8种模式的专业扫雷版本、第三代扫雷录像播放器及高性能算法工具箱
 
-[![MetaSweeper](https://img.shields.io/badge/MetaSweeper-v3.2.1-brightgreen.svg)](https://github.com/eee555/Solvable-Minesweeper)
-[![stars](https://img.shields.io/github/stars/eee555/Solvable-Minesweeper)](https://github.com/eee555/Solvable-Minesweeper/stargazers)
-[![forks](https://img.shields.io/github/forks/eee555/Solvable-Minesweeper)](https://github.com/eee555/Solvable-Minesweeper/forks)
+[![](https://img.shields.io/github/release/eee555/Metasweeper.svg)](https://github.com/eee555/Metasweeper/releases)
+[![stars](https://img.shields.io/github/stars/eee555/Metasweeper)](https://github.com/eee555/Metasweeper/stargazers)
+[![forks](https://img.shields.io/github/forks/eee555/Metasweeper)](https://github.com/eee555/Metasweeper/forks)
+[![](https://img.shields.io/github/downloads/eee555/Metasweeper/total.svg)](https://github.com/eee555/Metasweeper/releases)
 
 ## 简介
 
@@ -170,6 +171,10 @@
 
 ## 下载链接
 
+### 正式版v3.2.2：
+添加了插件功能。开始支持播放RMV2录像。修复了在局面边框上按下、局面内释放时，处理错误的严重bug。修复了不能在“cell0”上双击的bug。优化了“关于”菜单。补全了计数器中缺失的若干算子、删除了checksum_ok变量。修复了一个evfs安全漏洞。添加了命令行校验录像工具。现在限制光标不能超出边框时，窗口始终置顶。添加了打开录像、设置目录的菜单选项。  
+链接：[https://gitee.com/ee55/Metasweeper/releases/download/3.2.2/Metaminesweeper-3.2.2.exe](https://gitee.com/ee55/Metasweeper/releases/download/3.2.2/Metaminesweeper-3.2.2.exe)、[https://github.com/eee555/Metasweeper/releases/download/3.2.2/Metaminesweeper-3.2.2.exe](https://github.com/eee555/Metasweeper/releases/download/3.2.2/Metaminesweeper-3.2.2.exe)
+
 ### 正式版v3.2.1：
 可以保存evfs录像集，可以选择其中任意录像播放，可以多选并另存为evf文件。增加pluck指标，刻画了运气的好坏。增加迟延模式，可以在标识前增加“[lag]”，获取更宽松的作弊判定。录像播放控制、计数器等子窗口可以保存位置坐标。升级了录像播放器，可以多标签切换。将录像格式升级至evf4。调整法埋雷算法升级。回车等于窗口确定。播放器进度条时间修改为3位小数。可以通过拖入文件来进行播放。给计数器添加log, sin, tan, cos, row, column, minenum等函数和变量。优化了国家下拉框的补全交互。删除设置中的透明度属性。修复了计数器公式不能包含百分号%、回放时脸不动、窗口超出屏幕后无法移回、文件权限相关问题等已经发现的bug。  
 链接：[https://gitee.com/ee55/Metasweeper/releases/download/3.2.1/Metaminesweeper-3.2.1.exe](https://gitee.com/ee55/Metasweeper/releases/download/3.2.1/Metaminesweeper-3.2.1.exe)、[https://github.com/eee555/Metasweeper/releases/download/3.2.1/Metaminesweeper-3.2.1.exe](https://github.com/eee555/Metasweeper/releases/download/3.2.1/Metaminesweeper-3.2.1.exe)

README_EN.md

@@ -4,9 +4,10 @@
 
 * A professional Minesweeper suite featuring 8 gameplay modes, a third-generation replay player, and a high-performance algorithm toolbox.
 
-[![MetaSweeper](https://img.shields.io/badge/MetaSweeper-v3.2.1-brightgreen.svg)](https://github.com/eee555/Solvable-Minesweeper)
-[![stars](https://img.shields.io/github/stars/eee555/Solvable-Minesweeper)](https://github.com/eee555/Solvable-Minesweeper/stargazers)
-[![forks](https://img.shields.io/github/forks/eee555/Solvable-Minesweeper)](https://github.com/eee555/Solvable-Minesweeper/forks)
+[![](https://img.shields.io/github/release/eee555/Metasweeper.svg)](https://github.com/eee555/Metasweeper/releases)
+[![stars](https://img.shields.io/github/stars/eee555/Metasweeper)](https://github.com/eee555/Metasweeper/stargazers)
+[![forks](https://img.shields.io/github/forks/eee555/Metasweeper)](https://github.com/eee555/Metasweeper/forks)
+[![](https://img.shields.io/github/downloads/eee555/Metasweeper/total.svg)](https://github.com/eee555/Metasweeper/releases)
 
 ## Introduction
 

requirements.txt

@@ -1,8 +1,7 @@
 pyQt5==5.15.11
-ms-toollib==1.5.1
+ms-toollib==1.5.3
 setuptools==80.9.0
-pyinstaller==6.16.0
 msgspec>=0.20.0
 zmq>=0.0.0
-
+pywin32
 

src/gameAbout.py

@@ -1,14 +1,16 @@
 from PyQt5 import QtGui
 from ui.ui_about import Ui_Form
 from ui.uiComponents import RoundQDialog
+from PyQt5.QtWidgets import QShortcut
+from PyQt5.QtGui import QKeySequence
+from PyQt5.QtCore import Qt
 
 class ui_Form(Ui_Form):
     def __init__(self, r_path, parent):
         # 关于界面，继承一下就好
         self.Dialog = RoundQDialog(parent)
         self.setupUi (self.Dialog)
-        # self.Dialog.setWindowIcon (QtGui.QIcon (str(r_path.with_name('media').joinpath('cat.ico'))))
-
-     
-
+        
+        # 空格键快捷键关闭这个窗口。回车不需要设置，在ui文件中已经设置。
+        QShortcut(QKeySequence("Space"),  self.Dialog, activated=self.pushButton.click)
 

src/gameRecordPop.py

@@ -1,13 +1,18 @@
 from PyQt5 import QtCore, QtGui
 from ui.ui_record_pop import Ui_Form
 from ui.uiComponents import RoundQDialog
+from PyQt5.QtWidgets import QShortcut
+from PyQt5.QtGui import QKeySequence
 
 class ui_Form(Ui_Form):
     def __init__(self, r_path, del_items: list, pb_bbbv, nf_items, parent):
         self.Dialog = RoundQDialog(parent)
         self.setupUi(self.Dialog)
         self.Dialog.setWindowIcon (QtGui.QIcon (str(r_path.with_name('media').joinpath('cat.ico'))))
 
+        # 空格键快捷键关闭这个窗口。回车不需要设置，在ui文件中已经设置。
+        QShortcut(QKeySequence("Space"),  self.Dialog, activated=self.pushButton.click)
+        
         for i in nf_items:
             eval(f"self.label_{i}.setText('NF ' + self.label_{i}.text())")
         for i in del_items: