Browse Source

basic overlay, combobox, improved table

pull/3/head
Eugenio Parodi 5 years ago
parent
commit
241a23c6ca
  1. 31
      TermTk/TTkCore/canvas.py
  2. 1
      TermTk/TTkCore/cfg.py
  3. 34
      TermTk/TTkCore/helper.py
  4. 12
      TermTk/TTkCore/ttk.py
  5. 10
      TermTk/TTkLayouts/gridlayout.py
  6. 2
      TermTk/TTkLayouts/layout.py
  7. 3
      TermTk/TTkWidgets/__init__.py
  8. 54
      TermTk/TTkWidgets/combobox.py
  9. 13
      TermTk/TTkWidgets/scrollbar.py
  10. 269
      TermTk/TTkWidgets/table.py
  11. 208
      TermTk/TTkWidgets/tableview.py
  12. 17
      TermTk/TTkWidgets/widget.py
  13. 20
      docs/TODO.md
  14. 10
      tests/test.ui.008.table.py
  15. 8
      tests/test.ui.009.widgets.form.py

31
TermTk/TTkCore/canvas.py

@ -100,6 +100,37 @@ class TTkCanvas:
self._data[_y][_x] = _ch
self._colors[_y][_x] = _col.mod(_x,_y)
'''
'''
def drawTableLine(self, pos, items, sizes, colors, alignments ):
x,y = pos
for i in range(0,len(items)):
txt = items[i]
w = sizes[i]
color = colors[i]
align = alignments[i]
if w > 0:
line = ""
lentxt = len(txt)
if lentxt > w:
line += txt[0:w]
else:
pad = w-lentxt
if align == TTkK.NONE or align == TTkK.LEFT_ALIGN:
line += txt + " "*pad
elif align == TTkK.RIGHT_ALIGN:
line += " "*pad + txt
elif align == TTkK.CENTER_ALIGN:
p1 = pad//2
p2 = pad-p1
line += " "*p1 + txt+" "*p2
elif align == TTkK.JUSTIFY:
# TODO: Text Justification
line += txt + " "*pad
self.drawText(pos=(x,y), text=line, color=color)
x += w + 1
def drawText(self, pos, text, color=TTkColor.RST):
if not self._visible: return
x,y = pos

1
TermTk/TTkCore/cfg.py

@ -30,6 +30,7 @@ class TTkCfg:
color_depth: int = DEP_24
scrollDelta = 5
theme = None
class TTkGlbl:

34
TermTk/TTkCore/helper.py

