Skip to content

Commit 4dfc615

Browse files
tonquertonquer
committed
update
1 parent 86a74ff commit 4dfc615

10 files changed

+1220
-190
lines changed

‎src/config/config.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
UpdateUrl3Api = "https://api.fastgit.xyz/repos/tonquer/JMComic-qt/releases"
4343
UpdateUrl3Back = "https://hub.fastgit.xyz/tonquer/JMComic-qt"
4444

45-
UpdateVersion = "v1.1.6"
46-
RealVersion = "v1.1.6"
47-
VersionTime = "2023-10-15"
45+
UpdateVersion = "v1.1.7"
46+
RealVersion = "v1.1.7"
47+
VersionTime = "2023-11-3"
4848

4949
Waifu2xVersion = "1.1.6"
5050
LoginUserName = ""

‎src/config/setting.py

+1
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ class Setting:
155155
IsReDownload = SettingValue("Other", 0, False)
156156
WebpToPng = SettingValue("Other", 0, False)
157157
IsPreUpdate = SettingValue("Other", 0, False)
158+
UerAgent = SettingValue("Other", "", False)
158159

159160
# IpbMemberId = SettingValue("Other", "", False)
160161
# IpbPassHash = SettingValue("Other", "", False)

‎src/interface/ui_login_proxy_widget.py

+29-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from PySide6.QtWidgets import (QApplication, QButtonGroup, QCheckBox, QCommandLinkButton,
1919
QFrame, QGridLayout, QHBoxLayout, QLabel,
2020
QLineEdit, QPushButton, QRadioButton, QSizePolicy,
21-
QVBoxLayout, QWidget)
21+
QSpacerItem, QVBoxLayout, QWidget)
2222

2323
from component.scroll_area.smooth_scroll_area import SmoothScrollArea
2424

@@ -36,7 +36,7 @@ def setupUi(self, LoginProxyWidget):
3636
self.scrollArea.setWidgetResizable(True)
3737
self.scrollAreaWidgetContents = QWidget()
3838
self.scrollAreaWidgetContents.setObjectName(u"scrollAreaWidgetContents")
39-
self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 521, 463))
39+
self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 504, 515))
4040
self.verticalLayout = QVBoxLayout(self.scrollAreaWidgetContents)
4141
self.verticalLayout.setObjectName(u"verticalLayout")
4242
self.horizontalLayout_11 = QHBoxLayout()
@@ -145,6 +145,31 @@ def setupUi(self, LoginProxyWidget):
145145

146146
self.verticalLayout.addWidget(self.loginProxy)
147147

148+
self.horizontalLayout_3 = QHBoxLayout()
149+
self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
150+
self.label_9 = QLabel(self.scrollAreaWidgetContents)
151+
self.label_9.setObjectName(u"label_9")
152+
self.label_9.setMinimumSize(QSize(90, 0))
153+
154+
self.horizontalLayout_3.addWidget(self.label_9)
155+
156+
self.uaRandom = QPushButton(self.scrollAreaWidgetContents)
157+
self.uaRandom.setObjectName(u"uaRandom")
158+
159+
self.horizontalLayout_3.addWidget(self.uaRandom)
160+
161+
self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
162+
163+
self.horizontalLayout_3.addItem(self.horizontalSpacer)
164+
165+
166+
self.verticalLayout.addLayout(self.horizontalLayout_3)
167+
168+
self.uaEdit = QLineEdit(self.scrollAreaWidgetContents)
169+
self.uaEdit.setObjectName(u"uaEdit")
170+
171+
self.verticalLayout.addWidget(self.uaEdit)
172+
148173
self.testSpeedButton = QPushButton(self.scrollAreaWidgetContents)
149174
self.testSpeedButton.setObjectName(u"testSpeedButton")
150175

