prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lioncash's corrections

Browse Source
This commit is contained in:
CJBok
2020-01-28 22:49:58 +01:00
parent 17b1a3e9fc
commit 0b5dde045f
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/yuzu/main.cpp
View File

@@ -480,7 +480,7 @@ void GMainWindow::InitializeWidgets() {
// Setup Dock button // Setup Dock button
dock_status_button = new QPushButton(); dock_status_button = new QPushButton();
dock_status_button->setObjectName(tr("TogglableStatusBarButton")); dock_status_button->setObjectName(QStringLiteral("TogglableStatusBarButton"));
dock_status_button->setFocusPolicy(Qt::NoFocus); dock_status_button->setFocusPolicy(Qt::NoFocus);
connect(dock_status_button, &QPushButton::clicked, [&] { connect(dock_status_button, &QPushButton::clicked, [&] {
Settings::values.use_docked_mode = !Settings::values.use_docked_mode; Settings::values.use_docked_mode = !Settings::values.use_docked_mode;
@@ -494,11 +494,12 @@ void GMainWindow::InitializeWidgets() {
// Setup ASync button // Setup ASync button
async_status_button = new QPushButton(); async_status_button = new QPushButton();
async_status_button->setObjectName(tr("TogglableStatusBarButton")); async_status_button->setObjectName(QStringLiteral("TogglableStatusBarButton"));
async_status_button->setFocusPolicy(Qt::NoFocus); async_status_button->setFocusPolicy(Qt::NoFocus);
connect(async_status_button, &QPushButton::clicked, [&] { connect(async_status_button, &QPushButton::clicked, [&] {
if (emulation_running) if (emulation_running) {
return; return;
}
Settings::values.use_asynchronous_gpu_emulation = Settings::values.use_asynchronous_gpu_emulation =
!Settings::values.use_asynchronous_gpu_emulation; !Settings::values.use_asynchronous_gpu_emulation;
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation); async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation);
@@ -511,11 +512,11 @@ void GMainWindow::InitializeWidgets() {
// Setup Renderer API button // Setup Renderer API button
renderer_status_button = new QPushButton(); renderer_status_button = new QPushButton();
renderer_status_button->setObjectName(tr("RendererStatusBarButton")); renderer_status_button->setObjectName(QStringLiteral("RendererStatusBarButton"));
renderer_status_button->setCheckable(true); renderer_status_button->setCheckable(true);
renderer_status_button->setFocusPolicy(Qt::NoFocus); renderer_status_button->setFocusPolicy(Qt::NoFocus);
connect(renderer_status_button, &QPushButton::toggled, [=](bool checked) { connect(renderer_status_button, &QPushButton::toggled, [=](bool checked) {
renderer_status_button->setText(tr(checked ? "VULKAN" : "OPENGL")); renderer_status_button->setText(checked ? tr("VULKAN") : tr("OPENGL"));
}); });
renderer_status_button->toggle(); renderer_status_button->toggle();
@@ -527,9 +528,9 @@ void GMainWindow::InitializeWidgets() {
renderer_status_button->setChecked(Settings::values.renderer_backend == renderer_status_button->setChecked(Settings::values.renderer_backend ==
Settings::RendererBackend::Vulkan); Settings::RendererBackend::Vulkan);
connect(renderer_status_button, &QPushButton::clicked, [=] { connect(renderer_status_button, &QPushButton::clicked, [=] {
if (emulation_running) if (emulation_running) {
return; return;
}
if (renderer_status_button->isChecked()) { if (renderer_status_button->isChecked()) {
Settings::values.renderer_backend = Settings::RendererBackend::Vulkan; Settings::values.renderer_backend = Settings::RendererBackend::Vulkan;
} else { } else {
@@ -1909,8 +1910,8 @@ void GMainWindow::OnConfigure() {
dock_status_button->setChecked(Settings::values.use_docked_mode); dock_status_button->setChecked(Settings::values.use_docked_mode);
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation); async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation);
#ifdef HAS_VULKAN #ifdef HAS_VULKAN
renderer_status_button->setChecked( renderer_status_button->setChecked(Settings::values.renderer_backend ==
Settings::values.renderer_backend == Settings::RendererBackend::Vulkan ? true : false); Settings::RendererBackend::Vulkan);
#endif #endif
} }
@@ -2365,7 +2366,7 @@ void GMainWindow::UpdateUITheme() {
QStringList theme_paths(default_theme_paths); QStringList theme_paths(default_theme_paths);
if (is_default_theme || current_theme.isEmpty()) { if (is_default_theme || current_theme.isEmpty()) {
const QString theme_uri(QLatin1Char{':'} + QStringLiteral("default/style.qss")); const QString theme_uri(QStringLiteral(":default/style.qss"));
QFile f(theme_uri); QFile f(theme_uri);
if (f.open(QFile::ReadOnly | QFile::Text)) { if (f.open(QFile::ReadOnly | QFile::Text)) {
QTextStream ts(&f); QTextStream ts(&f);