@ -221,7 +221,7 @@ const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> Config::default
// 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
// UISetting::values.shortcuts, which is alphabetically ordered.
// UISetting::values.shortcuts, which is alphabetically ordered.
// clang-format off
// clang-format off
const std : : array < UISettings : : Shortcut , 18 > Config : : default_hotkeys { {
const std : : array < UISettings : : Shortcut , 2 1> Config : : default_hotkeys { {
{ QStringLiteral ( " Capture Screenshot " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+P " ) , Qt : : WidgetWithChildrenShortcut } } ,
{ QStringLiteral ( " Capture Screenshot " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+P " ) , Qt : : WidgetWithChildrenShortcut } } ,
{ QStringLiteral ( " Change Docked Mode " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " F10 " ) , Qt : : ApplicationShortcut } } ,
{ QStringLiteral ( " Change Docked Mode " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " F10 " ) , Qt : : ApplicationShortcut } } ,
{ QStringLiteral ( " Continue/Pause Emulation " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " F4 " ) , Qt : : WindowShortcut } } ,
{ QStringLiteral ( " Continue/Pause Emulation " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " F4 " ) , Qt : : WindowShortcut } } ,
@ -235,6 +235,9 @@ const std::array<UISettings::Shortcut, 18> Config::default_hotkeys{{
{ QStringLiteral ( " Mute Audio " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+M " ) , Qt : : WindowShortcut } } ,
{ QStringLiteral ( " Mute Audio " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+M " ) , Qt : : WindowShortcut } } ,
{ QStringLiteral ( " Restart Emulation " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " F6 " ) , Qt : : WindowShortcut } } ,
{ QStringLiteral ( " Restart Emulation " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " F6 " ) , Qt : : WindowShortcut } } ,
{ QStringLiteral ( " Stop Emulation " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " F5 " ) , Qt : : WindowShortcut } } ,
{ QStringLiteral ( " Stop Emulation " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " F5 " ) , Qt : : WindowShortcut } } ,
{ QStringLiteral ( " TAS Start/Stop " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+F5 " ) , Qt : : ApplicationShortcut } } ,
{ QStringLiteral ( " TAS Reset " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+F6 " ) , Qt : : ApplicationShortcut } } ,
{ QStringLiteral ( " TAS Record " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+F7 " ) , Qt : : ApplicationShortcut } } ,
{ QStringLiteral ( " Toggle Filter Bar " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+F " ) , Qt : : WindowShortcut } } ,
{ QStringLiteral ( " Toggle Filter Bar " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+F " ) , Qt : : WindowShortcut } } ,
{ QStringLiteral ( " Toggle Framerate Limit " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+U " ) , Qt : : ApplicationShortcut } } ,
{ QStringLiteral ( " Toggle Framerate Limit " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+U " ) , Qt : : ApplicationShortcut } } ,
{ QStringLiteral ( " Toggle Mouse Panning " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+F9 " ) , Qt : : ApplicationShortcut } } ,
{ QStringLiteral ( " Toggle Mouse Panning " ) , QStringLiteral ( " Main Window " ) , { QStringLiteral ( " Ctrl+F9 " ) , Qt : : ApplicationShortcut } } ,
@ -564,6 +567,9 @@ void Config::ReadControlValues() {
Settings : : values . mouse_panning = false ;
Settings : : values . mouse_panning = false ;
ReadBasicSetting ( Settings : : values . mouse_panning_sensitivity ) ;
ReadBasicSetting ( Settings : : values . mouse_panning_sensitivity ) ;
ReadBasicSetting ( Settings : : values . tas_enable = false ) ;
ReadBasicSetting ( Settings : : values . tas_reset = false ) ;
ReadGlobalSetting ( Settings : : values . use_docked_mode ) ;
ReadGlobalSetting ( Settings : : values . use_docked_mode ) ;
// Disable docked mode if handheld is selected
// Disable docked mode if handheld is selected
@ -661,10 +667,21 @@ void Config::ReadDataStorageValues() {
QString : : fromStdString ( FS : : GetYuzuPathString ( FS : : YuzuPath : : DumpDir ) ) )
QString : : fromStdString ( FS : : GetYuzuPathString ( FS : : YuzuPath : : DumpDir ) ) )
. toString ( )
. toString ( )
. toStdString ( ) ) ;
. toStdString ( ) ) ;
FS : : SetYuzuPath (
FS : : YuzuPath : : TASFile ,
qt_config
- > value ( QStringLiteral ( " tas_path " ) ,
QString : : fromStdString ( FS : : GetYuzuPathString ( FS : : YuzuPath : : TASFile ) ) )
. toString ( )
. toStdString ( ) ) ;
ReadBasicSetting ( Settings : : values . pauseTasOnLoad ) ;
ReadBasicSetting ( Settings : : values . gamecard_inserted ) ;
ReadBasicSetting ( Settings : : values . gamecard_inserted ) ;
ReadBasicSetting ( Settings : : values . gamecard_current_game ) ;
ReadBasicSetting ( Settings : : values . gamecard_current_game ) ;
ReadBasicSetting ( Settings : : values . gamecard_path ) ;
ReadBasicSetting ( Settings : : values . gamecard_path ) ;
qt_config - > endGroup ( ) ;
qt_config - > endGroup ( ) ;
}
}
@ -1215,6 +1232,11 @@ void Config::SaveDataStorageValues() {
WriteSetting ( QStringLiteral ( " dump_directory " ) ,
WriteSetting ( QStringLiteral ( " dump_directory " ) ,
QString : : fromStdString ( FS : : GetYuzuPathString ( FS : : YuzuPath : : DumpDir ) ) ,
QString : : fromStdString ( FS : : GetYuzuPathString ( FS : : YuzuPath : : DumpDir ) ) ,
QString : : fromStdString ( FS : : GetYuzuPathString ( FS : : YuzuPath : : DumpDir ) ) ) ;
QString : : fromStdString ( FS : : GetYuzuPathString ( FS : : YuzuPath : : DumpDir ) ) ) ;
WriteSetting ( QStringLiteral ( " tas_path " ) ,
QString : : fromStdString ( FS : : GetYuzuPathString ( FS : : YuzuPath : : TASFile ) ) ,
QString : : fromStdString ( FS : : GetYuzuPathString ( FS : : YuzuPath : : TASFile ) ) ) ;
WriteSetting ( QStringLiteral ( " tas_pause_on_load " ) , Settings : : values . pauseTasOnLoad , true ) ;
WriteBasicSetting ( Settings : : values . gamecard_inserted ) ;
WriteBasicSetting ( Settings : : values . gamecard_inserted ) ;
WriteBasicSetting ( Settings : : values . gamecard_current_game ) ;
WriteBasicSetting ( Settings : : values . gamecard_current_game ) ;
WriteBasicSetting ( Settings : : values . gamecard_path ) ;
WriteBasicSetting ( Settings : : values . gamecard_path ) ;