Volume: Rename GetName to GetInternalName
This is intended to better separate it from GetNames and to clarify that this name originally wasn't meant to be shown to users. The ISOProperties GUI is also updated, mainly because labeling the long banner name "short name" was confusing.
This commit is contained in:
parent
78e59d08fe
commit
bad09fc358
|
@ -176,7 +176,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
|
||||||
m_strFilename.c_str());
|
m_strFilename.c_str());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
m_strName = pVolume->GetName();
|
m_strName = pVolume->GetInternalName();
|
||||||
m_strUniqueID = pVolume->GetUniqueID();
|
m_strUniqueID = pVolume->GetUniqueID();
|
||||||
m_revision = pVolume->GetRevision();
|
m_revision = pVolume->GetRevision();
|
||||||
|
|
||||||
|
@ -247,7 +247,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
|
||||||
|
|
||||||
if (pVolume)
|
if (pVolume)
|
||||||
{
|
{
|
||||||
m_strName = pVolume->GetName();
|
m_strName = pVolume->GetInternalName();
|
||||||
m_strUniqueID = pVolume->GetUniqueID();
|
m_strUniqueID = pVolume->GetUniqueID();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -76,7 +76,7 @@ public:
|
||||||
virtual std::string GetUniqueID() const = 0;
|
virtual std::string GetUniqueID() const = 0;
|
||||||
virtual std::string GetMakerID() const = 0;
|
virtual std::string GetMakerID() const = 0;
|
||||||
virtual int GetRevision() const = 0;
|
virtual int GetRevision() const = 0;
|
||||||
virtual std::string GetName() const = 0;
|
virtual std::string GetInternalName() const = 0;
|
||||||
virtual std::map<ELanguage, std::string> GetNames() const = 0;
|
virtual std::map<ELanguage, std::string> GetNames() const = 0;
|
||||||
virtual std::map<ELanguage, std::string> GetDescriptions() const { return std::map<ELanguage, std::string>(); }
|
virtual std::map<ELanguage, std::string> GetDescriptions() const { return std::map<ELanguage, std::string>(); }
|
||||||
virtual std::string GetCompany() const { return std::string(); }
|
virtual std::string GetCompany() const { return std::string(); }
|
||||||
|
|
|
@ -182,7 +182,7 @@ std::string CVolumeDirectory::GetMakerID() const
|
||||||
return "VOID";
|
return "VOID";
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string CVolumeDirectory::GetName() const
|
std::string CVolumeDirectory::GetInternalName() const
|
||||||
{
|
{
|
||||||
char name[0x60];
|
char name[0x60];
|
||||||
if (Read(0x20, 0x60, (u8*)name, false))
|
if (Read(0x20, 0x60, (u8*)name, false))
|
||||||
|
@ -194,7 +194,7 @@ std::string CVolumeDirectory::GetName() const
|
||||||
std::map<IVolume::ELanguage, std::string> CVolumeDirectory::GetNames() const
|
std::map<IVolume::ELanguage, std::string> CVolumeDirectory::GetNames() const
|
||||||
{
|
{
|
||||||
std::map<IVolume::ELanguage, std::string> names;
|
std::map<IVolume::ELanguage, std::string> names;
|
||||||
std::string name = GetName();
|
std::string name = GetInternalName();
|
||||||
if (!name.empty())
|
if (!name.empty())
|
||||||
names[IVolume::ELanguage::LANGUAGE_UNKNOWN] = name;
|
names[IVolume::ELanguage::LANGUAGE_UNKNOWN] = name;
|
||||||
return names;
|
return names;
|
||||||
|
|
|
@ -40,7 +40,7 @@ public:
|
||||||
std::string GetMakerID() const override;
|
std::string GetMakerID() const override;
|
||||||
|
|
||||||
int GetRevision() const override { return 0; }
|
int GetRevision() const override { return 0; }
|
||||||
std::string GetName() const override;
|
std::string GetInternalName() const override;
|
||||||
std::map<IVolume::ELanguage, std::string> GetNames() const override;
|
std::map<IVolume::ELanguage, std::string> GetNames() const override;
|
||||||
void SetName(const std::string&);
|
void SetName(const std::string&);
|
||||||
|
|
||||||
|
|
|
@ -96,7 +96,7 @@ int CVolumeGC::GetRevision() const
|
||||||
return revision;
|
return revision;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string CVolumeGC::GetName() const
|
std::string CVolumeGC::GetInternalName() const
|
||||||
{
|
{
|
||||||
char name[0x60];
|
char name[0x60];
|
||||||
if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)name))
|
if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)name))
|
||||||
|
|
|
@ -28,7 +28,7 @@ public:
|
||||||
std::string GetUniqueID() const override;
|
std::string GetUniqueID() const override;
|
||||||
std::string GetMakerID() const override;
|
std::string GetMakerID() const override;
|
||||||
int GetRevision() const override;
|
int GetRevision() const override;
|
||||||
virtual std::string GetName() const override;
|
virtual std::string GetInternalName() const override;
|
||||||
std::map<ELanguage, std::string> GetNames() const override;
|
std::map<ELanguage, std::string> GetNames() const override;
|
||||||
std::map<ELanguage, std::string> GetDescriptions() const override;
|
std::map<ELanguage, std::string> GetDescriptions() const override;
|
||||||
std::string GetCompany() const override;
|
std::string GetCompany() const override;
|
||||||
|
|
|
@ -31,7 +31,7 @@ public:
|
||||||
std::string GetUniqueID() const override;
|
std::string GetUniqueID() const override;
|
||||||
std::string GetMakerID() const override;
|
std::string GetMakerID() const override;
|
||||||
int GetRevision() const override;
|
int GetRevision() const override;
|
||||||
std::string GetName() const override { return ""; }
|
std::string GetInternalName() const override { return ""; }
|
||||||
std::map<IVolume::ELanguage, std::string> GetNames() const override;
|
std::map<IVolume::ELanguage, std::string> GetNames() const override;
|
||||||
u32 GetFSTSize() const override { return 0; }
|
u32 GetFSTSize() const override { return 0; }
|
||||||
std::string GetApploaderDate() const override { return ""; }
|
std::string GetApploaderDate() const override { return ""; }
|
||||||
|
|
|
@ -193,7 +193,7 @@ int CVolumeWiiCrypted::GetRevision() const
|
||||||
return revision;
|
return revision;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string CVolumeWiiCrypted::GetName() const
|
std::string CVolumeWiiCrypted::GetInternalName() const
|
||||||
{
|
{
|
||||||
char name_buffer[0x60];
|
char name_buffer[0x60];
|
||||||
if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)&name_buffer, false))
|
if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)&name_buffer, false))
|
||||||
|
|
|
@ -31,7 +31,7 @@ public:
|
||||||
std::string GetUniqueID() const override;
|
std::string GetUniqueID() const override;
|
||||||
std::string GetMakerID() const override;
|
std::string GetMakerID() const override;
|
||||||
int GetRevision() const override;
|
int GetRevision() const override;
|
||||||
std::string GetName() const override;
|
std::string GetInternalName() const override;
|
||||||
std::map<IVolume::ELanguage, std::string> GetNames() const override;
|
std::map<IVolume::ELanguage, std::string> GetNames() const override;
|
||||||
u32 GetFSTSize() const override;
|
u32 GetFSTSize() const override;
|
||||||
std::string GetApploaderDate() const override;
|
std::string GetApploaderDate() const override;
|
||||||
|
|
|
@ -133,7 +133,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
|
||||||
|
|
||||||
// Disk header and apploader
|
// Disk header and apploader
|
||||||
|
|
||||||
m_Name->SetValue(StrToWxStr(OpenISO->GetName()));
|
m_InternalName->SetValue(StrToWxStr(OpenISO->GetInternalName()));
|
||||||
m_GameID->SetValue(StrToWxStr(OpenISO->GetUniqueID()));
|
m_GameID->SetValue(StrToWxStr(OpenISO->GetUniqueID()));
|
||||||
switch (OpenISO->GetCountry())
|
switch (OpenISO->GetCountry())
|
||||||
{
|
{
|
||||||
|
@ -474,8 +474,8 @@ void CISOProperties::CreateGUIControls()
|
||||||
m_CheatPage->SetSizer(sCheatPage);
|
m_CheatPage->SetSizer(sCheatPage);
|
||||||
|
|
||||||
|
|
||||||
wxStaticText* const m_NameText = new wxStaticText(m_Information, wxID_ANY, _("Name:"));
|
wxStaticText* const m_InternalNameText = new wxStaticText(m_Information, wxID_ANY, _("Internal Name:"));
|
||||||
m_Name = new wxTextCtrl(m_Information, ID_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
m_InternalName = new wxTextCtrl(m_Information, ID_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||||
wxStaticText* const m_GameIDText = new wxStaticText(m_Information, wxID_ANY, _("Game ID:"));
|
wxStaticText* const m_GameIDText = new wxStaticText(m_Information, wxID_ANY, _("Game ID:"));
|
||||||
m_GameID = new wxTextCtrl(m_Information, ID_GAMEID, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
m_GameID = new wxTextCtrl(m_Information, ID_GAMEID, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||||
wxStaticText* const m_CountryText = new wxStaticText(m_Information, wxID_ANY, _("Country:"));
|
wxStaticText* const m_CountryText = new wxStaticText(m_Information, wxID_ANY, _("Country:"));
|
||||||
|
@ -546,19 +546,19 @@ void CISOProperties::CreateGUIControls()
|
||||||
if (arrayStringFor_Lang.size() <= 1)
|
if (arrayStringFor_Lang.size() <= 1)
|
||||||
m_Lang->Disable();
|
m_Lang->Disable();
|
||||||
|
|
||||||
wxStaticText* const m_ShortText = new wxStaticText(m_Information, wxID_ANY, _("Short Name:"));
|
wxStaticText* const m_NameText = new wxStaticText(m_Information, wxID_ANY, _("Name:"));
|
||||||
m_ShortName = new wxTextCtrl(m_Information, ID_SHORTNAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
m_Name = new wxTextCtrl(m_Information, ID_SHORTNAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||||
wxStaticText* const m_MakerText = new wxStaticText(m_Information, wxID_ANY, _("Maker:"));
|
wxStaticText* const m_MakerText = new wxStaticText(m_Information, wxID_ANY, _("Maker:"));
|
||||||
m_Maker = new wxTextCtrl(m_Information, ID_MAKER, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
m_Maker = new wxTextCtrl(m_Information, ID_MAKER, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||||
wxStaticText* const m_CommentText = new wxStaticText(m_Information, wxID_ANY, _("Comment:"));
|
wxStaticText* const m_CommentText = new wxStaticText(m_Information, wxID_ANY, _("Description:"));
|
||||||
m_Comment = new wxTextCtrl(m_Information, ID_COMMENT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY);
|
m_Comment = new wxTextCtrl(m_Information, ID_COMMENT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY);
|
||||||
wxStaticText* const m_BannerText = new wxStaticText(m_Information, wxID_ANY, _("Banner:"));
|
wxStaticText* const m_BannerText = new wxStaticText(m_Information, wxID_ANY, _("Banner:"));
|
||||||
m_Banner = new wxStaticBitmap(m_Information, ID_BANNER, wxNullBitmap, wxDefaultPosition, wxSize(96, 32));
|
m_Banner = new wxStaticBitmap(m_Information, ID_BANNER, wxNullBitmap, wxDefaultPosition, wxSize(96, 32));
|
||||||
|
|
||||||
// ISO Details
|
// ISO Details
|
||||||
wxGridBagSizer* const sISODetails = new wxGridBagSizer(0, 0);
|
wxGridBagSizer* const sISODetails = new wxGridBagSizer(0, 0);
|
||||||
sISODetails->Add(m_NameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
sISODetails->Add(m_InternalNameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||||
sISODetails->Add(m_Name, wxGBPosition(0, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
|
sISODetails->Add(m_InternalName, wxGBPosition(0, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
|
||||||
sISODetails->Add(m_GameIDText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
sISODetails->Add(m_GameIDText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||||
sISODetails->Add(m_GameID, wxGBPosition(1, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
|
sISODetails->Add(m_GameID, wxGBPosition(1, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
|
||||||
sISODetails->Add(m_CountryText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
sISODetails->Add(m_CountryText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||||
|
@ -586,8 +586,8 @@ void CISOProperties::CreateGUIControls()
|
||||||
wxGridBagSizer* const sBannerDetails = new wxGridBagSizer(0, 0);
|
wxGridBagSizer* const sBannerDetails = new wxGridBagSizer(0, 0);
|
||||||
sBannerDetails->Add(m_LangText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
sBannerDetails->Add(m_LangText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||||
sBannerDetails->Add(m_Lang, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
|
sBannerDetails->Add(m_Lang, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
|
||||||
sBannerDetails->Add(m_ShortText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
sBannerDetails->Add(m_NameText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||||
sBannerDetails->Add(m_ShortName, wxGBPosition(1, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
|
sBannerDetails->Add(m_Name, wxGBPosition(1, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
|
||||||
sBannerDetails->Add(m_MakerText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
sBannerDetails->Add(m_MakerText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||||
sBannerDetails->Add(m_Maker, wxGBPosition(2, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
|
sBannerDetails->Add(m_Maker, wxGBPosition(2, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
|
||||||
sBannerDetails->Add(m_CommentText, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALL, 5);
|
sBannerDetails->Add(m_CommentText, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALL, 5);
|
||||||
|
@ -1488,12 +1488,12 @@ void CISOProperties::OnChangeBannerLang(wxCommandEvent& event)
|
||||||
|
|
||||||
void CISOProperties::ChangeBannerDetails(DiscIO::IVolume::ELanguage language)
|
void CISOProperties::ChangeBannerDetails(DiscIO::IVolume::ELanguage language)
|
||||||
{
|
{
|
||||||
wxString const shortName = StrToWxStr(OpenGameListItem->GetName(language));
|
wxString const name = StrToWxStr(OpenGameListItem->GetName(language));
|
||||||
wxString const comment = StrToWxStr(OpenGameListItem->GetDescription(language));
|
wxString const comment = StrToWxStr(OpenGameListItem->GetDescription(language));
|
||||||
wxString const maker = StrToWxStr(OpenGameListItem->GetCompany());
|
wxString const maker = StrToWxStr(OpenGameListItem->GetCompany());
|
||||||
|
|
||||||
// Updates the information shown in the window
|
// Updates the information shown in the window
|
||||||
m_ShortName->SetValue(shortName);
|
m_Name->SetValue(name);
|
||||||
m_Comment->SetValue(comment);
|
m_Comment->SetValue(comment);
|
||||||
m_Maker->SetValue(maker);//dev too
|
m_Maker->SetValue(maker);//dev too
|
||||||
|
|
||||||
|
@ -1501,5 +1501,5 @@ void CISOProperties::ChangeBannerDetails(DiscIO::IVolume::ELanguage language)
|
||||||
SplitPath(OpenGameListItem->GetFileName(), nullptr, &filename, &extension);
|
SplitPath(OpenGameListItem->GetFileName(), nullptr, &filename, &extension);
|
||||||
// Also sets the window's title
|
// Also sets the window's title
|
||||||
SetTitle(StrToWxStr(StringFromFormat("%s%s: %s - ", filename.c_str(),
|
SetTitle(StrToWxStr(StringFromFormat("%s%s: %s - ", filename.c_str(),
|
||||||
extension.c_str(), OpenGameListItem->GetUniqueID().c_str())) + shortName);
|
extension.c_str(), OpenGameListItem->GetUniqueID().c_str())) + name);
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,7 +102,7 @@ private:
|
||||||
wxButton* EditCheat;
|
wxButton* EditCheat;
|
||||||
wxButton* RemoveCheat;
|
wxButton* RemoveCheat;
|
||||||
|
|
||||||
wxTextCtrl* m_Name;
|
wxTextCtrl* m_InternalName;
|
||||||
wxTextCtrl* m_GameID;
|
wxTextCtrl* m_GameID;
|
||||||
wxTextCtrl* m_Country;
|
wxTextCtrl* m_Country;
|
||||||
wxTextCtrl* m_MakerID;
|
wxTextCtrl* m_MakerID;
|
||||||
|
@ -113,7 +113,7 @@ private:
|
||||||
wxButton* m_MD5SumCompute;
|
wxButton* m_MD5SumCompute;
|
||||||
wxArrayString arrayStringFor_Lang;
|
wxArrayString arrayStringFor_Lang;
|
||||||
wxChoice* m_Lang;
|
wxChoice* m_Lang;
|
||||||
wxTextCtrl* m_ShortName;
|
wxTextCtrl* m_Name;
|
||||||
wxTextCtrl* m_Maker;
|
wxTextCtrl* m_Maker;
|
||||||
wxTextCtrl* m_Comment;
|
wxTextCtrl* m_Comment;
|
||||||
wxStaticBitmap* m_Banner;
|
wxStaticBitmap* m_Banner;
|
||||||
|
|
Loading…
Reference in New Issue