Skip to content

Commit efaab4a

Browse files
committed
翻译、子窗口的坐标可以保存
1 parent 871ba3a commit efaab4a

24 files changed

+385
-853
lines changed

src/gameScoreBoard.py

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# 左侧计时器
2-
import configparser
32
import minesweeper_master as mm
43
from ui.ui_score_board import Ui_Form
54
from ui.uiComponents import RoundQWidget
@@ -90,10 +89,6 @@ def __init__(self, r_path, score_board_setting, game_setting, pix_size, parent):
9089
self.initialized = False
9190
self.game_setting = game_setting
9291
self.score_board_setting = score_board_setting
93-
# self.score_board_setting.beginGroup('DEFAULT')
94-
# _score_board_items = self.score_board_setting.allKeys()
95-
# config_score_board = configparser.ConfigParser()
96-
# if not _score_board_items:
9792
default_config = [
9893
("游戏模式", "mode"),
9994
("RTime", "f'{time:.3f}'"),
@@ -126,6 +121,8 @@ def __init__(self, r_path, score_board_setting, game_setting, pix_size, parent):
126121
self.ui.QWidget.closeEvent_.connect(self.close)
127122
QShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Return), self.ui.QWidget).\
128123
activated.connect(self.__table_ok)
124+
self.ui.QWidget.move(game_setting.value("DEFAULT/scoreboardtop", 100, int),
125+
game_setting.value("DEFAULT/scoreboardleft", 200, int))
129126
self.editing_row = -1 # -1不在编辑状态,-2不能编辑(正在游戏)
130127
self.editing_column = -1
131128

@@ -160,7 +157,7 @@ def reset(self):
160157
...
161158

162159
def cal_index_value(self, ms_board, index_type):
163-
# 原地修改指标数值
160+
# 原地修改指标数值
164161
self.update_namespace(ms_board, index_type)
165162
index_value = []
166163
# for (idx, (_, expression), _type) in enumerate(zip(self.score_board_items, self.score_board_items_type)):
@@ -338,22 +335,9 @@ def __add_blank_line(self):
338335
def close(self):
339336
self.score_board_setting.set_section("DEFAULT", self.score_board_items)
340337
self.score_board_setting.sync()
341-
# config = configparser.ConfigParser()
342-
# config["DEFAULT"] = dict(filter(lambda x: x[0], self.score_board_items))
343-
# config.write(open(self.score_board_path, "w"))
344-
# conf = configparser.ConfigParser()
345-
# conf.read(self.game_setting_path, encoding='utf-8')
346-
# conf.set("DEFAULT", "scoreBoardTop", str(self.ui.QWidget.x()))
347-
# conf.set("DEFAULT", "scoreBoardLeft", str(self.ui.QWidget.y()))
348-
# conf.write(open(self.game_setting_path, "w", encoding='utf-8'))
349-
# self.ui.QWidget.close()
350-
351-
352-
353-
354-
355-
356-
338+
self.game_setting.set_value("DEFAULT/scoreboardtop", self.ui.QWidget.x())
339+
self.game_setting.set_value("DEFAULT/scoreboardleft", self.ui.QWidget.y())
340+
self.game_setting.sync()
357341

358342

359343

src/mineSweeperGUI.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,8 @@ def play_video(self, video):
13951395

13961396
self.timer_video = QTimer()
13971397
self.timer_video.timeout.connect(self.video_playing_step)
1398-
self.ui_video_control = videoControl.ui_Form(self.r_path, video, comments, self.mainWindow)
1398+
self.ui_video_control = videoControl.ui_Form(self.r_path, video, comments,
1399+
self.game_setting, self.mainWindow)
13991400
# self.mainWindow.closeEvent_.connect(self.ui_video_control.QWidget.close)
14001401
self.ui_video_control.pushButton_play.clicked.connect(self.video_play)
14011402
self.ui_video_control.pushButton_replay.clicked.connect(self.video_replay)

src/superGUI.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,8 +454,8 @@ def read_or_create_game_setting(self):
454454
'''
455455
transparency = self.game_setting.get_or_set_value('DEFAULT/transparency', 100, int)
456456
self.mainWindow.setWindowOpacity(transparency / 100)
457-
mainWinTop = self.game_setting.get_or_set_value("DEFAULT/mainWinTop", 100, int)
458-
mainWinLeft = self.game_setting.get_or_set_value("DEFAULT/mainWinLeft", 200, int)
457+
mainWinTop = self.game_setting.get_or_set_value("DEFAULT/mainwintop", 100, int)
458+
mainWinLeft = self.game_setting.get_or_set_value("DEFAULT/mainwinleft", 200, int)
459459
self.mainWindow.move(mainWinTop, mainWinLeft)
460460
self.row = self.game_setting.get_or_set_value("DEFAULT/row", 16, int)
461461
self.column = self.game_setting.get_or_set_value("DEFAULT/column", 30, int)

0 commit comments

Comments
 (0)