From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] setup: fix field-order at addressconfig for red Date: Wed, 03 Feb 2021 19:31:50 +0100 Message-ID: <20210203183150.2639-1-arne_f@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0370853855355977056==" List-Id: --===============0370853855355977056== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable i have added the gatewayfield at the line below the IP and Netmask fields but prior this fields so the cursor jumps first the the gateway and after this to the IP. This patch fix the activation order. Signed-off-by: Arne Fitzenreiter --- src/setup/netstuff.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/setup/netstuff.c b/src/setup/netstuff.c index dac407767..1e196dc1e 100644 --- a/src/setup/netstuff.c +++ b/src/setup/netstuff.c @@ -134,18 +134,6 @@ int changeaddress(struct keyvalue *kv, char *colour, int= typeflag, newtEntrySetFlags(dhcphostnameentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); newtEntrySetFlags(dhcpforcemtuentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); } - /* Gateway */ - gatewaylabel =3D newtTextbox(2, (typeflag ? 11 : 4) + 2, 18, 1, 0); - newtTextboxSetText(gatewaylabel, _("Gateway:")); - strcpy(temp, ""); - findkey(kv, gatewayfield, temp); - gatewayentry =3D newtEntry(20, (typeflag ? 11 : 4) + 2, temp, 20, &gateway= result, 0); - newtEntrySetFilter(gatewayentry, ip_input_filter, NULL); - if (typeflag =3D=3D 1 && startstatictype =3D=3D 0) - newtEntrySetFlags(gatewayentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); - newtFormAddComponent(networkform, gatewaylabel); - newtFormAddComponent(networkform, gatewayentry); - } /* Address */ addresslabel =3D newtTextbox(2, (typeflag ? 11 : 4) + 0, 18, 1, 0); @@ -171,6 +159,20 @@ int changeaddress(struct keyvalue *kv, char *colour, int= typeflag, newtFormAddComponent(networkform, netmasklabel); newtFormAddComponent(networkform, netmaskentry); =20 + if (typeflag) + { + /* Gateway */ + gatewaylabel =3D newtTextbox(2, (typeflag ? 11 : 4) + 2, 18, 1, 0); + newtTextboxSetText(gatewaylabel, _("Gateway:")); + strcpy(temp, ""); + findkey(kv, gatewayfield, temp); + gatewayentry =3D newtEntry(20, (typeflag ? 11 : 4) + 2, temp, 20, &gateway= result, 0); + newtEntrySetFilter(gatewayentry, ip_input_filter, NULL); + if (typeflag =3D=3D 1 && startstatictype =3D=3D 0) + newtEntrySetFlags(gatewayentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); + newtFormAddComponent(networkform, gatewaylabel); + newtFormAddComponent(networkform, gatewayentry); + } =20 /* Buttons. */ ok =3D newtButton(8, (typeflag ? 15 : 7), _("OK")); --=20 2.17.1 --===============0370853855355977056==--