Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-28 20:09:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Only enable the device selection OK button of validator is OK

Browse Source 
While the combobox validator prevents "QValidator.Invalid"
characters to be entered, the user could still get away with
any string that is considered "QValidator.Intermediate". In
that caes, disable the OK button of the button box so the
(intermediate) result could not be passed on.
This commit is contained in:
Joerg Wunsch
2024-04-14 22:54:44 +02:00
parent ec3ecc6169
commit 69267f365c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/python/adgui.py
View File

@@ -434,13 +434,15 @@ class FusePopup():
class listValidator(QValidator):
def __init__(self, liste):
def __init__(self, liste, buttonbox):
super().__init__()
self.list = liste
self.buttonbox = buttonbox
def validate(self, string, position):
if string == "":
# empty string could always become a real match
self.buttonbox.button(QDialogButtonBox.Ok).setEnabled(False)
return QValidator.Intermediate, string, position
s = string.lower()
@@ -450,13 +452,16 @@ class listValidator(QValidator):
if i == s:
# exact match
self.buttonbox.button(QDialogButtonBox.Ok).setEnabled(True)
return QValidator.Acceptable, string, position
if i.find(s) != -1:
# could become a real match some day
self.buttonbox.button(QDialogButtonBox.Ok).setEnabled(False)
return QValidator.Intermediate, string, position
# no match at all, invalid input
self.buttonbox.button(QDialogButtonBox.Ok).setEnabled(False)
return QValidator.Invalid, string, position
def fixup(self, string):
@@ -793,7 +798,7 @@ class adgui(QObject):
for d in self.devices[f]:
self.device.devices.addItem(d)
l.append(d)
self.dev_validator = listValidator(l)
self.dev_validator = listValidator(l, self.device.buttonBox)
self.device.devices.setValidator(self.dev_validator)
def update_programmer_cb(self):