switch to freesimplegui

README.md

@@ -188,7 +188,7 @@ If you have any questions/suggestions feel free to raise an issue or open a new
 
 [Vincent Burel](https://github.com/vburel2018) for creating Voicemeeter and its SDK.
 
-[PySimpleGUI](https://github.com/PySimpleGUI) team for creating an awesome GUI framework.
+[FreeSimpleGUI](https://github.com/spyoungtech/FreeSimpleGUI) a fork of the now closed source PySimpleGUI project.
 
 [spec]: ./SPECIFICATION.md
 [voicemeeter]: https://voicemeeter.com/

pdm.lock

@@ -5,7 +5,7 @@
 groups = ["default", "build", "lint", "test"]
 strategy = ["cross_platform"]
 lock_version = "4.4.1"
-content_hash = "sha256:6be74981983ee2ba3a99c9aa75b10f6c7433fec0854390f82029635cb34d3e0b"
+content_hash = "sha256:d8f7b44e465a0e57f724712da8b6b57d7cfb492a5d18f7c09ee9948a36d46b95"
 
 [[package]]
 name = "altgraph"
@@ -66,6 +66,15 @@ files = [
     {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 ]
 
+[[package]]
+name = "freesimplegui"
+version = "5.1.0"
+summary = "The free-forever Python GUI framework."
+files = [
+    {file = "FreeSimpleGUI-5.1.0-py3-none-any.whl", hash = "sha256:9dee6408bc0df2d30327f775e5e61160085f63d0d1c2f41f83d00cb250e507c2"},
+    {file = "freesimplegui-5.1.0.tar.gz", hash = "sha256:2be084404bac9675a3082df8eb8cea4872121f166fc37298081203961618268f"},
+]
+
 [[package]]
 name = "macholib"
 version = "1.16.2"
@@ -290,13 +299,13 @@ files = [
 
 [[package]]
 name = "voicemeeter-api"
-version = "2.5.3"
+version = "2.6.0"
-requires_python = ">=3.10,<4.0"
+requires_python = "<4.0,>=3.10"
 summary = "A Python wrapper for the Voiceemeter API"
 dependencies = [
     "tomli<3.0.0,>=2.0.1; python_version < \"3.11\"",
 ]
 files = [
-    {file = "voicemeeter_api-2.5.3-py3-none-any.whl", hash = "sha256:00c1f5b4027844d09ae19042f1662501dc28b1cee12a4238503790a50293c8f7"},
+    {file = "voicemeeter_api-2.6.0-py3-none-any.whl", hash = "sha256:c2ef8eb063ce3aeac4827ad7883150c407a0effb0fde3778782cd3024a295255"},
-    {file = "voicemeeter_api-2.5.3.tar.gz", hash = "sha256:b40f77e94446b4a5ab561c777109bdaf9c2478dfaa19e728c91ade3b44226704"},
+    {file = "voicemeeter_api-2.6.0.tar.gz", hash = "sha256:db93f27b58ce927c7d56084b224e1d0cdd6406ab7f26e4f99a9a873495a3d2e7"},
 ]

pyproject.toml

@@ -2,13 +2,11 @@
 name = "nvda_voicemeeter"
 version = "0.6.3"
 description = "A Voicemeeter app compatible with NVDA"
-authors = [
+authors = [{ name = "onyx-and-iris", email = "code@onyxandiris.online" }]
-    { name = "onyx-and-iris", email = "code@onyxandiris.online" },
-]
 dependencies = [
-    "pysimplegui>=4.60.5",
     "pyparsing>=3.1.1",
     "voicemeeter-api>=2.5.3",
+    "freesimplegui>=5.1.0",
 ]
 requires-python = ">=3.10,<3.12"
 readme = "README.md"
@@ -17,17 +15,9 @@ readme = "README.md"
 text = "MIT"
 
 [tool.pdm.dev-dependencies]
-lint = [
+lint = ["black>=23.7.0", "ruff>=0.0.291", "mypy>=1.7.0"]
-    "black>=23.7.0",
+test = ["psgdemos>=1.12.1"]
-    "ruff>=0.0.291",
+build = ["pyinstaller>=6.3.0"]
-    "mypy>=1.7.0",
-]
-test = [
-    "psgdemos>=1.12.1",
-]
-build = [
-    "pyinstaller>=6.3.0",
-]
 
 [tool.pdm.scripts.build]
 shell = "build.ps1"
@@ -36,13 +26,8 @@ shell = "build.ps1"
 line-length = 119
 
 [tool.ruff]
-select = [
+select = ["E", "F"]
-    "E",
+ignore = ["E501"]
-    "F",
-]
-ignore = [
-    "E501",
-]
 fixable = [
     "A",
     "B",
@@ -121,7 +106,4 @@ target-version = "py310"
 max-complexity = 10
 
 [tool.ruff.per-file-ignores]
-"__init__.py" = [
+"__init__.py" = ["E402", "F401"]
-    "E402",
-    "F401",
-]

src/nvda_voicemeeter/builder.py

@@ -1,4 +1,4 @@
-import PySimpleGUI as psg
+import FreeSimpleGUI as psg
 
 from . import util
 from .compound import LabelSlider

src/nvda_voicemeeter/compound.py

@@ -1,6 +1,6 @@
 from typing import Union
 
-import PySimpleGUI as psg
+import FreeSimpleGUI as psg
 
 from . import util
 

src/nvda_voicemeeter/popup.py

@@ -1,7 +1,7 @@
 import logging
 from pathlib import Path
 
-import PySimpleGUI as psg
+import FreeSimpleGUI as psg
 
 from . import util
 from .compound import CompSlider, GateSlider, LabelSliderAdvanced

src/nvda_voicemeeter/util.py

@@ -1,6 +1,6 @@
 from typing import Iterable
 
-import PySimpleGUI as psg
+import FreeSimpleGUI as psg
 
 
 def get_asio_input_spinbox_index(channel, num) -> int:

src/nvda_voicemeeter/window.py

@@ -2,7 +2,7 @@ import json
 import logging
 from pathlib import Path
 
-import PySimpleGUI as psg
+import FreeSimpleGUI as psg
 
 from . import configuration, models, util
 from .builder import Builder