Merge pull request #7924 from jordan-woyak/info-widget-fix
DolphinQt: Fix unused widgets in InfoWidget from being visible.
This commit is contained in:
commit
a2df9beb9f
|
@ -102,24 +102,23 @@ QGroupBox* InfoWidget::CreateBannerDetails()
|
|||
|
||||
layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
|
||||
|
||||
m_name = CreateValueDisplay();
|
||||
m_maker = CreateValueDisplay();
|
||||
m_description = new QTextEdit(group);
|
||||
m_description->setReadOnly(true);
|
||||
CreateLanguageSelector();
|
||||
|
||||
layout->addRow(tr("Show Language:"), m_language_selector);
|
||||
|
||||
if (m_game.GetPlatform() == DiscIO::Platform::GameCubeDisc)
|
||||
{
|
||||
layout->addRow(tr("Name:"), m_name);
|
||||
layout->addRow(tr("Maker:"), m_maker);
|
||||
layout->addRow(tr("Description:"), m_description);
|
||||
layout->addRow(tr("Name:"), m_name = CreateValueDisplay());
|
||||
layout->addRow(tr("Maker:"), m_maker = CreateValueDisplay());
|
||||
layout->addRow(tr("Description:"), m_description = new QTextEdit());
|
||||
m_description->setReadOnly(true);
|
||||
}
|
||||
else if (DiscIO::IsWii(m_game.GetPlatform()))
|
||||
{
|
||||
layout->addRow(tr("Name:"), m_name);
|
||||
layout->addRow(tr("Name:"), m_name = CreateValueDisplay());
|
||||
}
|
||||
|
||||
ChangeLanguage();
|
||||
|
||||
QPixmap banner = ToQPixmap(m_game.GetBannerImage());
|
||||
if (!banner.isNull())
|
||||
layout->addRow(tr("Banner:"), CreateBannerGraphic(banner));
|
||||
|
@ -183,15 +182,20 @@ void InfoWidget::CreateLanguageSelector()
|
|||
connect(m_language_selector,
|
||||
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
|
||||
&InfoWidget::ChangeLanguage);
|
||||
ChangeLanguage();
|
||||
}
|
||||
|
||||
void InfoWidget::ChangeLanguage()
|
||||
{
|
||||
DiscIO::Language language =
|
||||
static_cast<DiscIO::Language>(m_language_selector->currentData().toInt());
|
||||
|
||||
if (m_name)
|
||||
m_name->setText(QString::fromStdString(m_game.GetLongName(language)));
|
||||
|
||||
if (m_maker)
|
||||
m_maker->setText(QString::fromStdString(m_game.GetLongMaker(language)));
|
||||
|
||||
if (m_description)
|
||||
m_description->setText(QString::fromStdString(m_game.GetDescription(language)));
|
||||
}
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ private:
|
|||
UICommon::GameFile m_game;
|
||||
QLineEdit* m_checksum_result;
|
||||
QComboBox* m_language_selector;
|
||||
QLineEdit* m_name;
|
||||
QLineEdit* m_maker;
|
||||
QTextEdit* m_description;
|
||||
QLineEdit* m_name = {};
|
||||
QLineEdit* m_maker = {};
|
||||
QTextEdit* m_description = {};
|
||||
};
|
||||
|
|
|
@ -6,10 +6,6 @@
|
|||
|
||||
#include "DolphinQt/QtUtils/DoubleClickEventFilter.h"
|
||||
|
||||
DoubleClickEventFilter::DoubleClickEventFilter(QObject* parent) : QObject(parent)
|
||||
{
|
||||
}
|
||||
|
||||
bool DoubleClickEventFilter::eventFilter(QObject* object, QEvent* event)
|
||||
{
|
||||
if (event->type() == QEvent::MouseButtonDblClick)
|
||||
|
|
|
@ -10,7 +10,7 @@ class DoubleClickEventFilter : public QObject
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit DoubleClickEventFilter(QObject* parent);
|
||||
using QObject::QObject;
|
||||
|
||||
signals:
|
||||
void doubleClicked();
|
||||
|
|
|
@ -7,10 +7,6 @@
|
|||
|
||||
#include "DolphinQt/QtUtils/WindowActivationEventFilter.h"
|
||||
|
||||
WindowActivationEventFilter::WindowActivationEventFilter(QObject* parent) : QObject(parent)
|
||||
{
|
||||
}
|
||||
|
||||
bool WindowActivationEventFilter::eventFilter(QObject* object, QEvent* event)
|
||||
{
|
||||
if (event->type() == QEvent::WindowDeactivate)
|
||||
|
|
|
@ -10,7 +10,7 @@ class WindowActivationEventFilter : public QObject
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit WindowActivationEventFilter(QObject* parent);
|
||||
using QObject::QObject;
|
||||
|
||||
signals:
|
||||
void windowActivated();
|
||||
|
|
Loading…
Reference in New Issue