Ava GUI: Make Dialogue More Intuitive (#3955)

* Adjust button position and locales

* Shortcuts + Highlight default action

* Update Locales - Corrections Welcome

* Move `Apply` button back to right side

* OS Reactive Button layout

* Fix reversed boolean :)

* Fix accented button styling

Ryujinx.Ava/Assets/Locales/de_DE.json

@@ -166,8 +166,8 @@
   "SettingsTabInput": "Eingabe",
   "SettingsTabInputEnableDockedMode": "Docked Modus",
   "SettingsTabInputDirectKeyboardAccess": "Direkter Tastaturzugriff",
-  "SettingsButtonSave": "Speichern",
+  "SettingsButtonOk": "OK",
-  "SettingsButtonClose": "Schließen",
+  "SettingsButtonCancel": "Abbrechen",
   "SettingsButtonApply": "Übernehmen",
   "ControllerSettingsPlayer": "Spieler",
   "ControllerSettingsPlayer1": "Spieler 1",

Ryujinx.Ava/Assets/Locales/el_GR.json

@@ -166,8 +166,8 @@
   "SettingsTabInput": "Χειρισμός",
   "SettingsTabInputEnableDockedMode": "Ενεργοποίηση Docked Mode",
   "SettingsTabInputDirectKeyboardAccess": "Άμεση Πρόσβαση στο Πληκτρολόγιο",
-  "SettingsButtonSave": "Αποθήκευση",
+  "SettingsButtonOk": "OK",
-  "SettingsButtonClose": "Κλείσιμο",
+  "SettingsButtonCancel": "Ακύρωση",
   "SettingsButtonApply": "Εφαρμογή",
   "ControllerSettingsPlayer": "Παίχτης",
   "ControllerSettingsPlayer1": "Παίχτης 1",

Ryujinx.Ava/Assets/Locales/en_US.json

@@ -166,8 +166,8 @@
   "SettingsTabInput": "Input",
   "SettingsTabInputEnableDockedMode": "Docked Mode",
   "SettingsTabInputDirectKeyboardAccess": "Direct Keyboard Access",
-  "SettingsButtonSave": "Save",
+  "SettingsButtonOk": "OK",
-  "SettingsButtonClose": "Close",
+  "SettingsButtonCancel": "Cancel",
   "SettingsButtonApply": "Apply",
   "ControllerSettingsPlayer": "Player",
   "ControllerSettingsPlayer1": "Player 1",

Ryujinx.Ava/Assets/Locales/es_ES.json

@@ -166,8 +166,8 @@
   "SettingsTabInput": "Entrada",
   "SettingsTabInputEnableDockedMode": "Modo dock/TV",
   "SettingsTabInputDirectKeyboardAccess": "Acceso directo al teclado",
-  "SettingsButtonSave": "Guardar",
+  "SettingsButtonOk": "OK",
-  "SettingsButtonClose": "Cerrar",
+  "SettingsButtonCancel": "Cancelar",
   "SettingsButtonApply": "Aplicar",
   "ControllerSettingsPlayer": "Jugador",
   "ControllerSettingsPlayer1": "Jugador 1",

Ryujinx.Ava/Assets/Locales/fr_FR.json

@@ -159,8 +159,8 @@
   "SettingsTabInput": "Contrôles",
   "SettingsTabInputEnableDockedMode": "Active le mode station d'accueil",
   "SettingsTabInputDirectKeyboardAccess": "Accès direct au clavier",
-  "SettingsButtonSave": "Enregistrer",
+  "SettingsButtonOk": "OK",
-  "SettingsButtonClose": "Fermer",
+  "SettingsButtonCancel": "Annuler",
   "SettingsButtonApply": "Appliquer",
   "ControllerSettingsPlayer": "Joueur",
   "ControllerSettingsPlayer1": "Joueur 1",

Ryujinx.Ava/Assets/Locales/it_IT.json

@@ -166,8 +166,8 @@
     "SettingsTabInput": "Input",
     "SettingsTabInputEnableDockedMode": "Attiva modalità TV",
     "SettingsTabInputDirectKeyboardAccess": "Accesso diretto alla tastiera",
-    "SettingsButtonSave": "Salva",
+    "SettingsButtonOk": "OK",
-    "SettingsButtonClose": "Chiudi",
+    "SettingsButtonCancel": "Cancella",
     "SettingsButtonApply": "Applica",
     "ControllerSettingsPlayer": "Giocatore",
     "ControllerSettingsPlayer1": "Giocatore 1",

Ryujinx.Ava/Assets/Locales/ja_JP.json

@@ -166,8 +166,8 @@
   "SettingsTabInput": "入力",
   "SettingsTabInputEnableDockedMode": "ドッキングモード",
   "SettingsTabInputDirectKeyboardAccess": "キーボード直接アクセス",
-  "SettingsButtonSave": "セーブ",
+  "SettingsButtonOk": "オーケー",
-  "SettingsButtonClose": "閉じる",
+  "SettingsButtonCancel": "キャンセル",
   "SettingsButtonApply": "適用",
   "ControllerSettingsPlayer": "プレイヤー",
   "ControllerSettingsPlayer1": "プレイヤー 1",

Ryujinx.Ava/Assets/Locales/ko_KR.json

@@ -165,8 +165,8 @@
   "SettingsTabInput": "입력",
   "SettingsTabInputEnableDockedMode": "도킹 모드 활성화",
   "SettingsTabInputDirectKeyboardAccess": "직접 키보드 액세스",
-  "SettingsButtonSave": "구하다",
+  "SettingsButtonOk": "좋아",
-  "SettingsButtonClose": "출구",
+  "SettingsButtonCancel": "취소",
   "SettingsButtonApply": "적용하다",
   "ControllerSettingsPlayer": "플레이어",
   "ControllerSettingsPlayer1": "플레이어 1",

Ryujinx.Ava/Assets/Locales/pl_PL.json

@@ -166,8 +166,8 @@
   "SettingsTabInput": "Sterowanie",
   "SettingsTabInputEnableDockedMode": "Tryb Zadokowany",
   "SettingsTabInputDirectKeyboardAccess": "Bezpośredni Dostęp do Klawiatury",
-  "SettingsButtonSave": "Zapisz",
+  "SettingsButtonOk": "OK",
-  "SettingsButtonClose": "Zamknij",
+  "SettingsButtonCancel": "Anuluj",
   "SettingsButtonApply": "Zastosuj",
   "ControllerSettingsPlayer": "Gracz",
   "ControllerSettingsPlayer1": "Gracz 1",

Ryujinx.Ava/Assets/Locales/pt_BR.json

@@ -166,8 +166,8 @@
   "SettingsTabInput": "Controle",
   "SettingsTabInputEnableDockedMode": "Habilitar modo TV",
   "SettingsTabInputDirectKeyboardAccess": "Acesso direto ao teclado",
-  "SettingsButtonSave": "Salvar",
+  "SettingsButtonOk": "OK",
-  "SettingsButtonClose": "Fechar",
+  "SettingsButtonCancel": "Cancelar",
   "SettingsButtonApply": "Aplicar",
   "ControllerSettingsPlayer": "Jogador",
   "ControllerSettingsPlayer1": "Jogador 1",

Ryujinx.Ava/Assets/Locales/ru_RU.json

@@ -165,8 +165,8 @@
   "SettingsTabInput": "Управление",
   "SettingsTabInputEnableDockedMode": "Включить режим закрепления",
   "SettingsTabInputDirectKeyboardAccess": "Прямой доступ с клавиатуры",
-  "SettingsButtonSave": "Сохранить",
+  "SettingsButtonOk": "OK",
-  "SettingsButtonClose": "Закрыть",
+  "SettingsButtonCancel": "Отмена",
   "SettingsButtonApply": "Применить",
   "ControllerSettingsPlayer": "Игрок",
   "ControllerSettingsPlayer1": "Игрок 1",

Ryujinx.Ava/Assets/Locales/tr_TR.json

@@ -166,8 +166,8 @@
   "SettingsTabInput": "Giriş Yöntemi",
   "SettingsTabInputEnableDockedMode": "Docked Modunu Etkinleştir",
   "SettingsTabInputDirectKeyboardAccess": "Doğrudan Klavye Erişimi",
-  "SettingsButtonSave": "Kaydet",
+  "SettingsButtonOk": "Tamam",
-  "SettingsButtonClose": "Kapat",
+  "SettingsButtonCancel": "İptal",
   "SettingsButtonApply": "Uygula",
   "ControllerSettingsPlayer": "Oyuncu",
   "ControllerSettingsPlayer1": "Oyuncu 1",

Ryujinx.Ava/Assets/Locales/zh_CN.json

@@ -166,8 +166,8 @@
   "SettingsTabInput": "输入",
   "SettingsTabInputEnableDockedMode": "主机模式",
   "SettingsTabInputDirectKeyboardAccess": "直通键盘控制",
-  "SettingsButtonSave": "保存",
+  "SettingsButtonOk": "批准",
-  "SettingsButtonClose": "关闭",
+  "SettingsButtonCancel": "取消",
   "SettingsButtonApply": "应用",
   "ControllerSettingsPlayer": "玩家",
   "ControllerSettingsPlayer1": "玩家 1",

