修改快捷键空格为回车、修复窗口超出屏幕

Author: eee555

README.md

@@ -19,7 +19,7 @@
 
 + 游戏模式方面，具有**全部6种无猜扫雷模式+标准+win7**，弱可猜、强可猜的模式都是绝无仅有的。
 
-+ 外观上它只是一款普通的标准扫雷，但它能通过按住ctrl并滚动滚轮任意**调整大小**，能调整窗口的**透明度**。这是罕见的。
++ 可以按住ctrl并滚动滚轮任意**调整大小**，能调整窗口的**透明度**。这是罕见的。
 
 + 按下“空格”计算局面中每一格是雷的概率。这是罕见的。
 
@@ -137,16 +137,21 @@ Currently in the lengthy development phase, with updates approximately every 1 t
 [![Star History Chart](https://api.star-history.com/svg?repos=eee555/Metasweeper&type=Date)](https://star-history.com/?repos=eee555/Metasweeper#repos=eee555/Metasweeper&eee555/Metasweeper&Date)
 
 ## 赞助
-感谢您考虑支持我们的开源项目，赞助时请备注您的称呼（或Github主页）。您的赞助将有助于项目的持续发展和改进，使我们能够继续提高软件的质量（owner许诺向所有contributor按获得赞助时commit数量的比例分配赞助得到的收入）。 
+感谢您考虑支持我们的开源项目，赞助时请备注5+您的昵称，例如“5张先生”。您的赞助将有助于项目的持续发展和改进，使我们能够继续提高软件的质量（owner许诺向所有contributor按获得赞助时commit数量的比例分配赞助得到的收入）。
 
 ### 一般赞助者
-- 一次性捐款￥10或以上
-- 您的名字将出现在项目的贡献者列表中
-
-### 高级赞助者
-- 一次性捐款￥50或以上
-- 您的名字将出现在项目的贡献者列表中
-- 独家定期报告项目进展  
+- 一次性捐款￥3及以上
+- 您的名字将永久出现在项目的贡献者列表中（按照您要求的形式）
+
+### 重要赞助者
+- 一次性捐款￥50及以上
+- 一般赞助者的所有的权益
+- 独家定期报告项目进展
+
+### 核心赞助者
+- 累计捐款￥1000及以上
+- 重要赞助者的所有的权益
+- 可行的前提下，按照您的要求来制定开发计划
 
 ![](readme_pic/微信收款码.png) ![](readme_pic/支付宝收款码.png)  
 

src/CheckUpdateGui.py

@@ -391,7 +391,7 @@ def downloadCancel(self):
 #     app = QApplication(sys.argv)
 #     data = {
 #         "Github": "https://api.github.com/repos/",
-#         "fff666": "https://fff666.top/",
+#         "openms": "https://openms.top/",
 #     }
 #     w = CheckUpdateGui(GitHub(SourceManager(data), "eee555",
 #                        "Solvable-Minesweeper", "3.1.9", "(\d+\.\d+\.\d+)"))

src/gameSettings.py

@@ -4,6 +4,7 @@
 from ui.uiComponents import RoundQDialog
 from country_name import country_name
 from PyQt5.QtGui import QPixmap
+from PyQt5.QtCore import Qt
 
 class ui_Form(Ui_Form):
     def __init__(self, mainWindow):
@@ -37,19 +38,16 @@ def __init__(self, mainWindow):
 
         self.Dialog = RoundQDialog(mainWindow.mainWindow)
         self.setupUi(self.Dialog)
-        self.setParameter()
         self.Dialog.setWindowIcon(QtGui.QIcon (str(self.r_path.with_name('media').joinpath('cat.ico'))))
+        
         self.pushButton_yes.clicked.connect(self.processParameter)
         self.pushButton_no.clicked.connect(self.Dialog.close)
-        self.comboBox_country.resize.connect(self.set_lineedit_country_geometry)
-        self.lineEdit_country.textEdited.connect(lambda x: self.set_combobox_country(x))
-        self.comboBox_country.activated['QString'].connect(lambda x: self.set_country_flag(x))
-        self.lineEdit_country.textEdited.connect(lambda x: self.set_country_flag(x))
-        
+        # self.comboBox_country.activated['QString'].connect(lambda x: self.onchange_combobox_country(x))
+        self.comboBox_country.editTextChanged.connect(self.onchange_combobox_country)
+        self.comboBox_country.lineEdit().setAlignment(Qt.AlignCenter)
         self.country_name = list(country_name.keys())
-        self.set_combobox_country(self.lineEdit_country.text())
-        self.set_country_flag(self.lineEdit_country.text())
-        
+        self.setParameter()
+
     def set_country_flag(self, flag_name):
         # 设置国旗图案
         if flag_name not in country_name:
@@ -61,22 +59,20 @@ def set_country_flag(self, flag_name):
                                  (fn + ".svg"))).scaled(51, 31)
             self.label_national_flag.setPixmap(pixmap)
             self.label_national_flag.update()
