From a6c2b2fa63b0d0172b2408ae7dc9384f680242aa Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 2 Feb 2015 17:17:29 +0000 Subject: [PATCH] network preflet: On IPv6, show "Automatic" for address mode * IPv6 is "DHCPv6" or "Router Advertisement". Lets just say automatic to not confuse techie people. --- .../InterfacesAddOn/InterfaceAddressView.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/preferences/network/InterfacesAddOn/InterfaceAddressView.cpp b/src/preferences/network/InterfacesAddOn/InterfaceAddressView.cpp index 95faf363e2..a2636fd145 100644 --- a/src/preferences/network/InterfacesAddOn/InterfaceAddressView.cpp +++ b/src/preferences/network/InterfacesAddOn/InterfaceAddressView.cpp @@ -42,8 +42,17 @@ InterfaceAddressView::InterfaceAddressView(int family, // Create our controls fModePopUpMenu = new BPopUpMenu("modes"); - fModePopUpMenu->AddItem(new BMenuItem(B_TRANSLATE("DHCP"), - new BMessage(M_MODE_AUTO))); + if (fFamily == AF_INET) { + fModePopUpMenu->AddItem(new BMenuItem(B_TRANSLATE("DHCP"), + new BMessage(M_MODE_AUTO))); + } + + if (fFamily == AF_INET6) { + // Automatic can be DHCPv6 or Router Advertisements + fModePopUpMenu->AddItem(new BMenuItem(B_TRANSLATE("Automatic"), + new BMessage(M_MODE_AUTO))); + } + fModePopUpMenu->AddItem(new BMenuItem(B_TRANSLATE("Static"), new BMessage(M_MODE_STATIC))); fModePopUpMenu->AddSeparatorItem();