Merge branch 'MultiMC:develop' into develop

application/LaunchController.cpp

@@ -15,6 +15,9 @@
 #include <minecraft/auth/YggdrasilTask.h>
 #include <launch/steps/TextPrint.h>
 #include <QStringList>
+#include <QHostInfo>
+#include <QList>
+#include <QHostAddress>
 
 LaunchController::LaunchController(QObject *parent) : Task(parent)
 {
@@ -215,7 +218,46 @@ void LaunchController::launchInstance()
     connect(m_launcher.get(), &LaunchTask::failed, this,  &LaunchController::onFailed);
     connect(m_launcher.get(), &LaunchTask::requestProgress, this, &LaunchController::onProgressRequested);
 
+    // Prepend Online and Auth Status
+    QString online_mode;
+    if(m_session->wants_online) {
+        online_mode = "online";
 
+        // Prepend Server Status
+        QStringList servers = {"authserver.mojang.com", "session.minecraft.net", "textures.minecraft.net", "api.mojang.com"};
+        QString resolved_servers = "";
+        QHostInfo host_info;
+
+        for(QString server : servers) {
+            host_info = QHostInfo::fromName(server);
+            resolved_servers = resolved_servers + server + " resolves to:\n    [";
+            if(!host_info.addresses().isEmpty()) {
+                for(QHostAddress address : host_info.addresses()) {
+                    resolved_servers = resolved_servers + address.toString();
+                    if(!host_info.addresses().endsWith(address)) {
+                        resolved_servers = resolved_servers + ", ";
+                    }
+                }
+            } else {
+                resolved_servers = resolved_servers + "N/A";
+            }
+            resolved_servers = resolved_servers + "]\n\n";
+        }
+        m_launcher->prependStep(new TextPrint(m_launcher.get(), resolved_servers, MessageLevel::MultiMC));
+    } else {
+        online_mode = "offline";
+    }
+
+    QString auth_server_status;
+    if(m_session->auth_server_online) {
+        auth_server_status = "online";
+    } else {
+        auth_server_status = "offline";
+    }
+
+    m_launcher->prependStep(new TextPrint(m_launcher.get(), "Launched instance in " + online_mode + " mode\nAuthentication server is " + auth_server_status + "\n", MessageLevel::MultiMC));
+
+    // Prepend Version
     m_launcher->prependStep(new TextPrint(m_launcher.get(), "MultiMC version: " + BuildConfig.printableVersionString() + "\n\n", MessageLevel::MultiMC));
     m_launcher->start();
 }

application/MainWindow.cpp

@@ -738,7 +738,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
     repopulateAccountsMenu();
 
     accountMenuButton = new QToolButton(this);
-    accountMenuButton->setText(tr("Profiles"));
     accountMenuButton->setMenu(accountMenu);
     accountMenuButton->setPopupMode(QToolButton::InstantPopup);
     accountMenuButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
@@ -837,6 +836,21 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
 
     // removing this looks stupid
     view->setFocus();
+
+    retranslateUi();
+}
+
+void MainWindow::retranslateUi()
+{
+    accountMenuButton->setText(tr("Profiles"));
+
+    if (m_selectedInstance) {
+        m_statusLeft->setText(m_selectedInstance->getStatusbarDescription());
+    } else {
+        m_statusLeft->setText(tr("No instance selected"));
+    }
+
+    ui->retranslateUi(this);
 }
 
 MainWindow::~MainWindow()
@@ -1750,7 +1764,7 @@ void MainWindow::changeEvent(QEvent* event)
 {
     if (event->type() == QEvent::LanguageChange)
     {
-        ui->retranslateUi(this);
+        retranslateUi();
     }
     QMainWindow::changeEvent(event);
 }

application/MainWindow.h

@@ -187,6 +187,8 @@ private slots:
     void globalSettingsClosed();
 
 private:
+    void retranslateUi();
+
     void addInstance(QString url = QString());
     void activateInstance(InstancePtr instance);
     void setCatBackground(bool enabled);

application/pages/instance/LogPage.cpp

@@ -236,15 +236,15 @@ void LogPage::on_btnPaste_clicked()
         return;
 
     //FIXME: turn this into a proper task and move the upload logic out of GuiUtil!
-    m_model->append(MessageLevel::MultiMC, tr("MultiMC: Log upload triggered at: %1").arg(QDateTime::currentDateTime().toString(Qt::RFC2822Date)));
+    m_model->append(MessageLevel::MultiMC, QString("MultiMC: Log upload triggered at: %1").arg(QDateTime::currentDateTime().toString(Qt::RFC2822Date)));
     auto url = GuiUtil::uploadPaste(m_model->toPlainText(), this);
     if(!url.isEmpty())
     {
-        m_model->append(MessageLevel::MultiMC, tr("MultiMC: Log uploaded to: %1").arg(url));
+        m_model->append(MessageLevel::MultiMC, QString("MultiMC: Log uploaded to: %1").arg(url));
     }
     else
     {
-        m_model->append(MessageLevel::Error, tr("MultiMC: Log upload failed!"));
+        m_model->append(MessageLevel::Error, "MultiMC: Log upload failed!");
     }
 }
 