-            
-        
-    def set_lineedit_country_geometry(self):
-        # 把lineEdit_country重叠到comboBox_country上
-        QRect1 = self.comboBox_country.geometry()
-        QRect2 = self.horizontalWidget_country.geometry()
-        self.lineEdit_country.setGeometry(QRect1.x() + QRect2.x(),
-                                          QRect1.y() + QRect2.y(),
-                                          QRect1.width() - 30, # 把箭头露出来
-                                          QRect1.height())
-        
-    def set_combobox_country(self, qtext):
-        # 修改comboBox_country里的国家选项
+
+
+    # 修改comboBox_country里的国家选项的回调
+    def onchange_combobox_country(self, qtext):
+        # 记录光标位置
+        line_edit = self.comboBox_country.lineEdit()
+        cursor_position = line_edit.cursorPosition()
+        self.comboBox_country.editTextChanged.disconnect(self.onchange_combobox_country)
         self.comboBox_country.clear()
         self.comboBox_country.addItems(filter(lambda x: qtext in x, self.country_name))
-        
+        self.comboBox_country.setCurrentText(qtext)
+        line_edit.setCursorPosition(cursor_position)
+        self.comboBox_country.editTextChanged.connect(self.onchange_combobox_country)
+        self.set_country_flag(qtext)
 
     def setParameter(self):
         self.spinBox_pixsize.setValue (self.pixSize)
@@ -90,7 +86,9 @@ def setParameter(self):
         self.lineEdit_label.setText(self.player_identifier)
         self.lineEdit_race_label.setText(self.race_identifier)
         self.lineEdit_unique_label.setText(self.unique_identifier)
-        self.lineEdit_country.setText(self.country)
+        # self.lineEdit_country.setText(self.country)
+        # self.onchange_combobox_country(self.country)
+        self.comboBox_country.setCurrentText(self.country)
         self.checkBox_end_then_flag.setChecked(self.end_then_flag)
         self.checkBox_cursor_limit.setChecked(self.cursor_limit)
         self.horizontalSlider_transparency.setValue (self.transparency)
@@ -122,7 +120,7 @@ def processParameter(self):
         self.player_identifier = self.lineEdit_label.text()
         self.race_identifier = self.lineEdit_race_label.text()
         self.unique_identifier = self.lineEdit_unique_label.text()
-        self.country = self.lineEdit_country.text()
+        self.country = self.comboBox_country.currentText()
         self.autosave_video = self.checkBox_autosave_video.isChecked()
         self.filter_forever = self.checkBox_filter_forever.isChecked()
         self.board_constraint = self.lineEdit_constraint.text()

src/main.py

@@ -2,7 +2,7 @@
 import time
 from PyQt5 import QtWidgets
 from PyQt5 import QtCore
-from PyQt5.QtWidgets import QApplication, QMessageBox
+from PyQt5.QtWidgets import QApplication
 from PyQt5.QtNetwork import QLocalSocket, QLocalServer
 import sys
 import os
@@ -63,45 +63,45 @@ def find_window(class_name, window_name):
 
 if __name__ == "__main__":
     # QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
