From 97a74d5c1f00a11d331a41b16690f7202fe102a3 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Wed, 10 Aug 2022 14:48:34 -0300
Subject: refactor: adapt rest of the codebase to the new resource model

In order to access the ModFolderModel from the ModFolderPage, i created
a new m_model for the correct type, shadowing the m_model of type
ResourceFolderModel. This creates two shared_ptr references to the same object,
but since they will have the same lifetime, it doesn't generate a memory
leak.

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/ui/widgets/InfoFrame.cpp      | 172 +++++++++++++++++++++++++++++++++
 launcher/ui/widgets/InfoFrame.h        |  54 +++++++++++
 launcher/ui/widgets/InfoFrame.ui       |  92 ++++++++++++++++++
 launcher/ui/widgets/MCModInfoFrame.cpp | 168 --------------------------------
 launcher/ui/widgets/MCModInfoFrame.h   |  52 ----------
 launcher/ui/widgets/MCModInfoFrame.ui  |  92 ------------------
 6 files changed, 318 insertions(+), 312 deletions(-)
 create mode 100644 launcher/ui/widgets/InfoFrame.cpp
 create mode 100644 launcher/ui/widgets/InfoFrame.h
 create mode 100644 launcher/ui/widgets/InfoFrame.ui
 delete mode 100644 launcher/ui/widgets/MCModInfoFrame.cpp
 delete mode 100644 launcher/ui/widgets/MCModInfoFrame.h
 delete mode 100644 launcher/ui/widgets/MCModInfoFrame.ui

(limited to 'launcher/ui/widgets')

