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

Merge pull request #4941 from JosJuice/no-compressed-color 

DolphinWX: Don't use a special color for compressed games
This commit is contained in:
Anthony 2017-02-23 07:17:48 -08:00 committed by GitHub
parent 0a3a2fe155 a7e11db4bf
commit f7a09c41a1
5 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/ConfigManager.cpp
View File

@ -207,8 +207,6 @@ void SConfig::SaveGameListSettings(IniFile& ini)
gamelist->Set("ListSort", m_ListSort); gamelist->Set("ListSort", m_ListSort);
gamelist->Set("ListSortSecondary", m_ListSort2); gamelist->Set("ListSortSecondary", m_ListSort2);
gamelist->Set("ColorCompressed", m_ColorCompressed);
gamelist->Set("ColumnPlatform", m_showSystemColumn); gamelist->Set("ColumnPlatform", m_showSystemColumn);
gamelist->Set("ColumnBanner", m_showBannerColumn); gamelist->Set("ColumnBanner", m_showBannerColumn);
gamelist->Set("ColumnNotes", m_showMakerColumn); gamelist->Set("ColumnNotes", m_showMakerColumn);
@ -526,9 +524,6 @@ void SConfig::LoadGameListSettings(IniFile& ini)
gamelist->Get("ListSort", &m_ListSort, 3); gamelist->Get("ListSort", &m_ListSort, 3);
gamelist->Get("ListSortSecondary", &m_ListSort2, 0); gamelist->Get("ListSortSecondary", &m_ListSort2, 0);
// Determines if compressed games display in blue
gamelist->Get("ColorCompressed", &m_ColorCompressed, true);
// Gamelist columns toggles // Gamelist columns toggles
gamelist->Get("ColumnPlatform", &m_showSystemColumn, true); gamelist->Get("ColumnPlatform", &m_showSystemColumn, true);
gamelist->Get("ColumnBanner", &m_showBannerColumn, true); gamelist->Get("ColumnBanner", &m_showBannerColumn, true);

3
Source/Core/Core/ConfigManager.h
View File

@ -289,9 +289,6 @@ struct SConfig : NonCopyable
bool m_showSizeColumn; bool m_showSizeColumn;
bool m_showStateColumn; bool m_showStateColumn;
// Toggles whether compressed titles show up in blue in the game list
bool m_ColorCompressed;
std::string m_WirelessMac; std::string m_WirelessMac;
bool m_PauseMovie; bool m_PauseMovie;
bool m_ShowLag; bool m_ShowLag;

11
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -463,11 +463,7 @@ void CGameListCtrl::ReloadList()
// add all items // add all items
for (int i = 0; i < (int)m_ISOFiles.size(); i++) for (int i = 0; i < (int)m_ISOFiles.size(); i++)
{
InsertItemInReportView(i); InsertItemInReportView(i);
if (SConfig::GetInstance().m_ColorCompressed && m_ISOFiles[i]->IsCompressed())
SetItemTextColour(i, wxColour(0xFF0000));
}
// Sort items by Title // Sort items by Title
if (!sorted) if (!sorted)
@ -1219,7 +1215,8 @@ void CGameListCtrl::CompressSelection(bool _compress)
items_to_compress.push_back(iso); items_to_compress.push_back(iso);
// Show the Wii compression warning if it's relevant and it hasn't been shown already // Show the Wii compression warning if it's relevant and it hasn't been shown already
if (!wii_compression_warning_accepted && _compress && !iso->IsCompressed() && if (!wii_compression_warning_accepted && _compress &&
iso->GetBlobType() != DiscIO::BlobType::GCZ &&
iso->GetPlatform() == DiscIO::Platform::WII_DISC) iso->GetPlatform() == DiscIO::Platform::WII_DISC)
{ {
if (WiiCompressWarning()) if (WiiCompressWarning())
@ -1250,7 +1247,7 @@ void CGameListCtrl::CompressSelection(bool _compress)
for (const GameListItem* iso : items_to_compress) for (const GameListItem* iso : items_to_compress)
{ {
if (!iso->IsCompressed() && _compress) if (iso->GetBlobType() != DiscIO::BlobType::GCZ && _compress)
{ {
std::string FileName; std::string FileName;
SplitPath(iso->GetFileName(), nullptr, &FileName, nullptr); SplitPath(iso->GetFileName(), nullptr, &FileName, nullptr);
@ -1272,7 +1269,7 @@ void CGameListCtrl::CompressSelection(bool _compress)
(iso->GetPlatform() == DiscIO::Platform::WII_DISC) ? 1 : 0, (iso->GetPlatform() == DiscIO::Platform::WII_DISC) ? 1 : 0,
16384, &MultiCompressCB, &progress); 16384, &MultiCompressCB, &progress);
} }
else if (iso->IsCompressed() && !_compress) else if (iso->GetBlobType() == DiscIO::BlobType::GCZ && !_compress)
{ {
std::string FileName; std::string FileName;
SplitPath(iso->GetFileName(), nullptr, &FileName, nullptr); SplitPath(iso->GetFileName(), nullptr, &FileName, nullptr);

6
Source/Core/DolphinWX/ISOFile.cpp
View File

@ -386,9 +386,3 @@ const std::string GameListItem::GetWiiFSPath() const
return ret; return ret;
} }
bool GameListItem::IsCompressed() const
{
return m_blob_type == DiscIO::BlobType::GCZ || m_blob_type == DiscIO::BlobType::CISO ||
m_blob_type == DiscIO::BlobType::WBFS;
}

1
Source/Core/DolphinWX/ISOFile.h
View File

@ -53,7 +53,6 @@ public:
DiscIO::BlobType GetBlobType() const { return m_blob_type; } DiscIO::BlobType GetBlobType() const { return m_blob_type; }
const std::string& GetIssues() const { return m_issues; } const std::string& GetIssues() const { return m_issues; }
int GetEmuState() const { return m_emu_state; } int GetEmuState() const { return m_emu_state; }
bool IsCompressed() const;
u64 GetFileSize() const { return m_FileSize; } u64 GetFileSize() const { return m_FileSize; }
u64 GetVolumeSize() const { return m_VolumeSize; } u64 GetVolumeSize() const { return m_VolumeSize; }
// 0 is the first disc, 1 is the second disc // 0 is the first disc, 1 is the second disc