diff --git a/TermTk/TTkAbstract/abstractitemmodel.py b/TermTk/TTkAbstract/abstractitemmodel.py index 402e7d5d..24421a22 100644 --- a/TermTk/TTkAbstract/abstractitemmodel.py +++ b/TermTk/TTkAbstract/abstractitemmodel.py @@ -22,7 +22,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal +from TermTk.TTkCore.signal import pyTTkSignal class TTkAbstractItemModel(): __slots__ = ( diff --git a/TermTk/TTkAbstract/abstractscrollarea.py b/TermTk/TTkAbstract/abstractscrollarea.py index 6221afd8..430c9182 100644 --- a/TermTk/TTkAbstract/abstractscrollarea.py +++ b/TermTk/TTkAbstract/abstractscrollarea.py @@ -22,10 +22,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from TermTk.TTkCore.constant import TTkConstant, TTkK -from TermTk.TTkCore.log import TTkLog +from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.cfg import * -from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal +from TermTk.TTkCore.signal import pyTTkSlot from TermTk.TTkWidgets.widget import TTkWidget from TermTk.TTkWidgets.scrollbar import TTkScrollBar from TermTk.TTkLayouts.gridlayout import TTkGridLayout diff --git a/TermTk/TTkAbstract/abstractscrollview.py b/TermTk/TTkAbstract/abstractscrollview.py index db7d9c58..ea04e513 100644 --- a/TermTk/TTkAbstract/abstractscrollview.py +++ b/TermTk/TTkAbstract/abstractscrollview.py @@ -22,9 +22,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from TermTk.TTkCore.constant import TTkConstant, TTkK +from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.cfg import * -from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal from TermTk.TTkWidgets.widget import TTkWidget diff --git a/TermTk/TTkCore/TTkTerm/readinputlinux.py b/TermTk/TTkCore/TTkTerm/readinputlinux.py index e0cc4ebc..1ab2f429 100644 --- a/TermTk/TTkCore/TTkTerm/readinputlinux.py +++ b/TermTk/TTkCore/TTkTerm/readinputlinux.py @@ -29,7 +29,6 @@ except Exception as e: print(f'ERROR: {e}') exit(1) -from TermTk.TTkCore.log import TTkLog class ReadInput(): __slots__ = ('_readPipe') diff --git a/TermTk/TTkCore/canvas.py b/TermTk/TTkCore/canvas.py index 145ecdf0..257cd7a7 100644 --- a/TermTk/TTkCore/canvas.py +++ b/TermTk/TTkCore/canvas.py @@ -25,10 +25,10 @@ from TermTk.TTkCore.TTkTerm.term import TTkTerm from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.log import TTkLog -from TermTk.TTkCore.cfg import TTkCfg, TTkGlbl +from TermTk.TTkCore.cfg import TTkCfg from TermTk.TTkCore.color import TTkColor from TermTk.TTkCore.string import TTkString -from TermTk.TTkCore.helper import TTkHelper + class TTkCanvas: ''' Init the Canvas object diff --git a/TermTk/TTkCore/color.py b/TermTk/TTkCore/color.py index 507430a8..8173990f 100644 --- a/TermTk/TTkCore/color.py +++ b/TermTk/TTkCore/color.py @@ -22,8 +22,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from TermTk.TTkCore.log import TTkLog -from TermTk.TTkCore.cfg import TTkCfg from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.helper import TTkHelper @@ -82,7 +80,7 @@ class _TTkColor: r,g,b = self.fgToRGB() else: r,g,b = self.bgToRGB() - return "#{:06x}".format(r<<16|g<<8|b) + return f"#{r<<16|g<<8|b:06x}" def fgToRGB(self): if self._fg == "": return 0xff,0xff,0xff diff --git a/TermTk/TTkCore/filebuffer.py b/TermTk/TTkCore/filebuffer.py index 6f52443e..7d75a9ff 100644 --- a/TermTk/TTkCore/filebuffer.py +++ b/TermTk/TTkCore/filebuffer.py @@ -26,7 +26,7 @@ import os import re import threading from TermTk.TTkCore.log import TTkLog -from TermTk.TTkCore.signal import pyTTkSignal, pyTTkSlot +from TermTk.TTkCore.signal import pyTTkSignal ''' w1 w3 w2 w5 @@ -74,7 +74,7 @@ class TTkFileBuffer(): self._width=0 self._buffer = [None]*self._numW self._pages = [None] - self._fd = open(self._filename,'r') + self._fd = open(self._filename) threading.Thread(target=self.createIndex).start() def __del__(self): @@ -129,9 +129,7 @@ class TTkFileBuffer(): def createIndex(self): # TTkLog.debug(f"Start Indexing {self._filename}") indexes = [] - lines = 0 offset = 0 - width = 0 fileSize = os.stat(self._filename).st_size chunkSize = 0x1000000 # ~16M with open(self._filename,'rb') as infile: @@ -148,7 +146,7 @@ class TTkFileBuffer(): offset+=len(chunk) self.indexUpdated.emit(offset/fileSize) # TTkLog.debug(f"{self._filename} {offset/fileSize} ...") - self._width = max([ (self._indexes[i+1]-self._indexes[i]) for i in range(len(self._indexes)-1) ]) + self._width = max( (self._indexes[i+1]-self._indexes[i]) for i in range(len(self._indexes)-1) ) self.indexUpdated.emit(1.0) self.indexed.emit() # TTkLog.debug(f"{self._filename} {offset/fileSize} END") @@ -158,7 +156,7 @@ class TTkFileBuffer(): id = 0 rr = re.compile(regex, re.IGNORECASE if ignoreCase else 0) TTkLog.debug(f"Search RE: {regex}") - with open(self._filename,'r') as infile: + with open(self._filename) as infile: for line in infile: ma = rr.search(line) if ma: @@ -168,7 +166,7 @@ class TTkFileBuffer(): def search(self, txt): indexes = [] - with open(self._filename,'r') as infile: + with open(self._filename) as infile: for line in infile: if txt in line: indexes.append(id) diff --git a/TermTk/TTkCore/helper.py b/TermTk/TTkCore/helper.py index cce83a51..e329f9f2 100644 --- a/TermTk/TTkCore/helper.py +++ b/TermTk/TTkCore/helper.py @@ -24,7 +24,6 @@ from TermTk.TTkCore.TTkTerm.colors import TTkTermColor from TermTk.TTkCore.TTkTerm.term import TTkTerm -from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.cfg import TTkCfg, TTkGlbl from TermTk.TTkCore.constant import TTkK @@ -59,12 +58,6 @@ class TTkHelper: def addShortcut(widget, letter): TTkHelper._shortcut.append(TTkHelper._Shortcut(letter, widget)) - @staticmethod - def isParent(parent, widget): - if parent==widget: return True - if widget.parentWidget() is None: return False - return TTkHelper.isParent(parent,widget.parentWidget()) - @staticmethod def execShortcut(letter, widget=None): if not isinstance(letter, str): return @@ -319,6 +312,7 @@ class TTkHelper: layout = layout.parent() return (wx, wy) + @staticmethod def nextFocus(widget): rootWidget = TTkHelper.rootOverlay(widget) if not rootWidget: @@ -342,6 +336,7 @@ class TTkHelper: first.setFocus() first.update() + @staticmethod def prevFocus(widget): rootWidget = TTkHelper.rootOverlay(widget) if not rootWidget: diff --git a/TermTk/TTkCore/signal.py b/TermTk/TTkCore/signal.py index 6117b586..32bb536d 100644 --- a/TermTk/TTkCore/signal.py +++ b/TermTk/TTkCore/signal.py @@ -1,4 +1,3 @@ - #!/usr/bin/env python3 # MIT License diff --git a/TermTk/TTkCore/string.py b/TermTk/TTkCore/string.py index 14e28d5f..8e449e62 100644 --- a/TermTk/TTkCore/string.py +++ b/TermTk/TTkCore/string.py @@ -25,8 +25,6 @@ import re 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, _TTkColor class TTkString(): @@ -71,6 +69,7 @@ class TTkString(): self._hasTab = '\t' in self._text # raise AttributeError(f"{type(text)} not supported in TTkString") + @staticmethod def _parseAnsi(text, color = TTkColor.RST): pos = 0 txtret = "" @@ -281,7 +280,6 @@ class TTkString(): ret._text = self._text.replace(*args, **kwargs) else: start = 0 - oldPos=0 while pos := self._text.index(old, start) if old in self._text[start:] else None: ret._colors += self._colors[start:pos+oldLen] + [self._colors[pos+oldLen-1]]*(newLen-oldLen) start = pos+oldLen diff --git a/TermTk/TTkCore/timer.py b/TermTk/TTkCore/timer.py index 662c415d..347778e6 100644 --- a/TermTk/TTkCore/timer.py +++ b/TermTk/TTkCore/timer.py @@ -24,8 +24,6 @@ import threading, time -from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal diff --git a/TermTk/TTkCore/ttk.py b/TermTk/TTkCore/ttk.py index f82e8323..6e104c99 100644 --- a/TermTk/TTkCore/ttk.py +++ b/TermTk/TTkCore/ttk.py @@ -31,11 +31,9 @@ from TermTk.TTkCore.TTkTerm.input import TTkInput from TermTk.TTkCore.TTkTerm.term import TTkTerm from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.log import TTkLog -from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal from TermTk.TTkCore.cfg import * from TermTk.TTkCore.timer import * from TermTk.TTkTheme.theme import TTkTheme -from TermTk.TTkLayouts.layout import TTkLayout from TermTk.TTkWidgets.widget import * class TTk(TTkWidget): @@ -192,7 +190,7 @@ class TTk(TTkWidget): self.setGeometry(0,0,TTkGlbl.term_w,TTkGlbl.term_h) TTkLog.info(f"Resize: w:{TTkGlbl.term_w}, h:{TTkGlbl.term_h}") elif evt is TTkK.QUIT_EVENT: - TTkLog.debug(f"Quit.") + TTkLog.debug("Quit.") break else: TTkLog.error(f"Unhandled Event {evt}") diff --git a/TermTk/TTkLayouts/boxlayout.py b/TermTk/TTkLayouts/boxlayout.py index 33e76350..82166de9 100644 --- a/TermTk/TTkLayouts/boxlayout.py +++ b/TermTk/TTkLayouts/boxlayout.py @@ -26,7 +26,6 @@ **Box Layout** [`Tutorial `_] ''' -from TermTk.TTkCore.log import TTkLog from TermTk.TTkLayouts.gridlayout import TTkGridLayout class TTkHBoxLayout(TTkGridLayout): diff --git a/TermTk/TTkLayouts/gridlayout.py b/TermTk/TTkLayouts/gridlayout.py index f4c451bc..ac7395a3 100644 --- a/TermTk/TTkLayouts/gridlayout.py +++ b/TermTk/TTkLayouts/gridlayout.py @@ -27,8 +27,7 @@ ''' from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.log import TTkLog -from TermTk.TTkLayouts.layout import TTkLayout, TTkWidgetItem +from TermTk.TTkLayouts.layout import TTkLayout class TTkGridLayout(TTkLayout): ''' diff --git a/TermTk/TTkLayouts/layout.py b/TermTk/TTkLayouts/layout.py index e09d804b..6f8b7331 100644 --- a/TermTk/TTkLayouts/layout.py +++ b/TermTk/TTkLayouts/layout.py @@ -26,7 +26,6 @@ **Layout** [`Tutorial `_] ''' -from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.constant import TTkK class TTkLayoutItem: diff --git a/TermTk/TTkTemplates/color.py b/TermTk/TTkTemplates/color.py index 093ca8dc..3e843628 100644 --- a/TermTk/TTkTemplates/color.py +++ b/TermTk/TTkTemplates/color.py @@ -23,7 +23,6 @@ # SOFTWARE. from TermTk.TTkCore.color import TTkColor -from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal class TColor(): #__slots__ = ('_color') diff --git a/TermTk/TTkTestWidgets/logviewer.py b/TermTk/TTkTestWidgets/logviewer.py index 8e7326cb..4c63a333 100644 --- a/TermTk/TTkTestWidgets/logviewer.py +++ b/TermTk/TTkTestWidgets/logviewer.py @@ -26,10 +26,7 @@ import os from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.color import TTkColor -from TermTk.TTkWidgets.frame import TTkFrame -from TermTk.TTkTemplates.color import TColor -from TermTk.TTkTemplates.text import TText -from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal +from TermTk.TTkCore.signal import pyTTkSlot from TermTk.TTkAbstract.abstractscrollarea import TTkAbstractScrollArea from TermTk.TTkAbstract.abstractscrollview import TTkAbstractScrollView @@ -49,7 +46,7 @@ class _TTkLogViewer(TTkAbstractScrollView): self.update() def viewFullAreaSize(self) -> (int, int): - w = max([ len(m) for m in self._messages]) + w = max( len(m) for m in self._messages) h = len(self._messages) return w , h @@ -76,7 +73,6 @@ class _TTkLogViewer(TTkAbstractScrollView): def paintEvent(self): ox,oy = self.getViewOffsets() _,h = self.size() - offset = max(0,ox) for y, message in enumerate(self._messages[oy:]): self._canvas.drawText(pos=(0,y),text=message[ox:]) c = TTkColor.RST diff --git a/TermTk/TTkTestWidgets/testwidgetsizes.py b/TermTk/TTkTestWidgets/testwidgetsizes.py index 23483abe..f4384907 100644 --- a/TermTk/TTkTestWidgets/testwidgetsizes.py +++ b/TermTk/TTkTestWidgets/testwidgetsizes.py @@ -22,8 +22,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from TermTk.TTkCore.log import TTkLog -from TermTk.TTkCore.color import TTkColor from TermTk.TTkWidgets.frame import * class TTkTestWidgetSizes(TTkFrame): diff --git a/TermTk/TTkTheme/fileicon_nerd.py b/TermTk/TTkTheme/fileicon_nerd.py index 363540af..0af6dd84 100644 --- a/TermTk/TTkTheme/fileicon_nerd.py +++ b/TermTk/TTkTheme/fileicon_nerd.py @@ -30,7 +30,7 @@ import re import os -from TermTk.TTkCore.color import TTkColor + class FileIcon(): folderClose = '' diff --git a/TermTk/TTkWidgets/Fancy/table.py b/TermTk/TTkWidgets/Fancy/table.py index 0987fa18..ea88d186 100644 --- a/TermTk/TTkWidgets/Fancy/table.py +++ b/TermTk/TTkWidgets/Fancy/table.py @@ -22,13 +22,8 @@ # 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.tableview import TTkFancyTableView -from TermTk.TTkLayouts.gridlayout import TTkGridLayout from TermTk.TTkAbstract.abstractscrollarea import TTkAbstractScrollArea class TTkFancyTable(TTkAbstractScrollArea): diff --git a/TermTk/TTkWidgets/Fancy/tableview.py b/TermTk/TTkWidgets/Fancy/tableview.py index 16b4fdb7..a4f231a4 100644 --- a/TermTk/TTkWidgets/Fancy/tableview.py +++ b/TermTk/TTkWidgets/Fancy/tableview.py @@ -22,9 +22,7 @@ # 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.widget import TTkWidget diff --git a/TermTk/TTkWidgets/Fancy/tree.py b/TermTk/TTkWidgets/Fancy/tree.py index 1e51b9b0..040f7bd5 100644 --- a/TermTk/TTkWidgets/Fancy/tree.py +++ b/TermTk/TTkWidgets/Fancy/tree.py @@ -22,13 +22,8 @@ # 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): diff --git a/TermTk/TTkWidgets/Fancy/treeview.py b/TermTk/TTkWidgets/Fancy/treeview.py index 1fd1a64e..9c0321d6 100644 --- a/TermTk/TTkWidgets/Fancy/treeview.py +++ b/TermTk/TTkWidgets/Fancy/treeview.py @@ -22,11 +22,6 @@ # 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.tableview import TTkFancyTableView class TTkFancyTreeView(TTkFancyTableView): diff --git a/TermTk/TTkWidgets/Fancy/treewidget.py b/TermTk/TTkWidgets/Fancy/treewidget.py index 624786eb..8d10757a 100644 --- a/TermTk/TTkWidgets/Fancy/treewidget.py +++ b/TermTk/TTkWidgets/Fancy/treewidget.py @@ -22,14 +22,11 @@ # 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.widget import TTkWidget from TermTk.TTkWidgets.checkbox import TTkCheckbox -from TermTk.TTkLayouts.gridlayout import TTkGridLayout from TermTk.TTkWidgets.Fancy.tableview import TTkFancyTableView from TermTk.TTkWidgets.Fancy.treewidgetitem import TTkFancyTreeWidgetItem diff --git a/TermTk/TTkWidgets/Fancy/treewidgetitem.py b/TermTk/TTkWidgets/Fancy/treewidgetitem.py index 0b2c7cd8..84cbf059 100644 --- a/TermTk/TTkWidgets/Fancy/treewidgetitem.py +++ b/TermTk/TTkWidgets/Fancy/treewidgetitem.py @@ -22,10 +22,8 @@ # 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.signal import pyTTkSignal class TTkFancyTreeWidgetItem(): __slots__ = ('_parent', '_data', '_children', '_expand', '_childIndicatorPolicy', diff --git a/TermTk/TTkWidgets/TTkModelView/__init__.py b/TermTk/TTkWidgets/TTkModelView/__init__.py index b7dafca5..f37a83a7 100644 --- a/TermTk/TTkWidgets/TTkModelView/__init__.py +++ b/TermTk/TTkWidgets/TTkModelView/__init__.py @@ -1,4 +1,3 @@ - from .tree import TTkTree from .treewidget import TTkTreeWidget from .treewidgetitem import TTkTreeWidgetItem diff --git a/TermTk/TTkWidgets/TTkModelView/filetree.py b/TermTk/TTkWidgets/TTkModelView/filetree.py index 55f6c232..065bd469 100644 --- a/TermTk/TTkWidgets/TTkModelView/filetree.py +++ b/TermTk/TTkWidgets/TTkModelView/filetree.py @@ -22,8 +22,6 @@ # 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.signal import pyTTkSlot, pyTTkSignal from TermTk.TTkWidgets.TTkModelView.tree import TTkTree from TermTk.TTkWidgets.TTkModelView.filetreewidget import TTkFileTreeWidget diff --git a/TermTk/TTkWidgets/TTkModelView/filetreewidget.py b/TermTk/TTkWidgets/TTkModelView/filetreewidget.py index 72e5e162..e1641119 100644 --- a/TermTk/TTkWidgets/TTkModelView/filetreewidget.py +++ b/TermTk/TTkWidgets/TTkModelView/filetreewidget.py @@ -23,13 +23,11 @@ # SOFTWARE. import os -import re import datetime from TermTk.TTkCore.color import TTkColor from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.cfg import TTkCfg from TermTk.TTkCore.string import TTkString from TermTk.TTkWidgets.TTkModelView.treewidget import TTkTreeWidget diff --git a/TermTk/TTkWidgets/TTkModelView/filetreewidgetitem.py b/TermTk/TTkWidgets/TTkModelView/filetreewidgetitem.py index d8488e9a..349e638a 100644 --- a/TermTk/TTkWidgets/TTkModelView/filetreewidgetitem.py +++ b/TermTk/TTkWidgets/TTkModelView/filetreewidgetitem.py @@ -24,14 +24,8 @@ import re -from TermTk.TTkCore.color import TTkColor - from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.log import TTkLog -from TermTk.TTkCore.cfg import TTkCfg -from TermTk.TTkCore.string import TTkString from TermTk.TTkWidgets.TTkModelView.treewidgetitem import TTkTreeWidgetItem -from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal class TTkFileTreeWidgetItem(TTkTreeWidgetItem): FILE = 0x00 diff --git a/TermTk/TTkWidgets/TTkModelView/tree.py b/TermTk/TTkWidgets/TTkModelView/tree.py index 28f6c1e2..834d5164 100644 --- a/TermTk/TTkWidgets/TTkModelView/tree.py +++ b/TermTk/TTkWidgets/TTkModelView/tree.py @@ -23,8 +23,6 @@ # SOFTWARE. from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal -from TermTk.TTkWidgets.TTkModelView import treewidget from TermTk.TTkWidgets.TTkModelView.treewidget import TTkTreeWidget from TermTk.TTkAbstract.abstractscrollarea import TTkAbstractScrollArea diff --git a/TermTk/TTkWidgets/TTkModelView/treewidget.py b/TermTk/TTkWidgets/TTkModelView/treewidget.py index 7ec2106c..53ee9172 100644 --- a/TermTk/TTkWidgets/TTkModelView/treewidget.py +++ b/TermTk/TTkWidgets/TTkModelView/treewidget.py @@ -23,9 +23,7 @@ # SOFTWARE. from TermTk.TTkCore.cfg import TTkCfg -from TermTk.TTkCore.color import TTkColor from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.log import TTkLog from TermTk.TTkWidgets.TTkModelView.treewidgetitem import TTkTreeWidgetItem from TermTk.TTkAbstract.abstractscrollarea import TTkAbstractScrollView from TermTk.TTkCore.signal import pyTTkSignal, pyTTkSlot @@ -181,7 +179,7 @@ class TTkTreeWidget(TTkAbstractScrollView): item = self._cache[y].item level = self._cache[y].level if level*2 <= x < level*2+3 and \ - ( item.childIndicatorPolicy() == TTkK.DontShowIndicatorWhenChildless and item.children() or \ + ( item.childIndicatorPolicy() == TTkK.DontShowIndicatorWhenChildless and item.children() or item.childIndicatorPolicy() == TTkK.ShowIndicator ): item.setExpanded(not item.isExpanded()) if item.isExpanded(): @@ -291,7 +289,6 @@ class TTkTreeWidget(TTkAbstractScrollView): for i, c in enumerate(self._cache): if i-y<0 : continue item = c.item - level = c.level for il in range(len(self._header)): lx = 0 if il==0 else self._columnsPos[il-1]+1 lx1 = self._columnsPos[il] diff --git a/TermTk/TTkWidgets/TTkModelView/treewidgetitem.py b/TermTk/TTkWidgets/TTkModelView/treewidgetitem.py index 61ee2628..6b0af244 100644 --- a/TermTk/TTkWidgets/TTkModelView/treewidgetitem.py +++ b/TermTk/TTkWidgets/TTkModelView/treewidgetitem.py @@ -24,8 +24,7 @@ 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.signal import pyTTkSlot from TermTk.TTkAbstract.abstractitemmodel import TTkAbstractItemModel @@ -40,7 +39,6 @@ class TTkTreeWidgetItem(TTkAbstractItemModel): def __init__(self, *args, **kwargs): # Signals # self.refreshData = pyTTkSignal(TTkTreeWidgetItem) - tt = TTkCfg.theme.tree super().__init__(*args, **kwargs) self._children = [] self._data = args[0] if len(args)>0 and type(args[0])==list else [''] @@ -184,6 +182,6 @@ class TTkTreeWidgetItem(TTkAbstractItemModel): def size(self): if self._expanded: - return 1 + sum([c.size() for c in self.children()]) + return 1 + sum(c.size() for c in self.children()) else: return 1 diff --git a/TermTk/TTkWidgets/TTkPickers/colorpicker.py b/TermTk/TTkWidgets/TTkPickers/colorpicker.py index ebe11a36..80dc2f1b 100644 --- a/TermTk/TTkWidgets/TTkPickers/colorpicker.py +++ b/TermTk/TTkWidgets/TTkPickers/colorpicker.py @@ -33,7 +33,6 @@ from TermTk.TTkCore.helper import TTkHelper from TermTk.TTkWidgets.widget import TTkWidget from TermTk.TTkWidgets.window import TTkWindow from TermTk.TTkWidgets.button import TTkButton -from TermTk.TTkWidgets.frame import TTkFrame from TermTk.TTkWidgets.label import TTkLabel from TermTk.TTkWidgets.lineedit import TTkLineEdit from TermTk.TTkWidgets.spinbox import TTkSpinBox @@ -61,10 +60,9 @@ class _TTkHueCanvas(TTkWidget): self._selected = -1 def mousePressEvent(self, evt): - x,y = evt.x, evt.y - self._selected = x - if x < len(self._hueList): - self.colorPicked.emit(self._hueList[x]) + self._selected = evt.x + if evt.x < len(self._hueList): + self.colorPicked.emit(self._hueList[evt.x]) self.update() return True @@ -83,7 +81,7 @@ class _TTkHueCanvas(TTkWidget): rgb =a|(b&_linInt(0,b,6*x/w)) else: rgb =a|(b&_linInt(b,0,6*x/w)) - color = TTkColor.bg( "#{:06x}".format(rgb) ) + color = TTkColor.bg( f"#{rgb:06x}" ) if (num*w//6)+x == self._selected: self._canvas.drawChar(pos=((num*w//6)+x,0), char="◼", color=color+TTkColor.fg("#000000")) else: @@ -144,7 +142,7 @@ class _TTkColorCanvas(TTkWidget): w,h = self.size() for x in range(w): for y in range(h): - color = TTkColor.bg( "#{:06x}".format(self._colorAt(x,y,w,h)) ) + color = TTkColor.bg( f"#{self._colorAt(x,y,w,h):06x}" ) if (x,y)==self._selected: self._canvas.drawText(pos=(x,y), text="◼", color=color+TTkColor.fg("#000000")) else: @@ -158,7 +156,7 @@ class _TTkShowColor(TTkWidget,TColor): @pyTTkSlot(int) def setRGBColor(self, color): - self.color = TTkColor.bg( "#{:06x}".format(color) ) + self.color = TTkColor.bg( f"#{color:06x}" ) self.update() @pyTTkSlot(TTkColor) @@ -296,7 +294,7 @@ class TTkColorDialogPicker(TTkWindow,TColor): leR.setValue((color&0xff0000)>>16) leG.setValue((color&0x00ff00)>> 8) leB.setValue((color&0x0000ff)>> 0) - leHTML.setText("#{:06X}".format(color)) + leHTML.setText(f"#{color:06X}") @pyTTkSlot(TTkColor) def _controlSetColor(color): diff --git a/TermTk/TTkWidgets/TTkPickers/filepicker.py b/TermTk/TTkWidgets/TTkPickers/filepicker.py index efcf4b94..cddd4598 100644 --- a/TermTk/TTkWidgets/TTkPickers/filepicker.py +++ b/TermTk/TTkWidgets/TTkPickers/filepicker.py @@ -28,7 +28,6 @@ import re from TermTk.TTkCore.color import TTkColor from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.cfg import TTkCfg from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal from TermTk.TTkCore.string import TTkString @@ -113,7 +112,7 @@ class TTkFileDialogPicker(TTkWindow): self._btnCancel = TTkButton(text="Cancel",maxWidth=8) for f in self._filters.split(';;'): - if m := re.match(".*\(.*\)",f): + if re.match(".*\(.*\)",f): self._fileType.addItem(f) self._fileType.setCurrentIndex(0) self._fileType.currentTextChanged.connect(self._fileTypeChanged) @@ -263,5 +262,6 @@ class TTkFileDialogPicker(TTkWindow): break return ret class TTkFileDialog: + @staticmethod def getOpenFileName(caption, dir=".", filter="All Files (*)", options=None): pass \ No newline at end of file diff --git a/TermTk/TTkWidgets/about.py b/TermTk/TTkWidgets/about.py index 09d95568..ce9201f8 100644 --- a/TermTk/TTkWidgets/about.py +++ b/TermTk/TTkWidgets/about.py @@ -22,10 +22,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.cfg import TTkCfg from TermTk.TTkCore.color import TTkColor -from TermTk.TTkCore.string import TTkString from TermTk.TTkWidgets.window import TTkWindow from TermTk.TTkWidgets.image import TTkImage @@ -76,7 +74,7 @@ class TTkAbout(TTkWindow): self._canvas.drawText(pos=(9,3+y),text=line, color=TTkColor.fg(f'#{c[0]:02X}{c[1]:02X}{c[2]:02X}')) c[2]-=0x11 self._canvas.drawText(pos=(20,9),text=f" Version: {TTkCfg.version}", color=TTkColor.fg('#AAAAFF')) - self._canvas.drawText(pos=(12,11),text=f"Powered By, Eugenio Parodi") - self._canvas.drawText(pos=(2,13),text=f"https://github.com/ceccopierangiolieugenio/pyTermTk", color=TTkColor.fg('#44FFFF')) + self._canvas.drawText(pos=(12,11),text="Powered By, Eugenio Parodi") + self._canvas.drawText(pos=(2,13),text="https://github.com/ceccopierangiolieugenio/pyTermTk", color=TTkColor.fg('#44FFFF')) TTkWindow.paintEvent(self) diff --git a/TermTk/TTkWidgets/button.py b/TermTk/TTkWidgets/button.py index 4c54dc37..1d9fb8f8 100644 --- a/TermTk/TTkWidgets/button.py +++ b/TermTk/TTkWidgets/button.py @@ -23,9 +23,7 @@ # 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.TTkCore.signal import pyTTkSignal from TermTk.TTkWidgets.widget import * class TTkButton(TTkWidget): diff --git a/TermTk/TTkWidgets/checkbox.py b/TermTk/TTkWidgets/checkbox.py index 4de70d67..7b8ce785 100644 --- a/TermTk/TTkWidgets/checkbox.py +++ b/TermTk/TTkWidgets/checkbox.py @@ -23,9 +23,7 @@ # 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.TTkCore.signal import pyTTkSignal from TermTk.TTkWidgets.widget import * class TTkCheckbox(TTkWidget): diff --git a/TermTk/TTkWidgets/combobox.py b/TermTk/TTkWidgets/combobox.py index 5a0b033b..3479bd92 100644 --- a/TermTk/TTkWidgets/combobox.py +++ b/TermTk/TTkWidgets/combobox.py @@ -26,11 +26,9 @@ 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.TTkCore.helper import TTkHelper from TermTk.TTkLayouts.gridlayout import TTkGridLayout from TermTk.TTkWidgets.widget import TTkWidget -from TermTk.TTkWidgets.button import TTkButton from TermTk.TTkWidgets.list_ import TTkList from TermTk.TTkWidgets.lineedit import TTkLineEdit from TermTk.TTkWidgets.resizableframe import TTkResizableFrame diff --git a/TermTk/TTkWidgets/frame.py b/TermTk/TTkWidgets/frame.py index c611e7d8..ca397dc9 100644 --- a/TermTk/TTkWidgets/frame.py +++ b/TermTk/TTkWidgets/frame.py @@ -23,8 +23,6 @@ # SOFTWARE. from TermTk.TTkCore.cfg import * -from TermTk.TTkCore.helper import TTkHelper -from TermTk.TTkCore.log import TTkLog from TermTk.TTkWidgets.widget import TTkWidget from TermTk.TTkWidgets.menubar import TTkMenuLayout diff --git a/TermTk/TTkWidgets/graph.py b/TermTk/TTkWidgets/graph.py index 7e3c3cbe..339277eb 100644 --- a/TermTk/TTkWidgets/graph.py +++ b/TermTk/TTkWidgets/graph.py @@ -29,7 +29,6 @@ from TermTk.TTkCore.cfg import * from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.log import TTkLog from TermTk.TTkWidgets.widget import TTkWidget from TermTk.TTkTemplates.color import TColor diff --git a/TermTk/TTkWidgets/image.py b/TermTk/TTkWidgets/image.py index 02f3c409..dad03d81 100644 --- a/TermTk/TTkWidgets/image.py +++ b/TermTk/TTkWidgets/image.py @@ -22,7 +22,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.color import TTkColor from TermTk.TTkCore.string import TTkString from TermTk.TTkWidgets.widget import TTkWidget @@ -34,7 +33,7 @@ class TTkImage(TTkWidget): self._name = kwargs.get('name' , 'TTkImage' ) self._data = kwargs.get('data' , [] ) if self._data: - w = min([len(i) for i in self._data]) + w = min(len(i) for i in self._data) h = len(self._data) self.resize(w//2,h//2) @@ -42,7 +41,7 @@ class TTkImage(TTkWidget): # quadblitter notcurses like l = (a,b,c,d) def delta(i): - return max([v[i] for v in l]) - min([v[i] for v in l]) + return max(v[i] for v in l) - min(v[i] for v in l) deltaR = delta(0) deltaG = delta(1) deltaB = delta(2) @@ -87,7 +86,7 @@ class TTkImage(TTkWidget): '▄', '▙', '▟', '█'] return TTkString() + \ - (TTkColor.bg(f'#{c1[0]:02X}{c1[1]:02X}{c1[2]:02X}') + \ + (TTkColor.bg(f'#{c1[0]:02X}{c1[1]:02X}{c1[2]:02X}') + TTkColor.fg(f'#{c2[0]:02X}{c2[1]:02X}{c2[2]:02X}')) + \ quad[ch] @@ -172,8 +171,8 @@ class TTkImage(TTkWidget): img = self._data for y in range(0, len(img)&(~1), 2): for x in range(0, min(len(img[y])&(~1),len(img[y+1])&(~1)), 2): - self._canvas.drawText( \ - pos=(x//2,y//2), \ + self._canvas.drawText( + pos=(x//2,y//2), text=self._reduce( img[y][x] , img[y][x+1] , img[y+1][x] , img[y+1][x+1] )) diff --git a/TermTk/TTkWidgets/label.py b/TermTk/TTkWidgets/label.py index 38431b71..b842e5e6 100644 --- a/TermTk/TTkWidgets/label.py +++ b/TermTk/TTkWidgets/label.py @@ -23,7 +23,6 @@ # SOFTWARE. from TermTk.TTkCore.color import TTkColor -from TermTk.TTkCore.log import TTkLog from TermTk.TTkWidgets.widget import * from TermTk.TTkTemplates.color import TColor from TermTk.TTkTemplates.text import TText diff --git a/TermTk/TTkWidgets/lineedit.py b/TermTk/TTkWidgets/lineedit.py index 14270c6f..4b98235f 100644 --- a/TermTk/TTkWidgets/lineedit.py +++ b/TermTk/TTkWidgets/lineedit.py @@ -25,7 +25,6 @@ import re from TermTk.TTkCore.cfg import TTkCfg -from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.helper import TTkHelper from TermTk.TTkCore.string import TTkString from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal @@ -164,7 +163,6 @@ class TTkLineEdit(TTkWidget): return True def keyEvent(self, evt): - w = self.width() baseText = self._text if evt.type == TTkK.SpecialKey: # Don't Handle the special tab key diff --git a/TermTk/TTkWidgets/list_.py b/TermTk/TTkWidgets/list_.py index b6eae5e9..43ea1f2c 100644 --- a/TermTk/TTkWidgets/list_.py +++ b/TermTk/TTkWidgets/list_.py @@ -22,10 +22,6 @@ # 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.TTkWidgets.listwidget import TTkListWidget from TermTk.TTkAbstract.abstractscrollarea import TTkAbstractScrollArea diff --git a/TermTk/TTkWidgets/menubar.py b/TermTk/TTkWidgets/menubar.py index ad39b7a8..9f34a7ec 100644 --- a/TermTk/TTkWidgets/menubar.py +++ b/TermTk/TTkWidgets/menubar.py @@ -26,7 +26,6 @@ from TermTk.TTkCore.cfg import * from TermTk.TTkCore.helper import TTkHelper from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.signal import pyTTkSignal, pyTTkSlot -from TermTk.TTkWidgets.widget import TTkWidget from TermTk.TTkWidgets.button import TTkButton from TermTk.TTkWidgets.listwidget import TTkListWidget, TTkAbstractListItem from TermTk.TTkLayouts.layout import TTkLayout diff --git a/TermTk/TTkWidgets/radiobutton.py b/TermTk/TTkWidgets/radiobutton.py index 61a47127..2150fe35 100644 --- a/TermTk/TTkWidgets/radiobutton.py +++ b/TermTk/TTkWidgets/radiobutton.py @@ -23,9 +23,7 @@ # 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.TTkCore.signal import pyTTkSignal from TermTk.TTkWidgets.widget import * class TTkRadioButton(TTkWidget): diff --git a/TermTk/TTkWidgets/resizableframe.py b/TermTk/TTkWidgets/resizableframe.py index 7e10f97a..35be48e6 100644 --- a/TermTk/TTkWidgets/resizableframe.py +++ b/TermTk/TTkWidgets/resizableframe.py @@ -23,7 +23,6 @@ # SOFTWARE. from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.log import TTkLog from TermTk.TTkWidgets.frame import TTkFrame class TTkResizableFrame(TTkFrame): diff --git a/TermTk/TTkWidgets/scrollarea.py b/TermTk/TTkWidgets/scrollarea.py index 442e81e1..aa052a22 100644 --- a/TermTk/TTkWidgets/scrollarea.py +++ b/TermTk/TTkWidgets/scrollarea.py @@ -22,9 +22,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from TermTk.TTkCore.log import TTkLog -from TermTk.TTkCore.constant import TTkConstant, TTkK -from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal +from TermTk.TTkCore.constant import TTkK +from TermTk.TTkCore.signal import pyTTkSlot from TermTk.TTkAbstract.abstractscrollarea import TTkAbstractScrollArea from TermTk.TTkAbstract.abstractscrollview import TTkAbstractScrollView diff --git a/TermTk/TTkWidgets/scrollbar.py b/TermTk/TTkWidgets/scrollbar.py index b82e236d..5e8c9737 100644 --- a/TermTk/TTkWidgets/scrollbar.py +++ b/TermTk/TTkWidgets/scrollbar.py @@ -23,7 +23,6 @@ # 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.TTkWidgets.widget import TTkWidget @@ -218,7 +217,7 @@ class TTkScrollBar(TTkWidget): @property def maximum(self): return self._maximum - @minimum.setter + @maximum.setter def maximum(self, v): if v == self._maximum: return diff --git a/TermTk/TTkWidgets/spacer.py b/TermTk/TTkWidgets/spacer.py index 182fb919..aa95a0e1 100644 --- a/TermTk/TTkWidgets/spacer.py +++ b/TermTk/TTkWidgets/spacer.py @@ -22,7 +22,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from TermTk.TTkCore.log import TTkLog from TermTk.TTkWidgets.widget import TTkWidget class TTkSpacer(TTkWidget): diff --git a/TermTk/TTkWidgets/spinbox.py b/TermTk/TTkWidgets/spinbox.py index cb3a399d..e73d9596 100644 --- a/TermTk/TTkWidgets/spinbox.py +++ b/TermTk/TTkWidgets/spinbox.py @@ -23,11 +23,7 @@ # SOFTWARE. from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.cfg import TTkCfg -from TermTk.TTkCore.log import TTkLog -from TermTk.TTkCore.helper import TTkHelper from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal -from TermTk.TTkCore.color import TTkColor from TermTk.TTkLayouts import TTkGridLayout from TermTk.TTkWidgets.widget import TTkWidget from TermTk.TTkWidgets.lineedit import TTkLineEdit diff --git a/TermTk/TTkWidgets/splitter.py b/TermTk/TTkWidgets/splitter.py index 1fe2ae19..590f1fad 100644 --- a/TermTk/TTkWidgets/splitter.py +++ b/TermTk/TTkWidgets/splitter.py @@ -23,8 +23,6 @@ # SOFTWARE. from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.log import TTkLog -from TermTk.TTkCore.color import TTkColor from TermTk.TTkWidgets.widget import * from TermTk.TTkWidgets.frame import * diff --git a/TermTk/TTkWidgets/tabwidget.py b/TermTk/TTkWidgets/tabwidget.py index c4d41e74..18d5b0ea 100644 --- a/TermTk/TTkWidgets/tabwidget.py +++ b/TermTk/TTkWidgets/tabwidget.py @@ -22,7 +22,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from TermTk.TTkCore.constant import TTkConstant, TTkK +from TermTk.TTkCore.constant import TTkK from TermTk.TTkCore.helper import TTkHelper from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.cfg import * @@ -134,11 +134,11 @@ class _TTkTabMenuButton(TTkMenuButton): if self._pressed: borderColor = self._borderColor textColor = TTkCfg.theme.menuButtonColorClicked - scColor = TTkCfg.theme.menuButtonShortcutColor + # scColor = TTkCfg.theme.menuButtonShortcutColor else: borderColor = self._borderColor textColor = self._color - scColor = TTkCfg.theme.menuButtonShortcutColor + # scColor = TTkCfg.theme.menuButtonShortcutColor text = TTkString('[',borderColor) + TTkString(self.text,textColor) + TTkString(']',borderColor) self._canvas.drawText(pos=(0,0),text=text) diff --git a/TermTk/TTkWidgets/texedit.py b/TermTk/TTkWidgets/texedit.py index bd79f728..f93673a0 100644 --- a/TermTk/TTkWidgets/texedit.py +++ b/TermTk/TTkWidgets/texedit.py @@ -22,12 +22,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from TermTk.TTkCore.log import TTkLog from TermTk.TTkWidgets.widget import * -from TermTk.TTkLayouts.gridlayout import TTkGridLayout -from TermTk.TTkCore.color import TTkColor from TermTk.TTkCore.string import TTkString -from TermTk.TTkWidgets.scrollbar import TTkScrollBar from TermTk.TTkAbstract.abstractscrollarea import TTkAbstractScrollArea from TermTk.TTkAbstract.abstractscrollview import TTkAbstractScrollView @@ -158,7 +154,7 @@ class _TTkTextEditView(TTkAbstractScrollView): return super().resizeEvent(w,h) def _updateSize(self): - self._hsize = max( [ len(l) for l in self._dataLines ] ) + self._hsize = max( len(l) for l in self._dataLines ) def viewFullAreaSize(self) -> (int, int): if self._lineWrapMode == TTkK.NoWrap: diff --git a/TermTk/TTkWidgets/window.py b/TermTk/TTkWidgets/window.py index dac955a6..4b358d50 100644 --- a/TermTk/TTkWidgets/window.py +++ b/TermTk/TTkWidgets/window.py @@ -24,10 +24,8 @@ from TermTk.TTkCore.cfg import TTkCfg from TermTk.TTkCore.constant import TTkK -from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.color import TTkColor from TermTk.TTkWidgets.resizableframe import TTkResizableFrame -from TermTk.TTkWidgets.widget import TTkWidget class TTkWindow(TTkResizableFrame):