split up taskfiles

add azure builds

CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -   [ ] 
 
+## [1.9.8] - 2025-01-22
+
+### Changed
+
+-   vm-compact config dirs now override _internal/configs (if using build from releases). See [TOML Files](https://github.com/onyx-and-iris/voicemeeter-compact?tab=readme-ov-file#toml-files) section in README.
+-   after disconnecting from a vban connection, vban menus are re-enabled after 500ms.
+
 ## [1.9.5] - 2024-07-03
 
 ### Changed

README.md

@@ -139,13 +139,13 @@ A valid `vban.toml` might look like this:
 ```toml
 [connection-1]
 kind = 'banana'
-ip = '192.168.1.2'
+host = '192.168.1.2'
 streamname = 'worklaptop'
 port = 6980
 
 [connection-2]
 kind = 'potato'
-ip = '192.168.1.3'
+host = '192.168.1.3'
 streamname = 'streampc'
 port = 6990
 ```

Taskfile.azure.yml

@@ -0,0 +1,40 @@
+version: '3'
+
+tasks:
+  build:
+    desc: Build Azure artifacts
+    deps: [rewrite]
+    cmds:
+      - defer: { task: restore }
+      - for:
+          matrix:
+            KIND: [basic, banana, potato]
+            THEME: [azure-light, azure-dark]
+        cmd: poetry run pyinstaller --noconfirm --distpath dist/{{.ITEM.THEME}}-{{.ITEM.KIND}} spec/azure/{{.ITEM.THEME}}-{{.ITEM.KIND}}.spec
+
+  rewrite:
+    internal: true
+    desc: Run the source code rewriter
+    cmds:
+      - poetry run python tools/rewriter.py --rewrite --theme {{.THEME}}
+
+  restore:
+    internal: true
+    desc: Restore the backup files
+    cmds:
+      - poetry run python tools/rewriter.py --restore
+
+  compress:
+    desc: Compress Azure artifacts
+    cmds:
+      - for:
+          matrix:
+            KIND: [basic, banana, potato]
+            THEME: [azure-light, azure-dark]
+        cmd: '{{.SHELL}} -Command "Compress-Archive -Path dist/{{.ITEM.THEME}}-{{.ITEM.KIND}} -DestinationPath dist/{{.ITEM.THEME}}-{{.ITEM.KIND}}.zip -Force"'
+
+  clean:
+    desc: Clean build and dist directories
+    cmds:
+      - |
+        {{.SHELL}} -Command "Remove-Item -Path build/azure-*,dist/azure-* -Recurse -Force"

Taskfile.forest.yml

@@ -0,0 +1,40 @@
+version: '3'
+
+tasks:
+  build:
+    desc: Build Forest artifacts
+    deps: [rewrite]
+    cmds:
+      - defer: { task: restore }
+      - for:
+          matrix:
+            KIND: [basic, banana, potato]
+            THEME: [forest-light, forest-dark]
+        cmd: poetry run pyinstaller --noconfirm --distpath dist/{{.ITEM.THEME}}-{{.ITEM.KIND}} spec/forest/{{.ITEM.THEME}}-{{.ITEM.KIND}}.spec
+
+  rewrite:
+    internal: true
+    desc: Run the source code rewriter
+    cmds:
+      - poetry run python tools/rewriter.py --rewrite --theme {{.THEME}}
+
+  restore:
+    internal: true
+    desc: Restore the backup files
+    cmds:
+      - poetry run python tools/rewriter.py --restore
+
+  compress:
+    desc: Compress Forest artifacts
+    cmds:
+      - for:
+          matrix:
+            KIND: [basic, banana, potato]
+            THEME: [forest-light, forest-dark]
+        cmd: '{{.SHELL}} -Command "Compress-Archive -Path dist/{{.ITEM.THEME}}-{{.ITEM.KIND}} -DestinationPath dist/{{.ITEM.THEME}}-{{.ITEM.KIND}}.zip -Force"'
+
+  clean:
+    desc: Clean build and dist directories
+    cmds:
+      - |
+        {{.SHELL}} -Command "Remove-Item -Path build/forest-*,dist/forest-* -Recurse -Force"

Taskfile.sunvalley.yml

@@ -0,0 +1,24 @@
+version: '3'
+
+tasks:
+  build:
+    desc: Build Sunvalley artifacts
+    cmds:
+      - for:
+          matrix:
+            KIND: [basic, banana, potato]
+        cmd: poetry run pyinstaller --noconfirm --distpath dist/sunvalley-{{.ITEM.KIND}} spec/sunvalley/sunvalley-{{.ITEM.KIND}}.spec
+
+  compress:
+    desc: Compress Sunvalley artifacts
+    cmds:
+      - for:
+          matrix:
+            KIND: [basic, banana, potato]
+        cmd: '{{.SHELL}} -Command "Compress-Archive -Path dist/sunvalley-{{.ITEM.KIND}} -DestinationPath dist/sunvalley-{{.ITEM.KIND}}.zip -Force"'
+
+  clean:
+    desc: Clean build and dist directories
+    cmds:
+      - |
+        {{.SHELL}} -Command "Remove-Item -Path build/sunvalley-*,dist/sunvalley-* -Recurse -Force"

Taskfile.yml

@@ -0,0 +1,55 @@
+version: '3'
+
+includes:
+  sunvalley:
+    taskfile: ./Taskfile.sunvalley.yml
+    vars:
+      THEME: sunvalley
+  forest:
+    taskfile: ./Taskfile.forest.yml
+    vars:
+      THEME: forest
+  azure:
+    taskfile: ./Taskfile.azure.yml
+    vars:
+      THEME: azure
+
+vars:
+  SHELL: pwsh
+
+tasks:
+  default:
+    desc: Prepare artifacts for release
+    cmds:
+      - task: release
+
+  release:
+    desc: Build and compress all artifacts
+    cmds:
+      - task: build
+      - task: compress
+      - echo "Release complete"
+
+  build:
+    desc: Build all artifacts
+    cmds:
+      - for:
+          matrix:
+            THEME: [sunvalley, forest, azure]
+        task: '{{.ITEM.THEME}}:build'
+
+  compress:
+    desc: Compress all artifacts
+    cmds:
+      - for:
+          matrix:
+            THEME: [sunvalley, forest, azure]
+        task: '{{.ITEM.THEME}}:compress'
+
+  clean:
+    desc: Clean up build and dist directories
+    cmds:
+      - for:
+          matrix:
+            THEME: [sunvalley, forest, azure]
+        task: '{{.ITEM.THEME}}:clean'

build.ps1

@@ -1,41 +0,0 @@
-param(
-    [Parameter(Mandatory = $true)]
-    [string]$prefix,
-    [string]$theme
-)
-
-function Format-SpecName {
-    param(
-        [string]$Kind
-    )
-    return @(
-        $prefix,
-        (& { if ($theme) { $theme } else { "" } }),
-        $Kind
-    ).Where({ $_ -ne "" }) -Join "_"
-}
-
-function Compress-Builds {
-    $target = Join-Path -Path $PSScriptRoot -ChildPath "dist"
-    @("basic", "banana", "potato") | ForEach-Object {
-        $compressPath = Format-SpecName -Kind $_
-        Compress-Archive -Path (Join-Path -Path $target -ChildPath $compressPath) -DestinationPath (Join-Path -Path $target -ChildPath "${compressPath}.zip") -Force
-    } 
-}
-
-function Get-Builds {
-    @("basic", "banana", "potato") | ForEach-Object {
-        $specName = Format-SpecName -Kind $_
-
-        Write-Host "building $specName"
-
-        poetry run pyinstaller --noconfirm --distpath (Join-Path -Path "dist" -ChildPath $specName) (Join-Path -Path "spec" -ChildPath "${specName}.spec")
-    }
-}
-
-function main {
-    Get-Builds
-    Compress-Builds
-}
-
-if ($MyInvocation.InvocationName -ne '.') { main }

configs/app.toml

@@ -1,10 +1,9 @@
 # load a specific profile on start (file name without .toml ext)
 # [configs]
 # config="example"
-# load with themes enabled? set the default mode
+# load with themes enabled?
 [theme]
 enabled = true
-mode = "light"
 # load in extended mode? if so which orientation
 [extends]
 extended = true
@@ -22,4 +21,4 @@ size = 3
 default = 0
 # show the navigation frame?
 [navigation]
-show = true
+show = false

configs/vban.toml

@@ -2,12 +2,12 @@
 ### set the ip then uncomment
 # [connection-1]
 # kind = 'banana'
-# ip = '<ip address 1>'
+# ip = 'localhost'
 # streamname = 'Command1'
 # port = 6980
 
 # [connection-2]
 # kind = 'potato'
-# ip = '<ip address 2>'
+# ip = 'gamepc.local'
 # streamname = 'Command1'
 # port = 6980

poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.0.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.3.2 and should not be changed by hand.
 
 [[package]]
 name = "altgraph"
@@ -147,24 +147,24 @@ files = [
 
 [[package]]
 name = "setuptools"
-version = "75.8.0"
+version = "78.1.1"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 optional = false
 python-versions = ">=3.9"
 groups = ["build"]
 files = [
-    {file = "setuptools-75.8.0-py3-none-any.whl", hash = "sha256:e3982f444617239225d675215d51f6ba05f845d4eec313da4418fdbb56fb27e3"},
-    {file = "setuptools-75.8.0.tar.gz", hash = "sha256:c5afc8f407c626b8313a86e10311dd3f661c6cd9c09d4bf8c15c0e11f9f2b0e6"},
+    {file = "setuptools-78.1.1-py3-none-any.whl", hash = "sha256:c3a9c4211ff4c309edb8b8c4f1cbfa7ae324c4ba9f91ff254e3d305b9fd54561"},
+    {file = "setuptools-78.1.1.tar.gz", hash = "sha256:fcc17fd9cd898242f6b4adfaca46137a9edef687f43e6f78469692a5e70d851d"},
 ]
 
 [package.extras]
-check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.8.0)"]
-core = ["importlib_metadata (>=6)", "jaraco.collections", "jaraco.functools (>=4)", "jaraco.text (>=3.7)", "more_itertools", "more_itertools (>=8.8)", "packaging", "packaging (>=24.2)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\"", "ruff (>=0.8.0) ; sys_platform != \"cygwin\""]
+core = ["importlib_metadata (>=6) ; python_version < \"3.10\"", "jaraco.functools (>=4)", "jaraco.text (>=3.7)", "more_itertools", "more_itertools (>=8.8)", "packaging (>=24.2)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1) ; python_version < \"3.11\"", "wheel (>=0.43.0)"]
 cover = ["pytest-cov"]
 doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
 enabler = ["pytest-enabler (>=2.2)"]
-test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.7.2)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
-type = ["importlib_metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.14.*)", "pytest-mypy"]
+test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21) ; python_version >= \"3.9\" and sys_platform != \"cygwin\"", "jaraco.envs (>=2.2)", "jaraco.path (>=3.7.2)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf ; sys_platform != \"cygwin\"", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
+type = ["importlib_metadata (>=7.0.2) ; python_version < \"3.10\"", "jaraco.develop (>=7.21) ; sys_platform != \"cygwin\"", "mypy (==1.14.*)", "pytest-mypy"]
 
 [[package]]
 name = "sv-ttk"
