Browse Source

Cleaned the handling of the widget's name.

pull/146/head
Eugenio Parodi 3 years ago
parent
commit
25f28c266f
  1. 2
      TermTk/TTkTestWidgets/logviewer.py
  2. 1
      TermTk/TTkTestWidgets/testwidgetsizes.py
  3. 2
      TermTk/TTkUiTools/properties/menubar.py
  4. 5
      TermTk/TTkUiTools/properties/widget.py
  5. 8
      TermTk/TTkUiTools/uiloader.py
  6. 1
      TermTk/TTkWidgets/Fancy/table.py
  7. 3
      TermTk/TTkWidgets/Fancy/treeview.py
  8. 3
      TermTk/TTkWidgets/Fancy/treewidget.py
  9. 1
      TermTk/TTkWidgets/TTkModelView/filetree.py
  10. 1
      TermTk/TTkWidgets/TTkModelView/filetreewidget.py
  11. 3
      TermTk/TTkWidgets/TTkModelView/tree.py
  12. 1
      TermTk/TTkWidgets/TTkModelView/treewidget.py
  13. 1
      TermTk/TTkWidgets/graph.py
  14. 10
      TermTk/TTkWidgets/widget.py
  15. 1
      demo/paint.py
  16. 2
      demo/ttkode.old.py
  17. 1
      demo/ttkode.py
  18. 1
      tests/pytest/test_001_demo.py
  19. 1
      tests/test.ui.016.raster.py
  20. 1
      tests/test.ui.020.TextEdit.02.UndoRedo.py

2
TermTk/TTkTestWidgets/logviewer.py

@ -35,7 +35,6 @@ class _TTkLogViewer(TTkAbstractScrollView):
__slots__ = ('_color', '_text', '_messages', '_cwd', '_follow')
def __init__(self, *args, **kwargs):
TTkAbstractScrollView.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , '_TTkLogViewer' )
self._messages = [TTkString()]
self._cwd = os.getcwd()
self._follow = kwargs.get('follow' , False )
@ -81,7 +80,6 @@ class TTkLogViewer(TTkAbstractScrollArea):
__slots__ = ('_logView')
def __init__(self, *args, **kwargs):
TTkAbstractScrollArea.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , 'TTkLogViewer' )
if 'parent' in kwargs: kwargs.pop('parent')
self._logView = _TTkLogViewer(*args, **kwargs)
self.setFocusPolicy(TTkK.ClickFocus)

1
TermTk/TTkTestWidgets/testwidgetsizes.py

@ -26,7 +26,6 @@ from TermTk.TTkWidgets.frame import *
class TTkTestWidgetSizes(TTkFrame):
ID = 1
__slots__ = ('_name')
def __init__(self, *args, **kwargs):
TTkFrame.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , f"TestWidgetSizes-{TTkTestWidgetSizes.ID}" )

2
TermTk/TTkUiTools/properties/menubar.py

@ -1,5 +1,3 @@
#!/usr/bin/env python3
# MIT License
#
# Copyright (c) 2023 Eugenio Parodi <ceccopierangiolieugenio AT googlemail DOT com>

5
TermTk/TTkUiTools/properties/widget.py

@ -27,8 +27,9 @@ from TermTk.TTkWidgets.widget import TTkWidget
TTkWidgetProperties = {
'properties' : {
'Name' : {
'init': {'name':'name', 'type':str } ,
'get': { 'cb':TTkWidget.name, 'type':str} },
'init': {'name':'name', 'type':str } ,
'get': { 'cb':TTkWidget.name, 'type':str } ,
'set': { 'cb':TTkWidget.setName, 'type':str } },
# 'X' : {
# 'init': {'name':'x', 'type':int } ,
# 'get': { 'cb':x, 'type':int } },

8
TermTk/TTkUiTools/uiloader.py

@ -81,13 +81,17 @@ class TTkUiLoader():
if _sm == 'spacer':
_menuButton.addSpacer()
continue
_btn = _menuButton.addMenu(text=_sm['text'], checkable=_sm['checkable'], checked=_sm['checked'])
_btn = _menuButton.addMenu(text=_sm['params']['Text'], checkable=_sm['params']['Checkable'], checked=_sm['params']['Checked'])
_btn.setName(_sm['params']['Name'])
_btn.setToolTip(_sm['params']['ToolTip'])
_setMenuButton(_sm,_btn)
def _setMenuBar(_menuBarProp, _menuBar:TTkMenuBarLayout):
def __addMenu(__prop, __alignment):
for _bp in __prop:
_btn = _menuBar.addMenu(_bp['text'], alignment=__alignment)
_btn = _menuBar.addMenu(text=_bp['params']['Text'], checkable=_bp['params']['Checkable'], checked=_bp['params']['Checked'], alignment=__alignment)
_btn.setName(_bp['params']['Name'])
_btn.setToolTip(_bp['params']['ToolTip'])
_setMenuButton(_bp, _btn)
if 'left' in _menuBarProp: __addMenu(_menuBarProp['left'], TTkK.LEFT_ALIGN)

1
TermTk/TTkWidgets/Fancy/table.py

@ -37,7 +37,6 @@ class TTkFancyTable(TTkAbstractScrollArea):
def __init__(self, *args, **kwargs):
TTkAbstractScrollArea.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , 'TTkFancyTable' )
if 'parent' in kwargs: kwargs.pop('parent')
self._tableView = TTkFancyTableView(*args, **kwargs)
# Forward the signal

