diff -r 81abf93b4684 -r d1470c052662 connectors/PYRO_dialog.py --- a/connectors/PYRO_dialog.py Fri Nov 09 13:26:06 2018 +0100 +++ b/connectors/PYRO_dialog.py Wed Nov 14 11:32:08 2018 +0100 @@ -14,17 +14,19 @@ model = [('host',_("Host:")), ('port',_("Port:"))] -secure_model = model + [('ID',_("ID:"))] - -models = [("LOCAL", []), ("PYRO",model), ("PYROS",secure_model)] +# (scheme, model, secure) +models = [("LOCAL", [], False), ("PYRO", model, False), ("PYROS", model, True)] Schemes = list(zip(*models)[0]) -ModelsDict = dict(models) +_PerSchemeConf = {sch : (mod,sec) for sch,mod,sec in models} class PYRO_dialog(SchemeEditor): def __init__(self, scheme, *args, **kwargs): - self.model = ModelsDict[scheme] + + # ID selector is enabled only on PYROS (secure) + self.model, self.EnableIDSelector = _PerSchemeConf[scheme] + SchemeEditor.__init__(self, scheme, *args, **kwargs) def SetLoc(self, loc): @@ -38,6 +40,8 @@ template = "{host}" if fields['port']: template += ":{port}" + if fields['ID']: + template += "#{ID}" return template.format(**fields) return ''