Lots of little tweaks and fixes

ui/pause/PauseMain.gd

@@ -2,44 +2,37 @@ class_name PauseMain extends VBoxContainer
 
 signal resumeRequested
 signal settingsRequested
-signal mainMenuRequested
-signal quitRequested
 
 @export var btnResume:Button
 @export var btnSettings:Button
 @export var btnMainMenu:Button
 @export var btnQuit:Button
-@export var mainButtons:VBoxContainer
-@export var confirmQuit:VBoxContainer
-@export var btnQuitConfirm:Button
-@export var btnQuitCancel:Button
 
 func _ready() -> void:
   visible = false
   btnResume.pressed.connect(resumeRequested.emit)
   btnSettings.pressed.connect(settingsRequested.emit)
-  btnMainMenu.pressed.connect(mainMenuRequested.emit)
-  btnQuit.pressed.connect(_showConfirm)
-  btnQuitConfirm.pressed.connect(quitRequested.emit)
-  btnQuitCancel.pressed.connect(cancelConfirm)
+  btnMainMenu.pressed.connect(_showMainMenuConfirm)
+  btnQuit.pressed.connect(_showQuitConfirm)
+  UI.QUIT_DIALOG.closed.connect(_onQuitDialogClosed)
+  UI.MAIN_MENU_DIALOG.closed.connect(_onMainMenuDialogClosed)
 
-func _showConfirm() -> void:
-  mainButtons.visible = false
-  confirmQuit.visible = true
-  btnQuitCancel.grab_focus()
+func _showQuitConfirm() -> void:
+  UI.QUIT_DIALOG.open()
 
-func cancelConfirm() -> void:
-  mainButtons.visible = true
-  confirmQuit.visible = false
-  btnQuit.grab_focus()
+func _showMainMenuConfirm() -> void:
+  UI.MAIN_MENU_DIALOG.open()
 
-func isConfirming() -> bool:
-  return confirmQuit.visible
+func _onQuitDialogClosed() -> void:
+  if isOpen():
+    btnQuit.grab_focus()
+
+func _onMainMenuDialogClosed() -> void:
+  if isOpen():
+    btnMainMenu.grab_focus()
 
 func open() -> void:
   visible = true
-  if isConfirming():
-    cancelConfirm()
   btnResume.grab_focus()
 
 func close() -> void: