diff --git a/README.md b/README.md index bdfdd80a..2fee2f67 100644 --- a/README.md +++ b/README.md @@ -30,13 +30,11 @@ python3 tests/test.input.py ```shell # Press CTRL-C to exit # the logs are written to "session.log" -python3 tests/test.ui.002.py -python3 tests/test.ui.003.layout.py -python3 tests/test.ui.004.windowspy +python3 tests/test.showcase.001.py -f # Try gittk pip3 install GitPython -tests/gittk.py +tests/gittk.py ``` #### Profiling ##### cProfile diff --git a/TermTk/TTkWidgets/splitter.py b/TermTk/TTkWidgets/splitter.py index 08985f69..8637a1ba 100644 --- a/TermTk/TTkWidgets/splitter.py +++ b/TermTk/TTkWidgets/splitter.py @@ -125,11 +125,11 @@ class TTkSplitter(TTkFrame): selected = self._separatorSelected sepPos = sep[selected] minsize,maxsize = self._minMaxSizeBefore(selected) - TTkLog.debug(f"before:{minsize,maxsize}") + # TTkLog.debug(f"before:{minsize,maxsize}") if sepPos > maxsize: sep[selected] = maxsize if sepPos < minsize: sep[selected] = minsize minsize,maxsize = self._minMaxSizeAfter(selected) - TTkLog.debug(f"after:{minsize,maxsize}") + # TTkLog.debug(f"after:{minsize,maxsize}") if sepPos < size-maxsize: sep[selected] = size-maxsize if sepPos > size-minsize: sep[selected] = size-minsize @@ -157,7 +157,7 @@ class TTkSplitter(TTkFrame): self._separatorSelected = None self._mouseDelta = (evt.x, evt.y) x,y = evt.x, evt.y - TTkLog.debug(f"{self._separators} {evt}") + # TTkLog.debug(f"{self._separators} {evt}") for i in range(len(self._separators)): val = self._separators[i] if self._orientation == TTkK.HORIZONTAL: diff --git a/tests/gittk.py b/tests/gittk.py index adfe4e33..b43273eb 100755 --- a/tests/gittk.py +++ b/tests/gittk.py @@ -22,13 +22,19 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -import sys, os, time +import sys, os, time, argparse sys.path.append(os.path.join(sys.path[0],'..')) import TermTk as ttk import git +parser = argparse.ArgumentParser() +parser.add_argument('-f', help='Full Screen', action='store_true') +args = parser.parse_args() + +fullscreen = args.f + repo = git.Repo('.') assert not repo.bare @@ -43,7 +49,6 @@ for commit in allCommits: ttk.TTkLog.use_default_file_logging() -fullscreen = True root = ttk.TTk() if fullscreen: diff --git a/tests/showcase/tab.py b/tests/showcase/tab.py index dcd92da7..e662dc64 100755 --- a/tests/showcase/tab.py +++ b/tests/showcase/tab.py @@ -27,10 +27,6 @@ import sys, os sys.path.append(os.path.join(sys.path[0],'../..')) import TermTk as ttk -ttk.TTkLog.use_default_file_logging() - -root = ttk.TTk() - def demoTab(root= None): tabWidget1 = ttk.TTkTabWidget(parent=root, border=True) tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.1"), "Label 1.1") diff --git a/tests/showcase/tree.py b/tests/showcase/tree.py index b03cbd42..96ebab7a 100755 --- a/tests/showcase/tree.py +++ b/tests/showcase/tree.py @@ -31,8 +31,6 @@ import sys sys.path.append(os.path.join(sys.path[0],'../..')) import TermTk as ttk -ttk.TTkLog.use_default_file_logging() - def demoTree(root=None): # tw = ttk.TTkTreeWidget(parent=rootTree1) tw = ttk.TTkTree(parent=root) diff --git a/tests/test.showcase.001.py b/tests/test.showcase.001.py index da6865a6..e0bf0423 100755 --- a/tests/test.showcase.001.py +++ b/tests/test.showcase.001.py @@ -22,7 +22,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -import sys, os +import sys, os, argparse import random sys.path.append(os.path.join(sys.path[0],'..')) @@ -36,28 +36,35 @@ from showcase.splitter import demoSplitter from showcase.windows import demoWindows from showcase.formwidgets import demoFormWidgets -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) -def getSentence(a,b): - return " ".join([getWord() for i in range(0,random.randint(a,b))]) +def demoShowcase(root= None): + tabWidget1 = ttk.TTkTabWidget(parent=root, border=True) + tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.1"), " Label 1.1 ") + tabWidget1.addTab(ttk.TTkTestWidget(border=True, title="Frame1.2"), " Label Test 1.2 ") + tabWidget1.addTab(demoLayout(), " Layout Test ") + tabWidget1.addTab(demoFormWidgets(), " Form Test ") + tabWidget1.addTab(demoTable(), " Table Test ") + tabWidget1.addTab(demoTree(), " Tree Test ") + tabWidget1.addTab(demoSplitter(), " Splitter Test ") + tabWidget1.addTab(demoWindows(), " Windows Test ") + tabWidget1.addTab(demoTab(), " Tab Test ") + return tabWidget1 -ttk.TTkLog.use_default_file_logging() +def main(): + parser = argparse.ArgumentParser() + parser.add_argument('-f', help='Full Screen', action='store_true') + args = parser.parse_args() -root = ttk.TTk() + ttk.TTkLog.use_default_file_logging() -winTabbed1 = ttk.TTkWindow(parent=root,pos=(1,1), size=(100,40), title="Test Tab", border=True, layout=ttk.TTkGridLayout()) -tabWidget1 = ttk.TTkTabWidget(parent=winTabbed1, border=True) -tabWidget1.addTab(ttk.TTkTestWidgetSizes(border=True, title="Frame1.1"), " Label 1.1 ") -tabWidget1.addTab(ttk.TTkTestWidget(border=True, title="Frame1.2"), " Label Test 1.2 ") -tabWidget1.addTab(demoLayout(), " Layout Test ") -tabWidget1.addTab(demoFormWidgets(), " Form Test ") -tabWidget1.addTab(demoTable(), " Table Test ") -tabWidget1.addTab(demoTree(), " Tree Test ") -tabWidget1.addTab(demoSplitter(), " Splitter Test ") -tabWidget1.addTab(demoWindows(), " Windows Test ") -tabWidget1.addTab(demoTab(), " Tab Test ") + root = ttk.TTk() + if args.f: + root.setLayout(ttk.TTkGridLayout()) + winTabbed1 = root + else: + winTabbed1 = ttk.TTkWindow(parent=root,pos=(1,1), size=(100,40), title="Test Tab", border=True, layout=ttk.TTkGridLayout()) + demoShowcase(winTabbed1) + root.mainloop() +if __name__ == "__main__": + main() - -root.mainloop()