Skip to content

Commit

Permalink
Fix: 配置文件目录设置无效 (#37)
Browse files Browse the repository at this point in the history
  • Loading branch information
sqzw-x committed Jan 8, 2024
1 parent 39b6011 commit 0450c37
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/controllers/main_window/load_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,7 @@ def load_config(self):
# endregion

# region other
self.Ui.lineEdit_config_folder.setText(convert_path(config.folder)) # 配置文件目录
rest_count = int(config.rest_count) # 间歇刮削文件数量
if rest_count == 0:
rest_count = 1
Expand Down
4 changes: 2 additions & 2 deletions src/models/config/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import os
import sys
import traceback
import zhconv

import zhconv
from PyQt5.QtGui import QFontDatabase
from lxml import etree

Expand Down Expand Up @@ -137,7 +137,7 @@ def _get_path(self):
signal.show_traceback_log(self._resources_base_path)
signal.show_traceback_log(traceback.format_exc())
print(self._resources_base_path, traceback.format_exc())
self._userdata_base_path = os.path.join(get_main_path(), 'userdata')
self._userdata_base_path = os.path.join(config.folder, 'userdata')

def _resource_path(self, relative_path):
if os.path.exists(os.path.join(self._resources_base_path, relative_path)):
Expand Down
2 changes: 1 addition & 1 deletion src/views/MDCx.py
Original file line number Diff line number Diff line change
Expand Up @@ -11907,7 +11907,7 @@ def retranslateUi(self, MDCx):
self.pushButton_select_config_folder.setText(_translate("MDCx", "选择目录"))
self.checkBox_remain_task.setText(_translate("MDCx", "记住未完成的刮削任务,即使退出或中止,下次仍可继续刮削未完成任务"))
self.label_279.setText(_translate("MDCx", "保留任务:"))
self.label_40.setText(_translate("MDCx", "将读取该目录中的配置文件、映射表、水印图片、演员头像等数据"))
self.label_40.setText(_translate("MDCx", "将读取该目录中的配置文件、映射表、水印图片、演员头像等数据,修改后重启程序方可生效"))
self.checkBox_dialog_qt.setText(_translate("MDCx", "使用 QT 选择对话框"))
self.label_421.setText(_translate("MDCx", "目录中的文件较多时,可以勾选此项以提高打开速度"))
self.label_314.setText(_translate("MDCx", "隐藏图标:"))
Expand Down
2 changes: 1 addition & 1 deletion src/views/MDCx.ui
Original file line number Diff line number Diff line change
Expand Up @@ -23911,7 +23911,7 @@ font-weight:bold</string>
<string notr="true">color: rgb(8, 128, 128);</string>
</property>
<property name="text">
<string>将读取该目录中的配置文件、映射表、水印图片、演员头像等数据</string>
<string>将读取该目录中的配置文件、映射表、水印图片、演员头像等数据,修改后重启程序方可生效</string>
</property>
</widget>
</item>
Expand Down

0 comments on commit 0450c37

Please sign in to comment.