1 files changed, 63 insertions, 5 deletions

diff --git a/application/pages/OtherLogsPage.cpp b/application/pages/OtherLogsPage.cpp
index 3988e939..2141e0cc 100644
--- a/application/pages/OtherLogsPage.cpp
+++ b/application/pages/OtherLogsPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 #include "RecursiveFileSystemWatcher.h"
 #include <GZip.h>
 #include <FileSystem.h>
+#include <QShortcut>
 
 OtherLogsPage::OtherLogsPage(QString path, IPathMatcher::Ptr fileFilter, QWidget *parent)
 	: QWidget(parent), ui(new Ui::OtherLogsPage), m_path(path), m_fileFilter(fileFilter),
@@ -35,6 +36,17 @@ OtherLogsPage::OtherLogsPage(QString path, IPathMatcher::Ptr fileFilter, QWidget
 
 	connect(m_watcher, &RecursiveFileSystemWatcher::filesChanged, this, &OtherLogsPage::populateSelectLogBox);
 	populateSelectLogBox();
+
+	auto findShortcut = new QShortcut(QKeySequence(QKeySequence::Find), this);
+	connect(findShortcut, &QShortcut::activated, this, &OtherLogsPage::findActivated);
+
+	auto findNextShortcut = new QShortcut(QKeySequence(QKeySequence::FindNext), this);
+	connect(findNextShortcut, &QShortcut::activated, this, &OtherLogsPage::findNextActivated);
+
+	auto findPreviousShortcut = new QShortcut(QKeySequence(QKeySequence::FindPrevious), this);
+	connect(findPreviousShortcut, &QShortcut::activated, this, &OtherLogsPage::findPreviousActivated);
+
+	connect(ui->searchBar, &QLineEdit::returnPressed, this, &OtherLogsPage::on_findButton_clicked);
 }
 
 OtherLogsPage::~OtherLogsPage()
@@ -115,9 +127,22 @@ void OtherLogsPage::on_btnReload_clicked()
 	}
 	else
 	{
+		auto setPlainText = [&](const QString & text)
+		{
+			QString fontFamily = MMC->settings()->get("ConsoleFont").toString();
+			bool conversionOk = false;
+			int fontSize = MMC->settings()->get("ConsoleFontSize").toInt(&conversionOk);
+			if(!conversionOk)
+			{
+				fontSize = 11;
+			}
+			QTextDocument *doc = ui->text->document();
+			doc->setDefaultFont(QFont(fontFamily, fontSize));
+			ui->text->setPlainText(text);
+		};
 		auto showTooBig = [&]()
 		{
-			ui->text->setPlainText(
+			setPlainText(
 				tr("The file (%1) is too big. You may want to open it in a viewer optimized "
 				   "for large files.").arg(file.fileName()));
 		};
@@ -132,7 +157,7 @@ void OtherLogsPage::on_btnReload_clicked()
 			QByteArray temp;
 			if(!GZip::unzip(file.readAll(), temp))
 			{
-				ui->text->setPlainText(
+				setPlainText(
 					tr("The file (%1) is not readable.").arg(file.fileName()));
 				return;
 			}
@@ -147,7 +172,7 @@ void OtherLogsPage::on_btnReload_clicked()
 			showTooBig();
 			return;
 		}
-		ui->text->setPlainText(content);
+		setPlainText(content);
 	}
 }
 
@@ -200,7 +225,7 @@ void OtherLogsPage::on_btnClean_clicked()
 	}
 	else
 	{
-		messageBox->setText(tr("Do you really want to these files?\n%1").arg(toDelete.join('\n')));
+		messageBox->setText(tr("Do you really want to delete these files?\n%1").arg(toDelete.join('\n')));
 	}
 	messageBox->setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
 	messageBox->setDefaultButton(QMessageBox::Ok);
@@ -253,3 +278,36 @@ void OtherLogsPage::setControlsEnabled(const bool enabled)
 	ui->text->setEnabled(enabled);
 	ui->btnClean->setEnabled(enabled);
 }
+
+// FIXME: HACK, use LogView instead?
+static void findNext(QPlainTextEdit * _this, const QString& what, bool reverse)
+{
+	_this->find(what, reverse ? QTextDocument::FindFlag::FindBackward : QTextDocument::FindFlag(0));
+}
+
+void OtherLogsPage::on_findButton_clicked()
+{
+	auto modifiers = QApplication::keyboardModifiers();
+	bool reverse = modifiers & Qt::ShiftModifier;
+	findNext(ui->text, ui->searchBar->text(), reverse);
+}
+
+void OtherLogsPage::findNextActivated()
+{
+	findNext(ui->text, ui->searchBar->text(), false);
+}
+
+void OtherLogsPage::findPreviousActivated()
+{
+	findNext(ui->text, ui->searchBar->text(), true);
+}
+
+void OtherLogsPage::findActivated()
+{
+	// focus the search bar if it doesn't have focus
+	if (!ui->searchBar->hasFocus())
+	{
+		ui->searchBar->setFocus();
+		ui->searchBar->selectAll();
+	}
+}