From 31a8fb071cdc0b96aec1dad0d2d1c237fd300b01 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 27 Sep 2022 23:58:23 +0200 Subject: [PATCH] network_setup: rework network apply messages Loader icon moved into message window. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f6996b095884b210c0ae309c630cd8fe0d13e73f Author: Thilo Graf Date: 2022-09-27 (Tue, 27 Sep 2022) ------------------ This commit was generated by Migit --- src/gui/network_setup.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 886192b69..084836c2e 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -102,8 +102,8 @@ int CNetworkSetup::exec(CMenuTarget* parent, const std::string &actionKey) if(actionKey=="networkapply") { applyNetworkSettings(); - ShowHintS("Read settings...", (sigc::mem_fun(*this, &CNetworkSetup::readNetworkSettings)), 1); - ShowHintS("Backup settings...", (sigc::mem_fun(*this, &CNetworkSetup::backupNetworkSettings)), 1); + ShowHintS("Read settings...", (sigc::mem_fun(*this, &CNetworkSetup::readNetworkSettings)), 1, true, NEUTRINO_ICON_LOADER); + ShowHintS("Backup settings...", (sigc::mem_fun(*this, &CNetworkSetup::backupNetworkSettings)), 1, true, NEUTRINO_ICON_LOADER); return res; } else if(actionKey=="networktest") @@ -578,14 +578,14 @@ void CNetworkSetup::saveNetworkSettings() void CNetworkSetup::applyNetworkSettings() { dprintf(DEBUG_NORMAL, "[CNetworkSetup]\t[%s - %d], apply network settings...\n", __func__, __LINE__); - ShowHintS(LOCALE_NETWORKMENU_APPLY_SETTINGS, 1); + ShowHintS(LOCALE_NETWORKMENU_APPLY_SETTINGS, 1, true, NEUTRINO_ICON_LOADER); if (!checkForIP()) return; - ShowHintS("Stopping network...", (sigc::mem_fun(networkConfig, &CNetworkConfig::stopNetwork)), 1); - ShowHintS("Save network settings...", (sigc::mem_fun(*this, &CNetworkSetup::saveNetworkSettings)), 1); - ShowHintS("Starting network...", (sigc::mem_fun(networkConfig, &CNetworkConfig::startNetwork)), 0); + ShowHintS("Stopping network...", (sigc::mem_fun(networkConfig, &CNetworkConfig::stopNetwork)), 1, true, NEUTRINO_ICON_LOADER); + ShowHintS("Save network settings...", (sigc::mem_fun(*this, &CNetworkSetup::saveNetworkSettings)), 1, true, NEUTRINO_ICON_LOADER); + ShowHintS("Starting network...", (sigc::mem_fun(networkConfig, &CNetworkConfig::startNetwork)), 0, true, NEUTRINO_ICON_LOADER); } //open a message dialog with buttons, @@ -713,7 +713,7 @@ const char * CNetworkSetup::mypinghost(std::string &host) void CNetworkSetup::testNetworkSettings() { dprintf(DEBUG_NORMAL, "[CNetworkSetup]\t[%s - %d], doing network test...\n", __func__, __LINE__); - ShowHintS(LOCALE_NETWORKMENU_TEST, 1); + ShowHintS(LOCALE_NETWORKMENU_TEST, 1, true, NEUTRINO_ICON_LOADER); std::string our_ip, our_mask, our_broadcast, our_gateway, our_nameserver;