Skip to content

Commit f024925

Browse files
committed
fix:计数器标题不能翻译、研究模式中不能显示计数器
1 parent fbb6233 commit f024925

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

src/mineSweeperGUI.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
import ms_toollib as ms
1111
import configparser
1212
# from pathlib import Path
13-
import time
13+
# import time
1414
import os
1515
import ctypes
1616
import hashlib, uuid
1717
# from PyQt5.QtWidgets import QApplication
18-
from country_name import country_name
18+
# from country_name import country_name
1919
import metaminesweeper_checksum
20-
import mmap
2120

2221

2322
class MineSweeperGUI(superGUI.Ui_MainWindow):
@@ -1279,10 +1278,10 @@ def play_video(self, video):
12791278
event_len = video.events_len
12801279
comments = []
12811280
for event_id in range(event_len):
1282-
time = video.events_time(event_id)
1281+
t = video.events_time(event_id)
12831282
comment = video.events_comments(event_id)
12841283
if comment:
1285-
comments.append((time, [i.split(': ') for i in comment.split(';')[:-1]]))
1284+
comments.append((t, [i.split(': ') for i in comment.split(';')[:-1]]))
12861285
# 调整窗口
12871286
if (video.row, video.column) != (self.row, self.column):
12881287
self.setBoard(video.row, video.column, video.mine_num)
@@ -1403,6 +1402,8 @@ def set_face(self, face_type):
14031402

14041403
def hidden_score_board(self):
14051404
# 按/隐藏计数器,再按显示
1405+
if self.game_state == 'study':
1406+
return
14061407
if self.score_board_manager.ui.QWidget.isVisible():
14071408
self.score_board_manager.invisible()
14081409
else:
@@ -1415,13 +1416,13 @@ def limit_cursor(self):
14151416
widget_size = self.label.size()
14161417
# 计算限制区域
14171418
rect = QRect(widget_pos, widget_size)
1418-
self.clip_mouse(rect)
1419+
self._clip_mouse(rect)
14191420

14201421
# 取消将鼠标区域限制在游戏界面中
14211422
def unlimit_cursor(self):
14221423
ctypes.windll.user32.ClipCursor(None)
14231424

1424-
def clip_mouse(self, rect):
1425+
def _clip_mouse(self, rect):
14251426
# 定义RECT结构体
14261427
class RECT(ctypes.Structure):
14271428
_fields_ = [("left", ctypes.c_long),

src/superGUI.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,11 @@ def trans_language(self, language = ""):
285285
self.trans.load(str(self.r_path.with_name(language + '.qm')))
286286
app.installTranslator(self.trans)
287287
self.retranslateUi(self.mainWindow)
288+
self.score_board_manager.ui.retranslateUi(self.score_board_manager.ui.QWidget)
288289
else:
289290
app.removeTranslator(self.trans)
290291
self.retranslateUi(self.mainWindow)
292+
self.score_board_manager.ui.retranslateUi(self.score_board_manager.ui.QWidget)
291293
mm.updata_ini(self.game_setting_path, [("DEFAULT", "language", language)])
292294
self.language = language
293295

0 commit comments

Comments
 (0)