From 64b69b76c08c83cf2a820d8343f8a12edcc7cbd2 Mon Sep 17 00:00:00 2001 From: Eugenio Parodi Date: Thu, 31 Aug 2023 23:52:16 +0100 Subject: [PATCH] Reworked the import of Abstract,Gui,LAyouts --- TermTk/TTkAbstract/__init__.py | 6 +++--- TermTk/TTkAbstract/abstractitemmodel.py | 2 ++ TermTk/TTkAbstract/abstractscrollarea.py | 2 ++ TermTk/TTkAbstract/abstractscrollview.py | 2 ++ TermTk/TTkGui/__init__.py | 12 ++++++------ TermTk/TTkGui/clipboard.py | 2 ++ TermTk/TTkGui/drag.py | 2 ++ TermTk/TTkGui/textcursor.py | 2 ++ TermTk/TTkGui/textdocument.py | 2 ++ TermTk/TTkGui/textwrap1.py | 2 ++ TermTk/TTkGui/tooltip.py | 2 ++ TermTk/TTkLayouts/__init__.py | 4 ++-- TermTk/TTkLayouts/boxlayout.py | 2 ++ TermTk/TTkLayouts/gridlayout.py | 2 ++ TermTk/TTkLayouts/layout.py | 2 ++ 15 files changed, 35 insertions(+), 11 deletions(-) diff --git a/TermTk/TTkAbstract/__init__.py b/TermTk/TTkAbstract/__init__.py index 3137a2e9..9ed30ad1 100644 --- a/TermTk/TTkAbstract/__init__.py +++ b/TermTk/TTkAbstract/__init__.py @@ -1,3 +1,3 @@ -from .abstractscrollview import TTkAbstractScrollViewInterface, TTkAbstractScrollView, TTkAbstractScrollViewGridLayout -from .abstractscrollarea import TTkAbstractScrollArea -from .abstractitemmodel import TTkAbstractItemModel +from .abstractscrollview import * +from .abstractscrollarea import * +from .abstractitemmodel import * diff --git a/TermTk/TTkAbstract/abstractitemmodel.py b/TermTk/TTkAbstract/abstractitemmodel.py index 24421a22..5558abdd 100644 --- a/TermTk/TTkAbstract/abstractitemmodel.py +++ b/TermTk/TTkAbstract/abstractitemmodel.py @@ -24,6 +24,8 @@ from TermTk.TTkCore.signal import pyTTkSignal +__all__ = ['TTkAbstractItemModel'] + class TTkAbstractItemModel(): __slots__ = ( # Signals diff --git a/TermTk/TTkAbstract/abstractscrollarea.py b/TermTk/TTkAbstract/abstractscrollarea.py index 310d50ea..57e71837 100644 --- a/TermTk/TTkAbstract/abstractscrollarea.py +++ b/TermTk/TTkAbstract/abstractscrollarea.py @@ -29,6 +29,8 @@ from TermTk.TTkWidgets.scrollbar import TTkScrollBar from TermTk.TTkLayouts.gridlayout import TTkGridLayout from TermTk.TTkAbstract.abstractscrollview import TTkAbstractScrollViewInterface +__all__ = ['TTkAbstractScrollArea'] + class TTkAbstractScrollArea(TTkContainer): __slots__ = ( '_processing', # this flag is required to avoid unnecessary loop on edge cases diff --git a/TermTk/TTkAbstract/abstractscrollview.py b/TermTk/TTkAbstract/abstractscrollview.py index 45bd65c2..896ab6e4 100644 --- a/TermTk/TTkAbstract/abstractscrollview.py +++ b/TermTk/TTkAbstract/abstractscrollview.py @@ -29,6 +29,8 @@ from TermTk.TTkWidgets.widget import TTkWidget from TermTk.TTkWidgets.container import TTkContainer from TermTk.TTkLayouts.gridlayout import TTkGridLayout +__all__ = ['TTkAbstractScrollViewInterface', 'TTkAbstractScrollView', 'TTkAbstractScrollViewGridLayout'] + class TTkAbstractScrollViewInterface(): # Override this function def viewFullAreaSize(self) -> (int, int): diff --git a/TermTk/TTkGui/__init__.py b/TermTk/TTkGui/__init__.py index 33cfe160..fed17c31 100644 --- a/TermTk/TTkGui/__init__.py +++ b/TermTk/TTkGui/__init__.py @@ -1,6 +1,6 @@ -from .drag import TTkDrag, TTkDropEvent -from .textwrap1 import TTkTextWrap -from .textcursor import TTkTextCursor -from .textdocument import TTkTextDocument -from .clipboard import TTkClipboard -from .tooltip import TTkToolTip +from .drag import * +from .textwrap1 import * +from .textcursor import * +from .textdocument import * +from .clipboard import * +from .tooltip import * diff --git a/TermTk/TTkGui/clipboard.py b/TermTk/TTkGui/clipboard.py index f98542ec..569492bb 100644 --- a/TermTk/TTkGui/clipboard.py +++ b/TermTk/TTkGui/clipboard.py @@ -24,6 +24,8 @@ import importlib.util +__all__ = ['TTkClipboard'] + class TTkClipboard(): _clipboard = '' __slots__ = ('_setText', '_text') diff --git a/TermTk/TTkGui/drag.py b/TermTk/TTkGui/drag.py index fbf7a621..83fca832 100644 --- a/TermTk/TTkGui/drag.py +++ b/TermTk/TTkGui/drag.py @@ -26,6 +26,8 @@ from TermTk.TTkCore.helper import TTkHelper from TermTk.TTkCore.canvas import TTkCanvas from TermTk.TTkWidgets.widget import TTkWidget +__all__ = ['TTkDrag', 'TTkDropEvent'] + class _TTkDragDisplayWidget(TTkWidget): __slots__ = ('_pixmap') diff --git a/TermTk/TTkGui/textcursor.py b/TermTk/TTkGui/textcursor.py index 1e008cf0..4c8541b4 100644 --- a/TermTk/TTkGui/textcursor.py +++ b/TermTk/TTkGui/textcursor.py @@ -27,6 +27,8 @@ from TermTk.TTkCore.color import TTkColor from TermTk.TTkCore.string import TTkString from TermTk.TTkGui.textdocument import TTkTextDocument +__all__ = ['TTkTextCursor'] + class TTkTextCursor(): class MoveMode(): MoveAnchor = 0x00 diff --git a/TermTk/TTkGui/textdocument.py b/TermTk/TTkGui/textdocument.py index 10a9a717..0907c2de 100644 --- a/TermTk/TTkGui/textdocument.py +++ b/TermTk/TTkGui/textdocument.py @@ -26,6 +26,8 @@ from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.signal import pyTTkSignal, pyTTkSlot from TermTk.TTkCore.string import TTkString +__all__ = ['TTkTextDocument'] + class TTkTextDocument(): ''' Undo,Redo Logic diff --git a/TermTk/TTkGui/textwrap1.py b/TermTk/TTkGui/textwrap1.py index 9a149334..94d34110 100644 --- a/TermTk/TTkGui/textwrap1.py +++ b/TermTk/TTkGui/textwrap1.py @@ -28,6 +28,8 @@ from TermTk.TTkCore.string import TTkString from TermTk.TTkGui.textcursor import TTkTextCursor from TermTk.TTkGui.textdocument import TTkTextDocument +__all__ = ['TTkTextWrap'] + class TTkTextWrap(): __slots__ = ( '_lines', '_textDocument', '_tabSpaces', diff --git a/TermTk/TTkGui/tooltip.py b/TermTk/TTkGui/tooltip.py index a0767c63..9037ecdd 100644 --- a/TermTk/TTkGui/tooltip.py +++ b/TermTk/TTkGui/tooltip.py @@ -31,6 +31,8 @@ from TermTk.TTkCore.string import TTkString from TermTk.TTkWidgets.widget import TTkWidget from TermTk.TTkCore.signal import pyTTkSlot +__all__ = ['TTkToolTip'] + class _TTkToolTipDisplayWidget(TTkWidget): __slots__ = ('_toolTip', '_x', '_y') def __init__(self, *args, **kwargs): diff --git a/TermTk/TTkLayouts/__init__.py b/TermTk/TTkLayouts/__init__.py index b921e528..00d8c30e 100644 --- a/TermTk/TTkLayouts/__init__.py +++ b/TermTk/TTkLayouts/__init__.py @@ -4,6 +4,6 @@ Layouts .. image:: /../_images/Layout.HLD.001.svg ''' -from .layout import * +from .layout import * from .gridlayout import * -from .boxlayout import * +from .boxlayout import * diff --git a/TermTk/TTkLayouts/boxlayout.py b/TermTk/TTkLayouts/boxlayout.py index 259d0161..2d714e07 100644 --- a/TermTk/TTkLayouts/boxlayout.py +++ b/TermTk/TTkLayouts/boxlayout.py @@ -29,6 +29,8 @@ from TermTk.TTkCore.constant import TTkK from TermTk.TTkLayouts.gridlayout import TTkGridLayout +__all__ = ['TTkHBoxLayout', 'TTkVBoxLayout'] + class TTkHBoxLayout(TTkGridLayout): ''' The TTkHBoxLayout class lines up widgets horizontally diff --git a/TermTk/TTkLayouts/gridlayout.py b/TermTk/TTkLayouts/gridlayout.py index cf97b0aa..9c391abd 100644 --- a/TermTk/TTkLayouts/gridlayout.py +++ b/TermTk/TTkLayouts/gridlayout.py @@ -29,6 +29,8 @@ from TermTk.TTkCore.constant import TTkK from TermTk.TTkLayouts.layout import TTkLayout +__all__ = ['TTkGridLayout'] + class TTkGridLayout(TTkLayout): ''' The grid layout allows an automatic place all the widgets in a grid,
diff --git a/TermTk/TTkLayouts/layout.py b/TermTk/TTkLayouts/layout.py index 73d87abc..1ae9f0db 100644 --- a/TermTk/TTkLayouts/layout.py +++ b/TermTk/TTkLayouts/layout.py @@ -28,6 +28,8 @@ from TermTk.TTkCore.constant import TTkK +__all__ = ['TTkLayoutItem', 'TTkLayout'] + class TTkLayoutItem: ''' :class:`~TTkLayoutItem` is the base class of layout Items inherited by :class:`~TTkLayout`, :class:`~TTkWidgetItem`, and all the derived layout managers.