Skip to content

Commit

Permalink
Fix: 修复了初次运行时选择翻译源显示不正确的bug以及可以绕过4个翻译源限制导致溢出的bug
Browse files Browse the repository at this point in the history
  • Loading branch information
CberYellowstone committed Jun 14, 2023
1 parent 41428f6 commit a3da1af
Show file tree
Hide file tree
Showing 6 changed files with 111 additions and 106 deletions.
13 changes: 9 additions & 4 deletions GUI.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,10 @@ def replaceWithCurrentConfig(self):
self.ListWidget_SelectedSource.clear()
self.Label_ShortcutKeyText.setText(self.parent.Hotkey_OCR)
configDict = readConfig()
[self.LineEditMapping[each].setText(configDict[each]) for each in self.LineEditMapping]
[self.FreeRiderMapping[each].setChecked(configDict[each]) for each in self.FreeRiderMapping]
for each in self.LineEditMapping:
self.LineEditMapping[each].setText(configDict[each])
for each in self.FreeRiderMapping:
self.FreeRiderMapping[each].setChecked(configDict[each])
for eachTranslator in [each for each in TranslatorMapping if each not in configDict['SELECTED_TRANSLATORS']]:
self.ListWidget_SelectableSource.addItem(eachTranslator)
for each in configDict['SELECTED_TRANSLATORS']:
Expand Down Expand Up @@ -173,8 +175,10 @@ def getCurrentSelectedTranslator(self):
def checkSelectedTranslatorCount(self):
if self.ListWidget_SelectedSource.count() >= 4:
self.PushButton_SourceEnable.setEnabled(False)
self.ListWidget_SelectableSource.setEnabled(False)
else:
self.PushButton_SourceEnable.setEnabled(True)
self.ListWidget_SelectableSource.setEnabled(True)

def getIntoHotKeyChangeMode(self):
print('请摁下快捷键!')
Expand Down Expand Up @@ -455,11 +459,12 @@ def updateTranslatorList(self, _list:list):

for n, eachTranslator in enumerate(self.TranslatorList):
self.resultTextEditList[n].setPlaceholderText(eachTranslator)

_len = _list.__len__()
if _len < 4:
if _len == 0: _len = 1

for each in self.resultTextEditList[:_len]:
each.setVisible(True)
for each in self.resultTextEditList[_len-4:]:
each.setVisible(False)

