chore: improve typing (#504)

Author: ceccopierangiolieugenio

demo/demo.py

@@ -54,7 +54,7 @@
 from  showcase.dndtabs       import demoDnDTabs
 from  showcase.sigmask       import demoSigmask
 from  showcase.apptemplate   import demoAppTemplate
-from  showcase.datetime      import demoDateTimePicker
+from  showcase.date_time     import demoDateTimePicker
 
 def stupidPythonHighlighter(txt):
     def _colorize(regex, txt, color):
@@ -185,7 +185,7 @@ def demoShowcase(root=None, border=True):
     tabPickers.addTab(demoFilePicker(),     " File Picker ",     'showcase/filepicker.py')
     tabPickers.addTab(demoColorPicker(),    " Color Picker ",    'showcase/colorpicker.py')
     tabPickers.addTab(demoTextPicker(),     " Text Picker ",     'showcase/textpicker.py')
-    tabPickers.addTab(demoDateTimePicker(), " DateTime Picker ", 'showcase/datetime.py')
+    tabPickers.addTab(demoDateTimePicker(), " DateTime Picker ", 'showcase/date_time.py')
     tabPickers.addMenu("sources", ttk.TTkK.RIGHT, tabPickers).menuButtonClicked.connect(lambda _menuButton : showSource(_menuButton.data().currentData()))
 
     listMenu.addItem(f"Graphs")
@@ -243,7 +243,7 @@ def main():
 
     root = ttk.TTk(title="pyTermTk Demo", mouseTrack=mouseTrack)
     if windowed:
-        winTabbed1 = ttk.TTkWindow(parent=root,pos=(0,0), size=(120,40), title="pyTermTk Showcase", border=True, layout=ttk.TTkGridLayout(), flags=ttk.TTkK.NONE)
+        winTabbed1 = ttk.TTkWindow(parent=root,pos=(0,0), size=(120,40), title="pyTermTk Showcase", border=True, layout=ttk.TTkGridLayout(), flags=ttk.TTkK.WindowFlag.NONE)
         border = True
     else:
         root.setLayout(ttk.TTkGridLayout())

demo/showcase/datetime.py demo/showcase/date_time.pydemo/showcase/datetime.py renamed to demo/showcase/date_time.py

@@ -69,7 +69,7 @@ def demoWindowsFlags(root=None):
                     flags = ttk.TTkK.WindowFlag.WindowMaximizeButtonHint | ttk.TTkK.WindowFlag.WindowCloseButtonHint)
     # Disable all the control buttons
     WindowFlagsTest(parent=frame, pos = (4,4), size=(40,8), title="Test Window 3",
-                    flags = ttk.TTkK.NONE)
+                    flags = ttk.TTkK.WindowFlag.NONE)
     # Enable only the Max and Min Buttons
     WindowFlagsTest(parent=frame, pos = (6,6), size=(40,8), title="Test Window 4",
                     flags = ttk.TTkK.WindowFlag.WindowMinMaxButtonsHint)

demo/showcase/windowsflags.py

@@ -22,6 +22,8 @@
 
 __all__ = ['TTkKeyEvent']
 
+from typing import Union
+
 from TermTk.TTkCore.constant import TTkK
 
 class TTkKeyEvent:
@@ -60,7 +62,7 @@ class TTkKeyEvent:
 
     '''
     __slots__ = ('type', 'key', 'code', 'mod')
-    def __init__(self, type:int, key: str, code: str, mod: int):
+    def __init__(self, type:int, key: Union[str,int], code: str, mod: int):
         self.type = type
         self.key = key
         self.mod = mod

libs/pyTermTk/TermTk/TTkCore/TTkTerm/inputkey.py

@@ -19,13 +19,18 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
+from __future__ import annotations
 
 __all__ = ['TTkCfg', 'TTkGlbl']
 
-from TermTk.TTkCore.constant import TTkK
+from typing import TYPE_CHECKING, Optional
+if TYPE_CHECKING:
+    from TermTk.TTkTheme.theme import TTkTheme
+
 from TermTk import __version__
+from TermTk.TTkCore.constant import TTkK
 
-class TTkCfg:
+class _TTkCfg:
     version:str = __version__
     name:str = "pyTermTk"
 
@@ -36,8 +41,17 @@ class TTkCfg:
     doubleBuffer:bool = True
     doubleBufferNew:bool = False
 
-    scrollDelta:bool = 5
-    theme = None
+    scrollDelta:int = 5
+
+    _theme:Optional[TTkTheme] = None
+    @property
+    def theme(self) -> TTkTheme:
+        if not TTkCfg._theme:
+            from TermTk.TTkTheme.theme import TTkTheme
+            TTkCfg._theme = TTkTheme()
+        return TTkCfg._theme
+
+TTkCfg = _TTkCfg()
 
 class TTkGlbl:
     term_w: int = 0

libs/pyTermTk/TermTk/TTkCore/cfg.py

@@ -565,7 +565,7 @@ class LayoutItemTypes(int):
     LayoutItem = LayoutItemTypes.LayoutItem
     WidgetItem = LayoutItemTypes.WidgetItem
 
-    class WindowFlag(int):
+    class WindowFlag(Flag):
         '''
         Those flags are used to enable customization of the window controls.
 
