diff --git a/TermTk/TTkTestWidgets/logviewer.py b/TermTk/TTkTestWidgets/logviewer.py index 18a60044..645544f4 100644 --- a/TermTk/TTkTestWidgets/logviewer.py +++ b/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) diff --git a/TermTk/TTkTestWidgets/testwidgetsizes.py b/TermTk/TTkTestWidgets/testwidgetsizes.py index 2ebc3544..d81223d7 100644 --- a/TermTk/TTkTestWidgets/testwidgetsizes.py +++ b/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}" ) diff --git a/TermTk/TTkUiTools/properties/menubar.py b/TermTk/TTkUiTools/properties/menubar.py index f2708318..044a5b9e 100644 --- a/TermTk/TTkUiTools/properties/menubar.py +++ b/TermTk/TTkUiTools/properties/menubar.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python3 - # MIT License # # Copyright (c) 2023 Eugenio Parodi diff --git a/TermTk/TTkUiTools/properties/widget.py b/TermTk/TTkUiTools/properties/widget.py index f1fc9ed6..121629e0 100644 --- a/TermTk/TTkUiTools/properties/widget.py +++ b/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 } }, diff --git a/TermTk/TTkUiTools/uiloader.py b/TermTk/TTkUiTools/uiloader.py index 6ebf3721..1836d39c 100644 --- a/TermTk/TTkUiTools/uiloader.py +++ b/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) diff --git a/TermTk/TTkWidgets/Fancy/table.py b/TermTk/TTkWidgets/Fancy/table.py index ea88d186..76b5e0db 100644 --- a/TermTk/TTkWidgets/Fancy/table.py +++ b/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 diff --git a/TermTk/TTkWidgets/Fancy/treeview.py b/TermTk/TTkWidgets/Fancy/treeview.py index 9c0321d6..a72d75e2 100644 --- a/TermTk/TTkWidgets/Fancy/treeview.py +++ b/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') - diff --git a/TermTk/TTkWidgets/Fancy/treewidget.py b/TermTk/TTkWidgets/Fancy/treewidget.py index e8d61d73..c8e3c42b 100644 --- a/TermTk/TTkWidgets/Fancy/treewidget.py +++ b/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') diff --git a/TermTk/TTkWidgets/TTkModelView/filetree.py b/TermTk/TTkWidgets/TTkModelView/filetree.py index 065bd469..8d8768a5 100644 --- a/TermTk/TTkWidgets/TTkModelView/filetree.py +++ b/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 diff --git a/TermTk/TTkWidgets/TTkModelView/filetreewidget.py b/TermTk/TTkWidgets/TTkModelView/filetreewidget.py index e9ba6f5f..8b3fbda9 100644 --- a/TermTk/TTkWidgets/TTkModelView/filetreewidget.py +++ b/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"]) diff --git a/TermTk/TTkWidgets/TTkModelView/tree.py b/TermTk/TTkWidgets/TTkModelView/tree.py index 8e959c40..3eeda770 100644 --- a/TermTk/TTkWidgets/TTkModelView/tree.py +++ b/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) diff --git a/TermTk/TTkWidgets/TTkModelView/treewidget.py b/TermTk/TTkWidgets/TTkModelView/treewidget.py index 6e172002..322e425f 100644 --- a/TermTk/TTkWidgets/TTkModelView/treewidget.py +++ b/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 diff --git a/TermTk/TTkWidgets/graph.py b/TermTk/TTkWidgets/graph.py index b941e18c..69c6ff9d 100644 --- a/TermTk/TTkWidgets/graph.py +++ b/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) diff --git a/TermTk/TTkWidgets/widget.py b/TermTk/TTkWidgets/widget.py index a5e89aaf..5165bff0 100644 --- a/TermTk/TTkWidgets/widget.py +++ b/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: diff --git a/demo/paint.py b/demo/paint.py index 41f2b485..b9c405fd 100755 --- a/demo/paint.py +++ b/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): diff --git a/demo/ttkode.old.py b/demo/ttkode.old.py index ac01c23b..c2f853fa 100755 --- a/demo/ttkode.old.py +++ b/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))) diff --git a/demo/ttkode.py b/demo/ttkode.py index c0241eda..756c134a 100755 --- a/demo/ttkode.py +++ b/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): diff --git a/tests/pytest/test_001_demo.py b/tests/pytest/test_001_demo.py index 68521875..70573aa5 100755 --- a/tests/pytest/test_001_demo.py +++ b/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() diff --git a/tests/test.ui.016.raster.py b/tests/test.ui.016.raster.py index d664f89f..26ab3594 100755 --- a/tests/test.ui.016.raster.py +++ b/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): diff --git a/tests/test.ui.020.TextEdit.02.UndoRedo.py b/tests/test.ui.020.TextEdit.02.UndoRedo.py index 7079f887..8cfce8ac 100755 --- a/tests/test.ui.020.TextEdit.02.UndoRedo.py +++ b/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())