From f5476531ae39fdae8c3adc63d4c4a11f92600ff8 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sun, 24 Nov 2019 19:39:26 -0500 Subject: basic html loot report --- src/loot.cpp | 53 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-) (limited to 'src/loot.cpp') diff --git a/src/loot.cpp b/src/loot.cpp index c315056b..c73dcaa7 100644 --- a/src/loot.cpp +++ b/src/loot.cpp @@ -32,14 +32,13 @@ log::Levels levelFromLoot(lootcli::LogLevels level) } } - class LootDialog : public QDialog { public: LootDialog(QWidget* parent, OrganizerCore& core, Loot& loot) : QDialog(parent), m_core(core), m_loot(loot), - m_label(nullptr), m_progress(nullptr), m_buttons(nullptr), - m_report(nullptr), m_output(nullptr), + m_label(nullptr), m_progress(nullptr), + m_report(nullptr), m_output(nullptr), m_buttons(nullptr), m_finished(false), m_cancelling(false) { createUI(); @@ -143,9 +142,10 @@ private: Loot& m_loot; QLabel* m_label; QProgressBar* m_progress; - QDialogButtonBox* m_buttons; + QTextEdit* m_messages; QPushButton* m_report; QPlainTextEdit* m_output; + QDialogButtonBox* m_buttons; bool m_finished; bool m_cancelling; @@ -164,6 +164,9 @@ private: m_progress = new QProgressBar; ly->addWidget(m_progress); + m_messages = new QTextEdit; + ly->addWidget(m_messages); + auto* more = createMoreUI(); ly->addWidget(more); @@ -253,10 +256,46 @@ private: addLineOutput(""); } - for (auto&& m : report.messages) { - log(m.type, m.text); + QString html; + + if (!report.messages.empty()) { + html += "