diff --git a/launcher/ui/widgets/InfoFrame.cpp b/launcher/ui/widgets/InfoFrame.cpp
new file mode 100644
index 00000000..821e61a7
--- /dev/null
+++ b/launcher/ui/widgets/InfoFrame.cpp
@@ -0,0 +1,172 @@
+/* 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 <QMessageBox>
+
+#include "InfoFrame.h"
+#include "ui_InfoFrame.h"
+
+#include "ui/dialogs/CustomMessageBox.h"
+
+InfoFrame::InfoFrame(QWidget *parent) :
+    QFrame(parent),
+    ui(new Ui::InfoFrame)
+{
+    ui->setupUi(this);
+    ui->descriptionLabel->setHidden(true);
+    ui->nameLabel->setHidden(true);
+    updateHiddenState();
+}
+
+InfoFrame::~InfoFrame()
+{
+    delete ui;
+}
+
+void InfoFrame::updateWithMod(Mod const& m)
+{
+    if (m.type() == ResourceType::FOLDER)
+    {
+        clear();
+        return;
+    }
+
+    QString text = "";
+    QString name = "";
+    if (m.name().isEmpty())
+        name = m.internal_id();
+    else
+        name = m.name();
+
+    if (m.homeurl().isEmpty())
+        text = name;
+    else
+        text = "<a href=\"" + m.homeurl() + "\">" + name + "</a>";
+    if (!m.authors().isEmpty())
+        text += " by " + m.authors().join(", ");
+
+    setName(text);
+
+    if (m.description().isEmpty())
+    {
+        setDescription(QString());
+    }
+    else
+    {
+        setDescription(m.description());
+    }
+}
+
+void InfoFrame::updateWithResource(const Resource& resource)
+{
+    setName(resource.name());
+}
+
+void InfoFrame::clear()
+{
+    setName();
+    setDescription();
+}
+
+void InfoFrame::updateHiddenState()
+{
+    if(ui->descriptionLabel->isHidden() && ui->nameLabel->isHidden())
+    {
+        setHidden(true);
+    }
+    else
+    {
+        setHidden(false);
+    }
+}
+
+void InfoFrame::setName(QString text)
+{
+    if(text.isEmpty())
+    {
+        ui->nameLabel->setHidden(true);
+    }
+    else
+    {
+        ui->nameLabel->setText(text);
+        ui->nameLabel->setHidden(false);
+    }
+    updateHiddenState();
+}
+
+void InfoFrame::setDescription(QString text)
+{
+    if(text.isEmpty())
+    {
+        ui->descriptionLabel->setHidden(true);
+        updateHiddenState();
+        return;
+    }
+    else
+    {
+        ui->descriptionLabel->setHidden(false);
+        updateHiddenState();
+    }
+    ui->descriptionLabel->setToolTip("");
+    QString intermediatetext = text.trimmed();
+    bool prev(false);
+    QChar rem('\n');
+    QString finaltext;
+    finaltext.reserve(intermediatetext.size());
+    foreach(const QChar& c, intermediatetext)
+    {
+        if(c == rem && prev){
+            continue;
+        }
+        prev = c == rem;
+        finaltext += c;
+    }
+    QString labeltext;
+    labeltext.reserve(300);
+    if(finaltext.length() > 290)
+    {
+        ui->descriptionLabel->setOpenExternalLinks(false);
+        ui->descriptionLabel->setTextFormat(Qt::TextFormat::RichText);
+        m_description = text;
+        // This allows injecting HTML here.
+        labeltext.append("<html><body>" + finaltext.left(287) + "<a href=\"#mod_desc\">...</a></body></html>");
+        QObject::connect(ui->descriptionLabel, &QLabel::linkActivated, this, &InfoFrame::descriptionEllipsisHandler);
+    }
+    else
+    {
+        ui->descriptionLabel->setTextFormat(Qt::TextFormat::PlainText);
+        labeltext.append(finaltext);
+    }
+    ui->descriptionLabel->setText(labeltext);
+}
+
+void InfoFrame::descriptionEllipsisHandler(QString link)
+{
+    if(!m_current_box)
+    {
+        m_current_box = CustomMessageBox::selectable(this, "", m_description);
+        connect(m_current_box, &QMessageBox::finished, this, &InfoFrame::boxClosed);
+        m_current_box->show();
+    }
+    else
+    {
+        m_current_box->setText(m_description);
+    }
+}
+
+void InfoFrame::boxClosed(int result)
+{
+    m_current_box = nullptr;
+}
diff --git a/launcher/ui/widgets/InfoFrame.h b/launcher/ui/widgets/InfoFrame.h
new file mode 100644
index 00000000..d69dc232
--- /dev/null
+++ b/launcher/ui/widgets/InfoFrame.h
@@ -0,0 +1,54 @@
+/* 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
+
+#include <QFrame>
+
+#include "minecraft/mod/Mod.h"
+#include "minecraft/mod/ResourcePack.h"
+
+namespace Ui
+{
+class InfoFrame;
+}
+
+class InfoFrame : public QFrame {
+    Q_OBJECT
+
+   public:
+    InfoFrame(QWidget* parent = nullptr);
+    ~InfoFrame() override;
+
+    void setName(QString text = {});
+    void setDescription(QString text = {});
+
+    void clear();
+
+    void updateWithMod(Mod const& m);
+    void updateWithResource(Resource const& resource);
+
+   public slots:
+    void descriptionEllipsisHandler(QString link);
+    void boxClosed(int result);
+
+   private:
+    void updateHiddenState();
+
+   private:
+    Ui::InfoFrame* ui;
+    QString m_description;
+    class QMessageBox* m_current_box = nullptr;
+};
diff --git a/launcher/ui/widgets/InfoFrame.ui b/launcher/ui/widgets/InfoFrame.ui
new file mode 100644
index 00000000..0d3772d7
--- /dev/null
+++ b/launcher/ui/widgets/InfoFrame.ui
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>InfoFrame</class>
+ <widget class="QFrame" name="InfoFrame">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>527</width>
+    <height>113</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>120</height>
+   </size>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="nameLabel">
+     <property name="text">
+      <string notr="true"/>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="descriptionLabel">
+     <property name="toolTip">
+      <string notr="true"/>
+     </property>
+     <property name="text">
+      <string notr="true"/>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/launcher/ui/widgets/MCModInfoFrame.cpp b/launcher/ui/widgets/MCModInfoFrame.cpp
deleted file mode 100644
index 22475abc..00000000
--- a/launcher/ui/widgets/MCModInfoFrame.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/* 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 <QMessageBox>
-#include <QtGui>
-
-#include "MCModInfoFrame.h"
-#include "ui_MCModInfoFrame.h"
-
-#include "ui/dialogs/CustomMessageBox.h"
-
-void MCModInfoFrame::updateWithMod(Mod &m)
-{
-    if (m.type() == ResourceType::FOLDER)
-    {
-        clear();
-        return;
-    }
-
-    QString text = "";
-    QString name = "";
-    if (m.name().isEmpty())
-        name = m.internal_id();
-    else
-        name = m.name();
-
-    if (m.homeurl().isEmpty())
-        text = name;
-    else
-        text = "<a href=\"" + m.homeurl() + "\">" + name + "</a>";
-    if (!m.authors().isEmpty())
-        text += " by " + m.authors().join(", ");
-
-    setModText(text);
-
-    if (m.description().isEmpty())
-    {
-        setModDescription(QString());
-    }
-    else
-    {
-        setModDescription(m.description());
-    }
-}
-
-void MCModInfoFrame::clear()
-{
-    setModText(QString());
-    setModDescription(QString());
-}
-
-MCModInfoFrame::MCModInfoFrame(QWidget *parent) :
-    QFrame(parent),
-    ui(new Ui::MCModInfoFrame)
-{
-    ui->setupUi(this);
-    ui->label_ModDescription->setHidden(true);
-    ui->label_ModText->setHidden(true);
-    updateHiddenState();
-}
-
-MCModInfoFrame::~MCModInfoFrame()
-{
-    delete ui;
-}
-
-void MCModInfoFrame::updateHiddenState()
-{
-    if(ui->label_ModDescription->isHidden() && ui->label_ModText->isHidden())
-    {
-        setHidden(true);
-    }
-    else
-    {
-        setHidden(false);
-    }
-}
-
-void MCModInfoFrame::setModText(QString text)
-{
-    if(text.isEmpty())
-    {
-        ui->label_ModText->setHidden(true);
-    }
-    else
-    {
-        ui->label_ModText->setText(text);
-        ui->label_ModText->setHidden(false);
-    }
-    updateHiddenState();
-}
-
-void MCModInfoFrame::setModDescription(QString text)
-{
-    if(text.isEmpty())
-    {
-        ui->label_ModDescription->setHidden(true);
-        updateHiddenState();
-        return;
-    }
-    else
-    {
-        ui->label_ModDescription->setHidden(false);
-        updateHiddenState();
-    }
-    ui->label_ModDescription->setToolTip("");
-    QString intermediatetext = text.trimmed();
-    bool prev(false);
-    QChar rem('\n');
-    QString finaltext;
-    finaltext.reserve(intermediatetext.size());
-    foreach(const QChar& c, intermediatetext)
-    {
-        if(c == rem && prev){
-            continue;
-        }
-        prev = c == rem;
-        finaltext += c;
-    }
-    QString labeltext;
-    labeltext.reserve(300);
-    if(finaltext.length() > 290)
-    {
-        ui->label_ModDescription->setOpenExternalLinks(false);
-        ui->label_ModDescription->setTextFormat(Qt::TextFormat::RichText);
-        desc = text;
-        // This allows injecting HTML here.
-        labeltext.append("<html><body>" + finaltext.left(287) + "<a href=\"#mod_desc\">...</a></body></html>");
-        QObject::connect(ui->label_ModDescription, &QLabel::linkActivated, this, &MCModInfoFrame::modDescEllipsisHandler);
-    }
-    else
-    {
-        ui->label_ModDescription->setTextFormat(Qt::TextFormat::PlainText);
-        labeltext.append(finaltext);
-    }
-    ui->label_ModDescription->setText(labeltext);
-}
-
-void MCModInfoFrame::modDescEllipsisHandler(const QString &link)
-{
-    if(!currentBox)
-    {
-        currentBox = CustomMessageBox::selectable(this, QString(), desc);
-        connect(currentBox, &QMessageBox::finished, this, &MCModInfoFrame::boxClosed);
-        currentBox->show();
-    }
-    else
-    {
-        currentBox->setText(desc);
-    }
-}
-
-void MCModInfoFrame::boxClosed(int result)
-{
-    currentBox = nullptr;
-}
diff --git a/launcher/ui/widgets/MCModInfoFrame.h b/launcher/ui/widgets/MCModInfoFrame.h
deleted file mode 100644
index 0b7ef537..00000000
--- a/launcher/ui/widgets/MCModInfoFrame.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* 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
-
-#include <QFrame>
-#include "minecraft/mod/Mod.h"
-
-namespace Ui
-{
-class MCModInfoFrame;
-}
-
-class MCModInfoFrame : public QFrame
-{
-    Q_OBJECT
-
-public:
-    explicit MCModInfoFrame(QWidget *parent = 0);
-    ~MCModInfoFrame();
-
-    void setModText(QString text);
-    void setModDescription(QString text);
-
-    void updateWithMod(Mod &m);
-    void clear();
-
-public slots:
-    void modDescEllipsisHandler(const QString& link );
-    void boxClosed(int result);
-
-private:
-    void updateHiddenState();
-
-private:
-    Ui::MCModInfoFrame *ui;
-    QString desc;
-    class QMessageBox * currentBox = nullptr;
-};
-
diff --git a/launcher/ui/widgets/MCModInfoFrame.ui b/launcher/ui/widgets/MCModInfoFrame.ui
deleted file mode 100644
index 5ef33379..00000000
--- a/launcher/ui/widgets/MCModInfoFrame.ui
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MCModInfoFrame</class>
- <widget class="QFrame" name="MCModInfoFrame">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>527</width>
-    <height>113</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>120</height>
-   </size>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="label_ModText">
-     <property name="text">
-      <string notr="true"/>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::RichText</enum>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-     <property name="openExternalLinks">
-      <bool>true</bool>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_ModDescription">
-     <property name="toolTip">
-      <string notr="true"/>
-     </property>
-     <property name="text">
-      <string notr="true"/>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::RichText</enum>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-     <property name="openExternalLinks">
-      <bool>true</bool>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
-- 
cgit