From b1589a6337c4a1c608a92b6c1bb68c88737d1e7b Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 20 Feb 2017 16:02:30 +0100 Subject: [PATCH 1/2] DolphinWX: Don't use a special color for compressed games - There's no clear definition of what it means for a GC/Wii game to be compressed. GC games in GCZ are obviously compressed, but what about formats like WBFS and CISO that just discard data? - Hardcoded colors might have bad contrast with the used theme. - It feels Windows XP to me. --- Source/Core/Core/ConfigManager.cpp | 5 ----- Source/Core/Core/ConfigManager.h | 3 --- Source/Core/DolphinWX/GameListCtrl.cpp | 4 ---- 3 files changed, 12 deletions(-) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index c5e2b5891a..8b64441f7f 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -207,8 +207,6 @@ void SConfig::SaveGameListSettings(IniFile& ini) gamelist->Set("ListSort", m_ListSort); gamelist->Set("ListSortSecondary", m_ListSort2); - gamelist->Set("ColorCompressed", m_ColorCompressed); - gamelist->Set("ColumnPlatform", m_showSystemColumn); gamelist->Set("ColumnBanner", m_showBannerColumn); gamelist->Set("ColumnNotes", m_showMakerColumn); @@ -526,9 +524,6 @@ void SConfig::LoadGameListSettings(IniFile& ini) gamelist->Get("ListSort", &m_ListSort, 3); gamelist->Get("ListSortSecondary", &m_ListSort2, 0); - // Determines if compressed games display in blue - gamelist->Get("ColorCompressed", &m_ColorCompressed, true); - // Gamelist columns toggles gamelist->Get("ColumnPlatform", &m_showSystemColumn, true); gamelist->Get("ColumnBanner", &m_showBannerColumn, true); diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 3974de3dfe..b156686b6e 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -289,9 +289,6 @@ struct SConfig : NonCopyable bool m_showSizeColumn; bool m_showStateColumn; - // Toggles whether compressed titles show up in blue in the game list - bool m_ColorCompressed; - std::string m_WirelessMac; bool m_PauseMovie; bool m_ShowLag; diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 657a3d44ef..14c262e39b 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -463,11 +463,7 @@ void CGameListCtrl::ReloadList() // add all items for (int i = 0; i < (int)m_ISOFiles.size(); i++) - { InsertItemInReportView(i); - if (SConfig::GetInstance().m_ColorCompressed && m_ISOFiles[i]->IsCompressed()) - SetItemTextColour(i, wxColour(0xFF0000)); - } // Sort items by Title if (!sorted) From a7e11db4bfa33b5e3f6d43022a9c3f87d7052deb Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 20 Feb 2017 16:08:07 +0100 Subject: [PATCH 2/2] DolphinWX: Remove usage of IsCompressed() in compression code What we actually care about is whether it's a GCZ file, not whether it's compressed. (This commit doesn't change the behavior, since the beginning of CompressSelection discards items that aren't BlobType::GCZ or BlobType::PLAIN.) --- Source/Core/DolphinWX/GameListCtrl.cpp | 7 ++++--- Source/Core/DolphinWX/ISOFile.cpp | 6 ------ Source/Core/DolphinWX/ISOFile.h | 1 - 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 14c262e39b..a6ea42048f 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -1215,7 +1215,8 @@ void CGameListCtrl::CompressSelection(bool _compress) items_to_compress.push_back(iso); // 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) { if (WiiCompressWarning()) @@ -1246,7 +1247,7 @@ void CGameListCtrl::CompressSelection(bool _compress) for (const GameListItem* iso : items_to_compress) { - if (!iso->IsCompressed() && _compress) + if (iso->GetBlobType() != DiscIO::BlobType::GCZ && _compress) { std::string FileName; SplitPath(iso->GetFileName(), nullptr, &FileName, nullptr); @@ -1268,7 +1269,7 @@ void CGameListCtrl::CompressSelection(bool _compress) (iso->GetPlatform() == DiscIO::Platform::WII_DISC) ? 1 : 0, 16384, &MultiCompressCB, &progress); } - else if (iso->IsCompressed() && !_compress) + else if (iso->GetBlobType() == DiscIO::BlobType::GCZ && !_compress) { std::string FileName; SplitPath(iso->GetFileName(), nullptr, &FileName, nullptr); diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 5a46458d81..0962f17893 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -386,9 +386,3 @@ const std::string GameListItem::GetWiiFSPath() const 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; -} diff --git a/Source/Core/DolphinWX/ISOFile.h b/Source/Core/DolphinWX/ISOFile.h index d793860759..f12b710483 100644 --- a/Source/Core/DolphinWX/ISOFile.h +++ b/Source/Core/DolphinWX/ISOFile.h @@ -53,7 +53,6 @@ public: DiscIO::BlobType GetBlobType() const { return m_blob_type; } const std::string& GetIssues() const { return m_issues; } int GetEmuState() const { return m_emu_state; } - bool IsCompressed() const; u64 GetFileSize() const { return m_FileSize; } u64 GetVolumeSize() const { return m_VolumeSize; } // 0 is the first disc, 1 is the second disc