Expand Down
48 changes: 24 additions & 24 deletions OCR_style.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Form implementation generated from reading ui file '.\OCR_style.ui'
#
# Created by: PyQt6 UI code generator 6.3.0
# Created by: PyQt6 UI code generator 6.5.1
#
# WARNING: Any manual changes made to this file will be lost when pyuic6 is
# run again. Do not edit this file unless you know what you are doing.
Expand All @@ -20,9 +20,9 @@ def setupUi(self, OCR_Window):
OCR_Window.setFont(font)
OCR_Window.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.DefaultContextMenu)
OCR_Window.setAnimated(True)
self.centralwidget = QtWidgets.QWidget(OCR_Window)
self.centralwidget = QtWidgets.QWidget(parent=OCR_Window)
self.centralwidget.setObjectName("centralwidget")
self.OCRResultTextEdit = betterSelectionQPlainTextEdit(self.centralwidget)
self.OCRResultTextEdit = betterSelectionQPlainTextEdit(parent=self.centralwidget)
self.OCRResultTextEdit.setGeometry(QtCore.QRect(30, 60, 721, 71))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
Expand All @@ -32,7 +32,7 @@ def setupUi(self, OCR_Window):
self.OCRResultTextEdit.viewport().setProperty("cursor", QtGui.QCursor(QtCore.Qt.CursorShape.IBeamCursor))
self.OCRResultTextEdit.setPlainText("")
self.OCRResultTextEdit.setObjectName("OCRResultTextEdit")
self.TransResult_0 = QtWidgets.QPlainTextEdit(self.centralwidget)
self.TransResult_0 = QtWidgets.QPlainTextEdit(parent=self.centralwidget)
self.TransResult_0.setGeometry(QtCore.QRect(30, 190, 721, 71))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
Expand All @@ -42,15 +42,15 @@ def setupUi(self, OCR_Window):
self.TransResult_0.setAutoFillBackground(False)
self.TransResult_0.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.TextSelectableByKeyboard|QtCore.Qt.TextInteractionFlag.TextSelectableByMouse)
self.TransResult_0.setObjectName("TransResult_0")
self.TransResult_1 = QtWidgets.QPlainTextEdit(self.centralwidget)
self.TransResult_1 = QtWidgets.QPlainTextEdit(parent=self.centralwidget)
self.TransResult_1.setGeometry(QtCore.QRect(30, 270, 721, 71))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
font.setPointSize(18)
self.TransResult_1.setFont(font)
self.TransResult_1.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.TextSelectableByKeyboard|QtCore.Qt.TextInteractionFlag.TextSelectableByMouse)
self.TransResult_1.setObjectName("TransResult_1")
self.ChooseAreaButton = QtWidgets.QPushButton(self.centralwidget)
self.ChooseAreaButton = QtWidgets.QPushButton(parent=self.centralwidget)
self.ChooseAreaButton.setGeometry(QtCore.QRect(530, 20, 111, 31))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
Expand All @@ -61,15 +61,15 @@ def setupUi(self, OCR_Window):
self.ChooseAreaButton.setWhatsThis("")
self.ChooseAreaButton.setAccessibleDescription("")
self.ChooseAreaButton.setObjectName("ChooseAreaButton")
self.ChosenTitleTitle = QtWidgets.QLabel(self.centralwidget)
self.ChosenTitleTitle = QtWidgets.QLabel(parent=self.centralwidget)
self.ChosenTitleTitle.setGeometry(QtCore.QRect(700, 10, 81, 20))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
font.setPointSize(10)
self.ChosenTitleTitle.setFont(font)
self.ChosenTitleTitle.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
self.ChosenTitleTitle.setObjectName("ChosenTitleTitle")
self.PosText = QtWidgets.QLabel(self.centralwidget)
self.PosText = QtWidgets.QLabel(parent=self.centralwidget)
self.PosText.setGeometry(QtCore.QRect(650, 30, 181, 20))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei")
Expand All @@ -78,15 +78,15 @@ def setupUi(self, OCR_Window):
self.PosText.setFont(font)
self.PosText.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
self.PosText.setObjectName("PosText")
self.OCRButton = QtWidgets.QPushButton(self.centralwidget)
self.OCRButton = QtWidgets.QPushButton(parent=self.centralwidget)
self.OCRButton.setGeometry(QtCore.QRect(30, 20, 111, 31))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
font.setPointSize(14)
self.OCRButton.setFont(font)
self.OCRButton.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
self.OCRButton.setObjectName("OCRButton")
self.splitTextEdit = betterSelectionQPlainTextEdit(self.centralwidget)
self.splitTextEdit = betterSelectionQPlainTextEdit(parent=self.centralwidget)
self.splitTextEdit.setGeometry(QtCore.QRect(30, 130, 721, 41))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
Expand All @@ -95,7 +95,7 @@ def setupUi(self, OCR_Window):
self.splitTextEdit.setFont(font)
self.splitTextEdit.viewport().setProperty("cursor", QtGui.QCursor(QtCore.Qt.CursorShape.IBeamCursor))
self.splitTextEdit.setObjectName("splitTextEdit")
self.SplitChooseBox = QtWidgets.QComboBox(self.centralwidget)
self.SplitChooseBox = QtWidgets.QComboBox(parent=self.centralwidget)
self.SplitChooseBox.setGeometry(QtCore.QRect(760, 150, 91, 21))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
Expand All @@ -105,23 +105,23 @@ def setupUi(self, OCR_Window):
self.SplitChooseBox.addItem("")
self.SplitChooseBox.addItem("")
self.SplitChooseBox.addItem("")
self.SplitChooseTitle = QtWidgets.QLabel(self.centralwidget)
self.SplitChooseTitle = QtWidgets.QLabel(parent=self.centralwidget)
self.SplitChooseTitle.setGeometry(QtCore.QRect(770, 130, 71, 16))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
font.setPointSize(10)
self.SplitChooseTitle.setFont(font)
self.SplitChooseTitle.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
self.SplitChooseTitle.setObjectName("SplitChooseTitle")
self.ShortcutKeyTitle = QtWidgets.QLabel(self.centralwidget)
self.ShortcutKeyTitle = QtWidgets.QLabel(parent=self.centralwidget)
self.ShortcutKeyTitle.setGeometry(QtCore.QRect(280, 10, 151, 20))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
font.setPointSize(11)
self.ShortcutKeyTitle.setFont(font)
self.ShortcutKeyTitle.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
self.ShortcutKeyTitle.setObjectName("ShortcutKeyTitle")
self.ShortcutKeyText = QtWidgets.QLabel(self.centralwidget)
self.ShortcutKeyText = QtWidgets.QLabel(parent=self.centralwidget)
self.ShortcutKeyText.setGeometry(QtCore.QRect(290, 30, 131, 20))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
Expand All @@ -130,47 +130,47 @@ def setupUi(self, OCR_Window):
self.ShortcutKeyText.setFont(font)
self.ShortcutKeyText.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
self.ShortcutKeyText.setObjectName("ShortcutKeyText")
self.TransResult_2 = QtWidgets.QPlainTextEdit(self.centralwidget)
self.TransResult_2 = QtWidgets.QPlainTextEdit(parent=self.centralwidget)
self.TransResult_2.setGeometry(QtCore.QRect(30, 350, 721, 71))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
font.setPointSize(18)
self.TransResult_2.setFont(font)
self.TransResult_2.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.TextSelectableByKeyboard|QtCore.Qt.TextInteractionFlag.TextSelectableByMouse)
self.TransResult_2.setObjectName("TransResult_2")
self.TransResult_3 = QtWidgets.QPlainTextEdit(self.centralwidget)
self.TransResult_3 = QtWidgets.QPlainTextEdit(parent=self.centralwidget)
self.TransResult_3.setGeometry(QtCore.QRect(30, 430, 721, 71))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
font.setPointSize(18)
self.TransResult_3.setFont(font)
self.TransResult_3.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.TextSelectableByKeyboard|QtCore.Qt.TextInteractionFlag.TextSelectableByMouse)
self.TransResult_3.setObjectName("TransResult_3")
self.OCRButtonPlus = QtWidgets.QPushButton(self.centralwidget)
self.OCRButtonPlus = QtWidgets.QPushButton(parent=self.centralwidget)
self.OCRButtonPlus.setGeometry(QtCore.QRect(150, 20, 111, 31))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
font.setPointSize(14)
self.OCRButtonPlus.setFont(font)
self.OCRButtonPlus.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
self.OCRButtonPlus.setObjectName("OCRButtonPlus")
self.showDictWindowButton = QtWidgets.QPushButton(self.centralwidget)
self.showDictWindowButton = QtWidgets.QPushButton(parent=self.centralwidget)
self.showDictWindowButton.setGeometry(QtCore.QRect(760, 60, 91, 31))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
font.setPointSize(11)
self.showDictWindowButton.setFont(font)
self.showDictWindowButton.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
self.showDictWindowButton.setObjectName("showDictWindowButton")
self.autoDictCheckBox = QtWidgets.QCheckBox(self.centralwidget)
self.autoDictCheckBox = QtWidgets.QCheckBox(parent=self.centralwidget)
self.autoDictCheckBox.setGeometry(QtCore.QRect(760, 90, 91, 21))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
font.setPointSize(10)
self.autoDictCheckBox.setFont(font)
self.autoDictCheckBox.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
self.autoDictCheckBox.setObjectName("autoDictCheckBox")
self.autoTransCheckBox = QtWidgets.QCheckBox(self.centralwidget)
self.autoTransCheckBox = QtWidgets.QCheckBox(parent=self.centralwidget)
self.autoTransCheckBox.setGeometry(QtCore.QRect(760, 220, 91, 21))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
Expand All @@ -179,26 +179,26 @@ def setupUi(self, OCR_Window):
self.autoTransCheckBox.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
self.autoTransCheckBox.setChecked(True)
self.autoTransCheckBox.setObjectName("autoTransCheckBox")
self.doTransButton = QtWidgets.QPushButton(self.centralwidget)
self.doTransButton = QtWidgets.QPushButton(parent=self.centralwidget)
self.doTransButton.setGeometry(QtCore.QRect(760, 190, 91, 31))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
font.setPointSize(11)
self.doTransButton.setFont(font)
self.doTransButton.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
self.doTransButton.setObjectName("doTransButton")
self.changeHotKeyButton = QtWidgets.QPushButton(self.centralwidget)
self.changeHotKeyButton = QtWidgets.QPushButton(parent=self.centralwidget)
self.changeHotKeyButton.setGeometry(QtCore.QRect(421, 30, 21, 21))
self.changeHotKeyButton.setObjectName("changeHotKeyButton")
self.doTransButton_2 = QtWidgets.QPushButton(self.centralwidget)
self.doTransButton_2 = QtWidgets.QPushButton(parent=self.centralwidget)
self.doTransButton_2.setGeometry(QtCore.QRect(760, 270, 91, 31))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
font.setPointSize(11)
self.doTransButton_2.setFont(font)
self.doTransButton_2.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
self.doTransButton_2.setObjectName("doTransButton_2")
self.replaceListWidget = QtWidgets.QListWidget(self.centralwidget)
self.replaceListWidget = QtWidgets.QListWidget(parent=self.centralwidget)
self.replaceListWidget.setGeometry(QtCore.QRect(720, 60, 30, 70))
font = QtGui.QFont()
font.setFamily("Microsoft YaHei UI")
Expand Down
Loading

0 comments on commit a3da1af

Please sign in to comment.