Skip to content

Commit 6ffa420

Browse files
committed
Allow to set manual DNS in TUI for autoconf
Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
1 parent 0f18e5d commit 6ffa420

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

tui/network.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ def dhcp_change():
6464
for x in [ ip_field, gateway_field, subnet_field, dns_field ]:
6565
x.setFlags(FLAG_DISABLED, static_rb.selected())
6666

67+
# Allow manual DNS for autoconf
68+
if autoconf_rb.selected():
69+
dns_field.setFlags(FLAG_DISABLED, False)
70+
6771
ipv6 = iface_class == NetInterfaceV6
6872

6973
gf = GridFormHelp(tui.screen, 'Networking', 'ifconfig', 1, 10)
@@ -124,16 +128,19 @@ def dhcp_change():
124128
dns_text = Textbox(15, 1, "Nameserver:")
125129
vlan_text = Textbox(15, 1, "VLAN (1-4094):")
126130

127-
entry_grid = Grid(2, include_dns and 4 or 3)
131+
entry_grid = Grid(2, 3)
128132
entry_grid.setField(ip_text, 0, 0)
129133
entry_grid.setField(ip_field, 1, 0)
130134
entry_grid.setField(subnet_text, 0, 1)
131135
entry_grid.setField(subnet_field, 1, 1)
132136
entry_grid.setField(gateway_text, 0, 2)
133137
entry_grid.setField(gateway_field, 1, 2)
138+
139+
dns_grid = None
134140
if include_dns:
135-
entry_grid.setField(dns_text, 0, 3)
136-
entry_grid.setField(dns_field, 1, 3)
141+
dns_grid = Grid(2, 1)
142+
dns_grid.setField(dns_text, 0, 0)
143+
dns_grid.setField(dns_field, 1, 0)
137144

138145
vlan_grid = Grid(2, 1)
139146
vlan_grid.setField(vlan_text, 0, 0)
@@ -145,9 +152,11 @@ def dhcp_change():
145152
gf.add(entry_grid, 0, 4, padding=(0, 0, 0, 1))
146153
if ipv6:
147154
gf.add(autoconf_rb, 0, 5, anchorLeft=True)
148-
gf.add(vlan_cb, 0, 6, anchorLeft=True)
149-
gf.add(vlan_grid, 0, 7, padding=(0, 0, 0, 1))
150-
gf.add(buttons, 0, 8, growx=1)
155+
if include_dns:
156+
gf.add(dns_grid, 0, 6, padding=(0, 0, 0, 1))
157+
gf.add(vlan_cb, 0, 7, anchorLeft=True)
158+
gf.add(vlan_grid, 0, 8, padding=(0, 0, 0, 1))
159+
gf.add(buttons, 0, 9, growx=1)
151160

152161
loop = True
153162
ip_family = socket.AF_INET6 if ipv6 else socket.AF_INET

0 commit comments

Comments
 (0)