diff --git a/TermTk/TTkTypes/treewidgetitem.py b/TermTk/TTkTypes/treewidgetitem.py index 8df89b01..e23e48ba 100644 --- a/TermTk/TTkTypes/treewidgetitem.py +++ b/TermTk/TTkTypes/treewidgetitem.py @@ -27,13 +27,13 @@ from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal -class TtkFancyTreeWidgetItem(): +class TTkFancyTreeWidgetItem(): __slots__ = ('_parent', '_data', '_childs', '_expand', '_childIndicatorPolicy', # Signals 'refreshData') def __init__(self, *args, **kwargs): # Signals - self.refreshData = pyTTkSignal(TtkFancyTreeWidgetItem) + self.refreshData = pyTTkSignal(TTkFancyTreeWidgetItem) self._data = args[0] self._childs = [] self._childIndicatorPolicy = kwargs.get('childIndicatorPolicy', TTkK.DontShowIndicatorWhenChildless) diff --git a/TermTk/TTkWidgets/Fancy/table.py b/TermTk/TTkWidgets/Fancy/table.py index 6d36ef87..0987fa18 100644 --- a/TermTk/TTkWidgets/Fancy/table.py +++ b/TermTk/TTkWidgets/Fancy/table.py @@ -27,11 +27,11 @@ from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal from TermTk.TTkCore.color import TTkColor -from TermTk.TTkWidgets.Fancy.tableview import TtkFancyTableView +from TermTk.TTkWidgets.Fancy.tableview import TTkFancyTableView from TermTk.TTkLayouts.gridlayout import TTkGridLayout from TermTk.TTkAbstract.abstractscrollarea import TTkAbstractScrollArea -class TtkFancyTable(TTkAbstractScrollArea): +class TTkFancyTable(TTkAbstractScrollArea): __slots__ = ( '_tableView', 'activated', # Forwarded Methods @@ -42,9 +42,9 @@ class TtkFancyTable(TTkAbstractScrollArea): def __init__(self, *args, **kwargs): TTkAbstractScrollArea.__init__(self, *args, **kwargs) - self._name = kwargs.get('name' , 'TtkFancyTable' ) + self._name = kwargs.get('name' , 'TTkFancyTable' ) if 'parent' in kwargs: kwargs.pop('parent') - self._tableView = TtkFancyTableView(*args, **kwargs) + 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 5a94bbc2..1c6e2930 100644 --- a/TermTk/TTkWidgets/Fancy/tableview.py +++ b/TermTk/TTkWidgets/Fancy/tableview.py @@ -31,11 +31,11 @@ from TermTk.TTkWidgets.widget import TTkWidget from TermTk.TTkLayouts.gridlayout import TTkGridLayout from TermTk.TTkAbstract.abstractscrollview import TTkAbstractScrollView -class _TtkFancyTableViewHeader(TTkWidget): +class _TTkFancyTableViewHeader(TTkWidget): __slots__ = ('_header', '_alignments', '_headerColor', '_columns') def __init__(self, *args, **kwargs): TTkWidget.__init__(self, *args, **kwargs) - self._name = kwargs.get('name' , '_TtkFancyTableViewHeader' ) + self._name = kwargs.get('name' , '_TTkFancyTableViewHeader' ) self._columns = kwargs.get('columns' , [-1] ) self._header = [""]*len(self._columns) self._alignments = [TTkK.NONE]*len(self._columns) @@ -80,7 +80,7 @@ class _TtkFancyTableViewHeader(TTkWidget): self._canvas.drawTableLine(pos=(0,0), items=self._header, sizes=sizes, colors=colors, alignments=self._alignments) -class _TtkFancyTableView(TTkAbstractScrollView): +class _TTkFancyTableView(TTkAbstractScrollView): __slots__ = ( '_alignments', '_headerColor', '_columns', '_columnColors', @@ -94,7 +94,7 @@ class _TtkFancyTableView(TTkAbstractScrollView): self._tableDataWidget = [] self._shownWidgets = [] TTkAbstractScrollView.__init__(self, *args, **kwargs) - self._name = kwargs.get('name' , '_TtkFancyTableView' ) + self._name = kwargs.get('name' , '_TTkFancyTableView' ) # define signals self.activated = pyTTkSignal(int) # Value self.doubleClicked = pyTTkSignal(int) # Value @@ -335,7 +335,7 @@ class _TtkFancyTableView(TTkAbstractScrollView): colors = [c.modParam(val=-val) for c in self._columnColors] self._canvas.drawTableLine(pos=(0,y), items=item, sizes=sizes, colors=colors, alignments=self._alignments) -class TtkFancyTableView(TTkAbstractScrollView): +class TTkFancyTableView(TTkAbstractScrollView): __slots__ = ( '_header', '_tableView', '_showHeader', 'activated', # Forwarded Methods @@ -344,12 +344,12 @@ class TtkFancyTableView(TTkAbstractScrollView): def __init__(self, *args, **kwargs): super().__init__(self, *args, **kwargs) - self._name = kwargs.get('name' , 'TtkFancyTableView' ) + self._name = kwargs.get('name' , 'TTkFancyTableView' ) if 'parent' in kwargs: kwargs.pop('parent') self._showHeader = kwargs.get('showHeader', True) self.setLayout(TTkGridLayout()) - self._tableView = _TtkFancyTableView(*args, **kwargs) - self._header = _TtkFancyTableViewHeader(*args, **kwargs) + self._tableView = _TTkFancyTableView(*args, **kwargs) + self._header = _TTkFancyTableViewHeader(*args, **kwargs) self.layout().addWidget(self._header,0,0) self.layout().addWidget(self._tableView,1,0) # Forward the tableSignals diff --git a/TermTk/TTkWidgets/Fancy/tree.py b/TermTk/TTkWidgets/Fancy/tree.py index d4af583a..1e51b9b0 100644 --- a/TermTk/TTkWidgets/Fancy/tree.py +++ b/TermTk/TTkWidgets/Fancy/tree.py @@ -27,11 +27,11 @@ from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal from TermTk.TTkCore.color import TTkColor -from TermTk.TTkWidgets.Fancy.treewidget import TtkFancyTreeWidget +from TermTk.TTkWidgets.Fancy.treewidget import TTkFancyTreeWidget from TermTk.TTkLayouts.gridlayout import TTkGridLayout from TermTk.TTkAbstract.abstractscrollarea import TTkAbstractScrollArea -class TtkFancyTree(TTkAbstractScrollArea): +class TTkFancyTree(TTkAbstractScrollArea): __slots__ = ( '_treeView', 'activated', # Forwarded Methods @@ -39,9 +39,9 @@ class TtkFancyTree(TTkAbstractScrollArea): def __init__(self, *args, **kwargs): TTkAbstractScrollArea.__init__(self, *args, **kwargs) - self._name = kwargs.get('name' , 'TtkFancyTree' ) + self._name = kwargs.get('name' , 'TTkFancyTree' ) if 'parent' in kwargs: kwargs.pop('parent') - self._treeView = TtkFancyTreeWidget(*args, **kwargs) + self._treeView = TTkFancyTreeWidget(*args, **kwargs) # Forward the signal self.activated = self._treeView.activated diff --git a/TermTk/TTkWidgets/Fancy/treeview.py b/TermTk/TTkWidgets/Fancy/treeview.py index d4757df8..3a5d296e 100644 --- a/TermTk/TTkWidgets/Fancy/treeview.py +++ b/TermTk/TTkWidgets/Fancy/treeview.py @@ -27,13 +27,13 @@ from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal from TermTk.TTkCore.color import TTkColor -from TermTk.TTkWidgets.Fancy.tableview import TtkFancyTableView +from TermTk.TTkWidgets.Fancy.tableview import TTkFancyTableView -class TtkFancyTreeView(TtkFancyTableView): +class TTkFancyTreeView(TTkFancyTableView): __slots__ = ( '_header', '_treeView', '_showHeader', 'activated') def __init__(self, *args, **kwargs): super().__init__(self, *args, **kwargs) - self._name = kwargs.get('name' , 'TtkFancyTreeView' ) + 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 68468eeb..11055678 100644 --- a/TermTk/TTkWidgets/Fancy/treewidget.py +++ b/TermTk/TTkWidgets/Fancy/treewidget.py @@ -29,9 +29,9 @@ from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal from TermTk.TTkCore.color import TTkColor from TermTk.TTkWidgets.widget import TTkWidget from TermTk.TTkWidgets.checkbox import TTkCheckbox -from TermTk.TTkWidgets.Fancy.tableview import TtkFancyTableView +from TermTk.TTkWidgets.Fancy.tableview import TTkFancyTableView from TermTk.TTkLayouts.gridlayout import TTkGridLayout -from TermTk.TTkTypes.treewidgetitem import TtkFancyTreeWidgetItem +from TermTk.TTkTypes.treewidgetitem import TTkFancyTreeWidgetItem class _TTkDisplayedTreeItemControl(TTkCheckbox): def __init__(self, *args, **kwargs): @@ -51,7 +51,7 @@ class _TTkDisplayedTreeItem(TTkWidget): def __init__(self, *args, **kwargs): super().__init__(self, *args, **kwargs) #Signals - self._clicked = pyTTkSignal(bool, _TTkDisplayedTreeItem, TtkFancyTreeWidgetItem) + self._clicked = pyTTkSignal(bool, _TTkDisplayedTreeItem, TTkFancyTreeWidgetItem) self._name = kwargs.get('name' , '_TTkDisplayedTreeItem' ) self._depth = kwargs.get('depth' , 0 ) @@ -77,13 +77,13 @@ class _TTkDisplayedTreeItem(TTkWidget): self._canvas.drawText(pos=(self._depth+2, 0), text=self._text) -class TtkFancyTreeWidget(TtkFancyTableView): +class TTkFancyTreeWidget(TTkFancyTableView): __slots__ = ( '_topLevelItems') def __init__(self, *args, **kwargs): super().__init__(self, *args, **kwargs) - self._name = kwargs.get('name' , 'TtkFancyTreeView' ) - self._topLevelItems = TtkFancyTreeWidgetItem(None) + self._name = kwargs.get('name' , 'TTkFancyTreeView' ) + self._topLevelItems = TTkFancyTreeWidgetItem(None) self.doubleClicked.connect(self._doubleClickItem) # if 'parent' in kwargs: kwargs.pop('parent') @@ -120,23 +120,23 @@ class TtkFancyTreeWidget(TtkFancyTableView): def _doubleClickItem(self, index): if not (item := self.itemAt(index)): return if item[0]._isLeaf: return - if not item[0]._treeWidgetItem.expand(): # we need to expand the TtkFancyTreeWidgetItem + if not item[0]._treeWidgetItem.expand(): # we need to expand the TTkFancyTreeWidgetItem self._expand(item=item[0]._treeWidgetItem, depth=item[0]._depth+1) - else: # we need to shrink the TtkFancyTreeWidgetItem + else: # we need to shrink the TTkFancyTreeWidgetItem self._shrink(item=item[0]._treeWidgetItem) - @pyTTkSlot(bool, _TTkDisplayedTreeItem, TtkFancyTreeWidgetItem) + @pyTTkSlot(bool, _TTkDisplayedTreeItem, TTkFancyTreeWidgetItem) def _controlClicked(self, status, widget, item): TTkLog.debug(f"{status} {widget._name}") - if status: # we need to expand the TtkFancyTreeWidgetItem + if status: # we need to expand the TTkFancyTreeWidgetItem self._expand(item=item, depth=(widget._depth+1)) - else: # we need to shrink the TtkFancyTreeWidgetItem + else: # we need to shrink the TTkFancyTreeWidgetItem self._shrink(item=item) def _addTreeWidgetItem(self, item, depth=0, index=-1): - if not isinstance(item, TtkFancyTreeWidgetItem): - raise TypeError("TtkFancyTreeWidgetItem is required in TtkFancyTreeWidget.addTopLevelItem(item)") + if not isinstance(item, TTkFancyTreeWidgetItem): + raise TypeError("TTkFancyTreeWidgetItem is required in TTkFancyTreeWidget.addTopLevelItem(item)") if item.parent() is None: self._topLevelItems.addChild(item) displayedItems = item.data().copy() diff --git a/TermTk/TTkWidgets/TTkPickers/filepicker.py b/TermTk/TTkWidgets/TTkPickers/filepicker.py index 3a926d00..ecfd745d 100644 --- a/TermTk/TTkWidgets/TTkPickers/filepicker.py +++ b/TermTk/TTkWidgets/TTkPickers/filepicker.py @@ -25,11 +25,11 @@ from os import walk from TermTk.TTkWidgets.window import TTkWindow -from TermTk.TTkTypes.treewidgetitem import TtkFancyTreeWidgetItem +from TermTk.TTkTypes.treewidgetitem import TTkFancyTreeWidgetItem -class _FileWidgetItem(TtkFancyTreeWidgetItem): +class _FileWidgetItem(TTkFancyTreeWidgetItem): def __init__(self, *args, **kwargs): - TtkFancyTreeWidgetItem.__init__(self, *args, **kwargs) + TTkFancyTreeWidgetItem.__init__(self, *args, **kwargs) class TTkFileDialogPicker(TTkWindow): def __init__(self, *args, **kwargs): diff --git a/TermTk/TTkWidgets/table.py b/TermTk/TTkWidgets/table.py index 6d36ef87..0987fa18 100644 --- a/TermTk/TTkWidgets/table.py +++ b/TermTk/TTkWidgets/table.py @@ -27,11 +27,11 @@ from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal from TermTk.TTkCore.color import TTkColor -from TermTk.TTkWidgets.Fancy.tableview import TtkFancyTableView +from TermTk.TTkWidgets.Fancy.tableview import TTkFancyTableView from TermTk.TTkLayouts.gridlayout import TTkGridLayout from TermTk.TTkAbstract.abstractscrollarea import TTkAbstractScrollArea -class TtkFancyTable(TTkAbstractScrollArea): +class TTkFancyTable(TTkAbstractScrollArea): __slots__ = ( '_tableView', 'activated', # Forwarded Methods @@ -42,9 +42,9 @@ class TtkFancyTable(TTkAbstractScrollArea): def __init__(self, *args, **kwargs): TTkAbstractScrollArea.__init__(self, *args, **kwargs) - self._name = kwargs.get('name' , 'TtkFancyTable' ) + self._name = kwargs.get('name' , 'TTkFancyTable' ) if 'parent' in kwargs: kwargs.pop('parent') - self._tableView = TtkFancyTableView(*args, **kwargs) + self._tableView = TTkFancyTableView(*args, **kwargs) # Forward the signal self.activated = self._tableView.activated diff --git a/TermTk/TTkWidgets/tree.py b/TermTk/TTkWidgets/tree.py deleted file mode 100644 index d4af583a..00000000 --- a/TermTk/TTkWidgets/tree.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env python3 - -# MIT License -# -# Copyright (c) 2021 Eugenio Parodi -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -from TermTk.TTkCore.cfg import TTkCfg -from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.log import TTkLog -from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal -from TermTk.TTkCore.color import TTkColor -from TermTk.TTkWidgets.Fancy.treewidget import TtkFancyTreeWidget -from TermTk.TTkLayouts.gridlayout import TTkGridLayout -from TermTk.TTkAbstract.abstractscrollarea import TTkAbstractScrollArea - -class TtkFancyTree(TTkAbstractScrollArea): - __slots__ = ( - '_treeView', 'activated', - # Forwarded Methods - 'setAlignment', 'setHeader', 'setHeaderLabels', 'setColumnSize', 'setColumnColors', 'appendItem', 'addTopLevelItem' ) - - def __init__(self, *args, **kwargs): - TTkAbstractScrollArea.__init__(self, *args, **kwargs) - self._name = kwargs.get('name' , 'TtkFancyTree' ) - if 'parent' in kwargs: kwargs.pop('parent') - self._treeView = TtkFancyTreeWidget(*args, **kwargs) - # Forward the signal - self.activated = self._treeView.activated - - self.setFocusPolicy(TTkK.ClickFocus) - self.setViewport(self._treeView) - - # Forwarded Methods - self.setAlignment = self._treeView.setAlignment - self.setHeader = self._treeView.setHeader - self.setHeaderLabels = self._treeView.setHeaderLabels - self.setColumnSize = self._treeView.setColumnSize - self.setColumnColors = self._treeView.setColumnColors - self.appendItem = self._treeView.appendItem - self.addTopLevelItem = self._treeView.addTopLevelItem - - - diff --git a/TermTk/TTkWidgets/treeview.py b/TermTk/TTkWidgets/treeview.py index d4757df8..3a5d296e 100644 --- a/TermTk/TTkWidgets/treeview.py +++ b/TermTk/TTkWidgets/treeview.py @@ -27,13 +27,13 @@ from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal from TermTk.TTkCore.color import TTkColor -from TermTk.TTkWidgets.Fancy.tableview import TtkFancyTableView +from TermTk.TTkWidgets.Fancy.tableview import TTkFancyTableView -class TtkFancyTreeView(TtkFancyTableView): +class TTkFancyTreeView(TTkFancyTableView): __slots__ = ( '_header', '_treeView', '_showHeader', 'activated') def __init__(self, *args, **kwargs): super().__init__(self, *args, **kwargs) - self._name = kwargs.get('name' , 'TtkFancyTreeView' ) + self._name = kwargs.get('name' , 'TTkFancyTreeView' ) # if 'parent' in kwargs: kwargs.pop('parent') diff --git a/TermTk/TTkWidgets/treewidget.py b/TermTk/TTkWidgets/treewidget.py new file mode 100644 index 00000000..a0033998 --- /dev/null +++ b/TermTk/TTkWidgets/treewidget.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python3 + +# MIT License +# +# Copyright (c) 2021 Eugenio Parodi +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. \ No newline at end of file diff --git a/TermTk/TTkWidgets/treewidgetitem.py b/TermTk/TTkWidgets/treewidgetitem.py new file mode 100644 index 00000000..a0033998 --- /dev/null +++ b/TermTk/TTkWidgets/treewidgetitem.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python3 + +# MIT License +# +# Copyright (c) 2021 Eugenio Parodi +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. \ No newline at end of file diff --git a/demo/gittk.py b/demo/gittk.py index cb255f89..1ca04cea 100755 --- a/demo/gittk.py +++ b/demo/gittk.py @@ -59,7 +59,7 @@ else: gittk = ttk.TTkWindow(parent=root,pos = (1,1), size=(100,40), title="gittk", border=True, layout=ttk.TTkGridLayout()) gittkVsplitter = ttk.TTkSplitter(parent=gittk, orientation=ttk.TTkK.VERTICAL) -tableCommit = ttk.TtkFancyTable(parent=gittkVsplitter, selectColor=ttk.TTkColor.bg('#882200')) +tableCommit = ttk.TTkFancyTable(parent=gittkVsplitter, selectColor=ttk.TTkColor.bg('#882200')) gittkHsplitter = ttk.TTkSplitter(parent=gittkVsplitter, orientation=ttk.TTkK.HORIZONTAL) diffText = ttk.TTkTextEdit(parent=gittkHsplitter) gittkHsplitter.addWidget(ttk.TTkTestWidgetSizes(border=True, title="Details"),20) diff --git a/demo/showcase/table.py b/demo/showcase/table.py index 50c239cf..171ffe1d 100755 --- a/demo/showcase/table.py +++ b/demo/showcase/table.py @@ -42,7 +42,7 @@ def demoTable(root=None): btn1 = ttk.TTkButton(parent=top, maxHeight=3, border=True, text='Add') btn2 = ttk.TTkButton(parent=top, maxHeight=3, border=True, text='Add Many') - table1 = ttk.TtkFancyTable(parent=frame, selectColor=ttk.TTkColor.bg('#882200')) + table1 = ttk.TTkFancyTable(parent=frame, selectColor=ttk.TTkColor.bg('#882200')) table1.setColumnSize((5,10,-1,10,20)) table1.setAlignment(( diff --git a/demo/showcase/tree.py b/demo/showcase/tree.py index 43291bb4..8bc3066b 100755 --- a/demo/showcase/tree.py +++ b/demo/showcase/tree.py @@ -40,8 +40,8 @@ def getSentence(a,b): return " ".join([getWord() for i in range(0,random.randint(a,b))]) def demoTree(root=None): - # tw = ttk.TtkFancyTreeWidget(parent=rootTree1) - tw = ttk.TtkFancyTree(parent=root) + # tw = ttk.TTkFancyTreeWidget(parent=rootTree1) + tw = ttk.TTkFancyTree(parent=root) tw.setHeaderLabels(["Column 1", "Column 2", "Column 3"]) tw.setColumnSize((-1,20,20)) tw.setColumnColors(( @@ -49,40 +49,40 @@ def demoTree(root=None): ttk.TTkColor.fg('#00dddd', modifier=ttk.TTkColorGradient(increment=-4)), ttk.TTkColor.fg('#cccc00', modifier=ttk.TTkColorGradient(increment=-2)) )) - l1 = ttk.TtkFancyTreeWidgetItem(["String A", "String B", "String C"]) - l2 = ttk.TtkFancyTreeWidgetItem(["String AA", "String BB", "String CC"]) - l3 = ttk.TtkFancyTreeWidgetItem(["String AAA", "String BBB", "String CCC"]) - l4 = ttk.TtkFancyTreeWidgetItem(["String AAAA", "String BBBB", "String CCCC"]) - l5 = ttk.TtkFancyTreeWidgetItem(["String AAAAA", "String BBBBB", "String CCCCC"]) + l1 = ttk.TTkFancyTreeWidgetItem(["String A", "String B", "String C"]) + l2 = ttk.TTkFancyTreeWidgetItem(["String AA", "String BB", "String CC"]) + l3 = ttk.TTkFancyTreeWidgetItem(["String AAA", "String BBB", "String CCC"]) + l4 = ttk.TTkFancyTreeWidgetItem(["String AAAA", "String BBBB", "String CCCC"]) + l5 = ttk.TTkFancyTreeWidgetItem(["String AAAAA", "String BBBBB", "String CCCCC"]) l2.addChild(l5) for i in range(3): - l1_child = ttk.TtkFancyTreeWidgetItem(["Child A" + str(i), "Child B" + str(i), "Child C" + str(i)]) + l1_child = ttk.TTkFancyTreeWidgetItem(["Child A" + str(i), "Child B" + str(i), "Child C" + str(i)]) l1.addChild(l1_child) for j in range(2): - l2_child = ttk.TtkFancyTreeWidgetItem(["Child AA" + str(j), "Child BB" + str(j), "Child CC" + str(j)]) + l2_child = ttk.TTkFancyTreeWidgetItem(["Child AA" + str(j), "Child BB" + str(j), "Child CC" + str(j)]) l2.addChild(l2_child) for j in range(2): - l3_child = ttk.TtkFancyTreeWidgetItem(["Child AAA" + str(j), "Child BBB" + str(j), "Child CCC" + str(j)]) + l3_child = ttk.TTkFancyTreeWidgetItem(["Child AAA" + str(j), "Child BBB" + str(j), "Child CCC" + str(j)]) l3.addChild(l3_child) for j in range(2): - l4_child = ttk.TtkFancyTreeWidgetItem(["Child AAAA" + str(j), "Child BBBB" + str(j), "Child CCCC" + str(j)]) + l4_child = ttk.TTkFancyTreeWidgetItem(["Child AAAA" + str(j), "Child BBBB" + str(j), "Child CCCC" + str(j)]) l4.addChild(l4_child) for j in range(2): - l5_child = ttk.TtkFancyTreeWidgetItem(["Child AAAAA" + str(j), "Child BBBBB" + str(j), "Child CCCCC" + str(j)]) + l5_child = ttk.TTkFancyTreeWidgetItem(["Child AAAAA" + str(j), "Child BBBBB" + str(j), "Child CCCCC" + str(j)]) l5.addChild(l5_child) - l6 = ttk.TtkFancyTreeWidgetItem(["RND", "RND", "RND"], childIndicatorPolicy=ttk.TTkK.ShowIndicator) + l6 = ttk.TTkFancyTreeWidgetItem(["RND", "RND", "RND"], childIndicatorPolicy=ttk.TTkK.ShowIndicator) def updateChilds(item): if item.childs(): return for _ in range(0,random.randint(3,8)): - child = ttk.TtkFancyTreeWidgetItem([getWord(),getWord(),getWord()]) + child = ttk.TTkFancyTreeWidgetItem([getWord(),getWord(),getWord()]) if random.randint(0,10)>5: child.setChildIndicatorPolicy(ttk.TTkK.ShowIndicator) child.refreshData.connect(updateChilds) diff --git a/tests/test.ui.008.table.py b/tests/test.ui.008.table.py index 606a14b8..3b1dfb74 100755 --- a/tests/test.ui.008.table.py +++ b/tests/test.ui.008.table.py @@ -42,13 +42,13 @@ btn1 = ttk.TTkButton(parent=root, pos=(0,0), size=(5,3), border=True, text='Add' btn2 = ttk.TTkButton(parent=root, pos=(5,0), size=(10,3), border=True, text='Add Many') win_table1 = ttk.TTkWindow(parent=root,pos = (3,3), size=(150,40), title="Test Table 1", layout=ttk.TTkHBoxLayout(), border=True) -table1 = ttk.TtkFancyTable(parent=win_table1, selectColor=ttk.TTkColor.bg('#882200')) +table1 = ttk.TTkFancyTable(parent=win_table1, selectColor=ttk.TTkColor.bg('#882200')) win_table2 = ttk.TTkWindow(parent=root,pos = (15,5), size=(100,30), title="Test Table 2 Default", layout=ttk.TTkHBoxLayout(), border=True) -table2 = ttk.TtkFancyTable(parent=win_table2) +table2 = ttk.TTkFancyTable(parent=win_table2) win_table3 = ttk.TTkWindow(parent=root,pos = (15,5), size=(130,40), title="Test Table 2 Default", layout=ttk.TTkHBoxLayout(), border=True) -table3 = ttk.TtkFancyTable(parent=win_table3, showHeader=False) +table3 = ttk.TTkFancyTable(parent=win_table3, showHeader=False) table1.setColumnSize((5,10,-1,10,20)) table1.setAlignment(( diff --git a/tests/test.ui.011.tree.py b/tests/test.ui.011.tree.py index 730dda70..11e8cd29 100755 --- a/tests/test.ui.011.tree.py +++ b/tests/test.ui.011.tree.py @@ -42,8 +42,8 @@ if fullscreen: else: rootTree1 = ttk.TTkWindow(parent=root,pos = (0,0), size=(150,50), title="Test Tree 1", layout=ttk.TTkGridLayout(), border=True) -# tw = ttk.TtkFancyTreeWidget(parent=rootTree1) -tw = ttk.TtkFancyTree(parent=rootTree1) +# tw = ttk.TTkFancyTreeWidget(parent=rootTree1) +tw = ttk.TTkFancyTree(parent=rootTree1) tw.setHeaderLabels(["Column 1", "Column 2", "Column 3"]) tw.setColumnSize((20,20,-1)) tw.setColumnColors(( @@ -51,32 +51,32 @@ tw.setColumnColors(( ttk.TTkColor.fg('#00dddd', modifier=ttk.TTkColorGradient(increment=-4)), ttk.TTkColor.fg('#cccc00', modifier=ttk.TTkColorGradient(increment=-2)) )) -l1 = ttk.TtkFancyTreeWidgetItem(["String A", "String B", "String C"]) -l2 = ttk.TtkFancyTreeWidgetItem(["String AA", "String BB", "String CC"]) -l3 = ttk.TtkFancyTreeWidgetItem(["String AAA", "String BBB", "String CCC"]) -l4 = ttk.TtkFancyTreeWidgetItem(["String AAAA", "String BBBB", "String CCCC"]) -l5 = ttk.TtkFancyTreeWidgetItem(["String AAAAA", "String BBBBB", "String CCCCC"]) +l1 = ttk.TTkFancyTreeWidgetItem(["String A", "String B", "String C"]) +l2 = ttk.TTkFancyTreeWidgetItem(["String AA", "String BB", "String CC"]) +l3 = ttk.TTkFancyTreeWidgetItem(["String AAA", "String BBB", "String CCC"]) +l4 = ttk.TTkFancyTreeWidgetItem(["String AAAA", "String BBBB", "String CCCC"]) +l5 = ttk.TTkFancyTreeWidgetItem(["String AAAAA", "String BBBBB", "String CCCCC"]) l2.addChild(l5) for i in range(3): - l1_child = ttk.TtkFancyTreeWidgetItem(["Child A" + str(i), "Child B" + str(i), "Child C" + str(i)]) + l1_child = ttk.TTkFancyTreeWidgetItem(["Child A" + str(i), "Child B" + str(i), "Child C" + str(i)]) l1.addChild(l1_child) for j in range(2): - l2_child = ttk.TtkFancyTreeWidgetItem(["Child AA" + str(j), "Child BB" + str(j), "Child CC" + str(j)]) + l2_child = ttk.TTkFancyTreeWidgetItem(["Child AA" + str(j), "Child BB" + str(j), "Child CC" + str(j)]) l2.addChild(l2_child) for j in range(2): - l3_child = ttk.TtkFancyTreeWidgetItem(["Child AAA" + str(j), "Child BBB" + str(j), "Child CCC" + str(j)]) + l3_child = ttk.TTkFancyTreeWidgetItem(["Child AAA" + str(j), "Child BBB" + str(j), "Child CCC" + str(j)]) l3.addChild(l3_child) for j in range(2): - l4_child = ttk.TtkFancyTreeWidgetItem(["Child AAAA" + str(j), "Child BBBB" + str(j), "Child CCCC" + str(j)]) + l4_child = ttk.TTkFancyTreeWidgetItem(["Child AAAA" + str(j), "Child BBBB" + str(j), "Child CCCC" + str(j)]) l4.addChild(l4_child) for j in range(2): - l5_child = ttk.TtkFancyTreeWidgetItem(["Child AAAAA" + str(j), "Child BBBBB" + str(j), "Child CCCCC" + str(j)]) + l5_child = ttk.TTkFancyTreeWidgetItem(["Child AAAAA" + str(j), "Child BBBBB" + str(j), "Child CCCCC" + str(j)]) l5.addChild(l5_child)