summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/sysinfo.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2013-11-03 11:35:41 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2013-11-04 23:32:57 +0100
commitdd0d52ee0f6750233be61155160eb35e74b908f9 (patch)
tree73083ec78b3af7df8ec04c3b91bbd26d0b368ff2 /rbutil/rbutilqt/sysinfo.cpp
parent646f74937f00e508a5b25a003333569e907013d7 (diff)
downloadrockbox-dd0d52ee0f6750233be61155160eb35e74b908f9.tar.gz
rockbox-dd0d52ee0f6750233be61155160eb35e74b908f9.tar.bz2
rockbox-dd0d52ee0f6750233be61155160eb35e74b908f9.zip
Handle conversion to text in Sysinfo::getInfo().
When saving the system info from the progresslogger it shouldn't have knowledge about the format of the data provided by getInfo(). Instead of relying on the output being HTML formatted make getInfo() accept a parameter that indicates if the data is to be formatted as HTML or text. Change-Id: I733fe1a148e51b70ea1361d8feccffd7cbccd3d7
Diffstat (limited to 'rbutil/rbutilqt/sysinfo.cpp')
-rw-r--r--rbutil/rbutilqt/sysinfo.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/sysinfo.cpp b/rbutil/rbutilqt/sysinfo.cpp
index 3de387721c..0bb5465240 100644
--- a/rbutil/rbutilqt/sysinfo.cpp
+++ b/rbutil/rbutilqt/sysinfo.cpp
@@ -39,7 +39,7 @@ void Sysinfo::updateSysinfo(void)
ui.textBrowser->setHtml(getInfo());
}
-QString Sysinfo::getInfo()
+QString Sysinfo::getInfo(Sysinfo::InfoType type)
{
QString info;
info += tr("<b>OS</b><br/>") + System::osVersionString() + "<hr/>";
@@ -76,6 +76,9 @@ QString Sysinfo::getInfo()
}
info += "</table>";
info += "<hr/>";
+ if(type == InfoText) {
+ info.replace(QRegExp("(<[^>]+>)+"),"\n");
+ }
return info;
}