mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- update: fix release cycle handling; add human readable version string

Browse Source 
Signed-off-by: GetAway <get-away@t-online.de>
This commit is contained in:
svenhoefer
2020-06-13 22:18:19 +02:00
committed by GetAway
parent 5d9749b1a0
commit 33ecf51bdb
6 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/imageinfo.cpp
View File

@@ -331,7 +331,7 @@ void CImageInfo::InitInfoData()
if (is_version_code && version_string.size() == 16){
static CFlashVersionInfo versionInfo(version_string.c_str());
if (oe_image_version.empty()){
version_string = versionInfo.getReleaseCycle();
version_string = versionInfo.getVersionString();
version_string += " ";
version_string += versionInfo.getType();
version_string += " (";

6
src/gui/update.cpp
View File

@@ -251,7 +251,7 @@ bool CFlashUpdate::selectHttpImage(void)
char currentleft[200];
char currentright[200];
snprintf(currentleft, 200, "%s %d - %s, %s", curInfo.getType(true), curInfo.getVersion(), curInfo.getDate(), curInfo.getTime());
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);
@@ -313,7 +313,7 @@ bool CFlashUpdate::selectHttpImage(void)
fileTypes[i] = versionInfo.snapshot;
std::string description = versionInfo.getType(true);
description += " ";
description += versionInfo.getVersion();
description += versionInfo.getVersionString();
description += " - ";
description += versionInfo.getDate();
description += ", ";
@@ -428,7 +428,7 @@ bool CFlashUpdate::checkVersion4Update()
msg_body = LOCALE_FLASHUPDATE_MSGBOX;
#ifdef SQUASHFS
versionInfo = new CFlashVersionInfo(newVersion);//Memory leak: versionInfo
sprintf(msg, g_Locale->getText(msg_body), versionInfo->getDate(), versionInfo->getTime(), versionInfo->getReleaseCycle(), versionInfo->getType(true));
sprintf(msg, g_Locale->getText(msg_body), versionInfo->getType(true), versionInfo->getVersionString(), versionInfo->getDate(), versionInfo->getTime());
if (gotImage)
{