@@ -376,6 +401,8 @@ def retranslateUi(self, LoginProxyWidget):
376401
self.proxy_3.setText(QCoreApplication.translate("LoginProxyWidget", u"\u4f7f\u7528\u7cfb\u7edf\u4ee3\u7406", None))
377402
self.httpsBox.setText(QCoreApplication.translate("LoginProxyWidget", u"\u542f\u7528Https\uff08\u5982\u679c\u51fa\u73b0\u8fde\u63a5\u88ab\u91cd\u7f6e\uff0c\u5efa\u8bae\u5173\u95ed\u8bd5\u8bd5\uff09", None))
378403
self.loginProxy.setText(QCoreApplication.translate("LoginProxyWidget", u"\u4f7f\u7528\u6ce8\u518c\u5206\u6d41\uff08\u65e0\u6cd5\u6ce8\u518c\u53ef\u5c1d\u8bd5\u5f00\u542f\uff09", None))
404+
self.label_9.setText(QCoreApplication.translate("LoginProxyWidget", u"UA\u8bbe\u7f6e:", None))
405+
self.uaRandom.setText(QCoreApplication.translate("LoginProxyWidget", u"\u968f\u673a\u751f\u6210", None))
379406
self.testSpeedButton.setText(QCoreApplication.translate("LoginProxyWidget", u"\u6d4b\u901f", None))
380407
#if QT_CONFIG(tooltip)
381408
self.radioButton_4.setToolTip(QCoreApplication.translate("LoginProxyWidget", u"\u6240\u4ee5\u5206\u6d41\u4e0d\u53ef\u4f7f\u7528\u65f6\uff0c\u81ea\u52a8\u89e3\u9501", None))

‎src/interface/ui_register_widget.py

+83-65
Original file line numberDiff line numberDiff line change
@@ -15,63 +15,52 @@
1515
QFont, QFontDatabase, QGradient, QIcon,
1616
QImage, QKeySequence, QLinearGradient, QPainter,
1717
QPalette, QPixmap, QRadialGradient, QTransform)
18-
from PySide6.QtWidgets import (QApplication, QButtonGroup, QGridLayout, QHBoxLayout,
19-
QLabel, QLineEdit, QRadioButton, QSizePolicy,
20-
QWidget)
18+
from PySide6.QtWidgets import (QApplication, QButtonGroup, QCommandLinkButton, QGridLayout,
19+
QHBoxLayout, QLabel, QLineEdit, QRadioButton,
20+
QSizePolicy, QWidget)
2121

2222
class Ui_RegisterWidget(object):
2323
def setupUi(self, RegisterWidget):
2424
if not RegisterWidget.objectName():
2525
RegisterWidget.setObjectName(u"RegisterWidget")
26-
RegisterWidget.resize(393, 216)
26+
RegisterWidget.resize(444, 376)
2727
self.gridLayout_2 = QGridLayout(RegisterWidget)
2828
self.gridLayout_2.setObjectName(u"gridLayout_2")
2929
self.gridLayout = QGridLayout()
3030
self.gridLayout.setObjectName(u"gridLayout")
31-
self.horizontalLayout_3 = QHBoxLayout()
32-
self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
33-
self.user = QLabel(RegisterWidget)
34-
self.user.setObjectName(u"user")
35-
self.user.setMinimumSize(QSize(80, 0))
36-
self.user.setMaximumSize(QSize(60, 16777215))
37-
self.user.setLayoutDirection(Qt.LeftToRight)
38-
self.user.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter)
39-
40-
self.horizontalLayout_3.addWidget(self.user)
41-
42-
self.userEdit = QLineEdit(RegisterWidget)
43-
self.userEdit.setObjectName(u"userEdit")
44-
self.userEdit.setMinimumSize(QSize(200, 0))
31+
self.horizontalLayout_2 = QHBoxLayout()
32+
self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
33+
self.verLabel = QLabel(RegisterWidget)
34+
self.verLabel.setObjectName(u"verLabel")
35+
self.verLabel.setMinimumSize(QSize(80, 0))
4536

46-
self.horizontalLayout_3.addWidget(self.userEdit)
37+
self.horizontalLayout_2.addWidget(self.verLabel)
4738

39+
self.verEdit = QLineEdit(RegisterWidget)
40+
self.verEdit.setObjectName(u"verEdit")
4841

49-
self.gridLayout.addLayout(self.horizontalLayout_3, 10, 1, 1, 1)
42+
self.horizontalLayout_2.addWidget(self.verEdit)
5043

51-
self.horizontalLayout = QHBoxLayout()
52-
self.horizontalLayout.setObjectName(u"horizontalLayout")
53-
self.name = QLabel(RegisterWidget)
54-
self.name.setObjectName(u"name")
55-
self.name.setMinimumSize(QSize(80, 0))
56-
self.name.setMaximumSize(QSize(60, 16777215))
57-
self.name.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter)
5844

59-
self.horizontalLayout.addWidget(self.name)
45+
self.gridLayout.addLayout(self.horizontalLayout_2, 16, 1, 1, 1)
6046