Ryujinx.Ava/Assets/Locales/zh_TW.json

@@ -166,8 +166,8 @@
   "SettingsTabInput": "輸入",
   "SettingsTabInputEnableDockedMode": "Docked 模式",
   "SettingsTabInputDirectKeyboardAccess": "直通鍵盤控制",
-  "SettingsButtonSave": "儲存",
+  "SettingsButtonOk": "嘛好",
-  "SettingsButtonClose": "關閉",
+  "SettingsButtonCancel": "取消",
   "SettingsButtonApply": "套用",
   "ControllerSettingsPlayer": "玩家",
   "ControllerSettingsPlayer1": "玩家 1",

Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs

@@ -118,7 +118,12 @@ namespace Ryujinx.Ava.Ui.ViewModels
                 OnPropertyChanged();
             }
         }
-
+        
+        public bool IsMacOS
+        {
+            get => OperatingSystem.IsMacOS();
+        }
+        
         public bool EnableDiscordIntegration { get; set; }
         public bool CheckUpdatesOnStart { get; set; }
         public bool ShowConfirmExit { get; set; }
@@ -474,11 +479,40 @@ namespace Ryujinx.Ava.Ui.ViewModels
             MainWindow.UpdateGraphicsConfig();
 
             _previousVolumeLevel = Volume;
+
+            if (_owner is SettingsWindow owner)
+            {
+                owner.ControllerSettings?.SaveCurrentProfile();
+            }
+            
+            if (_owner.Owner is MainWindow window && _directoryChanged)
+            {
+                window.ViewModel.LoadApplications();
+            }
+
+            _directoryChanged = false;
         }
 
         public void RevertIfNotSaved()
         {
             Program.ReloadConfig();
         }
+
+        public void ApplyButton()
+        {
+            SaveSettings();
+        }
+
+        public void OkButton()
+        {
+            SaveSettings();
+            _owner.Close();
+        }
+
+        public void CancelButton()
+        {
+            RevertIfNotSaved();
+            _owner.Close();
+        }
     }
 }

Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml

@@ -955,16 +955,25 @@
                     Icon="Document" />
             </ui:NavigationView.MenuItems>
         </ui:NavigationView>
-        <StackPanel
+        <ReversibleStackPanel
             Grid.Row="2"
             Margin="10"
             Spacing="10"
             Orientation="Horizontal"
-            HorizontalAlignment="Right">
+            HorizontalAlignment="Right"
-            <Button Content="{locale:Locale SettingsButtonSave}" Click="SaveButton_Clicked" />
+            ReverseOrder="{ReflectionBinding IsMacOS}">
-            <Button Content="{locale:Locale SettingsButtonClose}" Click="CloseButton_Clicked" />
+            <Button 
-            <Button Content="{locale:Locale SettingsButtonApply}"
+                HotKey="Enter" 
-                    Click="ApplyButton_Clicked" />
+                Classes="accent"
-        </StackPanel>
+                Content="{locale:Locale SettingsButtonOk}" 
+                Command="{ReflectionBinding OkButton}" />
+            <Button 
+                HotKey="Escape" 
+                Content="{locale:Locale SettingsButtonCancel}" 
+                Command="{ReflectionBinding CancelButton}" />
+            <Button 
+                Content="{locale:Locale SettingsButtonApply}" 
+                Command="{ReflectionBinding ApplyButton}" />
+        </ReversibleStackPanel>
     </Grid>
 </window:StyleableWindow>

Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs

@@ -199,36 +199,6 @@ namespace Ryujinx.Ava.Ui.Windows
             }
         }
 
-        private void SaveButton_Clicked(object sender, RoutedEventArgs e)
-        {
-            SaveSettings();
-            Close();
-        }
-
-        private void CloseButton_Clicked(object sender, RoutedEventArgs e)
-        {
-            ViewModel.RevertIfNotSaved();
-            Close();
-        }
-
-        private void ApplyButton_Clicked(object sender, RoutedEventArgs e)
-        {
-            SaveSettings();
-        }
-
-        private void SaveSettings()
-        {
-            ViewModel.SaveSettings();
-            ControllerSettings?.SaveCurrentProfile();
-
-            if (Owner is MainWindow window && ViewModel.DirectoryChanged)
-            {
-                window.ViewModel.LoadApplications();
-            }
-
-            ViewModel.DirectoryChanged = false;
-        }
-
         protected override void OnClosed(EventArgs e)
         {
             ControllerSettings.Dispose();