Reuse OtherLogsPage directly

Signed-off-by: Yihe Li <winmikedows@hotmail.com>

launcher/ui/pages/instance/LogPage.cpp

@@ -52,6 +52,82 @@
 
 #include <BuildConfig.h>
 
+QVariant LogFormatProxyModel::data(const QModelIndex& index, int role) const
+{
+    const LogColors& colors = APPLICATION->themeManager()->getLogColors();
+
+    switch (role) {
+        case Qt::FontRole:
+            return m_font;
+        case Qt::ForegroundRole: {
+            auto level = static_cast<MessageLevel::Enum>(QIdentityProxyModel::data(index, LogModel::LevelRole).toInt());
+            QColor result = colors.foreground.value(level);
+
+            if (result.isValid())
+                return result;
+
+            break;
+        }
+        case Qt::BackgroundRole: {
+            auto level = static_cast<MessageLevel::Enum>(QIdentityProxyModel::data(index, LogModel::LevelRole).toInt());
+            QColor result = colors.background.value(level);
+
+            if (result.isValid())
+                return result;
+
+            break;
+        }
+    }
+
+    return QIdentityProxyModel::data(index, role);
+}
+
+QModelIndex LogFormatProxyModel::find(const QModelIndex& start, const QString& value, bool reverse) const
+{
+    QModelIndex parentIndex = parent(start);
+    auto compare = [this, start, parentIndex, value](int r) -> QModelIndex {
+        QModelIndex idx = index(r, start.column(), parentIndex);
+        if (!idx.isValid() || idx == start) {
+            return QModelIndex();
+        }
+        QVariant v = data(idx, Qt::DisplayRole);
+        QString t = v.toString();
+        if (t.contains(value, Qt::CaseInsensitive))
+            return idx;
+        return QModelIndex();
+    };
+    if (reverse) {
+        int from = start.row();
+        int to = 0;
+
+        for (int i = 0; i < 2; ++i) {
+            for (int r = from; (r >= to); --r) {
+                auto idx = compare(r);
+                if (idx.isValid())
+                    return idx;
+            }
+            // prepare for the next iteration
+            from = rowCount() - 1;
+            to = start.row();
+        }
+    } else {
+        int from = start.row();
+        int to = rowCount(parentIndex);
+
+        for (int i = 0; i < 2; ++i) {
+            for (int r = from; (r < to); ++r) {
+                auto idx = compare(r);
+                if (idx.isValid())
+                    return idx;
+            }
+            // prepare for the next iteration
+            from = 0;
+            to = start.row();
+        }
+    }
+    return QModelIndex();
+}
+
 LogPage::LogPage(InstancePtr instance, QWidget* parent) : QWidget(parent), ui(new Ui::LogPage), m_instance(instance)
 {
     ui->setupUi(this);

launcher/ui/pages/instance/LogPage.h

@@ -42,11 +42,23 @@
 #include "BaseInstance.h"
 #include "launch/LaunchTask.h"
 #include "ui/pages/BasePage.h"
-#include "ui/pages/global/LauncherLogPage.h"
 
 namespace Ui {
 class LogPage;
 }
+class QTextCharFormat;
+
+class LogFormatProxyModel : public QIdentityProxyModel {
+   public:
+    LogFormatProxyModel(QObject* parent = nullptr) : QIdentityProxyModel(parent) {}
+    QVariant data(const QModelIndex& index, int role) const override;
+    QFont getFont() const { return m_font; }
+    void setFont(QFont font) { m_font = font; }
+    QModelIndex find(const QModelIndex& start, const QString& value, bool reverse) const;
+
+   private:
+    QFont m_font;
+};
 
 class LogPage : public QWidget, public BasePage {
     Q_OBJECT

launcher/ui/pages/instance/OtherLogsPage.cpp

@@ -40,6 +40,7 @@
 #include <QMessageBox>
 
 #include "ui/GuiUtil.h"
+#include "ui/themes/ThemeManager.h"
 
 #include <FileSystem.h>
 #include <GZip.h>
@@ -49,18 +50,26 @@
 #include <QShortcut>
 #include <QUrl>
 
-OtherLogsPage::OtherLogsPage(InstancePtr instance, QWidget* parent)
+OtherLogsPage::OtherLogsPage(QString id, QString displayName, QString helpPage, InstancePtr instance, QWidget* parent)
     : QWidget(parent)
+    , m_id(id)
+    , m_displayName(displayName)
+    , m_helpPage(helpPage)
     , ui(new Ui::OtherLogsPage)
     , m_instance(instance)
-    , m_basePath(instance->gameRoot())
-    , m_logSearchPaths(instance->getLogFileSearchPaths())
-    , m_model(new LogModel(this))
+    , m_basePath(instance ? instance->gameRoot() : APPLICATION->dataRoot())
+    , m_logSearchPaths(instance ? instance->getLogFileSearchPaths() : QStringList{ "logs" })
 {
     ui->setupUi(this);
     ui->tabWidget->tabBar()->hide();
 
     m_proxy = new LogFormatProxyModel(this);
+    if (m_instance) {
+        m_model.reset(new LogModel(this));
+        ui->trackLogCheckbox->setVisible(false);
+    } else {
+        m_model = APPLICATION->logModel;
+    }
 
     // set up fonts in the log proxy
     {
@@ -75,9 +84,13 @@ OtherLogsPage::OtherLogsPage(InstancePtr instance, QWidget* parent)
 
     ui->text->setModel(m_proxy);
 
-    m_model->setMaxLines(m_instance->getConsoleMaxLines());
-    m_model->setStopOnOverflow(m_instance->shouldStopOnConsoleOverflow());
-    m_model->setOverflowMessage(tr("Cannot display this log since the log length surpassed %1 lines.").arg(m_model->getMaxLines()));
+    if (m_instance) {
+        m_model->setMaxLines(m_instance->getConsoleMaxLines());
+        m_model->setStopOnOverflow(m_instance->shouldStopOnConsoleOverflow());
+        m_model->setOverflowMessage(tr("Cannot display this log since the log length surpassed %1 lines.").arg(m_model->getMaxLines()));
+    } else {
+        modelStateToUI();
+    }
     m_proxy->setSourceModel(m_model.get());
 
     connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &OtherLogsPage::populateSelectLogBox);
@@ -99,6 +112,39 @@ OtherLogsPage::~OtherLogsPage()
     delete ui;
 }
 
+void OtherLogsPage::modelStateToUI()
+{
+    if (m_model->wrapLines()) {
+        ui->text->setWordWrap(true);
+        ui->wrapCheckbox->setCheckState(Qt::Checked);
+    } else {
+        ui->text->setWordWrap(false);
+        ui->wrapCheckbox->setCheckState(Qt::Unchecked);
+    }
+    if (m_model->colorLines()) {
+        ui->text->setColorLines(true);
+        ui->colorCheckbox->setCheckState(Qt::Checked);
+    } else {
+        ui->text->setColorLines(false);
+        ui->colorCheckbox->setCheckState(Qt::Unchecked);
+    }
+    if (m_model->suspended()) {
+        ui->trackLogCheckbox->setCheckState(Qt::Unchecked);
+    } else {
+        ui->trackLogCheckbox->setCheckState(Qt::Checked);
+    }
+}
+
+void OtherLogsPage::UIToModelState()
+{
+    if (!m_model) {
+        return;
+    }
+    m_model->setLineWrap(ui->wrapCheckbox->checkState() == Qt::Checked);
+    m_model->setColorLines(ui->colorCheckbox->checkState() == Qt::Checked);
+    m_model->suspend(ui->trackLogCheckbox->checkState() != Qt::Checked);
+}
+
 void OtherLogsPage::retranslate()
 {
     ui->retranslateUi(this);
@@ -136,6 +182,8 @@ void OtherLogsPage::populateSelectLogBox()
 
     ui->selectLogBox->blockSignals(true);
     ui->selectLogBox->clear();
+    if (!m_instance)
+        ui->selectLogBox->addItem("Current logs");
     ui->selectLogBox->addItems(getPaths());
     ui->selectLogBox->blockSignals(false);
 
@@ -151,6 +199,9 @@ void OtherLogsPage::populateSelectLogBox()
         } else {
             setControlsEnabled(false);
         }
+    } else if (!m_instance) {
+        ui->selectLogBox->setCurrentIndex(0);
+        setControlsEnabled(true);
     }
 
     on_selectLogBox_currentIndexChanged(ui->selectLogBox->currentIndex());
@@ -159,27 +210,49 @@ void OtherLogsPage::populateSelectLogBox()
 void OtherLogsPage::on_selectLogBox_currentIndexChanged(const int index)
 {
     QString file;
-    if (index != -1) {
+    if (index > 0 || (index == 0 && m_instance)) {
         file = ui->selectLogBox->itemText(index);
     }
 
-    if (file.isEmpty() || !QFile::exists(FS::PathCombine(m_basePath, file))) {
+    if ((index != 0 || m_instance) && (file.isEmpty() || !QFile::exists(FS::PathCombine(m_basePath, file)))) {
         m_currentFile = QString();
         ui->text->clear();
         setControlsEnabled(false);
     } else {
         m_currentFile = file;
-        on_btnReload_clicked();
+        reload();
         setControlsEnabled(true);
     }
 }
 
 void OtherLogsPage::on_btnReload_clicked()
+{
+    if (!m_instance && m_currentFile.isEmpty()) {
+        if (!m_model)
+            return;
+        m_model->clear();
+        m_container->refreshContainer();
+    } else {
+        reload();
+    }
+}
+
+void OtherLogsPage::reload()
 {
     if (m_currentFile.isEmpty()) {
-        setControlsEnabled(false);
+        if (m_instance) {
+            setControlsEnabled(false);
+        } else {
+            m_model = APPLICATION->logModel;
+            m_proxy->setSourceModel(m_model.get());
+            ui->text->setModel(m_proxy);
+            ui->text->scrollToBottom();
+            UIToModelState();
+            setControlsEnabled(true);
+        }
         return;
     }
+
     QFile file(FS::PathCombine(m_basePath, m_currentFile));
     if (!file.open(QFile::ReadOnly)) {
         setControlsEnabled(false);
@@ -210,16 +283,20 @@ void OtherLogsPage::on_btnReload_clicked()
                 line = line.remove(line.size() - 1, 1);
             MessageLevel::Enum level = MessageLevel::Unknown;
 
-            // if the launcher part set a log level, use it
             QString lineTemp = line;  // don't edit out the time and level for clarity
-            auto innerLevel = MessageLevel::fromLine(lineTemp);
-            if (innerLevel != MessageLevel::Unknown) {
-                level = innerLevel;
-            }
+            if (!m_instance) {
+                level = MessageLevel::fromLauncherLine(lineTemp);
+            } else {
+                // if the launcher part set a log level, use it
+                auto innerLevel = MessageLevel::fromLine(lineTemp);
+                if (innerLevel != MessageLevel::Unknown) {
+                    level = innerLevel;
+                }
 
-            // If the level is still undetermined, guess level
-            if (level == MessageLevel::StdErr || level == MessageLevel::StdOut || level == MessageLevel::Unknown) {
-                level = LogParser::guessLevel(line, last);
+                // If the level is still undetermined, guess level
+                if (level == MessageLevel::StdErr || level == MessageLevel::StdOut || level == MessageLevel::Unknown) {
+                    level = LogParser::guessLevel(line, last);
+                }
             }
 
             last = level;
@@ -230,6 +307,12 @@ void OtherLogsPage::on_btnReload_clicked()
         // Try to determine a level for each line
         ui->text->clear();
         ui->text->setModel(nullptr);
+        if (!m_instance) {
+            m_model.reset(new LogModel(this));
+            m_model->setMaxLines(APPLICATION->getConsoleMaxLines());
+            m_model->setStopOnOverflow(APPLICATION->shouldStopOnConsoleOverflow());
+            m_model->setOverflowMessage(tr("Cannot display this log since the log length surpassed %1 lines.").arg(m_model->getMaxLines()));
+        }
         m_model->clear();
         if (file.fileName().endsWith(".gz")) {
             QString line;
@@ -259,8 +342,17 @@ void OtherLogsPage::on_btnReload_clicked()
             while (!file.atEnd() && !handleLine(QString::fromUtf8(file.readLine()))) {
             }
         }
-        ui->text->setModel(m_proxy);
-        ui->text->scrollToBottom();
+
+        if (m_instance) {
+            ui->text->setModel(m_proxy);
+            ui->text->scrollToBottom();
+        } else {
+            m_proxy->setSourceModel(m_model.get());
+            ui->text->setModel(m_proxy);
+            ui->text->scrollToBottom();
+            UIToModelState();
+            setControlsEnabled(true);
+        }
     }
 }
 
@@ -279,6 +371,13 @@ void OtherLogsPage::on_btnBottom_clicked()
     ui->text->scrollToBottom();
 }
 
+void OtherLogsPage::on_trackLogCheckbox_clicked(bool checked)
+{
+    if (!m_model)
+        return;
+    m_model->suspend(!checked);
+}
+
 void OtherLogsPage::on_btnDelete_clicked()
 {
     if (m_currentFile.isEmpty()) {
@@ -377,12 +476,27 @@ void OtherLogsPage::on_colorCheckbox_clicked(bool checked)
 
 void OtherLogsPage::setControlsEnabled(const bool enabled)
 {
+    if (m_instance) {
+        ui->btnDelete->setEnabled(enabled);
+        ui->btnClean->setEnabled(enabled);
+    } else if (!m_currentFile.isEmpty()) {
+        ui->btnReload->setText("&Reload");
+        ui->btnReload->setToolTip("Reload the contents of the log from the disk");
+        ui->btnDelete->setEnabled(enabled);
+        ui->btnClean->setEnabled(enabled);
+        ui->trackLogCheckbox->setEnabled(false);
+    } else {
+        ui->btnReload->setText("Clear");
+        ui->btnReload->setToolTip("Clear the log");
+        ui->btnDelete->setEnabled(false);
+        ui->btnClean->setEnabled(false);
+        ui->trackLogCheckbox->setEnabled(enabled);
+    }
+
     ui->btnReload->setEnabled(enabled);
-    ui->btnDelete->setEnabled(enabled);
     ui->btnCopy->setEnabled(enabled);
     ui->btnPaste->setEnabled(enabled);
     ui->text->setEnabled(enabled);
-    ui->btnClean->setEnabled(enabled);
 }
 
 QStringList OtherLogsPage::getPaths()

launcher/ui/pages/instance/OtherLogsPage.h

@@ -53,13 +53,13 @@ class OtherLogsPage : public QWidget, public BasePage {
     Q_OBJECT
 
    public:
-    explicit OtherLogsPage(InstancePtr instance, QWidget* parent = 0);
+    explicit OtherLogsPage(QString id, QString displayName, QString helpPage, InstancePtr instance = nullptr, QWidget* parent = 0);
     ~OtherLogsPage();
 
-    QString id() const override { return "logs"; }
-    QString displayName() const override { return tr("Other logs"); }
+    QString id() const override { return m_id; }
+    QString displayName() const override { return m_displayName; }
     QIcon icon() const override { return APPLICATION->getThemedIcon("log"); }
-    QString helpPage() const override { return "other-Logs"; }
+    QString helpPage() const override { return m_helpPage; }
     void retranslate() override;
 
     void openedImpl() override;
@@ -75,6 +75,7 @@ class OtherLogsPage : public QWidget, public BasePage {
     void on_btnClean_clicked();
     void on_btnBottom_clicked();
 
+    void on_trackLogCheckbox_clicked(bool checked);
     void on_wrapCheckbox_clicked(bool checked);
     void on_colorCheckbox_clicked(bool checked);
 
@@ -84,11 +85,18 @@ class OtherLogsPage : public QWidget, public BasePage {
     void findPreviousActivated();
 
    private:
+    void reload();
+    void modelStateToUI();
+    void UIToModelState();
     void setControlsEnabled(bool enabled);
 
     QStringList getPaths();
 
    private:
+    QString m_id;
+    QString m_displayName;
+    QString m_helpPage;
+
     Ui::OtherLogsPage* ui;
     InstancePtr m_instance;
     /** Path to display log paths relative to. */

launcher/ui/pages/instance/OtherLogsPage.ui

@@ -127,6 +127,16 @@
          </item>
          <item row="1" column="0" colspan="5">
           <layout class="QHBoxLayout" name="horizontalLayout1">
+           <item>
+            <widget class="QCheckBox" name="trackLogCheckbox">
+             <property name="text">
+              <string>Keep updating</string>
+             </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QCheckBox" name="wrapCheckbox">
              <property name="text">