61-
self.nameEdit = QLineEdit(RegisterWidget)
62-
self.nameEdit.setObjectName(u"nameEdit")
47+
self.horizontalLayout_19 = QHBoxLayout()
48+
self.horizontalLayout_19.setObjectName(u"horizontalLayout_19")
49+
self.passwd = QLabel(RegisterWidget)
50+
self.passwd.setObjectName(u"passwd")
51+
self.passwd.setMinimumSize(QSize(80, 0))
52+
self.passwd.setMaximumSize(QSize(60, 16777215))
53+
self.passwd.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter)
6354

64-
self.horizontalLayout.addWidget(self.nameEdit)
55+
self.horizontalLayout_19.addWidget(self.passwd)
6556

57+
self.passwdEdit = QLineEdit(RegisterWidget)
58+
self.passwdEdit.setObjectName(u"passwdEdit")
6659

67-
self.gridLayout.addLayout(self.horizontalLayout, 11, 1, 1, 1)
60+
self.horizontalLayout_19.addWidget(self.passwdEdit)
6861

69-
self.verPicture = QLabel(RegisterWidget)
70-
self.verPicture.setObjectName(u"verPicture")
71-
self.verPicture.setMinimumSize(QSize(0, 0))
72-
self.verPicture.setMaximumSize(QSize(16777215, 100))
7362

74-
self.gridLayout.addWidget(self.verPicture, 13, 1, 1, 1, Qt.AlignHCenter)
63+
self.gridLayout.addLayout(self.horizontalLayout_19, 14, 1, 1, 1)
7564

7665
self.horizontalLayout_10 = QHBoxLayout()
7766
self.horizontalLayout_10.setObjectName(u"horizontalLayout_10")
@@ -91,41 +80,67 @@ def setupUi(self, RegisterWidget):
9180
self.horizontalLayout_10.addWidget(self.gender_Female)
9281

9382

94-
self.gridLayout.addLayout(self.horizontalLayout_10, 15, 1, 1, 1)
83+
self.gridLayout.addLayout(self.horizontalLayout_10, 17, 1, 1, 1)
9584

96-
self.horizontalLayout_19 = QHBoxLayout()
97-
self.horizontalLayout_19.setObjectName(u"horizontalLayout_19")
98-
self.passwd = QLabel(RegisterWidget)
99-
self.passwd.setObjectName(u"passwd")
100-
self.passwd.setMinimumSize(QSize(80, 0))
101-
self.passwd.setMaximumSize(QSize(60, 16777215))
102-
self.passwd.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter)
85+
self.label = QLabel(RegisterWidget)
86+
self.label.setObjectName(u"label")
10387

104-
self.horizontalLayout_19.addWidget(self.passwd)
88+
self.gridLayout.addWidget(self.label, 0, 1, 1, 1)
10589

106-
self.passwdEdit = QLineEdit(RegisterWidget)
107-
self.passwdEdit.setObjectName(u"passwdEdit")
90+
self.commandLinkButton = QCommandLinkButton(RegisterWidget)
91+
self.commandLinkButton.setObjectName(u"commandLinkButton")
10892

109-
self.horizontalLayout_19.addWidget(self.passwdEdit)
93+
self.gridLayout.addWidget(self.commandLinkButton, 1, 1, 1, 1)
11094

95+
self.horizontalLayout_3 = QHBoxLayout()
96+
self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
97+
self.user = QLabel(RegisterWidget)
98+
self.user.setObjectName(u"user")
99+
self.user.setMinimumSize(QSize(80, 0))
100+
self.user.setMaximumSize(QSize(60, 16777215))
101+
self.user.setLayoutDirection(Qt.LeftToRight)
102+
self.user.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter)
111103

112-
self.gridLayout.addLayout(self.horizontalLayout_19, 12, 1, 1, 1)
104+
self.horizontalLayout_3.addWidget(self.user)
113105

114-
self.horizontalLayout_2 = QHBoxLayout()
115-
self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
116-
self.verLabel = QLabel(RegisterWidget)
117-
self.verLabel.setObjectName(u"verLabel")
118-
self.verLabel.setMinimumSize(QSize(80, 0))
106+
self.userEdit = QLineEdit(RegisterWidget)
107+
self.userEdit.setObjectName(u"userEdit")
108+
self.userEdit.setMinimumSize(QSize(200, 0))
119109

120-
self.horizontalLayout_2.addWidget(self.verLabel)
110+
self.horizontalLayout_3.addWidget(self.userEdit)
121111

