piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5664 from ligfx/removesettings

Browse Source 
DolphinQt2: replace Settings with SConfig where possible
This commit is contained in:
Leo Lam
2017-07-04 13:45:21 +02:00
committed by GitHub
parent 365892c61c d0fdb9f149
commit aa1d750f30
16 changed files with 132 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinQt2/GameList/GameFile.cpp
View File

@ -215,11 +215,7 @@ QString GameFile::GetBannerString(const QMap<DiscIO::Language, QString>& m) cons
return QString();
bool wii = m_platform != DiscIO::Platform::GAMECUBE_DISC;
DiscIO::Language current_lang;
if (wii)
current_lang = Settings::Instance().GetWiiSystemLanguage();
else
current_lang = Settings::Instance().GetGCSystemLanguage();
DiscIO::Language current_lang = SConfig::GetInstance().GetCurrentLanguage(wii);
if (m.contains(current_lang))
return m[current_lang];

23
Source/Core/DolphinQt2/GameList/GameList.cpp
View File

@ -17,6 +17,7 @@
#include <QUrl>
#include "Common/FileUtil.h"
#include "Core/ConfigManager.h"
#include "DiscIO/Blob.h"
#include "DiscIO/Enums.h"
@ -72,16 +73,16 @@ void GameList::MakeTableView()
connect(m_table, &QTableView::customContextMenuRequested, this, &GameList::ShowContextMenu);
auto& settings = Settings::Instance();
m_table->setColumnHidden(GameListModel::COL_PLATFORM, !settings.PlatformVisible());
m_table->setColumnHidden(GameListModel::COL_ID, !settings.IDVisible());
m_table->setColumnHidden(GameListModel::COL_BANNER, !settings.BannerVisible());
m_table->setColumnHidden(GameListModel::COL_TITLE, !settings.TitleVisible());
m_table->setColumnHidden(GameListModel::COL_DESCRIPTION, !settings.DescriptionVisible());
m_table->setColumnHidden(GameListModel::COL_MAKER, !settings.MakerVisible());
m_table->setColumnHidden(GameListModel::COL_SIZE, !settings.SizeVisible());
m_table->setColumnHidden(GameListModel::COL_COUNTRY, !settings.CountryVisible());
m_table->setColumnHidden(GameListModel::COL_RATING, !settings.StateVisible());
m_table->setColumnHidden(GameListModel::COL_PLATFORM, !SConfig::GetInstance().m_showSystemColumn);
m_table->setColumnHidden(GameListModel::COL_ID, !SConfig::GetInstance().m_showIDColumn);
m_table->setColumnHidden(GameListModel::COL_BANNER, !SConfig::GetInstance().m_showBannerColumn);
m_table->setColumnHidden(GameListModel::COL_TITLE, !SConfig::GetInstance().m_showTitleColumn);
m_table->setColumnHidden(GameListModel::COL_DESCRIPTION,
!SConfig::GetInstance().m_showDescriptionColumn);
m_table->setColumnHidden(GameListModel::COL_MAKER, !SConfig::GetInstance().m_showMakerColumn);
m_table->setColumnHidden(GameListModel::COL_SIZE, !SConfig::GetInstance().m_showSizeColumn);
m_table->setColumnHidden(GameListModel::COL_COUNTRY, !SConfig::GetInstance().m_showRegionColumn);
m_table->setColumnHidden(GameListModel::COL_RATING, !SConfig::GetInstance().m_showStateColumn);
QHeaderView* hor_header = m_table->horizontalHeader();
hor_header->setSectionResizeMode(GameListModel::COL_PLATFORM, QHeaderView::ResizeToContents);
@ -298,7 +299,7 @@ void GameList::UninstallWAD()
void GameList::SetDefaultISO()
{
Settings::Instance().SetDefaultGame(GetSelectedGame());
SConfig::GetInstance().m_strDefaultISO = GetSelectedGame().toStdString();
}
void GameList::OpenContainingFolder()