@ -36,6 +36,13 @@ class TTkHelper:
_cursorPos = [0,0]
_cursor = False
_cursorType = lbt.Term.cursor_blinking_block
class _Overlay():
__slots__ = ('_widget','_x','_y')
def __init__(self,x,y,widget):
self._widget = widget
widget.move(x,y)
_overlay = None
@staticmethod
def addUpdateWidget(widget):
@ -54,6 +61,23 @@ class TTkHelper:
TTkHelper._updateBuffer = []
TTkHelper._updateWidget = []
@staticmethod
def overlay(caller, widget, x, y):
wx, wy = TTkHelper.absPos(caller)
TTkHelper._overlay = TTkHelper._Overlay(wx+x,wy+y,widget)
# widget.setFocus()
@staticmethod
def getOverlay():
if TTkHelper._overlay is not None:
return TTkHelper._overlay._widget
return None
@staticmethod
def removeOverlay():
if TTkHelper._overlay is not None:
TTkHelper._overlay = None
@staticmethod
def paintAll():
'''
@ -99,6 +123,16 @@ class TTkHelper:
pushToTerminal = True
widget.paintChildCanvas()
if TTkHelper._overlay is not None:
lx,ly,lw,lh = (0, 0, TTkGlbl.term_w, TTkGlbl.term_h)
child =TTkHelper._overlay._widget
cx,cy,cw,ch = child.geometry()
TTkHelper._rootCanvas.paintCanvas(
child.getCanvas(),
(cx, cy, cw, ch),
(0,0,cw,ch),
(lx, ly, lw, lh))
if pushToTerminal:
if TTkHelper._cursor:
lbt.Term.hideCursor()

12
TermTk/TTkCore/ttk.py

@ -109,17 +109,29 @@ class TTk(TTkWidget):
if evt is TTkK.MOUSE_EVENT:
mevt = self.mouse_events.get()
focusWidget = TTkHelper.getFocus()
overlayWidget = TTkHelper.getOverlay()
if focusWidget is not None and mevt.evt != TTkK.Press:
x,y = TTkHelper.absPos(focusWidget)
nmevt = mevt.clone(pos=(mevt.x-x, mevt.y-y))
focusWidget.mouseEvent(nmevt)
elif overlayWidget is not None:
x,y,w,h=overlayWidget.geometry()
if x <= mevt.x < x+w and y <= mevt.y < y+h:
px,py = TTkHelper.absPos(overlayWidget)
nmevt = mevt.clone(pos=(mevt.x-px, mevt.y-py))
overlayWidget.mouseEvent(nmevt)
else:
self.mouseEvent(mevt)
else:
self.mouseEvent(mevt)
elif evt is TTkK.KEY_EVENT:
kevt = self.key_events.get()
focusWidget = TTkHelper.getFocus()
overlayWidget = TTkHelper.getOverlay()
if focusWidget is not None:
focusWidget.keyEvent(kevt)
elif overlayWidget is not None:
overlayWidget.keyEvent(kevt)
pass
elif evt is TTkK.TIME_EVENT:
TTkHelper.paintAll()

10
TermTk/TTkLayouts/gridlayout.py

@ -129,7 +129,7 @@ class TTkGridLayout(TTkLayout):
anyItem = False
for gridRow in range(len(self._gridItems)):
item = self._gridItems[gridRow][gridCol]
if item is not None:
if item is not None and item.isVisible():
anyItem = True
w = item.minimumWidth()
if colw < w:
@ -142,7 +142,7 @@ class TTkGridLayout(TTkLayout):
rowh = 0
anyItem = False
for item in self._gridItems[gridRow]:
if item is not None:
if item is not None and item.isVisible():
anyItem = True
h = item.minimumHeight()
if rowh < h:
@ -156,7 +156,7 @@ class TTkGridLayout(TTkLayout):
anyItem = False
for gridRow in range(len(self._gridItems)):
item = self._gridItems[gridRow][gridCol]
if item is not None:
if item is not None and item.isVisible():
anyItem = True
w = item.maximumWidth()
if colw > w:
@ -169,7 +169,7 @@ class TTkGridLayout(TTkLayout):
rowh = 0x10000
anyItem = False
for item in self._gridItems[gridRow]:
if item is not None:
if item is not None and item.isVisible():
anyItem = True
h = item.maximumHeight()
if rowh > h:
@ -273,6 +273,8 @@ class TTkGridLayout(TTkLayout):
i[0] = newy
newy += i[1]
# TTkLog.debug(f"h:{horSizes} v:{vertSizes}")
# loop and set the geometry of any item
for item in self.children():
col = item._col

2
TermTk/TTkLayouts/layout.py

@ -148,6 +148,8 @@ class TTkWidgetItem(TTkLayoutItem):
def widget(self):
return self._widget
def isVisible(self): return self._widget.isVisible()
def isEmpty(self): return self._widget is None
def minimumSize(self) -> int: return self._widget.minimumSize()

3
TermTk/TTkWidgets/__init__.py

@ -1,10 +1,11 @@
from .widget import *
from .spacer import *
from .frame import *
from .label import *
from .button import *
from .checkbox import *
from .radiobutton import *
from .label import *
from .combobox import *
from .lineedit import *
from .scrollbar import *
from .window import *

54
TermTk/TTkWidgets/combobox.py

@ -0,0 +1,54 @@
#!/usr/bin/env python3
# MIT License
#
# Copyright (c) 2021 Eugenio Parodi <ceccopierangiolieugenio AT googlemail DOT com>
#
# 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.log import TTkLog
from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal
from TermTk.TTkCore.color import TTkColor
from TermTk.TTkWidgets.widget import *
from TermTk.TTkWidgets.button import *
from TermTk.TTkWidgets.table import *
class TTkComboBox(TTkWidget):
__slots__ = ('_list', '_id')
def __init__(self, *args, **kwargs):
TTkWidget.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , 'TTkCheckbox' )
# Define Signals
# self.cehcked = pyTTkSignal()
self._list = kwargs.get('list', [] )
self.setMinimumSize(5, 1)
self.setMaximumHeight(1)
self.setFocusPolicy(TTkK.ClickFocus + TTkK.TabFocus)
def paintEvent(self):
self._canvas.drawText(pos=(0,0), text="XXXXXXXXXXXXXXXX")
def mouseReleaseEvent(self, evt):
table = TTkTable(size=(self.width(),10))
for item in self._list:
table.appendItem((item))
TTkHelper.overlay(self, table, 0, 0)
self.update()
return True

13
TermTk/TTkWidgets/scrollbar.py

@ -58,7 +58,6 @@ class TTkScrollBar(TTkWidget):
self.rangeChanged = pyTTkSignal(int, int) # Min, Max
self.sliderMoved = pyTTkSignal(int) # Value
self._orientation = kwargs.get('orientation' , TTkK.VERTICAL )
if self._orientation == TTkK.VERTICAL:
self.setMaximumWidth(1)
@ -126,6 +125,7 @@ class TTkScrollBar(TTkWidget):
self.value = self.value - self.pagestep
else:
self.value = self.value + self.pagestep
self.sliderMoved.emit(self.value)
return True
def mousePressEvent(self, evt):
@ -154,6 +154,7 @@ class TTkScrollBar(TTkWidget):
self.update()
else:
return False
self.sliderMoved.emit(self.value)
# TTkLog.debug(f"m={mouse}, md:{self._mouseDelta}, d:{self._screenPgDown},u:{self._screenPgUp},s:{self._screenScroller}")
return True
@ -173,7 +174,7 @@ class TTkScrollBar(TTkWidget):
a = aa * (self._maximum - self._minimum) // asciiDrawingSize
self.value = a + self._minimum
self.sliderMoved.emit(aa)
self.sliderMoved.emit(self.value)
# TTkLog.debug(f"m={mouse}, md:{self._mouseDelta}, aa:{aa}")
return True
@ -185,6 +186,14 @@ class TTkScrollBar(TTkWidget):
def focusOutEvent(self):
self.update()
@pyTTkSlot(int)
def setPageStep(self, pageStep):
self._pagestep = pageStep
@pyTTkSlot(int)
def setRangeTo(self, max):
self.setRange(0,max)
@pyTTkSlot(int, int)
def setRange(self, min, max):
self.minimum = min

269
TermTk/TTkWidgets/table.py

@ -22,51 +22,145 @@
# 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.TTkLayouts.boxlayout import TTkHBoxLayout
from TermTk.TTkLayouts.gridlayout import TTkGridLayout
from TermTk.TTkWidgets.widget import TTkWidget
from TermTk.TTkWidgets.frame import TTkFrame
from TermTk.TTkWidgets.testwidget import TTkTestWidget
from TermTk.TTkWidgets.spacer import TTkSpacer
from TermTk.TTkWidgets.scrollbar import TTkScrollBar
'''
class _TTkTableViewHeader(TTkWidget):
__slots__ = (
'_header', '_showHeader',
'_alignments', '_headerColor',
'_columns')
def __init__(self, *args, **kwargs):
TTkWidget.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , '_TTkTableViewHeader' )
self._columns = kwargs.get('columns' , [-1] )
self._header = [""]*len(self._columns)
self._alignments = [TTkK.NONE]*len(self._columns)
self._headerColor = kwargs.get('headerColor' , TTkColor.BOLD )
self.setMaximumHeight(1)
self.setMinimumHeight(1)
def setAlignment(self, alignments):
if len(alignments) != len(self._columns):
return
self._alignments = alignments
'''
class TTkTable(TTkWidget):
__slots__ = ('_hlayout','_vscroller', '_header', '_alignments', '_headerColor', '_columns', '_columnColors', '_selectColor', '_tableData', '_moveTo', '_selected')
def setHeader(self, header):
if len(header) != len(self._columns):
return
self._header = header
def setHeader(self, header):
if len(header) != len(self._columns):
return
self._header = header
def setColumnSize(self, columns):
self._columns = columns
self._header = [""]*len(self._columns)
self._alignments = [TTkK.NONE]*len(self._columns)
def paintEvent(self):
w,h = self.size()
total = 0
variableCols = 0
# Retrieve the free size
for width in self._columns:
if width > 0:
total += width
else:
variableCols += 1
# Define the list of cols sizes
sizes = []
for width in self._columns:
if width > 0:
sizes.append(width)
else:
sizes.append((w-total)//variableCols)
variableCols -= 1
colors = [self._headerColor]*len(self._header)
self._canvas.drawTableLine(pos=(0,0), items=self._header, sizes=sizes, colors=colors, alignments=self._alignments)
class _TTkTableViewData(TTkWidget):
__slots__ = (
'_alignments',
'_columns', '_columnColors',
'_tableData',
'_selectColor', '_moveTo', '_selected')
def __init__(self, *args, **kwargs):
self._vscroller = None # This is required to avoid crash int he vScroller Tuning
self._moveTo = 0
self._tableData = []
TTkWidget.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , 'TTkTable' )
self._columns = kwargs.get('columns' , [] )
self._name = kwargs.get('name' , '_TTkTableViewData' )
self._columns = kwargs.get('columns' , [-1] )
self._alignments = [TTkK.NONE]*len(self._columns)
self._columnColors = kwargs.get('columnColors' , [TTkColor.RST]*len(self._columns) )
self._selectColor = kwargs.get('selectColor' , TTkColor.BOLD )
self._selected = -1
self.setFocusPolicy(TTkK.ClickFocus)
class _TTkTableView(TTkWidget):
__slots__ = (
'_header', '_showHeader',
'_alignments', '_headerColor',
'_columns', '_columnColors',
'_tableData',
'_selectColor', '_moveTo', '_selected',
# Signals
'tableMoved', 'displayedMaxRowsChanged', 'tablePropertiesChanged')
def __init__(self, *args, **kwargs):
self._moveTo = 0
self._tableData = []
TTkWidget.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , '_TTkTableView' )
# define signals
self.tableMoved = pyTTkSignal(int) # Value
self.displayedMaxRowsChanged = pyTTkSignal(int) # Value
self.tablePropertiesChanged = pyTTkSignal(int, int, int, int) # selected, numItems, displayed lines, offsetView
self._columns = kwargs.get('columns' , [-1] )
self._header = [""]*len(self._columns)
self._showHeader = False
self._alignments = [TTkK.NONE]*len(self._columns)
self._columnColors = kwargs.get('columnColors' , [TTkColor.RST]*len(self._columns) )
self._selectColor = kwargs.get('selectColor' , TTkColor.BOLD )
self._headerColor = kwargs.get('headerColor' , TTkColor.BOLD )
self._hlayout = TTkHBoxLayout()
self.setLayout(self._hlayout)
self._selected = -1
TTkSpacer(parent=self)
self._vscroller = TTkScrollBar(parent=self)
self._vscroller.valueChanged.connect(self.scrollTo)
self.setFocusPolicy(TTkK.ClickFocus)
def _initSignals(self):
# self.cellActivated(int row, int column)
# self.cellChanged(int row, int column)
# self.cellClicked(int row, int column)
# self.cellDoubleClicked(int row, int column)
# self.cellEntered(int row, int column)
# self.cellPressed(int row, int column)
# self.currentCellChanged(int currentRow, int currentColumn, int previousRow, int previousColumn)
# self.currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous)
# self.itemActivated(QTableWidgetItem *item)
# self.itemChanged(QTableWidgetItem *item)
# self.itemClicked(QTableWidgetItem *item)
# self.itemDoubleClicked(QTableWidgetItem *item)
# self.itemEntered(QTableWidgetItem *item)
# self.itemPressed(QTableWidgetItem *item)
# self.itemSelectionChanged()
pass
def items(self): return self._tableData
def setAlignment(self, alignments):
if len(alignments) != len(self._columns):
return
self._alignments = alignments
def setHeader(self, header):
if len(header) != len(self._columns):
return
self._header = header
def setColumnSize(self, columns):
self._columns = columns
self._columnColors = [TTkColor.RST]*len(self._columns)
@ -82,20 +176,8 @@ class TTkTable(TTkWidget):
if len(item) != len(self._columns):
return
self._tableData.append(item)
self._tuneTheScroller()
def resizeEvent(self, w, h):
if self._moveTo > len(self._tableData)-h-1:
self._moveTo = len(self._tableData)-h-1
if self._moveTo < 0:
self._moveTo = 0
self._tuneTheScroller()
def _tuneTheScroller(self):
if self._vscroller is None: return
scrollTo = len(self._tableData) - self.height()
self._vscroller.setRange(0, scrollTo)
self._vscroller.pagestep = self.height()
self.tablePropertiesChanged.emit(self._selected, len(self._tableData), self.height(), self._moveTo)
self.update()
def mousePressEvent(self, evt):
x,y = evt.x, evt.y
@ -107,82 +189,63 @@ class TTkTable(TTkWidget):
return True
def wheelEvent(self, evt):
# delta = self.height()
delta = 5
delta = TTkCfg.scrollDelta
if evt.evt == TTkK.WHEEL_Up:
delta = -delta
# self.scrollTo(self._moveTo + delta)
self._vscroller.value = self._moveTo + delta
self.scrollTo(self._moveTo + delta)
self.update()
return True
def resizeEvent(self, w, h):
if self._moveTo > len(self._tableData)-h-1:
self._moveTo = len(self._tableData)-h-1
if self._moveTo < 0:
self._moveTo = 0
self.displayedMaxRowsChanged.emit(h)
self.tablePropertiesChanged.emit(self._selected, len(self._tableData), self.height(), self._moveTo)
@pyTTkSlot(int)
def scrollTo(self, to):
# TTkLog.debug(f"to:{to},h{self._height},size:{len(self._tableData)}")
max = len(self._tableData) - self.height()
if to>max: to=max
if to<0: to=0
self._moveTo = to
self.tableMoved.emit(to)
self.tablePropertiesChanged.emit(self._selected, len(self._tableData), self.height(), self._moveTo)
self.update()
def paintEvent(self):
w,h = self.size()
total = 0
variableCols = 0
slicesize = 0
# Retrieve the free size
for width in self._columns:
if width > 0:
total += width
else:
variableCols += 1
if variableCols > 0:
slicesize = int((w-total)/variableCols)
# TTkLog.debug(f"ss:{slicesize}, w:{w}")
# Define the list of cols sizes
sizes = []
for width in self._columns:
if width > 0:
sizes.append(width)
else:
sizes.append((w-total)//variableCols)
variableCols -= 1
maxItems = len(self._tableData)
itemFrom = self._moveTo -1
itemFrom = self._moveTo
if itemFrom > maxItems-h: itemFrom = maxItems-h
if itemFrom < 0 : itemFrom = 0
itemTo = itemFrom + h
if itemTo > maxItems: itemTo = maxItems
# TTkLog.debug(f"moveto:{self._moveTo}, maxItems:{maxItems}, f:{itemFrom}, t{itemTo}, h:{h}, sel:{self._selected}")
def _lineDraw(_y, _val, _item, _inColor=None):
_x = 0
for i in range(0,len(_item)):
_txt = _item[i]
_width = self._columns[i]
_color = self._columnColors[i]
_align = self._alignments[i]
if _inColor is not None:
_color = _inColor
if _width < 0:
_width = slicesize
if _width > 0:
_line = ""
_lentxt = len(_txt)
if _lentxt > _width:
_line += _txt[0:_width]
else:
_pad = _width-_lentxt
if _align == TTkK.NONE or _align == TTkK.LEFT_ALIGN:
_line += _txt + " "*_pad
elif _align == TTkK.RIGHT_ALIGN:
_line += " "*_pad + _txt
elif _align == TTkK.CENTER_ALIGN:
_p1 = _pad//2
_p2 = _pad-_p1
_line += " "*_p1 + _txt+" "*_p2
elif _align == TTkK.JUSTIFY:
# TODO: Text Justification
_line += _txt + " "*_pad
self._canvas.drawText(pos=(_x,_y), text=_line, color=_color.modParam(val=-_val))
_line += " "
_x += _width + 1
_lineDraw(0,0,self._header,self._headerColor)
y = 1
y = 0
for it in range(itemFrom, itemTo):
item = self._tableData[it]
item = self._tableData[it]
if self._selected > 0:
val = self._selected - itemFrom
else:
@ -190,12 +253,58 @@ class TTkTable(TTkWidget):
if val < 0 : val = 0
if val > h : val = h
if it == self._selected:
_lineDraw(y,val,item,self._selectColor)
colors = [self._selectColor]*len(self._columnColors)
self._canvas.drawTableLine(pos=(0,y), items=item, sizes=sizes, colors=colors, alignments=self._alignments)
else:
_lineDraw(y,val,item)
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)
y+=1
class TTkTable(TTkWidget):
__slots__ = ('_vscroller', '_hscroller', '_tableView', '_headerView', '_showHeader')
def __init__(self, *args, **kwargs):
TTkWidget.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , 'TTkTable' )
if 'parent' in kwargs:
kwargs.pop('parent')
self._tableView = _TTkTableView(*args, **kwargs)
self._headerView = _TTkTableViewHeader(*args, **kwargs)
self._showHeader = kwargs.get('showHeader',True)
self._vscroller = TTkScrollBar(orientation=TTkK.VERTICAL)
self._hscroller = TTkScrollBar(orientation=TTkK.HORIZONTAL)
self.setLayout(TTkGridLayout())
self._vscroller.sliderMoved.connect(self._tableView.scrollTo)
self._tableView.tablePropertiesChanged.connect(self.handleTableProperties)
self.layout().addWidget(self._headerView,0,0)
self.layout().addWidget(self._tableView,1,0)
# self.layout().addWidget(TTkTestWidget(border=True),0,0)
self.layout().addWidget(self._vscroller,1,1)
# self.layout().addWidget(self._hscroller,1,0)
if not self._showHeader:
self._headerView.hide()
self.setFocusPolicy(TTkK.ClickFocus)
def setAlignment(self, *args, **kwargs) :
self._tableView.setAlignment(*args, **kwargs)
self._headerView.setAlignment(*args, **kwargs)
def setHeader(self, *args, **kwargs) :
self._headerView.setHeader(*args, **kwargs)
def setColumnSize(self, *args, **kwargs) :
self._tableView.setColumnSize(*args, **kwargs)
self._headerView.setColumnSize(*args, **kwargs)
def setColumnColors(self, *args, **kwargs):
self._tableView.setColumnColors(*args, **kwargs)
def appendItem(self, *args, **kwargs) :
self._vscroller.setRangeTo(len(self._tableView.items()))
self._tableView.appendItem(*args, **kwargs)
@pyTTkSlot(int, int, int, int)
def handleTableProperties(self, selected, items, height, offset):
self._vscroller.setRange(0, items-height)
self._vscroller.setValue(offset)

208
TermTk/TTkWidgets/tableview.py

@ -0,0 +1,208 @@
#!/usr/bin/env python3
# MIT License
#
# Copyright (c) 2021 Eugenio Parodi <ceccopierangiolieugenio AT googlemail DOT com>
#
# 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.constant import TTkK
from TermTk.TTkCore.log import TTkLog
from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal
from TermTk.TTkCore.color import TTkColor
from TermTk.TTkLayouts.boxlayout import TTkHBoxLayout
from TermTk.TTkWidgets.widget import TTkWidget
from TermTk.TTkWidgets.spacer import TTkSpacer
from TermTk.TTkWidgets.scrollbar import TTkScrollBar
'''
'''
class _______TTkTable(TTkWidget):
__slots__ = (
'_hlayout','_vscroller',
'_header', '_showHeader',
'_alignments', '_headerColor',
'_columns', '_columnColors',
'_tableData',
'_selectColor', '_moveTo', '_selected')
def __init__(self, *args, **kwargs):
self._vscroller = None # This is required to avoid crash int he vScroller Tuning
self._moveTo = 0
self._tableData = []
TTkWidget.__init__(self, *args, **kwargs)
self._name = kwargs.get('name' , 'TTkTable' )
self._columns = kwargs.get('columns' , [-1] )
self._header = [""]*len(self._columns)
self._showHeader = False
self._alignments = [TTkK.NONE]*len(self._columns)
self._columnColors = kwargs.get('columnColors' , [TTkColor.RST]*len(self._columns) )
self._selectColor = kwargs.get('selectColor' , TTkColor.BOLD )
self._headerColor = kwargs.get('headerColor' , TTkColor.BOLD )
self._hlayout = TTkHBoxLayout()
self.setLayout(self._hlayout)
self._selected = -1
TTkSpacer(parent=self)
self._vscroller = TTkScrollBar(parent=self)
self._vscroller.valueChanged.connect(self.scrollTo)
self.setFocusPolicy(TTkK.ClickFocus)
def setAlignment(self, alignments):
if len(alignments) != len(self._columns):
return
self._alignments = alignments
def setHeader(self, header):
if len(header) != len(self._columns):
return
self._header = header
def setColumnSize(self, columns):
self._columns = columns
self._columnColors = [TTkColor.RST]*len(self._columns)
self._header = [""]*len(self._columns)
self._alignments = [TTkK.NONE]*len(self._columns)
def setColumnColors(self, colors):
if len(colors) != len(self._columns):
return
self._columnColors = colors
def appendItem(self, item):
if len(item) != len(self._columns):
return
self._tableData.append(item)
self._tuneTheScroller()
def resizeEvent(self, w, h):
if self._moveTo > len(self._tableData)-h-1:
self._moveTo = len(self._tableData)-h-1
if self._moveTo < 0:
self._moveTo = 0
self._tuneTheScroller()
def _tuneTheScroller(self):
if self._vscroller is None: return
scrollTo = len(self._tableData) - self.height()
self._vscroller.setRange(0, scrollTo)
self._vscroller.pagestep = self.height()
def mousePressEvent(self, evt):
x,y = evt.x, evt.y
if x == self.width() - 1:
return False
if y > 0:
self._selected = self._moveTo + y - 1
self.update()
return True
def wheelEvent(self, evt):
# delta = self.height()
delta = 5
if evt.evt == TTkK.WHEEL_Up:
delta = -delta
# self.scrollTo(self._moveTo + delta)
self._vscroller.value = self._moveTo + delta
return True
@pyTTkSlot(int)
def scrollTo(self, to):
max = len(self._tableData) - self.height()
if to>max: to=max
if to<0: to=0
self._moveTo = to
self.update()
def paintEvent(self):
w,h = self.size()
total = 0
variableCols = 0
slicesize = 0
for width in self._columns:
if width > 0:
total += width
else:
variableCols += 1
if variableCols > 0:
slicesize = int((w-total)/variableCols)
# TTkLog.debug(f"ss:{slicesize}, w:{w}")
maxItems = len(self._tableData)
itemFrom = self._moveTo -1
if itemFrom > maxItems-h: itemFrom = maxItems-h
if itemFrom < 0 : itemFrom = 0
itemTo = itemFrom + h
if itemTo > maxItems: itemTo = maxItems
# TTkLog.debug(f"moveto:{self._moveTo}, maxItems:{maxItems}, f:{itemFrom}, t{itemTo}, h:{h}, sel:{self._selected}")
def _lineDraw(_y, _val, _item, _inColor=None):
_x = 0
for i in range(0,len(_item)):
_txt = _item[i]
_width = self._columns[i]
_color = self._columnColors[i]
_align = self._alignments[i]
if _inColor is not None:
_color = _inColor
if _width < 0:
_width = slicesize
if _width > 0:
_line = ""
_lentxt = len(_txt)
if _lentxt > _width:
_line += _txt[0:_width]
else:
_pad = _width-_lentxt
if _align == TTkK.NONE or _align == TTkK.LEFT_ALIGN:
_line += _txt + " "*_pad
elif _align == TTkK.RIGHT_ALIGN:
_line += " "*_pad + _txt
elif _align == TTkK.CENTER_ALIGN:
_p1 = _pad//2
_p2 = _pad-_p1
_line += " "*_p1 + _txt+" "*_p2
elif _align == TTkK.JUSTIFY:
# TODO: Text Justification
_line += _txt + " "*_pad
self._canvas.drawText(pos=(_x,_y), text=_line, color=_color.modParam(val=-_val))
_line += " "
_x += _width + 1
_lineDraw(0,0,self._header,self._headerColor)
y = 1
for it in range(itemFrom, itemTo):
item = self._tableData[it]
if self._selected > 0:
val = self._selected - itemFrom
else:
val = h//2
if val < 0 : val = 0
if val > h : val = h
if it == self._selected:
_lineDraw(y,val,item,self._selectColor)
else:
_lineDraw(y,val,item)
y+=1

17
TermTk/TTkWidgets/widget.py

@ -242,7 +242,7 @@ class TTkWidget:
self.setFocus()
self.raiseWidget()
if self.mousePressEvent(evt):
TTkLog.debug(f"Click {self._name}")
# TTkLog.debug(f"Click {self._name}")
return True
elif evt.key == lbt.MouseEvent.Wheel:
if self.wheelEvent(evt):
@ -376,9 +376,7 @@ class TTkWidget:
def show(self):
self._canvas.show()
self._visible = True
self.update()
# if self._data['layout'] is not None:
# CuWidget._showHandle(self._data['layout'])
self.update(updateLayout=True, updateParent=True)
#@staticmethod
#def _hideHandle(layout):
@ -393,10 +391,7 @@ class TTkWidget:
def hide(self):
self._canvas.hide()
self._visible = False
# self._parent._canvas.clean(self.pos(),self.size())
self.update()
# if self._layout is not None:
# TTkWidget._hideHandle(self._layout])
self.update(repaint=False, updateParent=True)
def raiseWidget(self):
if self._parent is not None and \
@ -416,7 +411,8 @@ class TTkWidget:
return self._visible
# Event to be sent
def layoutUpdated(): pass
# TODO: Remove This
def layoutUpdated(self): pass
def update(self, repaint=True, updateLayout=False, updateParent=False):
if repaint:
@ -434,6 +430,9 @@ class TTkWidget:
tmp.clearFocus()
tmp.focusOutEvent()
tmp.update(repaint=True, updateLayout=False)
tmp = TTkHelper.getOverlay()
if tmp is not None and tmp is not self:
TTkHelper.removeOverlay()
TTkHelper.setFocus(self)
self._focus = True
self.focusInEvent()

20
docs/TODO.md

@ -1,6 +1,6 @@
# TODO
- [ ] Follow [PEP 8](https://www.python.org/dev/peps/pep-0008/) coding style
- [ ] Move the Global Constants outside TTk object
- [x] Move the Global Constants outside TTk object
- [ ] Add Typing (good luck) https://docs.python.org/3/library/typing.html
- [ ] Remove Duplicate functionalities (i.e. Widget)
- [ ] Use @property/@setter when possible
@ -18,7 +18,7 @@
- [x] Handle the Paste Buffer
- [ ] Investigate the middle mouse button paste
*note: It works only in "INSERT" mode on Vim*
- [ ] Handle Special Keys (UP, Down, . . .)
- [x] Handle Special Keys (UP, Down, . . .)
- [ ] Events
https://tkinterexamples.com/events/events.html
https://www.pythontutorial.net/tkinter/tkinter-event-binding/
@ -43,6 +43,14 @@
- [ ] logger auto integration
- [ ] stdout until mainLoop
### Layout
- [ ] Add Weight in V and H Layout
- [ ] Add addLayout method - Nested layouts
- [x] Add Grid Layout
### Overlay widget
- [ ] Rewrite the Handling (ttk.py)
It would be nice to have it as child outside the layour
## Widgets
- [ ] Add Size Policy (fixed minimum maximum expanding)
- [x] Add Show/Hide
@ -77,7 +85,7 @@
- [x] Basic Implementation
- [ ] Events (Signal/Slots)
- [x] Themes
#### Dropdown Widget
#### ComboBox (dropdown) Widget
- [ ] Basic Implementation
- [ ] Events (Signal/Slots)
- [ ] Themes
@ -105,9 +113,3 @@
- [ ] Basic Implementation
- [ ] Events (Signal/Slots)
- [ ] Themes
### Layout
- [ ] Add Weight in V and H Layout
- [ ] Add addLayout method
- [x] Add Grid Layout

10
tests/test.ui.008.table.py

@ -48,7 +48,7 @@ win_table2 = ttk.TTkWindow(parent=root,pos = (15,5), size=(100,30), title="Test
table2 = ttk.TTkTable(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.TTkTable(parent=win_table3)
table3 = ttk.TTkTable(parent=win_table3, showHeader=False)
table1.setColumnSize((5,10,-1,10,20))
table1.setAlignment((
@ -114,7 +114,15 @@ def addMany():
for i in range(0, 500):
ii+=1
table1.appendItem((str(ii), getWord(), getSentence(), getWord(), getWord()))
table1.appendItem((" - ","This is the end", "Beautiful friend, This is the end My only friend", "the end", "..."))
btn2.clicked.connect(addMany)
#win_form1 = ttk.TTkWindow(parent=root,pos=(1,1), size=(60,30), title="Test Window 1", border=True)
#win_form1.setLayout(ttk.TTkGridLayout(columnMinWidth=1))
#win_form1.layout().addWidget(ttk.TTkTestWidget(border=True),0,0)
#win_form1.layout().addWidget(ttk.TTkScrollBar(),0,1)
root.mainloop()

8
tests/test.ui.009.widgets.form.py

@ -37,8 +37,14 @@ win_form1.setLayout(ttk.TTkGridLayout(columnMinWidth=1))
win_form1.layout().addWidget(ttk.TTkButton(text='Button 1'),0,0)
win_form1.layout().addWidget(ttk.TTkButton(text='Button 2'),1,0)
win_form1.layout().addWidget(ttk.TTkButton(text='Button 3'),0,2)
win_form1.layout().addWidget(ttk.TTkButton(text='Button 4'),1,2)
row = 2
row = 1; win_form1.layout().addWidget(ttk.TTkLabel(text='Line Edit Test 1'),row,0)
row +=1; win_form1.layout().addWidget(ttk.TTkLabel(text='Combo Box'),row,0)
win_form1.layout().addWidget(ttk.TTkComboBox(list=['One','Two','Three']),row,2)
row +=1; win_form1.layout().addWidget(ttk.TTkLabel(text='Line Edit Test 1'),row,0)
win_form1.layout().addWidget(ttk.TTkLineEdit(text='Line Edit Test 1'),row,2)
row += 1; win_form1.layout().addWidget(ttk.TTkLabel(text='Line Edit Test 2'),row,0)
win_form1.layout().addWidget(ttk.TTkLineEdit(text='Line Edit Test 2'),row,2)

Loading…
Cancel
Save