chore(Typing): solved typing issues in the unsupported Fancy widgets

Author: ceccopierangiolieugenio

libs/pyTermTk/TermTk/TTkCore/constant.py

@@ -253,7 +253,7 @@ class DragDropMode(int):
     AllowDrop      = DragDropMode.AllowDrop
     AllowDragDrop  = DragDropMode.AllowDragDrop
 
-    class ChildIndicatorPolicy(int):
+    class ChildIndicatorPolicy(IntEnum):
         ShowIndicator                  = 0x00 #The controls for expanding and collapsing will be shown for this item even if there are no children.
         DontShowIndicator              = 0x01 #The controls for expanding and collapsing will never be shown even if there are children. If the node is forced open the user will not be able to expand or collapse the item.
         DontShowIndicatorWhenChildless = 0x02 #The controls for expanding and collapsing will be shown if the item contains children.

libs/pyTermTk/TermTk/TTkWidgets/Fancy/progressbar.py

@@ -24,6 +24,7 @@
 __all__ = ['TTkFancyProgressBar', 'TTkLookAndFeelFPBar']
 
 import math
+from typing import Optional
 
 from TermTk.TTkCore.cfg       import TTkCfg
 from TermTk.TTkCore.color     import TTkColor
@@ -88,7 +89,7 @@ class TTkFancyProgressBar(TTkWidget):
 
     def __init__(self, *,
                  value:float=0.0,
-                 lookAndFeel:TTkLookAndFeelFPBar=None,
+                 lookAndFeel:Optional[TTkLookAndFeelFPBar]=None,
                  **kwargs) -> None:
         self.valueChanged = pyTTkSignal(float)
         super().__init__(**kwargs)

libs/pyTermTk/TermTk/TTkWidgets/Fancy/table.py

@@ -22,6 +22,8 @@
 
 __all__ = ['TTkFancyTable']
 
+from typing import Optional
+
 from TermTk.TTkCore.constant import TTkK
 from TermTk.TTkCore.color import TTkColor
 from TermTk.TTkWidgets.widget import TTkWidget
@@ -39,11 +41,11 @@ class TTkFancyTable(TTkAbstractScrollArea):
 
     def __init__(self, *,
                  # TTkWidget init
-                 parent:TTkWidget=None,
+                 parent:Optional[TTkWidget]=None,
                  visible:bool=True,
                  # TTkFancyTableView init
-                 columns:list[int]=None,
-                 columnColors:list[TTkColor]=None,
+                 columns:Optional[list[int]]=None,
+                 columnColors:Optional[list[TTkColor]]=None,
                  selectColor:TTkColor=TTkColor.BOLD,
                  headerColor:TTkColor=TTkColor.BOLD,
                  showHeader:bool=True,

libs/pyTermTk/TermTk/TTkWidgets/Fancy/tableview.py

@@ -22,6 +22,8 @@
 
 __all__ = ['TTkFancyTableView']
 
+from typing import Optional, List
+
 from TermTk.TTkCore.constant import TTkK
 from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal
 from TermTk.TTkCore.color import TTkColor
@@ -36,7 +38,7 @@
 class _TTkFancyTableViewHeader(TTkAbstractScrollView):
     __slots__ = ('_header', '_alignments', '_headerColor', '_columns')
     def __init__(self, *,
-                 columns:list[int]=None,
+                 columns:Optional[List[int]]=None,
                  headerColor:TTkColor=TTkColor.BOLD,
                  **kwargs) -> None:
         super().__init__(**kwargs)
@@ -102,9 +104,13 @@ class _TTkFancyTableView(TTkAbstractScrollView):
             '_tableWidth',
             # Signals
             'activated', 'doubleClicked')
+    _tableDataId:List[List[TTkString]]
+    _tableDataText:List[List[TTkString]]
+    _tableDataWidget:List[List[Optional[TTkWidget]]]
+    _shownWidgets:List[TTkWidget]
     def __init__(self, *,
-                 columns:list[int]=None,
-                 columnColors:list[TTkColor]=None,
+                 columns:Optional[List[int]]=None,
+                 columnColors:Optional[List[TTkColor]]=None,
                  selectColor:TTkColor=TTkColor.BOLD,
                  headerColor:TTkColor=TTkColor.BOLD,
                  **kwargs) -> None:
@@ -379,20 +385,20 @@ class TTkFancyTableView(TTkAbstractScrollView):
 
     def __init__(self, *,
                  # _TTkFancyTableView init
-                 columns:list[int]=None,
-                 columnColors:list[TTkColor]=None,
+                 columns:Optional[List[int]]=None,
+                 columnColors:Optional[List[TTkColor]]=None,
                  selectColor:TTkColor=TTkColor.BOLD,
                  headerColor:TTkColor=TTkColor.BOLD,
                  # TTkFancyTableView init
                  showHeader:bool=True,
                  **kwargs) -> None:
         self._excludeEvent = False
-        super().__init__(**kwargs|{'layout':TTkGridLayout()})
+        super().__init__(**kwargs|{'layout':(gl:=TTkGridLayout())})
         self._showHeader = showHeader
         self._tableView = _TTkFancyTableView(columns=columns, columnColors=columnColors, selectColor=selectColor, headerColor=headerColor, **kwargs)
         self._header = _TTkFancyTableViewHeader(columns=columns, headerColor=headerColor, **kwargs)
-        self.layout().addWidget(self._header,0,0)
-        self.layout().addWidget(self._tableView,1,0)
+        gl.addWidget(self._header,0,0)
+        gl.addWidget(self._tableView,1,0)
         self._tableView.viewChanged.connect(self._viewChanged)
         self._tableView.viewMovedTo.connect(self._viewMovedTo)
         # Forward the tableSignals

libs/pyTermTk/TermTk/TTkWidgets/Fancy/treewidget.py

@@ -22,6 +22,8 @@
 
 __all__ = ['TTkFancyTreeWidget']
 
+from typing import Union, Optional
+
 from TermTk.TTkCore.constant import TTkK
 from TermTk.TTkCore.log import TTkLog
 from TermTk.TTkCore.string import TTkString
@@ -48,9 +50,9 @@ class _TTkDisplayedTreeItem(TTkContainer):
     __slots__ = ('_depth', '_control', '_text', '_id', '_clicked', '_treeWidgetItem', '_isLeaf' )
     def __init__(self, *,
                   id:int=0,
-                  text:TTkString='',
+                  text:Union[str,TTkString]='',
                   depth:int=0,
-                  treeWidgetItem:TTkFancyTreeWidgetItem=None,
+                  treeWidgetItem:TTkFancyTreeWidgetItem,
                  **kwargs) -> None:
         super().__init__(**kwargs)
         #Signals

libs/pyTermTk/TermTk/TTkWidgets/Fancy/treewidgetitem.py

@@ -22,6 +22,8 @@
 
 __all__ = ['TTkFancyTreeWidgetItem']
 
+from typing import List
+
 from TermTk.TTkCore.constant import TTkK
 from TermTk.TTkCore.signal import pyTTkSignal
 
@@ -36,7 +38,7 @@ def __init__(self, *args,
         # Signals
         self.refreshData = pyTTkSignal(TTkFancyTreeWidgetItem)
         self._data = args[0]
-        self._children = []
+        self._children:List = []
         self._childIndicatorPolicy = childIndicatorPolicy
         self._expand = False
         self._parent = parent