diff --git a/gui/pages/LogPage.ui b/gui/pages/LogPage.ui
index 924babdb..d6b0a0c0 100644
--- a/gui/pages/LogPage.ui
+++ b/gui/pages/LogPage.ui
@@ -6,14 +6,14 @@
0
0
- 831
- 596
+ 825
+ 782
Log
-
+
0
@@ -26,7 +26,34 @@
0
- -
+
-
+
+
+ false
+
+
+
+ -
+
+
+ false
+
+
+ Search:
+
+
+
+ -
+
+
+ false
+
+
+ Find next
+
+
+
+ -
false
@@ -45,25 +72,51 @@
- -
-
+
-
+
-
-
-
- Upload the log to paste.ee - it will stay online for a month
+
+
+ false
- Upload Log
+ Keep updating
+
+
+ true
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
-
Copy the whole log into the clipboard
- &Copy Log
+ &Copy
+
+
+
+ -
+
+
+ Upload the log to paste.ee - it will stay online for a month
+
+
+ Upload
@@ -77,19 +130,6 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
diff --git a/gui/pages/OtherLogsPage.cpp b/gui/pages/OtherLogsPage.cpp
index f20b9fef..555075e3 100644
--- a/gui/pages/OtherLogsPage.cpp
+++ b/gui/pages/OtherLogsPage.cpp
@@ -29,7 +29,7 @@ OtherLogsPage::OtherLogsPage(BaseInstance *instance, QWidget *parent)
{
ui->setupUi(this);
- m_watcher->setFileExpression(".*\\.log$");
+ m_watcher->setFileExpression("(.*\\.log(\\.[0-9]*)?$)|(crash-.*\\.txt)");
m_watcher->setRootDir(QDir::current().absoluteFilePath(m_instance->minecraftRoot()));
connect(m_watcher, &RecursiveFileSystemWatcher::filesChanged, this,
@@ -55,7 +55,6 @@ void OtherLogsPage::populateSelectLogBox()
{
ui->selectLogBox->clear();
ui->selectLogBox->addItems(m_watcher->files());
- ui->selectLogBox->addItem(tr("Other"), true);
if (m_currentFile.isNull())
{
ui->selectLogBox->setCurrentIndex(-1);
@@ -63,7 +62,8 @@ void OtherLogsPage::populateSelectLogBox()
else
{
const int index = ui->selectLogBox->findText(m_currentFile);
- ui->selectLogBox->setCurrentIndex(index);
+ if(index != -1)
+ ui->selectLogBox->setCurrentIndex(index);
}
}
@@ -72,15 +72,7 @@ void OtherLogsPage::on_selectLogBox_currentIndexChanged(const int index)
QString file;
if (index != -1)
{
- if (ui->selectLogBox->itemData(index).isValid())
- {
- file = QFileDialog::getOpenFileName(
- this, tr("Open log file"), m_instance->minecraftRoot(), tr("*.log;;*.txt;;*"));
- }
- else
- {
- file = ui->selectLogBox->itemText(index);
- }
+ file = ui->selectLogBox->itemText(index);
}
if (file.isEmpty() || !QFile::exists(m_instance->minecraftRoot() + "/" + file))
diff --git a/gui/pages/OtherLogsPage.ui b/gui/pages/OtherLogsPage.ui
index e6ce6397..1083ebcb 100644
--- a/gui/pages/OtherLogsPage.ui
+++ b/gui/pages/OtherLogsPage.ui
@@ -6,14 +6,14 @@
0
0
- 640
- 480
+ 657
+ 538
Form
-
+
0
@@ -27,24 +27,14 @@
0
-
-
-
- false
-
-
- true
-
-
-
- -
-
+
-
-
-
- 96
- 16777215
-
+
+
+ 0
+ 0
+
@@ -56,9 +46,12 @@
-
-
-
- Qt::Horizontal
+
+
+ Copy the whole log into the clipboard
+
+
+ &Copy
@@ -68,17 +61,7 @@
Upload the log to paste.ee - it will stay online for a month
- Upload Log
-
-
-
- -
-
-
- Copy the whole log into the clipboard
-
-
- &Copy Log
+ Upload
@@ -92,23 +75,29 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
+ -
+
+
+ false
+
+
+ Qt::ScrollBarAlwaysOn
+
+
+ true
+
+
+ Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
+
+
+
+
+ text
+