From 9d599f49dc7bc38e9f3204844a656d3a4b0cb44c Mon Sep 17 00:00:00 2001
From: abc15379 <1938729173@qq.com>
Date: Sun, 15 Oct 2023 21:29:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/.idea/dbnavigator.xml | 525 ++++++++++++++++++
.../operateselect_window.cpython-311.pyc | Bin 962 -> 4066 bytes
.../selectRuleOrder.cpython-311.pyc | Bin 3025 -> 3017 bytes
.../settingrule_window.cpython-311.pyc | Bin 1979 -> 5434 bytes
.../control/contrltools/setShotArea.py | 76 +++
.../control/database/databaseconnact.py | 23 +
src/windows/main_window.py | 32 +-
src/windows/operateselect_window.py | 44 +-
...˜Žæ—¥æ–¹èˆŸè‡ªåŠ¨æ¸…体力.cpython-311.pyc | Bin 13609 -> 14447 bytes
.../res/rules/明日方舟自动清体力.py | 36 +-
src/windows/res/tools/test.py | 7 -
src/windows/res/tools/translate.py | 47 ++
src/windows/res/ui/main_window.ui | 14 +-
src/windows/res/ui/operationSelect_window.ui | 332 ++++++-----
src/windows/res/ui/setRule_window.ui | 34 +-
src/windows/selectRuleOrder.py | 3 +-
src/windows/settingrule_window.py | 56 +-
17 files changed, 1013 insertions(+), 216 deletions(-)
create mode 100644 src/.idea/dbnavigator.xml
create mode 100644 src/windows/control/contrltools/setShotArea.py
create mode 100644 src/windows/control/database/databaseconnact.py
delete mode 100644 src/windows/res/tools/test.py
create mode 100644 src/windows/res/tools/translate.py
diff --git a/src/.idea/dbnavigator.xml b/src/.idea/dbnavigator.xml
new file mode 100644
index 0000000..7391c15
--- /dev/null
+++ b/src/.idea/dbnavigator.xml
@@ -0,0 +1,525 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/windows/__pycache__/operateselect_window.cpython-311.pyc b/src/windows/__pycache__/operateselect_window.cpython-311.pyc
index d94f42b686d18b80b73aeecf6d4cdb787a06c387..3b1284fca75518dd26d8b1c0280f37455e9890c2 100644
GIT binary patch
literal 4066
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
QF+utxNc0O9sUnaQ0Q~zae*gdg
delta 180
zcmX>peo>rvIWI340}yPzp_Cf8k=Kodkz;cROB^Gk$mY$gT12K%#-+0}K1)
z*X$0A4;JfiFfp=E*5$J0=VUedzyK#CCRcLh^5_CpmuKds+XYng
ZflZlF^aBGXF+utxNc0O9sUm5hxd6~dF8u%i
diff --git a/src/windows/__pycache__/settingrule_window.cpython-311.pyc b/src/windows/__pycache__/settingrule_window.cpython-311.pyc
index be28162b5d8875c5ae23a1ff04b84020925203cb..f8503b33c122605bff8b571470c1b07443795d5d 100644
GIT binary patch
literal 5434
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
delta 661
zcmaD~uriBxIWI340}vd&p_Hn;k#~~-h2
zVPf$C$g#X@>v6?4>IR4Mg1{BbKxsQ&ptPOt4FeOPw4Lc>7V&6%VFqq73e4C%U0j@<
zapC0ka%UM=O|F$c!?<~}m%?|(J(Hajk1-yd%&D}S@!aI2N}Y_eH~TB^WoNuInOFNX
zfqljj;3
zOqOKho$M>eIeCYqz~o#uewa944MP?SC_q7A0qbOYV@*bu$(hC)npFaNdioGlo|%`D
zUtX-qc8e*$_!et&MoMPUEw=R3lH~G~BHKwOBJxbPSc+3~(ryVRmlhSJ=9R<)Riq}D
z4Cut
0
0
- 352
- 803
+ 350
+ 809
@@ -114,7 +114,7 @@
è¯è¨€é€‰æ‹©ï¼š
-
+
50
@@ -123,11 +123,19 @@
25
+
+ æ—¥è¯
+
-
æ—¥è¯
+ -
+
+ 法è¯
+
+
-
英è¯
diff --git a/src/windows/res/ui/operationSelect_window.ui b/src/windows/res/ui/operationSelect_window.ui
index 931bd74..2ff8df1 100644
--- a/src/windows/res/ui/operationSelect_window.ui
+++ b/src/windows/res/ui/operationSelect_window.ui
@@ -6,212 +6,210 @@
0
0
- 693
- 431
+ 663
+ 465
Form
-
+
0
0
- 691
- 341
+ 671
+ 471
-
+
- 0
- 0
- 101
- 101
+ 10
+ 10
+ 641
+ 321
-
-
-
-
-
- -
-
-
- 点击æ“作
-
+
+
-
+
+
+
-
+
+
+ <html><head/><body><p><br/></p></body></html>
+
+
+ <html><head/><body><p>12</p></body></html>
+
+
+
+ -
+
+
+ 点击æ“作
+
+
+ Qt::AutoText
+
+
+ Qt::AlignCenter
+
+
+
+
-
-
-
-
-
- 130
- 0
- 101
- 101
-
-
-
- -
-
-
- -
-
-
- 长按æ“作
-
+
-
+
+
+
-
+
+
+ -
+
+
+ 长按æ“作
+
+
+ Qt::AlignCenter
+
+
+
+
-
-
-
-
-
- 260
- 0
- 101
- 101
-
-
-
- -
-
-
- -
-
-
- 左划æ“作
-
+
-
+
+
+
-
+
+
+ -
+
+
+ 左滑æ“作
+
+
+ Qt::AlignCenter
+
+
+
+
-
-
-
-
-
- 390
- 0
- 101
- 101
-
-
-
- -
-
-
- -
-
-
- å³åˆ’æ“作
-
+
-
+
+
+
-
+
+
+ -
+
+
+ å³æ»‘æ“作
+
+
+ Qt::AlignCenter
+
+
+
+
-
-
-
-
-
- 520
- 0
- 101
- 101
-
-
-
- -
-
-
- -
-
-
- 键盘点击æ“作
-
+
-
+
+
+
-
+
+
+ -
+
+
+ ä¼‘çœ æ“作
+
+
+ Qt::AlignCenter
+
+
+
+
-
-
-
-
-
- 0
- 130
- 101
- 101
-
-
-
- -
-
-
- -
-
-
- ä¼‘çœ æ“作
-
+
-
+
+
+
-
+
+
+ -
+
+
+ 上滑æ“作
+
+
+ Qt::AlignCenter
+
+
+
+
-
-
-
-
-
- 130
- 130
- 101
- 101
-
-
-
- -
-
+
-
+
+
+
-
+
+
+ -
+
+
+ 键盘点击æ“作
+
+
+ Qt::AlignCenter
+
+
+
+
+
- -
-
-
- 上划æ“作
-
+
-
+
+
+
-
+
+
+ -
+
+
+ 下滑æ“作
+
+
+ Qt::AlignCenter
+
+
+
+
-
+
270
- 130
- 101
- 101
+ 370
+ 119
+ 71
-
- -
-
-
- -
-
-
- 下划æ“作
-
-
-
-
+
+ 确认
+
-
-
-
- 300
- 350
- 91
- 71
-
-
-
- 确认
-
-
diff --git a/src/windows/res/ui/setRule_window.ui b/src/windows/res/ui/setRule_window.ui
index 506ee5e..f286870 100644
--- a/src/windows/res/ui/setRule_window.ui
+++ b/src/windows/res/ui/setRule_window.ui
@@ -44,11 +44,11 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">图片地å€</p></body></html>
+</style></head><body style=" font-family:'SimSun'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">图片地å€</span></p></body></html>
-
+
220
@@ -100,7 +100,7 @@ p, li { white-space: pre-wrap; }
æ“作åæ ‡ï¼š
-
+
220
@@ -126,8 +126,8 @@ p, li { white-space: pre-wrap; }
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">0</p></body></html>
+</style></head><body style=" font-family:'SimSun'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">0</span></p></body></html>
@@ -169,8 +169,8 @@ p, li { white-space: pre-wrap; }
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">0</p></body></html>
+</style></head><body style=" font-family:'SimSun'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">0</span></p></body></html>
@@ -245,11 +245,11 @@ p, li { white-space: pre-wrap; }
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">图片地å€</p></body></html>
+</style></head><body style=" font-family:'SimSun'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">图片地å€</span></p></body></html>
-
+
220
@@ -275,12 +275,12 @@ p, li { white-space: pre-wrap; }
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">图片地å€</p></body></html>
+</style></head><body style=" font-family:'SimSun'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">图片地å€</span></p></body></html>
-
+
230
@@ -293,7 +293,7 @@ p, li { white-space: pre-wrap; }
next
-
+
160
@@ -306,7 +306,7 @@ p, li { white-space: pre-wrap; }
previous
-
+
160
@@ -319,7 +319,7 @@ p, li { white-space: pre-wrap; }
ä¿å˜
-
+
30
diff --git a/src/windows/selectRuleOrder.py b/src/windows/selectRuleOrder.py
index 109fc51..a97d0df 100644
--- a/src/windows/selectRuleOrder.py
+++ b/src/windows/selectRuleOrder.py
@@ -1,7 +1,8 @@
import os
from PyQt5.QtWidgets import QMainWindow, QListWidget, QPushButton
from PyQt5 import uic
-from windows.res.rules.明日方舟自动清体力 import WorkerThread
+
+from res.rules.明日方舟自动清体力 import WorkerThread
class orderselet(QMainWindow):
diff --git a/src/windows/settingrule_window.py b/src/windows/settingrule_window.py
index 1aa9c49..4e81493 100644
--- a/src/windows/settingrule_window.py
+++ b/src/windows/settingrule_window.py
@@ -1,5 +1,8 @@
-from PyQt5.QtWidgets import QMainWindow, QComboBox
+import os
+
+from PyQt5.QtWidgets import QMainWindow, QComboBox, QPushButton, QTextEdit
from PyQt5 import uic
+import shutil
from operateselect_window import operateselect
@@ -10,9 +13,21 @@ class settingrule(QMainWindow):
uic.loadUi('res/ui/setRule_window.ui', self)
- self.operateChoseBox = self.findChild(QComboBox, 'operateChose')
+ # 图片地å€
+
+ self.operateChoseBox = self.findChild(QComboBox, 'operateChose') # æ“作选择
+ self.cancelBtn = self.findChild(QPushButton, 'cancelBtn')#å–消选择按钮
+ self.preserveBtn = self.findChild(QPushButton, 'preserveBtn') # ä¿å˜é€‰æ‹©æŒ‰é’®
+ self.uploadBtn = self.findChild(QPushButton, 'uploadBtn') # "ä¸Šä¼ "按钮
+ self.uploadBtn_2 = self.findChild(QPushButton, 'uploadBtn_2')
+ self.uploadBtn_3 = self.findChild(QPushButton, 'uploadBtn_3')
self.operateChoseBox.activated.connect(self.handleComboBoxActivated)
+ self.cancelBtn.clicked.connect(self.cancel_clicked)
+ self.preserveBtn.clicked.connect(self.preserve_clicked)
+ self.uploadBtn.clicked.connect(self.write_image_to_folder)
+ self.uploadBtn_2.clicked.connect(self.write_image_to_folder_2)
+ self.uploadBtn_3.clicked.connect(self.write_image_to_folder_3)
self.operateselect_window = operateselect()
@@ -24,3 +39,40 @@ class settingrule(QMainWindow):
def createæ–°ç•Œé¢(self):
# 显示新界é¢
self.operateselect_window.show()
+
+ def cancel_clicked(self):
+ self.close()
+
+ def preserve_clicked(self):
+ self.close()
+
+ def write_image_to_folder(self): # å°†å›¾ç‰‡å†™å…¥ç›®æ ‡æ–‡ä»¶
+ text_edit = self.findChild(QTextEdit, "textEdit")
+ self.image_path = text_edit.toPlainText()
+ print(self.image_path)
+ destination_path = "D:/代ç /pythoncode/src/windows/res/pictures"
+ if not os.path.exists(self.image_path):
+ print("image address is not existing!")
+ return
+ shutil.copy(self.image_path, destination_path)
+
+ def write_image_to_folder_2(self): # å°†å›¾ç‰‡å†™å…¥ç›®æ ‡æ–‡ä»¶
+ text_edit = self.findChild(QTextEdit, "textEdit_2")
+ self.image_path = text_edit.toPlainText()
+ print(self.image_path)
+ destination_path = "D:/代ç /pythoncode/src/windows/res/pictures"
+ if not os.path.exists(self.image_path):
+ print("image address is not existing!")
+ return
+ shutil.copy(self.image_path, destination_path)
+
+ def write_image_to_folder_3(self): # å°†å›¾ç‰‡å†™å…¥ç›®æ ‡æ–‡ä»¶
+ text_edit = self.findChild(QTextEdit, "textEdit_3")
+ self.image_path = text_edit.toPlainText()
+ print(self.image_path)
+ destination_path = "D:/代ç /pythoncode/src/windows/res/pictures"
+ if not os.path.exists(self.image_path):
+ print("image address is not existing!")
+ return
+ shutil.copy(self.image_path, destination_path)
+