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 #12114 from AdmiralCurtiss/color-correction-button 

DolphinQt/EnhancementsWidget: Use custom tooltip for Color Correction button.
This commit is contained in:
Admiral H. Curtiss 2023-08-18 00:16:47 +02:00 committed by GitHub
parent fc7ef66669 5635a0bdef
commit 42e893d6be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
View File

@ -21,6 +21,7 @@
#include "DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.h" #include "DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.h"
#include "DolphinQt/Config/Graphics/GraphicsWindow.h" #include "DolphinQt/Config/Graphics/GraphicsWindow.h"
#include "DolphinQt/Config/Graphics/PostProcessingConfigWindow.h" #include "DolphinQt/Config/Graphics/PostProcessingConfigWindow.h"
#include "DolphinQt/Config/ToolTipControls/ToolTipPushButton.h"
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h" #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
#include "DolphinQt/QtUtils/SetWindowDecorations.h" #include "DolphinQt/QtUtils/SetWindowDecorations.h"
#include "DolphinQt/Settings.h" #include "DolphinQt/Settings.h"
@ -104,7 +105,7 @@ void EnhancementsWidget::CreateWidgets()
m_texture_filtering_combo->addItem(tr("Force Linear and 16x Anisotropic"), m_texture_filtering_combo->addItem(tr("Force Linear and 16x Anisotropic"),
TEXTURE_FILTERING_FORCE_LINEAR_ANISO_16X); TEXTURE_FILTERING_FORCE_LINEAR_ANISO_16X);
m_configure_color_correction = new NonDefaultQPushButton(tr("Configure")); m_configure_color_correction = new ToolTipPushButton(tr("Configure"));
m_pp_effect = new ToolTipComboBox(); m_pp_effect = new ToolTipComboBox();
m_configure_pp_effect = new NonDefaultQPushButton(tr("Configure")); m_configure_pp_effect = new NonDefaultQPushButton(tr("Configure"));
@ -455,8 +456,8 @@ void EnhancementsWidget::AddDescriptions()
"of the game's textures and might cause issues in a small number of " "of the game's textures and might cause issues in a small number of "
"games.<br><br><dolphin_emphasis>If unsure, select 'Default'.</dolphin_emphasis>"); "games.<br><br><dolphin_emphasis>If unsure, select 'Default'.</dolphin_emphasis>");
static const char TR_COLOR_CORRECTION_DESCRIPTION[] = static const char TR_COLOR_CORRECTION_DESCRIPTION[] =
QT_TR_NOOP("A group of features to make the colors more accurate," QT_TR_NOOP("A group of features to make the colors more accurate, matching the color space "
" matching the color space Wii and GC games were meant for."); "Wii and GC games were meant for.");
static const char TR_POSTPROCESSING_DESCRIPTION[] = static const char TR_POSTPROCESSING_DESCRIPTION[] =
QT_TR_NOOP("Applies a post-processing effect after rendering a frame.<br><br " QT_TR_NOOP("Applies a post-processing effect after rendering a frame.<br><br "
"/><dolphin_emphasis>If unsure, select (off).</dolphin_emphasis>"); "/><dolphin_emphasis>If unsure, select (off).</dolphin_emphasis>");
@ -536,7 +537,8 @@ void EnhancementsWidget::AddDescriptions()
m_texture_filtering_combo->SetTitle(tr("Texture Filtering")); m_texture_filtering_combo->SetTitle(tr("Texture Filtering"));
m_texture_filtering_combo->SetDescription(tr(TR_FORCE_TEXTURE_FILTERING_DESCRIPTION)); m_texture_filtering_combo->SetDescription(tr(TR_FORCE_TEXTURE_FILTERING_DESCRIPTION));
m_configure_color_correction->setToolTip(tr(TR_COLOR_CORRECTION_DESCRIPTION)); m_configure_color_correction->SetTitle(tr("Color Correction"));
m_configure_color_correction->SetDescription(tr(TR_COLOR_CORRECTION_DESCRIPTION));
m_pp_effect->SetTitle(tr("Post-Processing Effect")); m_pp_effect->SetTitle(tr("Post-Processing Effect"));
m_pp_effect->SetDescription(tr(TR_POSTPROCESSING_DESCRIPTION)); m_pp_effect->SetDescription(tr(TR_POSTPROCESSING_DESCRIPTION));

3
Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h
View File

@ -16,6 +16,7 @@ class QComboBox;
class QPushButton; class QPushButton;
class QSlider; class QSlider;
class ToolTipComboBox; class ToolTipComboBox;
class ToolTipPushButton;
class EnhancementsWidget final : public QWidget class EnhancementsWidget final : public QWidget
{ {
@ -39,7 +40,7 @@ private:
ToolTipComboBox* m_aa_combo; ToolTipComboBox* m_aa_combo;
ToolTipComboBox* m_texture_filtering_combo; ToolTipComboBox* m_texture_filtering_combo;
ToolTipComboBox* m_pp_effect; ToolTipComboBox* m_pp_effect;
QPushButton* m_configure_color_correction; ToolTipPushButton* m_configure_color_correction;
QPushButton* m_configure_pp_effect; QPushButton* m_configure_pp_effect;
ConfigBool* m_scaled_efb_copy; ConfigBool* m_scaled_efb_copy;
ConfigBool* m_per_pixel_lighting; ConfigBool* m_per_pixel_lighting;