Merge pull request #183 from ceccopierangiolieugenio/dev

Dev

TermTk/TTkCore/helper.py

@@ -414,7 +414,7 @@ def nextFocus(widget):
                 if w == widget:
                     widget=None
                 continue
-            if w.focusPolicy() & TTkK.TabFocus == TTkK.TabFocus:
+            if w.isEnabled() and w.focusPolicy() & TTkK.TabFocus == TTkK.TabFocus:
                 w.setFocus()
                 w.update()
                 return
@@ -436,7 +436,7 @@ def prevFocus(widget):
                 widget=None
                 if prev:
                     break
-            if w.focusPolicy() & TTkK.TabFocus == TTkK.TabFocus:
+            if w.isEnabled() and w.focusPolicy() & TTkK.TabFocus == TTkK.TabFocus:
                 prev = w
         if prev:
             prev.setFocus()

TermTk/TTkWidgets/button.py

@@ -226,6 +226,9 @@ def mouseReleaseEvent(self, evt):
     def keyEvent(self, evt):
         if ( evt.type == TTkK.Character and evt.key==" " ) or \
            ( evt.type == TTkK.SpecialKey and evt.key == TTkK.Key_Enter ):
+            if self._checkable:
+                self._checked = not self._checked
+                self.toggled.emit(self._checked)
             self.update()
             self.clicked.emit()
             return True
@@ -237,10 +240,13 @@ def paintEvent(self, canvas):
                 style = self.style()['checked']
             else:
                 style = self.style()['unchecked']
+            if self.hasFocus():
+                borderColor = self.style()['focus']['borderColor']
+            else:
+                borderColor = style['borderColor']
         else:
             style = self.currentStyle()
-
-        borderColor = style['borderColor']
+            borderColor = style['borderColor']
         textColor   = style['color']
         grid = style['grid']
 

TermTk/TTkWidgets/lineedit.py

@@ -185,7 +185,7 @@ def mouseTapEvent(self, evt) -> bool:
     @staticmethod
     def _isFloat(num):
         try:
-            float(num)
+            float(str(num))
             return True
         except:
             return False
@@ -220,12 +220,12 @@ def pasteEvent(self, txt:str):
     def keyEvent(self, evt):
         baseText = self._text
         if evt.type == TTkK.SpecialKey:
-            # Don't Handle the special tab key
-            if evt.key == TTkK.Key_Tab:
+            # Don't Handle the special focus switch key
+            if evt.key in (
+                TTkK.Key_Tab, TTkK.Key_Up, TTkK.Key_Down):
                 return False
-            if evt.key == TTkK.Key_Up: pass
-            elif evt.key == TTkK.Key_Down: pass
-            elif evt.key == TTkK.Key_Left:
+
+            if evt.key == TTkK.Key_Left:
                 if self._selectionFrom < self._selectionTo:
                     self._cursorPos = self._selectionTo
                 self._cursorPos = self._text.prevPos(self._cursorPos)

TermTk/TTkWidgets/listwidget.py

@@ -226,10 +226,15 @@ def moveItem(self, fr, to):
 
     def removeItem(self, item):
         '''removeItem'''
-        self.removeWidget(item)
+        item.listItemClicked.disconnect(self._labelSelectedHandler)
+        item._setSelected(False)
+        item._setHighlighted(False)
+        self.layout().removeWidget(item)
         self._items.remove(item)
         if item in self._selectedItems:
             self._selectedItems.remove(item)
+        if item == self._highlighted:
+            self._highlighted = None
         self._placeItems()
 
     def removeAt(self, pos):

tests/test.ui.014.list.03.py