@@ -184,8 +184,8 @@ version = "2.2.1"
 description = "A lil' TOML parser"
 optional = false
 python-versions = ">=3.8"
-groups = ["main"]
-markers = "python_version < \"3.11\""
+groups = ["main", "dev"]
+markers = "python_version == \"3.10\""
 files = [
     {file = "tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249"},
     {file = "tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6"},
@@ -223,35 +223,39 @@ files = [
 
 [[package]]
 name = "vban-cmd"
-version = "2.5.0"
+version = "2.10.1"
 description = "Python interface for the VBAN RT Packet Service (Sendtext)"
 optional = false
 python-versions = ">=3.10"
-groups = ["main"]
-files = [
-    {file = "vban_cmd-2.5.0-py3-none-any.whl", hash = "sha256:22a19037066487d464a61941a3b85a0331b498a9efb1bcacdc932e9d06c5bf87"},
-    {file = "vban_cmd-2.5.0.tar.gz", hash = "sha256:691a852e5052e50103839b06a0a9d0746b90df3346545c2cf4f10b099d9666e4"},
-]
+groups = ["main", "dev"]
+files = []
+develop = true
 
 [package.dependencies]
 tomli = {version = ">=2.0.1,<3.0", markers = "python_version < \"3.11\""}
 
+[package.source]
+type = "directory"
+url = "../vban-cmd-python"
+
 [[package]]
 name = "voicemeeter-api"
-version = "2.6.1"
+version = "2.7.2"
 description = "A Python wrapper for the Voiceemeter API"
 optional = false
-python-versions = "<4.0,>=3.10"
-groups = ["main"]
-files = [
-    {file = "voicemeeter_api-2.6.1-py3-none-any.whl", hash = "sha256:8ae3bce0f9ad6bbad78f2f69f522b6fb2e229d314918a075ad83d4009aff7020"},
-    {file = "voicemeeter_api-2.6.1.tar.gz", hash = "sha256:34d8672603ec66197f2d61fd8f038f46d8451759c81fbe222b00e7d3ccccd1f5"},
-]
+python-versions = ">=3.10"
+groups = ["main", "dev"]
+files = []
+develop = true
 
 [package.dependencies]
 tomli = {version = ">=2.0.1,<3.0", markers = "python_version < \"3.11\""}
 
+[package.source]
+type = "directory"
+url = "../voicemeeter-api-python"
+
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10,<3.14"
-content-hash = "19c384acd36868a5bfdc3f3173f444858136603694c3f1134c0d30cd17157651"
+content-hash = "171da15ce55f47b4e651aade40ab21afd5ef589ff7ff26e51caf6840d25b98a1"

pyproject.toml

@@ -2,33 +2,33 @@
 name = "voicemeeter-compact"
 version = "1.9.8"
 description = "A Compact Voicemeeter Remote App"
-authors = [
-    {name = "Onyx and Iris",email = "code@onyxandiris.online"}
-]
-license = {text = "MIT"}
+authors = [{ name = "Onyx and Iris", email = "code@onyxandiris.online" }]
+license = { text = "MIT" }
 readme = "README.md"
 requires-python = ">=3.10,<3.14"
 dependencies = [
-    "voicemeeter-api (>=2.6.1,<3.0.0)",
-    "vban-cmd (>=2.5.0,<3.0.0)",
+    "voicemeeter-api (>=2.7.2,<3.0.0)",
+    "vban-cmd (>=2.10.1,<3.0.0)",
     "sv-ttk (>=2.6.0,<3.0.0)",
     "tomli (>=2.0.1,<3.0) ; python_version < '3.11'",
 ]
 
 [project.scripts]
-gui-basic = "vmcompact.gui.basic:run"
-gui-banana = "vmcompact.gui.banana:run"
-gui-potato = "vmcompact.gui.potato:run"
+gui-basic-compact = "vmcompact.gui.basic:run"
+gui-banana-compact = "vmcompact.gui.banana:run"
+gui-potato-compact = "vmcompact.gui.potato:run"
 
 [tool.poetry]
 packages = [{ include = "vmcompact" }]
 include = ["vmcompact/img/cat.ico"]
 
 [tool.poetry.requires-plugins]
-poethepoet = "^0.32.1"
+poethepoet = ">=0.42.0"
 
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.9.1"
+voicemeeter-api = { path = "../voicemeeter-api-python/", develop = true }
+vban-cmd = { path = "../vban-cmd-python/", develop = true }
 
 [tool.poetry.group.build.dependencies]
 pyinstaller = "^6.11.1"
@@ -38,9 +38,14 @@ requires = ["poetry-core>=2.0.0,<3.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poe.tasks]
-build_sunvalley.script = "scripts:build_sunvalley"
-build_forest.script = "scripts:build_forest"
-build_all.script = "scripts:build_all"
+build-sunvalley = "task build-sunvalley"
+build-forest = "task build-forest"
+release = [
+    { ref = "build-sunvalley" },
+    { ref = "build-forest" },
+    { cmd = "task compress-sunvalley" },
+    { cmd = "task compress-forest" },
+]
 
 [tool.ruff]
 exclude = [
@@ -120,7 +125,4 @@ docstring-code-line-length = "dynamic"
 max-complexity = 10
 
 [tool.ruff.lint.per-file-ignores]
-"__init__.py" = [
-    "E402",
-    "F401",
-]
+"__init__.py" = ["E402", "F401"]

scripts.py

@@ -1,24 +0,0 @@
-import subprocess
-import sys
-from pathlib import Path
-
-
-def build_sunvalley():
-    buildscript = Path.cwd() / "build.ps1"
-    subprocess.run(["powershell", str(buildscript), "sv"])
-
-
-def build_forest():
-    rewriter = Path.cwd() / "tools" / "rewriter.py"
-    subprocess.run([sys.executable, str(rewriter), "-r"])
-
-    buildscript = Path.cwd() / "build.ps1"
-    for theme in ("light", "dark"):
-        subprocess.run(["powershell", str(buildscript), "fst", theme])
-
-    subprocess.run([sys.executable, str(rewriter), "-c"])
-
-
-def build_all():
-    steps = (build_sunvalley, build_forest)
-    [step() for step in steps]

tools/rewriter.py

@@ -4,11 +4,11 @@ from pathlib import Path
 
 logging.basicConfig(level=logging.DEBUG)
 
-logger = logging.getLogger("vm-compact-rewriter")
+logger = logging.getLogger('vm-compact-rewriter')
 
-PACKAGE_DIR = Path(__file__).parent.parent / "vmcompact"
+PACKAGE_DIR = Path(__file__).parent.parent / 'vmcompact'
 
-SRC_DIR = Path(__file__).parent / "src"
+SRC_DIR = Path(__file__).parent / 'src'
 
 
 def write_outs(output, outs: tuple):
@@ -16,235 +16,256 @@ def write_outs(output, outs: tuple):
         output.write(out)
 
 
-def rewrite_app():
-    app_logger = logger.getChild("app")
-    app_logger.info("rewriting app.py")
-    infile = Path(SRC_DIR) / "app.bk"
-    outfile = Path(PACKAGE_DIR) / "app.py"
-    with open(infile, "r") as input:
-        with open(outfile, "w") as output:
+def rewrite_app(theme):
+    app_logger = logger.getChild('app')
+    app_logger.info('rewriting app.py')
+    infile = Path(SRC_DIR) / 'app.bk'
+    outfile = Path(PACKAGE_DIR) / 'app.py'
+    with open(infile, 'r') as input:
+        with open(outfile, 'w') as output:
             for line in input:
                 match line:
                     # App init()
-                    case "    def __init__(self, vmr):\n":
-                        output.write("    def __init__(self, vmr, theme):\n")
-                    case "        self._vmr = vmr\n":
+                    case '    def __init__(self, vmr):\n':
+                        output.write('    def __init__(self, vmr, theme):\n')
+                    case '        self._vmr = vmr\n':
                         write_outs(
                             output,
                             (
-                                "        self._vmr = vmr\n",
-                                "        self._theme = theme\n",
+                                '        self._vmr = vmr\n',
+                                '        self._theme = theme\n',
+                                '        self._theme_name = theme.split("-")[0]\n',
+                                '        self._theme_type = theme.split("-")[-1]\n',
                                 '        tcldir = Path.cwd() / "theme"\n',
-                                "        if not tcldir.is_dir():\n",
+                                '        if not tcldir.is_dir():\n',
                                 '            tcldir = Path.cwd() / "_internal" / "theme"\n',
-                                '        self.tk.call("source", tcldir.resolve() / f"forest-{self._theme}.tcl")\n',
+                                '        match self._theme_name:\n',
+                                '            case "forest":\n',
+                                '                self.tk.call("source", tcldir.resolve() / f"{self._theme}.tcl")\n',
+                                '            case "azure":\n',
+                                '                self.tk.call("source", tcldir.resolve() / f"{self._theme_name}.tcl")\n',
                             ),
                         )
                     # def connect()
-                    case "def connect(kind_id: str, vmr) -> App:\n":
-                        output.write(
-                            'def connect(kind_id: str, vmr, theme="light") -> App:\n'
-                        )
-                    case "    return VMMIN_cls(vmr)\n":
-                        output.write("    return VMMIN_cls(vmr, theme)\n")
+                    case 'def connect(kind_id: str, vmr) -> App:\n':
+                        output.write('def connect(kind_id: str, vmr, theme) -> App:\n')
+                    case '    return VMMIN_cls(vmr)\n':
+                        output.write('    return VMMIN_cls(vmr, theme)\n')
                     case _:
                         output.write(line)
 
 
-def rewrite_builders():
-    builders_logger = logger.getChild("builders")
-    builders_logger.info("rewriting builders.py")
-    infile = Path(SRC_DIR) / "builders.bk"
-    outfile = Path(PACKAGE_DIR) / "builders.py"
-    with open(infile, "r") as input:
-        with open(outfile, "w") as output:
+def rewrite_builders(theme):
+    builders_logger = logger.getChild('builders')
+    builders_logger.info('rewriting builders.py')
+    infile = Path(SRC_DIR) / 'builders.bk'
+    outfile = Path(PACKAGE_DIR) / 'builders.py'
+    with open(infile, 'r') as input:
+        with open(outfile, 'w') as output:
             ignore_next_lines = 0
 
             for line in input:
                 if ignore_next_lines > 0:
-                    builders_logger.info(f"ignoring: {line}")
+                    builders_logger.info(f'ignoring: {line}')
                     ignore_next_lines -= 1
                     continue
 
                 match line:
                     # loading themes
-                    case "import sv_ttk\n":
-                        output.write("#import sv_ttk\n")
-                    case "        self.app.resizable(False, False)\n":
-                        write_outs(
-                            output,
-                            (
-                                "        self.app.resizable(False, False)\n"
-                                "        if _configuration.themes_enabled:\n",
-                                '            ttk.Style().theme_use(f"forest-{self.app._theme}")\n',
-                                '            self.logger.info(f"Forest Theme applied")\n',
-                            ),
-                        )
+                    case 'import sv_ttk\n':
+                        output.write('#import sv_ttk\n')
+                    case '        self.app.resizable(False, False)\n':
+                        if theme.startswith('forest'):
+                            write_outs(
+                                output,
+                                (
+                                    '        self.app.resizable(False, False)\n'
+                                    '        if _configuration.themes_enabled:\n',
+                                    '            ttk.Style().theme_use(self.app._theme)\n',
+                                    '            self.logger.info(f"{self.app._theme} Theme applied")\n',
+                                ),
+                            )
+                        elif theme.startswith('azure'):
+                            write_outs(
+                                output,
+                                (
+                                    '        self.app.resizable(False, False)\n'
+                                    '        if _configuration.themes_enabled:\n',
+                                    '            self.app.tk.call("set_theme", self.app._theme_type)\n',
+                                    '            self.logger.info(f"Azure {self.app._theme_type} Theme applied")\n',
+                                ),
+                            )
                         ignore_next_lines = 6
                     # setting navframe button widths
-                    case "            variable=self.navframe.submix,\n":
+                    case '            variable=self.navframe.submix,\n':
                         write_outs(
                             output,
                             (
-                                "            variable=self.navframe.submix,\n"
-                                "            width=8,\n",
+                                '            variable=self.navframe.submix,\n'
+                                '            width=8,\n',
                             ),
                         )
-                    case "            variable=self.navframe.channel,\n":
+                    case '            variable=self.navframe.channel,\n':
                         write_outs(
                             output,
                             (
-                                "            variable=self.navframe.channel,\n"
-                                "            width=8,\n",
+                                '            variable=self.navframe.channel,\n'
+                                '            width=8,\n',
                             ),
                         )
-                    case "            variable=self.navframe.extend,\n":
+                    case '            variable=self.navframe.extend,\n':
                         write_outs(
                             output,
                             (
-                                "            variable=self.navframe.extend,\n"
-                                "            width=8,\n",
+                                '            variable=self.navframe.extend,\n'
+                                '            width=8,\n',
                             ),
                         )
-                    case "            variable=self.navframe.info,\n":
+                    case '            variable=self.navframe.info,\n':
                         write_outs(
                             output,
                             (
-                                "            variable=self.navframe.info,\n"
-                                "            width=8,\n",
+                                '            variable=self.navframe.info,\n'
+                                '            width=8,\n',
                             ),
                         )
                     # set channelframe button widths
-                    case "            variable=self.labelframe.mute,\n":
+                    case '            variable=self.labelframe.mute,\n':
                         write_outs(
                             output,
                             (
-                                "            variable=self.labelframe.mute,\n"
-                                "            width=7,\n",
+                                '            variable=self.labelframe.mute,\n'
+                                '            width=7,\n',
                             ),
                         )
-                    case "            variable=self.labelframe.conf,\n":
+                    case '            variable=self.labelframe.conf,\n':
                         write_outs(
                             output,
                             (
-                                "            variable=self.labelframe.conf,\n"
-                                "            width=7,\n",
+                                '            variable=self.labelframe.conf,\n'
+                                '            width=7,\n',
                             ),
                         )
-                    case "            variable=self.labelframe.on,\n":
+                    case '            variable=self.labelframe.on,\n':
                         write_outs(
                             output,
                             (
-                                "            variable=self.labelframe.on,\n"
-                                "            width=7,\n",
+                                '            variable=self.labelframe.on,\n'
+                                '            width=7,\n',
                             ),
                         )
                     # set stripconfigframe button widths
-                    case "                    self.configframe.phys_out_params.index(param)\n":
+                    case '                    self.configframe.phys_out_params.index(param)\n':
                         write_outs(
                             output,
                             (
-                                "                    self.configframe.phys_out_params.index(param)\n",
-                                "                ],\n",
-                                "                width=6,\n",
+                                '                    self.configframe.phys_out_params.index(param)\n',
+                                '                ],\n',
+                                '                width=6,\n',
                             ),
                         )
                         ignore_next_lines = 1
-                    case "                    self.configframe.virt_out_params.index(param)\n":
+                    case '                    self.configframe.virt_out_params.index(param)\n':
                         write_outs(
                             output,
                             (
-                                "                    self.configframe.virt_out_params.index(param)\n",
-                                "                ],\n",
-                                "                width=6,\n",
+                                '                    self.configframe.virt_out_params.index(param)\n',
+                                '                ],\n',
+                                '                width=6,\n',
                             ),
                         )
                         ignore_next_lines = 1
                     # This does both strip and bus param vars buttons
-                    case "                variable=self.configframe.param_vars[i],\n":
+                    case '                variable=self.configframe.param_vars[i],\n':
                         write_outs(
                             output,
                             (
-                                "                variable=self.configframe.param_vars[i],\n",
-                                "                width=6,\n",
+                                '                variable=self.configframe.param_vars[i],\n',
+                                '                width=6,\n',
                             ),
                         )
                     case _:
-                        if "Toggle.TButton" in line:
-                            output.write(line.replace("Toggle.TButton", "ToggleButton"))
+                        if 'Toggle.TButton' in line:
+                            if theme.startswith('forest'):
+                                output.write(
+                                    line.replace('Toggle.TButton', 'ToggleButton')
+                                )
+                            elif theme.startswith('azure'):
+                                output.write(
+                                    line.replace(
+                                        'Toggle.TButton', 'Switch.TCheckbutton'
+                                    )
+                                )
                         else:
                             output.write(line)
 
 
-def rewrite_menu():
-    menu_logger = logger.getChild("menu")
-    menu_logger.info("rewriting menu.py")
-    infile = Path(SRC_DIR) / "menu.bk"
-    outfile = Path(PACKAGE_DIR) / "menu.py"
-    with open(infile, "r") as input:
-        with open(outfile, "w") as output:
+def rewrite_menu(theme):
+    menu_logger = logger.getChild('menu')
+    menu_logger.info('rewriting menu.py')
+    infile = Path(SRC_DIR) / 'menu.bk'
+    outfile = Path(PACKAGE_DIR) / 'menu.py'
+    with open(infile, 'r') as input:
+        with open(outfile, 'w') as output:
             ignore_next_lines = 0
 
             for line in input:
                 if ignore_next_lines > 0:
-                    menu_logger.info(f"ignoring: {line}")
+                    menu_logger.info(f'ignoring: {line}')
                     ignore_next_lines -= 1
                     continue
                 match line:
-                    case "import sv_ttk\n":
-                        output.write("#import sv_ttk\n")
-                    case "        # layout/themes\n":
+                    case 'import sv_ttk\n':
+                        output.write('#import sv_ttk\n')
+                    case '        # layout/themes\n':
                         ignore_next_lines = 14
                     case _:
                         output.write(line)
 
 
-def prepare_for_build():
+def prepare_for_build(theme):
     ################# MOVE FILES FROM PACKAGE DIR INTO SRC DIR #########################
     for file in (
-        PACKAGE_DIR / "app.py",
-        PACKAGE_DIR / "builders.py",
-        PACKAGE_DIR / "menu.py",
+        PACKAGE_DIR / 'app.py',
+        PACKAGE_DIR / 'builders.py',
+        PACKAGE_DIR / 'menu.py',
     ):
         if file.exists():
-            logger.debug(f"moving {str(file)}")
-            file.rename(SRC_DIR / f"{file.stem}.bk")
+            logger.debug(f'moving {str(file)}')
+            file.rename(SRC_DIR / f'{file.stem}.bk')
 
     ###################### RUN THE FILE REWRITER FOR EACH *.BK #########################
-    steps = (
-        rewrite_app,
-        rewrite_builders,
-        rewrite_menu,
-    )
-    [step() for step in steps]
+    for step in (rewrite_app, rewrite_builders, rewrite_menu):
+        step(theme)
 
 
 def cleanup():
     ########################## RESTORE *.BK FILES #####################################
     for file in (
-        PACKAGE_DIR / "app.py",
-        PACKAGE_DIR / "builders.py",
-        PACKAGE_DIR / "menu.py",
+        PACKAGE_DIR / 'app.py',
+        PACKAGE_DIR / 'builders.py',
+        PACKAGE_DIR / 'menu.py',
     ):
         file.unlink()
 
     for file in (
-        SRC_DIR / "app.bk",
-        SRC_DIR / "builders.bk",
-        SRC_DIR / "menu.bk",
+        SRC_DIR / 'app.bk',
+        SRC_DIR / 'builders.bk',
+        SRC_DIR / 'menu.bk',
     ):
-        file.rename(PACKAGE_DIR / f"{file.stem}.py")
+        file.rename(PACKAGE_DIR / f'{file.stem}.py')
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     parser = argparse.ArgumentParser()
-    parser.add_argument("-r", "--rewrite", action="store_true")
-    parser.add_argument("-c", "--cleanup", action="store_true")
+    parser.add_argument('--rewrite', action='store_true')
+    parser.add_argument('--theme', type=str, default='forest')
+    parser.add_argument('--restore', action='store_true')
     args = parser.parse_args()
 
     if args.rewrite:
-        logger.info("preparing files for build")
-        prepare_for_build()
-    elif args.cleanup:
-        logger.info("cleaning up files")
+        logger.info('preparing files for build')
+        prepare_for_build(args.theme)
+    elif args.restore:
+        logger.info('cleaning up files')
         cleanup()

vmcompact/builders.py

@@ -227,7 +227,7 @@ class ChannelLabelFrameBuilder(AbstractBuilder):
         """Adds a progress bar widget to a single label frame"""
         self.labelframe.pb = ttk.Progressbar(
             self.labelframe,
-            maximum=72,
+            maximum=72,  # Range: 0 = -60dB, 72 = +12dB (72dB total range)
             orient='vertical',
             mode='determinate',
             variable=self.labelframe.level,
@@ -362,15 +362,15 @@ class StripConfigFrameBuilder(ChannelConfigFrameBuilder):
             tk.BooleanVar() for _ in self.configframe.virt_out_params
         ]
 
-        self.configframe.params = ('mono', 'solo')
-        self.configframe.param_vars = list(
-            tk.BooleanVar() for _ in self.configframe.params
+        self.configframe.bool_params = ('mono', 'solo')
+        self.configframe.bool_param_vars = list(
+            tk.BooleanVar() for _ in self.configframe.bool_params
         )
 
         if self.configframe.parent.kind.name in ('banana', 'potato'):
             if self.configframe.index == self.configframe.phys_in:
                 self.configframe.params = list(
-                    map(lambda x: x.replace('mono', 'mc'), self.configframe.params)
+                    map(lambda x: x.replace('mono', 'mc'), self.configframe.bool_params)
                 )
             if self.configframe.parent.kind.name == 'banana':
                 pass
@@ -388,7 +388,10 @@ class StripConfigFrameBuilder(ChannelConfigFrameBuilder):
                     == self.configframe.phys_in + self.configframe.virt_in - 1
                 ):
                     self.configframe.params = list(
-                        map(lambda x: x.replace('mono', 'mc'), self.configframe.params)
+                        map(
+                            lambda x: x.replace('mono', 'mc'),
+                            self.configframe.bool_params,
+                        )
                     )
 
     def create_comp_slider(self):
@@ -542,9 +545,9 @@ class StripConfigFrameBuilder(ChannelConfigFrameBuilder):
                     self.configframe.pause_updates, self.configframe.toggle_p, param
                 ),
                 style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{param}.TButton"}',
-                variable=self.configframe.param_vars[i],
+                variable=self.configframe.bool_param_vars[i],
             )
-            for i, param in enumerate(self.configframe.params)
+            for i, param in enumerate(self.configframe.bool_params)
         ]
         [
             button.grid(
@@ -574,10 +577,22 @@ class BusConfigFrameBuilder(ChannelConfigFrameBuilder):
             "lfeonly": "LFE Only",
             "rearonly": "Rear Only",
         }
+        self.configframe.bus_mode_map_reverse = {v: k for k, v in self.configframe.bus_mode_map.items()}
         self.configframe.bus_modes = list(self.configframe.bus_mode_map.keys())
         # fmt: on
-        self.configframe.params = ('mono', 'eq.on', 'eq.ab')
-        self.configframe.param_vars = [tk.BooleanVar() for _ in self.configframe.params]
+        self.configframe.int_params = ('mono',)
+        self.configframe.int_param_vars = [
+            tk.IntVar(value=getattr(self.configframe.target, param))
+            for param in self.configframe.int_params
+        ]
+        self.configframe.mono_modes = ['mono: off', 'mono: on', 'stereo reverse']
+        self.configframe.bus_mono_label_text = tk.StringVar(
+            value=self.configframe.mono_modes[self.configframe.target.mono]
+        )
+        self.configframe.bool_params = ('eq.on', 'eq.ab')
+        self.configframe.bool_param_vars = [
+            tk.BooleanVar() for _ in self.configframe.bool_params
+        ]
         self.configframe.bus_mode_label_text = tk.StringVar(
             value=self.configframe.bus_mode_map[self.configframe.current_bus_mode()]
         )
@@ -602,6 +617,20 @@ class BusConfigFrameBuilder(ChannelConfigFrameBuilder):
             ),
         )
 
