aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/ui/widgets')
-rw-r--r--launcher/ui/widgets/InfoFrame.cpp (renamed from launcher/ui/widgets/MCModInfoFrame.cpp)96
-rw-r--r--launcher/ui/widgets/InfoFrame.h (renamed from launcher/ui/widgets/MCModInfoFrame.h)36
-rw-r--r--launcher/ui/widgets/InfoFrame.ui (renamed from launcher/ui/widgets/MCModInfoFrame.ui)8
3 files changed, 73 insertions, 67 deletions
diff --git a/launcher/ui/widgets/MCModInfoFrame.cpp b/launcher/ui/widgets/InfoFrame.cpp
index 22475abc..821e61a7 100644
--- a/launcher/ui/widgets/MCModInfoFrame.cpp
+++ b/launcher/ui/widgets/InfoFrame.cpp
@@ -14,14 +14,28 @@
*/
#include <QMessageBox>
-#include <QtGui>
-#include "MCModInfoFrame.h"
-#include "ui_MCModInfoFrame.h"
+#include "InfoFrame.h"
+#include "ui_InfoFrame.h"
#include "ui/dialogs/CustomMessageBox.h"
-void MCModInfoFrame::updateWithMod(Mod &m)
+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)
{
@@ -43,42 +57,32 @@ void MCModInfoFrame::updateWithMod(Mod &m)
if (!m.authors().isEmpty())
text += " by " + m.authors().join(", ");
- setModText(text);
+ setName(text);
if (m.description().isEmpty())
{
- setModDescription(QString());
+ setDescription(QString());
}
else
{
- setModDescription(m.description());
+ setDescription(m.description());
}
}
-void MCModInfoFrame::clear()
-{
- setModText(QString());
- setModDescription(QString());
-}
-
-MCModInfoFrame::MCModInfoFrame(QWidget *parent) :
- QFrame(parent),
- ui(new Ui::MCModInfoFrame)
+void InfoFrame::updateWithResource(const Resource& resource)
{
- ui->setupUi(this);
- ui->label_ModDescription->setHidden(true);
- ui->label_ModText->setHidden(true);
- updateHiddenState();
+ setName(resource.name());
}
-MCModInfoFrame::~MCModInfoFrame()
+void InfoFrame::clear()
{
- delete ui;
+ setName();
+ setDescription();
}
-void MCModInfoFrame::updateHiddenState()
+void InfoFrame::updateHiddenState()
{
- if(ui->label_ModDescription->isHidden() && ui->label_ModText->isHidden())
+ if(ui->descriptionLabel->isHidden() && ui->nameLabel->isHidden())
{
setHidden(true);
}
@@ -88,34 +92,34 @@ void MCModInfoFrame::updateHiddenState()
}
}
-void MCModInfoFrame::setModText(QString text)
+void InfoFrame::setName(QString text)
{
if(text.isEmpty())
{
- ui->label_ModText->setHidden(true);
+ ui->nameLabel->setHidden(true);
}
else
{
- ui->label_ModText->setText(text);
- ui->label_ModText->setHidden(false);
+ ui->nameLabel->setText(text);
+ ui->nameLabel->setHidden(false);
}
updateHiddenState();
}
-void MCModInfoFrame::setModDescription(QString text)
+void InfoFrame::setDescription(QString text)
{
if(text.isEmpty())
{
- ui->label_ModDescription->setHidden(true);
+ ui->descriptionLabel->setHidden(true);
updateHiddenState();
return;
}
else
{
- ui->label_ModDescription->setHidden(false);
+ ui->descriptionLabel->setHidden(false);
updateHiddenState();
}
- ui->label_ModDescription->setToolTip("");
+ ui->descriptionLabel->setToolTip("");
QString intermediatetext = text.trimmed();
bool prev(false);
QChar rem('\n');
@@ -133,36 +137,36 @@ void MCModInfoFrame::setModDescription(QString text)
labeltext.reserve(300);
if(finaltext.length() > 290)
{
- ui->label_ModDescription->setOpenExternalLinks(false);
- ui->label_ModDescription->setTextFormat(Qt::TextFormat::RichText);
- desc = text;
+ 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->label_ModDescription, &QLabel::linkActivated, this, &MCModInfoFrame::modDescEllipsisHandler);
+ QObject::connect(ui->descriptionLabel, &QLabel::linkActivated, this, &InfoFrame::descriptionEllipsisHandler);
}
else
{
- ui->label_ModDescription->setTextFormat(Qt::TextFormat::PlainText);
+ ui->descriptionLabel->setTextFormat(Qt::TextFormat::PlainText);
labeltext.append(finaltext);
}
- ui->label_ModDescription->setText(labeltext);
+ ui->descriptionLabel->setText(labeltext);
}
-void MCModInfoFrame::modDescEllipsisHandler(const QString &link)
+void InfoFrame::descriptionEllipsisHandler(QString link)
{
- if(!currentBox)
+ if(!m_current_box)
{
- currentBox = CustomMessageBox::selectable(this, QString(), desc);
- connect(currentBox, &QMessageBox::finished, this, &MCModInfoFrame::boxClosed);
- currentBox->show();
+ m_current_box = CustomMessageBox::selectable(this, "", m_description);
+ connect(m_current_box, &QMessageBox::finished, this, &InfoFrame::boxClosed);
+ m_current_box->show();
}
else
{
- currentBox->setText(desc);
+ m_current_box->setText(m_description);
}
}
-void MCModInfoFrame::boxClosed(int result)
+void InfoFrame::boxClosed(int result)
{
- currentBox = nullptr;
+ m_current_box = nullptr;
}
diff --git a/launcher/ui/widgets/MCModInfoFrame.h b/launcher/ui/widgets/InfoFrame.h
index 0b7ef537..d69dc232 100644
--- a/launcher/ui/widgets/MCModInfoFrame.h
+++ b/launcher/ui/widgets/InfoFrame.h
@@ -16,37 +16,39 @@
#pragma once
#include <QFrame>
+
#include "minecraft/mod/Mod.h"
+#include "minecraft/mod/ResourcePack.h"
namespace Ui
{
-class MCModInfoFrame;
+class InfoFrame;
}
-class MCModInfoFrame : public QFrame
-{
+class InfoFrame : public QFrame {
Q_OBJECT
-public:
- explicit MCModInfoFrame(QWidget *parent = 0);
- ~MCModInfoFrame();
+ public:
+ InfoFrame(QWidget* parent = nullptr);
+ ~InfoFrame() override;
- void setModText(QString text);
- void setModDescription(QString text);
+ void setName(QString text = {});
+ void setDescription(QString text = {});
- void updateWithMod(Mod &m);
void clear();
-public slots:
- void modDescEllipsisHandler(const QString& link );
+ void updateWithMod(Mod const& m);
+ void updateWithResource(Resource const& resource);
+
+ public slots:
+ void descriptionEllipsisHandler(QString link);
void boxClosed(int result);
-private:
+ private:
void updateHiddenState();
-private:
- Ui::MCModInfoFrame *ui;
- QString desc;
- class QMessageBox * currentBox = nullptr;
+ private:
+ Ui::InfoFrame* ui;
+ QString m_description;
+ class QMessageBox* m_current_box = nullptr;
};
-
diff --git a/launcher/ui/widgets/MCModInfoFrame.ui b/launcher/ui/widgets/InfoFrame.ui
index 5ef33379..0d3772d7 100644
--- a/launcher/ui/widgets/MCModInfoFrame.ui
+++ b/launcher/ui/widgets/InfoFrame.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MCModInfoFrame</class>
- <widget class="QFrame" name="MCModInfoFrame">
+ <class>InfoFrame</class>
+ <widget class="QFrame" name="InfoFrame">
<property name="geometry">
<rect>
<x>0</x>
@@ -39,7 +39,7 @@
<number>0</number>
</property>
<item>
- <widget class="QLabel" name="label_ModText">
+ <widget class="QLabel" name="nameLabel">
<property name="text">
<string notr="true"/>
</property>
@@ -61,7 +61,7 @@
</widget>
</item>
<item>
- <widget class="QLabel" name="label_ModDescription">
+ <widget class="QLabel" name="descriptionLabel">
<property name="toolTip">
<string notr="true"/>
</property>
generated by cgit (git 2.46.0) at 2025-02-03 02:14:47 +0000