From 1e702ee40f211286f85fa5353704e358e7fe14a9 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Wed, 7 Jun 2023 00:16:23 +0300
Subject: Added dynamic page extra info

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/pages/BasePage.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'launcher/ui/pages/BasePage.h')

diff --git a/launcher/ui/pages/BasePage.h b/launcher/ui/pages/BasePage.h
index ceb24040..5537c28f 100644
--- a/launcher/ui/pages/BasePage.h
+++ b/launcher/ui/pages/BasePage.h
@@ -35,15 +35,16 @@
 
 #pragma once
 
-#include <QString>
 #include <QIcon>
+#include <QString>
+#include <functional>
 #include <memory>
 
 #include "BasePageContainer.h"
 
-class BasePage
-{
-public:
+class BasePage {
+   public:
+    using updateExtraInfoFunc = std::function<void(QString)>;
     virtual ~BasePage() {}
     virtual QString id() const = 0;
     virtual QString displayName() const = 0;
@@ -63,17 +64,16 @@ public:
     }
     virtual void openedImpl() {}
     virtual void closedImpl() {}
-    virtual void setParentContainer(BasePageContainer * container)
-    {
-        m_container = container;
-    };
-    virtual void retranslate() { }
+    virtual void setParentContainer(BasePageContainer* container) { m_container = container; };
+    virtual void retranslate() {}
 
-public:
+   public:
     int stackIndex = -1;
     int listIndex = -1;
-protected:
-    BasePageContainer * m_container = nullptr;
+    updateExtraInfoFunc updateExtraInfo;
+
+   protected:
+    BasePageContainer* m_container = nullptr;
     bool isOpened = false;
 };
 
-- 
cgit 


From 6d0e255ca18b1934d6eb514b6324cde67bb87d60 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 25 Jun 2023 22:00:33 +0300
Subject: fix: Page container extra info set on logs page

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/pages/BasePage.h                         | 2 +-
 launcher/ui/pages/instance/ExternalResourcesPage.cpp | 2 +-
 launcher/ui/widgets/PageContainer.cpp                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'launcher/ui/pages/BasePage.h')

diff --git a/launcher/ui/pages/BasePage.h b/launcher/ui/pages/BasePage.h
index 5537c28f..dc2bde99 100644
--- a/launcher/ui/pages/BasePage.h
+++ b/launcher/ui/pages/BasePage.h
@@ -44,7 +44,7 @@
 
 class BasePage {
    public:
-    using updateExtraInfoFunc = std::function<void(QString)>;
+    using updateExtraInfoFunc = std::function<void(QString, QString)>;
     virtual ~BasePage() {}
     virtual QString id() const = 0;
     virtual QString displayName() const = 0;
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
index 8e5226ef..173bcb66 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.cpp
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
@@ -83,7 +83,7 @@ ExternalResourcesPage::ExternalResourcesPage(BaseInstance* instance, std::shared
     connect(selection_model, &QItemSelectionModel::currentChanged, this, &ExternalResourcesPage::current);
     auto updateExtra = [this]() {
         if (updateExtraInfo)
-            updateExtraInfo(extraHeaderInfoString());
+            updateExtraInfo(id(), extraHeaderInfoString());
     };
     connect(selection_model, &QItemSelectionModel::selectionChanged, this, updateExtra);
     connect(model.get(), &ResourceFolderModel::updateFinished, this, updateExtra);
diff --git a/launcher/ui/widgets/PageContainer.cpp b/launcher/ui/widgets/PageContainer.cpp
index 34df42ec..b98c9796 100644
--- a/launcher/ui/widgets/PageContainer.cpp
+++ b/launcher/ui/widgets/PageContainer.cpp
@@ -93,8 +93,8 @@ PageContainer::PageContainer(BasePageProvider *pageProvider, QString defaultId,
         page->listIndex = counter;
         page->setParentContainer(this);
         counter++;
-        page->updateExtraInfo = [this](QString info) {
-            if (m_currentPage)
+        page->updateExtraInfo = [this](QString id, QString info) {
+            if (m_currentPage && id == m_currentPage->id())
                 m_header->setText(m_currentPage->displayName() + info);
         };
     }
-- 
cgit