Browse Source

FIX: removed 'self' from 'super()' usage

pull/34/head
Eugenio Parodi 4 years ago
parent
commit
eaadff0cb0
  1. 2
      TermTk/TTkAbstract/abstractscrollarea.py
  2. 2
      TermTk/TTkAbstract/abstractscrollview.py
  3. 2
      TermTk/TTkWidgets/Fancy/tableview.py
  4. 2
      TermTk/TTkWidgets/Fancy/treeview.py
  5. 6
      TermTk/TTkWidgets/Fancy/treewidget.py
  6. 2
      TermTk/TTkWidgets/TTkModelView/treewidget.py
  7. 2
      TermTk/TTkWidgets/TTkModelView/treewidgetitem.py
  8. 7
      TermTk/TTkWidgets/texedit.py
  9. 2
      demo/showcase/textedit.py

2
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)

2
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

2
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)

2
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')

6
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)

2
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

2
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)

7
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)

2
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():

Loading…
Cancel
Save