AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-07-10 07:05:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

CTemplateEditDialog: Make use of Qt 5 signals and slots

Browse Source
This commit is contained in:
Lioncash 2020-06-29 04:56:43 -04:00
parent df8b0543ba
commit e6cb5c3462
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Editor/WorldEditor/CTemplateEditDialog.cpp
View File

@ -32,7 +32,7 @@ CTemplateEditDialog::CTemplateEditDialog(IProperty *pProperty, QWidget *pParent)
if (AllowTypeNameEdit) if (AllowTypeNameEdit)
{ {
connect( mpUI->TypenameLineEdit, SIGNAL(textChanged(QString)), this, SLOT(RefreshTypeNameOverride()) ); connect(mpUI->TypenameLineEdit, &QLineEdit::textChanged, this, &CTemplateEditDialog::RefreshTypeNameOverride);
mOriginalTypeName = pProperty->RootArchetype()->Name(); mOriginalTypeName = pProperty->RootArchetype()->Name();
mpUI->TypenameLineEdit->setText(TO_QSTRING(mOriginalTypeName)); mpUI->TypenameLineEdit->setText(TO_QSTRING(mOriginalTypeName));
} }
@ -48,7 +48,7 @@ CTemplateEditDialog::CTemplateEditDialog(IProperty *pProperty, QWidget *pParent)
CEnumProperty* pEnum = TPropCast<CEnumProperty>(pProperty); CEnumProperty* pEnum = TPropCast<CEnumProperty>(pProperty);
mOriginalAllowTypeNameOverride = pEnum->OverridesTypeName(); mOriginalAllowTypeNameOverride = pEnum->OverridesTypeName();
mpUI->OverrideTypeNameCheckBox->setChecked(mOriginalAllowTypeNameOverride); mpUI->OverrideTypeNameCheckBox->setChecked(mOriginalAllowTypeNameOverride);
connect( mpUI->OverrideTypeNameCheckBox, SIGNAL(toggled(bool)), this, SLOT(RefreshTypeNameOverride()) ); connect(mpUI->OverrideTypeNameCheckBox, &QCheckBox::toggled, this, &CTemplateEditDialog::RefreshTypeNameOverride);
} }
else else
{ {
@ -61,10 +61,19 @@ CTemplateEditDialog::CTemplateEditDialog(IProperty *pProperty, QWidget *pParent)
if (Type == EPropertyType::Int || Type == EPropertyType::Choice || Type == EPropertyType::Flags || Type == EPropertyType::Sound) if (Type == EPropertyType::Int || Type == EPropertyType::Choice || Type == EPropertyType::Flags || Type == EPropertyType::Sound)
{ {
QMenu* pConvertMenu = new QMenu(this); QMenu* pConvertMenu = new QMenu(this);
if (Type != EPropertyType::Int) pConvertMenu->addAction(tr("Int"), this, SLOT(ConvertToInt()));
if (Type != EPropertyType::Choice) pConvertMenu->addAction(tr("Choice"), this, SLOT(ConvertToChoice())); if (Type != EPropertyType::Int)
if (Type != EPropertyType::Flags) pConvertMenu->addAction(tr("Flags"), this, SLOT(ConvertToFlags())); pConvertMenu->addAction(tr("Int"), this, &CTemplateEditDialog::ConvertToInt);
if (Type != EPropertyType::Sound) pConvertMenu->addAction(tr("Sound"), this, SLOT(ConvertToSound()));
if (Type != EPropertyType::Choice)
pConvertMenu->addAction(tr("Choice"), this, &CTemplateEditDialog::ConvertToChoice);
if (Type != EPropertyType::Flags)
pConvertMenu->addAction(tr("Flags"), this, &CTemplateEditDialog::ConvertToFlags);
if (Type != EPropertyType::Sound)
pConvertMenu->addAction(tr("Sound"), this, &CTemplateEditDialog::ConvertToSound);
mpUI->TypeConversionButton->setMenu(pConvertMenu); mpUI->TypeConversionButton->setMenu(pConvertMenu);
} }
else else
@ -80,7 +89,6 @@ CTemplateEditDialog::CTemplateEditDialog(IProperty *pProperty, QWidget *pParent)
mpUI->ValidityLabel->hide(); mpUI->ValidityLabel->hide();
resize(width(), minimumHeight()); resize(width(), minimumHeight());
} }
else else
{ {
NGameList::LoadAllGameTemplates(); NGameList::LoadAllGameTemplates();
@ -92,7 +100,7 @@ CTemplateEditDialog::CTemplateEditDialog(IProperty *pProperty, QWidget *pParent)
mpUI->TemplatesListWidget->addItem(TO_QSTRING(*Iter)); mpUI->TemplatesListWidget->addItem(TO_QSTRING(*Iter));
mpUI->ValidityLabel->SetValidityText(tr("Hash match! Property name is likely correct."), tr("Hash mismatch! Property name is likely wrong.")); mpUI->ValidityLabel->SetValidityText(tr("Hash match! Property name is likely correct."), tr("Hash mismatch! Property name is likely wrong."));
connect(mpUI->NameLineEdit, SIGNAL( SoftValidityChanged(bool) ), mpUI->ValidityLabel, SLOT( SetValid(bool) ) ); connect(mpUI->NameLineEdit, &CSoftValidatorLineEdit::SoftValidityChanged, mpUI->ValidityLabel, &CValidityLabel::SetValid);
mpValidator->SetProperty(pProperty); mpValidator->SetProperty(pProperty);
mpUI->NameLineEdit->SetSoftValidator(mpValidator); mpUI->NameLineEdit->SetSoftValidator(mpValidator);
@ -106,8 +114,8 @@ CTemplateEditDialog::CTemplateEditDialog(IProperty *pProperty, QWidget *pParent)
mpUI->SourceFileDisplayLabel->setText(TO_QSTRING(Source)); mpUI->SourceFileDisplayLabel->setText(TO_QSTRING(Source));
connect(mpUI->ButtonBox, SIGNAL(accepted()), this, SLOT(ApplyChanges())); connect(mpUI->ButtonBox, &QDialogButtonBox::accepted, this, &CTemplateEditDialog::ApplyChanges);
connect(mpUI->ButtonBox, SIGNAL(rejected()), this, SLOT(close())); connect(mpUI->ButtonBox, &QDialogButtonBox::rejected, this, &CTemplateEditDialog::close);
} }
CTemplateEditDialog::~CTemplateEditDialog() = default; CTemplateEditDialog::~CTemplateEditDialog() = default;