-    try:
-        app = QtWidgets.QApplication(sys.argv)
-        serverName = "MineSweeperServer"
-        socket = QLocalSocket()
-        socket.connectToServer(serverName)
-        if socket.waitForConnected(500):
-            if len(sys.argv) == 2:
-                filePath = sys.argv[1]
-                socket.write(filePath.encode())
-                socket.flush()
-            time.sleep(0.5)
-            app.quit()
-        else:
-            localServer = QLocalServer()
-            localServer.listen(serverName)
-            localServer.newConnection.connect(
-                lambda: on_new_connection(localServer=localServer))
-            mainWindow = mainWindowGUI.MainWindow()
-            ui = mineSweeperGUI.MineSweeperGUI(mainWindow, sys.argv)
-            ui.mainWindow.show()
-            # ui.mainWindow.game_setting = ui.game_setting
-
-            _translate = QtCore.QCoreApplication.translate
-            hwnd = find_window(None, _translate("MainWindow", "元扫雷"))
-
-            SetWindowDisplayAffinity = ctypes.windll.user32.SetWindowDisplayAffinity
-            ui.disable_screenshot = lambda: ... if SetWindowDisplayAffinity(
-                hwnd, 0x00000011) else 1/0
-            ui.enable_screenshot = lambda: ... if SetWindowDisplayAffinity(
-                hwnd, 0x00000000) else 1/0
-            ui.disable_screenshot = lambda: ... if SetWindowDisplayAffinity(
-                hwnd, 0x00000011) else 1/0
-            ui.enable_screenshot = lambda: ... if SetWindowDisplayAffinity(
-                hwnd, 0x00000000) else 1/0
-
-            sys.exit(app.exec_())
-            ...
-    except:
-        pass
+    # try:
+    app = QtWidgets.QApplication(sys.argv)
+    serverName = "MineSweeperServer"
+    socket = QLocalSocket()
+    socket.connectToServer(serverName)
+    if socket.waitForConnected(500):
+        if len(sys.argv) == 2:
+            filePath = sys.argv[1]
+            socket.write(filePath.encode())
+            socket.flush()
+        time.sleep(0.5)
+        app.quit()
+    else:
+        localServer = QLocalServer()
+        localServer.listen(serverName)
+        localServer.newConnection.connect(
+            lambda: on_new_connection(localServer=localServer))
+        mainWindow = mainWindowGUI.MainWindow()
+        ui = mineSweeperGUI.MineSweeperGUI(mainWindow, sys.argv)
+        ui.mainWindow.show()
+        # ui.mainWindow.game_setting = ui.game_setting
+
+        _translate = QtCore.QCoreApplication.translate
+        hwnd = find_window(None, _translate("MainWindow", "元扫雷"))
+
+        SetWindowDisplayAffinity = ctypes.windll.user32.SetWindowDisplayAffinity
+        ui.disable_screenshot = lambda: ... if SetWindowDisplayAffinity(
+            hwnd, 0x00000011) else 1/0
+        ui.enable_screenshot = lambda: ... if SetWindowDisplayAffinity(
+            hwnd, 0x00000000) else 1/0
+        ui.disable_screenshot = lambda: ... if SetWindowDisplayAffinity(
+            hwnd, 0x00000011) else 1/0
+        ui.enable_screenshot = lambda: ... if SetWindowDisplayAffinity(
+            hwnd, 0x00000000) else 1/0
+
+        sys.exit(app.exec_())
+        ...
+    # except:
+    #     pass
 
 # 最高优先级
 # 计时器快捷键切换

src/mineSweeperGUI.py

@@ -8,8 +8,7 @@
 import gameAbout
 import gameSettings
 import gameSettingShortcuts
-import \
-    captureScreen, mine_num_bar, videoControl, gameRecordPop
+import captureScreen, mine_num_bar, videoControl, gameRecordPop
 from CheckUpdateGui import CheckUpdateGui
 from githubApi import GitHub, SourceManager
 import minesweeper_master as mm
@@ -1604,9 +1603,9 @@ def closeEvent_(self):
         self.unlimit_cursor()
         # self.score_board_manager.close()
         self.game_setting.set_value(
-            "DEFAULT/mainWinTop", str(self.mainWindow.x()))
+            "DEFAULT/mainWinTop", str(self.mainWindow.y()))
         self.game_setting.set_value(
-            "DEFAULT/mainWinLeft", str(self.mainWindow.y()))
+            "DEFAULT/mainWinLeft", str(self.mainWindow.x()))
         self.game_setting.set_value("DEFAULT/row", str(self.row))
         self.game_setting.set_value("DEFAULT/column", str(self.column))
         self.game_setting.set_value("DEFAULT/mineNum", str(self.mineNum))

src/superGUI.py