3
TermTk/TTkWidgets/Fancy/treeview.py

@ -29,6 +29,3 @@ class TTkFancyTreeView(TTkFancyTableView):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self._name = kwargs.get('name' , 'TTkFancyTreeView' )
# if 'parent' in kwargs: kwargs.pop('parent')

3
TermTk/TTkWidgets/Fancy/treewidget.py

@ -34,7 +34,6 @@ from TermTk.TTkWidgets.Fancy.treewidgetitem import TTkFancyTreeWidgetItem
class _TTkDisplayedTreeItemControl(TTkCheckbox):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self._name = kwargs.get('name' , '_TTkDisplayedTreeItemControl' )
self.setMinimumSize(1, 1)
def paintEvent(self, canvas):
@ -51,7 +50,6 @@ class _TTkDisplayedTreeItem(TTkWidget):
#Signals
self._clicked = pyTTkSignal(bool, _TTkDisplayedTreeItem, TTkFancyTreeWidgetItem)
self._name = kwargs.get('name' , '_TTkDisplayedTreeItem' )
self._depth = kwargs.get('depth' , 0 )
self._text = TTkString(kwargs.get('text' , "" ))
self._id = kwargs.get('id' , 0 )
@ -80,7 +78,6 @@ class TTkFancyTreeWidget(TTkFancyTableView):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self._name = kwargs.get('name' , 'TTkFancyTreeView' )
self._topLevelItems = TTkFancyTreeWidgetItem(None)
self.doubleClicked.connect(self._doubleClickItem)
# if 'parent' in kwargs: kwargs.pop('parent')

1
TermTk/TTkWidgets/TTkModelView/filetree.py

@ -39,7 +39,6 @@ class TTkFileTree(TTkTree):
self._fileTreeWidget = TTkFileTreeWidget(*args, **wkwargs)
TTkTree.__init__(self, *args, **kwargs, treeWidget=self._fileTreeWidget)
self._name = kwargs.get('name' , 'TTkFileTree' )
# Forward Signals
self.fileClicked = self._fileTreeWidget.fileClicked

1
TermTk/TTkWidgets/TTkModelView/filetreewidget.py

@ -47,7 +47,6 @@ class TTkFileTreeWidget(TTkTreeWidget):
self.fileActivated = pyTTkSignal(TTkFileTreeWidgetItem)
self.folderActivated = pyTTkSignal(TTkFileTreeWidgetItem)
TTkTreeWidget.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , 'TTkFileTreeWidget' )
self._path = kwargs.get('path','.')
self._filter = '*'
self.setHeaderLabels(["Name", "Size", "Type", "Date Modified"])

3
TermTk/TTkWidgets/TTkModelView/tree.py

@ -36,8 +36,7 @@ class TTkTree(TTkAbstractScrollArea):
'addTopLevelItem', 'takeTopLevelItem', 'topLevelItem', 'indexOfTopLevelItem', 'selectedItems', 'clear' )
def __init__(self, *args, **kwargs):
TTkAbstractScrollArea.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , 'TTkTree' )
super().__init__(*args, **kwargs)
if 'parent' in kwargs: kwargs.pop('parent')
self._treeView = kwargs.get('treeWidget',TTkTreeWidget(*args, **kwargs))
self.setViewport(self._treeView)

1
TermTk/TTkWidgets/TTkModelView/treewidget.py

