diff --git a/TermTk/TTkAbstract/abstractscrollarea.py b/TermTk/TTkAbstract/abstractscrollarea.py index fe01fc59..6221afd8 100644 --- a/TermTk/TTkAbstract/abstractscrollarea.py +++ b/TermTk/TTkAbstract/abstractscrollarea.py @@ -38,7 +38,7 @@ class TTkAbstractScrollArea(TTkWidget): '_horizontalScrollBar', '_horizontalScrollBarPolicy',) def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self._name = kwargs.get('name' , 'TTkAbstractScrollArea') self.setLayout(TTkGridLayout()) self._verticalScrollBar = TTkScrollBar(orientation=TTkK.VERTICAL) diff --git a/TermTk/TTkAbstract/abstractscrollview.py b/TermTk/TTkAbstract/abstractscrollview.py index 60af2b56..db7d9c58 100644 --- a/TermTk/TTkAbstract/abstractscrollview.py +++ b/TermTk/TTkAbstract/abstractscrollview.py @@ -39,7 +39,7 @@ class TTkAbstractScrollView(TTkWidget): self.viewMovedTo = pyTTkSignal(int, int) # x, y self.viewSizeChanged = pyTTkSignal(int, int) # w, h self.viewChanged = pyTTkSignal() - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self._name = kwargs.get('name' , 'TTkAbstractScrollView') self._viewOffsetX = 0 diff --git a/TermTk/TTkWidgets/Fancy/tableview.py b/TermTk/TTkWidgets/Fancy/tableview.py index 1c6e2930..ff7a58fc 100644 --- a/TermTk/TTkWidgets/Fancy/tableview.py +++ b/TermTk/TTkWidgets/Fancy/tableview.py @@ -343,7 +343,7 @@ class TTkFancyTableView(TTkAbstractScrollView): 'removeItem', 'removeItemAt', 'removeItemsFrom', 'doubleClicked') def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self._name = kwargs.get('name' , 'TTkFancyTableView' ) if 'parent' in kwargs: kwargs.pop('parent') self._showHeader = kwargs.get('showHeader', True) diff --git a/TermTk/TTkWidgets/Fancy/treeview.py b/TermTk/TTkWidgets/Fancy/treeview.py index 3a5d296e..1fd1a64e 100644 --- a/TermTk/TTkWidgets/Fancy/treeview.py +++ b/TermTk/TTkWidgets/Fancy/treeview.py @@ -33,7 +33,7 @@ class TTkFancyTreeView(TTkFancyTableView): __slots__ = ( '_header', '_treeView', '_showHeader', 'activated') def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self._name = kwargs.get('name' , 'TTkFancyTreeView' ) # if 'parent' in kwargs: kwargs.pop('parent') diff --git a/TermTk/TTkWidgets/Fancy/treewidget.py b/TermTk/TTkWidgets/Fancy/treewidget.py index 80cd4959..624786eb 100644 --- a/TermTk/TTkWidgets/Fancy/treewidget.py +++ b/TermTk/TTkWidgets/Fancy/treewidget.py @@ -35,7 +35,7 @@ from TermTk.TTkWidgets.Fancy.treewidgetitem import TTkFancyTreeWidgetItem class _TTkDisplayedTreeItemControl(TTkCheckbox): def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self._name = kwargs.get('name' , '_TTkDisplayedTreeItemControl' ) self.setMinimumSize(1, 1) @@ -49,7 +49,7 @@ class _TTkDisplayedTreeItemControl(TTkCheckbox): class _TTkDisplayedTreeItem(TTkWidget): __slots__ = ('_depth', '_control', '_text', '_id', '_clicked', '_treeWidgetItem', '_isLeaf' ) def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) #Signals self._clicked = pyTTkSignal(bool, _TTkDisplayedTreeItem, TTkFancyTreeWidgetItem) @@ -81,7 +81,7 @@ class TTkFancyTreeWidget(TTkFancyTableView): __slots__ = ( '_topLevelItems') def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self._name = kwargs.get('name' , 'TTkFancyTreeView' ) self._topLevelItems = TTkFancyTreeWidgetItem(None) self.doubleClicked.connect(self._doubleClickItem) diff --git a/TermTk/TTkWidgets/TTkModelView/treewidget.py b/TermTk/TTkWidgets/TTkModelView/treewidget.py index ecf70c0e..7ec2106c 100644 --- a/TermTk/TTkWidgets/TTkModelView/treewidget.py +++ b/TermTk/TTkWidgets/TTkModelView/treewidget.py @@ -55,7 +55,7 @@ class TTkTreeWidget(TTkAbstractScrollView): self.itemExpanded = pyTTkSignal(TTkTreeWidgetItem) self.itemCollapsed = pyTTkSignal(TTkTreeWidgetItem) - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self._name = kwargs.get('name' , 'TTkTreeView' ) self._selected = None self._selectedId = None diff --git a/TermTk/TTkWidgets/TTkModelView/treewidgetitem.py b/TermTk/TTkWidgets/TTkModelView/treewidgetitem.py index 5e685d50..61ee2628 100644 --- a/TermTk/TTkWidgets/TTkModelView/treewidgetitem.py +++ b/TermTk/TTkWidgets/TTkModelView/treewidgetitem.py @@ -41,7 +41,7 @@ class TTkTreeWidgetItem(TTkAbstractItemModel): # Signals # self.refreshData = pyTTkSignal(TTkTreeWidgetItem) tt = TTkCfg.theme.tree - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self._children = [] self._data = args[0] if len(args)>0 and type(args[0])==list else [''] self._alignment = [TTkK.LEFT_ALIGN]*len(self._data) diff --git a/TermTk/TTkWidgets/texedit.py b/TermTk/TTkWidgets/texedit.py index 8b46863e..ef81c0db 100644 --- a/TermTk/TTkWidgets/texedit.py +++ b/TermTk/TTkWidgets/texedit.py @@ -49,14 +49,14 @@ class _TTkTextEditView(TTkAbstractScrollView): This is required to support the wrap feature ''' def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self._name = kwargs.get('name' , '_TTkTextEditView' ) self._readOnly = True self._hsize = 0 self._lines = [(0,(0,0))] self._dataLines = [''] self._tabSpaces = 4 - self._wrapWidth = 30 + self._wrapWidth = 80 self._lastWrapUsed = 0 self._lineWrapMode = TTkK.NoWrap self._wordWrapMode = TTkK.NoWrap @@ -142,6 +142,7 @@ class _TTkTextEditView(TTkAbstractScrollView): if w != self._lastWrapUsed and w>self._tabSpaces: self._lastWrapUsed = w self._rewrap() + return super().resizeEvent(w,h) def _updateSize(self): self._hsize = max( [ len(l) for l in self._dataLines ] ) @@ -407,7 +408,7 @@ class TTkTextEdit(TTkAbstractScrollArea): 'wordWrapMode', 'setWordWrapMode', ) def __init__(self, *args, **kwargs): - super().__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self._name = kwargs.get('name' , 'TTkTextEdit' ) self._textEditView = _TTkTextEditView() self.setViewport(self._textEditView) diff --git a/demo/showcase/textedit.py b/demo/showcase/textedit.py index d4113b4d..8e50938f 100755 --- a/demo/showcase/textedit.py +++ b/demo/showcase/textedit.py @@ -75,7 +75,7 @@ def demoTextEdit(root=None): # Use a fixed wrap size te.setLineWrapMode(ttk.TTkK.FixedWidth) - te.setWrapWidth(40) + te.setWrapWidth(100) return te def main():