piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7924 from jordan-woyak/info-widget-fix

Browse Source 
DolphinQt: Fix unused widgets in InfoWidget from being visible.
This commit is contained in:
JMC47 2019-04-02 19:59:44 -04:00 committed by GitHub
commit a2df9beb9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Core/DolphinQt/Config/InfoWidget.cpp
View File

@ -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,16 +182,21 @@ 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());
m_name->setText(QString::fromStdString(m_game.GetLongName(language)));
m_maker->setText(QString::fromStdString(m_game.GetLongMaker(language)));
m_description->setText(QString::fromStdString(m_game.GetDescription(language)));
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)));
}
QWidget* InfoWidget::CreateChecksumComputer()

6
Source/Core/DolphinQt/Config/InfoWidget.h
View File

@ -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 = {};
};

4
Source/Core/DolphinQt/QtUtils/DoubleClickEventFilter.cpp
View File

@ -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)

2
Source/Core/DolphinQt/QtUtils/DoubleClickEventFilter.h
View File

@ -10,7 +10,7 @@ class DoubleClickEventFilter : public QObject
{
Q_OBJECT
public:
explicit DoubleClickEventFilter(QObject* parent);
using QObject::QObject;
signals:
void doubleClicked();

4
Source/Core/DolphinQt/QtUtils/WindowActivationEventFilter.cpp
View File

@ -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)

2
Source/Core/DolphinQt/QtUtils/WindowActivationEventFilter.h
View File

@ -10,7 +10,7 @@ class WindowActivationEventFilter : public QObject
{
Q_OBJECT
public:
explicit WindowActivationEventFilter(QObject* parent);
using QObject::QObject;
signals:
void windowActivated();