ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Rename CreateMemoryCardDialog to MemoryCardCreateDialog 

Consistency.
This commit is contained in:
Stenzek 2023-07-04 20:51:56 +10:00 committed by Connor McLaughlin
parent ecabadbf95
commit 5057dfedba
7 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2-qt/CMakeLists.txt
View File

@ -68,9 +68,6 @@ target_sources(pcsx2-qt PRIVATE
Settings/ControllerSettingsDialog.h
Settings/ControllerSettingsDialog.ui
Settings/ControllerSettingWidgetBinder.h
Settings/CreateMemoryCardDialog.cpp
Settings/CreateMemoryCardDialog.h
Settings/CreateMemoryCardDialog.ui
Settings/DebugSettingsWidget.cpp
Settings/DebugSettingsWidget.h
Settings/DebugSettingsWidget.ui
@ -114,6 +111,9 @@ target_sources(pcsx2-qt PRIVATE
Settings/MemoryCardConvertDialog.ui
Settings/MemoryCardConvertWorker.cpp
Settings/MemoryCardConvertWorker.h
Settings/MemoryCardCreateDialog.cpp
Settings/MemoryCardCreateDialog.h
Settings/MemoryCardCreateDialog.ui
Settings/MemoryCardSettingsWidget.cpp
Settings/MemoryCardSettingsWidget.h
Settings/MemoryCardSettingsWidget.ui

24
pcsx2-qt/Settings/CreateMemoryCardDialog.cpp → pcsx2-qt/Settings/MemoryCardCreateDialog.cpp
View File

@ -22,12 +22,12 @@
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QPushButton>
#include "Settings/CreateMemoryCardDialog.h"
#include "Settings/MemoryCardCreateDialog.h"
#include "pcsx2/MemoryCardFile.h"
#include "pcsx2/System.h"
CreateMemoryCardDialog::CreateMemoryCardDialog(QWidget* parent /* = nullptr */)
MemoryCardCreateDialog::MemoryCardCreateDialog(QWidget* parent /* = nullptr */)
: QDialog(parent)
{
m_ui.setupUi(this);
@ -35,7 +35,7 @@ CreateMemoryCardDialog::CreateMemoryCardDialog(QWidget* parent /* = nullptr */)
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
connect(m_ui.name, &QLineEdit::textChanged, this, &CreateMemoryCardDialog::nameTextChanged);
connect(m_ui.name, &QLineEdit::textChanged, this, &MemoryCardCreateDialog::nameTextChanged);
connect(m_ui.size8MB, &QRadioButton::clicked, this, [this]() { setType(MemoryCardType::File, MemoryCardFileType::PS2_8MB); });
connect(m_ui.size16MB, &QRadioButton::clicked, this, [this]() { setType(MemoryCardType::File, MemoryCardFileType::PS2_16MB); });
@ -46,9 +46,9 @@ CreateMemoryCardDialog::CreateMemoryCardDialog(QWidget* parent /* = nullptr */)
disconnect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, nullptr);
connect(m_ui.buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &CreateMemoryCardDialog::createCard);
connect(m_ui.buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &CreateMemoryCardDialog::close);
connect(m_ui.buttonBox->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, this, &CreateMemoryCardDialog::restoreDefaults);
connect(m_ui.buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &MemoryCardCreateDialog::createCard);
connect(m_ui.buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &MemoryCardCreateDialog::close);
connect(m_ui.buttonBox->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, this, &MemoryCardCreateDialog::restoreDefaults);
#ifndef _WIN32
m_ui.ntfsCompression->setEnabled(false);
@ -57,9 +57,9 @@ CreateMemoryCardDialog::CreateMemoryCardDialog(QWidget* parent /* = nullptr */)
updateState();
}
CreateMemoryCardDialog::~CreateMemoryCardDialog() = default;
MemoryCardCreateDialog::~MemoryCardCreateDialog() = default;
void CreateMemoryCardDialog::nameTextChanged()
void MemoryCardCreateDialog::nameTextChanged()
{
QString controlName(m_ui.name->text());
const int cursorPos = m_ui.name->cursorPosition();
@ -76,14 +76,14 @@ void CreateMemoryCardDialog::nameTextChanged()
updateState();
}
void CreateMemoryCardDialog::setType(MemoryCardType type, MemoryCardFileType fileType)
void MemoryCardCreateDialog::setType(MemoryCardType type, MemoryCardFileType fileType)
{
m_type = type;
m_fileType = fileType;
updateState();
}
void CreateMemoryCardDialog::restoreDefaults()
void MemoryCardCreateDialog::restoreDefaults()
{
setType(MemoryCardType::File, MemoryCardFileType::PS2_8MB);
m_ui.size8MB->setChecked(true);
@ -94,7 +94,7 @@ void CreateMemoryCardDialog::restoreDefaults()
m_ui.sizeFolder->setChecked(false);
}
void CreateMemoryCardDialog::updateState()
void MemoryCardCreateDialog::updateState()
{
const bool okay = (m_ui.name->text().length() > 0);
@ -104,7 +104,7 @@ void CreateMemoryCardDialog::updateState()
#endif
}
void CreateMemoryCardDialog::createCard()
void MemoryCardCreateDialog::createCard()
{
QString name(m_ui.name->text());
std::string nameStr;

10
pcsx2-qt/Settings/CreateMemoryCardDialog.h → pcsx2-qt/Settings/MemoryCardCreateDialog.h
View File

@ -17,17 +17,17 @@
#include <QtWidgets/QDialog>
#include "ui_CreateMemoryCardDialog.h"
#include "ui_MemoryCardCreateDialog.h"
#include "pcsx2/Config.h"
class CreateMemoryCardDialog final : public QDialog
class MemoryCardCreateDialog final : public QDialog
{
Q_OBJECT
public:
explicit CreateMemoryCardDialog(QWidget* parent = nullptr);
~CreateMemoryCardDialog();
explicit MemoryCardCreateDialog(QWidget* parent = nullptr);
~MemoryCardCreateDialog();
private Q_SLOTS:
void nameTextChanged();
@ -38,7 +38,7 @@ private:
void restoreDefaults();
void updateState();
Ui::CreateMemoryCardDialog m_ui;
Ui::MemoryCardCreateDialog m_ui;
MemoryCardType m_type = MemoryCardType::File;
MemoryCardFileType m_fileType = MemoryCardFileType::PS2_8MB;

8
pcsx2-qt/Settings/CreateMemoryCardDialog.ui → pcsx2-qt/Settings/MemoryCardCreateDialog.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CreateMemoryCardDialog</class>
<widget class="QDialog" name="CreateMemoryCardDialog">
<class>MemoryCardCreateDialog</class>
<widget class="QDialog" name="MemoryCardCreateDialog">
<property name="geometry">
<rect>
<x>0</x>
@ -285,7 +285,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>CreateMemoryCardDialog</receiver>
<receiver>MemoryCardCreateDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@ -301,7 +301,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>CreateMemoryCardDialog</receiver>
<receiver>MemoryCardCreateDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">

4
pcsx2-qt/Settings/MemoryCardSettingsWidget.cpp
View File

@ -24,8 +24,8 @@
#include "common/StringUtil.h"
#include "CreateMemoryCardDialog.h"
#include "MemoryCardConvertDialog.h"
#include "MemoryCardCreateDialog.h"
#include "MemoryCardSettingsWidget.h"
#include "QtHost.h"
#include "QtUtils.h"
@ -186,7 +186,7 @@ void MemoryCardSettingsWidget::ejectSlot(u32 slot)
void MemoryCardSettingsWidget::createCard()
{
CreateMemoryCardDialog dialog(QtUtils::GetRootWidget(this));
MemoryCardCreateDialog dialog(QtUtils::GetRootWidget(this));
if (dialog.exec() == QDialog::Accepted)
refresh();
}

8
pcsx2-qt/pcsx2-qt.vcxproj
View File

@ -105,7 +105,7 @@
<ClCompile Include="Settings\BIOSSettingsWidget.cpp" />
<ClCompile Include="Settings\ControllerBindingWidgets.cpp" />
<ClCompile Include="Settings\ControllerGlobalSettingsWidget.cpp" />
<ClCompile Include="Settings\CreateMemoryCardDialog.cpp" />
<ClCompile Include="Settings\MemoryCardCreateDialog.cpp" />
<ClCompile Include="Settings\EmulationSettingsWidget.cpp" />
<ClCompile Include="Settings\GameListSettingsWidget.cpp" />
<ClCompile Include="Settings\GraphicsSettingsWidget.cpp" />
@ -172,7 +172,7 @@
<QtMoc Include="Settings\GamePatchSettingsWidget.h" />
<ClInclude Include="Settings\HddCreateQt.h" />
<QtMoc Include="Settings\GameSummaryWidget.h" />
<QtMoc Include="Settings\CreateMemoryCardDialog.h" />
<QtMoc Include="Settings\MemoryCardCreateDialog.h" />
<QtMoc Include="Settings\AchievementLoginDialog.h" />
<QtMoc Include="Settings\AchievementSettingsWidget.h" />
<QtMoc Include="GameList\GameListModel.h" />
@ -212,7 +212,7 @@
<ClCompile Include="$(IntDir)Settings\moc_ControllerBindingWidgets.cpp" />
<ClCompile Include="$(IntDir)Settings\moc_ControllerGlobalSettingsWidget.cpp" />
<ClCompile Include="$(IntDir)Settings\moc_ControllerSettingsDialog.cpp" />
<ClCompile Include="$(IntDir)Settings\moc_CreateMemoryCardDialog.cpp" />
<ClCompile Include="$(IntDir)Settings\moc_MemoryCardCreateDialog.cpp" />
<ClCompile Include="$(IntDir)Settings\moc_EmulationSettingsWidget.cpp" />
<ClCompile Include="$(IntDir)Settings\moc_GameListSettingsWidget.cpp" />
<ClCompile Include="$(IntDir)Settings\moc_GraphicsSettingsWidget.cpp" />
@ -312,7 +312,7 @@
<QtUi Include="Settings\ControllerGlobalSettingsWidget.ui">
<FileType>Document</FileType>
</QtUi>
<QtUi Include="Settings\CreateMemoryCardDialog.ui">
<QtUi Include="Settings\MemoryCardCreateDialog.ui">
<FileType>Document</FileType>
</QtUi>
<QtUi Include="Settings\AudioSettingsWidget.ui">

8
pcsx2-qt/pcsx2-qt.vcxproj.filters
View File

@ -190,10 +190,10 @@
<ClCompile Include="Settings\AudioSettingsWidget.cpp">
<Filter>Settings</Filter>
</ClCompile>
<ClCompile Include="$(IntDir)Settings\moc_CreateMemoryCardDialog.cpp">
<ClCompile Include="$(IntDir)Settings\moc_MemoryCardCreateDialog.cpp">
<Filter>moc</Filter>
</ClCompile>
<ClCompile Include="Settings\CreateMemoryCardDialog.cpp">
<ClCompile Include="Settings\MemoryCardCreateDialog.cpp">
<Filter>Settings</Filter>
</ClCompile>
<ClCompile Include="Settings\DEV9DnsHostDialog.cpp">
@ -423,7 +423,7 @@
<QtMoc Include="Settings\AudioSettingsWidget.h">
<Filter>Settings</Filter>
</QtMoc>
<QtMoc Include="Settings\CreateMemoryCardDialog.h">
<QtMoc Include="Settings\MemoryCardCreateDialog.h">
<Filter>Settings</Filter>
</QtMoc>
<QtMoc Include="Settings\DEV9DnsHostDialog.h">
@ -549,7 +549,7 @@
<QtUi Include="Settings\AudioSettingsWidget.ui">
<Filter>Settings</Filter>
</QtUi>
<QtUi Include="Settings\CreateMemoryCardDialog.ui">
<QtUi Include="Settings\MemoryCardCreateDialog.ui">
<Filter>Settings</Filter>
</QtUi>
<QtUi Include="Settings\DEV9DnsHostDialog.ui">