@@ -0,0 +1,105 @@
+#!/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.
+
+import sys, os, argparse, math, random
+
+sys.path.append(os.path.join(sys.path[0],'..'))
+import TermTk as ttk
+
+words = ["Lorem", "ipsum", "dolor", "sit", "amet,", "consectetur", "adipiscing", "elit,", "sed", "do", "eiusmod", "tempor", "incididunt", "ut", "labore", "et", "dolore", "magna", "aliqua.", "Ut", "enim", "ad", "minim", "veniam,", "quis", "nostrud", "exercitation", "ullamco", "laboris", "nisi", "ut", "aliquip", "ex", "ea", "commodo", "consequat.", "Duis", "aute", "irure", "dolor", "in", "reprehenderit", "in", "voluptate", "velit", "esse", "cillum", "dolore", "eu", "fugiat", "nulla", "pariatur.", "Excepteur", "sint", "occaecat", "cupidatat", "non", "proident,", "sunt", "in", "culpa", "qui", "officia", "deserunt", "mollit", "anim", "id", "est", "laborum."]
+def getWord():
+    return random.choice(words)
+
+parser = argparse.ArgumentParser()
+parser.add_argument('-t', help='Track Mouse', action='store_true')
+args = parser.parse_args()
+mouseTrack = args.t
+
+root = ttk.TTk(title="pyTermTk List Demo", mouseTrack=mouseTrack)
+
+# Define the main Layout
+frame1 = ttk.TTkResizableFrame(parent=root, pos=( 0, 0), size=(30,30), title="Single List", border=0, layout=ttk.TTkVBoxLayout())
+frame2 = ttk.TTkResizableFrame(parent=root, pos=(30, 0), size=(30,30), title="Multi List", border=0, layout=ttk.TTkVBoxLayout())
+frame3 = ttk.TTkResizableFrame(parent=root, pos=(60, 0), size=(80,30), title="Log", border=0, layout=ttk.TTkVBoxLayout())
+
+# Single Selection List
+listWidgetSingle = ttk.TTkList(parent=frame1, maxWidth=40, minWidth=10)
+
+# Multi Selection List
+listWidgetMulti = ttk.TTkList(parent=frame2, maxWidth=40, minWidth=10, selectionMode=ttk.TTkK.MultiSelection)
+
+# Log Viewer
+label1 = ttk.TTkLabel(parent=root, pos=(10,30), text="[ list1 ]",maxHeight=2)
+label2 = ttk.TTkLabel(parent=root, pos=(10,31), text="[ list2 ]",maxHeight=2)
+ttk.TTkLogViewer(parent=frame3)#, border=True)
+
+btn_mv1 = ttk.TTkButton(parent=root, pos=(0,30), text=" >> ")
+btn_mv2 = ttk.TTkButton(parent=root, pos=(0,31), text=" << ")
+btn_del = ttk.TTkButton(parent=root, pos=(0,32), text="Delete")
+
+@ttk.pyTTkSlot(str)
+def _listCallback1(label):
+    ttk.TTkLog.info(f'Clicked label1: "{label}"')
+    label1.setText(f'[ list1 ] clicked "{label}" - Selected: {[str(s) for s in listWidgetSingle.selectedLabels()]}')
+
+@ttk.pyTTkSlot(str)
+def _listCallback2(label):
+    ttk.TTkLog.info(f'Clicked label2: "{label}" - selected: {[str(s) for s in listWidgetMulti.selectedLabels()]}')
+    label2.setText(f'[ list2 ] clicked "{label}" - {[str(s) for s in listWidgetMulti.selectedLabels()]}')
+
+@ttk.pyTTkSlot()
+def _moveToRight2():
+    for i in listWidgetSingle.selectedItems().copy():
+        listWidgetSingle.removeItem(i)
+        listWidgetMulti.addItemAt(i,0)
+
+@ttk.pyTTkSlot()
+def _moveToLeft1():
+    for i in listWidgetMulti.selectedItems().copy():
+        listWidgetMulti.removeItem(i)
+        listWidgetSingle.addItemAt(i,0)
+
+@ttk.pyTTkSlot()
+def _delSelected():
+    for i in listWidgetMulti.selectedItems().copy():
+        listWidgetMulti.removeItem(i)
+    for i in listWidgetSingle.selectedItems().copy():
+        listWidgetSingle.removeItem(i)
+
+
+btn_mv1.clicked.connect(_moveToRight2)
+btn_mv2.clicked.connect(_moveToLeft1)
+btn_del.clicked.connect(_delSelected)
+
+
+# Connect the signals to the 2 slots defines
+listWidgetSingle.textClicked.connect(_listCallback1)
+listWidgetMulti.textClicked.connect(_listCallback2)
+
+# populate the lists with random entries
+for i in range(10):
+    listWidgetSingle.addItem(f"{i}) {getWord()} {getWord()}")
+    listWidgetMulti.addItem(f"{getWord()} {getWord()}")
+
+root.mainloop()