Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonquer
tonquer committed Nov 3, 2023
1 parent 86a74ff commit 4dfc615
Show file tree
Hide file tree
Showing 10 changed files with 1,220 additions and 190 deletions.
6 changes: 3 additions & 3 deletions src/config/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
UpdateUrl3Api = "https://api.fastgit.xyz/repos/tonquer/JMComic-qt/releases"
UpdateUrl3Back = "https://hub.fastgit.xyz/tonquer/JMComic-qt"

UpdateVersion = "v1.1.6"
RealVersion = "v1.1.6"
VersionTime = "2023-10-15"
UpdateVersion = "v1.1.7"
RealVersion = "v1.1.7"
VersionTime = "2023-11-3"

Waifu2xVersion = "1.1.6"
LoginUserName = ""
Expand Down
1 change: 1 addition & 0 deletions src/config/setting.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ class Setting:
IsReDownload = SettingValue("Other", 0, False)
WebpToPng = SettingValue("Other", 0, False)
IsPreUpdate = SettingValue("Other", 0, False)
UerAgent = SettingValue("Other", "", False)

# IpbMemberId = SettingValue("Other", "", False)
# IpbPassHash = SettingValue("Other", "", False)
Expand Down
31 changes: 29 additions & 2 deletions src/interface/ui_login_proxy_widget.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from PySide6.QtWidgets import (QApplication, QButtonGroup, QCheckBox, QCommandLinkButton,
QFrame, QGridLayout, QHBoxLayout, QLabel,
QLineEdit, QPushButton, QRadioButton, QSizePolicy,
QVBoxLayout, QWidget)
QSpacerItem, QVBoxLayout, QWidget)

from component.scroll_area.smooth_scroll_area import SmoothScrollArea

Expand All @@ -36,7 +36,7 @@ def setupUi(self, LoginProxyWidget):
self.scrollArea.setWidgetResizable(True)
self.scrollAreaWidgetContents = QWidget()
self.scrollAreaWidgetContents.setObjectName(u"scrollAreaWidgetContents")
self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 521, 463))
self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 504, 515))
self.verticalLayout = QVBoxLayout(self.scrollAreaWidgetContents)
self.verticalLayout.setObjectName(u"verticalLayout")
self.horizontalLayout_11 = QHBoxLayout()
Expand Down Expand Up @@ -145,6 +145,31 @@ def setupUi(self, LoginProxyWidget):

self.verticalLayout.addWidget(self.loginProxy)

self.horizontalLayout_3 = QHBoxLayout()
self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
self.label_9 = QLabel(self.scrollAreaWidgetContents)
self.label_9.setObjectName(u"label_9")
self.label_9.setMinimumSize(QSize(90, 0))

self.horizontalLayout_3.addWidget(self.label_9)

self.uaRandom = QPushButton(self.scrollAreaWidgetContents)
self.uaRandom.setObjectName(u"uaRandom")

self.horizontalLayout_3.addWidget(self.uaRandom)

self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)

self.horizontalLayout_3.addItem(self.horizontalSpacer)


self.verticalLayout.addLayout(self.horizontalLayout_3)

self.uaEdit = QLineEdit(self.scrollAreaWidgetContents)
self.uaEdit.setObjectName(u"uaEdit")

self.verticalLayout.addWidget(self.uaEdit)

self.testSpeedButton = QPushButton(self.scrollAreaWidgetContents)
self.testSpeedButton.setObjectName(u"testSpeedButton")

Expand Down Expand Up @@ -376,6 +401,8 @@ def retranslateUi(self, LoginProxyWidget):
self.proxy_3.setText(QCoreApplication.translate("LoginProxyWidget", u"\u4f7f\u7528\u7cfb\u7edf\u4ee3\u7406", None))
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))
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))
self.label_9.setText(QCoreApplication.translate("LoginProxyWidget", u"UA\u8bbe\u7f6e:", None))
self.uaRandom.setText(QCoreApplication.translate("LoginProxyWidget", u"\u968f\u673a\u751f\u6210", None))
self.testSpeedButton.setText(QCoreApplication.translate("LoginProxyWidget", u"\u6d4b\u901f", None))
#if QT_CONFIG(tooltip)
self.radioButton_4.setToolTip(QCoreApplication.translate("LoginProxyWidget", u"\u6240\u4ee5\u5206\u6d41\u4e0d\u53ef\u4f7f\u7528\u65f6\uff0c\u81ea\u52a8\u89e3\u9501", None))
Expand Down
148 changes: 83 additions & 65 deletions src/interface/ui_register_widget.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,63 +15,52 @@
QFont, QFontDatabase, QGradient, QIcon,
QImage, QKeySequence, QLinearGradient, QPainter,
QPalette, QPixmap, QRadialGradient, QTransform)
from PySide6.QtWidgets import (QApplication, QButtonGroup, QGridLayout, QHBoxLayout,
QLabel, QLineEdit, QRadioButton, QSizePolicy,
QWidget)
from PySide6.QtWidgets import (QApplication, QButtonGroup, QCommandLinkButton, QGridLayout,
QHBoxLayout, QLabel, QLineEdit, QRadioButton,
QSizePolicy, QWidget)

