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

update: smoother view for current image

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: aebfaddab3
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-11-18 (Mon, 18 Nov 2019)

Origin message was:
------------------
- update: smoother view for current image

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-11-18 23:25:39 +01:00
parent bb7e6423cc
commit 8c1000df3c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/update.cpp
View File

@@ -233,8 +233,14 @@ bool CFlashUpdate::selectHttpImage(void)
CConfigFile _configfile('\t'); CConfigFile _configfile('\t');
std::string versionString = "????????????????"; std::string versionString = "????????????????";
std::string imagedescription = "";
std::string imageversion = "n/a";
if (_configfile.loadConfig(TARGET_PREFIX "/.version")) if (_configfile.loadConfig(TARGET_PREFIX "/.version"))
{
versionString = _configfile.getString("version", "????????????????"); versionString = _configfile.getString("version", "????????????????");
imagedescription = _configfile.getString("imagedescription", "");
imageversion = _configfile.getString("imageversion", "n/a");
}
CFlashVersionInfo curInfo(versionString.c_str()); CFlashVersionInfo curInfo(versionString.c_str());
dprintf(DEBUG_NORMAL, "[update] current flash-version: %s (%d) date %s (%ld)\n", versionString.c_str(), curInfo.getVersion(), curInfo.getDate(), curInfo.getDateTime()); dprintf(DEBUG_NORMAL, "[update] current flash-version: %s (%d) date %s (%ld)\n", versionString.c_str(), curInfo.getVersion(), curInfo.getDate(), curInfo.getDateTime());
@@ -243,16 +249,18 @@ bool CFlashUpdate::selectHttpImage(void)
httpTool.setStatusViewer(this); httpTool.setStatusViewer(this);
showStatusMessageUTF(g_Locale->getText(LOCALE_FLASHUPDATE_GETINFOFILE)); showStatusMessageUTF(g_Locale->getText(LOCALE_FLASHUPDATE_GETINFOFILE));
char current[200]; char currentleft[200];
snprintf(current, 200, "%s %s - %s, %s", curInfo.getType(true), curInfo.getVersionString(), curInfo.getDate(), curInfo.getTime()); char currentright[200];
snprintf(currentleft, 200, "%s %s - %s, %s", curInfo.getType(true), curInfo.getVersionString(), curInfo.getDate(), curInfo.getTime());
snprintf(currentright, 200, "%s %s", imagedescription.c_str(), imageversion.c_str());
CMenuWidget SelectionWidget(LOCALE_FLASHUPDATE_SELECTIMAGE, NEUTRINO_ICON_UPDATE, listWidth, MN_WIDGET_ID_IMAGESELECTOR); CMenuWidget SelectionWidget(LOCALE_FLASHUPDATE_SELECTIMAGE, NEUTRINO_ICON_UPDATE, listWidth, MN_WIDGET_ID_IMAGESELECTOR);
SelectionWidget.addItem(GenericMenuSeparator); SelectionWidget.addItem(GenericMenuSeparator);
SelectionWidget.addItem(GenericMenuBack); SelectionWidget.addItem(GenericMenuBack);
SelectionWidget.addItem(new CMenuSeparator(CMenuSeparator::LINE)); SelectionWidget.addItem(new CMenuSeparator(CMenuSeparator::STRING | CMenuSeparator::LINE, g_Locale->getText(LOCALE_FLASHUPDATE_CURRENTVERSION_SEP)));
SelectionWidget.addItem(new CMenuForwarder(currentleft, false, currentright));
SelectionWidget.addItem(new CMenuForwarder(current, false, g_Locale->getText(LOCALE_FLASHUPDATE_CURRENTVERSION_SEP))); //NI
std::ifstream urlFile(g_settings.softupdate_url_file.c_str()); std::ifstream urlFile(g_settings.softupdate_url_file.c_str());
dprintf(DEBUG_NORMAL, "[update] file %s\n", g_settings.softupdate_url_file.c_str()); dprintf(DEBUG_NORMAL, "[update] file %s\n", g_settings.softupdate_url_file.c_str());