+    def create_bus_mono_button(self):
+        self.configframe.mono_button = ttk.Button(
+            self.configframe, textvariable=self.configframe.bus_mono_label_text
+        )
+        self.configframe.mono_button.bind(
+            '<Button-1>',
+            partial(self.configframe.pause_updates, self.configframe.rotate_mono_right),
+        )
+        self.configframe.mono_button.bind(
+            '<Button-3>',
+            partial(self.configframe.pause_updates, self.configframe.rotate_mono_left),
+        )
+        self.configframe.mono_button.grid(column=0, row=1, sticky=(tk.W))
+
     def create_param_buttons(self):
         param_buttons = [
             ttk.Checkbutton(
@@ -611,13 +640,13 @@ class BusConfigFrameBuilder(ChannelConfigFrameBuilder):
                     self.configframe.pause_updates, self.configframe.toggle_p, param
                 ),
                 style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{param}.TButton"}',
-                variable=self.configframe.param_vars[i],
+                variable=self.configframe.bool_param_vars[i],
             )
-            for i, param in enumerate(self.configframe.params)
+            for i, param in enumerate(self.configframe.bool_params)
         ]
         [
             button.grid(
-                column=i,
+                column=i + 1,
                 row=1,
             )
             for i, button in enumerate(param_buttons)

vmcompact/channels.py

@@ -197,14 +197,22 @@ class Strip(ChannelLabelFrame):
 
     def upd_levels(self):
         """
-        Updates level values.
+        Updates level values using direct dB values.
         """
         if self.index < self.parent.parent.kind.num_strip:
             if self.target.levels.is_updated:
                 val = max(self.target.levels.prefader)
-                self.level.set(
-                    (0 if self.mute.get() else 72 + val - 12 + self.gain.get())
-                )
+                if val < -72:
+                    if self.level.get() != 0:
+                        self.level.set(0)
+                    return
+                # Convert dB to progressbar: -60dB=0, 0dB=60, +12dB=72
+                if self.mute.get():
+                    level_display = 0
+                else:
+                    level_db = val + self.gain.get()
+                    level_display = max(0, min(72, level_db + 60))
+                self.level.set(level_display)
 
 
 class Bus(ChannelLabelFrame):
@@ -223,9 +231,18 @@ class Bus(ChannelLabelFrame):
 
     def upd_levels(self):
         if self.index < self.parent.parent.kind.num_bus:
-            if self.target.levels.is_updated or self.level.get() != -118:
+            if self.target.levels.is_updated:
                 val = max(self.target.levels.all)
-                self.level.set((0 if self.mute.get() else 72 + val - 12))
+                if val < -72:
+                    if self.level.get() != 0:
+                        self.level.set(0)
+                    return
+                # Convert dB to progressbar: -60dB=0, 0dB=60, +12dB=72
+                if self.mute.get():
+                    level_display = 0
+                else:
+                    level_display = max(0, min(72, val + 60))
+                self.level.set(level_display)
 
 
 class ChannelFrame(ttk.Frame):

vmcompact/config.py

@@ -98,7 +98,7 @@ class Config(ttk.Frame):
         self.slider_vars[self.slider_params.index(param)].set(val)
 
     def toggle_p(self, param):
-        val = self.param_vars[self.params.index(param)].get()
+        val = self.bool_param_vars[self.bool_params.index(param)].get()
         self.setter(param, val)
         if not _configuration.themes_enabled:
             self.styletable.configure(
@@ -177,15 +177,14 @@ class StripConfig(Config):
             for i, param in enumerate(self.virt_out_params)
         ]
         [
-            self.param_vars[i].set(self.getter(param))
-            for i, param in enumerate(self.params)
+            self.bool_param_vars[i].set(self.getter(param))
+            for i, param in enumerate(self.bool_params)
+        ]
+        [
+            self.slider_vars[i].set(self.getter(param))
+            for i, param in enumerate(self.slider_params)
+            if self.index < self.phys_in
         ]
-        if not _base_values.vban_connected:  # slider vars not defined in RT Packet
-            [
-                self.slider_vars[i].set(self.getter(param))
-                for i, param in enumerate(self.slider_params)
-                if self.index < self.phys_in
-            ]
 
         if not _configuration.themes_enabled:
             [
@@ -207,7 +206,7 @@ class StripConfig(Config):
                     f'{param}.TButton',
                     background=f'{"green" if self.param_vars[i].get() else "white"}',
                 )
-                for i, param in enumerate(self.params)
+                for i, param in enumerate(self.bool_params)
             ]
 
 