class Ui_RegisterWidget(object):
def setupUi(self, RegisterWidget):
if not RegisterWidget.objectName():
RegisterWidget.setObjectName(u"RegisterWidget")
RegisterWidget.resize(393, 216)
RegisterWidget.resize(444, 376)
self.gridLayout_2 = QGridLayout(RegisterWidget)
self.gridLayout_2.setObjectName(u"gridLayout_2")
self.gridLayout = QGridLayout()
self.gridLayout.setObjectName(u"gridLayout")
self.horizontalLayout_3 = QHBoxLayout()
self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
self.user = QLabel(RegisterWidget)
self.user.setObjectName(u"user")
self.user.setMinimumSize(QSize(80, 0))
self.user.setMaximumSize(QSize(60, 16777215))
self.user.setLayoutDirection(Qt.LeftToRight)
self.user.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter)

self.horizontalLayout_3.addWidget(self.user)

self.userEdit = QLineEdit(RegisterWidget)
self.userEdit.setObjectName(u"userEdit")
self.userEdit.setMinimumSize(QSize(200, 0))
self.horizontalLayout_2 = QHBoxLayout()
self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
self.verLabel = QLabel(RegisterWidget)
self.verLabel.setObjectName(u"verLabel")
self.verLabel.setMinimumSize(QSize(80, 0))

self.horizontalLayout_3.addWidget(self.userEdit)
self.horizontalLayout_2.addWidget(self.verLabel)

self.verEdit = QLineEdit(RegisterWidget)
self.verEdit.setObjectName(u"verEdit")

self.gridLayout.addLayout(self.horizontalLayout_3, 10, 1, 1, 1)
self.horizontalLayout_2.addWidget(self.verEdit)

self.horizontalLayout = QHBoxLayout()
self.horizontalLayout.setObjectName(u"horizontalLayout")
self.name = QLabel(RegisterWidget)
self.name.setObjectName(u"name")
self.name.setMinimumSize(QSize(80, 0))
self.name.setMaximumSize(QSize(60, 16777215))
self.name.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter)

self.horizontalLayout.addWidget(self.name)
self.gridLayout.addLayout(self.horizontalLayout_2, 16, 1, 1, 1)

self.nameEdit = QLineEdit(RegisterWidget)
self.nameEdit.setObjectName(u"nameEdit")
self.horizontalLayout_19 = QHBoxLayout()
self.horizontalLayout_19.setObjectName(u"horizontalLayout_19")
self.passwd = QLabel(RegisterWidget)
self.passwd.setObjectName(u"passwd")
self.passwd.setMinimumSize(QSize(80, 0))
self.passwd.setMaximumSize(QSize(60, 16777215))
self.passwd.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter)

self.horizontalLayout.addWidget(self.nameEdit)
self.horizontalLayout_19.addWidget(self.passwd)

self.passwdEdit = QLineEdit(RegisterWidget)
self.passwdEdit.setObjectName(u"passwdEdit")

self.gridLayout.addLayout(self.horizontalLayout, 11, 1, 1, 1)
self.horizontalLayout_19.addWidget(self.passwdEdit)

self.verPicture = QLabel(RegisterWidget)
self.verPicture.setObjectName(u"verPicture")
self.verPicture.setMinimumSize(QSize(0, 0))
self.verPicture.setMaximumSize(QSize(16777215, 100))

self.gridLayout.addWidget(self.verPicture, 13, 1, 1, 1, Qt.AlignHCenter)
self.gridLayout.addLayout(self.horizontalLayout_19, 14, 1, 1, 1)

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


self.gridLayout.addLayout(self.horizontalLayout_10, 15, 1, 1, 1)
self.gridLayout.addLayout(self.horizontalLayout_10, 17, 1, 1, 1)

self.horizontalLayout_19 = QHBoxLayout()
self.horizontalLayout_19.setObjectName(u"horizontalLayout_19")
self.passwd = QLabel(RegisterWidget)
self.passwd.setObjectName(u"passwd")
self.passwd.setMinimumSize(QSize(80, 0))
self.passwd.setMaximumSize(QSize(60, 16777215))
self.passwd.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter)
self.label = QLabel(RegisterWidget)
self.label.setObjectName(u"label")

self.horizontalLayout_19.addWidget(self.passwd)
self.gridLayout.addWidget(self.label, 0, 1, 1, 1)

self.passwdEdit = QLineEdit(RegisterWidget)
self.passwdEdit.setObjectName(u"passwdEdit")
self.commandLinkButton = QCommandLinkButton(RegisterWidget)
self.commandLinkButton.setObjectName(u"commandLinkButton")