@@ -457,7 +457,25 @@ def read_or_create_game_setting(self):
         self.mainWindow.setWindowOpacity(transparency / 100)
         mainWinTop = self.game_setting.get_or_set_value("DEFAULT/mainwintop", 100, int)
         mainWinLeft = self.game_setting.get_or_set_value("DEFAULT/mainwinleft", 200, int)
-        self.mainWindow.move(mainWinTop, mainWinLeft)
+        
+        window_width = self.mainWindow.width()
+        window_height = self.mainWindow.height()
+        screen = QtGui.QGuiApplication.primaryScreen()
+        screen_geometry = screen.geometry()
+        screen_width = screen_geometry.width()
+        screen_height = screen_geometry.height()
+        if mainWinLeft < 0:
+            mainWinLeft = 0
+        elif mainWinLeft + window_width > screen_width:
+            mainWinLeft = screen_width - window_width
+        if mainWinTop < 0:
+            mainWinTop = 0
+        elif mainWinTop + window_height > screen_height:
+            mainWinTop = screen_height - window_height
+        # 考虑设置导致窗口移出屏幕外（例如使用拓展屏）。然而执行此初始化方法时，屏幕尚未
+        # 画局面，因此尺寸较完全初始化后偏小，仍有可能有半个窗口在屏幕外，当然这不影响使用。
+        self.mainWindow.move(mainWinLeft, mainWinTop)
+        
         self.row = self.game_setting.get_or_set_value("DEFAULT/row", 16, int)
         self.column = self.game_setting.get_or_set_value("DEFAULT/column", 30, int)
         self.mineNum = self.game_setting.get_or_set_value("DEFAULT/mineNum", 99, int)

src/ui/uiComponents.py

@@ -14,6 +14,7 @@
 from PyQt5.QtGui import QPixmap
 import configparser
 from PyQt5.QtCore import pyqtSignal 
+from PyQt5.QtCore import QEvent
 # ui相关的小组件，非窗口
 
 class RoundQDialog(QDialog):
@@ -238,25 +239,22 @@ def mouseReleaseEvent(self, e):
 class ScoreTable(QtWidgets.QTableWidget):
     ...
 
-# 能响应点击的QComboBox
+# 可编辑、阻止输入框部分点击事件冒泡
 class BetterQCombox(QComboBox):
-    # clicked = pyqtSignal()
-    # show_popup = pyqtSignal()
     resize = pyqtSignal()
     def __init__(self, parent=None):
         super(BetterQCombox, self).__init__(parent)
+        
+    def mousePressEvent(self, event):
+        # 拦截鼠标按下事件，阻止事件冒泡
+        super().mousePressEvent(event)
+        event.accept()
 
-    # def mousePressEvent(self, QMouseEvent):
-    #     self.clicked.emit()
-    #     QComboBox.mousePressEvent(self, QMouseEvent)
-
-    # def showPopup(self):
-    #     self.show_popup.emit()
-    #     QComboBox.showPopup(self)
+    def mouseReleaseEvent(self, event):
+        # 拦截鼠标释放事件，阻止事件冒泡
+        super().mouseReleaseEvent(event)
+        event.accept()
 
-    # def hidePopup(self):
-    #     QComboBox.hidePopup(self)
-        
     def resizeEvent(self, e):
         self.resize.emit()
 

src/ui/ui_about.py

@@ -53,7 +53,7 @@ def setupUi(self, Form):
         self.label_2.setWhatsThis("")
         self.label_2.setAccessibleName("")
         self.label_2.setAccessibleDescription("")
-        self.label_2.setText("<html><head/><body><p><a href=\"https://github.com/eee555/Solvable-Minesweeper\"><span style=\" font-size:12pt; font-weight:600; text-decoration: underline; color:#0000ff;\">https://github.com/eee555/Solvable-Minesweeper</span></a></p></body></html>")
+        self.label_2.setText("<html><head/><body><p><a href=\"https://github.com/eee555/Metasweeper\"><span style=\" text-decoration: underline; color:#0000ff;\">https://github.com/eee555/Metasweeper</span></a></p></body></html>")
         self.label_2.setTextFormat(QtCore.Qt.RichText)
         self.label_2.setWordWrap(True)
         self.label_2.setOpenExternalLinks(True)
