summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/progressloggergui.cpp3
-rw-r--r--rbutil/rbutilqt/sysinfo.cpp5
-rw-r--r--rbutil/rbutilqt/sysinfo.h6
3 files changed, 10 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/progressloggergui.cpp b/rbutil/rbutilqt/progressloggergui.cpp
index 41df0600f0..71485b02ea 100644
--- a/rbutil/rbutilqt/progressloggergui.cpp
+++ b/rbutil/rbutilqt/progressloggergui.cpp
@@ -175,8 +175,7 @@ void ProgressLoggerGui::saveErrorLog()
175 "*********************************************\n"; 175 "*********************************************\n";
176 176
177 file.write(info.toUtf8(), info.size()); 177 file.write(info.toUtf8(), info.size());
178 info = Sysinfo::getInfo(); 178 info = Sysinfo::getInfo(Sysinfo::InfoText);
179 info.replace(QRegExp("(<[^>]+>)+"),"\n");
180 file.write(info.toUtf8(), info.size()); 179 file.write(info.toUtf8(), info.size());
181 180
182 // trace 181 // trace
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)
39 ui.textBrowser->setHtml(getInfo()); 39 ui.textBrowser->setHtml(getInfo());
40} 40}
41 41
42QString Sysinfo::getInfo() 42QString Sysinfo::getInfo(Sysinfo::InfoType type)
43{ 43{
44 QString info; 44 QString info;
45 info += tr("<b>OS</b><br/>") + System::osVersionString() + "<hr/>"; 45 info += tr("<b>OS</b><br/>") + System::osVersionString() + "<hr/>";
@@ -76,6 +76,9 @@ QString Sysinfo::getInfo()
76 } 76 }
77 info += "</table>"; 77 info += "</table>";
78 info += "<hr/>"; 78 info += "<hr/>";
79 if(type == InfoText) {
80 info.replace(QRegExp("(<[^>]+>)+"),"\n");
81 }
79 82
80 return info; 83 return info;
81} 84}
diff --git a/rbutil/rbutilqt/sysinfo.h b/rbutil/rbutilqt/sysinfo.h
index 45928a8b43..e2b3675102 100644
--- a/rbutil/rbutilqt/sysinfo.h
+++ b/rbutil/rbutilqt/sysinfo.h
@@ -30,9 +30,13 @@ class Sysinfo : public QDialog
30 Q_OBJECT 30 Q_OBJECT
31 31
32 public: 32 public:
33 enum InfoType {
34 InfoHtml,
35 InfoText,
36 };
33 Sysinfo(QWidget *parent = 0); 37 Sysinfo(QWidget *parent = 0);
34 38
35 static QString getInfo(); 39 static QString getInfo(InfoType type = InfoHtml);
36 private: 40 private:
37 void changeEvent(QEvent *event); 41 void changeEvent(QEvent *event);
38 Ui::SysinfoFrm ui; 42 Ui::SysinfoFrm ui;