feat: add internal status-column

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

launcher/BaseInstance.h

@@ -240,19 +240,6 @@ public:
         }
     }
 
-    bool hasUpdateAvailable() const
-    {
-        return m_hasUpdate;
-    }
-    void setUpdateAvailable(bool value)
-    {
-        if(m_hasUpdate != value)
-        {
-            m_hasUpdate = value;
-            emit propertiesChanged(this);
-        }
-    }
-
     bool hasCrashed() const
     {
         return m_crashed;
@@ -317,7 +304,6 @@ protected: /* data */
 private: /* data */
     Status m_status = Status::Present;
     bool m_crashed = false;
-    bool m_hasUpdate = false;
     bool m_hasBrokenVersion = false;
 
     SettingsObjectWeakPtr m_global_settings;

launcher/InstanceList.cpp

@@ -144,6 +144,8 @@ QVariant InstanceList::headerData(int section, Qt::Orientation orientation, int
     }
 
     switch (section) {
+        case StatusColumn:
+            return tr("Status");
         case NameColumn:
             return tr("Name");
         case CategoryColumn:
@@ -167,12 +169,19 @@ QVariant InstanceList::data(const QModelIndex& index, int role) const
 
     QString instanceGroup = getInstanceGroup(inst->id());
 
-
-
     switch (role) {
         case Qt::DecorationRole: {
-            if (index.column() == NameColumn)
+            switch (index.column()) {
-                return inst->iconKey();
+                case StatusColumn: {
+                    if (inst->isRunning())
+                        return "status-running";
+                    else if (inst->hasCrashed() || inst->hasVersionBroken())
+                        return "status-bad";
+                    return QVariant();
+                }
+                case NameColumn:
+                    return inst->iconKey();
+            }
             break;
         }
 
@@ -194,6 +203,15 @@ QVariant InstanceList::data(const QModelIndex& index, int role) const
 
         case Qt::ToolTipRole: {
             switch (index.column()) {
+                case StatusColumn: {
+                    if (inst->isRunning())
+                        return tr("Running");
+                    else if (inst->hasCrashed())
+                        return tr("Crashed");
+                    else if (inst->hasVersionBroken())
+                        return tr("Broken");
+                    return tr("Inactive");
+                }
                 case NameColumn:
                     return inst->instanceRoot();
                 case GameVersionColumn:

launcher/InstanceList.h

@@ -57,6 +57,7 @@ class InstanceList : public QAbstractTableModel {
     int columnCount(const QModelIndex& parent = QModelIndex()) const override;
 
     enum Column {
+        StatusColumn,
         NameColumn,
         CategoryColumn,
         GameVersionColumn,

launcher/ui/instanceview/InstanceTableProxyModel.cpp

@@ -1,16 +1,36 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *  This program is free software: you can redistribute it and/or modify
- * you may not use this file except in compliance with the License.
+ *  it under the terms of the GNU General Public License as published by
- * You may obtain a copy of the License at
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
+ *  You should have received a copy of the GNU General Public License
- * distributed under the License is distributed on an "AS IS" BASIS,
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
- * See the License for the specific language governing permissions and
+ * This file incorporates work covered by the following copyright and
- * limitations under the License.
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #include "InstanceTableProxyModel.h"
@@ -40,8 +60,16 @@ QVariant InstanceTableProxyModel::data(const QModelIndex& index, int role) const
 
     switch (role) {
         case Qt::DecorationRole: {
-            if (!data.toString().isEmpty())
+            QString iconKey = data.toString();
-                return APPLICATION->icons()->getIcon(data.toString());
+            if (iconKey.isEmpty())
+                break;
+
+            switch (index.column()) {
+                case InstanceList::StatusColumn:
+                    return QIcon::fromTheme(iconKey);
+                case InstanceList::NameColumn:
+                    return APPLICATION->icons()->getIcon(iconKey);
+            }
             break;
         }
         case Qt::DisplayRole: {

launcher/ui/instanceview/InstanceTableProxyModel.h

@@ -1,16 +1,36 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *  This program is free software: you can redistribute it and/or modify
- * you may not use this file except in compliance with the License.
+ *  it under the terms of the GNU General Public License as published by
- * You may obtain a copy of the License at
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
+ *  You should have received a copy of the GNU General Public License
- * distributed under the License is distributed on an "AS IS" BASIS,
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
- * See the License for the specific language governing permissions and
+ * This file incorporates work covered by the following copyright and
- * limitations under the License.
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #pragma once
@@ -35,7 +55,7 @@ class InstanceTableProxyModel : public QSortFilterProxyModel {
 
    protected:
     QVariant data(const QModelIndex& index, int role) const override;
-    bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
 
    private:
     QCollator m_naturalSort;

launcher/ui/instanceview/InstancesView.cpp

@@ -126,6 +126,8 @@ void InstancesView::createTable()
         header->restoreState(QByteArray::fromBase64(APPLICATION->settings()->get("InstanceViewTableHeaderState").toByteArray()));
     }
 
+    m_table->setColumnHidden(InstanceList::StatusColumn, true);
+
     connect(m_table, &QAbstractItemView::doubleClicked, this, &InstancesView::activateInstance);
     connect(m_table->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &InstancesView::currentRowChanged);
     connect(m_table->selectionModel(), &QItemSelectionModel::currentColumnChanged, this, &InstancesView::selectNameColumn);