@ -58,7 +58,6 @@ class TTkTreeWidget(TTkAbstractScrollView):
self.itemCollapsed = pyTTkSignal(TTkTreeWidgetItem)
super().__init__(*args, **kwargs)
self._name = kwargs.get('name' , 'TTkTreeView' )
self._selected = None
self._selectedId = None
self._separatorSelected = None

1
TermTk/TTkWidgets/graph.py

@ -39,7 +39,6 @@ class TTkGraph(TTkWidget):
self._offset = 0
super().__init__(*args, **kwargs)
self._color = kwargs.get('color', TTkColor.RST )
self._name = kwargs.get('name' , 'TTkGraph' )
self._maxData = kwargs.get('maxData', 0x1000)
self._direction = kwargs.get('direction', TTkK.RIGHT)
self._align = kwargs.get('align', TTkK.CENTER)

10
TermTk/TTkWidgets/widget.py

@ -193,9 +193,15 @@ class TTkWidget(TMouseEvents,TKeyEvents, TDragEvents):
self._parent.layout().removeWidget(self)
self._parent = None
def name(self):
def name(self) -> str:
'''name'''
return self._name
def setName(self, name:str):
'''setName'''
self._name = name
def widgetItem(self): return self._widgetItem
def addWidget(self, widget):
@ -729,7 +735,7 @@ class TTkWidget(TMouseEvents,TKeyEvents, TDragEvents):
return self._toolTip
def setToolTip(self, toolTip: TTkString):
self._toolTip = toolTip
self._toolTip = TTkString(toolTip)
def getWidgetByName(self, name: str):
if name == self._name:

1
demo/paint.py

@ -44,7 +44,6 @@ class PaintCanvas(TTkWidget):
self._double = False
self._boxes = []
TTkWidget.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , 'PaintCanvas' )
self.setFocusPolicy(TTkK.ClickFocus)
def setLine(self, type):

2
demo/ttkode.old.py

@ -39,7 +39,6 @@ class _KolorFrame(TTkFrame):
__slots__ = ('_fillColor')
def __init__(self, *args, **kwargs):
TTkFrame.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , '_KolorFrame')
self._fillColor = kwargs.get('fillColor', TTkColor.RST)
def setFillColor(self, color):
@ -56,7 +55,6 @@ class KodeTab(TTkTabWidget):
__slots__ = ('_frameOverlay')
def __init__(self, *args, **kwargs):
TTkTabWidget.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , 'KodeTab')
self._frameOverlay = _KolorFrame('visible',False)
self._frameOverlay.setBorderColor(TTkColor.fg("#00FFFF")+TTkColor.bg("#000044"))
self._frameOverlay.setFillColor(TTkColor.bg("#000088", modifier=TTkColorGradient(increment=-3)))

1
demo/ttkode.py

@ -39,7 +39,6 @@ class _KolorFrame(TTkFrame):
__slots__ = ('_fillColor')
def __init__(self, *args, **kwargs):
TTkFrame.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , '_KolorFrame')
self._fillColor = kwargs.get('fillColor', TTkColor.RST)
def setFillColor(self, color):

1
tests/pytest/test_001_demo.py

@ -59,7 +59,6 @@ class TTkRecord(demo.ttk.TTk):
__slots__ = ('_record', '_events', '_key_events', '_mouse_events', '_screen_events')
def __init__(self, *args, **kwargs):
super().__init__( *args, **kwargs)
self._name = kwargs.get('name' , 'TTkRecord' )
self._record = kwargs.get('record', True)
self._events = self._RecordQueue()
self._key_events = self._RecordQueue()

1
tests/test.ui.016.raster.py

@ -60,7 +60,6 @@ class TTkPeppered(TTkWidget):
['#000000', '#000000', '#000000', '#000000', '#150000', '#550000', '#210000', '#000000', '#000000', '#000000']]
def __init__(self, *args, **kwargs):
TTkWidget.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , 'TTkPeppered' )
self.setGeometry(0,0,40,40)
def reduce(self, a,b,c,d):

1
tests/test.ui.020.TextEdit.02.UndoRedo.py

@ -33,7 +33,6 @@ import TermTk as ttk
class TestUndoRedo(ttk.TTkWidget):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self._name = kwargs.get('name' , 'TestUndoRedo' )
self._doc = kwargs.get('document', ttk.TTkTextDocument())
self._doc.contentsChanged.connect(self.update)
self._doc.undoAvailable.connect(lambda _: self.update())

Loading…
Cancel
Save