update

tonquer · Jun 30, 2024 · ca41d1d · ca41d1d
1 parent 8b59628
commit ca41d1d
Show file tree

Hide file tree

Showing 35 changed files with 7,361 additions and 4,925 deletions.
diff --git a/src/component/dialog/loading_dialog.py b/src/component/dialog/loading_dialog.py
@@ -5,6 +5,7 @@
 
 from component.label.gif_group_label import GifGroupLabel
 from component.label.gif_label import GifLabel
+from config.setting import Setting
 
 
 class LoadingDialog(QtWidgets.QDialog):
@@ -31,6 +32,7 @@ def __init__(self, owner):
 
     def show(self) -> None:
         self.timer.start()
+        self.closeCnt = 10 * Setting.ApiTimeOut.GetIndexV()
         self.cnt = 0
         super(self.__class__, self).show()
 

diff --git a/src/component/scroll/read_scroll.py b/src/component/scroll/read_scroll.py
@@ -35,7 +35,10 @@ def __init__(self, parent):
         # self.valueChanged.connect(self.ValueChange)
         self.oldv = 0
         self.changeState = False
+
+        self.lastSubV = 0
 
+
     @property
     def stripModel(self):
         return self._owner().qtTool.stripModel
@@ -146,18 +149,18 @@ def ForceSetValue(self, value):
         QScrollBar.setValue(self, value)
         self.StartAni(value, value, self.scrollTime)
 
-    def ForceSetValue2(self, value, isAdd):
-        if value == self.value():
-            if isAdd and self.stripModel != ReadMode.RightLeftScroll:
-                self.__value = self.__value + 1
-            else:
-                self.__value = self.__value - 1
+    # def ForceSetValue2(self, value, isAdd):
+    #     if value == self.value():
+    #         if isAdd and self.stripModel != ReadMode.RightLeftScroll:
+    #             self.__value = self.__value + 1
+    #         else:
+    #             self.__value = self.__value - 1
 
-        self.ani.stop()
-        # print("ani stop 3")
-        print("force setV2, {}".format(value))
-        QScrollBar.setValue(self, value)
-        self.StartAni(value, value, self.scrollTime)
+    #     self.ani.stop()
+    #     # print("ani stop 3")
+    #     print("force setV2, {}".format(value))
+    #     QScrollBar.setValue(self, value)
+    #     self.StartAni(value, value, self.scrollTime)
 
     def StartAni(self, start, end, duration):
         self.lastAniEndV = end
@@ -199,9 +202,52 @@ def scrollValue(self, value: int):
     #     self.__value = min(self.maximum(), self.__value)
     #     self.setValue(self.__value)
 
-    def SetChangeState(self, state):
-        self.changeState = state
+    # def SetChangeState(self, state):
+    #     self.changeState = state
+
+    # value变化后，重新定位位置信息
+    def SaveLastPosition(self):
+        if not self.isCurReadModel:
+            return
+
+        if not ReadMode.isScroll(self.stripModel):
+            return
 
+        oldV = self.value()
+        oldMinV = max(1, self.labelSize.get(self.readImg.curIndex, 0))
+        height =  max(1,self.labelSize.get(self.readImg.curIndex-1, 0))
+        subV = (oldV - oldMinV)/height
+        if self.isCurReadModel:
+            print("set lastV, {}, {}".format(oldV, subV))
+        self.lastSubV = subV
+        self.changeState = True
+        return
+
+    def SaveLastPositionEnd(self):
+        if not self.isCurReadModel:
+            return
+
+        if not ReadMode.isScroll(self.stripModel):
+            return    
+
+        oldV = self.value()
+        oldMinV = max(1, self.labelSize.get(self.readImg.curIndex, 0))
+        height =  max(1,self.labelSize.get(self.readImg.curIndex-1, 0))
+        newV = int(oldMinV + height*self.lastSubV)
+        if oldV == newV:
+            self.__value = newV
+            self.lastSubV = 0
+            self.changeState = False
+            return
+        self.ani.stop()
+        QScrollBar.setValue(self, newV)
+        if self.isCurReadModel:
+            print("set lastV2, {}, {}".format(oldV, newV))
+        self.__value = newV
+        self.lastSubV = 0
+        self.changeState = False
+        return
+
     def OnValueChange(self, value):
         if self.changeState:
             return

diff --git a/src/config/config.py b/src/config/config.py
@@ -22,9 +22,9 @@
 UpdateUrl2Back = "https://hub.ggo.icu/tonquer/JMComic-qt/"
 UpdateUrl3Back = "https://hub.fastgit.xyz/tonquer/JMComic-qt"
 
-UpdateVersion = "v1.2.2"
-RealVersion = "v1.2.2"
-VersionTime = "2024-5-26"
+UpdateVersion = "v1.2.3"
+RealVersion = "v1.2.3"
+VersionTime = "2024-6-30"
 
 Waifu2xVersion = "1.1.6"
 LoginUserName = ""

diff --git a/src/config/setting.py b/src/config/setting.py
@@ -112,7 +112,9 @@ class Setting:
 
     IsLoginProxy = SettingValue("ProxySetting", 0, False)
     RegisterProsyIndex = SettingValue("ProxySetting", 1, False)
-
+    ApiTimeOut = SettingValue("ProxySetting", 1, False, [2, 5, 7, 10])
+    ImgTimeOut = SettingValue("ProxySetting", 1, False, [2, 5, 7, 10, 15])
+
     # 下载与缓存
     SavePath = SettingValue("DownloadSetting", "", False)
     SaveNameType = SettingValue("DownloadSetting", 0, False)