Skip to content

Commit

Permalink
Fix bugs
Browse files Browse the repository at this point in the history
修复ex直连图片不能加载
修复看图会出现回滚
修复下载可能出现一直失败
  • Loading branch information
tonquer committed Jun 15, 2023
1 parent 2868b5c commit 6784ebd
Show file tree
Hide file tree
Showing 18 changed files with 457 additions and 287 deletions.
6 changes: 3 additions & 3 deletions src/component/list/base_list_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def __init__(self, parent):
if Setting.IsGrabGesture.value:
QScroller.grabGesture(self, QScroller.LeftMouseButtonGesture)
propertiesOne = QScroller.scroller(self).scrollerProperties()
print(propertiesOne.scrollMetric(propertiesOne.MousePressEventDelay))
# print(propertiesOne.scrollMetric(propertiesOne.MousePressEventDelay))
propertiesOne.setScrollMetric(QScrollerProperties.MousePressEventDelay, 1)
propertiesOne.setScrollMetric(QScrollerProperties.VerticalOvershootPolicy, QScrollerProperties.OvershootAlwaysOff)
propertiesOne.setScrollMetric(QScrollerProperties.HorizontalOvershootPolicy, QScrollerProperties.OvershootAlwaysOff)
Expand Down Expand Up @@ -80,8 +80,8 @@ def wheelEvent(self, arg__1) -> None:
if self.vScrollBar:
self.vScrollBar.ScrollValue(-arg__1.angleDelta().y())
else:
print(self.verticalScrollMode())
print(self.verticalScrollBar().singleStep())
# print(self.verticalScrollMode())
# print(self.verticalScrollBar().singleStep())
return QListWidget.wheelEvent(self, arg__1)

def OnActionTriggered(self):
Expand Down
6 changes: 3 additions & 3 deletions src/config/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
Issues2 = "https://hub.ggo.icu/tonquer/ehentai-qt/issues"
Issues3 = "https://hub.fastgit.xyz/tonquer/ehentai-qt/issues"

UpdateVersion = "v1.1.1"
RealVersion = "v1.1.1"
UpdateVersion = "v1.1.2"
RealVersion = "v1.1.2"
Waifu2xVersion = "1.1.6"
TimeVersion = "2023-3-19"
TimeVersion = "2023-6-15"

CurSite = "e-hentai" # 当前站点
CurLoginName = "" # 当前登录名
Expand Down
1 change: 1 addition & 0 deletions src/config/setting.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ class Setting:
ProxyApiIndex = SettingValue("ProxySetting", 1, False)
ProxyExIndex = SettingValue("ProxySetting", 1, False)
ProxyEhIndex = SettingValue("ProxySetting", 1, False)
ProxyExaIndex = SettingValue("ProxySetting", 1, False)

# 下载与缓存
SavePath = SettingValue("DownloadSetting", "", False)
Expand Down
26 changes: 15 additions & 11 deletions src/interface/ui_download.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ def setupUi(self, Download):
self.gridLayout.addLayout(self.horizontalLayout, 2, 0, 1, 1)

self.tableWidget = QTableWidget(Download)
if (self.tableWidget.columnCount() < 10):
self.tableWidget.setColumnCount(10)
if (self.tableWidget.columnCount() < 11):
self.tableWidget.setColumnCount(11)
__qtablewidgetitem = QTableWidgetItem()
self.tableWidget.setHorizontalHeaderItem(0, __qtablewidgetitem)
__qtablewidgetitem1 = QTableWidgetItem()
Expand All @@ -108,6 +108,8 @@ def setupUi(self, Download):
self.tableWidget.setHorizontalHeaderItem(8, __qtablewidgetitem8)
__qtablewidgetitem9 = QTableWidgetItem()
self.tableWidget.setHorizontalHeaderItem(9, __qtablewidgetitem9)
__qtablewidgetitem10 = QTableWidgetItem()
self.tableWidget.setHorizontalHeaderItem(10, __qtablewidgetitem10)
self.tableWidget.setObjectName(u"tableWidget")

self.gridLayout.addWidget(self.tableWidget, 5, 0, 1, 1)
Expand Down Expand Up @@ -144,22 +146,24 @@ def retranslateUi(self, Download):
___qtablewidgetitem = self.tableWidget.horizontalHeaderItem(0)
___qtablewidgetitem.setText(QCoreApplication.translate("Download", u"id", None));
___qtablewidgetitem1 = self.tableWidget.horizontalHeaderItem(1)
___qtablewidgetitem1.setText(QCoreApplication.translate("Download", u"\u6807\u9898", None));
___qtablewidgetitem1.setText(QCoreApplication.translate("Download", u"\u65f6\u95f4", None));
___qtablewidgetitem2 = self.tableWidget.horizontalHeaderItem(2)
___qtablewidgetitem2.setText(QCoreApplication.translate("Download", u"\u7ad9\u70b9", None));
___qtablewidgetitem2.setText(QCoreApplication.translate("Download", u"\u6807\u9898", None));
___qtablewidgetitem3 = self.tableWidget.horizontalHeaderItem(3)
___qtablewidgetitem3.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u8fdb\u5ea6", None));
___qtablewidgetitem3.setText(QCoreApplication.translate("Download", u"\u7ad9\u70b9", None));
___qtablewidgetitem4 = self.tableWidget.horizontalHeaderItem(4)
___qtablewidgetitem4.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u5927\u5c0f", None));
___qtablewidgetitem4.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u8fdb\u5ea6", None));
___qtablewidgetitem5 = self.tableWidget.horizontalHeaderItem(5)
___qtablewidgetitem5.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u901f\u5ea6", None));
___qtablewidgetitem5.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u5927\u5c0f", None));
___qtablewidgetitem6 = self.tableWidget.horizontalHeaderItem(6)
___qtablewidgetitem6.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u72b6\u6001", None));
___qtablewidgetitem6.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u901f\u5ea6", None));
___qtablewidgetitem7 = self.tableWidget.horizontalHeaderItem(7)
___qtablewidgetitem7.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u8fdb\u5ea6", None));
___qtablewidgetitem7.setText(QCoreApplication.translate("Download", u"\u4e0b\u8f7d\u72b6\u6001", None));
___qtablewidgetitem8 = self.tableWidget.horizontalHeaderItem(8)
___qtablewidgetitem8.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u8017\u65f6", None));
___qtablewidgetitem8.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u8fdb\u5ea6", None));
___qtablewidgetitem9 = self.tableWidget.horizontalHeaderItem(9)
___qtablewidgetitem9.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u72b6\u6001", None));
___qtablewidgetitem9.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u8017\u65f6", None));
___qtablewidgetitem10 = self.tableWidget.horizontalHeaderItem(10)
___qtablewidgetitem10.setText(QCoreApplication.translate("Download", u"\u8f6c\u6362\u72b6\u6001", None));
# retranslateUi

2 changes: 1 addition & 1 deletion src/interface/ui_favority.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def setupUi(self, Favority):
self.comboBox.addItem("")
self.comboBox.addItem("")
self.comboBox.setObjectName(u"comboBox")
self.comboBox.setMinimumSize(QSize(100, 0))
self.comboBox.setMinimumSize(QSize(200, 0))

self.horizontalLayout.addWidget(self.comboBox)

Expand Down
Loading

0 comments on commit 6784ebd

Please sign in to comment.