@@ -576,6 +576,8 @@ class WindowFlag(int):
           WindowMinMaxButtonsHint
           WindowCloseButtonHint
         '''
+        NONE = 0
+        '''Empty flag'''
         # FramelessWindowHint         = 0x00000800
         # ''' Produces a borderless window.'''
         # CustomizeWindowHint         = 0x02000000
@@ -676,7 +678,7 @@ class KeyModifier(int):
     CTRL  = KeyModifier.CTRL
     ALT   = KeyModifier.ALT
 
-    class ShortcutContext(int):
+    class ShortcutContext(IntEnum):
         '''
         For a :py:class:`TTkShortcut` event to occur,
         the shortcut's key sequence must be entered by the user in a context where the shortcut is active.

libs/pyTermTk/TermTk/TTkCore/constant.py

@@ -20,21 +20,27 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+from __future__ import annotations
+
 __all__ = ['TTkShortcut']
 
+from typing import TYPE_CHECKING,Dict,List,Union,Optional
+
 from TermTk.TTkCore.log import TTkLog
 from TermTk.TTkCore.constant import TTkK
 from TermTk.TTkCore.helper import TTkHelper
 from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal
 from TermTk.TTkCore.TTkTerm.inputkey import TTkKeyEvent
 
-class TTkStandardKey():
+if TYPE_CHECKING:
+    from TermTk.TTkWidgets.widget import TTkWidget
+
+class _TTkStandardKey():
     pass
 
-class TTkKeySequence():
+class _TTkKeySequence():
     __slots__ = ('_key')
     def __init__(self, key:int):
