From f38e03a4312945372c44a1c943034f4a0e33db3b Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Sun, 17 Dec 2017 21:44:51 +0100
Subject: [PATCH] icons: fix assignment of settings, network and mainmenu icons

Assignment was confused. There are probaly more.
---
 data/icons/headers/mainmenue.png | Bin 1775 -> 2050 bytes
 data/icons/headers/settings.png  | Bin 386 -> 1775 bytes
 src/gui/network_setup.cpp        |   8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/icons/headers/mainmenue.png b/data/icons/headers/mainmenue.png
index a43f2a61d4e1a8190b7d8d76a8952eb36a81e6cc..251e5378651c6014fe14bc2d4be42fa4d5e389d7 100644
GIT binary patch
delta 2036
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
Sh;!cn0000<MNUMnLSTY!Pq1?U

delta 1759
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
BT9p6*

diff --git a/data/icons/headers/settings.png b/data/icons/headers/settings.png
index 7d7217c8167ed018e6e40d855e93532fa946388e..a43f2a61d4e1a8190b7d8d76a8952eb36a81e6cc 100644
GIT binary patch
literal 1775
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
Rh(Q1V002ovPDHLkV1gvxR}KIG

literal 386
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ipR~8SJh7Bb#-NBlrsshRU
zZZ-DmnaW;0j_i?afByZMIAP-IHLK(2gwCHof5*-pCiVKZ%h+Rpdbvu1{DS|(0K=v;
zI_H6+oCO|{#S9GGLLkg|>2BR0px`4<7sn8Z%gHl3StJ~eu&}ZDNwhCy=8#aB!zr6^
zfb&^FNy(b1s~0aaJo0(*f~m+NjA5xnTG5s@QPtny-3@inY?~<?yZYU`dwaiM>*|}y
z<M1{+e}DD&UwZD`>JuIpmB(kF*u7U*&cW~Ws@wjTdOpY9FKR59ckBQ9>e|)JCkh#h
z4xK)~ci&Z}r&s1!vIjn!RQ7xBqBFa%XD0Z4x?B7H-rn1@ryV+JF!?N3(s?891>6xm
zih3U243<}ZgkQM3dsX*k2fn#C|JY|-)moasy`etshPZ5ymj1hzit4t?%F0^xZ48af
Z3>xb5<@X#bDhK+O!PC{xWt~$(699fLq<R1V

diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp
index 3af377dd8..28fa4cd8a 100644
--- a/src/gui/network_setup.cpp
+++ b/src/gui/network_setup.cpp
@@ -240,7 +240,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
@@ -352,9 +352,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;
@@ -805,7 +805,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];