@@ -238,53 +237,56 @@ class BusConfig(Config):
         self.builder.create_bus_mode_button()
 
     def make_row_1(self):
+        self.builder.create_bus_mono_button()
         self.builder.create_param_buttons()
 
     def current_bus_mode(self):
         return self.target.mode.get()
 
     def rotate_bus_modes_right(self, *args):
-        current_mode = self.current_bus_mode()
-        next = self.bus_modes.index(current_mode) + 1
-        if next < len(self.bus_modes):
-            setattr(
-                self.target.mode,
-                self.bus_modes[next],
-                True,
-            )
-            self.bus_mode_label_text.set(self.bus_mode_map[self.bus_modes[next]])
-        else:
-            self.target.mode.normal = True
-            self.bus_mode_label_text.set('Normal')
+        current_mode = self.bus_mode_map_reverse[self.bus_mode_label_text.get()]
+        current_index = self.bus_modes.index(current_mode)
+        next_index = (current_index + 1) % len(self.bus_modes)
+        next_mode = self.bus_modes[next_index]
+
+        setattr(self.target.mode, next_mode, True)
+        self.bus_mode_label_text.set(self.bus_mode_map[next_mode])
 
     def rotate_bus_modes_left(self, *args):
-        current_mode = self.current_bus_mode()
-        prev = self.bus_modes.index(current_mode) - 1
-        if prev < 0:
-            self.target.mode.rearonly = True
-            self.bus_mode_label_text.set('Rear Only')
-        else:
-            setattr(
-                self.target.mode,
-                self.bus_modes[prev],
-                True,
-            )
-            self.bus_mode_label_text.set(self.bus_mode_map[self.bus_modes[prev]])
+        current_mode = self.bus_mode_map_reverse[self.bus_mode_label_text.get()]
+        current_index = self.bus_modes.index(current_mode)
+        prev_index = (current_index - 1) % len(self.bus_modes)
+        prev_mode = self.bus_modes[prev_index]
+
+        setattr(self.target.mode, prev_mode, True)
+        self.bus_mode_label_text.set(self.bus_mode_map[prev_mode])
+
+    def rotate_mono_right(self, *args):
+        current_val = self.mono_modes.index(self.bus_mono_label_text.get())
+        next_val = (current_val + 1) % 3
+        self.bus_mono_label_text.set(self.mono_modes[next_val])
+        self.setter('mono', next_val)
+
+    def rotate_mono_left(self, *args):
+        current_val = self.mono_modes.index(self.bus_mono_label_text.get())
+        next_val = (current_val - 1) % 3
+        self.bus_mono_label_text.set(self.mono_modes[next_val])
+        self.setter('mono', next_val)
 
     def teardown(self):
         self.builder.teardown()
 
     def sync(self):
         [
-            self.param_vars[i].set(self.getter(param))
-            for i, param in enumerate(self.params)
+            self.bool_param_vars[i].set(self.getter(param))
+            for i, param in enumerate(self.bool_params)
         ]
         self.bus_mode_label_text.set(self.bus_mode_map[self.current_bus_mode()])
         if not _configuration.themes_enabled:
             [
                 self.styletable.configure(
                     f'{param}.TButton',
-                    background=f'{"green" if self.param_vars[i].get() else "white"}',
+                    background=f'{"green" if self.bool_param_vars[i].get() else "white"}',
                 )
-                for i, param in enumerate(self.params)
+                for i, param in enumerate(self.bool_params)
             ]

