mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

imageinfo: outsource build date info init into own member

Browse Source
This commit is contained in:
Thilo Graf
2020-10-14 08:32:54 +02:00
parent 74dc704a40
commit aa6924aad6
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/imageinfo.cpp
View File

@@ -307,15 +307,6 @@ void CImageInfo::InitInfoData()
config.loadConfig(VERSION_FILE); config.loadConfig(VERSION_FILE);
string builddate = "";
#ifdef BUILT_DATE
builddate = BUILT_DATE;
#else
builddate = config.getString("builddate", "").c_str();
#endif
if (builddate.empty())
builddate = PACKAGE_VERSION_DATE;
string version_string = config.getString("version", ""); string version_string = config.getString("version", "");
#ifdef IMAGE_VERSION #ifdef IMAGE_VERSION
@@ -358,7 +349,8 @@ void CImageInfo::InitInfoData()
//kernel //kernel
initKernelInfo(); initKernelInfo();
v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_DATE), builddate}); //build date
initBuildDateInfo();
//creator //creator
string creator = config.getString("creator", ""); string creator = config.getString("creator", "");
@@ -385,6 +377,19 @@ void CImageInfo::InitInfoData()
initSupportInfo(); initSupportInfo();
} }
void CImageInfo::initBuildDateInfo()
{
string builddate = "";
#ifdef BUILT_DATE
builddate = BUILT_DATE;
#else
builddate = config.getString("builddate", "").c_str();
#endif
if (builddate.empty())
builddate = PACKAGE_VERSION_DATE;
v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_DATE), builddate});
}
void CImageInfo::initHalInfo() void CImageInfo::initHalInfo()
{ {
#if USE_STB_HAL #if USE_STB_HAL

1
src/gui/imageinfo.h
View File

@@ -58,6 +58,7 @@ class CImageInfo : public CMenuTarget
void InitMinitv(); void InitMinitv();
void InitInfos(); void InitInfos();
void InitBuildInfos(); void InitBuildInfos();
void initBuildDateInfo();
void initKernelInfo(); void initKernelInfo();
void initHalInfo(); void initHalInfo();
void InitInfoText(const std::string& text); void InitInfoText(const std::string& text);