onyx_online/nvda-voicemeeter
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/nvda-voicemeeter.git synced 2024-11-22 18:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

increment indices in formatted strings

Browse Source 
instead of range expressions
This commit is contained in:
onyx-and-iris 2023-08-25 20:41:48 +01:00
parent ead28db48c
commit 2490fc9343
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvda_voicemeeter/builder.py
View File

@ -62,12 +62,12 @@ class Builder:
layout.append( layout.append(
[ [
psg.ButtonMenu( psg.ButtonMenu(
f"A{i}", f"A{i + 1}",
size=(6, 3), size=(6, 3),
menu_def=["", devices], menu_def=["", devices],
key=f"HARDWARE OUT||A{i}", key=f"HARDWARE OUT||A{i + 1}",
) )
for i in range(1, self.kind.phys_out + 1) for i in range(self.kind.phys_out)
] ]
) )

26
src/nvda_voicemeeter/window.py
View File

@ -30,8 +30,8 @@ class NVDAVMWindow(psg.Window):
self.builder = Builder(self, self.vm) self.builder = Builder(self, self.vm)
layout = self.builder.run() layout = self.builder.run()
super().__init__(title, layout, finalize=True) super().__init__(title, layout, finalize=True)
[self[f"HARDWARE OUT||A{i}"].Widget.config(takefocus=1) for i in range(1, self.kind.phys_out + 1)] [self[f"HARDWARE OUT||A{i + 1}"].Widget.config(takefocus=1) for i in range(self.kind.phys_out)]
[self[f"PATCH COMPOSITE||PC{i}"].Widget.config(takefocus=1) for i in range(1, self.kind.phys_out + 1)] [self[f"PATCH COMPOSITE||PC{i + 1}"].Widget.config(takefocus=1) for i in range(self.kind.phys_out)]
self.register_events() self.register_events()
def __enter__(self): def __enter__(self):
@ -44,27 +44,27 @@ class NVDAVMWindow(psg.Window):
"""Registers events for widgets""" """Registers events for widgets"""
# Hardware Out # Hardware Out
for i in range(1, self.vm.kind.phys_out + 1): for i in range(self.vm.kind.phys_out):
self[f"HARDWARE OUT||A{i}"].bind("<FocusIn>", "||FOCUS IN") self[f"HARDWARE OUT||A{i + 1}"].bind("<FocusIn>", "||FOCUS IN")
# Patch ASIO # Patch ASIO
if self.kind.name != "basic": if self.kind.name != "basic":
for i in range(1, self.kind.phys_out + 1): for i in range(self.kind.phys_out):
self[f"ASIO CHECKBOX||IN{i} 0"].bind("<FocusIn>", "||FOCUS IN") self[f"ASIO CHECKBOX||IN{i + 1} 0"].bind("<FocusIn>", "||FOCUS IN")
self[f"ASIO CHECKBOX||IN{i} 1"].bind("<FocusIn>", "||FOCUS IN") self[f"ASIO CHECKBOX||IN{i + 1} 1"].bind("<FocusIn>", "||FOCUS IN")
# Patch Composite # Patch Composite
for i in range(1, self.vm.kind.phys_out + 1): for i in range(self.vm.kind.phys_out):
self[f"PATCH COMPOSITE||PC{i}"].bind("<FocusIn>", "||FOCUS IN") self[f"PATCH COMPOSITE||PC{i + 1}"].bind("<FocusIn>", "||FOCUS IN")
# Patch Insert # Patch Insert
if self.kind.name != "basic": if self.kind.name != "basic":
for i in range(1, self.kind.num_strip + 1): for i in range(self.kind.num_strip):
if i <= self.kind.phys_in: if i <= self.kind.phys_in:
self[f"INSERT CHECKBOX||IN{i} 0"].bind("<FocusIn>", "||FOCUS IN") self[f"INSERT CHECKBOX||IN{i + 1} 0"].bind("<FocusIn>", "||FOCUS IN")
self[f"INSERT CHECKBOX||IN{i} 1"].bind("<FocusIn>", "||FOCUS IN") self[f"INSERT CHECKBOX||IN{i + 1} 1"].bind("<FocusIn>", "||FOCUS IN")
else: else:
[self[f"INSERT CHECKBOX||IN{i} {j}"].bind("<FocusIn>", "||FOCUS IN") for j in range(8)] [self[f"INSERT CHECKBOX||IN{i + 1} {j}"].bind("<FocusIn>", "||FOCUS IN") for j in range(8)]
def run(self): def run(self):
""" """