vmcompact/configurations.py

@@ -60,7 +60,7 @@ _defaults = {
     'submixes': {
         'default': 0,
     },
-    'navigation': {'show': True},
+    'navigation': {'show': False},
 }
 
 

vmcompact/gainlayer.py

@@ -161,17 +161,18 @@ class GainLayer(ttk.LabelFrame):
         """
         Updates level values.
         """
-
         if self.parent.target.strip[self.index].levels.is_updated:
             val = max(self.parent.target.strip[self.index].levels.prefader)
-            self.level.set(
-                (
-                    0
-                    if self.parent.parent.strip_frame.strips[self.index].mute.get()
-                    or not self.on.get()
-                    else 72 + val - 12 + self.gain.get()
-                )
-            )
+            # Convert dB to progressbar: -60dB=0, 0dB=60, +12dB=72
+            if (
+                self.parent.parent.strip_frame.strips[self.index].mute.get()
+                or not self.on.get()
+            ):
+                level_display = 0
+            else:
+                level_db = val + self.gain.get()
+                level_display = max(0, min(72, level_db + 60))
+            self.level.set(level_display)
 
     def grid_configure(self):
         self.grid(padx=_configuration.channel_xpadding, sticky=(tk.N, tk.S))

vmcompact/menu.py

@@ -357,15 +357,17 @@ class Menus(tk.Menu):
         opts = {}
         opts |= self.vban_config[f'connection-{i + 1}']
         kind_id = opts.pop('kind')
+        if 'ip' in opts:
+            opts['host'] = opts.pop('ip')
         self.vban = vban_cmd.api(kind_id, **opts)
         # login to vban interface
         try:
-            self.logger.info(f'Attempting vban connection to {opts.get("ip")}')
+            self.logger.info(f'Attempting vban connection to {opts.get("host")}')
             self.vban.login()
         except VBANCMDConnectionError as e:
             self.vban.logout()
             msg = (
-                f'Timeout attempting to establish connection to {opts.get("ip")}',
+                f'Timeout attempting to establish connection to {opts.get("host")}',
                 'Please check your connection settings',
             )
             messagebox.showerror('Connection Error', '\n'.join(msg))
@@ -421,7 +423,7 @@ class Menus(tk.Menu):
             del self.parent.__dict__['userconfigs']
         self.menu_setup()
 
-        self.after(500, self.enable_vban_menus)
+        self.after(50, self.enable_vban_menus)
 
     def documentation(self):
         webbrowser.open_new(r'https://voicemeeter.com/')