application/pages/instance/ModFolderPage.cpp

@@ -163,7 +163,7 @@ ModFolderPage::ModFolderPage(
 
     auto smodel = ui->modTreeView->selectionModel();
     connect(smodel, &QItemSelectionModel::currentChanged, this, &ModFolderPage::modCurrent);
-    connect(ui->filterEdit, &QLineEdit::textChanged, this, &ModFolderPage::on_filterTextChanged );
+    connect(ui->filterEdit, &QLineEdit::textChanged, this, &ModFolderPage::on_filterTextChanged);
     connect(m_inst, &BaseInstance::runningStatusChanged, this, &ModFolderPage::on_RunningState_changed);
 }
 

application/pages/instance/ResourcePackPage.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include "ModFolderPage.h"
 #include "ui_ModFolderPage.h"
 
@@ -12,8 +13,8 @@ public:
     {
         ui->actionView_configs->setVisible(false);
     }
-
     virtual ~ResourcePackPage() {}
+
     virtual bool shouldDisplay() const override
     {
         return !m_inst->traits().contains("no-texturepacks") &&

application/pages/instance/TexturePackPage.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include "ModFolderPage.h"
 #include "ui_ModFolderPage.h"
 
@@ -13,6 +14,7 @@ public:
         ui->actionView_configs->setVisible(false);
     }
     virtual ~TexturePackPage() {}
+
     virtual bool shouldDisplay() const override
     {
         return m_inst->traits().contains("texturepacks");

application/pages/instance/VersionPage.cpp

@@ -120,7 +120,15 @@ VersionPage::VersionPage(MinecraftInstance *inst, QWidget *parent)
 
     auto proxy = new IconProxy(ui->packageView);
     proxy->setSourceModel(m_profile.get());
-    ui->packageView->setModel(proxy);
+
+    m_filterModel = new QSortFilterProxyModel();
+    m_filterModel->setDynamicSortFilter(true);
+    m_filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+    m_filterModel->setSortCaseSensitivity(Qt::CaseInsensitive);
+    m_filterModel->setSourceModel(proxy);
+    m_filterModel->setFilterKeyColumn(-1);
+
+    ui->packageView->setModel(m_filterModel);
     ui->packageView->installEventFilter(this);
     ui->packageView->setSelectionMode(QAbstractItemView::SingleSelection);
     ui->packageView->setContextMenuPolicy(Qt::CustomContextMenu);
@@ -134,7 +142,8 @@ VersionPage::VersionPage(MinecraftInstance *inst, QWidget *parent)
     updateVersionControls();
     preselect(0);
     connect(m_inst, &BaseInstance::runningStatusChanged, this, &VersionPage::updateRunningStatus);
-    connect(ui->packageView, &ModListView::customContextMenuRequested, this, &VersionPage::ShowContextMenu);
+    connect(ui->packageView, &ModListView::customContextMenuRequested, this, &VersionPage::showContextMenu);
+    connect(ui->filterEdit, &QLineEdit::textChanged, this, &VersionPage::onFilterTextChanged);
 }
 
 VersionPage::~VersionPage()
@@ -142,7 +151,7 @@ VersionPage::~VersionPage()
     delete ui;
 }
 
-void VersionPage::ShowContextMenu(const QPoint& pos)
+void VersionPage::showContextMenu(const QPoint& pos)
 {
     auto menu = ui->toolBar->createContextMenu(this, tr("Context menu"));
     menu->exec(ui->packageView->mapToGlobal(pos));
@@ -620,5 +629,10 @@ void VersionPage::on_actionRevert_triggered()
     m_container->refreshContainer();
 }
 
+void VersionPage::onFilterTextChanged(const QString &newContents)
+{
+    m_filterModel->setFilterFixedString(newContents);
+}
+
 #include "VersionPage.moc"
 

application/pages/instance/VersionPage.h

@@ -86,6 +86,7 @@ protected:
 
 private:
     Ui::VersionPage *ui;
+    QSortFilterProxyModel *m_filterModel;
     std::shared_ptr<PackProfile> m_profile;
     MinecraftInstance *m_inst;
     int currentIdx = 0;
@@ -98,5 +99,6 @@ private slots:
     void updateRunningStatus(bool running);
     void onGameUpdateError(QString error);
     void packageCurrent(const QModelIndex &current, const QModelIndex &previous);
-    void ShowContextMenu(const QPoint &pos);
+    void showContextMenu(const QPoint &pos);
+    void onFilterTextChanged(const QString & newContents);
 };

application/pages/instance/VersionPage.ui

@@ -45,6 +45,24 @@
         </attribute>
        </widget>
       </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="filterEdit">
+          <property name="clearButtonEnabled">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="filterLabel">
+          <property name="text">
+           <string>Filter:</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
       <item>
        <widget class="MCModInfoFrame" name="frame">
         <property name="sizePolicy">