self.horizontalLayout_19.addWidget(self.passwdEdit)
self.gridLayout.addWidget(self.commandLinkButton, 1, 1, 1, 1)

self.horizontalLayout_3 = QHBoxLayout()
self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
self.user = QLabel(RegisterWidget)
self.user.setObjectName(u"user")
self.user.setMinimumSize(QSize(80, 0))
self.user.setMaximumSize(QSize(60, 16777215))
self.user.setLayoutDirection(Qt.LeftToRight)
self.user.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter)

self.gridLayout.addLayout(self.horizontalLayout_19, 12, 1, 1, 1)
self.horizontalLayout_3.addWidget(self.user)

self.horizontalLayout_2 = QHBoxLayout()
self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
self.verLabel = QLabel(RegisterWidget)
self.verLabel.setObjectName(u"verLabel")
self.verLabel.setMinimumSize(QSize(80, 0))
self.userEdit = QLineEdit(RegisterWidget)
self.userEdit.setObjectName(u"userEdit")
self.userEdit.setMinimumSize(QSize(200, 0))

self.horizontalLayout_2.addWidget(self.verLabel)
self.horizontalLayout_3.addWidget(self.userEdit)

self.verEdit = QLineEdit(RegisterWidget)
self.verEdit.setObjectName(u"verEdit")

self.horizontalLayout_2.addWidget(self.verEdit)
self.gridLayout.addLayout(self.horizontalLayout_3, 12, 1, 1, 1)

self.verPicture = QLabel(RegisterWidget)
self.verPicture.setObjectName(u"verPicture")
self.verPicture.setMinimumSize(QSize(0, 0))
self.verPicture.setMaximumSize(QSize(16777215, 100))

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

self.gridLayout.addLayout(self.horizontalLayout_2, 14, 1, 1, 1)
self.horizontalLayout = QHBoxLayout()
self.horizontalLayout.setObjectName(u"horizontalLayout")
self.name = QLabel(RegisterWidget)
self.name.setObjectName(u"name")
self.name.setMinimumSize(QSize(80, 0))
self.name.setMaximumSize(QSize(60, 16777215))
self.name.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignVCenter)

self.horizontalLayout.addWidget(self.name)

self.nameEdit = QLineEdit(RegisterWidget)
self.nameEdit.setObjectName(u"nameEdit")

self.horizontalLayout.addWidget(self.nameEdit)


self.gridLayout.addLayout(self.horizontalLayout, 13, 1, 1, 1)

self.commandLinkButton_2 = QCommandLinkButton(RegisterWidget)
self.commandLinkButton_2.setObjectName(u"commandLinkButton_2")

self.gridLayout.addWidget(self.commandLinkButton_2, 2, 1, 1, 1)


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

def retranslateUi(self, RegisterWidget):
RegisterWidget.setWindowTitle(QCoreApplication.translate("RegisterWidget", u"\u65b0\u7528\u6237\u6ce8\u518c", None))
self.user.setText(QCoreApplication.translate("RegisterWidget", u"\u90ae\u7bb1\uff1a", None))
self.name.setText(QCoreApplication.translate("RegisterWidget", u"\u7528\u6237\u540d\uff1a", None))
self.verPicture.setText(QCoreApplication.translate("RegisterWidget", u"\u9a8c\u8bc1\u7801\u3002\u3002\u3002", None))
self.verLabel.setText(QCoreApplication.translate("RegisterWidget", u"\u9a8c\u8bc1\u7801", None))
self.passwd.setText(QCoreApplication.translate("RegisterWidget", u"\u5bc6\u7801\uff1a", None))
self.gender_Male.setText(QCoreApplication.translate("RegisterWidget", u"\u7537", None))
self.gender_Female.setText(QCoreApplication.translate("RegisterWidget", u"\u5973", None))
self.passwd.setText(QCoreApplication.translate("RegisterWidget", u"\u5bc6\u7801\uff1a", None))
self.verLabel.setText(QCoreApplication.translate("RegisterWidget", u"\u9a8c\u8bc1\u7801", None))
self.label.setText(QCoreApplication.translate("RegisterWidget", u"\u8bf7\u81ea\u884c\u7f51\u9875\u6ce8\u518c", None))
self.commandLinkButton.setText(QCoreApplication.translate("RegisterWidget", u"https://18comic.vip/signup", None))
self.user.setText(QCoreApplication.translate("RegisterWidget", u"\u90ae\u7bb1\uff1a", None))
self.verPicture.setText(QCoreApplication.translate("RegisterWidget", u"\u9a8c\u8bc1\u7801\u3002\u3002\u3002", None))
self.name.setText(QCoreApplication.translate("RegisterWidget", u"\u7528\u6237\u540d\uff1a", None))
self.commandLinkButton_2.setText(QCoreApplication.translate("RegisterWidget", u"https://18comic.org/signup", None))
# retranslateUi

Loading

0 comments on commit 4dfc615

Please sign in to comment.