@@ -93,7 +93,7 @@ def setupUi(self, Form):
         self.label_4.setAccessibleName("")
         self.label_4.setAccessibleDescription("")
         self.label_4.setLayoutDirection(QtCore.Qt.LeftToRight)
-        self.label_4.setText("<html><head/><body><p><a href=\"https://openms.top/#/guide/[80.%E6%95%99%E7%A8%8B.%E8%BD%AF%E4%BB%B6]%E5%85%83%E6%89%AB%E9%9B%B7%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B\"><span style=\" text-decoration: underline; color:#0000ff;\">https://openms.top/#/guide/[80.%E6%95%99%E7%A8%8B.%E8%BD%AF%E4%BB%B6]%E5%85%83%E6%89%AB%E9%9B%B7%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B</span></a></p></body></html>")
+        self.label_4.setText("<html><head/><body><p><a href=\"https://openms.top/#/guide/[80.教程.软件]元扫雷使用教程\"><span style=\" text-decoration: underline; color:#0000ff;\">https://openms.top/#/guide/[80.教程.软件]元扫雷使用教程</span></a></p></body></html>")
         self.label_4.setTextFormat(QtCore.Qt.RichText)
         self.label_4.setWordWrap(True)
         self.label_4.setOpenExternalLinks(True)
@@ -140,7 +140,6 @@ def setupUi(self, Form):
         self.pushButton.setStyleSheet("border-image: url(media/button.png);\n"
 "font: 16pt \"黑体\";\n"
 "color:white;font: bold;")
-        self.pushButton.setShortcut("Space")
         self.pushButton.setAutoDefault(False)
         self.pushButton.setFlat(False)
         self.pushButton.setObjectName("pushButton")
@@ -160,3 +159,4 @@ def retranslateUi(self, Form):
         self.label_race_label_3.setText(_translate("Form", "①本软件可以不受任何限制地复制、储存、传播。\n"
 "②任何人可以在任何一个项目中使用本项目源代码的任何一个部分，同时欢迎在本项目主页提出宝贵的意见。"))
         self.pushButton.setText(_translate("Form", "确定"))
+        self.pushButton.setShortcut(_translate("Form", "Return"))

src/ui/ui_defined_parameter.py

@@ -43,7 +43,6 @@ def setupUi(self, Form):
         self.pushButton_3.setStyleSheet("border-image: url(media/button.png);\n"
 "font: 16pt \"黑体\";\n"
 "color:white;font: bold;")
-        self.pushButton_3.setShortcut("Return")
         self.pushButton_3.setAutoDefault(False)
         self.pushButton_3.setFlat(False)
         self.pushButton_3.setObjectName("pushButton_3")
@@ -150,6 +149,7 @@ def retranslateUi(self, Form):
         Form.setWindowTitle(_translate("Form", "自定义设置"))
         self.pushButton_2.setText(_translate("Form", "取消"))
         self.pushButton_3.setText(_translate("Form", "确定"))
+        self.pushButton_3.setShortcut(_translate("Form", "Return"))
         self.label.setText(_translate("Form", "行数(row)"))
         self.label_2.setText(_translate("Form", "列数(column)"))
         self.label_3.setText(_translate("Form", "雷数(number)"))

src/ui/ui_gameSettingShortcuts.py

@@ -60,7 +60,6 @@ def setupUi(self, Form):
         self.pushButton.setStyleSheet("border-image: url(media/button.png);\n"
 "font: 16pt \"黑体\";\n"
 "color:white;font: bold;")
-        self.pushButton.setShortcut("Return")
         self.pushButton.setAutoDefault(False)
         self.pushButton.setFlat(False)
         self.pushButton.setObjectName("pushButton")
@@ -747,6 +746,7 @@ def retranslateUi(self, Form):
         _translate = QtCore.QCoreApplication.translate
         self.pushButton_2.setText(_translate("Form", "取消"))
         self.pushButton.setText(_translate("Form", "确定"))
+        self.pushButton.setShortcut(_translate("Form", "Return"))
         self.comboBox_gamemode4.setItemText(0, _translate("Form", "标准"))
         self.comboBox_gamemode4.setItemText(1, _translate("Form", "Win7"))
         self.comboBox_gamemode4.setItemText(2, _translate("Form", "强无猜"))