Temporary improved typing

TermTk/TTkAbstract/abstractscrollview.py

@@ -46,7 +46,7 @@ class TTkAbstractScrollViewInterface():
     def __init__(self) -> None: pass
 
     # Override this function
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         '''
         This method returns the full widget area size of the :py:class:`TTkAbstractScrollViewInterface` implementation.
 
@@ -60,7 +60,7 @@ class TTkAbstractScrollViewInterface():
         raise NotImplementedError()
 
     # Override this function
-    def viewDisplayedSize(self) -> (int, int):
+    def viewDisplayedSize(self) -> tuple[int,int]:
         '''
         This method returns the displayed size of the :py:class:`TTkAbstractScrollViewInterface` implementation.
 
@@ -170,7 +170,7 @@ class TTkAbstractScrollView(TTkContainer, TTkAbstractScrollViewInterface):
         # Do NOT use super()
         TTkContainer.__init__(self, **kwargs)
 
-    def viewDisplayedSize(self) -> (int, int):
+    def viewDisplayedSize(self) -> tuple[int,int]:
         return self.size()
 
     @pyTTkSlot(int, int)
@@ -259,11 +259,11 @@ class TTkAbstractScrollViewLayout(TTkLayout, TTkAbstractScrollViewInterface):
         self._excludeEvent = False
         TTkLayout.__init__(self, *args, **kwargs)
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         _,_,w,h = self.fullWidgetAreaGeometry()
         return w,h
 
-    def viewDisplayedSize(self) -> (int, int):
+    def viewDisplayedSize(self) -> tuple[int,int]:
         _,_,w,h = self.geometry()
         return w,h
 
@@ -378,7 +378,7 @@ class TTkAbstractScrollViewGridLayout(TTkGridLayout, TTkAbstractScrollViewInterf
         return TTkGridLayout.addItem(self, item, row, col, rowspan, colspan)
 
     # Override this function
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         w,h=0,0
         for widget in self.iterWidgets(recurse=False):
             ww,wh = widget.viewFullAreaSize()
@@ -387,7 +387,7 @@ class TTkAbstractScrollViewGridLayout(TTkGridLayout, TTkAbstractScrollViewInterf
         return w,h
 
     # Override this function
-    def viewDisplayedSize(self) -> (int, int):
+    def viewDisplayedSize(self) -> tuple[int,int]:
         w,h=0,0
         for widget in self.iterWidgets(recurse=False):
             ww,wh = widget.viewDisplayedSize()

TermTk/TTkCore/helper.py

@@ -383,7 +383,7 @@ class TTkHelper:
         return layout.parentWidget()
 
     @staticmethod
-    def absPos(widget) -> (int,int):
+    def absPos(widget) -> tuple[int,int]:
         wx, wy = 0,0
         layout = widget.widgetItem()
         while layout:

TermTk/TTkTestWidgets/logviewer.py

@@ -48,7 +48,7 @@ class _TTkLogViewer(TTkAbstractScrollView):
     def _viewChangedHandler(self):
         self.update()
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         w = max( m.termWidth() for m in self._messages)
         h = len(self._messages)
         return w , h

TermTk/TTkTestWidgets/testabstractscroll.py

@@ -60,7 +60,7 @@ class TTkTestAbstractScrollWidget(TTkAbstractScrollView):
     def mousePressEvent(self, evt): return True
     def mouseReleaseEvent(self, evt): return True
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         return self._areaSize
 
 

TermTk/TTkTestWidgets/tominspector.py

@@ -69,7 +69,7 @@ class _DetailGridView(TTkAbstractScrollView):
         x,y = self.getViewOffsets()
         self._gridLayout.setOffset(-x,-y)
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         _,_,w,h = self._gridLayout.fullWidgetAreaGeometry()
         return w , h
 
@@ -115,7 +115,7 @@ class _DetailLazyFormView(TTkAbstractScrollView):
         x,y = self.getViewOffsets()
         self.layout().setOffset(-x,-y)
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         _,_,w,h = self.layout().fullWidgetAreaGeometry()
         return w , h+1
 

TermTk/TTkWidgets/Fancy/tableview.py

@@ -45,7 +45,7 @@ class _TTkFancyTableViewHeader(TTkAbstractScrollView):
         self.setMinimumHeight(1)
 
     # Override this function
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         return self.size()
 
     @pyTTkSlot(int, int)
@@ -190,7 +190,7 @@ class _TTkFancyTableView(TTkAbstractScrollView):
 
 
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         return self._tableWidth, len(self._tableDataText)
 
     # def items(self): return self._tableDataText
@@ -446,10 +446,10 @@ class TTkFancyTableView(TTkAbstractScrollView):
     def getViewOffsets(self):
         return self._tableView.getViewOffsets()
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         return self._tableView.viewFullAreaSize()
 
-    def viewDisplayedSize(self) -> (int, int):
+    def viewDisplayedSize(self) -> tuple[int,int]:
         return self._tableView.viewDisplayedSize()
 
     def setAlignment(self, *args, **kwargs)   :

TermTk/TTkWidgets/TTkPickers/textpicker.py

@@ -107,7 +107,7 @@ class _emojiPickerView(TTkAbstractScrollView):
         x,y = self.getViewOffsets()
         self.layout().setOffset(-x,-y)
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         _,_,w,h = self.layout().fullWidgetAreaGeometry()
         return w , h
 

TermTk/TTkWidgets/TTkTerminal/terminalview.py

@@ -246,7 +246,7 @@ class TTkTerminalView(TTkAbstractScrollView, _TTkTerminal_CSI_DEC):
     def _viewChangedHandler(self):
         self.update()
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         w,h = self.size()
         h += len(self._screen_current._bufferedLines)
         return w,h

TermTk/TTkWidgets/listwidget.py

@@ -262,7 +262,7 @@ class TTkListWidget(TTkAbstractScrollView):
             item.setGeometry(x,y,maxw,h)
         TTkAbstractScrollView.resizeEvent(self, w, h)
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         _,_,w,h = self.layout().fullWidgetAreaGeometry()
         return w, h
 

TermTk/TTkWidgets/scrollarea.py

@@ -39,7 +39,7 @@ class _TTkAreaWidget(TTkAbstractScrollView):
         x,y = self.getViewOffsets()
         self.layout().setOffset(-x,-y)
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         _,_,w,h = self.layout().fullWidgetAreaGeometry()
         return w , h
 

TermTk/TTkWidgets/texedit.py

@@ -71,7 +71,7 @@ class _TTkTextEditViewLineNumber(TTkAbstractScrollView):
         tw.wrapChanged.connect(self._wrapChanged)
         self._wrapChanged()
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         if self._textWrap:
             return 5, self._textWrap.size()
         else:
@@ -427,7 +427,7 @@ class TTkTextEditView(TTkAbstractScrollView):
     def _updateSize(self):
         self._hsize = max( len(l) for l in self._textDocument._dataLines ) + 1
 
-    def viewFullAreaSize(self) -> (int, int):
+    def viewFullAreaSize(self) -> tuple[int,int]:
         if self.lineWrapMode() == TTkK.NoWrap:
             return self._hsize, self._textWrap.size()
         elif self.lineWrapMode() == TTkK.WidgetWidth: