mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Conflicts:
	data/icons/headers/mainmenue.png
	data/icons/headers/settings.png
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/settings_manager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d756ed789a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-17 (Sun, 17 Dec 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-12-17 23:38:33 +01:00
parent 9b5758d55a ccab966bba
commit 1a49595a1c
6 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/network_setup.cpp
View File

@@ -241,7 +241,7 @@ int CNetworkSetup::showNetworkSetup()
backupNetworkSettings();
//menue init
CMenuWidget* networkSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP);
CMenuWidget* networkSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_NETWORK, width, MN_WIDGET_ID_NETWORKSETUP);
networkSettings->setWizardMode(is_wizard);
//apply button
@@ -353,9 +353,9 @@ int CNetworkSetup::showNetworkSetup()
networkSettings->addItem( m5); //nameserver
//------------------------------------------------
sectionsdConfigNotifier = NULL;
CMenuWidget ntp(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_NTP);
CMenuWidget ntp(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_NETWORK, width, MN_WIDGET_ID_NETWORKSETUP_NTP);
#ifdef ENABLE_GUI_MOUNT
CMenuWidget networkmounts(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_MOUNTS);
CMenuWidget networkmounts(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_NETWORK, width, MN_WIDGET_ID_NETWORKSETUP_MOUNTS);
#endif
CProxySetup proxy(LOCALE_MAINSETTINGS_NETWORK);
CNetworkServiceSetup services;
@@ -832,7 +832,7 @@ int CNetworkSetup::showWlanList()
return res;
}
CMenuWidget wlist(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width);
CMenuWidget wlist(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_NETWORK, width);
wlist.addIntroItems(LOCALE_NETWORKMENU_SSID_SCAN); //intros
char cnt[5];