ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pcsx2-gui: Clang format - pcsx2\gui\AppAccelerators.h - pcsx2\gui\GlobalCommands.cpp - pcsx2\gui\MainFrame.cpp - pcsx2\gui\MainFrame.h - pcsx2\gui\Panels\GSWindowPanel.cpp - pcsx2\gui\Panels\VideoPanel.cpp

This commit is contained in:
RedDevilus 2020-12-13 03:57:45 +01:00 committed by refractionpcsx2
parent ee54396670
commit 028f468d26
5 changed files with 144 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcsx2/gui/AppAccelerators.h
View File

@ -39,7 +39,10 @@ struct KeyAcceleratorCode
u32 val32; u32 val32;
}; };
KeyAcceleratorCode() : val32( 0 ) {} KeyAcceleratorCode()
: val32(0)
{
}
KeyAcceleratorCode(const wxKeyEvent& evt); KeyAcceleratorCode(const wxKeyEvent& evt);
//grab event attributes only //grab event attributes only
@ -47,9 +50,12 @@ struct KeyAcceleratorCode
{ {
val32 = 0; val32 = 0;
keycode = right.GetKeyCode(); keycode = right.GetKeyCode();
if( right.GetFlags() & wxACCEL_ALT ) Alt(); if (right.GetFlags() & wxACCEL_ALT)
if( right.GetFlags() & wxACCEL_CMD ) Cmd(); Alt();
if( right.GetFlags() & wxACCEL_SHIFT ) Shift(); if (right.GetFlags() & wxACCEL_CMD)
Cmd();
if (right.GetFlags() & wxACCEL_SHIFT)
Shift();
} }
KeyAcceleratorCode(wxKeyCode code) KeyAcceleratorCode(wxKeyCode code)
@ -152,7 +158,6 @@ class CommandDictionary : public std::unordered_map<std::string, const GlobalCom
typedef std::unordered_map<std::string, const GlobalCommandDescriptor*> _parent; typedef std::unordered_map<std::string, const GlobalCommandDescriptor*> _parent;
protected: protected:
public: public:
using _parent::operator[]; using _parent::operator[];
virtual ~CommandDictionary() = default; virtual ~CommandDictionary() = default;
@ -166,7 +171,6 @@ class AcceleratorDictionary : public std::unordered_map<int, const GlobalCommand
typedef std::unordered_map<int, const GlobalCommandDescriptor*> _parent; typedef std::unordered_map<int, const GlobalCommandDescriptor*> _parent;
protected: protected:
public: public:
using _parent::operator[]; using _parent::operator[];

1
pcsx2/gui/GlobalCommands.cpp
View File

@ -865,7 +865,6 @@ void AcceleratorDictionary::Map(const KeyAcceleratorCode& _acode, const char* se
KeyAcceleratorCode acode = _acode; KeyAcceleratorCode acode = _acode;
wxString overrideStr; wxString overrideStr;
wxAcceleratorEntry codeParser; //Provides string parsing capabilities wxAcceleratorEntry codeParser; //Provides string parsing capabilities
wxString ye = GetUiKeysFilename();
wxFileConfig cfg(L"", L"", L"", GetUiKeysFilename(), wxCONFIG_USE_GLOBAL_FILE); wxFileConfig cfg(L"", L"", L"", GetUiKeysFilename(), wxCONFIG_USE_GLOBAL_FILE);
if (cfg.Read(wxString::FromUTF8(searchfor), &overrideStr)) if (cfg.Read(wxString::FromUTF8(searchfor), &overrideStr))
{ {

21
pcsx2/gui/Panels/GSWindowPanel.cpp
View File

@ -33,15 +33,13 @@ Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent )
{ {
_("Fit to Window/Screen"), _("Fit to Window/Screen"),
_("Standard (4:3)"), _("Standard (4:3)"),
_("Widescreen (16:9)") _("Widescreen (16:9)")};
};
const wxString fmv_aspect_ratio_switch_labels[] = const wxString fmv_aspect_ratio_switch_labels[] =
{ {
_("Off (Default)"), _("Off (Default)"),
_("Standard (4:3)"), _("Standard (4:3)"),
_("Widescreen (16:9)") _("Widescreen (16:9)")};
};
// Warning must match the order of the VsyncMode Enum // Warning must match the order of the VsyncMode Enum
const wxString vsync_label[] = const wxString vsync_label[] =
@ -85,21 +83,16 @@ Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent )
L"NOTE: Some games draw their own black-bars, which will not be removed with '0'.\n\n" L"NOTE: Some games draw their own black-bars, which will not be removed with '0'.\n\n"
L"Keyboard: \n" L"Keyboard: \n"
L"CTRL + NUMPAD-PLUS: Zoom-In, \n" L"CTRL + NUMPAD-PLUS: Zoom-In, \n"
L"CTRL + NUMPAD-MINUS: Zoom-Out, \nCTRL + NUMPAD-*: Toggle 100/0" L"CTRL + NUMPAD-MINUS: Zoom-Out, \nCTRL + NUMPAD-*: Toggle 100/0"));
) );
m_combo_vsync->SetToolTip( pxEt( L"Vsync eliminates screen tearing but typically has a big performance hit. It usually only applies to fullscreen mode, and may not work with all GS plugins." m_combo_vsync->SetToolTip(pxEt(L"Vsync eliminates screen tearing but typically has a big performance hit. It usually only applies to fullscreen mode, and may not work with all GS plugins."));
) );
m_check_HideMouse->SetToolTip( pxEt( L"Check this to force the mouse cursor invisible inside the GS window; useful if using the mouse as a primary control device for gaming. By default the mouse auto-hides after 2 seconds of inactivity." m_check_HideMouse->SetToolTip(pxEt(L"Check this to force the mouse cursor invisible inside the GS window; useful if using the mouse as a primary control device for gaming. By default the mouse auto-hides after 2 seconds of inactivity."));
) );
m_check_Fullscreen->SetToolTip(pxEt(L"Enables automatic mode switch to fullscreen when starting or resuming emulation. You can still toggle fullscreen display at any time using \n" m_check_Fullscreen->SetToolTip(pxEt(L"Enables automatic mode switch to fullscreen when starting or resuming emulation. You can still toggle fullscreen display at any time using \n"
L"Alt-Enter or double clicking the output window (game)." L"Alt-Enter or double clicking the output window (game)."));
) );
m_check_CloseGS->SetToolTip( pxEt( L"Completely closes the often large and bulky GS window when pressing ESC or pausing the emulator." m_check_CloseGS->SetToolTip(pxEt(L"Completely closes the often large and bulky GS window when pressing ESC or pausing the emulator."));
) );
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Layout and Positioning // Layout and Positioning