122-
self.verEdit = QLineEdit(RegisterWidget)
123-
self.verEdit.setObjectName(u"verEdit")
124112

125-
self.horizontalLayout_2.addWidget(self.verEdit)
113+
self.gridLayout.addLayout(self.horizontalLayout_3, 12, 1, 1, 1)
114+
115+
self.verPicture = QLabel(RegisterWidget)
116+
self.verPicture.setObjectName(u"verPicture")
117+
self.verPicture.setMinimumSize(QSize(0, 0))
118+
self.verPicture.setMaximumSize(QSize(16777215, 100))
126119

120+
self.gridLayout.addWidget(self.verPicture, 15, 1, 1, 1, Qt.AlignHCenter)
127121

128-
self.gridLayout.addLayout(self.horizontalLayout_2, 14, 1, 1, 1)
122+
self.horizontalLayout = QHBoxLayout()
123+
self.horizontalLayout.setObjectName(u"horizontalLayout")
124+
self.name = QLabel(RegisterWidget)
125+
self.name.setObjectName(u"name")
126+
self.name.setMinimumSize(QSize(80, 0))
127+
self.name.setMaximumSize(QSize(60, 16777215))
128+
self.name.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter)
129+
130+
self.horizontalLayout.addWidget(self.name)
131+
132+
self.nameEdit = QLineEdit(RegisterWidget)
133+
self.nameEdit.setObjectName(u"nameEdit")
134+
135+
self.horizontalLayout.addWidget(self.nameEdit)
136+
137+
138+
self.gridLayout.addLayout(self.horizontalLayout, 13, 1, 1, 1)
139+
140+
self.commandLinkButton_2 = QCommandLinkButton(RegisterWidget)
141+
self.commandLinkButton_2.setObjectName(u"commandLinkButton_2")
142+
143+
self.gridLayout.addWidget(self.commandLinkButton_2, 2, 1, 1, 1)
129144

130145

131146
self.gridLayout_2.addLayout(self.gridLayout, 0, 0, 1, 1)
@@ -142,12 +157,15 @@ def setupUi(self, RegisterWidget):
142157

143158
def retranslateUi(self, RegisterWidget):
144159
RegisterWidget.setWindowTitle(QCoreApplication.translate("RegisterWidget", u"\u65b0\u7528\u6237\u6ce8\u518c", None))
145-
self.user.setText(QCoreApplication.translate("RegisterWidget", u"\u90ae\u7bb1\uff1a", None))
146-
self.name.setText(QCoreApplication.translate("RegisterWidget", u"\u7528\u6237\u540d\uff1a", None))
147-
self.verPicture.setText(QCoreApplication.translate("RegisterWidget", u"\u9a8c\u8bc1\u7801\u3002\u3002\u3002", None))
160+
self.verLabel.setText(QCoreApplication.translate("RegisterWidget", u"\u9a8c\u8bc1\u7801", None))
161+
self.passwd.setText(QCoreApplication.translate("RegisterWidget", u"\u5bc6\u7801\uff1a", None))
148162
self.gender_Male.setText(QCoreApplication.translate("RegisterWidget", u"\u7537", None))
149163
self.gender_Female.setText(QCoreApplication.translate("RegisterWidget", u"\u5973", None))
150-
self.passwd.setText(QCoreApplication.translate("RegisterWidget", u"\u5bc6\u7801\uff1a", None))
151-
self.verLabel.setText(QCoreApplication.translate("RegisterWidget", u"\u9a8c\u8bc1\u7801", None))
164+
self.label.setText(QCoreApplication.translate("RegisterWidget", u"\u8bf7\u81ea\u884c\u7f51\u9875\u6ce8\u518c", None))
165+
self.commandLinkButton.setText(QCoreApplication.translate("RegisterWidget", u"https://18comic.vip/signup", None))
166+
self.user.setText(QCoreApplication.translate("RegisterWidget", u"\u90ae\u7bb1\uff1a", None))
167+
self.verPicture.setText(QCoreApplication.translate("RegisterWidget", u"\u9a8c\u8bc1\u7801\u3002\u3002\u3002", None))
168+
self.name.setText(QCoreApplication.translate("RegisterWidget", u"\u7528\u6237\u540d\uff1a", None))
169+
self.commandLinkButton_2.setText(QCoreApplication.translate("RegisterWidget", u"https://18comic.org/signup", None))
152170
# retranslateUi
153171

0 commit comments

Comments
 (0)