feat: add nerd_1 theme to the tab widget

Author: ceccopierangiolieugenio

libs/pyTermTk/TermTk/TTkCore/TTkTerm/term_base.py

@@ -84,6 +84,7 @@ class Sigmask():
         CTRL_S = 0x0002
         CTRL_Z = 0x0004
         CTRL_Q = 0x0008
+        CTRL_Y = 0x0010
 
     title: str = "TermTk"
     width: int = 0

libs/pyTermTk/TermTk/TTkCore/drivers/term_unix.py

@@ -67,6 +67,8 @@ def _setSigmask(mask, value=True):
             attr[6][termios.VSUSP]=  b'\x1a' if value else 0
         if mask & TTkTerm.Sigmask.CTRL_Q:
             attr[6][termios.VSTART]= b'\x11' if value else 0
+        if mask & TTkTerm.Sigmask.CTRL_Y:
+            attr[6][termios.VDSUSP]= b'\x19' if value else 0
         termios.tcsetattr(sys.stdin, termios.TCSADRAIN, attr)
     TTkTermBase.setSigmask = _setSigmask
 

libs/pyTermTk/TermTk/TTkGui/textdocument.py

@@ -152,7 +152,6 @@ def __init__(self, *, text:TTkString=" ") -> None:
         self.undoCommandAdded = pyTTkSignal()
         self.modificationChanged = pyTTkSignal(bool)
         self._backgroundColor = TTkColor.RST
-        text = text
         self._dataLines = [TTkString(t) for t in text.split('\n')]
         self._modified = False
         # Cumulative changes since the lasrt snapshot
@@ -267,10 +266,10 @@ def appendText(self, text):
         self._snapChanged = None
 
     def isUndoAvailable(self):
-        return self._snap and self._snap._prevDiff
+        return self._snap is not None and self._snap._prevDiff is not None
 
     def isRedoAvailable(self):
-        return self._snap and self._snap._nextDiff
+        return self._snap is not None and self._snap._nextDiff is not None
 
     def hasSnapshots(self):
         return self._snap is not None

libs/pyTermTk/TermTk/TTkWidgets/kodetab.py

@@ -31,7 +31,7 @@
 from TermTk.TTkCore.color import TTkColor, TTkColorGradient
 from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal
 from TermTk.TTkWidgets.widget import TTkWidget
-from TermTk.TTkWidgets.tabwidget import TTkTabWidget, _TTkNewTabWidgetDragData, _TTkTabWidgetDragData
+from TermTk.TTkWidgets.tabwidget import TTkTabWidget, TTkBarType, _TTkNewTabWidgetDragData, _TTkTabWidgetDragData
 from TermTk.TTkWidgets.splitter import TTkSplitter
 from TermTk.TTkWidgets.frame import TTkFrame
 from TermTk.TTkLayouts.gridlayout import TTkGridLayout
@@ -70,7 +70,7 @@ def _importMenu(self, kt):
 
     def iterWidgets(self):
         for i in range(self.count()):
-            yield self.widget(i)
+            yield self.widget(i), self.tabButton(i)
 
     def dragEnterEvent(self, evt:TTkDnDEvent) -> bool:
         TTkLog.debug(f"Drag Enter")
@@ -122,7 +122,7 @@ def _processDrop(widget, label, orientation, offset):
                 splitter.replaceWidget(index, splitter := TTkSplitter(orientation=orientation))
                 splitter.addWidget(self)
                 index=offset
-            splitter.insertWidget(index+offset, kt:=_TTkKodeTab(baseWidget=self._baseWidget, border=self.border(), closable=self.tabsClosable()))
+            splitter.insertWidget(index+offset, kt:=_TTkKodeTab(baseWidget=self._baseWidget, border=self.border(), barType=self._barType, closable=self.tabsClosable()))
             kt._dropEventProxy = self._dropEventProxy
             kt.addTab(widget,label)
             if fwold!=(fwnew := self._baseWidget._getFirstWidget()) and fwold._hasMenu():
@@ -208,19 +208,22 @@ def paintChildCanvas(self):
 
 class TTkKodeTab(TTkSplitter):
     __slots__ = (
-        '_lastKodeTabWidget',
+        '_lastKodeTabWidget', '_barType',
         # Signals
         'currentChanged','tabBarClicked','tabCloseRequested' )
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self,
+                 barType:TTkBarType=TTkBarType.NONE,
+                 **kwargs) -> None:
         self.currentChanged    = pyTTkSignal(TTkTabWidget,int,TTkWidget,object)
         self.tabBarClicked     = pyTTkSignal(TTkTabWidget,int,TTkWidget,object)
         self.tabCloseRequested = pyTTkSignal(TTkTabWidget,int)
+        self._barType = barType
         super().__init__(**kwargs|{'layout':TTkGridLayout()})
         kwargs.pop('parent',None)
         kwargs.pop('visible',None)
         # self.layout().addWidget(splitter := TTkSplitter())
-        self._lastKodeTabWidget = _TTkKodeTab(baseWidget=self, **kwargs)
+        self._lastKodeTabWidget = _TTkKodeTab(baseWidget=self, barType=self._barType, **kwargs)
         self._lastKodeTabWidget._dropEventProxy = self._dropEventProxy
         self.addWidget(self._lastKodeTabWidget)
 

libs/pyTermTk/TermTk/TTkWidgets/menubar.py

@@ -104,7 +104,7 @@ def addMenu(self,text:TTkString, data:object=None, checkable:bool=False, checked
         text, shortcuts = text.extractShortcuts()
         button = TTkMenuBarButton(text=text, data=data, checkable=checkable, checked=checked)
         for ch in shortcuts:
-            shortcut = TTkShortcut(key=TTkK.ALT | ord(ch.upper()))
+            shortcut = TTkShortcut(key=TTkK.CTRL | ord(ch.upper()))
             shortcut.activated.connect(button.shortcutEvent)
         self._mbItems(alignment).addWidget(button)
         self._buttons.append(button)