Adjust playtime querying and chart context menu handling, bump revision

Author: HIllya51

src/LunaTranslator/gui/gamemanager/setting.py

@@ -657,8 +657,6 @@ def getstatistic(self, formLayout: QVBoxLayout, gameuid):
         chart2 = chartwidget()
         chart2.xtext = chart.xtext
         chart2.ytext = str
-        chart2.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
-        chart2.customContextMenuRequested.connect(self.chartwidget_ctxmenu)
         self._timelabel = QLabel()
         self._wordlabel = QLabel()
         self._wordlabel.setSizePolicy(
@@ -670,6 +668,8 @@ def getstatistic(self, formLayout: QVBoxLayout, gameuid):
         stack = QStackedWidget()
         stack.addWidget(chart)
         stack.addWidget(chart2)
+        stack.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
+        stack.customContextMenuRequested.connect(self.chartwidget_ctxmenu)
         wc = LPushButton("文字计数")
         tm = LPushButton("游戏时间")
         wc.setCheckable(True)
@@ -749,7 +749,9 @@ def split_range_into_days(self, times):
         return lists
 
     def refresh(self, chart: chartwidget, chart2: chartwidget, gameuid):
-        __ = gobject.base.somedatabase.querytraceplaytime(gameuid)
+        __ = gobject.base.somedatabase.querytraceplaytime(
+            None if self.__quanju_wc else gameuid
+        )
         _cnt = sum([_[1] - _[0] for _ in __])
         self._timelabel.setText(self.formattime(_cnt))
         self._wordlabel.setText(
@@ -770,7 +772,7 @@ def wordcountbydate(self, l: tuple[tuple[float, int]]):
         lists = []
         for k in sorted(daily_sum.keys()):
             lists.append((datetime.combine(k, dttime.min).timestamp(), daily_sum[k]))
-        
+
         return lists
 
     def formattime(self, t, usingnotstart=True):

src/LunaTranslator/myutils/somedatabase.py

@@ -96,12 +96,17 @@ def settraceplaytime(self, gameuid, lst: "list[tuple[float, float]]"):
             )
         self.sqlsavegameinfo.commit()
 
-    def querytraceplaytime(self, gameuid) -> "list[tuple[float, float]]":
-        gameinternalid = self.__get_gameinternalid(gameuid)
-        __ = self.sqlsavegameinfo.execute(
-            "SELECT timestart,timestop FROM trace_strict WHERE gameinternalid = ?",
-            (gameinternalid,),
-        ).fetchall()
+    def querytraceplaytime(self, gameuid: "str | None") -> "list[tuple[float, float]]":
+        if gameuid:
+            gameinternalid = self.__get_gameinternalid(gameuid)
+            __ = self.sqlsavegameinfo.execute(
+                "SELECT timestart,timestop FROM trace_strict WHERE gameinternalid = ?",
+                (gameinternalid,),
+            ).fetchall()
+        else:
+            __ = self.sqlsavegameinfo.execute(
+                "SELECT timestart,timestop FROM trace_strict"
+            ).fetchall()
         __ = tuple(_ for _ in __ if _[1] > _[0])
         return __
 

src/version.cmake

@@ -2,4 +2,4 @@
 set(VERSION_MAJOR 10)
 set(VERSION_MINOR 15)
 set(VERSION_PATCH 6)
-set(VERSION_REVISION 5)
+set(VERSION_REVISION 6)