diff --git a/TermTk/TTkTestWidgets/logviewer.py b/TermTk/TTkTestWidgets/logviewer.py index db9dc17d..5347651e 100644 --- a/TermTk/TTkTestWidgets/logviewer.py +++ b/TermTk/TTkTestWidgets/logviewer.py @@ -80,7 +80,8 @@ class TTkLogViewer(TTkAbstractScrollArea): __slots__ = ('_logView') def __init__(self, *args, **kwargs): TTkAbstractScrollArea.__init__(self, *args, **kwargs) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent',None) + kwargs.pop('visible',None) self._logView = _TTkLogViewer(*args, **kwargs) self.setFocusPolicy(TTkK.ClickFocus) self.setViewport(self._logView) diff --git a/TermTk/TTkWidgets/Fancy/table.py b/TermTk/TTkWidgets/Fancy/table.py index 4233f272..e7992efd 100644 --- a/TermTk/TTkWidgets/Fancy/table.py +++ b/TermTk/TTkWidgets/Fancy/table.py @@ -37,7 +37,8 @@ class TTkFancyTable(TTkAbstractScrollArea): def __init__(self, *args, **kwargs): TTkAbstractScrollArea.__init__(self, *args, **kwargs) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent',None) + kwargs.pop('visible',None) self._tableView = TTkFancyTableView(*args, **kwargs) # Forward the signal self.activated = self._tableView.activated diff --git a/TermTk/TTkWidgets/Fancy/tableview.py b/TermTk/TTkWidgets/Fancy/tableview.py index 77ef67c9..a6902002 100644 --- a/TermTk/TTkWidgets/Fancy/tableview.py +++ b/TermTk/TTkWidgets/Fancy/tableview.py @@ -376,7 +376,8 @@ class TTkFancyTableView(TTkAbstractScrollView): def __init__(self, **kwargs): self._excludeEvent = False super().__init__(**(kwargs|{'layout':TTkGridLayout()})) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent',None) + kwargs.pop('visible',None) self._showHeader = kwargs.get('showHeader', True) self._tableView = _TTkFancyTableView(**kwargs) self._header = _TTkFancyTableViewHeader(**kwargs) diff --git a/TermTk/TTkWidgets/Fancy/tree.py b/TermTk/TTkWidgets/Fancy/tree.py index 975e2be6..db26c86a 100644 --- a/TermTk/TTkWidgets/Fancy/tree.py +++ b/TermTk/TTkWidgets/Fancy/tree.py @@ -34,7 +34,8 @@ class TTkFancyTree(TTkAbstractScrollArea): def __init__(self, *args, **kwargs): TTkAbstractScrollArea.__init__(self, *args, **kwargs) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent',None) + kwargs.pop('visible',None) self._treeView = TTkFancyTreeWidget(*args, **kwargs) # Forward the signal self.activated = self._treeView.activated diff --git a/TermTk/TTkWidgets/Fancy/treewidget.py b/TermTk/TTkWidgets/Fancy/treewidget.py index 80117c60..7e29bdc9 100644 --- a/TermTk/TTkWidgets/Fancy/treewidget.py +++ b/TermTk/TTkWidgets/Fancy/treewidget.py @@ -81,7 +81,8 @@ class TTkFancyTreeWidget(TTkFancyTableView): super().__init__(*args, **kwargs) self._topLevelItems = TTkFancyTreeWidgetItem(None) self.doubleClicked.connect(self._doubleClickItem) - # if 'parent' in kwargs: kwargs.pop('parent') + # kwargs.pop('parent',None) + # kwargs.pop('visible',None) def _expand(self, item, depth): item.setExpand(True) diff --git a/TermTk/TTkWidgets/TTkModelView/tree.py b/TermTk/TTkWidgets/TTkModelView/tree.py index a7b62fde..b73a5323 100644 --- a/TermTk/TTkWidgets/TTkModelView/tree.py +++ b/TermTk/TTkWidgets/TTkModelView/tree.py @@ -38,7 +38,8 @@ class TTkTree(TTkAbstractScrollArea): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent',None) + kwargs.pop('visible',None) self._treeView = kwargs.get('treeWidget',TTkTreeWidget(*args, **kwargs)) self.setViewport(self._treeView) self.setFocusPolicy(TTkK.ClickFocus) diff --git a/TermTk/TTkWidgets/TTkPickers/textpicker.py b/TermTk/TTkWidgets/TTkPickers/textpicker.py index 32ee4f09..d2b37c64 100644 --- a/TermTk/TTkWidgets/TTkPickers/textpicker.py +++ b/TermTk/TTkWidgets/TTkPickers/textpicker.py @@ -123,7 +123,8 @@ class _emojiPickerArea(TTkAbstractScrollArea): __slots__ = ('_areaView') def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent',None) + kwargs.pop('visible',None) self._areaView = _emojiPickerView(*args, **kwargs) self.setFocusPolicy(TTkK.ClickFocus) self.setViewport(self._areaView) diff --git a/TermTk/TTkWidgets/TTkTerminal/terminal.py b/TermTk/TTkWidgets/TTkTerminal/terminal.py index 76d1b244..990b6620 100644 --- a/TermTk/TTkWidgets/TTkTerminal/terminal.py +++ b/TermTk/TTkWidgets/TTkTerminal/terminal.py @@ -44,7 +44,8 @@ class TTkTerminal(TTkAbstractScrollArea): 'termData', 'termResized') def __init__(self, *args, **kwargs): TTkAbstractScrollArea.__init__(self, *args, **kwargs) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent',None) + kwargs.pop('visible',None) self._terminalView = TTkTerminalView(*args, **kwargs) self.setFocusPolicy(TTkK.ClickFocus) self.setViewport(self._terminalView) diff --git a/TermTk/TTkWidgets/kodetab.py b/TermTk/TTkWidgets/kodetab.py index d98478aa..cd54c04c 100644 --- a/TermTk/TTkWidgets/kodetab.py +++ b/TermTk/TTkWidgets/kodetab.py @@ -190,7 +190,8 @@ class TTkKodeTab(TTkSplitter): self.tabBarClicked = pyTTkSignal(TTkTabWidget,int,TTkWidget,object) self.tabCloseRequested = pyTTkSignal(TTkTabWidget,int) super().__init__(**kwargs|{'layout':TTkGridLayout()}) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent',None) + kwargs.pop('visible',None) # self.layout().addWidget(splitter := TTkSplitter()) self._lastKodeTabWidget = _TTkKodeTab(baseWidget=self, **kwargs) self.addWidget(self._lastKodeTabWidget) diff --git a/TermTk/TTkWidgets/list_.py b/TermTk/TTkWidgets/list_.py index b6450e30..b2fe3f68 100644 --- a/TermTk/TTkWidgets/list_.py +++ b/TermTk/TTkWidgets/list_.py @@ -40,7 +40,8 @@ class TTkList(TTkAbstractScrollArea): def __init__(self, *args, **kwargs): TTkAbstractScrollArea.__init__(self, *args, **kwargs) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent',None) + kwargs.pop('visible',None) self._listView = kwargs.get('listWidget',TTkListWidget(*args, **kwargs)) self.setViewport(self._listView) self.itemClicked = self._listView.itemClicked diff --git a/TermTk/TTkWidgets/scrollarea.py b/TermTk/TTkWidgets/scrollarea.py index 597e04d1..6f33484a 100644 --- a/TermTk/TTkWidgets/scrollarea.py +++ b/TermTk/TTkWidgets/scrollarea.py @@ -55,7 +55,8 @@ class TTkScrollArea(TTkAbstractScrollArea): __slots__ = ('_areaView') def __init__(self, *args, **kwargs): TTkAbstractScrollArea.__init__(self, *args, **kwargs) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent',None) + kwargs.pop('visible',None) self._areaView = _TTkAreaWidget(*args, **kwargs) self.setFocusPolicy(TTkK.ClickFocus) self.setViewport(self._areaView) \ No newline at end of file diff --git a/TermTk/TTkWidgets/texedit.py b/TermTk/TTkWidgets/texedit.py index 760ce4d3..52691fa6 100644 --- a/TermTk/TTkWidgets/texedit.py +++ b/TermTk/TTkWidgets/texedit.py @@ -804,7 +804,8 @@ class TTkTextEdit(TTkAbstractScrollArea): ) def __init__(self, textEditView=None, lineNumber=False, lineNumberStarting=0, **kwargs): super().__init__(**kwargs) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent', None) + kwargs.pop('visible', None) self._textEditView = textEditView if textEditView else TTkTextEditView(**kwargs) # self.setFocusPolicy(self._textEditView.focusPolicy()) # self._textEditView.setFocusPolicy(TTkK.ParentFocus) diff --git a/tests/t.ui/test.ui.021.abstractscroll.01.py b/tests/t.ui/test.ui.021.abstractscroll.01.py index c9938be6..fe52695c 100755 --- a/tests/t.ui/test.ui.021.abstractscroll.01.py +++ b/tests/t.ui/test.ui.021.abstractscroll.01.py @@ -31,7 +31,8 @@ class ScrollAreaTest(ttk.TTkAbstractScrollArea): __slots__ = ('_areaView') def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent',None) + kwargs.pop('visible',None) self.setFocusPolicy(ttk.TTkK.ClickFocus) self.setViewport(ttk.TTkTestAbstractScrollWidget(areaSize=(100,40), areaPos=(10,5))) diff --git a/tests/t.ui/test.ui.021.abstractscroll.02.py b/tests/t.ui/test.ui.021.abstractscroll.02.py index 983fc185..fe5d78a8 100755 --- a/tests/t.ui/test.ui.021.abstractscroll.02.py +++ b/tests/t.ui/test.ui.021.abstractscroll.02.py @@ -31,7 +31,8 @@ class ScrollAreaTest(ttk.TTkAbstractScrollArea): __slots__ = ('_areaView') def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - if 'parent' in kwargs: kwargs.pop('parent') + kwargs.pop('parent',None) + kwargs.pop('visible',None) self.setFocusPolicy(ttk.TTkK.ClickFocus) scrollLayout = ttk.TTkAbstractScrollViewGridLayout() w1 = ttk.TTkTestAbstractScrollWidget(areaSize=(100,40), areaPos=(10,5))