From 64cafb145ef5de5963416392f6fc7be36ca11314 Mon Sep 17 00:00:00 2001 From: Eugenio Parodi Date: Thu, 17 Feb 2022 16:07:12 +0000 Subject: [PATCH] Minor improvement to add few features used by tlogg --- TermTk/TTkWidgets/TTkModelView/filetree.py | 5 +++-- TermTk/TTkWidgets/TTkModelView/filetreewidget.py | 3 +++ TermTk/TTkWidgets/filetree.py | 0 TermTk/TTkWidgets/tabwidget.py | 9 ++++++++- 4 files changed, 14 insertions(+), 3 deletions(-) delete mode 100644 TermTk/TTkWidgets/filetree.py diff --git a/TermTk/TTkWidgets/TTkModelView/filetree.py b/TermTk/TTkWidgets/TTkModelView/filetree.py index 9946d739..1c3400c3 100644 --- a/TermTk/TTkWidgets/TTkModelView/filetree.py +++ b/TermTk/TTkWidgets/TTkModelView/filetree.py @@ -30,7 +30,7 @@ from TermTk.TTkWidgets.TTkModelView.filetreewidget import TTkFileTreeWidget class TTkFileTree(TTkTree): __slots__ = ('_fileTreeWidget', # Forwarded Methods - 'openPath', + 'openPath', 'getOpenPath', # Forwarded Signals 'fileClicked', 'folderClicked', 'fileDoubleClicked', 'folderDoubleClicked', 'fileActivated', 'folderActivated') @@ -51,4 +51,5 @@ class TTkFileTree(TTkTree): self.folderActivated = self._fileTreeWidget.folderActivated # Forward Methods - self.openPath = self._fileTreeWidget.openPath \ No newline at end of file + self.openPath = self._fileTreeWidget.openPath + self.getOpenPath = self._fileTreeWidget.getOpenPath \ No newline at end of file diff --git a/TermTk/TTkWidgets/TTkModelView/filetreewidget.py b/TermTk/TTkWidgets/TTkModelView/filetreewidget.py index de5ccae2..72e5e162 100644 --- a/TermTk/TTkWidgets/TTkModelView/filetreewidget.py +++ b/TermTk/TTkWidgets/TTkModelView/filetreewidget.py @@ -65,6 +65,9 @@ class TTkFileTreeWidget(TTkTreeWidget): # TODO: Avoid to refer directly '_rootItem' TTkFileTreeWidgetItem.setFilter(self._rootItem, filter) + def getOpenPath(self): + return self._path + def openPath(self, path): self._path = path diff --git a/TermTk/TTkWidgets/filetree.py b/TermTk/TTkWidgets/filetree.py deleted file mode 100644 index e69de29b..00000000 diff --git a/TermTk/TTkWidgets/tabwidget.py b/TermTk/TTkWidgets/tabwidget.py index 1bc0e911..70a6d3bd 100644 --- a/TermTk/TTkWidgets/tabwidget.py +++ b/TermTk/TTkWidgets/tabwidget.py @@ -91,7 +91,7 @@ class _TTkTabs(TTkWidget): '_tabMovable', '_tabClosable', '_sideBorder', #Signals - 'currentChanged') + 'currentChanged', 'tabBarClicked') def __init__(self, *args, **kwargs): self._labels = [] @@ -114,6 +114,7 @@ class _TTkTabs(TTkWidget): self._tabOffsetColorFocus = TTkCfg.theme.tabOffsetColorFocus # Signals self.currentChanged = pyTTkSignal(int) + self.tabBarClicked = pyTTkSignal(int) TTkWidget.__init__(self, *args, **kwargs) self._name = kwargs.get('name' , '_TTkTabs') self.setFocusPolicy(TTkK.ClickFocus + TTkK.TabFocus) @@ -197,6 +198,7 @@ class _TTkTabs(TTkWidget): if posx <= x < (posx+tablen): self._currentIndex = i self._offset = i + self.tabBarClicked.emit(self._currentIndex) self._updateTabs() return True return False @@ -274,6 +276,8 @@ class TTkTabWidget(TTkFrame): '_offset', '_currentIndex', '_leftScroller', '_rightScroller', '_tabMovable', '_tabClosable', + # Forward Signals + 'currentChanged', 'tabBarClicked', # forward methods 'currentIndex', 'setCurrentIndex') @@ -314,6 +318,9 @@ class TTkTabWidget(TTkFrame): # forwarded methods self.currentIndex = self._tabBar.currentIndex self.setCurrentIndex = self._tabBar.setCurrentIndex + # forwarded Signals + self.currentChanged = self._tabBar.currentChanged + self.tabBarClicked = self._tabBar.tabBarClicked @pyTTkSlot(TTkWidget) def setCurrentWidget(self, widget):