mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/network_setup.cpp: move wlan setup items up,

Browse Source 
to be visible always on first page
This commit is contained in:
[CST] Focus
2013-11-12 17:19:52 +04:00
parent c3eb7a8d1a
commit b9881539d4
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gui/network_setup.cpp
View File

@@ -297,24 +297,8 @@ int CNetworkSetup::showNetworkSetup()
networkSettings->addItem(o1); //set on start networkSettings->addItem(o1); //set on start
networkSettings->addItem(GenericMenuSeparatorLine); networkSettings->addItem(GenericMenuSeparatorLine);
//------------------------------------------------ //------------------------------------------------
networkSettings->addItem(mac); //eth id
networkSettings->addItem(GenericMenuSeparatorLine);
//-------------------------------------------------
networkSettings->addItem(o2); //dhcp on/off
networkSettings->addItem( m8); //hostname
networkSettings->addItem(GenericMenuSeparatorLine);
//-------------------------------------------------
networkSettings->addItem( m1); //adress
networkSettings->addItem( m2); //mask
networkSettings->addItem( m3); //broadcast
networkSettings->addItem(GenericMenuSeparatorLine);
//------------------------------------------------
networkSettings->addItem( m4); //gateway
networkSettings->addItem( m5); //nameserver
//------------------------------------------------
if(ifcount > 1) // if there is only one, its probably wired if(ifcount > 1) // if there is only one, its probably wired
{ {
networkSettings->addItem(GenericMenuSeparatorLine);
//ssid //ssid
CStringInputSMS * networkSettings_ssid = new CStringInputSMS(LOCALE_NETWORKMENU_SSID, &network_ssid, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789 -_/()<>=+.,:!?\\'"); CStringInputSMS * networkSettings_ssid = new CStringInputSMS(LOCALE_NETWORKMENU_SSID, &network_ssid, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789 -_/()<>=+.,:!?\\'");
//key //key
@@ -334,10 +318,24 @@ int CNetworkSetup::showNetworkSetup()
networkSettings->addItem( m11); //ssid scan networkSettings->addItem( m11); //ssid scan
networkSettings->addItem( m9); //ssid networkSettings->addItem( m9); //ssid
networkSettings->addItem( m10); //key networkSettings->addItem( m10); //key
if (!g_settings.easymenu) networkSettings->addItem(GenericMenuSeparatorLine);
networkSettings->addItem(GenericMenuSeparatorLine);
} }
//------------------------------------------------ //------------------------------------------------
networkSettings->addItem(mac); //eth id
networkSettings->addItem(GenericMenuSeparatorLine);
//-------------------------------------------------
networkSettings->addItem(o2); //dhcp on/off
networkSettings->addItem( m8); //hostname
networkSettings->addItem(GenericMenuSeparatorLine);
//-------------------------------------------------
networkSettings->addItem( m1); //adress
networkSettings->addItem( m2); //mask
networkSettings->addItem( m3); //broadcast
networkSettings->addItem(GenericMenuSeparatorLine);
//------------------------------------------------
networkSettings->addItem( m4); //gateway
networkSettings->addItem( m5); //nameserver
//------------------------------------------------
sectionsdConfigNotifier = NULL; sectionsdConfigNotifier = NULL;
CMenuWidget ntp(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_NTP); CMenuWidget ntp(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_NTP);
#ifdef ENABLE_GUI_MOUNT #ifdef ENABLE_GUI_MOUNT