RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: augment pairing message for devices with multiple channels

This commit is contained in:
Peter F. Patel-Schneider 2024-10-08 15:12:30 -04:00
parent 128ec43d70
commit 4aada31b21
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/solaar/cli/pair.py
View File

@ -109,7 +109,9 @@ def run(receivers, args, find_receiver, _ignore):
else: else:
receiver.set_lock(False, timeout=timeout) receiver.set_lock(False, timeout=timeout)
print("Pairing: turn your new device on (timing out in", timeout, "seconds).") print("Pairing: Turn your device on or press, hold, and release")
print("a channel button or the channel switch button.")
print("Timing out in", timeout, "seconds.")
pairing_start = time() pairing_start = time()
patience = 5 # the lock-open notification may come slightly later, wait for it a bit patience = 5 # the lock-open notification may come slightly later, wait for it a bit
while receiver.pairing.lock_open or time() - pairing_start < patience: while receiver.pairing.lock_open or time() - pairing_start < patience:

14
lib/solaar/ui/pair_window.py
View File

@ -45,10 +45,20 @@ def create(receiver):
else: else:
text = _("Other receivers are only compatible with a few devices.") text = _("Other receivers are only compatible with a few devices.")
text += "\n\n" text += "\n\n"
text += _("Turn on the device you want to pair.") text += _("For most devices, turn on the device you want to pair.")
text += _("If the device is already turned on, turn it off and on again.")
text += "\n"
text += _("The device must not be paired with a nearby powered-on receiver.") text += _("The device must not be paired with a nearby powered-on receiver.")
text += "\n" text += "\n"
text += _("If the device is already turned on, turn it off and on again.") text += _(
"For devices with multiple channels, "
"press, hold, and release the button for the channel you wish to pair"
"\n"
"or use the channel switch button to select a channel "
"and then press, hold, and release the channel switch button."
)
text += "\n"
text += _("The channel indicator light should be blinking rapidly.")
if receiver.remaining_pairings() and receiver.remaining_pairings() >= 0: if receiver.remaining_pairings() and receiver.remaining_pairings() >= 0:
text += ( text += (
ngettext( ngettext(