diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eb41ef57..5fb4f953 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ env: jobs: release-please: - runs-on: ubuntu-latest + runs-on: self-hosted outputs: rp_out: ${{ toJson(steps.release-please.outputs) }} steps: @@ -59,22 +59,40 @@ jobs: https://${GITHUB_TOKEN}@github.com/ceccopierangiolieugenio/pyTermTk.git \ pyTermTk.new cd pyTermTk.new - _VERSION=$(jq .TermTk .release-please-manifest.json) - echo "Version: ${_VERSION}" + + # Update version in the project + _VERSION_TTK=$(jq .libs/pyTermTk .release-please-manifest.json) + _VERSION_DPT=$(jq .apps/dumbPaintTool .release-please-manifest.json) + _VERSION_T_D=$(jq .apps/ttkDesigner .release-please-manifest.json) + echo "Version TermTk: ${_VERSION_TTK}" + echo "Version dumbPaintTool: ${_VERSION_DPT}" + echo "Version ttkDesigner: ${_VERSION_T_D}" sed -i \ - "s|version:str.*|version:str = ${_VERSION}|" \ - TermTk/TTkCore/cfg.py \ - TermTk/__init__.py + "s|__version__:str.*|__version__:str = ${_VERSION_TTK}|" \ + libs/pyTermTk/TermTk/__init__.py sed -i \ - "s|'pyTermTk>=.*',|'pyTermTk>=${_VERSION/-/}',|" \ - setup.* - cp TermTk/CHANGELOG.md CHANGELOG.md + "s|__version__:str.*|__version__:str = ${_VERSION_TTK}|" \ + apps/dumbPaintTool/dumbPaintTool/__init__.py + sed -i \ + "s|__version__:str.*|__version__:str = ${_VERSION_T_D}|" \ + apps/ttkDesigner/ttkDesigner/__init__.py + + # Update required version in any pyproject.toml + # that depend on pyTermTk + find . -name pyproject.toml | + xargs sed -i \ + "s|'pyTermTk >= [^']*'|'pyTermTk >= ${_VERSION_TTK}'|" + git add \ - TermTk/TTkCore/cfg.py \ - TermTk/__init__.py \ - setup.* \ + libs/pyTermTk/TermTk/TTkCore/cfg.py \ + apps/dumbPaintTool/dumbPaintTool/__init__.py \ + apps/ttkDesigner/ttkDesigner/__init__.py \ + libs/pyTermTk/TermTk/__init__.py \ CHANGELOG.md - git commit -m "chore: updated version to ${_VERSION}" + find . -name pyproject.toml | + xargs git add + + git commit -m "chore: updated TermTk and apps to versions to ${_VERSION_TTK}, ${_VERSION_DPT}, ${_VERSION_T_D}" git push pyTermTk-deploy-artifacts: @@ -139,3 +157,10 @@ jobs: - release-please - pyTermTk-deploy-artifacts secrets: inherit + + # pyTermTk-deploy-build: + # if: ${{ fromJson(needs.release-please.outputs.rp_out)['TermTk--release_created'] }} + # name: Deploy pyTermTk to pypi + # shell: bash + # run: | + # gh release upload ${TAG_NAME} tmp/TermTk.tgz diff --git a/.github/workflows/release_doc.yml b/.github/workflows/release_doc.yml index eb212b5c..0d08fdc3 100644 --- a/.github/workflows/release_doc.yml +++ b/.github/workflows/release_doc.yml @@ -24,7 +24,7 @@ permissions: jobs: gen-docs: - runs-on: ubuntu-latest + runs-on: self-hosted steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 13a47111..c3ec9d2b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -12,8 +12,8 @@ on: jobs: build: - - runs-on: ubuntu-latest + # runs-on: ubuntu-latest + runs-on: self-hosted strategy: fail-fast: false matrix: diff --git a/.release-please-config.json b/.release-please-config.json index 33195dfb..3f915256 100644 --- a/.release-please-config.json +++ b/.release-please-config.json @@ -15,7 +15,7 @@ { "type": "test", "section": "Test Changes" } ], "packages": { - "TermTk": { + "libs/pyTermTk": { "package-name": "pyTermTk" }, "apps/dumbPaintTool": { diff --git a/.release-please-manifest.json b/.release-please-manifest.json index c0730f9e..b519bbd4 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,5 +1,5 @@ { - "TermTk": "0.41.11-a.0", - "apps/ttkDesigner": "0.40.1-a.0", - "apps/dumbPaintTool": "0.40.0-a.0" + "libs/pyTermTk": "0.41.11-a.0", + "apps/ttkDesigner": "0.41.0-a.54", + "apps/dumbPaintTool": "0.41.0-a.54" } diff --git a/.vscode/launch.json b/.vscode/launch.json index fa6633f2..0a74864e 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,25 +9,30 @@ "type": "debugpy", "request": "attach", "connect": { - "host": "localhost", - "port": 64321 + "host": "localhost", + "port": 64321 } - },{ + }, + { "name": "Python: Current File", "type": "debugpy", "request": "launch", "program": "${file}", "console": "integratedTerminal", "justMyCode": true, - },{ + }, + { "name": "Python: Current File with Args", "type": "debugpy", "request": "launch", "program": "${file}", "console": "integratedTerminal", "justMyCode": true, - "args": ["tools/webExporter/js/ttkproxy.js"] - },{ + "args": [ + "tools/webExporter/js/ttkproxy.js" + ] + }, + { "name": "Python: Current File with Env", "type": "debugpy", "request": "launch", @@ -37,25 +42,31 @@ "env": { "TERMTK_GPM": "1" }, - },{ + }, + { "name": "Python: Test Player", "type": "debugpy", "request": "launch", "program": "tests/pytest/test_001_demo.py", "console": "integratedTerminal", "justMyCode": true, - "args": ["-p", "tmp/test.input.001.bin"] - },{ - "name": "Python: TTk Designer", + "args": [ + "-p", + "tmp/test.input.001.bin" + ] + }, + { + "name": "py Debug: Module ttkDesigner", "type": "debugpy", "request": "launch", "module": "ttkDesigner", "console": "integratedTerminal", "justMyCode": true, "env": { - "PYTHONPATH": "./tools" + "PYTHONPATH": "./apps/ttkDesigner" } - },{ + }, + { "name": "Python: TTk Designer Quick", "type": "debugpy", "request": "launch", @@ -65,18 +76,22 @@ "env": { "PYTHONPATH": "./tools" }, - "args": ["ttkDesigner/tui/newWindow.tui.json"] - },{ - "name": "Python: DumbPaintTool", + "args": [ + "ttkDesigner/tui/newWindow.tui.json" + ] + }, + { + "name": "py Debug: Module DumbPaintTool", "type": "debugpy", "request": "launch", - "program": "apps/dumbPaintTool.py", + "module": "dumbPaintTool", "console": "integratedTerminal", "justMyCode": true, "env": { - "PYTHONPATH": "./tools" + "PYTHONPATH": "./apps/dumbPaintTool" } - },{ + }, + { "name": "Python: DumbPaintTool File", "type": "debugpy", "request": "launch", @@ -86,22 +101,28 @@ "env": { "PYTHONPATH": "./tools" }, - "args":["experiments/untitled.DPT.json"] - },{ + "args": [ + "experiments/untitled.DPT.json" + ] + }, + { "name": "Python: Demo", "type": "debugpy", "request": "launch", "program": "demo/demo.py", "console": "integratedTerminal", "justMyCode": true - },{ + }, + { "name": "Python: Demo Mouse tracking", "type": "debugpy", "request": "launch", "program": "demo/demo.py", "console": "integratedTerminal", "justMyCode": true, - "args": ["-t"] + "args": [ + "-t" + ] }, ] } \ No newline at end of file diff --git a/TermTk b/TermTk new file mode 120000 index 00000000..547ca510 --- /dev/null +++ b/TermTk @@ -0,0 +1 @@ +libs/pyTermTk/TermTk \ No newline at end of file diff --git a/TermTk/CHANGELOG.md b/TermTk/CHANGELOG.md deleted file mode 100644 index 88312ee3..00000000 --- a/TermTk/CHANGELOG.md +++ /dev/null @@ -1,93 +0,0 @@ -# Changelog - -## [0.41.11-a.0](https://github.com/ceccopierangiolieugenio/pyTermTk/compare/pyTermTk-v0.41.10-a.0...pyTermTk-v0.41.11-a.0) (2025-03-30) - - -### Chores - -* bump version ([ffad7d1](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/ffad7d153d5cd5a7a78fb4ee7fb0a108315e7af4)) - -## [0.41.10-a.0](https://github.com/ceccopierangiolieugenio/pyTermTk/compare/pyTermTk-v0.41.9-a.0...pyTermTk-v0.41.10-a.0) (2025-03-29) - - -### Chores - -* bump version ([51c89d8](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/51c89d88dc18bbdf08fb4eda334ec100a0f3caeb)) - -## [0.41.9-a.0](https://github.com/ceccopierangiolieugenio/pyTermTk/compare/pyTermTk-v0.41.8-a.0...pyTermTk-v0.41.9-a.0) (2025-03-29) - - -### Chores - -* bump version ([5884f69](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/5884f69a276e9fca20b9413d17b7ce368d1cc8bd)) - -## [0.41.8-a.0](https://github.com/ceccopierangiolieugenio/pyTermTk/compare/pyTermTk-v0.41.7-a.0...pyTermTk-v0.41.8-a.0) (2025-03-29) - - -### Chores - -* bumbed version ([e401e73](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/e401e73633c2e32fe0eb0b7302fd93f57aaeb9af)) - -## [0.41.7-a.0](https://github.com/ceccopierangiolieugenio/pyTermTk/compare/pyTermTk-v0.41.6-a.0...pyTermTk-v0.41.7-a.0) (2025-03-29) - - -### Chores - -* adapted the version ([e13a0ea](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/e13a0ea514139688f239c482c019852e605e4d70)) - -## [0.41.6-a.0](https://github.com/ceccopierangiolieugenio/pyTermTk/compare/pyTermTk-v0.41.5-a.0...pyTermTk-v0.41.6-a.0) (2025-03-29) - - -### Chores - -* let's see if the version actually update ([4fb9280](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/4fb928051ecb7518aebbfbe04fe99b17240f892d)) - -## [0.41.5-a.0](https://github.com/ceccopierangiolieugenio/pyTermTk/compare/pyTermTk-v0.41.4-a.0...pyTermTk-v0.41.5-a.0) (2025-03-29) - - -### Chores - -* added version updater ([96ae50c](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/96ae50c58add78d633887aa6aed95c1077194a9a)) -* test release 7 ([84b7c75](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/84b7c755e368732577a056f8f8d9786e294255f7)) - -## [0.41.4-a.0](https://github.com/ceccopierangiolieugenio/pyTermTk/compare/pyTermTk-v0.41.3-a.0...pyTermTk-v0.41.4-a.0) (2025-03-29) - - -### Chores - -* test release 4 ([3875ee0](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/3875ee0c23345fbfcbd1a341c0878ebb50661bf1)) -* test release 5 ([36b99e2](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/36b99e2bc9386b460010eee1155cf86456c972c9)) -* test release 6 ([59420b4](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/59420b4edffcaab9f4ae7f02184fa7a456018916)) - -## [0.41.3-a.0](https://github.com/ceccopierangiolieugenio/pyTermTk/compare/pyTermTk-v0.41.2-a.0...pyTermTk-v0.41.3-a.0) (2025-03-26) - - -### Chores - -* testing deploy ([#341](https://github.com/ceccopierangiolieugenio/pyTermTk/issues/341)) ([3668ae3](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/3668ae3c226f5aa316b8b769829f499f9b3a007a)) - -## [0.41.2-a.0](https://github.com/ceccopierangiolieugenio/pyTermTk/compare/pyTermTk-v0.41.1-a.0...pyTermTk-v0.41.2-a.0) (2025-03-26) - - -### Chores - -* testing deploy ([#338](https://github.com/ceccopierangiolieugenio/pyTermTk/issues/338)) ([4dc5d73](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/4dc5d733eefd9377dfd90dc0927941f46465a62f)) - -## [0.41.1-a.0](https://github.com/ceccopierangiolieugenio/pyTermTk/compare/pyTermTk-v0.41.0-a.0...pyTermTk-v0.41.1-a.0) (2025-03-26) - - -### Chores - -* testing release 01 ([#336](https://github.com/ceccopierangiolieugenio/pyTermTk/issues/336)) ([61b7b9c](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/61b7b9c05f9c102bdae52137fdcc2aa236fc8391)) - -## [0.41.0-a.0](https://github.com/ceccopierangiolieugenio/pyTermTk/compare/pyTermTk-v0.40.0-a.0...pyTermTk-v0.41.0-a.0) (2025-03-26) - - -### Fixes - -* [#326](https://github.com/ceccopierangiolieugenio/pyTermTk/issues/326) crash adding row in the TTkTableModelList ([#327](https://github.com/ceccopierangiolieugenio/pyTermTk/issues/327)) ([b0feaa1](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/b0feaa139ee8fb19d475e1cf267ff7b6c182dc72)) - - -### Features - -* added find in the text edit ([#320](https://github.com/ceccopierangiolieugenio/pyTermTk/issues/320)) ([d809d0b](https://github.com/ceccopierangiolieugenio/pyTermTk/commit/d809d0bcca544e42e3bb1b89f55481bb646c1a90)) diff --git a/TermTk/__init__.py b/TermTk/__init__.py deleted file mode 100644 index deb4506a..00000000 --- a/TermTk/__init__.py +++ /dev/null @@ -1,14 +0,0 @@ -version:str = "0.41.11-a.0" - -from .TTkCore import * -from .TTkTheme import * -from .TTkGui import * -from .TTkWidgets import * -from .TTkTypes import * -from .TTkLayouts import * -from .TTkTestWidgets import * -from .TTkAbstract import * -from .TTkUiTools import * -from .TTkCrossTools import * - -TTkCfg.theme = TTkTheme() diff --git a/apps/dumbPaintTool/app/__init__.py b/apps/dumbPaintTool/app/__init__.py deleted file mode 100644 index ea0640bb..00000000 --- a/apps/dumbPaintTool/app/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -from .main import * -from .maintemplate import * -from .toolspanel import * -from .paintarea import * -from .painttoolkit import * -from .textarea import * -from .palette import * -from .layersctrl import * -from .canvaslayer import * -from .about import * -from .glbls import * -from .const import * -from .filters import * -from .importimage import * -from .exportarea import * -from .state import * diff --git a/apps/dumbPaintTool/__init__.py b/apps/dumbPaintTool/dumbPaintTool/__init__.py similarity index 96% rename from apps/dumbPaintTool/__init__.py rename to apps/dumbPaintTool/dumbPaintTool/__init__.py index 5a25fbdd..ebef7b33 100755 --- a/apps/dumbPaintTool/__init__.py +++ b/apps/dumbPaintTool/dumbPaintTool/__init__.py @@ -20,7 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +__version__:str = "0.41.11-a.4" + from .app import main if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/apps/dumbPaintTool/__main__.py b/apps/dumbPaintTool/dumbPaintTool/__main__.py similarity index 100% rename from apps/dumbPaintTool/__main__.py rename to apps/dumbPaintTool/dumbPaintTool/__main__.py diff --git a/apps/dumbPaintTool/dumbPaintTool/app/__init__.py b/apps/dumbPaintTool/dumbPaintTool/app/__init__.py new file mode 100644 index 00000000..f8088b2f --- /dev/null +++ b/apps/dumbPaintTool/dumbPaintTool/app/__init__.py @@ -0,0 +1,38 @@ +# MIT License +# +# Copyright (c) 2024 Eugenio Parodi +# +# 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. + +from .main import * +from .maintemplate import * +from .toolspanel import * +from .paintarea import * +from .painttoolkit import * +from .textarea import * +from .palette import * +from .layersctrl import * +from .canvaslayer import * +from .about import * +from .glbls import * +from .const import * +from .filters import * +from .importimage import * +from .exportarea import * +from .state import * diff --git a/apps/dumbPaintTool/app/about.py b/apps/dumbPaintTool/dumbPaintTool/app/about.py similarity index 96% rename from apps/dumbPaintTool/app/about.py rename to apps/dumbPaintTool/dumbPaintTool/app/about.py index 4bc221e9..819e8a76 100644 --- a/apps/dumbPaintTool/app/about.py +++ b/apps/dumbPaintTool/dumbPaintTool/app/about.py @@ -23,6 +23,7 @@ __all__ = ['About'] import TermTk as ttk +from .. import __version__ _DPT_image = ttk.TTkUtil.base64_deflate_2_obj( "eJydWDtuJDcQdeBIuaNNdAKhi78mwTs4M2BgYwNOlPkAo10FC3sAK7C0M1jJAjacC2y+R9FJXFVksYtU9wiwRA40XcXm5716VdTux/tffvqBf379Gf949366vsSfd+9t" + @@ -50,7 +51,7 @@ class About(ttk.TTkWindow): self.resize(65+2,12+4) self.layout().addWidgets([ ttk.TTkLabel(text=_DPT_image), - ttk.TTkLabel(pos=(38,7), text=ttk.TTkString(f" Version: {ttk.TTkCfg.version}", ttk.TTkColor.fg('#AAAAFF'))), + ttk.TTkLabel(pos=(38,7), text=ttk.TTkString(f" Version: {__version__}", ttk.TTkColor.fg('#AAAAFF'))), ttk.TTkLabel(pos=(38,9), text=ttk.TTkString("Powered By, Eugenio Parodi",ttk.TTkColor.fg("#FF00FF"))), - ttk.TTkLabel(pos=(13,11),text=ttk.TTkString("https://github.com/ceccopierangiolieugenio/pyTermTk", ttk.TTkColor.fg('#44FFFF'))) + ttk.TTkLabel(pos=(13,11),text=ttk.TTkString("https://github.com/ceccopierangiolieugenio/pyTermTk", ttk.TTkColor.fg('#44FFFF', link="https://github.com/ceccopierangiolieugenio/pyTermTk"))) ]) diff --git a/apps/dumbPaintTool/app/canvaslayer.py b/apps/dumbPaintTool/dumbPaintTool/app/canvaslayer.py similarity index 100% rename from apps/dumbPaintTool/app/canvaslayer.py rename to apps/dumbPaintTool/dumbPaintTool/app/canvaslayer.py diff --git a/apps/dumbPaintTool/app/cfg.py b/apps/dumbPaintTool/dumbPaintTool/app/cfg.py similarity index 94% rename from apps/dumbPaintTool/app/cfg.py rename to apps/dumbPaintTool/dumbPaintTool/app/cfg.py index 8fa60dd6..c4d1f40a 100644 --- a/apps/dumbPaintTool/app/cfg.py +++ b/apps/dumbPaintTool/dumbPaintTool/app/cfg.py @@ -22,9 +22,10 @@ import os +from .. import __version__ class DPTCfg: - version="__VERSION__" - name="__NAME__" + version=__version__ + name="dumbPaintTool" cfgVersion = '1.0' pathCfg="." options={} diff --git a/apps/dumbPaintTool/app/const.py b/apps/dumbPaintTool/dumbPaintTool/app/const.py similarity index 100% rename from apps/dumbPaintTool/app/const.py rename to apps/dumbPaintTool/dumbPaintTool/app/const.py diff --git a/apps/dumbPaintTool/app/exportarea.py b/apps/dumbPaintTool/dumbPaintTool/app/exportarea.py similarity index 100% rename from apps/dumbPaintTool/app/exportarea.py rename to apps/dumbPaintTool/dumbPaintTool/app/exportarea.py diff --git a/apps/dumbPaintTool/app/filters/__init__.py b/apps/dumbPaintTool/dumbPaintTool/app/filters/__init__.py similarity index 100% rename from apps/dumbPaintTool/app/filters/__init__.py rename to apps/dumbPaintTool/dumbPaintTool/app/filters/__init__.py diff --git a/apps/dumbPaintTool/app/filters/brightness_contrast.py b/apps/dumbPaintTool/dumbPaintTool/app/filters/brightness_contrast.py similarity index 100% rename from apps/dumbPaintTool/app/filters/brightness_contrast.py rename to apps/dumbPaintTool/dumbPaintTool/app/filters/brightness_contrast.py diff --git a/apps/dumbPaintTool/app/filters/hue_chroma_lightness.py b/apps/dumbPaintTool/dumbPaintTool/app/filters/hue_chroma_lightness.py similarity index 100% rename from apps/dumbPaintTool/app/filters/hue_chroma_lightness.py rename to apps/dumbPaintTool/dumbPaintTool/app/filters/hue_chroma_lightness.py diff --git a/apps/dumbPaintTool/app/glbls.py b/apps/dumbPaintTool/dumbPaintTool/app/glbls.py similarity index 100% rename from apps/dumbPaintTool/app/glbls.py rename to apps/dumbPaintTool/dumbPaintTool/app/glbls.py diff --git a/apps/dumbPaintTool/app/importimage.py b/apps/dumbPaintTool/dumbPaintTool/app/importimage.py similarity index 100% rename from apps/dumbPaintTool/app/importimage.py rename to apps/dumbPaintTool/dumbPaintTool/app/importimage.py diff --git a/apps/dumbPaintTool/app/layersctrl.py b/apps/dumbPaintTool/dumbPaintTool/app/layersctrl.py similarity index 100% rename from apps/dumbPaintTool/app/layersctrl.py rename to apps/dumbPaintTool/dumbPaintTool/app/layersctrl.py diff --git a/apps/dumbPaintTool/app/main.py b/apps/dumbPaintTool/dumbPaintTool/app/main.py similarity index 100% rename from apps/dumbPaintTool/app/main.py rename to apps/dumbPaintTool/dumbPaintTool/app/main.py diff --git a/apps/dumbPaintTool/app/maintemplate.py b/apps/dumbPaintTool/dumbPaintTool/app/maintemplate.py similarity index 100% rename from apps/dumbPaintTool/app/maintemplate.py rename to apps/dumbPaintTool/dumbPaintTool/app/maintemplate.py diff --git a/apps/dumbPaintTool/app/paintarea.py b/apps/dumbPaintTool/dumbPaintTool/app/paintarea.py similarity index 100% rename from apps/dumbPaintTool/app/paintarea.py rename to apps/dumbPaintTool/dumbPaintTool/app/paintarea.py diff --git a/apps/dumbPaintTool/app/painttoolkit.py b/apps/dumbPaintTool/dumbPaintTool/app/painttoolkit.py similarity index 100% rename from apps/dumbPaintTool/app/painttoolkit.py rename to apps/dumbPaintTool/dumbPaintTool/app/painttoolkit.py diff --git a/apps/dumbPaintTool/app/palette.py b/apps/dumbPaintTool/dumbPaintTool/app/palette.py similarity index 100% rename from apps/dumbPaintTool/app/palette.py rename to apps/dumbPaintTool/dumbPaintTool/app/palette.py diff --git a/apps/dumbPaintTool/app/state/__init__.py b/apps/dumbPaintTool/dumbPaintTool/app/state/__init__.py similarity index 100% rename from apps/dumbPaintTool/app/state/__init__.py rename to apps/dumbPaintTool/dumbPaintTool/app/state/__init__.py diff --git a/apps/dumbPaintTool/app/state/brush.py b/apps/dumbPaintTool/dumbPaintTool/app/state/brush.py similarity index 100% rename from apps/dumbPaintTool/app/state/brush.py rename to apps/dumbPaintTool/dumbPaintTool/app/state/brush.py diff --git a/apps/dumbPaintTool/app/state/layers.py b/apps/dumbPaintTool/dumbPaintTool/app/state/layers.py similarity index 100% rename from apps/dumbPaintTool/app/state/layers.py rename to apps/dumbPaintTool/dumbPaintTool/app/state/layers.py diff --git a/apps/dumbPaintTool/app/textarea.py b/apps/dumbPaintTool/dumbPaintTool/app/textarea.py similarity index 100% rename from apps/dumbPaintTool/app/textarea.py rename to apps/dumbPaintTool/dumbPaintTool/app/textarea.py diff --git a/apps/dumbPaintTool/app/toolspanel.py b/apps/dumbPaintTool/dumbPaintTool/app/toolspanel.py similarity index 100% rename from apps/dumbPaintTool/app/toolspanel.py rename to apps/dumbPaintTool/dumbPaintTool/app/toolspanel.py diff --git a/apps/dumbPaintTool/tui/paintToolKit.tui.json b/apps/dumbPaintTool/dumbPaintTool/tui/paintToolKit.tui.json similarity index 100% rename from apps/dumbPaintTool/tui/paintToolKit.tui.json rename to apps/dumbPaintTool/dumbPaintTool/tui/paintToolKit.tui.json diff --git a/apps/dumbPaintTool/tui/quickImport.tui.json b/apps/dumbPaintTool/dumbPaintTool/tui/quickImport.tui.json similarity index 100% rename from apps/dumbPaintTool/tui/quickImport.tui.json rename to apps/dumbPaintTool/dumbPaintTool/tui/quickImport.tui.json diff --git a/apps/dumbPaintTool/tui/tools.tui.json b/apps/dumbPaintTool/dumbPaintTool/tui/tools.tui.json similarity index 100% rename from apps/dumbPaintTool/tui/tools.tui.json rename to apps/dumbPaintTool/dumbPaintTool/tui/tools.tui.json diff --git a/apps/dumbPaintTool/web.ttk.package.json b/apps/dumbPaintTool/dumbPaintTool/web.ttk.package.json similarity index 100% rename from apps/dumbPaintTool/web.ttk.package.json rename to apps/dumbPaintTool/dumbPaintTool/web.ttk.package.json diff --git a/apps/dumbPaintTool/pyproject.toml b/apps/dumbPaintTool/pyproject.toml new file mode 100644 index 00000000..10f70f63 --- /dev/null +++ b/apps/dumbPaintTool/pyproject.toml @@ -0,0 +1,58 @@ +[build-system] +requires = ["setuptools>=45", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "dumbPaintTool" +dynamic = ["version", "readme"] +description = "the Dumb Paint Tool is a Terminal ASCII Photoshop" +authors = [ + {name = "Eugenio Parodi", email = "ceccopierangiolieugenio@googlemail.com"}, +] +requires-python = ">=3.9" +dependencies = [ + 'pyTermTk >= 0.41.11-a.1', + 'pyperclip', + 'Pillow', +] +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Development Status :: 3 - Alpha", + "Environment :: Console", + "Intended Audience :: Education", + "Intended Audience :: Developers", + "Intended Audience :: Information Technology", + "Topic :: Terminals", + "Topic :: Text Editors :: Text Processing", + "Topic :: Multimedia :: Graphics", + "Topic :: Multimedia :: Graphics :: Editors", + "Topic :: Multimedia :: Graphics :: Editors :: Raster-Based", + "Topic :: Multimedia :: Graphics :: Graphics Conversion", + "Topic :: Software Development :: User Interfaces", + "Topic :: Software Development :: Libraries", + "Topic :: Software Development :: Libraries :: Python Modules", + "Topic :: Software Development :: Libraries :: Application Frameworks", +] + +[project.urls] +Homepage = "https://github.com/ceccopierangiolieugenio/pyTermTk/tree/main/apps/dumbPaintTool" + +[project.scripts] +dumbPaintTool = "dumbPaintTool:main" + +[tool.setuptools] +packages = [ + "dumbPaintTool", + "dumbPaintTool.app", + "dumbPaintTool.app.filters", + "dumbPaintTool.app.state" +] + +[tool.setuptools.package-data] +dumbPaintTool = ["tui/*"] + +[tool.setuptools.dynamic] +version = {attr = "dumbPaintTool.__version__"} +readme = {file = ["README.md", "CHANGELOG.md"]} \ No newline at end of file diff --git a/apps/ttkDesigner.py b/apps/ttkDesigner.py deleted file mode 100755 index 9bb397d6..00000000 --- a/apps/ttkDesigner.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python3 -# MIT License -# -# Copyright (c) 2023 Eugenio Parodi -# -# 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 -sys.path.append(os.path.join(sys.path[0],'..')) - -from ttkDesigner.app import main - -if __name__ == '__main__': - main() \ No newline at end of file diff --git a/apps/ttkDesigner/pyproject.toml b/apps/ttkDesigner/pyproject.toml new file mode 100644 index 00000000..6fd3f58d --- /dev/null +++ b/apps/ttkDesigner/pyproject.toml @@ -0,0 +1,50 @@ +[build-system] +requires = ["setuptools>=45", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "ttkDesigner" +dynamic = ["version", "readme"] +authors = [ + {name = "Eugenio Parodi", email = "ceccopierangiolieugenio@googlemail.com"}, +] +description = "ttkDesigner is a terminal user interface designer for pyTermTk applications" +requires-python = ">=3.9" +license = {text = "MIT"} +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Development Status :: 3 - Alpha", + "Environment :: Console", + "Intended Audience :: Education", + "Intended Audience :: Developers", + "Intended Audience :: Information Technology", + "Topic :: Terminals", + "Topic :: Text Editors :: Text Processing", + "Topic :: Software Development :: User Interfaces", + "Topic :: Software Development :: Libraries", + "Topic :: Software Development :: Libraries :: Python Modules", + "Topic :: Software Development :: Libraries :: Application Frameworks", +] +dependencies = [ + 'pyTermTk>=0.41.11-a.0', + 'pyperclip', + 'Pillow', +] + +[project.urls] +Homepage = "https://github.com/ceccopierangiolieugenio/pyTermTk/tree/main/apps/ttkDesigner" + +[project.scripts] +ttkDesigner = "ttkDesigner:main" + +[tool.setuptools] +packages = ["ttkDesigner", "ttkDesigner.app", "ttkDesigner.app.superobj"] + +[tool.setuptools.package-data] +ttkDesigner = ["tui/*"] + +[tool.setuptools.dynamic] +version = {attr = "ttkDesigner.__version__"} +readme = {file = ["README.md", "CHANGELOG.md"]} \ No newline at end of file diff --git a/apps/ttkDesigner/__init__.py b/apps/ttkDesigner/ttkDesigner/__init__.py similarity index 96% rename from apps/ttkDesigner/__init__.py rename to apps/ttkDesigner/ttkDesigner/__init__.py index 1e6db616..a5ac9637 100755 --- a/apps/ttkDesigner/__init__.py +++ b/apps/ttkDesigner/ttkDesigner/__init__.py @@ -20,7 +20,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +__version__:str = "0.41.113-a.12" + from .app import * if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/apps/ttkDesigner/__main__.py b/apps/ttkDesigner/ttkDesigner/__main__.py similarity index 100% rename from apps/ttkDesigner/__main__.py rename to apps/ttkDesigner/ttkDesigner/__main__.py diff --git a/apps/ttkDesigner/app/__init__.py b/apps/ttkDesigner/ttkDesigner/app/__init__.py similarity index 99% rename from apps/ttkDesigner/app/__init__.py rename to apps/ttkDesigner/ttkDesigner/app/__init__.py index d5a8afe1..b40a5125 100644 --- a/apps/ttkDesigner/app/__init__.py +++ b/apps/ttkDesigner/ttkDesigner/app/__init__.py @@ -1,4 +1,3 @@ - # MIT License # # Copyright (c) 2023 Eugenio Parodi diff --git a/apps/ttkDesigner/app/about.py b/apps/ttkDesigner/ttkDesigner/app/about.py similarity index 92% rename from apps/ttkDesigner/app/about.py rename to apps/ttkDesigner/ttkDesigner/app/about.py index f5b4bd21..7ba1e4db 100644 --- a/apps/ttkDesigner/app/about.py +++ b/apps/ttkDesigner/ttkDesigner/app/about.py @@ -43,7 +43,6 @@ class About(TTkAbout): __slots__=('_image') def __init__(self, *args, **kwargs): TTkAbout.__init__(self, *args, **kwargs) - self.setTitle('[PierCecco Cecco] Eugenio Parodi proudly presents...') self.resize(56,15) @@ -51,8 +50,10 @@ class About(TTkAbout): c = [0xFF,0xFF,0xFF] for y, line in enumerate(About.designerTxt): canvas.drawText(pos=(13,3+y),text=line) + for i,line in enumerate(TTkAbout._peppered_string.split('\n')): + canvas.drawTTkString(pos=(1,3+i), text=line) canvas.drawText(pos=(20, 9),text=f" Version: {TTkDesignerCfg.version}", color=TTkColor.fg('#AAAAFF')) canvas.drawText(pos=(14,11),text=f"Powered By, pyTermTk") - canvas.drawText(pos=( 2,13),text=f"https://github.com/ceccopierangiolieugenio/pyTermTk", color=TTkColor.fg('#44FFFF')) + canvas.drawText(pos=( 2,13),text=f"https://github.com/ceccopierangiolieugenio/pyTermTk", color=TTkColor.fg('#44FFFF', link="https://github.com/ceccopierangiolieugenio/pyTermTk")) TTkWindow.paintEvent(self, canvas) diff --git a/apps/ttkDesigner/app/cfg.py b/apps/ttkDesigner/ttkDesigner/app/cfg.py similarity index 94% rename from apps/ttkDesigner/app/cfg.py rename to apps/ttkDesigner/ttkDesigner/app/cfg.py index 1ca202c3..7ffe0a83 100644 --- a/apps/ttkDesigner/app/cfg.py +++ b/apps/ttkDesigner/ttkDesigner/app/cfg.py @@ -25,9 +25,10 @@ import os # import yaml +from .. import __version__ class TTkDesignerCfg: - version="__VERSION__" - name="__NAME__" + version=__version__ + name="ttkDesigner" cfgVersion = '1.0' pathCfg="." options={} diff --git a/apps/ttkDesigner/app/designer.py b/apps/ttkDesigner/ttkDesigner/app/designer.py similarity index 100% rename from apps/ttkDesigner/app/designer.py rename to apps/ttkDesigner/ttkDesigner/app/designer.py diff --git a/apps/ttkDesigner/app/main.py b/apps/ttkDesigner/ttkDesigner/app/main.py similarity index 100% rename from apps/ttkDesigner/app/main.py rename to apps/ttkDesigner/ttkDesigner/app/main.py diff --git a/apps/ttkDesigner/app/menuBarEditor.py b/apps/ttkDesigner/ttkDesigner/app/menuBarEditor.py similarity index 100% rename from apps/ttkDesigner/app/menuBarEditor.py rename to apps/ttkDesigner/ttkDesigner/app/menuBarEditor.py diff --git a/apps/ttkDesigner/app/notepad.py b/apps/ttkDesigner/ttkDesigner/app/notepad.py similarity index 100% rename from apps/ttkDesigner/app/notepad.py rename to apps/ttkDesigner/ttkDesigner/app/notepad.py diff --git a/apps/ttkDesigner/app/propertyeditor.py b/apps/ttkDesigner/ttkDesigner/app/propertyeditor.py similarity index 100% rename from apps/ttkDesigner/app/propertyeditor.py rename to apps/ttkDesigner/ttkDesigner/app/propertyeditor.py diff --git a/apps/ttkDesigner/app/quickexport.py b/apps/ttkDesigner/ttkDesigner/app/quickexport.py similarity index 100% rename from apps/ttkDesigner/app/quickexport.py rename to apps/ttkDesigner/ttkDesigner/app/quickexport.py diff --git a/apps/ttkDesigner/app/signalsloteditor.py b/apps/ttkDesigner/ttkDesigner/app/signalsloteditor.py similarity index 100% rename from apps/ttkDesigner/app/signalsloteditor.py rename to apps/ttkDesigner/ttkDesigner/app/signalsloteditor.py diff --git a/apps/ttkDesigner/app/superobj/__init__.py b/apps/ttkDesigner/ttkDesigner/app/superobj/__init__.py similarity index 100% rename from apps/ttkDesigner/app/superobj/__init__.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/__init__.py diff --git a/apps/ttkDesigner/app/superobj/supercontrol.py b/apps/ttkDesigner/ttkDesigner/app/superobj/supercontrol.py similarity index 100% rename from apps/ttkDesigner/app/superobj/supercontrol.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/supercontrol.py diff --git a/apps/ttkDesigner/app/superobj/superlayout.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superlayout.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superlayout.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superlayout.py diff --git a/apps/ttkDesigner/app/superobj/superlayoutgrid.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superlayoutgrid.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superlayoutgrid.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superlayoutgrid.py diff --git a/apps/ttkDesigner/app/superobj/superlayouthbox.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superlayouthbox.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superlayouthbox.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superlayouthbox.py diff --git a/apps/ttkDesigner/app/superobj/superlayoutvbox.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superlayoutvbox.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superlayoutvbox.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superlayoutvbox.py diff --git a/apps/ttkDesigner/app/superobj/superobj.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superobj.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superobj.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superobj.py diff --git a/apps/ttkDesigner/app/superobj/superwidget.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superwidget.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superwidget.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superwidget.py diff --git a/apps/ttkDesigner/app/superobj/superwidgetabstractscrollarea.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetabstractscrollarea.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superwidgetabstractscrollarea.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetabstractscrollarea.py diff --git a/apps/ttkDesigner/app/superobj/superwidgetcontainer.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetcontainer.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superwidgetcontainer.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetcontainer.py diff --git a/apps/ttkDesigner/app/superobj/superwidgetframe.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetframe.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superwidgetframe.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetframe.py diff --git a/apps/ttkDesigner/app/superobj/superwidgetlist.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetlist.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superwidgetlist.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetlist.py diff --git a/apps/ttkDesigner/app/superobj/superwidgetmenubutton.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetmenubutton.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superwidgetmenubutton.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetmenubutton.py diff --git a/apps/ttkDesigner/app/superobj/superwidgetradiobutton.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetradiobutton.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superwidgetradiobutton.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetradiobutton.py diff --git a/apps/ttkDesigner/app/superobj/superwidgetsplitter.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetsplitter.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superwidgetsplitter.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superwidgetsplitter.py diff --git a/apps/ttkDesigner/app/superobj/superwidgettextedit.py b/apps/ttkDesigner/ttkDesigner/app/superobj/superwidgettextedit.py similarity index 100% rename from apps/ttkDesigner/app/superobj/superwidgettextedit.py rename to apps/ttkDesigner/ttkDesigner/app/superobj/superwidgettextedit.py diff --git a/apps/ttkDesigner/app/treeinspector.py b/apps/ttkDesigner/ttkDesigner/app/treeinspector.py similarity index 100% rename from apps/ttkDesigner/app/treeinspector.py rename to apps/ttkDesigner/ttkDesigner/app/treeinspector.py diff --git a/apps/ttkDesigner/app/widgetbox.py b/apps/ttkDesigner/ttkDesigner/app/widgetbox.py similarity index 100% rename from apps/ttkDesigner/app/widgetbox.py rename to apps/ttkDesigner/ttkDesigner/app/widgetbox.py diff --git a/apps/ttkDesigner/app/windoweditor.py b/apps/ttkDesigner/ttkDesigner/app/windoweditor.py similarity index 100% rename from apps/ttkDesigner/app/windoweditor.py rename to apps/ttkDesigner/ttkDesigner/app/windoweditor.py diff --git a/apps/ttkDesigner/tui/menuBarEditor.tui.json b/apps/ttkDesigner/ttkDesigner/tui/menuBarEditor.tui.json similarity index 100% rename from apps/ttkDesigner/tui/menuBarEditor.tui.json rename to apps/ttkDesigner/ttkDesigner/tui/menuBarEditor.tui.json diff --git a/apps/ttkDesigner/tui/newWindow.tui.json b/apps/ttkDesigner/ttkDesigner/tui/newWindow.tui.json similarity index 100% rename from apps/ttkDesigner/tui/newWindow.tui.json rename to apps/ttkDesigner/ttkDesigner/tui/newWindow.tui.json diff --git a/apps/ttkDesigner/tui/quickExport.tui.json b/apps/ttkDesigner/ttkDesigner/tui/quickExport.tui.json similarity index 100% rename from apps/ttkDesigner/tui/quickExport.tui.json rename to apps/ttkDesigner/ttkDesigner/tui/quickExport.tui.json diff --git a/apps/ttkDesigner/tui/quickImport.tui.json b/apps/ttkDesigner/ttkDesigner/tui/quickImport.tui.json similarity index 100% rename from apps/ttkDesigner/tui/quickImport.tui.json rename to apps/ttkDesigner/ttkDesigner/tui/quickImport.tui.json diff --git a/libs/pyTermTk/CHANGELOG.md b/libs/pyTermTk/CHANGELOG.md new file mode 120000 index 00000000..699cc9e7 --- /dev/null +++ b/libs/pyTermTk/CHANGELOG.md @@ -0,0 +1 @@ +../../CHANGELOG.md \ No newline at end of file diff --git a/libs/pyTermTk/README.md b/libs/pyTermTk/README.md new file mode 120000 index 00000000..fe840054 --- /dev/null +++ b/libs/pyTermTk/README.md @@ -0,0 +1 @@ +../../README.md \ No newline at end of file diff --git a/TermTk/TTkAbstract/__init__.py b/libs/pyTermTk/TermTk/TTkAbstract/__init__.py similarity index 100% rename from TermTk/TTkAbstract/__init__.py rename to libs/pyTermTk/TermTk/TTkAbstract/__init__.py diff --git a/TermTk/TTkAbstract/abstractitemmodel.py b/libs/pyTermTk/TermTk/TTkAbstract/abstractitemmodel.py similarity index 100% rename from TermTk/TTkAbstract/abstractitemmodel.py rename to libs/pyTermTk/TermTk/TTkAbstract/abstractitemmodel.py diff --git a/TermTk/TTkAbstract/abstractscrollarea.py b/libs/pyTermTk/TermTk/TTkAbstract/abstractscrollarea.py similarity index 100% rename from TermTk/TTkAbstract/abstractscrollarea.py rename to libs/pyTermTk/TermTk/TTkAbstract/abstractscrollarea.py diff --git a/TermTk/TTkAbstract/abstractscrollview.py b/libs/pyTermTk/TermTk/TTkAbstract/abstractscrollview.py similarity index 100% rename from TermTk/TTkAbstract/abstractscrollview.py rename to libs/pyTermTk/TermTk/TTkAbstract/abstractscrollview.py diff --git a/TermTk/TTkAbstract/abstracttablemodel.py b/libs/pyTermTk/TermTk/TTkAbstract/abstracttablemodel.py similarity index 100% rename from TermTk/TTkAbstract/abstracttablemodel.py rename to libs/pyTermTk/TermTk/TTkAbstract/abstracttablemodel.py diff --git a/TermTk/TTkCore/TTkTerm/__init__.py b/libs/pyTermTk/TermTk/TTkCore/TTkTerm/__init__.py similarity index 100% rename from TermTk/TTkCore/TTkTerm/__init__.py rename to libs/pyTermTk/TermTk/TTkCore/TTkTerm/__init__.py diff --git a/TermTk/TTkCore/TTkTerm/colors.py b/libs/pyTermTk/TermTk/TTkCore/TTkTerm/colors.py similarity index 100% rename from TermTk/TTkCore/TTkTerm/colors.py rename to libs/pyTermTk/TermTk/TTkCore/TTkTerm/colors.py diff --git a/TermTk/TTkCore/TTkTerm/colors_ansi_map.py b/libs/pyTermTk/TermTk/TTkCore/TTkTerm/colors_ansi_map.py similarity index 100% rename from TermTk/TTkCore/TTkTerm/colors_ansi_map.py rename to libs/pyTermTk/TermTk/TTkCore/TTkTerm/colors_ansi_map.py diff --git a/TermTk/TTkCore/TTkTerm/input.py b/libs/pyTermTk/TermTk/TTkCore/TTkTerm/input.py similarity index 100% rename from TermTk/TTkCore/TTkTerm/input.py rename to libs/pyTermTk/TermTk/TTkCore/TTkTerm/input.py diff --git a/TermTk/TTkCore/TTkTerm/input_mono.py b/libs/pyTermTk/TermTk/TTkCore/TTkTerm/input_mono.py similarity index 100% rename from TermTk/TTkCore/TTkTerm/input_mono.py rename to libs/pyTermTk/TermTk/TTkCore/TTkTerm/input_mono.py diff --git a/TermTk/TTkCore/TTkTerm/input_thread.py b/libs/pyTermTk/TermTk/TTkCore/TTkTerm/input_thread.py similarity index 100% rename from TermTk/TTkCore/TTkTerm/input_thread.py rename to libs/pyTermTk/TermTk/TTkCore/TTkTerm/input_thread.py diff --git a/TermTk/TTkCore/TTkTerm/inputkey.py b/libs/pyTermTk/TermTk/TTkCore/TTkTerm/inputkey.py similarity index 100% rename from TermTk/TTkCore/TTkTerm/inputkey.py rename to libs/pyTermTk/TermTk/TTkCore/TTkTerm/inputkey.py diff --git a/TermTk/TTkCore/TTkTerm/inputmouse.py b/libs/pyTermTk/TermTk/TTkCore/TTkTerm/inputmouse.py similarity index 100% rename from TermTk/TTkCore/TTkTerm/inputmouse.py rename to libs/pyTermTk/TermTk/TTkCore/TTkTerm/inputmouse.py diff --git a/TermTk/TTkCore/TTkTerm/term.py b/libs/pyTermTk/TermTk/TTkCore/TTkTerm/term.py similarity index 100% rename from TermTk/TTkCore/TTkTerm/term.py rename to libs/pyTermTk/TermTk/TTkCore/TTkTerm/term.py diff --git a/TermTk/TTkCore/TTkTerm/term_base.py b/libs/pyTermTk/TermTk/TTkCore/TTkTerm/term_base.py similarity index 100% rename from TermTk/TTkCore/TTkTerm/term_base.py rename to libs/pyTermTk/TermTk/TTkCore/TTkTerm/term_base.py diff --git a/TermTk/TTkCore/__init__.py b/libs/pyTermTk/TermTk/TTkCore/__init__.py similarity index 100% rename from TermTk/TTkCore/__init__.py rename to libs/pyTermTk/TermTk/TTkCore/__init__.py diff --git a/TermTk/TTkCore/canvas.py b/libs/pyTermTk/TermTk/TTkCore/canvas.py similarity index 100% rename from TermTk/TTkCore/canvas.py rename to libs/pyTermTk/TermTk/TTkCore/canvas.py diff --git a/TermTk/TTkCore/cfg.py b/libs/pyTermTk/TermTk/TTkCore/cfg.py similarity index 96% rename from TermTk/TTkCore/cfg.py rename to libs/pyTermTk/TermTk/TTkCore/cfg.py index b6ddb272..303c104f 100644 --- a/TermTk/TTkCore/cfg.py +++ b/libs/pyTermTk/TermTk/TTkCore/cfg.py @@ -23,9 +23,10 @@ __all__ = ['TTkCfg', 'TTkGlbl'] from TermTk.TTkCore.constant import TTkK +from TermTk import __version__ class TTkCfg: - version:str = "0.41.11-a.0" + version:str = __version__ name:str = "pyTermTk" color_depth: int = TTkK.DEP_24 diff --git a/TermTk/TTkCore/color.py b/libs/pyTermTk/TermTk/TTkCore/color.py similarity index 100% rename from TermTk/TTkCore/color.py rename to libs/pyTermTk/TermTk/TTkCore/color.py diff --git a/TermTk/TTkCore/constant.py b/libs/pyTermTk/TermTk/TTkCore/constant.py similarity index 100% rename from TermTk/TTkCore/constant.py rename to libs/pyTermTk/TermTk/TTkCore/constant.py diff --git a/TermTk/TTkCore/drivers/__init__.py b/libs/pyTermTk/TermTk/TTkCore/drivers/__init__.py similarity index 100% rename from TermTk/TTkCore/drivers/__init__.py rename to libs/pyTermTk/TermTk/TTkCore/drivers/__init__.py diff --git a/TermTk/TTkCore/drivers/pyodide.py b/libs/pyTermTk/TermTk/TTkCore/drivers/pyodide.py similarity index 100% rename from TermTk/TTkCore/drivers/pyodide.py rename to libs/pyTermTk/TermTk/TTkCore/drivers/pyodide.py diff --git a/TermTk/TTkCore/drivers/term_pyodide.py b/libs/pyTermTk/TermTk/TTkCore/drivers/term_pyodide.py similarity index 100% rename from TermTk/TTkCore/drivers/term_pyodide.py rename to libs/pyTermTk/TermTk/TTkCore/drivers/term_pyodide.py diff --git a/TermTk/TTkCore/drivers/term_unix.py b/libs/pyTermTk/TermTk/TTkCore/drivers/term_unix.py similarity index 100% rename from TermTk/TTkCore/drivers/term_unix.py rename to libs/pyTermTk/TermTk/TTkCore/drivers/term_unix.py diff --git a/TermTk/TTkCore/drivers/term_unix_serial.py b/libs/pyTermTk/TermTk/TTkCore/drivers/term_unix_serial.py similarity index 100% rename from TermTk/TTkCore/drivers/term_unix_serial.py rename to libs/pyTermTk/TermTk/TTkCore/drivers/term_unix_serial.py diff --git a/TermTk/TTkCore/drivers/term_windows.py b/libs/pyTermTk/TermTk/TTkCore/drivers/term_windows.py similarity index 100% rename from TermTk/TTkCore/drivers/term_windows.py rename to libs/pyTermTk/TermTk/TTkCore/drivers/term_windows.py diff --git a/TermTk/TTkCore/drivers/unix.py b/libs/pyTermTk/TermTk/TTkCore/drivers/unix.py similarity index 100% rename from TermTk/TTkCore/drivers/unix.py rename to libs/pyTermTk/TermTk/TTkCore/drivers/unix.py diff --git a/TermTk/TTkCore/drivers/unix_gpm.py b/libs/pyTermTk/TermTk/TTkCore/drivers/unix_gpm.py similarity index 100% rename from TermTk/TTkCore/drivers/unix_gpm.py rename to libs/pyTermTk/TermTk/TTkCore/drivers/unix_gpm.py diff --git a/TermTk/TTkCore/drivers/unix_thread.py b/libs/pyTermTk/TermTk/TTkCore/drivers/unix_thread.py similarity index 100% rename from TermTk/TTkCore/drivers/unix_thread.py rename to libs/pyTermTk/TermTk/TTkCore/drivers/unix_thread.py diff --git a/TermTk/TTkCore/drivers/windows.py b/libs/pyTermTk/TermTk/TTkCore/drivers/windows.py similarity index 100% rename from TermTk/TTkCore/drivers/windows.py rename to libs/pyTermTk/TermTk/TTkCore/drivers/windows.py diff --git a/TermTk/TTkCore/filebuffer.py b/libs/pyTermTk/TermTk/TTkCore/filebuffer.py similarity index 100% rename from TermTk/TTkCore/filebuffer.py rename to libs/pyTermTk/TermTk/TTkCore/filebuffer.py diff --git a/TermTk/TTkCore/helper.py b/libs/pyTermTk/TermTk/TTkCore/helper.py similarity index 100% rename from TermTk/TTkCore/helper.py rename to libs/pyTermTk/TermTk/TTkCore/helper.py diff --git a/TermTk/TTkCore/log.py b/libs/pyTermTk/TermTk/TTkCore/log.py similarity index 100% rename from TermTk/TTkCore/log.py rename to libs/pyTermTk/TermTk/TTkCore/log.py diff --git a/TermTk/TTkCore/propertyanimation.py b/libs/pyTermTk/TermTk/TTkCore/propertyanimation.py similarity index 100% rename from TermTk/TTkCore/propertyanimation.py rename to libs/pyTermTk/TermTk/TTkCore/propertyanimation.py diff --git a/TermTk/TTkCore/shortcut.py b/libs/pyTermTk/TermTk/TTkCore/shortcut.py similarity index 100% rename from TermTk/TTkCore/shortcut.py rename to libs/pyTermTk/TermTk/TTkCore/shortcut.py diff --git a/TermTk/TTkCore/signal.py b/libs/pyTermTk/TermTk/TTkCore/signal.py similarity index 100% rename from TermTk/TTkCore/signal.py rename to libs/pyTermTk/TermTk/TTkCore/signal.py diff --git a/TermTk/TTkCore/string.py b/libs/pyTermTk/TermTk/TTkCore/string.py similarity index 100% rename from TermTk/TTkCore/string.py rename to libs/pyTermTk/TermTk/TTkCore/string.py diff --git a/TermTk/TTkCore/timer.py b/libs/pyTermTk/TermTk/TTkCore/timer.py similarity index 100% rename from TermTk/TTkCore/timer.py rename to libs/pyTermTk/TermTk/TTkCore/timer.py diff --git a/TermTk/TTkCore/timer_pyodide.py b/libs/pyTermTk/TermTk/TTkCore/timer_pyodide.py similarity index 100% rename from TermTk/TTkCore/timer_pyodide.py rename to libs/pyTermTk/TermTk/TTkCore/timer_pyodide.py diff --git a/TermTk/TTkCore/timer_unix.py b/libs/pyTermTk/TermTk/TTkCore/timer_unix.py similarity index 100% rename from TermTk/TTkCore/timer_unix.py rename to libs/pyTermTk/TermTk/TTkCore/timer_unix.py diff --git a/TermTk/TTkCore/ttk.py b/libs/pyTermTk/TermTk/TTkCore/ttk.py similarity index 100% rename from TermTk/TTkCore/ttk.py rename to libs/pyTermTk/TermTk/TTkCore/ttk.py diff --git a/TermTk/TTkCore/util.py b/libs/pyTermTk/TermTk/TTkCore/util.py similarity index 100% rename from TermTk/TTkCore/util.py rename to libs/pyTermTk/TermTk/TTkCore/util.py diff --git a/TermTk/TTkCrossTools/__init__.py b/libs/pyTermTk/TermTk/TTkCrossTools/__init__.py similarity index 100% rename from TermTk/TTkCrossTools/__init__.py rename to libs/pyTermTk/TermTk/TTkCrossTools/__init__.py diff --git a/TermTk/TTkCrossTools/savetools.py b/libs/pyTermTk/TermTk/TTkCrossTools/savetools.py similarity index 100% rename from TermTk/TTkCrossTools/savetools.py rename to libs/pyTermTk/TermTk/TTkCrossTools/savetools.py diff --git a/TermTk/TTkGui/__init__.py b/libs/pyTermTk/TermTk/TTkGui/__init__.py similarity index 100% rename from TermTk/TTkGui/__init__.py rename to libs/pyTermTk/TermTk/TTkGui/__init__.py diff --git a/TermTk/TTkGui/clipboard.py b/libs/pyTermTk/TermTk/TTkGui/clipboard.py similarity index 100% rename from TermTk/TTkGui/clipboard.py rename to libs/pyTermTk/TermTk/TTkGui/clipboard.py diff --git a/TermTk/TTkGui/drag.py b/libs/pyTermTk/TermTk/TTkGui/drag.py similarity index 100% rename from TermTk/TTkGui/drag.py rename to libs/pyTermTk/TermTk/TTkGui/drag.py diff --git a/TermTk/TTkGui/textcursor.py b/libs/pyTermTk/TermTk/TTkGui/textcursor.py similarity index 100% rename from TermTk/TTkGui/textcursor.py rename to libs/pyTermTk/TermTk/TTkGui/textcursor.py diff --git a/TermTk/TTkGui/textdocument.py b/libs/pyTermTk/TermTk/TTkGui/textdocument.py similarity index 100% rename from TermTk/TTkGui/textdocument.py rename to libs/pyTermTk/TermTk/TTkGui/textdocument.py diff --git a/TermTk/TTkGui/textdocument_highlight.py b/libs/pyTermTk/TermTk/TTkGui/textdocument_highlight.py similarity index 100% rename from TermTk/TTkGui/textdocument_highlight.py rename to libs/pyTermTk/TermTk/TTkGui/textdocument_highlight.py diff --git a/TermTk/TTkGui/textdocument_highlight_pygments.py b/libs/pyTermTk/TermTk/TTkGui/textdocument_highlight_pygments.py similarity index 100% rename from TermTk/TTkGui/textdocument_highlight_pygments.py rename to libs/pyTermTk/TermTk/TTkGui/textdocument_highlight_pygments.py diff --git a/TermTk/TTkGui/textwrap1.py b/libs/pyTermTk/TermTk/TTkGui/textwrap1.py similarity index 100% rename from TermTk/TTkGui/textwrap1.py rename to libs/pyTermTk/TermTk/TTkGui/textwrap1.py diff --git a/TermTk/TTkGui/tooltip.py b/libs/pyTermTk/TermTk/TTkGui/tooltip.py similarity index 100% rename from TermTk/TTkGui/tooltip.py rename to libs/pyTermTk/TermTk/TTkGui/tooltip.py diff --git a/TermTk/TTkLayouts/__init__.py b/libs/pyTermTk/TermTk/TTkLayouts/__init__.py similarity index 100% rename from TermTk/TTkLayouts/__init__.py rename to libs/pyTermTk/TermTk/TTkLayouts/__init__.py diff --git a/TermTk/TTkLayouts/boxlayout.py b/libs/pyTermTk/TermTk/TTkLayouts/boxlayout.py similarity index 100% rename from TermTk/TTkLayouts/boxlayout.py rename to libs/pyTermTk/TermTk/TTkLayouts/boxlayout.py diff --git a/TermTk/TTkLayouts/gridlayout.py b/libs/pyTermTk/TermTk/TTkLayouts/gridlayout.py similarity index 100% rename from TermTk/TTkLayouts/gridlayout.py rename to libs/pyTermTk/TermTk/TTkLayouts/gridlayout.py diff --git a/TermTk/TTkLayouts/layout.py b/libs/pyTermTk/TermTk/TTkLayouts/layout.py similarity index 100% rename from TermTk/TTkLayouts/layout.py rename to libs/pyTermTk/TermTk/TTkLayouts/layout.py diff --git a/TermTk/TTkTemplates/__init__.py b/libs/pyTermTk/TermTk/TTkTemplates/__init__.py similarity index 100% rename from TermTk/TTkTemplates/__init__.py rename to libs/pyTermTk/TermTk/TTkTemplates/__init__.py diff --git a/TermTk/TTkTemplates/dragevents.py b/libs/pyTermTk/TermTk/TTkTemplates/dragevents.py similarity index 100% rename from TermTk/TTkTemplates/dragevents.py rename to libs/pyTermTk/TermTk/TTkTemplates/dragevents.py diff --git a/TermTk/TTkTemplates/keyevents.py b/libs/pyTermTk/TermTk/TTkTemplates/keyevents.py similarity index 100% rename from TermTk/TTkTemplates/keyevents.py rename to libs/pyTermTk/TermTk/TTkTemplates/keyevents.py diff --git a/TermTk/TTkTemplates/mouseevents.py b/libs/pyTermTk/TermTk/TTkTemplates/mouseevents.py similarity index 100% rename from TermTk/TTkTemplates/mouseevents.py rename to libs/pyTermTk/TermTk/TTkTemplates/mouseevents.py diff --git a/TermTk/TTkTestWidgets/__init__.py b/libs/pyTermTk/TermTk/TTkTestWidgets/__init__.py similarity index 100% rename from TermTk/TTkTestWidgets/__init__.py rename to libs/pyTermTk/TermTk/TTkTestWidgets/__init__.py diff --git a/TermTk/TTkTestWidgets/keypressview.py b/libs/pyTermTk/TermTk/TTkTestWidgets/keypressview.py similarity index 100% rename from TermTk/TTkTestWidgets/keypressview.py rename to libs/pyTermTk/TermTk/TTkTestWidgets/keypressview.py diff --git a/TermTk/TTkTestWidgets/keypressviewfont.py b/libs/pyTermTk/TermTk/TTkTestWidgets/keypressviewfont.py similarity index 100% rename from TermTk/TTkTestWidgets/keypressviewfont.py rename to libs/pyTermTk/TermTk/TTkTestWidgets/keypressviewfont.py diff --git a/TermTk/TTkTestWidgets/logviewer.py b/libs/pyTermTk/TermTk/TTkTestWidgets/logviewer.py similarity index 100% rename from TermTk/TTkTestWidgets/logviewer.py rename to libs/pyTermTk/TermTk/TTkTestWidgets/logviewer.py diff --git a/TermTk/TTkTestWidgets/testabstractscroll.py b/libs/pyTermTk/TermTk/TTkTestWidgets/testabstractscroll.py similarity index 100% rename from TermTk/TTkTestWidgets/testabstractscroll.py rename to libs/pyTermTk/TermTk/TTkTestWidgets/testabstractscroll.py diff --git a/TermTk/TTkTestWidgets/testwidget.py b/libs/pyTermTk/TermTk/TTkTestWidgets/testwidget.py similarity index 100% rename from TermTk/TTkTestWidgets/testwidget.py rename to libs/pyTermTk/TermTk/TTkTestWidgets/testwidget.py diff --git a/TermTk/TTkTestWidgets/testwidgetsizes.py b/libs/pyTermTk/TermTk/TTkTestWidgets/testwidgetsizes.py similarity index 100% rename from TermTk/TTkTestWidgets/testwidgetsizes.py rename to libs/pyTermTk/TermTk/TTkTestWidgets/testwidgetsizes.py diff --git a/TermTk/TTkTestWidgets/tominspector.py b/libs/pyTermTk/TermTk/TTkTestWidgets/tominspector.py similarity index 100% rename from TermTk/TTkTestWidgets/tominspector.py rename to libs/pyTermTk/TermTk/TTkTestWidgets/tominspector.py diff --git a/TermTk/TTkTheme/__init__.py b/libs/pyTermTk/TermTk/TTkTheme/__init__.py similarity index 100% rename from TermTk/TTkTheme/__init__.py rename to libs/pyTermTk/TermTk/TTkTheme/__init__.py diff --git a/TermTk/TTkTheme/draw_ascii.py b/libs/pyTermTk/TermTk/TTkTheme/draw_ascii.py similarity index 100% rename from TermTk/TTkTheme/draw_ascii.py rename to libs/pyTermTk/TermTk/TTkTheme/draw_ascii.py diff --git a/TermTk/TTkTheme/draw_utf8.py b/libs/pyTermTk/TermTk/TTkTheme/draw_utf8.py similarity index 100% rename from TermTk/TTkTheme/draw_utf8.py rename to libs/pyTermTk/TermTk/TTkTheme/draw_utf8.py diff --git a/TermTk/TTkTheme/fileicon_ascii.py b/libs/pyTermTk/TermTk/TTkTheme/fileicon_ascii.py similarity index 100% rename from TermTk/TTkTheme/fileicon_ascii.py rename to libs/pyTermTk/TermTk/TTkTheme/fileicon_ascii.py diff --git a/TermTk/TTkTheme/fileicon_nerd.py b/libs/pyTermTk/TermTk/TTkTheme/fileicon_nerd.py similarity index 100% rename from TermTk/TTkTheme/fileicon_nerd.py rename to libs/pyTermTk/TermTk/TTkTheme/fileicon_nerd.py diff --git a/TermTk/TTkTheme/fileicon_utf8.py b/libs/pyTermTk/TermTk/TTkTheme/fileicon_utf8.py similarity index 100% rename from TermTk/TTkTheme/fileicon_utf8.py rename to libs/pyTermTk/TermTk/TTkTheme/fileicon_utf8.py diff --git a/TermTk/TTkTheme/theme.py b/libs/pyTermTk/TermTk/TTkTheme/theme.py similarity index 100% rename from TermTk/TTkTheme/theme.py rename to libs/pyTermTk/TermTk/TTkTheme/theme.py diff --git a/TermTk/TTkTypes/__init__.py b/libs/pyTermTk/TermTk/TTkTypes/__init__.py similarity index 100% rename from TermTk/TTkTypes/__init__.py rename to libs/pyTermTk/TermTk/TTkTypes/__init__.py diff --git a/TermTk/TTkTypes/viewitem.py b/libs/pyTermTk/TermTk/TTkTypes/viewitem.py similarity index 100% rename from TermTk/TTkTypes/viewitem.py rename to libs/pyTermTk/TermTk/TTkTypes/viewitem.py diff --git a/TermTk/TTkUiTools/__init__.py b/libs/pyTermTk/TermTk/TTkUiTools/__init__.py similarity index 100% rename from TermTk/TTkUiTools/__init__.py rename to libs/pyTermTk/TermTk/TTkUiTools/__init__.py diff --git a/TermTk/TTkUiTools/properties/__init__.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/__init__.py similarity index 100% rename from TermTk/TTkUiTools/properties/__init__.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/__init__.py diff --git a/TermTk/TTkUiTools/properties/about.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/about.py similarity index 100% rename from TermTk/TTkUiTools/properties/about.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/about.py diff --git a/TermTk/TTkUiTools/properties/button.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/button.py similarity index 100% rename from TermTk/TTkUiTools/properties/button.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/button.py diff --git a/TermTk/TTkUiTools/properties/checkbox.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/checkbox.py similarity index 100% rename from TermTk/TTkUiTools/properties/checkbox.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/checkbox.py diff --git a/TermTk/TTkUiTools/properties/colorpicker.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/colorpicker.py similarity index 100% rename from TermTk/TTkUiTools/properties/colorpicker.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/colorpicker.py diff --git a/TermTk/TTkUiTools/properties/combobox.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/combobox.py similarity index 100% rename from TermTk/TTkUiTools/properties/combobox.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/combobox.py diff --git a/TermTk/TTkUiTools/properties/container.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/container.py similarity index 100% rename from TermTk/TTkUiTools/properties/container.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/container.py diff --git a/TermTk/TTkUiTools/properties/filepicker.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/filepicker.py similarity index 100% rename from TermTk/TTkUiTools/properties/filepicker.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/filepicker.py diff --git a/TermTk/TTkUiTools/properties/filetree.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/filetree.py similarity index 100% rename from TermTk/TTkUiTools/properties/filetree.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/filetree.py diff --git a/TermTk/TTkUiTools/properties/frame.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/frame.py similarity index 100% rename from TermTk/TTkUiTools/properties/frame.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/frame.py diff --git a/TermTk/TTkUiTools/properties/graph.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/graph.py similarity index 100% rename from TermTk/TTkUiTools/properties/graph.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/graph.py diff --git a/TermTk/TTkUiTools/properties/image.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/image.py similarity index 100% rename from TermTk/TTkUiTools/properties/image.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/image.py diff --git a/TermTk/TTkUiTools/properties/label.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/label.py similarity index 100% rename from TermTk/TTkUiTools/properties/label.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/label.py diff --git a/TermTk/TTkUiTools/properties/layout.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/layout.py similarity index 100% rename from TermTk/TTkUiTools/properties/layout.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/layout.py diff --git a/TermTk/TTkUiTools/properties/lineedit.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/lineedit.py similarity index 100% rename from TermTk/TTkUiTools/properties/lineedit.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/lineedit.py diff --git a/TermTk/TTkUiTools/properties/list_.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/list_.py similarity index 100% rename from TermTk/TTkUiTools/properties/list_.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/list_.py diff --git a/TermTk/TTkUiTools/properties/listwidget.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/listwidget.py similarity index 100% rename from TermTk/TTkUiTools/properties/listwidget.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/listwidget.py diff --git a/TermTk/TTkUiTools/properties/menu.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/menu.py similarity index 100% rename from TermTk/TTkUiTools/properties/menu.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/menu.py diff --git a/TermTk/TTkUiTools/properties/menubar.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/menubar.py similarity index 100% rename from TermTk/TTkUiTools/properties/menubar.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/menubar.py diff --git a/TermTk/TTkUiTools/properties/progressbar.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/progressbar.py similarity index 100% rename from TermTk/TTkUiTools/properties/progressbar.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/progressbar.py diff --git a/TermTk/TTkUiTools/properties/radiobutton.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/radiobutton.py similarity index 100% rename from TermTk/TTkUiTools/properties/radiobutton.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/radiobutton.py diff --git a/TermTk/TTkUiTools/properties/resizableframe.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/resizableframe.py similarity index 100% rename from TermTk/TTkUiTools/properties/resizableframe.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/resizableframe.py diff --git a/TermTk/TTkUiTools/properties/scrollarea.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/scrollarea.py similarity index 100% rename from TermTk/TTkUiTools/properties/scrollarea.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/scrollarea.py diff --git a/TermTk/TTkUiTools/properties/scrollbar.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/scrollbar.py similarity index 100% rename from TermTk/TTkUiTools/properties/scrollbar.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/scrollbar.py diff --git a/TermTk/TTkUiTools/properties/slider.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/slider.py similarity index 100% rename from TermTk/TTkUiTools/properties/slider.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/slider.py diff --git a/TermTk/TTkUiTools/properties/spacer.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/spacer.py similarity index 100% rename from TermTk/TTkUiTools/properties/spacer.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/spacer.py diff --git a/TermTk/TTkUiTools/properties/spinbox.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/spinbox.py similarity index 100% rename from TermTk/TTkUiTools/properties/spinbox.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/spinbox.py diff --git a/TermTk/TTkUiTools/properties/splitter.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/splitter.py similarity index 100% rename from TermTk/TTkUiTools/properties/splitter.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/splitter.py diff --git a/TermTk/TTkUiTools/properties/table.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/table.py similarity index 100% rename from TermTk/TTkUiTools/properties/table.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/table.py diff --git a/TermTk/TTkUiTools/properties/tabwidget.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/tabwidget.py similarity index 100% rename from TermTk/TTkUiTools/properties/tabwidget.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/tabwidget.py diff --git a/TermTk/TTkUiTools/properties/texedit.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/texedit.py similarity index 100% rename from TermTk/TTkUiTools/properties/texedit.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/texedit.py diff --git a/TermTk/TTkUiTools/properties/tree.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/tree.py similarity index 100% rename from TermTk/TTkUiTools/properties/tree.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/tree.py diff --git a/TermTk/TTkUiTools/properties/widget.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/widget.py similarity index 100% rename from TermTk/TTkUiTools/properties/widget.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/widget.py diff --git a/TermTk/TTkUiTools/properties/window.py b/libs/pyTermTk/TermTk/TTkUiTools/properties/window.py similarity index 100% rename from TermTk/TTkUiTools/properties/window.py rename to libs/pyTermTk/TermTk/TTkUiTools/properties/window.py diff --git a/TermTk/TTkUiTools/uiloader.py b/libs/pyTermTk/TermTk/TTkUiTools/uiloader.py similarity index 100% rename from TermTk/TTkUiTools/uiloader.py rename to libs/pyTermTk/TermTk/TTkUiTools/uiloader.py diff --git a/TermTk/TTkUiTools/uiproperties.py b/libs/pyTermTk/TermTk/TTkUiTools/uiproperties.py similarity index 100% rename from TermTk/TTkUiTools/uiproperties.py rename to libs/pyTermTk/TermTk/TTkUiTools/uiproperties.py diff --git a/TermTk/TTkWidgets/Fancy/__init__.py b/libs/pyTermTk/TermTk/TTkWidgets/Fancy/__init__.py similarity index 100% rename from TermTk/TTkWidgets/Fancy/__init__.py rename to libs/pyTermTk/TermTk/TTkWidgets/Fancy/__init__.py diff --git a/TermTk/TTkWidgets/Fancy/progressbar.py b/libs/pyTermTk/TermTk/TTkWidgets/Fancy/progressbar.py similarity index 100% rename from TermTk/TTkWidgets/Fancy/progressbar.py rename to libs/pyTermTk/TermTk/TTkWidgets/Fancy/progressbar.py diff --git a/TermTk/TTkWidgets/Fancy/table.py b/libs/pyTermTk/TermTk/TTkWidgets/Fancy/table.py similarity index 100% rename from TermTk/TTkWidgets/Fancy/table.py rename to libs/pyTermTk/TermTk/TTkWidgets/Fancy/table.py diff --git a/TermTk/TTkWidgets/Fancy/tableview.py b/libs/pyTermTk/TermTk/TTkWidgets/Fancy/tableview.py similarity index 100% rename from TermTk/TTkWidgets/Fancy/tableview.py rename to libs/pyTermTk/TermTk/TTkWidgets/Fancy/tableview.py diff --git a/TermTk/TTkWidgets/Fancy/tree.py b/libs/pyTermTk/TermTk/TTkWidgets/Fancy/tree.py similarity index 100% rename from TermTk/TTkWidgets/Fancy/tree.py rename to libs/pyTermTk/TermTk/TTkWidgets/Fancy/tree.py diff --git a/TermTk/TTkWidgets/Fancy/treeview.py b/libs/pyTermTk/TermTk/TTkWidgets/Fancy/treeview.py similarity index 100% rename from TermTk/TTkWidgets/Fancy/treeview.py rename to libs/pyTermTk/TermTk/TTkWidgets/Fancy/treeview.py diff --git a/TermTk/TTkWidgets/Fancy/treewidget.py b/libs/pyTermTk/TermTk/TTkWidgets/Fancy/treewidget.py similarity index 100% rename from TermTk/TTkWidgets/Fancy/treewidget.py rename to libs/pyTermTk/TermTk/TTkWidgets/Fancy/treewidget.py diff --git a/TermTk/TTkWidgets/Fancy/treewidgetitem.py b/libs/pyTermTk/TermTk/TTkWidgets/Fancy/treewidgetitem.py similarity index 100% rename from TermTk/TTkWidgets/Fancy/treewidgetitem.py rename to libs/pyTermTk/TermTk/TTkWidgets/Fancy/treewidgetitem.py diff --git a/TermTk/TTkWidgets/TTkModelView/__init__.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/__init__.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/__init__.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/__init__.py diff --git a/TermTk/TTkWidgets/TTkModelView/filetree.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/filetree.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/filetree.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/filetree.py diff --git a/TermTk/TTkWidgets/TTkModelView/filetreewidget.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/filetreewidget.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/filetreewidget.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/filetreewidget.py diff --git a/TermTk/TTkWidgets/TTkModelView/filetreewidgetitem.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/filetreewidgetitem.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/filetreewidgetitem.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/filetreewidgetitem.py diff --git a/TermTk/TTkWidgets/TTkModelView/table.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/table.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/table.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/table.py diff --git a/TermTk/TTkWidgets/TTkModelView/tablemodelcsv.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/tablemodelcsv.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/tablemodelcsv.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/tablemodelcsv.py diff --git a/TermTk/TTkWidgets/TTkModelView/tablemodellist.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/tablemodellist.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/tablemodellist.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/tablemodellist.py diff --git a/TermTk/TTkWidgets/TTkModelView/tablemodelsqlite3.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/tablemodelsqlite3.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/tablemodelsqlite3.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/tablemodelsqlite3.py diff --git a/TermTk/TTkWidgets/TTkModelView/tablewidget.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/tablewidget.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/tablewidget.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/tablewidget.py diff --git a/TermTk/TTkWidgets/TTkModelView/tablewidgetitem.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/tablewidgetitem.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/tablewidgetitem.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/tablewidgetitem.py diff --git a/TermTk/TTkWidgets/TTkModelView/tree.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/tree.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/tree.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/tree.py diff --git a/TermTk/TTkWidgets/TTkModelView/treewidget.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/treewidget.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/treewidget.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/treewidget.py diff --git a/TermTk/TTkWidgets/TTkModelView/treewidgetitem.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/treewidgetitem.py similarity index 100% rename from TermTk/TTkWidgets/TTkModelView/treewidgetitem.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/treewidgetitem.py diff --git a/TermTk/TTkWidgets/TTkPickers/__init__.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkPickers/__init__.py similarity index 100% rename from TermTk/TTkWidgets/TTkPickers/__init__.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkPickers/__init__.py diff --git a/TermTk/TTkWidgets/TTkPickers/colorpicker.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkPickers/colorpicker.py similarity index 100% rename from TermTk/TTkWidgets/TTkPickers/colorpicker.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkPickers/colorpicker.py diff --git a/TermTk/TTkWidgets/TTkPickers/dateTimePicker.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkPickers/dateTimePicker.py similarity index 100% rename from TermTk/TTkWidgets/TTkPickers/dateTimePicker.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkPickers/dateTimePicker.py diff --git a/TermTk/TTkWidgets/TTkPickers/filepicker.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkPickers/filepicker.py similarity index 100% rename from TermTk/TTkWidgets/TTkPickers/filepicker.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkPickers/filepicker.py diff --git a/TermTk/TTkWidgets/TTkPickers/messagebox.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkPickers/messagebox.py similarity index 100% rename from TermTk/TTkWidgets/TTkPickers/messagebox.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkPickers/messagebox.py diff --git a/TermTk/TTkWidgets/TTkPickers/textpicker.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkPickers/textpicker.py similarity index 100% rename from TermTk/TTkWidgets/TTkPickers/textpicker.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkPickers/textpicker.py diff --git a/TermTk/TTkWidgets/TTkTerminal/__init__.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/__init__.py similarity index 100% rename from TermTk/TTkWidgets/TTkTerminal/__init__.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/__init__.py diff --git a/TermTk/TTkWidgets/TTkTerminal/debugterminal.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/debugterminal.py similarity index 100% rename from TermTk/TTkWidgets/TTkTerminal/debugterminal.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/debugterminal.py diff --git a/TermTk/TTkWidgets/TTkTerminal/mode.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/mode.py similarity index 100% rename from TermTk/TTkWidgets/TTkTerminal/mode.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/mode.py diff --git a/TermTk/TTkWidgets/TTkTerminal/terminal.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminal.py similarity index 100% rename from TermTk/TTkWidgets/TTkTerminal/terminal.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminal.py diff --git a/TermTk/TTkWidgets/TTkTerminal/terminal_screen.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminal_screen.py similarity index 100% rename from TermTk/TTkWidgets/TTkTerminal/terminal_screen.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminal_screen.py diff --git a/TermTk/TTkWidgets/TTkTerminal/terminal_screen_C1.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminal_screen_C1.py similarity index 100% rename from TermTk/TTkWidgets/TTkTerminal/terminal_screen_C1.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminal_screen_C1.py diff --git a/TermTk/TTkWidgets/TTkTerminal/terminal_screen_CSI.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminal_screen_CSI.py similarity index 100% rename from TermTk/TTkWidgets/TTkTerminal/terminal_screen_CSI.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminal_screen_CSI.py diff --git a/TermTk/TTkWidgets/TTkTerminal/terminalhelper.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminalhelper.py similarity index 100% rename from TermTk/TTkWidgets/TTkTerminal/terminalhelper.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminalhelper.py diff --git a/TermTk/TTkWidgets/TTkTerminal/terminalview.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminalview.py similarity index 100% rename from TermTk/TTkWidgets/TTkTerminal/terminalview.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminalview.py diff --git a/TermTk/TTkWidgets/TTkTerminal/terminalview_CSI_DEC.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminalview_CSI_DEC.py similarity index 100% rename from TermTk/TTkWidgets/TTkTerminal/terminalview_CSI_DEC.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/terminalview_CSI_DEC.py diff --git a/TermTk/TTkWidgets/TTkTerminal/vt102.py b/libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/vt102.py similarity index 100% rename from TermTk/TTkWidgets/TTkTerminal/vt102.py rename to libs/pyTermTk/TermTk/TTkWidgets/TTkTerminal/vt102.py diff --git a/TermTk/TTkWidgets/__init__.py b/libs/pyTermTk/TermTk/TTkWidgets/__init__.py similarity index 100% rename from TermTk/TTkWidgets/__init__.py rename to libs/pyTermTk/TermTk/TTkWidgets/__init__.py diff --git a/TermTk/TTkWidgets/about.py b/libs/pyTermTk/TermTk/TTkWidgets/about.py similarity index 95% rename from TermTk/TTkWidgets/about.py rename to libs/pyTermTk/TermTk/TTkWidgets/about.py index a6b2ab32..48d43964 100644 --- a/TermTk/TTkWidgets/about.py +++ b/libs/pyTermTk/TermTk/TTkWidgets/about.py @@ -39,6 +39,7 @@ _peppered_image = TTkUtil.base64_deflate_2_obj( "5U2DXq3mDsvOfNqlvUa+RyTDOIh2FzT0BTmKSF6LuBkvvDOKPDpMvEXbHn1c6vRN2kpFuMgl9u2lXnzdyIBqxgR8Vh+GLZhjEoz1rDe3NTPOD+7TKdv/iBsvaPR+fnxK" + "xQDE4uRREkUJ66XbtrnsPzh2UpZrPsLpiuSfWR4dVb7jqa6eZJnJVIxboW48rdJF2ABxDMxk73q1GcaMFpv7wcfOF+RqZ89t+64LcTjIw8OTYYtVm3J7H3cB43I6aSq0" + "4Zf9GYaCzmMK1e6+dLH7AkxADRtZ3ojHUrmNqNtco9mqF7pzbppx0GQSQ3Op8FcJ2G5ltCNVLuI74ZeG5vr8rDHAaP/o5bQnnOawWcPyRePnp/8KRQkp") +_peppered_string = TTkString(_peppered_image) class TTkAbout(TTkWindow): ''' @@ -104,12 +105,10 @@ class TTkAbout(TTkWindow): " ▌ ▐ ╚═╝ ╚═╝ ", " ▚▄▄▘ "] + __slots__=('_image') + _image:TTkString def __init__(self, **kwargs) -> None: TTkWindow.__init__(self,**kwargs) - TTkLabel(parent=self, pos=( 0, 0), text=_peppered_image) - TTkLabel(parent=self, pos=(20, 6),text=TTkString(f" Version: {TTkCfg.version}", color=TTkColor.fg('#AAAAFF'))) - TTkLabel(parent=self, pos=(12, 8),text=TTkString("Powered By, Eugenio Parodi")) - TTkLabel(parent=self, pos=( 2,10),text=TTkString("https://github.com/ceccopierangiolieugenio/pyTermTk", color=TTkColor.fg('#44FFFF'))) if not self.title(): self.setTitle('About...') self.resize(55,15) @@ -119,6 +118,11 @@ class TTkAbout(TTkWindow): for y, line in enumerate(TTkAbout.pyTermTk): canvas.drawText(pos=(9,3+y),text=line, color=TTkColor.fg(f'#{c[0]:02X}{c[1]:02X}{c[2]:02X}')) c[2]-=0x11 + for i,line in enumerate(_peppered_string.split('\n')): + canvas.drawTTkString(pos=(1,3+i), text=line) + canvas.drawText(pos=(20, 9),text=f" Version: {TTkCfg.version}", color=TTkColor.fg('#AAAAFF')) + canvas.drawText(pos=(12,11),text=f"Powered By, Eugenio Parodi") + canvas.drawText(pos=( 2,13),text=f"https://github.com/ceccopierangiolieugenio/pyTermTk", color=TTkColor.fg('#44FFFF', link="https://github.com/ceccopierangiolieugenio/pyTermTk")) TTkWindow.paintEvent(self, canvas) diff --git a/TermTk/TTkWidgets/apptemplate.py b/libs/pyTermTk/TermTk/TTkWidgets/apptemplate.py similarity index 100% rename from TermTk/TTkWidgets/apptemplate.py rename to libs/pyTermTk/TermTk/TTkWidgets/apptemplate.py diff --git a/TermTk/TTkWidgets/button.py b/libs/pyTermTk/TermTk/TTkWidgets/button.py similarity index 100% rename from TermTk/TTkWidgets/button.py rename to libs/pyTermTk/TermTk/TTkWidgets/button.py diff --git a/TermTk/TTkWidgets/checkbox.py b/libs/pyTermTk/TermTk/TTkWidgets/checkbox.py similarity index 100% rename from TermTk/TTkWidgets/checkbox.py rename to libs/pyTermTk/TermTk/TTkWidgets/checkbox.py diff --git a/TermTk/TTkWidgets/combobox.py b/libs/pyTermTk/TermTk/TTkWidgets/combobox.py similarity index 100% rename from TermTk/TTkWidgets/combobox.py rename to libs/pyTermTk/TermTk/TTkWidgets/combobox.py diff --git a/TermTk/TTkWidgets/container.py b/libs/pyTermTk/TermTk/TTkWidgets/container.py similarity index 100% rename from TermTk/TTkWidgets/container.py rename to libs/pyTermTk/TermTk/TTkWidgets/container.py diff --git a/TermTk/TTkWidgets/frame.py b/libs/pyTermTk/TermTk/TTkWidgets/frame.py similarity index 100% rename from TermTk/TTkWidgets/frame.py rename to libs/pyTermTk/TermTk/TTkWidgets/frame.py diff --git a/TermTk/TTkWidgets/graph.py b/libs/pyTermTk/TermTk/TTkWidgets/graph.py similarity index 100% rename from TermTk/TTkWidgets/graph.py rename to libs/pyTermTk/TermTk/TTkWidgets/graph.py diff --git a/TermTk/TTkWidgets/image.py b/libs/pyTermTk/TermTk/TTkWidgets/image.py similarity index 100% rename from TermTk/TTkWidgets/image.py rename to libs/pyTermTk/TermTk/TTkWidgets/image.py diff --git a/TermTk/TTkWidgets/kodetab.py b/libs/pyTermTk/TermTk/TTkWidgets/kodetab.py similarity index 100% rename from TermTk/TTkWidgets/kodetab.py rename to libs/pyTermTk/TermTk/TTkWidgets/kodetab.py diff --git a/TermTk/TTkWidgets/label.py b/libs/pyTermTk/TermTk/TTkWidgets/label.py similarity index 100% rename from TermTk/TTkWidgets/label.py rename to libs/pyTermTk/TermTk/TTkWidgets/label.py diff --git a/TermTk/TTkWidgets/lineedit.py b/libs/pyTermTk/TermTk/TTkWidgets/lineedit.py similarity index 100% rename from TermTk/TTkWidgets/lineedit.py rename to libs/pyTermTk/TermTk/TTkWidgets/lineedit.py diff --git a/TermTk/TTkWidgets/list_.py b/libs/pyTermTk/TermTk/TTkWidgets/list_.py similarity index 100% rename from TermTk/TTkWidgets/list_.py rename to libs/pyTermTk/TermTk/TTkWidgets/list_.py diff --git a/TermTk/TTkWidgets/listwidget.py b/libs/pyTermTk/TermTk/TTkWidgets/listwidget.py similarity index 100% rename from TermTk/TTkWidgets/listwidget.py rename to libs/pyTermTk/TermTk/TTkWidgets/listwidget.py diff --git a/TermTk/TTkWidgets/menu.py b/libs/pyTermTk/TermTk/TTkWidgets/menu.py similarity index 100% rename from TermTk/TTkWidgets/menu.py rename to libs/pyTermTk/TermTk/TTkWidgets/menu.py diff --git a/TermTk/TTkWidgets/menubar.py b/libs/pyTermTk/TermTk/TTkWidgets/menubar.py similarity index 100% rename from TermTk/TTkWidgets/menubar.py rename to libs/pyTermTk/TermTk/TTkWidgets/menubar.py diff --git a/TermTk/TTkWidgets/radiobutton.py b/libs/pyTermTk/TermTk/TTkWidgets/radiobutton.py similarity index 100% rename from TermTk/TTkWidgets/radiobutton.py rename to libs/pyTermTk/TermTk/TTkWidgets/radiobutton.py diff --git a/TermTk/TTkWidgets/resizableframe.py b/libs/pyTermTk/TermTk/TTkWidgets/resizableframe.py similarity index 100% rename from TermTk/TTkWidgets/resizableframe.py rename to libs/pyTermTk/TermTk/TTkWidgets/resizableframe.py diff --git a/TermTk/TTkWidgets/scrollarea.py b/libs/pyTermTk/TermTk/TTkWidgets/scrollarea.py similarity index 100% rename from TermTk/TTkWidgets/scrollarea.py rename to libs/pyTermTk/TermTk/TTkWidgets/scrollarea.py diff --git a/TermTk/TTkWidgets/scrollbar.py b/libs/pyTermTk/TermTk/TTkWidgets/scrollbar.py similarity index 100% rename from TermTk/TTkWidgets/scrollbar.py rename to libs/pyTermTk/TermTk/TTkWidgets/scrollbar.py diff --git a/TermTk/TTkWidgets/slider.py b/libs/pyTermTk/TermTk/TTkWidgets/slider.py similarity index 100% rename from TermTk/TTkWidgets/slider.py rename to libs/pyTermTk/TermTk/TTkWidgets/slider.py diff --git a/TermTk/TTkWidgets/spacer.py b/libs/pyTermTk/TermTk/TTkWidgets/spacer.py similarity index 100% rename from TermTk/TTkWidgets/spacer.py rename to libs/pyTermTk/TermTk/TTkWidgets/spacer.py diff --git a/TermTk/TTkWidgets/spinbox.py b/libs/pyTermTk/TermTk/TTkWidgets/spinbox.py similarity index 100% rename from TermTk/TTkWidgets/spinbox.py rename to libs/pyTermTk/TermTk/TTkWidgets/spinbox.py diff --git a/TermTk/TTkWidgets/splitter.py b/libs/pyTermTk/TermTk/TTkWidgets/splitter.py similarity index 100% rename from TermTk/TTkWidgets/splitter.py rename to libs/pyTermTk/TermTk/TTkWidgets/splitter.py diff --git a/TermTk/TTkWidgets/tabwidget.py b/libs/pyTermTk/TermTk/TTkWidgets/tabwidget.py similarity index 100% rename from TermTk/TTkWidgets/tabwidget.py rename to libs/pyTermTk/TermTk/TTkWidgets/tabwidget.py diff --git a/TermTk/TTkWidgets/texedit.py b/libs/pyTermTk/TermTk/TTkWidgets/texedit.py similarity index 100% rename from TermTk/TTkWidgets/texedit.py rename to libs/pyTermTk/TermTk/TTkWidgets/texedit.py diff --git a/TermTk/TTkWidgets/widget.py b/libs/pyTermTk/TermTk/TTkWidgets/widget.py similarity index 100% rename from TermTk/TTkWidgets/widget.py rename to libs/pyTermTk/TermTk/TTkWidgets/widget.py diff --git a/TermTk/TTkWidgets/window.py b/libs/pyTermTk/TermTk/TTkWidgets/window.py similarity index 100% rename from TermTk/TTkWidgets/window.py rename to libs/pyTermTk/TermTk/TTkWidgets/window.py diff --git a/apps/dumbPaintTool.py b/libs/pyTermTk/TermTk/__init__.py old mode 100755 new mode 100644 similarity index 72% rename from apps/dumbPaintTool.py rename to libs/pyTermTk/TermTk/__init__.py index 6782a129..f00bdcb0 --- a/apps/dumbPaintTool.py +++ b/libs/pyTermTk/TermTk/__init__.py @@ -1,7 +1,6 @@ -#!/usr/bin/env python3 # MIT License # -# Copyright (c) 2023 Eugenio Parodi +# Copyright (c) 2021 Eugenio Parodi # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,10 +20,17 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -import sys,os -sys.path.append(os.path.join(sys.path[0],'..')) +__version__:str = "0.41.11-a.6" -from dumbPaintTool.app import main +from .TTkCore import * +from .TTkTheme import * +from .TTkGui import * +from .TTkWidgets import * +from .TTkTypes import * +from .TTkLayouts import * +from .TTkTestWidgets import * +from .TTkAbstract import * +from .TTkUiTools import * +from .TTkCrossTools import * -if __name__ == '__main__': - main() \ No newline at end of file +TTkCfg.theme = TTkTheme() diff --git a/libs/pyTermTk/pyproject.toml b/libs/pyTermTk/pyproject.toml new file mode 100644 index 00000000..45404780 --- /dev/null +++ b/libs/pyTermTk/pyproject.toml @@ -0,0 +1,36 @@ +[build-system] +requires = ["setuptools>=42", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "pyTermTk" +dynamic = ["version", "readme"] +description = "Python Terminal Toolkit" +requires-python = ">=3.9" +license = { text = "MIT License" } +authors = [ + { name = "Eugenio Parodi", email = "ceccopierangiolieugenio@googlemail.com" } +] +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Development Status :: 3 - Alpha", + "Environment :: Console", + "Intended Audience :: Education", + "Intended Audience :: Developers", + "Intended Audience :: Information Technology", + "Topic :: Terminals", + "Topic :: Text Editors :: Text Processing", + "Topic :: Software Development :: User Interfaces", + "Topic :: Software Development :: Libraries", + "Topic :: Software Development :: Libraries :: Python Modules", + "Topic :: Software Development :: Libraries :: Application Frameworks" +] + +[tool.setuptools.packages.find] +where = ["."] + +[tool.setuptools.dynamic] +version = {attr = "TermTk.__version__"} +readme = {file = ["README.md", "CHANGELOG.md"]} \ No newline at end of file diff --git a/run.dumbPaintTool.sh b/run.dumbPaintTool.sh index 3be613d4..d7d013a6 100755 --- a/run.dumbPaintTool.sh +++ b/run.dumbPaintTool.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -PYTHONPATH=$(pwd)/apps python3 -m dumbPaintTool $@ \ No newline at end of file +PYTHONPATH=$(pwd)/apps/dumbPaintTool python3 -m dumbPaintTool $@ \ No newline at end of file diff --git a/run.ttkDesigner.sh b/run.ttkDesigner.sh index 9b1b3d0e..6e913fcd 100755 --- a/run.ttkDesigner.sh +++ b/run.ttkDesigner.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -PYTHONPATH=$(pwd)/apps python3 -m ttkDesigner $@ \ No newline at end of file +PYTHONPATH=$(pwd)/apps/ttkDesigner python3 -m ttkDesigner $@ \ No newline at end of file diff --git a/setup.dumbPaintTool.py b/setup.dumbPaintTool.py deleted file mode 100644 index 4879d9d7..00000000 --- a/setup.dumbPaintTool.py +++ /dev/null @@ -1,54 +0,0 @@ -from setuptools import setup - -with open("README.md", "r", encoding="utf-8") as fh: - long_description = fh.read() - -version = "__VERSION__" -name = "__NAME__" - -print(f"Version: {version}") -print(f"Name: {name}") - -setup( - name=name, - version=version, - author='Eugenio Parodi', - author_email='ceccopierangiolieugenio@googlemail.com', - description='the Dumb Paint Tool is a Terminal ASCII Photoshop', - long_description=long_description, - long_description_content_type="text/markdown", - url="https://github.com/ceccopierangiolieugenio/pyTermTk/tree/main/apps/dumbPaintTool", - classifiers=[ - # https://pypi.org/classifiers/ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", - "Development Status :: 3 - Alpha", - "Environment :: Console", - "Intended Audience :: Education", - "Intended Audience :: Developers", - "Intended Audience :: Information Technology", - "Topic :: Terminals", - "Topic :: Text Editors :: Text Processing", - "Topic :: Multimedia :: Graphics", - "Topic :: Multimedia :: Graphics :: Editors", - "Topic :: Multimedia :: Graphics :: Editors :: Raster-Based", - "Topic :: Multimedia :: Graphics :: Graphics Conversion", - "Topic :: Software Development :: User Interfaces", - "Topic :: Software Development :: Libraries", - "Topic :: Software Development :: Libraries :: Python Modules", - "Topic :: Software Development :: Libraries :: Application Frameworks"], - include_package_data=False, - packages=['dumbPaintTool','dumbPaintTool.app','dumbPaintTool.app.filters','dumbPaintTool.app.state'], - package_data={'dumbPaintTool': ['tui/*']}, - python_requires=">=3.9", - install_requires=[ - 'pyTermTk>="0.41.11-a.0"', - 'pyperclip', - 'Pillow'], - entry_points={ - 'console_scripts': [ - 'dumbPaintTool = dumbPaintTool:main', - ], - }, -) diff --git a/setup.py b/setup.py deleted file mode 100644 index 856a8527..00000000 --- a/setup.py +++ /dev/null @@ -1,43 +0,0 @@ -import setuptools, os -from TermTk import version - -with open("README.md", "r", encoding="utf-8") as fh: - long_description = fh.read() - -_name="pyTermTk" -_version=version - -print(f"Name: {_name}") -print(f"Version: {_version}") - -setuptools.setup( - name=_name, - version=_version, - author='Eugenio Parodi', - author_email='ceccopierangiolieugenio@googlemail.com', - description='Python Terminal Toolkit', - long_description=long_description, - long_description_content_type="text/markdown", - url="https://github.com/ceccopierangiolieugenio/pyTermTk", - classifiers=[ - # https://pypi.org/classifiers/ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", - "Development Status :: 3 - Alpha", - "Environment :: Console", - "Intended Audience :: Education", - "Intended Audience :: Developers", - "Intended Audience :: Information Technology", - "Topic :: Terminals", - "Topic :: Text Editors :: Text Processing", - "Topic :: Software Development :: User Interfaces", - "Topic :: Software Development :: Libraries", - "Topic :: Software Development :: Libraries", - "Topic :: Software Development :: Libraries :: Python Modules", - "Topic :: Software Development :: Libraries :: Application Frameworks"], - # packages=setuptools.find_packages(), - packages = setuptools.find_packages(where="."), - package_dir = {"":"."}, - python_requires=">=3.9", -) diff --git a/setup.ttkDesigner.py b/setup.ttkDesigner.py deleted file mode 100644 index 8520acfc..00000000 --- a/setup.ttkDesigner.py +++ /dev/null @@ -1,50 +0,0 @@ -from setuptools import setup - -with open("README.md", "r", encoding="utf-8") as fh: - long_description = fh.read() - -version = "__VERSION__" -name = "__NAME__" - -print(f"Version: {version}") -print(f"Name: {name}") - -setup( - name=name, - version=version, - author='Eugenio Parodi', - author_email='ceccopierangiolieugenio@googlemail.com', - description='ttkDesigner is a terminal user interface designer for pyTermTk applications', - long_description=long_description, - long_description_content_type="text/markdown", - url="https://github.com/ceccopierangiolieugenio/pyTermTk/tree/main/apps/ttkDesigner", - classifiers=[ - # https://pypi.org/classifiers/ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", - "Development Status :: 3 - Alpha", - "Environment :: Console", - "Intended Audience :: Education", - "Intended Audience :: Developers", - "Intended Audience :: Information Technology", - "Topic :: Terminals", - "Topic :: Text Editors :: Text Processing", - "Topic :: Software Development :: User Interfaces", - "Topic :: Software Development :: Libraries", - "Topic :: Software Development :: Libraries :: Python Modules", - "Topic :: Software Development :: Libraries :: Application Frameworks"], - include_package_data=False, - packages=['ttkDesigner','ttkDesigner.app', 'ttkDesigner.app.superobj'], - package_data={'ttkDesigner': ['tui/*']}, - python_requires=">=3.9", - install_requires=[ - 'pyTermTk>="0.41.11-a.0"', - 'pyperclip', - 'Pillow'], - entry_points={ - 'console_scripts': [ - 'ttkDesigner = ttkDesigner:main', - ], - }, -)