-        self._key = key
         mod = (
             ( TTkK.ControlModifier if key & TTkK.CTRL  else 0 ) |
             ( TTkK.AltModifier     if key & TTkK.ALT   else 0 ) |
@@ -47,27 +53,27 @@ def __init__(self, key:int):
         else:
             self._key = TTkKeyEvent(mod=mod, code="", type=TTkK.Character,  key=chr(key) )
 
-
-
     def __hash__(self) -> int:
         return self._key.__hash__()
 
-    def __eq__(self, __value: object) -> bool:
-        pass
 
 class TTkShortcut():
     '''TTkShortcut'''
-    _shortcuts = {}
+    _shortcuts:Dict[TTkKeyEvent,List[TTkShortcut]] = {}
     __slots__ = (
-        '_key', '_parent', '_shortcutContext',
+        '_parent', '_shortcutContext',
         # Signals
         'activated')
     def __init__(self,
-                 key:int, parent=None,
+                 key:Union[int,TTkKeyEvent], parent:Optional['TTkWidget']=None,
                  shortcutContext: TTkK.ShortcutContext = TTkK.ShortcutContext.WindowShortcut):
         if type(key) == int:
-            key = TTkKeySequence(key)._key
-        self._key = key
+            key = _TTkKeySequence(key)._key
+        elif isinstance(key, TTkKeyEvent):
+            key = key
+        else:
+            raise TypeError(f"{key=} is not int or TTkKeyEvent")
+
         self._parent = parent
         self._shortcutContext = shortcutContext
         # Signals
@@ -77,24 +83,17 @@ def __init__(self,
         TTkShortcut._shortcuts[key].append(self)
 
     @staticmethod
-    def processKey(key, focusWidget):
-        # TTkLog.debug(f"{str(key)=}")
-        # for k in TTkShortcut._shortcuts:
-        #     TTkLog.debug(f"{str(k)=} - {key==k=}")
-        if key in TTkShortcut._shortcuts:
-            for sc in TTkShortcut._shortcuts[key]:
-                # if sc._parent:
-                #     TTkLog.debug(f"{focusWidget=} {sc._parent=} {sc._parent._parent=}")
-                # else:
-                #     TTkLog.debug(f"{focusWidget=} {sc._parent=}")
-                if ( (   sc._shortcutContext == TTkK.WidgetShortcut
-                       and focusWidget == sc._parent )
-                  or ( sc._shortcutContext == TTkK.WidgetWithChildrenShortcut
-                        and (  focusWidget == sc._parent
-                            or TTkHelper.isParent(sc._parent,focusWidget) ) )
-                  or ( sc._shortcutContext == TTkK.WindowShortcut )
-                  or ( sc._shortcutContext == TTkK.ApplicationShortcut )):
-                    if sc.activated._connected_slots:
-                        sc.activated.emit()
-                        return True
+    def processKey(key:TTkKeyEvent, focusWidget:'TTkWidget') -> bool:
+        for sc in TTkShortcut._shortcuts.get(key,[]):
+            if (   ( sc._shortcutContext == TTkK.WidgetShortcut
+                     and focusWidget == sc._parent )
+                or ( sc._shortcutContext == TTkK.WidgetWithChildrenShortcut
+                     and sc._parent
+                     and ( focusWidget == sc._parent
+                           or TTkHelper.isParent(sc._parent,focusWidget) ) )
+                or ( sc._shortcutContext == TTkK.WindowShortcut )
+                or ( sc._shortcutContext == TTkK.ApplicationShortcut )):
+                if sc.activated._connected_slots:
+                    sc.activated.emit()
+                    return True
         return False

libs/pyTermTk/TermTk/TTkCore/shortcut.py

@@ -179,8 +179,8 @@ def __ne__(self, other): return self._text != other._text if issubclass(type(oth
     def __gt__(self, other): return self._text >  other._text if issubclass(type(other),TTkString) else self._text >  other
     def __ge__(self, other): return self._text >= other._text if issubclass(type(other),TTkString) else self._text >= other
 
-    def sameAs(self, other:TTkString) -> bool:
-        if not issubclass(type(other),TTkString): return False
+    def sameAs(self, other:TTkStringType) -> bool:
+        if not isinstance(other,TTkString): return False
         return (
             self==other and
             len(self._colors) == len(other._colors) and
@@ -602,7 +602,7 @@ def findall(self, regexp, ignoreCase=False):
     def getIndexes(self, char):
         return [i for i,c in enumerate(self._text) if c==char]
 
-    def join(self, strings:Union[GeneratorType[TTkStringType,None,None],List[TTkStringType]]) -> TTkString:
+    def join(self, strings:Union[GeneratorType[TTkStringType,None,None],List[TTkStringType],List[TTkString],List[str]]) -> TTkString:
         ''' Join the input strings using the current as separator
 
         :param strings: the list of strings to be joined
@@ -638,7 +638,7 @@ def _getWidthText(txt:str):
             sum(unicodedata.category(ch) in ('Me','Mn') for ch in txt) )
 
     @staticmethod
-    def _getLenTextWoZero(txt:str):
+    def _getLenTextWoZero(txt:str) -> int:
         return ( len(txt) -
             sum(unicodedata.category(ch) in ('Me','Mn') for ch in txt) )
 

libs/pyTermTk/TermTk/TTkCore/string.py

@@ -20,17 +20,19 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+from __future__ import annotations
+
 __all__ = ['TTkTimer']
 
-from typing import Optional,Callable
+from typing import Optional,Callable,Dict
 
 from TermTk.TTkCore.helper import TTkHelper
 from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal
 
 import pyodideProxy
 
 class TTkTimer():
-    _timers = {}
+    _timers:Dict[int,TTkTimer] = {}
     _uid = 0
 
     __slots__ = (

libs/pyTermTk/TermTk/TTkCore/timer_pyodide.py

@@ -119,6 +119,7 @@ class TTk(TTkContainer):
 
     _timer:TTkTimer
     _exceptions:List[Exception]
+    _mouseCursor:Optional[_MouseCursor]
 
     def __init__(self, *,
                  title:str='TermTk',
@@ -223,7 +224,6 @@ def _mainloop(self) -> None:
             if self._showMouseCursor:
                 self._mouseCursor = _MouseCursor()
                 self._mouseCursor.updated.connect(self.update)
-                self.paintChildCanvas = self._mouseCursorPaintChildCanvas
 
             if platform.system() != 'Emscripten':
                 TTkInput.start()
@@ -278,7 +278,7 @@ def _quit_timer(self) -> None:
         self._timer.quit()
         self._paintEvent.set()
 
-    def _mouseCursorPaintChildCanvas(self) -> None:
+    def paintChildCanvas(self) -> None:
         super().paintChildCanvas()
         if self._mouseCursor:
             ch = self._mouseCursor._cursor