From 472f506817bb1af2fceb039ba148d15723944562 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Thu, 25 Feb 2016 13:47:30 -0600 Subject: Improve progress bar handling for backup / restore / image flash The progress bar will now be updated during image backups, restores and during image flashing (except for sparse images which will require significant changes to libsparse, and except for mtd nand using flash_utils). The progress bar will now be updated mid-file for file systems (tar) so the user will see changes even during large file backup / restore. Add a new progress tracking class to simplify handling of progress bar updates. The class will only update the progress bar 5 times a second to reduce the CPU load from updating the GUI frequently which does affect backup times. Change-Id: Iff382faef3df1f86604af336c1a8ce8993cd12c5 --- gui/twmsg.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gui/twmsg.cpp') diff --git a/gui/twmsg.cpp b/gui/twmsg.cpp index 9fe9e5a94..57f192234 100644 --- a/gui/twmsg.cpp +++ b/gui/twmsg.cpp @@ -89,13 +89,16 @@ public: resname = name.substr(0, pos); default_value = name.substr(pos + 1); } +#ifndef BUILD_TWRPTAR_MAIN const ResourceManager* res = PageManager::GetResources(); if (res) { if (default_value.empty()) return res->FindString(resname); else return res->FindString(resname, default_value); - } else if (!default_value.empty()) { + } +#endif + if (!default_value.empty()) { return default_value; } return name; @@ -112,10 +115,12 @@ class DataLookup : public StringLookup public: virtual std::string operator()(const std::string& name) const { +#ifndef BUILD_TWRPTAR_MAIN std::string value; if (DataManager::GetValue(name, value) == 0) return value; else +#endif return ""; } }; -- cgit v1.2.3