From df8e768b77b551832ace0d552ec10c1b062c55f3 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 20 Apr 2015 13:00:15 +0200 Subject: [PATCH] wx: Now that Wii doesn't support descriptions, rename Notes to Maker I'm not sure if Maker is the best name (Developer? Publisher? Company? Copyright?) but I went with it because it's what the game properties window uses. For the sake of backwards compatibility, the INI option wasn't renamed. --- Source/Core/Core/ConfigManager.cpp | 4 +-- Source/Core/Core/ConfigManager.h | 2 +- Source/Core/DolphinWX/FrameTools.cpp | 8 +++--- Source/Core/DolphinWX/GameListCtrl.cpp | 40 ++++++++------------------ Source/Core/DolphinWX/GameListCtrl.h | 2 +- Source/Core/DolphinWX/Globals.h | 2 +- 6 files changed, 21 insertions(+), 37 deletions(-) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 89d561cfca..be488180c7 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -304,7 +304,7 @@ void SConfig::SaveGameListSettings(IniFile& ini) gamelist->Set("ColumnPlatform", m_showSystemColumn); gamelist->Set("ColumnBanner", m_showBannerColumn); - gamelist->Set("ColumnNotes", m_showNotesColumn); + gamelist->Set("ColumnNotes", m_showMakerColumn); gamelist->Set("ColumnID", m_showIDColumn); gamelist->Set("ColumnRegion", m_showRegionColumn); gamelist->Set("ColumnSize", m_showSizeColumn); @@ -556,7 +556,7 @@ void SConfig::LoadGameListSettings(IniFile& ini) // Gamelist columns toggles gamelist->Get("ColumnPlatform", &m_showSystemColumn, true); gamelist->Get("ColumnBanner", &m_showBannerColumn, true); - gamelist->Get("ColumnNotes", &m_showNotesColumn, true); + gamelist->Get("ColumnNotes", &m_showMakerColumn, true); gamelist->Get("ColumnID", &m_showIDColumn, false); gamelist->Get("ColumnRegion", &m_showRegionColumn, true); gamelist->Get("ColumnSize", &m_showSizeColumn, true); diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 23fce73852..2ec97266ff 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -84,7 +84,7 @@ struct SConfig : NonCopyable // Game list column toggles bool m_showSystemColumn; bool m_showBannerColumn; - bool m_showNotesColumn; + bool m_showMakerColumn; bool m_showIDColumn; bool m_showRegionColumn; bool m_showSizeColumn; diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index dde3cd4e4f..68a581fe5c 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -364,8 +364,8 @@ wxMenuBar* CFrame::CreateMenu() columnsMenu->Check(IDM_SHOW_SYSTEM, SConfig::GetInstance().m_showSystemColumn); columnsMenu->AppendCheckItem(IDM_SHOW_BANNER, _("Banner")); columnsMenu->Check(IDM_SHOW_BANNER, SConfig::GetInstance().m_showBannerColumn); - columnsMenu->AppendCheckItem(IDM_SHOW_NOTES, _("Notes")); - columnsMenu->Check(IDM_SHOW_NOTES, SConfig::GetInstance().m_showNotesColumn); + columnsMenu->AppendCheckItem(IDM_SHOW_MAKER, _("Maker")); + columnsMenu->Check(IDM_SHOW_MAKER, SConfig::GetInstance().m_showMakerColumn); columnsMenu->AppendCheckItem(IDM_SHOW_ID, _("Game ID")); columnsMenu->Check(IDM_SHOW_ID, SConfig::GetInstance().m_showIDColumn); columnsMenu->AppendCheckItem(IDM_SHOW_REGION, _("Region")); @@ -2035,8 +2035,8 @@ void CFrame::OnChangeColumnsVisible(wxCommandEvent& event) case IDM_SHOW_BANNER: SConfig::GetInstance().m_showBannerColumn = !SConfig::GetInstance().m_showBannerColumn; break; - case IDM_SHOW_NOTES: - SConfig::GetInstance().m_showNotesColumn = !SConfig::GetInstance().m_showNotesColumn; + case IDM_SHOW_MAKER: + SConfig::GetInstance().m_showMakerColumn = !SConfig::GetInstance().m_showMakerColumn; break; case IDM_SHOW_ID: SConfig::GetInstance().m_showIDColumn = !SConfig::GetInstance().m_showIDColumn; diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index f0bd9268c6..d4b7d85bcf 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -110,24 +110,16 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is if (iso1->GetUniqueID() != iso2->GetUniqueID()) return t * (iso1->GetUniqueID() > iso2->GetUniqueID() ? 1 : -1); if (iso1->GetRevision() != iso2->GetRevision()) - return t * (iso1->GetRevision() > iso2->GetRevision() ? 1 : -1); + return t * (iso1->GetRevision() > iso2->GetRevision() ? 1 : -1); if (iso1->IsDiscTwo() != iso2->IsDiscTwo()) return t * (iso1->IsDiscTwo() ? 1 : -1); } return strcasecmp(iso1->GetName(languageOne).c_str(), iso2->GetName(languageOther).c_str()) * t; - case CGameListCtrl::COLUMN_NOTES: - { - std::string cmp1 = - (iso1->GetPlatform() == GameListItem::GAMECUBE_DISC) ? - iso1->GetCompany() : iso1->GetDescription(languageOne); - std::string cmp2 = - (iso2->GetPlatform() == GameListItem::GAMECUBE_DISC) ? - iso2->GetCompany() : iso2->GetDescription(languageOther); - return strcasecmp(cmp1.c_str(), cmp2.c_str()) * t; - } + case CGameListCtrl::COLUMN_MAKER: + return strcasecmp(iso1->GetCompany().c_str(), iso2->GetCompany().c_str()) * t; case CGameListCtrl::COLUMN_ID: - return strcasecmp(iso1->GetUniqueID().c_str(), iso2->GetUniqueID().c_str()) * t; + return strcasecmp(iso1->GetUniqueID().c_str(), iso2->GetUniqueID().c_str()) * t; case CGameListCtrl::COLUMN_COUNTRY: if (iso1->GetCountry() > iso2->GetCountry()) return 1 * t; @@ -290,10 +282,7 @@ void CGameListCtrl::Update() InsertColumn(COLUMN_BANNER, _("Banner")); InsertColumn(COLUMN_TITLE, _("Title")); - // Instead of showing the notes + the company, which is unknown with - // Wii titles We show in the same column : company for GC games and - // description for Wii/wad games - InsertColumn(COLUMN_NOTES, _("Notes")); + InsertColumn(COLUMN_MAKER, _("Maker")); InsertColumn(COLUMN_ID, _("ID")); InsertColumn(COLUMN_COUNTRY, ""); InsertColumn(COLUMN_SIZE, _("Size")); @@ -310,7 +299,7 @@ void CGameListCtrl::Update() SetColumnWidth(COLUMN_PLATFORM, SConfig::GetInstance().m_showSystemColumn ? 35 + platform_padding : 0); SetColumnWidth(COLUMN_BANNER, SConfig::GetInstance().m_showBannerColumn ? 96 + platform_padding : 0); SetColumnWidth(COLUMN_TITLE, 175 + platform_padding); - SetColumnWidth(COLUMN_NOTES, SConfig::GetInstance().m_showNotesColumn ? 150 + platform_padding : 0); + SetColumnWidth(COLUMN_MAKER, SConfig::GetInstance().m_showMakerColumn ? 150 + platform_padding : 0); SetColumnWidth(COLUMN_ID, SConfig::GetInstance().m_showIDColumn ? 75 + platform_padding : 0); SetColumnWidth(COLUMN_COUNTRY, SConfig::GetInstance().m_showRegionColumn ? 32 + platform_padding : 0); SetColumnWidth(COLUMN_EMULATION_STATE, SConfig::GetInstance().m_showStateColumn ? 50 + platform_padding : 0); @@ -441,12 +430,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index) name = title; SetItem(_Index, COLUMN_TITLE, StrToWxStr(name), -1); - - // We show the company string on GameCube only - // On Wii we show the description instead as the company string is empty - std::string const notes = (rISOFile.GetPlatform() == GameListItem::GAMECUBE_DISC) ? - rISOFile.GetCompany() : rISOFile.GetDescription(); - SetItem(_Index, COLUMN_NOTES, StrToWxStr(notes), -1); + SetItem(_Index, COLUMN_MAKER, StrToWxStr(rISOFile.GetCompany()), -1); // Emulation state SetItemColumnImage(_Index, COLUMN_EMULATION_STATE, m_EmuStateImageIndex[rISOFile.GetEmuState()]); @@ -670,7 +654,7 @@ void CGameListCtrl::ScanForISOs() void CGameListCtrl::OnColBeginDrag(wxListEvent& event) { - if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_NOTES) + if (event.GetColumn() != COLUMN_TITLE && event.GetColumn() != COLUMN_MAKER) event.Veto(); } @@ -1319,13 +1303,13 @@ void CGameListCtrl::AutomaticColumnWidth() + GetColumnWidth(COLUMN_SIZE) + GetColumnWidth(COLUMN_EMULATION_STATE)); - // We hide the Notes column if the window is too small + // We hide the Maker column if the window is too small if (resizable > 400) { - if (SConfig::GetInstance().m_showNotesColumn) + if (SConfig::GetInstance().m_showMakerColumn) { SetColumnWidth(COLUMN_TITLE, resizable / 2); - SetColumnWidth(COLUMN_NOTES, resizable / 2); + SetColumnWidth(COLUMN_MAKER, resizable / 2); } else { @@ -1335,7 +1319,7 @@ void CGameListCtrl::AutomaticColumnWidth() else { SetColumnWidth(COLUMN_TITLE, resizable); - SetColumnWidth(COLUMN_NOTES, 0); + SetColumnWidth(COLUMN_MAKER, 0); } } } diff --git a/Source/Core/DolphinWX/GameListCtrl.h b/Source/Core/DolphinWX/GameListCtrl.h index 15f89b2944..b298d1514c 100644 --- a/Source/Core/DolphinWX/GameListCtrl.h +++ b/Source/Core/DolphinWX/GameListCtrl.h @@ -52,7 +52,7 @@ public: COLUMN_PLATFORM, COLUMN_BANNER, COLUMN_TITLE, - COLUMN_NOTES, + COLUMN_MAKER, COLUMN_ID, COLUMN_COUNTRY, COLUMN_SIZE, diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index 5f9b2167b7..8c3ff3c691 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -176,7 +176,7 @@ enum // List Column Title Toggles IDM_SHOW_SYSTEM, IDM_SHOW_BANNER, - IDM_SHOW_NOTES, + IDM_SHOW_MAKER, IDM_SHOW_ID, IDM_SHOW_REGION, IDM_SHOW_SIZE,