Mirrors/yuzu-fork
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/yuzu.git synced 2024-11-19 20:09:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10352 from grimkor/add-context-menu-status-bar-settings

Browse source 
add context menu for status bar settings
This commit is contained in:
liamwhite 2023-06-01 09:05:23 -04:00 committed by GitHub
commit 5ab5987e74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 152 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/yuzu/configuration/config.cpp
View file

@ -65,6 +65,42 @@ const std::array<int, 2> Config::default_ringcon_analogs{{
Qt::Key_D, Qt::Key_D,
}}; }};
const std::map<Settings::AntiAliasing, QString> Config::anti_aliasing_texts_map = {
{Settings::AntiAliasing::None, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "None"))},
{Settings::AntiAliasing::Fxaa, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "FXAA"))},
{Settings::AntiAliasing::Smaa, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "SMAA"))},
};
const std::map<Settings::ScalingFilter, QString> Config::scaling_filter_texts_map = {
{Settings::ScalingFilter::NearestNeighbor,
QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Nearest"))},
{Settings::ScalingFilter::Bilinear,
QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Bilinear"))},
{Settings::ScalingFilter::Bicubic, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Bicubic"))},
{Settings::ScalingFilter::Gaussian,
QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Gaussian"))},
{Settings::ScalingFilter::ScaleForce,
QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "ScaleForce"))},
{Settings::ScalingFilter::Fsr, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "FSR"))},
};
const std::map<bool, QString> Config::use_docked_mode_texts_map = {
{true, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Docked"))},
{false, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Handheld"))},
};
const std::map<Settings::GPUAccuracy, QString> Config::gpu_accuracy_texts_map = {
{Settings::GPUAccuracy::Normal, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Normal"))},
{Settings::GPUAccuracy::High, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "High"))},
{Settings::GPUAccuracy::Extreme, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Extreme"))},
};
const std::map<Settings::RendererBackend, QString> Config::renderer_backend_texts_map = {
{Settings::RendererBackend::Vulkan, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Vulkan"))},
{Settings::RendererBackend::OpenGL, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "OpenGL"))},
{Settings::RendererBackend::Null, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Null"))},
};
// This shouldn't have anything except static initializers (no functions). So // This shouldn't have anything except static initializers (no functions). So
// QKeySequence(...).toString() is NOT ALLOWED HERE. // QKeySequence(...).toString() is NOT ALLOWED HERE.
// This must be in alphabetical order according to action name as it must have the same order as // This must be in alphabetical order according to action name as it must have the same order as

6
src/yuzu/configuration/config.h
View file

@ -49,6 +49,12 @@ public:
static const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods; static const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods;
static const std::array<UISettings::Shortcut, 22> default_hotkeys; static const std::array<UISettings::Shortcut, 22> default_hotkeys;
static const std::map<Settings::AntiAliasing, QString> anti_aliasing_texts_map;
static const std::map<Settings::ScalingFilter, QString> scaling_filter_texts_map;
static const std::map<bool, QString> use_docked_mode_texts_map;
static const std::map<Settings::GPUAccuracy, QString> gpu_accuracy_texts_map;
static const std::map<Settings::RendererBackend, QString> renderer_backend_texts_map;
static constexpr UISettings::Theme default_theme{ static constexpr UISettings::Theme default_theme{
#ifdef _WIN32 #ifdef _WIN32
UISettings::Theme::DarkColorful UISettings::Theme::DarkColorful

181
src/yuzu/main.cpp
View file

@ -1054,6 +1054,24 @@ void GMainWindow::InitializeWidgets() {
bottomLeft.setY(bottomLeft.y() - volume_popup->geometry().height()); bottomLeft.setY(bottomLeft.y() - volume_popup->geometry().height());
volume_popup->setGeometry(QRect(bottomLeft, QSize(rect.width(), rect.height()))); volume_popup->setGeometry(QRect(bottomLeft, QSize(rect.width(), rect.height())));
}); });
volume_button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(volume_button, &QPushButton::customContextMenuRequested,
[this](const QPoint& menu_location) {
QMenu context_menu;
context_menu.addAction(
Settings::values.audio_muted ? tr("Unmute") : tr("Mute"), [this] {
Settings::values.audio_muted = !Settings::values.audio_muted;
UpdateVolumeUI();
});
context_menu.addAction(tr("Reset Volume"), [this] {
Settings::values.volume.SetValue(100);
UpdateVolumeUI();
});
context_menu.exec(volume_button->mapToGlobal(menu_location));
volume_button->repaint();
});
statusBar()->insertPermanentWidget(0, volume_button); statusBar()->insertPermanentWidget(0, volume_button);
// setup AA button // setup AA button
@ -1074,6 +1092,19 @@ void GMainWindow::InitializeWidgets() {
UpdateAAText(); UpdateAAText();
aa_status_button->setCheckable(true); aa_status_button->setCheckable(true);
aa_status_button->setChecked(true); aa_status_button->setChecked(true);
aa_status_button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(aa_status_button, &QPushButton::customContextMenuRequested,
[this](const QPoint& menu_location) {
QMenu context_menu;
for (auto const& aa_text_pair : Config::anti_aliasing_texts_map) {
context_menu.addAction(aa_text_pair.second, [this, aa_text_pair] {
Settings::values.anti_aliasing.SetValue(aa_text_pair.first);
UpdateAAText();
});
}
context_menu.exec(aa_status_button->mapToGlobal(menu_location));
aa_status_button->repaint();
});
statusBar()->insertPermanentWidget(0, aa_status_button); statusBar()->insertPermanentWidget(0, aa_status_button);
// Setup Filter button // Setup Filter button
@ -1085,6 +1116,19 @@ void GMainWindow::InitializeWidgets() {
UpdateFilterText(); UpdateFilterText();
filter_status_button->setCheckable(true); filter_status_button->setCheckable(true);
filter_status_button->setChecked(true); filter_status_button->setChecked(true);
filter_status_button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(filter_status_button, &QPushButton::customContextMenuRequested,
[this](const QPoint& menu_location) {
QMenu context_menu;
for (auto const& filter_text_pair : Config::scaling_filter_texts_map) {
context_menu.addAction(filter_text_pair.second, [this, filter_text_pair] {
Settings::values.scaling_filter.SetValue(filter_text_pair.first);
UpdateFilterText();
});
}
context_menu.exec(filter_status_button->mapToGlobal(menu_location));
filter_status_button->repaint();
});
statusBar()->insertPermanentWidget(0, filter_status_button); statusBar()->insertPermanentWidget(0, filter_status_button);
// Setup Dock button // Setup Dock button
@ -1094,14 +1138,47 @@ void GMainWindow::InitializeWidgets() {
connect(dock_status_button, &QPushButton::clicked, this, &GMainWindow::OnToggleDockedMode); connect(dock_status_button, &QPushButton::clicked, this, &GMainWindow::OnToggleDockedMode);
dock_status_button->setCheckable(true); dock_status_button->setCheckable(true);
UpdateDockedButton(); UpdateDockedButton();
dock_status_button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(dock_status_button, &QPushButton::customContextMenuRequested,
[this](const QPoint& menu_location) {
QMenu context_menu;
for (auto const& docked_mode_pair : Config::use_docked_mode_texts_map) {
context_menu.addAction(docked_mode_pair.second, [this, docked_mode_pair] {
if (docked_mode_pair.first != Settings::values.use_docked_mode.GetValue()) {
OnToggleDockedMode();
}
});
}
context_menu.exec(dock_status_button->mapToGlobal(menu_location));
dock_status_button->repaint();
});
statusBar()->insertPermanentWidget(0, dock_status_button); statusBar()->insertPermanentWidget(0, dock_status_button);
// Setup GPU Accuracy button
gpu_accuracy_button = new QPushButton(); gpu_accuracy_button = new QPushButton();
gpu_accuracy_button->setObjectName(QStringLiteral("GPUStatusBarButton")); gpu_accuracy_button->setObjectName(QStringLiteral("GPUStatusBarButton"));
gpu_accuracy_button->setCheckable(true); gpu_accuracy_button->setCheckable(true);
gpu_accuracy_button->setFocusPolicy(Qt::NoFocus); gpu_accuracy_button->setFocusPolicy(Qt::NoFocus);
connect(gpu_accuracy_button, &QPushButton::clicked, this, &GMainWindow::OnToggleGpuAccuracy); connect(gpu_accuracy_button, &QPushButton::clicked, this, &GMainWindow::OnToggleGpuAccuracy);
UpdateGPUAccuracyButton(); UpdateGPUAccuracyButton();
gpu_accuracy_button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(gpu_accuracy_button, &QPushButton::customContextMenuRequested,
[this](const QPoint& menu_location) {
QMenu context_menu;
for (auto const& gpu_accuracy_pair : Config::gpu_accuracy_texts_map) {
if (gpu_accuracy_pair.first == Settings::GPUAccuracy::Extreme) {
continue;
}
context_menu.addAction(gpu_accuracy_pair.second, [this, gpu_accuracy_pair] {
Settings::values.gpu_accuracy.SetValue(gpu_accuracy_pair.first);
UpdateGPUAccuracyButton();
});
}
context_menu.exec(gpu_accuracy_button->mapToGlobal(menu_location));
gpu_accuracy_button->repaint();
});
statusBar()->insertPermanentWidget(0, gpu_accuracy_button); statusBar()->insertPermanentWidget(0, gpu_accuracy_button);
// Setup Renderer API button // Setup Renderer API button
@ -1114,6 +1191,24 @@ void GMainWindow::InitializeWidgets() {
renderer_status_button->setCheckable(true); renderer_status_button->setCheckable(true);
renderer_status_button->setChecked(Settings::values.renderer_backend.GetValue() == renderer_status_button->setChecked(Settings::values.renderer_backend.GetValue() ==
Settings::RendererBackend::Vulkan); Settings::RendererBackend::Vulkan);
renderer_status_button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(renderer_status_button, &QPushButton::customContextMenuRequested,
[this](const QPoint& menu_location) {
QMenu context_menu;
for (auto const& renderer_backend_pair : Config::renderer_backend_texts_map) {
if (renderer_backend_pair.first == Settings::RendererBackend::Null) {
continue;
}
context_menu.addAction(
renderer_backend_pair.second, [this, renderer_backend_pair] {
Settings::values.renderer_backend.SetValue(renderer_backend_pair.first);
UpdateAPIText();
});
}
context_menu.exec(renderer_status_button->mapToGlobal(menu_location));
renderer_status_button->repaint();
});
statusBar()->insertPermanentWidget(0, renderer_status_button); statusBar()->insertPermanentWidget(0, renderer_status_button);
statusBar()->setVisible(true); statusBar()->setVisible(true);
@ -4004,94 +4099,38 @@ void GMainWindow::UpdateStatusBar() {
} }
void GMainWindow::UpdateGPUAccuracyButton() { void GMainWindow::UpdateGPUAccuracyButton() {
switch (Settings::values.gpu_accuracy.GetValue()) { const auto gpu_accuracy = Settings::values.gpu_accuracy.GetValue();
case Settings::GPUAccuracy::Normal: { const auto gpu_accuracy_text = Config::gpu_accuracy_texts_map.find(gpu_accuracy)->second;
gpu_accuracy_button->setText(tr("GPU NORMAL")); gpu_accuracy_button->setText(gpu_accuracy_text.toUpper());
gpu_accuracy_button->setChecked(false); gpu_accuracy_button->setChecked(gpu_accuracy != Settings::GPUAccuracy::Normal);
break;
}
case Settings::GPUAccuracy::High: {
gpu_accuracy_button->setText(tr("GPU HIGH"));
gpu_accuracy_button->setChecked(true);
break;
}
case Settings::GPUAccuracy::Extreme: {
gpu_accuracy_button->setText(tr("GPU EXTREME"));
gpu_accuracy_button->setChecked(true);
break;
}
default: {
gpu_accuracy_button->setText(tr("GPU ERROR"));
gpu_accuracy_button->setChecked(true);
break;
}
}
} }
void GMainWindow::UpdateDockedButton() { void GMainWindow::UpdateDockedButton() {
const bool is_docked = Settings::values.use_docked_mode.GetValue(); const bool is_docked = Settings::values.use_docked_mode.GetValue();
dock_status_button->setChecked(is_docked); dock_status_button->setChecked(is_docked);
dock_status_button->setText(is_docked ? tr("DOCKED") : tr("HANDHELD")); dock_status_button->setText(
Config::use_docked_mode_texts_map.find(is_docked)->second.toUpper());
} }
void GMainWindow::UpdateAPIText() { void GMainWindow::UpdateAPIText() {
const auto api = Settings::values.renderer_backend.GetValue(); const auto api = Settings::values.renderer_backend.GetValue();
switch (api) { const auto renderer_status_text = Config::renderer_backend_texts_map.find(api)->second;
case Settings::RendererBackend::OpenGL: renderer_status_button->setText(renderer_status_text.toUpper());
renderer_status_button->setText(tr("OPENGL"));
break;
case Settings::RendererBackend::Vulkan:
renderer_status_button->setText(tr("VULKAN"));
break;
case Settings::RendererBackend::Null:
renderer_status_button->setText(tr("NULL"));
break;
}
} }
void GMainWindow::UpdateFilterText() { void GMainWindow::UpdateFilterText() {
const auto filter = Settings::values.scaling_filter.GetValue(); const auto filter = Settings::values.scaling_filter.GetValue();
switch (filter) { const auto filter_text = Config::scaling_filter_texts_map.find(filter)->second;
case Settings::ScalingFilter::NearestNeighbor: filter_status_button->setText(filter == Settings::ScalingFilter::Fsr ? tr("FSR")
filter_status_button->setText(tr("NEAREST")); : filter_text.toUpper());
break;
case Settings::ScalingFilter::Bilinear:
filter_status_button->setText(tr("BILINEAR"));
break;
case Settings::ScalingFilter::Bicubic:
filter_status_button->setText(tr("BICUBIC"));
break;
case Settings::ScalingFilter::Gaussian:
filter_status_button->setText(tr("GAUSSIAN"));
break;
case Settings::ScalingFilter::ScaleForce:
filter_status_button->setText(tr("SCALEFORCE"));
break;
case Settings::ScalingFilter::Fsr:
filter_status_button->setText(tr("FSR"));
break;
default:
filter_status_button->setText(tr("BILINEAR"));
break;
}
} }
void GMainWindow::UpdateAAText() { void GMainWindow::UpdateAAText() {
const auto aa_mode = Settings::values.anti_aliasing.GetValue(); const auto aa_mode = Settings::values.anti_aliasing.GetValue();
switch (aa_mode) { const auto aa_text = Config::anti_aliasing_texts_map.find(aa_mode)->second;
case Settings::AntiAliasing::None: aa_status_button->setText(aa_mode == Settings::AntiAliasing::None
aa_status_button->setText(tr("NO AA")); ? QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "NO AA"))
break; : aa_text.toUpper());
case Settings::AntiAliasing::Fxaa:
aa_status_button->setText(tr("FXAA"));
break;
case Settings::AntiAliasing::Smaa:
aa_status_button->setText(tr("SMAA"));
break;
default:
aa_status_button->setText(tr("NO AA"));
break;
}
} }
void GMainWindow::UpdateVolumeUI() { void GMainWindow::UpdateVolumeUI() {