From 27234ddd67d7e5983fc0bea5939ab3bec51cf5f2 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Tue, 21 Nov 2023 13:31:02 -0500
Subject: [PATCH 01/16] Work in progress on backup popup

---
 source/funkin/save/Save.hx                    |  24 +++++
 .../ui/debug/charting/ChartEditorState.hx     | 100 ++++++++++++++----
 .../handlers/ChartEditorDialogHandler.hx      |  33 ++++++
 .../ChartEditorImportExportHandler.hx         |  12 ++-
 source/funkin/ui/debug/charting/import.hx     |   1 +
 source/funkin/util/FileUtil.hx                |   5 +
 source/funkin/util/logging/CrashHandler.hx    |  18 ++++
 7 files changed, 169 insertions(+), 24 deletions(-)

diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx
index efb3ee623..06b679c87 100644
--- a/source/funkin/save/Save.hx
+++ b/source/funkin/save/Save.hx
@@ -177,6 +177,23 @@ abstract Save(RawSaveData)
     return this.optionsChartEditor.previousFiles;
   }
 
+  public var chartEditorHasBackup(get, set):Bool;
+
+  function get_chartEditorHasBackup():Bool
+  {
+    if (this.optionsChartEditor.hasBackup == null) this.optionsChartEditor.hasBackup = [];
+
+    return this.optionsChartEditor.hasBackup;
+  }
+
+  function set_chartEditorHasBackup(value:Array<String>):Bool
+  {
+    // Set and apply.
+    this.optionsChartEditor.hasBackup = value;
+    flush();
+    return this.optionsChartEditor.hasBackup;
+  }
+
   public var chartEditorNoteQuant(get, set):Int;
 
   function get_chartEditorNoteQuant():Int
@@ -926,6 +943,13 @@ typedef SaveControlsData =
  */
 typedef SaveDataChartEditorOptions =
 {
+  /**
+   * Whether the Chart Editor created a backup the last time it closed.
+   * Prompt the user to load it, then set this back to `false`.
+   * @default `false`
+   */
+  var ?hasBackup:Bool;
+
   /**
    * Previous files opened in the Chart Editor.
    * @default `[]`
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index a3aeccc02..e937baf14 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -1,5 +1,6 @@
 package funkin.ui.debug.charting;
 
+import funkin.util.logging.CrashHandler;
 import haxe.ui.containers.menus.MenuBar;
 import flixel.addons.display.FlxSliceSprite;
 import flixel.addons.display.FlxTiledSprite;
@@ -779,6 +780,18 @@ class ChartEditorState extends HaxeUIState
     return saveDataDirty;
   }
 
+  var shouldShowBackupAvailableDialog(get, set):Bool;
+
+  function get_shouldShowBackupAvailableDialog():Bool
+  {
+    return Save.get().chartEditorHasBackup;
+  }
+
+  function set_shouldShowBackupAvailableDialog(value:Bool):Bool
+  {
+    return Save.get().chartEditorHasBackup = value;
+  }
+
   /**
    * Whether the difficulty tree view in the toolbox has been modified and needs to be updated.
    * This happens when we add/remove difficulties.
@@ -1498,7 +1511,7 @@ class ChartEditorState extends HaxeUIState
 
     buildAdditionalUI();
     populateOpenRecentMenu();
-    ChartEditorShortcutHandler.applyPlatformShortcutText(this);
+    this.applyPlatformShortcutText();
 
     // Setup the onClick listeners for the UI after it's been created.
     setupUIListeners();
@@ -1511,7 +1524,7 @@ class ChartEditorState extends HaxeUIState
     if (params != null && params.fnfcTargetPath != null)
     {
       // Chart editor was opened from the command line. Open the FNFC file now!
-      var result:Null<Array<String>> = ChartEditorImportExportHandler.loadFromFNFCPath(this, params.fnfcTargetPath);
+      var result:Null<Array<String>> = this.loadFromFNFCPath(params.fnfcTargetPath);
       if (result != null)
       {
         #if !mac
@@ -1537,8 +1550,8 @@ class ChartEditorState extends HaxeUIState
         #end
 
         // Song failed to load, open the Welcome dialog so we aren't in a broken state.
-        ChartEditorDialogHandler.openWelcomeDialog(this, false);
-      }
+        this.openWelcomeDialog(false);
+        if (shouldShowBackupAvailableDialog)}
     }
     else if (params != null && params.targetSongId != null)
     {
@@ -1546,7 +1559,7 @@ class ChartEditorState extends HaxeUIState
     }
     else
     {
-      ChartEditorDialogHandler.openWelcomeDialog(this, false);
+      this.openWelcomeDialog(false);
     }
   }
 
@@ -1560,6 +1573,7 @@ class ChartEditorState extends HaxeUIState
   {
     var save:Save = Save.get();
 
+    showBackupAvailablePopup = save.chartEditorHasBackup;
     if (previousWorkingFilePaths[0] == null)
     {
       previousWorkingFilePaths = [null].concat(save.chartEditorPreviousFiles);
@@ -1583,7 +1597,7 @@ class ChartEditorState extends HaxeUIState
     // audioVocalTrackGroup.pitch = save.chartEditorPlaybackSpeed;
   }
 
-  public function writePreferences():Void
+  public function writePreferences(hasBackup:Bool):Void
   {
     var save:Save = Save.get();
 
@@ -1592,6 +1606,7 @@ class ChartEditorState extends HaxeUIState
     for (chartPath in previousWorkingFilePaths)
       if (chartPath != null) filteredWorkingFilePaths.push(chartPath);
 
+    save.chartEditorHasBackup = hasBackup;
     save.chartEditorPreviousFiles = filteredWorkingFilePaths;
     save.chartEditorNoteQuant = noteSnapQuantIndex;
     save.chartEditorLiveInputStyle = currentLiveInputStyle;
@@ -1624,7 +1639,7 @@ class ChartEditorState extends HaxeUIState
         stopWelcomeMusic();
 
         // Load chart from file
-        var result:Null<Array<String>> = ChartEditorImportExportHandler.loadFromFNFCPath(this, chartPath);
+        var result:Null<Array<String>> = this.loadFromFNFCPath(chartPath);
         if (result != null)
         {
           #if !mac
@@ -2017,21 +2032,21 @@ class ChartEditorState extends HaxeUIState
 
     // Add functionality to the menu items.
 
-    addUIClickListener('menubarItemNewChart', _ -> ChartEditorDialogHandler.openWelcomeDialog(this, true));
-    addUIClickListener('menubarItemOpenChart', _ -> ChartEditorDialogHandler.openBrowseFNFC(this, true));
+    addUIClickListener('menubarItemNewChart', _ -> this.openWelcomeDialog(true));
+    addUIClickListener('menubarItemOpenChart', _ -> this.openBrowseFNFC(true));
     addUIClickListener('menubarItemSaveChart', _ -> {
       if (currentWorkingFilePath != null)
       {
-        ChartEditorImportExportHandler.exportAllSongData(this, true, currentWorkingFilePath);
+        this.exportAllSongData(true, currentWorkingFilePath);
       }
       else
       {
-        ChartEditorImportExportHandler.exportAllSongData(this, false);
+        this.exportAllSongData(false);
       }
     });
-    addUIClickListener('menubarItemSaveChartAs', _ -> ChartEditorImportExportHandler.exportAllSongData(this));
-    addUIClickListener('menubarItemLoadInst', _ -> ChartEditorDialogHandler.openUploadInstDialog(this, true));
-    addUIClickListener('menubarItemImportChart', _ -> ChartEditorDialogHandler.openImportChartDialog(this, 'legacy', true));
+    addUIClickListener('menubarItemSaveChartAs', _ -> this.exportAllSongData());
+    addUIClickListener('menubarItemLoadInst', _ -> this.openUploadInstDialog(true));
+    addUIClickListener('menubarItemImportChart', _ -> this.openImportChartDialog('legacy', true));
     addUIClickListener('menubarItemExit', _ -> quitChartEditor());
 
     addUIClickListener('menubarItemUndo', _ -> undoLastCommand());
@@ -2227,7 +2242,13 @@ class ChartEditorState extends HaxeUIState
    */
   function setupAutoSave():Void
   {
+    // Called when clicking the X button on the window.
     WindowUtil.windowExit.add(onWindowClose);
+
+    // Called when the game crashes.
+    CrashHandler.errorSignal.add(onWindowCrash);
+    CrashHandler.criticalErrorSignal.add(onWindowCrash);
+
     saveDataDirty = false;
   }
 
@@ -2239,7 +2260,7 @@ class ChartEditorState extends HaxeUIState
     saveDataDirty = false;
 
     // Auto-save preferences.
-    writePreferences();
+    writePreferences(false);
 
     // Auto-save the chart.
     #if html5
@@ -2247,24 +2268,51 @@ class ChartEditorState extends HaxeUIState
     // TODO: Implement this.
     #else
     // Auto-save to temp file.
-    ChartEditorImportExportHandler.exportAllSongData(this, true);
+    this.exportAllSongData(true);
     #end
   }
 
+  /**
+   * Called when the window was closed, to save a backup of the chart.
+   * @param exitCode The exit code of the window. We use `-1` when calling the function due to a game crash.
+   */
   function onWindowClose(exitCode:Int):Void
   {
     trace('Window exited with exit code: $exitCode');
     trace('Should save chart? $saveDataDirty');
 
-    if (saveDataDirty)
+    var needsAutoSave:Bool = saveDataDirty;
+
+    writePreferences(needsAutoSave);
+
+    if (needsAutoSave)
     {
-      ChartEditorImportExportHandler.exportAllSongData(this, true);
+      this.exportAllSongData(true);
+    }
+  }
+
+  function onWindowCrash(message:String):Void
+  {
+    trace('Chart editor intercepted crash:');
+    trace('${message}');
+
+    trace('Should save chart? $saveDataDirty');
+
+    var needsAutoSave:Bool = saveDataDirty;
+
+    writePreferences(needsAutoSave);
+
+    if (needsAutoSave)
+    {
+      this.exportAllSongData(true);
     }
   }
 
   function cleanupAutoSave():Void
   {
     WindowUtil.windowExit.remove(onWindowClose);
+    CrashHandler.errorSignal.remove(onWindowCrash);
+    CrashHandler.criticalErrorSignal.remove(onWindowCrash);
   }
 
   public override function update(elapsed:Float):Void
@@ -3965,12 +4013,12 @@ class ChartEditorState extends HaxeUIState
       if (currentWorkingFilePath == null || FlxG.keys.pressed.SHIFT)
       {
         // CTRL + SHIFT + S = Save As
-        ChartEditorImportExportHandler.exportAllSongData(this, false);
+        this.exportAllSongData(false);
       }
       else
       {
         // CTRL + S = Save Chart
-        ChartEditorImportExportHandler.exportAllSongData(this, true, currentWorkingFilePath);
+        this.exportAllSongData(true, currentWorkingFilePath);
       }
     }
 
@@ -4138,6 +4186,14 @@ class ChartEditorState extends HaxeUIState
   {
     // F1 = Open Help
     if (FlxG.keys.justPressed.F1) this.openUserGuideDialog();
+
+    // DEBUG KEYBIND: Ctrl + Alt + Shift + L = Crash the game.
+    #if debug
+    if (FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.ALT && FlxG.keys.pressed.SHIFT && FlxG.keys.justPressed.L)
+    {
+      throw "DEBUG: Crashing the chart editor!";
+    }
+    #end
   }
 
   override function handleQuickWatch():Void
@@ -4861,9 +4917,9 @@ class ChartEditorState extends HaxeUIState
       switch (noteData.getStrumlineIndex())
       {
         case 0: // Player
-          if (hitsoundsEnabledPlayer) ChartEditorAudioHandler.playSound(this, Paths.sound('chartingSounds/hitNotePlayer'));
+          if (hitsoundsEnabledPlayer) this.playSound(Paths.sound('chartingSounds/hitNotePlayer'));
         case 1: // Opponent
-          if (hitsoundsEnabledOpponent) ChartEditorAudioHandler.playSound(this, Paths.sound('chartingSounds/hitNoteOpponent'));
+          if (hitsoundsEnabledOpponent) this.playSound(Paths.sound('chartingSounds/hitNoteOpponent'));
       }
     }
   }
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
index 06da6ee12..0aaa433a4 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
@@ -250,6 +250,39 @@ class ChartEditorDialogHandler
     return dialog;
   }
 
+  /**
+   * [Description]
+   * @param state
+   * @return Null<Dialog>
+   */
+  public static function openBackupAvailableDialog(state:ChartEditorState):Null<Dialog>
+  {
+    var dialog:Null<Dialog> = openDialog(state, CHART_EDITOR_DIALOG_BACKUP_AVAILABLE_LAYOUT, true, true);
+    if (dialog == null) throw 'Could not locate Backup Available dialog';
+
+    state.isHaxeUIDialogOpen = true;
+
+    var buttonCancel:Null<Button> = dialog.findComponent('dialogCancel', Button);
+    if (buttonCancel == null) throw 'Could not locate dialogCancel button in Backup Available dialog';
+    buttonCancel.onClick = function(_event) {
+      dialog.hideDialog(DialogButton.CANCEL);
+    }
+
+    var buttonGoToFolder:Null<Button> = dialog.findComponent('buttonGoToFolder', Button);
+    if (buttonGoToFolder == null) throw 'Could not locate buttonGoToFolder button in Backup Available dialog';
+    buttonGoToFolder.onClick = function(_event) {
+      dialog.hideDialog(DialogButton.CANCEL);
+      state.openBackupFolder();
+    }
+
+    var buttonOpenBackup:Null<Button> = dialog.findComponent('buttonOpenBackup', Button);
+    if (buttonOpenBackup == null) throw 'Could not locate buttonOpenBackup button in Backup Available dialog';
+    buttonOpenBackup.onClick = function(_event) {
+      dialog.hideDialog(DialogButton.CANCEL);
+      state.openBackup();
+    }
+  }
+
   public static function openBrowseFNFC(state:ChartEditorState, closable:Bool):Null<Dialog>
   {
     var dialog:Null<Dialog> = openDialog(state, CHART_EDITOR_DIALOG_UPLOAD_CHART_LAYOUT, true, closable);
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
index 2f396d1a3..bde2b7a9a 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
@@ -318,6 +318,16 @@ class ChartEditorImportExportHandler
     return warnings;
   }
 
+  public static function getLatestBackupPath()
+  {
+    throw 'Not implemented yet.';
+  }
+
+  public static function getLatestBackupDate()
+  {
+    throw 'Not implemented yet.';
+  }
+
   /**
    * @param force Whether to export without prompting. `false` will prompt the user for a location.
    * @param targetPath where to export if `force` is `true`. If `null`, will export to the `backups` folder.
@@ -375,7 +385,6 @@ class ChartEditorImportExportHandler
         // We have to force write because the program will die before the save dialog is closed.
         trace('Force exporting to $targetPath...');
         FileUtil.saveFilesAsZIPToPath(zipEntries, targetPath, targetMode);
-
       }
       else
       {
@@ -383,7 +392,6 @@ class ChartEditorImportExportHandler
         trace('Force exporting to $targetPath...');
         FileUtil.saveFilesAsZIPToPath(zipEntries, targetPath, targetMode);
         state.saveDataDirty = false;
-
       }
     }
     else
diff --git a/source/funkin/ui/debug/charting/import.hx b/source/funkin/ui/debug/charting/import.hx
index 56660c37a..a6ca00267 100644
--- a/source/funkin/ui/debug/charting/import.hx
+++ b/source/funkin/ui/debug/charting/import.hx
@@ -5,6 +5,7 @@ package funkin.ui.debug.charting;
 using funkin.ui.debug.charting.handlers.ChartEditorAudioHandler;
 using funkin.ui.debug.charting.handlers.ChartEditorDialogHandler;
 using funkin.ui.debug.charting.handlers.ChartEditorImportExportHandler;
+using funkin.ui.debug.charting.handlers.ChartEditorShortcutHandler;
 using funkin.ui.debug.charting.handlers.ChartEditorThemeHandler;
 using funkin.ui.debug.charting.handlers.ChartEditorToolboxHandler;
 #end
diff --git a/source/funkin/util/FileUtil.hx b/source/funkin/util/FileUtil.hx
index 8c41cc363..c18678a46 100644
--- a/source/funkin/util/FileUtil.hx
+++ b/source/funkin/util/FileUtil.hx
@@ -73,6 +73,11 @@ class FileUtil
     #end
   }
 
+  public static function openFolderInExplorer():Void
+  {
+    throw 'Not implemented yet.';
+  }
+
   /**
    * Browses for multiple file, then calls `onSelect(paths)` when a path chosen.
    * Note that on HTML5 this will immediately fail.
diff --git a/source/funkin/util/logging/CrashHandler.hx b/source/funkin/util/logging/CrashHandler.hx
index 9d1d3f1b9..b23fd171b 100644
--- a/source/funkin/util/logging/CrashHandler.hx
+++ b/source/funkin/util/logging/CrashHandler.hx
@@ -2,6 +2,7 @@ package funkin.util.logging;
 
 import openfl.Lib;
 import openfl.events.UncaughtErrorEvent;
+import flixel.util.FlxSignal.FlxTypedSignal;
 
 /**
  * A custom crash handler that writes to a log file and displays a message box.
@@ -11,6 +12,19 @@ class CrashHandler
 {
   static final LOG_FOLDER = 'logs';
 
+  /**
+   * Called before exiting the game when a standard error occurs, like a thrown exception.
+   * @param message The error message.
+   */
+  public static var errorSignal(default, null):FlxTypedSignal<String->Void> = new FlxTypedSignal<String->Void>();
+
+  /**
+   * Called before exiting the game when a critical error occurs, like a stack overflow or null object reference.
+   * CAREFUL: The game may be in an unstable state when this is called.
+   * @param message The error message.
+   */
+  public static var criticalErrorSignal(default, null):FlxTypedSignal<String->Void> = new FlxTypedSignal<String->Void>();
+
   /**
    * Initializes
    */
@@ -34,6 +48,8 @@ class CrashHandler
   {
     try
     {
+      errorSignal.dispatch(generateErrorMessage(error));
+
       #if sys
       logError(error);
       #end
@@ -50,6 +66,8 @@ class CrashHandler
   {
     try
     {
+      criticalErrorSignal.dispatch(message);
+
       #if sys
       logErrorMessage(message, true);
       #end

From 621e18f27337ad00d05efd83394e2d66fbee2c75 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Tue, 21 Nov 2023 15:11:05 -0500
Subject: [PATCH 02/16] assets update

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 4ed2b3084..911327220 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 4ed2b3084d54899e10d10a97eaafe210158768be
+Subproject commit 911327220fe2aeaa08e111992a0fb9410476205f

From 25a66ddbfe04111126b4adaddc7c040513799929 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Tue, 21 Nov 2023 15:23:24 -0500
Subject: [PATCH 03/16] open recent on welcome screen

---
 .../debug/charting/handlers/ChartEditorDialogHandler.hx   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
index 06da6ee12..c9229009c 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
@@ -101,7 +101,13 @@ class ChartEditorDialogHandler
       if (chartPath == null) continue;
 
       var linkRecentChart:Link = new Link();
-      linkRecentChart.text = chartPath;
+      // regex to only use the filename, not the full path
+      // "dadbattle.fnc" insted of "c:/user/docs/funkin/dadbattle.fnc"
+      // hovering tooltip shows full path
+      var fileNamePattern:EReg = new EReg("([^/\\\\]+)$", "");
+      var fileName:String = fileNamePattern.match(chartPath) ? fileNamePattern.matched(1) : chartPath;
+      linkRecentChart.text = fileName;
+      linkRecentChart.tooltip = chartPath;
       linkRecentChart.onClick = function(_event) {
         dialog.hideDialog(DialogButton.CANCEL);
         state.stopWelcomeMusic();

From 63f65149f7b8a0c9f4465d46e74e644041919b4d Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Tue, 21 Nov 2023 16:09:13 -0500
Subject: [PATCH 04/16] skip transition into chart editor

---
 assets                                      | 2 +-
 source/funkin/ui/debug/DebugMenuSubState.hx | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets b/assets
index 911327220..04ff6aa6a 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 911327220fe2aeaa08e111992a0fb9410476205f
+Subproject commit 04ff6aa6ab22f9696932973f1644e5327dc44baa
diff --git a/source/funkin/ui/debug/DebugMenuSubState.hx b/source/funkin/ui/debug/DebugMenuSubState.hx
index e1f340770..404bf6f67 100644
--- a/source/funkin/ui/debug/DebugMenuSubState.hx
+++ b/source/funkin/ui/debug/DebugMenuSubState.hx
@@ -8,6 +8,7 @@ import funkin.ui.TextMenuList;
 import funkin.ui.debug.charting.ChartEditorState;
 import funkin.ui.MusicBeatSubState;
 import funkin.util.logging.CrashHandler;
+import flixel.addons.transition.FlxTransitionableState;
 
 class DebugMenuSubState extends MusicBeatSubState
 {
@@ -84,6 +85,8 @@ class DebugMenuSubState extends MusicBeatSubState
 
   function openChartEditor()
   {
+    FlxTransitionableState.skipNextTransIn = true;
+
     FlxG.switchState(new ChartEditorState());
   }
 

From cdfb3fb1727ac070d6469891bb2ef4603ec2fb8c Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Tue, 21 Nov 2023 18:45:31 -0500
Subject: [PATCH 05/16] dialog cursor fix

---
 source/funkin/ui/debug/charting/ChartEditorState.hx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 4772fab7c..80bceab32 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -2951,9 +2951,10 @@ class ChartEditorState extends HaxeUIState
     if (FlxG.mouse.justReleased) FlxG.sound.play(Paths.sound("chartingSounds/ClickUp"));
 
     // Note: If a menu is open in HaxeUI, don't handle cursor behavior.
-    var shouldHandleCursor:Bool = !(isHaxeUIFocused || playbarHeadDragging)
+    var shouldHandleCursor:Bool = !(isHaxeUIFocused || playbarHeadDragging || isHaxeUIDialogOpen)
       || (selectionBoxStartPos != null)
       || (dragTargetNote != null || dragTargetEvent != null);
+
     var eventColumn:Int = (STRUMLINE_SIZE * 2 + 1) - 1;
 
     // trace('shouldHandleCursor: $shouldHandleCursor');

From 21d70467746051085db806a084b8856757569dbc Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Tue, 21 Nov 2023 19:33:29 -0500
Subject: [PATCH 06/16] dropdown assets update

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 04ff6aa6a..f715fd22c 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 04ff6aa6ab22f9696932973f1644e5327dc44baa
+Subproject commit f715fd22cd51e71b017fae796cfe564b76dec20e

From 780220c2d4f02ad4c3cac3214b76f4a5eca0ac41 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 22 Nov 2023 19:16:38 -0500
Subject: [PATCH 07/16] Move notification handling into its own class.

---
 .../ui/debug/charting/ChartEditorState.hx     |  87 ++---
 .../charting/commands/PasteItemsCommand.hx    |  22 +-
 .../handlers/ChartEditorDialogHandler.hx      | 339 +++---------------
 .../ChartEditorImportExportHandler.hx         |  10 +-
 .../ChartEditorNotificationHandler.hx         | 103 ++++++
 source/funkin/ui/debug/charting/import.hx     |   1 +
 6 files changed, 191 insertions(+), 371 deletions(-)
 create mode 100644 source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx

diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index e937baf14..c381a8599 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -99,8 +99,6 @@ import haxe.ui.core.Screen;
 import haxe.ui.events.DragEvent;
 import haxe.ui.events.UIEvent;
 import haxe.ui.focus.FocusManager;
-import haxe.ui.notifications.NotificationManager;
-import haxe.ui.notifications.NotificationType;
 import openfl.display.BitmapData;
 import funkin.util.FileUtil;
 
@@ -1527,27 +1525,18 @@ class ChartEditorState extends HaxeUIState
       var result:Null<Array<String>> = this.loadFromFNFCPath(params.fnfcTargetPath);
       if (result != null)
       {
-        #if !mac
-        NotificationManager.instance.addNotification(
-          {
-            title: 'Success',
-            body: result.length == 0 ? 'Loaded chart (${params.fnfcTargetPath})' : 'Loaded chart (${params.fnfcTargetPath})\n${result.join("\n")}',
-            type: result.length == 0 ? NotificationType.Success : NotificationType.Warning,
-            expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-          });
-        #end
+        if (result.length == 0)
+        {
+          this.success('Loaded Chart', 'Loaded chart (${params.fnfcTargetPath})');
+        }
+        else
+        {
+          this.warning('Loaded Chart', 'Loaded chart with issues (${params.fnfcTargetPath})\n${result.join("\n")}');
+        }
       }
       else
       {
-        #if !mac
-        NotificationManager.instance.addNotification(
-          {
-            title: 'Failure',
-            body: 'Failed to load chart (${params.fnfcTargetPath})',
-            type: NotificationType.Error,
-            expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-          });
-        #end
+        this.error('Failure', 'Failed to load chart (${params.fnfcTargetPath})');
 
         // Song failed to load, open the Welcome dialog so we aren't in a broken state.
         this.openWelcomeDialog(false);
@@ -1559,7 +1548,11 @@ class ChartEditorState extends HaxeUIState
     }
     else
     {
-      this.openWelcomeDialog(false);
+      var welcomeDialog = this.openWelcomeDialog(false);
+      if (shouldShowBackupAvailableDialog)
+      {
+        this.openBackupAvailableDialog(welcomeDialog);
+      }
     }
   }
 
@@ -1642,27 +1635,18 @@ class ChartEditorState extends HaxeUIState
         var result:Null<Array<String>> = this.loadFromFNFCPath(chartPath);
         if (result != null)
         {
-          #if !mac
-          NotificationManager.instance.addNotification(
-            {
-              title: 'Success',
-              body: result.length == 0 ? 'Loaded chart (${chartPath.toString()})' : 'Loaded chart (${chartPath.toString()})\n${result.join("\n")}',
-              type: result.length == 0 ? NotificationType.Success : NotificationType.Warning,
-              expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-            });
-          #end
+          if (result.length == 0)
+          {
+            this.success('Loaded Chart', 'Loaded chart (${chartPath.toString()})');
+          }
+          else
+          {
+            this.warning('Loaded Chart', 'Loaded chart with issues (${chartPath.toString()})\n${result.join("\n")}');
+          }
         }
         else
         {
-          #if !mac
-          NotificationManager.instance.addNotification(
-            {
-              title: 'Failure',
-              body: 'Failed to load chart (${chartPath.toString()})',
-              type: NotificationType.Error,
-              expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-            });
-          #end
+          this.error('Failure', 'Failed to load chart (${params.fnfcTargetPath})');
         }
       }
 
@@ -2002,9 +1986,7 @@ class ChartEditorState extends HaxeUIState
     if (menubar == null) throw "Could not find menubar!";
     if (!Preferences.debugDisplay) menubar.paddingLeft = null;
 
-    // Setup notifications.
-    @:privateAccess
-    NotificationManager.GUTTER_SIZE = 20;
+    this.setupNotifications();
   }
 
   /**
@@ -4530,15 +4512,7 @@ class ChartEditorState extends HaxeUIState
       }
     }
 
-    #if !mac
-    NotificationManager.instance.addNotification(
-      {
-        title: 'Switch Difficulty',
-        body: 'Switched difficulty to ${selectedDifficulty.toTitleCase()}',
-        type: NotificationType.Success,
-        expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-      });
-    #end
+    this.success('Switch Difficulty', 'Switched difficulty to ${selectedDifficulty.toTitleCase()}');
   }
 
   /**
@@ -4803,9 +4777,6 @@ class ChartEditorState extends HaxeUIState
    */
   // ====================
 
-  /**
-   * Dismiss any existing HaxeUI notifications, if there are any.
-   */
   function handleNotePreview():Void
   {
     if (notePreviewDirty && notePreview != null)
@@ -5006,14 +4977,6 @@ class ChartEditorState extends HaxeUIState
     ChartEditorNoteSprite.noteFrameCollection = null;
   }
 
-  /**
-   * Dismiss any existing notifications, if there are any.
-   */
-  function dismissNotifications():Void
-  {
-    NotificationManager.instance.clearNotifications();
-  }
-
   function applyCanQuickSave():Void
   {
     if (menubarItemSaveChart == null) return;
diff --git a/source/funkin/ui/debug/charting/commands/PasteItemsCommand.hx b/source/funkin/ui/debug/charting/commands/PasteItemsCommand.hx
index 12115ba8a..1857b44db 100644
--- a/source/funkin/ui/debug/charting/commands/PasteItemsCommand.hx
+++ b/source/funkin/ui/debug/charting/commands/PasteItemsCommand.hx
@@ -4,8 +4,6 @@ import funkin.data.song.SongData.SongEventData;
 import funkin.data.song.SongData.SongNoteData;
 import funkin.data.song.SongDataUtils;
 import funkin.data.song.SongDataUtils.SongClipboardItems;
-import haxe.ui.notifications.NotificationManager;
-import haxe.ui.notifications.NotificationType;
 
 /**
  * A command which inserts the contents of the clipboard into the chart editor.
@@ -30,15 +28,7 @@ class PasteItemsCommand implements ChartEditorCommand
 
     if (currentClipboard.valid != true)
     {
-      #if !mac
-      NotificationManager.instance.addNotification(
-        {
-          title: 'Failed to Paste',
-          body: 'Could not parse clipboard contents.',
-          type: NotificationType.Error,
-          expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-        });
-      #end
+      state.error('Failed to Paste', 'Could not parse clipboard contents.');
       return;
     }
 
@@ -58,15 +48,7 @@ class PasteItemsCommand implements ChartEditorCommand
 
     state.sortChartData();
 
-    #if !mac
-    NotificationManager.instance.addNotification(
-      {
-        title: 'Paste Successful',
-        body: 'Successfully pasted clipboard contents.',
-        type: NotificationType.Success,
-        expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-      });
-    #end
+    state.success('Paste Successful', 'Successfully pasted clipboard contents.');
   }
 
   public function undo(state:ChartEditorState):Void
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
index 0aaa433a4..6985a5d60 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
@@ -36,8 +36,6 @@ import haxe.ui.containers.Form;
 import haxe.ui.containers.VBox;
 import haxe.ui.core.Component;
 import haxe.ui.events.UIEvent;
-import haxe.ui.notifications.NotificationManager;
-import haxe.ui.notifications.NotificationType;
 import thx.semver.Version;
 
 using Lambda;
@@ -110,27 +108,20 @@ class ChartEditorDialogHandler
         var result:Null<Array<String>> = ChartEditorImportExportHandler.loadFromFNFCPath(state, chartPath);
         if (result != null)
         {
-          #if !mac
-          NotificationManager.instance.addNotification(
-            {
-              title: 'Success',
-              body: result.length == 0 ? 'Loaded chart (${chartPath.toString()})' : 'Loaded chart (${chartPath.toString()})\n${result.join("\n")}',
-              type: result.length == 0 ? NotificationType.Success : NotificationType.Warning,
-              expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-            });
-          #end
+          if (result.length == 0)
+          {
+            // No warnings.
+            state.success('Loaded Chart', 'Loaded chart (${chartPath.toString()})');
+          }
+          else
+          {
+            // One or more warnings.
+            state.warning('Loaded Chart', 'Loaded chart (${chartPath.toString()})\n${result.join("\n")}');
+          }
         }
         else
         {
-          #if !mac
-          NotificationManager.instance.addNotification(
-            {
-              title: 'Failure',
-              body: 'Failed to load chart (${chartPath.toString()})',
-              type: NotificationType.Error,
-              expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-            });
-          #end
+          state.error('Failed to Load Chart', 'Failed to load chart (${chartPath.toString()})');
         }
       }
 
@@ -334,15 +325,14 @@ class ChartEditorDialogHandler
               var result:Null<Array<String>> = ChartEditorImportExportHandler.loadFromFNFC(state, selectedFile.bytes);
               if (result != null)
               {
-                #if !mac
-                NotificationManager.instance.addNotification(
-                  {
-                    title: 'Success',
-                    body: 'Loaded chart (${selectedFile.name})',
-                    type: NotificationType.Success,
-                    expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-                  });
-                #end
+                if (result.length == 0)
+                {
+                  state.success('Loaded Chart', 'Loaded chart (${selectedFile.name})');
+                }
+                else
+                {
+                  state.warning('Loaded Chart', 'Loaded chart (${selectedFile.name})\n${result.join("\n")}');
+                }
 
                 if (selectedFile.fullPath != null) state.currentWorkingFilePath = selectedFile.fullPath;
                 dialog.hideDialog(DialogButton.APPLY);
@@ -351,15 +341,7 @@ class ChartEditorDialogHandler
             }
             catch (err)
             {
-              #if !mac
-              NotificationManager.instance.addNotification(
-                {
-                  title: 'Failure',
-                  body: 'Failed to load chart (${selectedFile.name}): ${err}',
-                  type: NotificationType.Error,
-                  expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-                });
-              #end
+              state.error('Failed to Load Chart', 'Failed to load chart (${selectedFile.name}): ${err}');
             }
           }
       });
@@ -374,42 +356,26 @@ class ChartEditorDialogHandler
         var result:Null<Array<String>> = ChartEditorImportExportHandler.loadFromFNFCPath(state, path.toString());
         if (result != null)
         {
-          #if !mac
-          NotificationManager.instance.addNotification(
-            {
-              title: 'Success',
-              body: result.length == 0 ? 'Loaded chart (${path.toString()})' : 'Loaded chart (${path.toString()})\n${result.join("\n")}',
-              type: result.length == 0 ? NotificationType.Success : NotificationType.Warning,
-              expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-            });
-          #end
+          if (result.length == 0)
+          {
+            state.success('Loaded Chart', 'Loaded chart (${path.file}.${path.ext})');
+          }
+          else
+          {
+            state.warning('Loaded Chart', 'Loaded chart (${path.file}.${path.ext})\n${result.join("\n")}');
+          }
+
           dialog.hideDialog(DialogButton.APPLY);
           removeDropHandler(onDropFile);
         }
         else
         {
-          #if !mac
-          NotificationManager.instance.addNotification(
-            {
-              title: 'Failure',
-              body: 'Failed to load chart (${path.toString()})',
-              type: NotificationType.Error,
-              expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-            });
-          #end
+          state.error('Failed to Load Chart', 'Failed to load chart (${path.file}.${path.ext})');
         }
       }
       catch (err)
       {
-        #if !mac
-        NotificationManager.instance.addNotification(
-          {
-            title: 'Failure',
-            body: 'Failed to load chart (${path.toString()}): ${err}',
-            type: NotificationType.Error,
-            expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-          });
-        #end
+        state.error('Failed to Load Chart', 'Failed to load chart (${path.file}.${path.ext})');
       }
     };
 
@@ -699,15 +665,7 @@ class ChartEditorDialogHandler
           {
             if (state.loadInstFromBytes(selectedFile.bytes, instId))
             {
-              #if !mac
-              NotificationManager.instance.addNotification(
-                {
-                  title: 'Success',
-                  body: 'Loaded instrumental track (${selectedFile.name}) for variation (${state.selectedVariation})',
-                  type: NotificationType.Success,
-                  expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-                });
-              #end
+              state.success('Loaded Instrumental', 'Loaded instrumental track (${selectedFile.name}) for variation (${state.selectedVariation})');
 
               state.switchToCurrentInstrumental();
               dialog.hideDialog(DialogButton.APPLY);
@@ -715,15 +673,7 @@ class ChartEditorDialogHandler
             }
             else
             {
-              #if !mac
-              NotificationManager.instance.addNotification(
-                {
-                  title: 'Failure',
-                  body: 'Failed to load instrumental track (${selectedFile.name}) for variation (${state.selectedVariation})',
-                  type: NotificationType.Error,
-                  expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-                });
-              #end
+              state.error('Failed to Load Instrumental', 'Failed to load instrumental track (${selectedFile.name}) for variation (${state.selectedVariation})');
             }
           }
       });
@@ -735,15 +685,7 @@ class ChartEditorDialogHandler
       if (state.loadInstFromPath(path, instId))
       {
         // Tell the user the load was successful.
-        #if !mac
-        NotificationManager.instance.addNotification(
-          {
-            title: 'Success',
-            body: 'Loaded instrumental track (${path.file}.${path.ext}) for variation (${state.selectedVariation})',
-            type: NotificationType.Success,
-            expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-          });
-        #end
+        state.success('Loaded Instrumental', 'Loaded instrumental track (${path.file}.${path.ext}) for variation (${state.selectedVariation})');
 
         state.switchToCurrentInstrumental();
         dialog.hideDialog(DialogButton.APPLY);
@@ -761,15 +703,7 @@ class ChartEditorDialogHandler
         }
 
         // Tell the user the load was successful.
-        #if !mac
-        NotificationManager.instance.addNotification(
-          {
-            title: 'Failure',
-            body: message,
-            type: NotificationType.Error,
-            expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-          });
-        #end
+        state.error('Failed to Load Instrumental', message);
       }
     };
 
@@ -991,15 +925,7 @@ class ChartEditorDialogHandler
         if (state.loadVocalsFromPath(path, charKey, instId))
         {
           // Tell the user the load was successful.
-          #if !mac
-          NotificationManager.instance.addNotification(
-            {
-              title: 'Success',
-              body: 'Loaded vocals for $charName (${path.file}.${path.ext}), variation ${state.selectedVariation}',
-              type: NotificationType.Success,
-              expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-            });
-          #end
+          state.success('Loaded Vocals', 'Loaded vocals for $charName (${path.file}.${path.ext}), variation ${state.selectedVariation}');
           #if FILE_DROP_SUPPORTED
           vocalsEntryLabel.text = 'Voices for $charName (drag and drop, or click to browse)\nSelected file: ${path.file}.${path.ext}';
           #else
@@ -1013,16 +939,7 @@ class ChartEditorDialogHandler
         {
           trace('Failed to load vocal track (${path.file}.${path.ext})');
 
-          // Vocals failed to load.
-          #if !mac
-          NotificationManager.instance.addNotification(
-            {
-              title: 'Failure',
-              body: 'Failed to load vocal track (${path.file}.${path.ext}) for variation (${state.selectedVariation})',
-              type: NotificationType.Error,
-              expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-            });
-          #end
+          state.error('Failed to Load Vocals', 'Failed to load vocal track (${path.file}.${path.ext}) for variation (${state.selectedVariation})');
 
           #if FILE_DROP_SUPPORTED
           vocalsEntryLabel.text = 'Drag and drop vocals for $charName here, or click to browse.';
@@ -1046,15 +963,8 @@ class ChartEditorDialogHandler
               if (state.loadVocalsFromBytes(selectedFile.bytes, charKey, instId))
               {
                 // Tell the user the load was successful.
-                #if !mac
-                NotificationManager.instance.addNotification(
-                  {
-                    title: 'Success',
-                    body: 'Loaded vocals for $charName (${selectedFile.name}), variation ${state.selectedVariation}',
-                    type: NotificationType.Success,
-                    expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-                  });
-                #end
+                state.success('Loaded Vocals', 'Loaded vocals for $charName (${selectedFile.name}), variation ${state.selectedVariation}');
+
                 #if FILE_DROP_SUPPORTED
                 vocalsEntryLabel.text = 'Voices for $charName (drag and drop, or click to browse)\nSelected file: ${selectedFile.name}';
                 #else
@@ -1067,15 +977,7 @@ class ChartEditorDialogHandler
               {
                 trace('Failed to load vocal track (${selectedFile.fullPath})');
 
-                #if !mac
-                NotificationManager.instance.addNotification(
-                  {
-                    title: 'Failure',
-                    body: 'Failed to load vocal track (${selectedFile.name}) for variation (${state.selectedVariation})',
-                    type: NotificationType.Error,
-                    expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-                  });
-                #end
+                state.error('Failed to Load Vocals', 'Failed to load vocal track (${selectedFile.name}) for variation (${state.selectedVariation})');
 
                 #if FILE_DROP_SUPPORTED
                 vocalsEntryLabel.text = 'Drag and drop vocals for $charName here, or click to browse.';
@@ -1226,15 +1128,7 @@ class ChartEditorDialogHandler
       if (songMetadataVersion == null)
       {
         // Tell the user the load was not successful.
-        #if !mac
-        NotificationManager.instance.addNotification(
-          {
-            title: 'Failure',
-            body: 'Could not parse metadata file version (${path.file}.${path.ext})',
-            type: NotificationType.Error,
-            expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-          });
-        #end
+        state.error('Failure', 'Could not parse metadata file version (${path.file}.${path.ext})');
         return;
       }
 
@@ -1244,30 +1138,14 @@ class ChartEditorDialogHandler
       if (songMetadataVariation == null)
       {
         // Tell the user the load was not successful.
-        #if !mac
-        NotificationManager.instance.addNotification(
-          {
-            title: 'Failure',
-            body: 'Could not load metadata file (${path.file}.${path.ext})',
-            type: NotificationType.Error,
-            expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-          });
-        #end
+        state.error('Failure', 'Could not load metadata file (${path.file}.${path.ext})');
         return;
       }
 
       songMetadata.set(variation, songMetadataVariation);
 
       // Tell the user the load was successful.
-      #if !mac
-      NotificationManager.instance.addNotification(
-        {
-          title: 'Success',
-          body: 'Loaded metadata file (${path.file}.${path.ext})',
-          type: NotificationType.Success,
-          expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-        });
-      #end
+      state.success('Loaded Metadata', 'Loaded metadata file (${path.file}.${path.ext})');
 
       #if FILE_DROP_SUPPORTED
       label.text = 'Metadata file (drag and drop, or click to browse)\nSelected file: ${path.file}.${path.ext}';
@@ -1291,15 +1169,7 @@ class ChartEditorDialogHandler
             if (songMetadataVersion == null)
             {
               // Tell the user the load was not successful.
-              #if !mac
-              NotificationManager.instance.addNotification(
-                {
-                  title: 'Failure',
-                  body: 'Could not parse metadata file version (${selectedFile.name})',
-                  type: NotificationType.Error,
-                  expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-                });
-              #end
+              state.error('Failure', 'Could not parse metadata file version (${selectedFile.name})');
               return;
             }
 
@@ -1311,15 +1181,7 @@ class ChartEditorDialogHandler
               songMetadata.set(variation, songMetadataVariation);
 
               // Tell the user the load was successful.
-              #if !mac
-              NotificationManager.instance.addNotification(
-                {
-                  title: 'Success',
-                  body: 'Loaded metadata file (${selectedFile.name})',
-                  type: NotificationType.Success,
-                  expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-                });
-              #end
+              state.success('Loaded Metadata', 'Loaded metadata file (${selectedFile.name})');
 
               #if FILE_DROP_SUPPORTED
               label.text = 'Metadata file (drag and drop, or click to browse)\nSelected file: ${selectedFile.name}';
@@ -1332,15 +1194,7 @@ class ChartEditorDialogHandler
             else
             {
               // Tell the user the load was unsuccessful.
-              #if !mac
-              NotificationManager.instance.addNotification(
-                {
-                  title: 'Failure',
-                  body: 'Failed to load metadata file (${selectedFile.name})',
-                  type: NotificationType.Error,
-                  expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-                });
-              #end
+              state.error('Failure', 'Failed to load metadata file (${selectedFile.name})');
             }
           }
       });
@@ -1356,15 +1210,7 @@ class ChartEditorDialogHandler
       if (songChartDataVersion == null)
       {
         // Tell the user the load was not successful.
-        #if !mac
-        NotificationManager.instance.addNotification(
-          {
-            title: 'Failure',
-            body: 'Could not parse chart data file version (${path.file}.${path.ext})',
-            type: NotificationType.Error,
-            expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-          });
-        #end
+        state.error('Failure', 'Could not parse chart data file version (${path.file}.${path.ext})');
         return;
       }
 
@@ -1379,15 +1225,7 @@ class ChartEditorDialogHandler
         state.noteDisplayDirty = true;
 
         // Tell the user the load was successful.
-        #if !mac
-        NotificationManager.instance.addNotification(
-          {
-            title: 'Success',
-            body: 'Loaded chart data file (${path.file}.${path.ext})',
-            type: NotificationType.Success,
-            expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-          });
-        #end
+        state.success('Loaded Chart Data', 'Loaded chart data file (${path.file}.${path.ext})');
 
         #if FILE_DROP_SUPPORTED
         label.text = 'Chart data file (drag and drop, or click to browse)\nSelected file: ${path.file}.${path.ext}';
@@ -1398,15 +1236,7 @@ class ChartEditorDialogHandler
       else
       {
         // Tell the user the load was unsuccessful.
-        #if !mac
-        NotificationManager.instance.addNotification(
-          {
-            title: 'Failure',
-            body: 'Failed to load chart data file (${path.file}.${path.ext})',
-            type: NotificationType.Error,
-            expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-          });
-        #end
+        state.error('Failure', 'Failed to load chart data file (${path.file}.${path.ext})');
       }
     };
 
@@ -1423,15 +1253,7 @@ class ChartEditorDialogHandler
             if (songChartDataVersion == null)
             {
               // Tell the user the load was not successful.
-              #if !mac
-              NotificationManager.instance.addNotification(
-                {
-                  title: 'Failure',
-                  body: 'Could not parse chart data file version (${selectedFile.name})',
-                  type: NotificationType.Error,
-                  expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-                });
-              #end
+              state.error('Failure', 'Could not parse chart data file version (${selectedFile.name})');
               return;
             }
 
@@ -1446,15 +1268,7 @@ class ChartEditorDialogHandler
               state.noteDisplayDirty = true;
 
               // Tell the user the load was successful.
-              #if !mac
-              NotificationManager.instance.addNotification(
-                {
-                  title: 'Success',
-                  body: 'Loaded chart data file (${selectedFile.name})',
-                  type: NotificationType.Success,
-                  expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-                });
-              #end
+              state.success('Loaded Chart Data', 'Loaded chart data file (${selectedFile.name})');
 
               #if FILE_DROP_SUPPORTED
               label.text = 'Chart data file (drag and drop, or click to browse)\nSelected file: ${selectedFile.name}';
@@ -1551,15 +1365,7 @@ class ChartEditorDialogHandler
 
           if (fnfLegacyData == null)
           {
-            #if !mac
-            NotificationManager.instance.addNotification(
-              {
-                title: 'Failure',
-                body: 'Failed to parse FNF chart file (${selectedFile.name})',
-                type: NotificationType.Error,
-                expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-              });
-            #end
+            state.error('Failure', 'Failed to parse FNF chart file (${selectedFile.name})');
             return;
           }
 
@@ -1569,15 +1375,7 @@ class ChartEditorDialogHandler
           state.loadSong([Constants.DEFAULT_VARIATION => songMetadata], [Constants.DEFAULT_VARIATION => songChartData]);
 
           dialog.hideDialog(DialogButton.APPLY);
-          #if !mac
-          NotificationManager.instance.addNotification(
-            {
-              title: 'Success',
-              body: 'Loaded chart file (${selectedFile.name})',
-              type: NotificationType.Success,
-              expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-            });
-          #end
+          state.success('Success', 'Loaded chart file (${selectedFile.name})');
         }
       });
     }
@@ -1592,15 +1390,7 @@ class ChartEditorDialogHandler
       state.loadSong([Constants.DEFAULT_VARIATION => songMetadata], [Constants.DEFAULT_VARIATION => songChartData]);
 
       dialog.hideDialog(DialogButton.APPLY);
-      #if !mac
-      NotificationManager.instance.addNotification(
-        {
-          title: 'Success',
-          body: 'Loaded chart file (${path.file}.${path.ext})',
-          type: NotificationType.Success,
-          expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-        });
-      #end
+      state.success('Success', 'Loaded chart file (${path.file}.${path.ext})');
     };
 
     addDropHandler(importBox, onDropFile);
@@ -1700,14 +1490,9 @@ class ChartEditorDialogHandler
 
       state.songMetadata.set(pendingVariation.variation, pendingVariation);
       state.difficultySelectDirty = true; // Force the Difficulty toolbox to update.
-      #if !mac
-      NotificationManager.instance.addNotification(
-        {
-          title: "Add Variation",
-          body: 'Added new variation "${pendingVariation.variation}"',
-          type: NotificationType.Success
-        });
-      #end
+
+      state.success('Add Variation', 'Added new variation "${pendingVariation.variation}"');
+
       dialog.hideDialog(DialogButton.APPLY);
     }
 
@@ -1764,14 +1549,8 @@ class ChartEditorDialogHandler
 
       state.createDifficulty(dialogVariation.value.id, dialogDifficultyName.text.toLowerCase(), inputScrollSpeed.value ?? 1.0);
 
-      #if !mac
-      NotificationManager.instance.addNotification(
-        {
-          title: "Add Difficulty",
-          body: 'Added new difficulty "${dialogDifficultyName.text.toLowerCase()}"',
-          type: NotificationType.Success
-        });
-      #end
+      state.success('Add Difficulty', 'Added new difficulty "${dialogDifficultyName.text.toLowerCase()}"');
+
       dialog.hideDialog(DialogButton.APPLY);
     }
 
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
index bde2b7a9a..393af20a7 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
@@ -100,15 +100,7 @@ class ChartEditorImportExportHandler
 
     state.refreshMetadataToolbox();
 
-    #if !mac
-    NotificationManager.instance.addNotification(
-      {
-        title: 'Success',
-        body: 'Loaded song (${rawSongMetadata[0].songName})',
-        type: NotificationType.Success,
-        expiryMs: Constants.NOTIFICATION_DISMISS_TIME
-      });
-    #end
+    state.success('Success', 'Loaded song (${rawSongMetadata[0].songName})');
   }
 
   /**
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
new file mode 100644
index 000000000..606f8a5c8
--- /dev/null
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
@@ -0,0 +1,103 @@
+package funkin.ui.debug.charting.handlers;
+
+import haxe.ui.notifications.Notification;
+import haxe.ui.notifications.NotificationManager;
+import haxe.ui.notifications.NotificationType;
+
+class ChartEditorNotificationHandler
+{
+  public static function setupNotifications(state:ChartEditorState):Void
+  {
+    // Setup notifications.
+    @:privateAccess
+    NotificationManager.GUTTER_SIZE = 20;
+  }
+
+  /**
+   * Send a notification with a checkmark indicating success.
+   * @param state The current state of the chart editor.
+   */
+  public static function success(state:ChartEditorState, title:String, body:String):Notification
+  {
+    return sendNotification(title, body, NotificationType.Success);
+  }
+
+  /**
+   * Send a notification with a warning icon.
+   * @param state The current state of the chart editor.
+   */
+  public static function warning(state:ChartEditorState, title:String, body:String):Notification
+  {
+    return sendNotification(title, body, NotificationType.Warning);
+  }
+
+  /**
+   * Send a notification with a warning icon.
+   * @param state The current state of the chart editor.
+   */
+  public static inline function warn(state:ChartEditorState, title:String, body:String):Notification
+  {
+    return warning(state, title, body);
+  }
+
+  /**
+   * Send a notification with a cross indicating an error.
+   * @param state The current state of the chart editor.
+   */
+  public static function error(state:ChartEditorState, title:String, body:String):Notification
+  {
+    return sendNotification(title, body, NotificationType.Error);
+  }
+
+  /**
+   * Send a notification with a cross indicating failure.
+   * @param state The current state of the chart editor.
+   */
+  public static inline function failure(state:ChartEditorState, title:String, body:String):Notification
+  {
+    return error(state, title, body);
+  }
+
+  /**
+   * Send a notification with an info icon.
+   * @param state The current state of the chart editor.
+   */
+  public static function info(state:ChartEditorState, title:String, body:String):Notification
+  {
+    return sendNotification(title, body, NotificationType.Info);
+  }
+
+  /**
+   * Clear all active notifications.
+   * @param state The current state of the chart editor.
+   */
+  public static function clearNotifications(state:ChartEditorState):Void
+  {
+    NotificationManager.instance.clearNotifications();
+  }
+
+  /**
+   * Clear a specific notification.
+   * @param state The current state of the chart editor.
+   * @param notif The notification to clear.
+   */
+  public static function clearNotification(state:ChartEditorState, notif:Notification):Void
+  {
+    NotificationManager.instance.removeNotification(notif);
+  }
+
+  static function sendNotification(title:String, body:String, ?type:NotificationType):Notification
+  {
+    #if !mac
+    return NotificationManager.instance.addNotification(
+      {
+        title: title,
+        body: body,
+        type: type ?? NotificationType.Default,
+        expiryMs: Constants.NOTIFICATION_DISMISS_TIME
+      });
+    #else
+    trace('WARNING: Notifications are not supported on Mac OS.');
+    #end
+  }
+}
diff --git a/source/funkin/ui/debug/charting/import.hx b/source/funkin/ui/debug/charting/import.hx
index a6ca00267..933eaa3a5 100644
--- a/source/funkin/ui/debug/charting/import.hx
+++ b/source/funkin/ui/debug/charting/import.hx
@@ -5,6 +5,7 @@ package funkin.ui.debug.charting;
 using funkin.ui.debug.charting.handlers.ChartEditorAudioHandler;
 using funkin.ui.debug.charting.handlers.ChartEditorDialogHandler;
 using funkin.ui.debug.charting.handlers.ChartEditorImportExportHandler;
+using funkin.ui.debug.charting.handlers.ChartEditorNotificationHandler;
 using funkin.ui.debug.charting.handlers.ChartEditorShortcutHandler;
 using funkin.ui.debug.charting.handlers.ChartEditorThemeHandler;
 using funkin.ui.debug.charting.handlers.ChartEditorToolboxHandler;

From 97b259d1c2e49dcad5ed1d3778e28e20fffaff74 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 22 Nov 2023 19:17:35 -0500
Subject: [PATCH 08/16] Finalized backup handling

---
 assets                                        |  2 +-
 source/funkin/save/Save.hx                    |  4 +-
 .../ui/debug/charting/ChartEditorState.hx     | 39 ++++++++----
 .../handlers/ChartEditorDialogHandler.hx      | 63 +++++++++++++++++--
 .../ChartEditorImportExportHandler.hx         | 56 ++++++++++++++---
 source/funkin/util/CLIUtil.hx                 |  2 +-
 source/funkin/util/DateUtil.hx                |  7 +++
 source/funkin/util/FileUtil.hx                |  5 --
 source/funkin/util/WindowUtil.hx              | 21 ++++++-
 9 files changed, 164 insertions(+), 35 deletions(-)

diff --git a/assets b/assets
index 4ed2b3084..4cbffd074 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 4ed2b3084d54899e10d10a97eaafe210158768be
+Subproject commit 4cbffd074bb6d1d5fa13492d19e0736869338ac3
diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx
index 06b679c87..db1f2b69a 100644
--- a/source/funkin/save/Save.hx
+++ b/source/funkin/save/Save.hx
@@ -181,12 +181,12 @@ abstract Save(RawSaveData)
 
   function get_chartEditorHasBackup():Bool
   {
-    if (this.optionsChartEditor.hasBackup == null) this.optionsChartEditor.hasBackup = [];
+    if (this.optionsChartEditor.hasBackup == null) this.optionsChartEditor.hasBackup = false;
 
     return this.optionsChartEditor.hasBackup;
   }
 
-  function set_chartEditorHasBackup(value:Array<String>):Bool
+  function set_chartEditorHasBackup(value:Bool):Bool
   {
     // Set and apply.
     this.optionsChartEditor.hasBackup = value;
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index c381a8599..92279ef27 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -48,7 +48,6 @@ import funkin.data.song.SongData.SongNoteData;
 import funkin.data.song.SongData.SongCharacterData;
 import funkin.data.song.SongDataUtils;
 import funkin.ui.debug.charting.commands.ChartEditorCommand;
-import funkin.ui.debug.charting.handlers.ChartEditorShortcutHandler;
 import funkin.play.stage.StageData;
 import funkin.save.Save;
 import funkin.ui.debug.charting.commands.AddEventsCommand;
@@ -1539,8 +1538,12 @@ class ChartEditorState extends HaxeUIState
         this.error('Failure', 'Failed to load chart (${params.fnfcTargetPath})');
 
         // Song failed to load, open the Welcome dialog so we aren't in a broken state.
-        this.openWelcomeDialog(false);
-        if (shouldShowBackupAvailableDialog)}
+        var welcomeDialog = this.openWelcomeDialog(false);
+        if (shouldShowBackupAvailableDialog)
+        {
+          this.openBackupAvailableDialog(welcomeDialog);
+        }
+      }
     }
     else if (params != null && params.targetSongId != null)
     {
@@ -1566,7 +1569,6 @@ class ChartEditorState extends HaxeUIState
   {
     var save:Save = Save.get();
 
-    showBackupAvailablePopup = save.chartEditorHasBackup;
     if (previousWorkingFilePaths[0] == null)
     {
       previousWorkingFilePaths = [null].concat(save.chartEditorPreviousFiles);
@@ -1598,9 +1600,11 @@ class ChartEditorState extends HaxeUIState
     var filteredWorkingFilePaths:Array<String> = [];
     for (chartPath in previousWorkingFilePaths)
       if (chartPath != null) filteredWorkingFilePaths.push(chartPath);
-
-    save.chartEditorHasBackup = hasBackup;
     save.chartEditorPreviousFiles = filteredWorkingFilePaths;
+
+    if (hasBackup) trace('Queuing backup prompt for next time!');
+    save.chartEditorHasBackup = hasBackup;
+
     save.chartEditorNoteQuant = noteSnapQuantIndex;
     save.chartEditorLiveInputStyle = currentLiveInputStyle;
     save.chartEditorDownscroll = isViewDownscroll;
@@ -2023,7 +2027,7 @@ class ChartEditorState extends HaxeUIState
       }
       else
       {
-        this.exportAllSongData(false);
+        this.exportAllSongData(false, null);
       }
     });
     addUIClickListener('menubarItemSaveChartAs', _ -> this.exportAllSongData());
@@ -2239,10 +2243,12 @@ class ChartEditorState extends HaxeUIState
    */
   function autoSave():Void
   {
+    var needsAutoSave:Bool = saveDataDirty;
+
     saveDataDirty = false;
 
     // Auto-save preferences.
-    writePreferences(false);
+    writePreferences(needsAutoSave);
 
     // Auto-save the chart.
     #if html5
@@ -2250,7 +2256,10 @@ class ChartEditorState extends HaxeUIState
     // TODO: Implement this.
     #else
     // Auto-save to temp file.
-    this.exportAllSongData(true);
+    if (needsAutoSave)
+    {
+      this.exportAllSongData(true, null);
+    }
     #end
   }
 
@@ -2269,7 +2278,7 @@ class ChartEditorState extends HaxeUIState
 
     if (needsAutoSave)
     {
-      this.exportAllSongData(true);
+      this.exportAllSongData(true, null);
     }
   }
 
@@ -2286,7 +2295,7 @@ class ChartEditorState extends HaxeUIState
 
     if (needsAutoSave)
     {
-      this.exportAllSongData(true);
+      this.exportAllSongData(true, null);
     }
   }
 
@@ -3995,7 +4004,7 @@ class ChartEditorState extends HaxeUIState
       if (currentWorkingFilePath == null || FlxG.keys.pressed.SHIFT)
       {
         // CTRL + SHIFT + S = Save As
-        this.exportAllSongData(false);
+        this.exportAllSongData(false, null);
       }
       else
       {
@@ -4006,7 +4015,11 @@ class ChartEditorState extends HaxeUIState
 
     if (FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.SHIFT && FlxG.keys.justPressed.S)
     {
-      this.exportAllSongData(false);
+      this.exportAllSongData(false, null, function(path:String) {
+        // CTRL + SHIFT + S Successful
+      }, function() {
+        // CTRL + SHIFT + S Cancelled
+      });
     }
     // CTRL + Q = Quit to Menu
     if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.Q)
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
index 6985a5d60..86717132b 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
@@ -20,6 +20,8 @@ import funkin.util.FileUtil;
 import funkin.util.SerializerUtil;
 import funkin.util.SortUtil;
 import funkin.util.VersionUtil;
+import funkin.util.DateUtil;
+import funkin.util.WindowUtil;
 import haxe.io.Path;
 import haxe.ui.components.Button;
 import haxe.ui.components.DropDown;
@@ -61,6 +63,7 @@ class ChartEditorDialogHandler
   static final CHART_EDITOR_DIALOG_USER_GUIDE_LAYOUT:String = Paths.ui('chart-editor/dialogs/user-guide');
   static final CHART_EDITOR_DIALOG_ADD_VARIATION_LAYOUT:String = Paths.ui('chart-editor/dialogs/add-variation');
   static final CHART_EDITOR_DIALOG_ADD_DIFFICULTY_LAYOUT:String = Paths.ui('chart-editor/dialogs/add-difficulty');
+  static final CHART_EDITOR_DIALOG_BACKUP_AVAILABLE_LAYOUT:String = Paths.ui('chart-editor/dialogs/backup-available');
 
   /**
    * Builds and opens a dialog giving brief credits for the chart editor.
@@ -246,32 +249,84 @@ class ChartEditorDialogHandler
    * @param state
    * @return Null<Dialog>
    */
-  public static function openBackupAvailableDialog(state:ChartEditorState):Null<Dialog>
+  public static function openBackupAvailableDialog(state:ChartEditorState, welcomeDialog:Null<Dialog>):Null<Dialog>
   {
     var dialog:Null<Dialog> = openDialog(state, CHART_EDITOR_DIALOG_BACKUP_AVAILABLE_LAYOUT, true, true);
     if (dialog == null) throw 'Could not locate Backup Available dialog';
+    dialog.onDialogClosed = function(_event) {
+      state.isHaxeUIDialogOpen = false;
+      if (_event.button == DialogButton.APPLY)
+      {
+        // User loaded the backup! Close the welcome dialog behind this.
+        if (welcomeDialog != null) welcomeDialog.hideDialog(DialogButton.CANCEL);
+      }
+      else
+      {
+        // User cancelled the dialog, don't close the welcome dialog so we aren't in a broken state.
+      }
+    };
 
     state.isHaxeUIDialogOpen = true;
 
+    var backupTimeLabel:Null<Label> = dialog.findComponent('backupTimeLabel', Label);
+    if (backupTimeLabel == null) throw 'Could not locate backupTimeLabel button in Backup Available dialog';
+
+    var latestBackupDate:Null<Date> = ChartEditorImportExportHandler.getLatestBackupDate();
+    if (latestBackupDate != null)
+    {
+      var latestBackupDateStr:String = DateUtil.generateCleanTimestamp(latestBackupDate);
+      backupTimeLabel.text = latestBackupDateStr;
+    }
+
     var buttonCancel:Null<Button> = dialog.findComponent('dialogCancel', Button);
     if (buttonCancel == null) throw 'Could not locate dialogCancel button in Backup Available dialog';
     buttonCancel.onClick = function(_event) {
+      // Don't hide the welcome dialog behind this.
       dialog.hideDialog(DialogButton.CANCEL);
     }
 
     var buttonGoToFolder:Null<Button> = dialog.findComponent('buttonGoToFolder', Button);
     if (buttonGoToFolder == null) throw 'Could not locate buttonGoToFolder button in Backup Available dialog';
     buttonGoToFolder.onClick = function(_event) {
+      // TODO: Is there a way to open a folder and highlight a file in it?
+      var absoluteBackupsPath:String = Path.join([Sys.getCwd(), ChartEditorImportExportHandler.BACKUPS_PATH]);
+      WindowUtil.openFolder(absoluteBackupsPath);
+      // Don't hide the welcome dialog behind this.
       dialog.hideDialog(DialogButton.CANCEL);
-      state.openBackupFolder();
     }
 
     var buttonOpenBackup:Null<Button> = dialog.findComponent('buttonOpenBackup', Button);
     if (buttonOpenBackup == null) throw 'Could not locate buttonOpenBackup button in Backup Available dialog';
     buttonOpenBackup.onClick = function(_event) {
-      dialog.hideDialog(DialogButton.CANCEL);
-      state.openBackup();
+      var latestBackupPath:Null<String> = ChartEditorImportExportHandler.getLatestBackupPath();
+
+      var result:Null<Array<String>> = (latestBackupPath != null) ? state.loadFromFNFCPath(latestBackupPath) : null;
+      if (result != null)
+      {
+        if (result.length == 0)
+        {
+          // No warnings.
+          state.success('Loaded Chart', 'Loaded chart (${latestBackupPath})');
+        }
+        else
+        {
+          // One or more warnings.
+          state.warning('Loaded Chart', 'Loaded chart (${latestBackupPath})\n${result.join("\n")}');
+        }
+
+        // Close the welcome dialog behind this.
+        dialog.hideDialog(DialogButton.APPLY);
+      }
+      else
+      {
+        state.error('Failed to Load Chart', 'Failed to load chart (${latestBackupPath})');
+
+        // Song failed to load, don't close the Welcome dialog so we aren't in a broken state.
+        dialog.hideDialog(DialogButton.CANCEL);
+      }
     }
+
+    return dialog;
   }
 
   public static function openBrowseFNFC(state:ChartEditorState, closable:Bool):Null<Dialog>
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
index 393af20a7..23c864a07 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorImportExportHandler.hx
@@ -1,11 +1,10 @@
 package funkin.ui.debug.charting.handlers;
 
 import funkin.util.VersionUtil;
-import haxe.ui.notifications.NotificationType;
 import funkin.util.DateUtil;
 import haxe.io.Path;
 import funkin.util.SerializerUtil;
-import haxe.ui.notifications.NotificationManager;
+import funkin.util.SortUtil;
 import funkin.util.FileUtil;
 import funkin.util.FileUtil.FileWriteMode;
 import haxe.io.Bytes;
@@ -22,6 +21,8 @@ import funkin.data.song.importer.ChartManifestData;
 @:access(funkin.ui.debug.charting.ChartEditorState)
 class ChartEditorImportExportHandler
 {
+  public static final BACKUPS_PATH:String = './backups/';
+
   /**
    * Fetch's a song's existing chart and audio and loads it, replacing the current song.
    */
@@ -310,21 +311,56 @@ class ChartEditorImportExportHandler
     return warnings;
   }
 
-  public static function getLatestBackupPath()
+  public static function getLatestBackupPath():Null<String>
   {
-    throw 'Not implemented yet.';
+    #if sys
+    var entries:Array<String> = sys.FileSystem.readDirectory(BACKUPS_PATH);
+    entries.sort(SortUtil.alphabetically);
+
+    var latestBackupPath:Null<String> = entries[(entries.length - 1)];
+
+    if (latestBackupPath == null) return null;
+    return haxe.io.Path.join([BACKUPS_PATH, latestBackupPath]);
+    #else
+    return null;
+    #end
   }
 
-  public static function getLatestBackupDate()
+  public static function getLatestBackupDate():Null<Date>
   {
-    throw 'Not implemented yet.';
+    #if sys
+    var latestBackupPath:Null<String> = getLatestBackupPath();
+    if (latestBackupPath == null) return null;
+
+    var latestBackupName:String = haxe.io.Path.withoutDirectory(latestBackupPath);
+    latestBackupName = haxe.io.Path.withoutExtension(latestBackupName);
+
+    var parts = latestBackupName.split('-');
+
+    // var chart:String = parts[0];
+    // var editor:String = parts[1];
+    var year:Int = Std.parseInt(parts[2] ?? '0') ?? 0;
+    var month:Int = Std.parseInt(parts[3] ?? '1') ?? 1;
+    var day:Int = Std.parseInt(parts[4] ?? '0') ?? 0;
+    var hour:Int = Std.parseInt(parts[5] ?? '0') ?? 0;
+    var minute:Int = Std.parseInt(parts[6] ?? '0') ?? 0;
+    var second:Int = Std.parseInt(parts[7] ?? '0') ?? 0;
+
+    var date:Date = new Date(year, month - 1, day, hour, minute, second);
+    return date;
+    #else
+    return null;
+    #end
   }
 
   /**
    * @param force Whether to export without prompting. `false` will prompt the user for a location.
    * @param targetPath where to export if `force` is `true`. If `null`, will export to the `backups` folder.
+   * @param onSaveCb Callback for when the file is saved.
+   * @param onCancelCb Callback for when saving is cancelled.
    */
-  public static function exportAllSongData(state:ChartEditorState, force:Bool = false, ?targetPath:String):Void
+  public static function exportAllSongData(state:ChartEditorState, force:Bool = false, targetPath:Null<String>, ?onSaveCb:String->Void,
+      ?onCancelCb:Void->Void):Void
   {
     var zipEntries:Array<haxe.zip.Entry> = [];
 
@@ -371,12 +407,13 @@ class ChartEditorImportExportHandler
         // Force writing to a generic path (autosave or crash recovery)
         targetMode = Skip;
         targetPath = Path.join([
-          './backups/',
+          BACKUPS_PATH,
           'chart-editor-${DateUtil.generateTimestamp()}.${Constants.EXT_CHART}'
         ]);
         // We have to force write because the program will die before the save dialog is closed.
         trace('Force exporting to $targetPath...');
         FileUtil.saveFilesAsZIPToPath(zipEntries, targetPath, targetMode);
+        if (onSaveCb != null) onSaveCb(targetPath);
       }
       else
       {
@@ -384,6 +421,7 @@ class ChartEditorImportExportHandler
         trace('Force exporting to $targetPath...');
         FileUtil.saveFilesAsZIPToPath(zipEntries, targetPath, targetMode);
         state.saveDataDirty = false;
+        if (onSaveCb != null) onSaveCb(targetPath);
       }
     }
     else
@@ -400,11 +438,13 @@ class ChartEditorImportExportHandler
           trace('Saved to "${paths[0]}"');
           state.currentWorkingFilePath = paths[0];
           state.applyWindowTitle();
+          if (onSaveCb != null) onSaveCb(paths[0]);
         }
       };
 
       var onCancel:Void->Void = function() {
         trace('Export cancelled.');
+        if (onCancelCb != null) onCancelCb();
       };
 
       trace('Exporting to user-defined location...');
diff --git a/source/funkin/util/CLIUtil.hx b/source/funkin/util/CLIUtil.hx
index 0ca707c34..ecabaff06 100644
--- a/source/funkin/util/CLIUtil.hx
+++ b/source/funkin/util/CLIUtil.hx
@@ -96,7 +96,7 @@ class CLIUtil
 
   static function printUsage():Void
   {
-    trace('Usage: Funkin.exe [--chart <chart>]');
+    trace('Usage: Funkin.exe [--chart <chart>] [--help] [--version]');
   }
 
   static function buildDefaultParams():CLIParams
diff --git a/source/funkin/util/DateUtil.hx b/source/funkin/util/DateUtil.hx
index 2d08fd48b..f899ffeb2 100644
--- a/source/funkin/util/DateUtil.hx
+++ b/source/funkin/util/DateUtil.hx
@@ -12,4 +12,11 @@ class DateUtil
     return
       '${date.getFullYear()}-${Std.string(date.getMonth() + 1).lpad('0', 2)}-${Std.string(date.getDate()).lpad('0', 2)}-${Std.string(date.getHours()).lpad('0', 2)}-${Std.string(date.getMinutes()).lpad('0', 2)}-${Std.string(date.getSeconds()).lpad('0', 2)}';
   }
+
+  public static function generateCleanTimestamp(?date:Date = null):String
+  {
+    if (date == null) date = Date.now();
+
+    return '${DateTools.format(date, '%B %d, %Y')} at ${DateTools.format(date, '%I:%M %p')}';
+  }
 }
diff --git a/source/funkin/util/FileUtil.hx b/source/funkin/util/FileUtil.hx
index c18678a46..8c41cc363 100644
--- a/source/funkin/util/FileUtil.hx
+++ b/source/funkin/util/FileUtil.hx
@@ -73,11 +73,6 @@ class FileUtil
     #end
   }
 
-  public static function openFolderInExplorer():Void
-  {
-    throw 'Not implemented yet.';
-  }
-
   /**
    * Browses for multiple file, then calls `onSelect(paths)` when a path chosen.
    * Note that on HTML5 this will immediately fail.
diff --git a/source/funkin/util/WindowUtil.hx b/source/funkin/util/WindowUtil.hx
index 0e9b76bc2..ec64b45d6 100644
--- a/source/funkin/util/WindowUtil.hx
+++ b/source/funkin/util/WindowUtil.hx
@@ -18,7 +18,7 @@ class WindowUtil
    * Runs platform-specific code to open a URL in a web browser.
    * @param targetUrl The URL to open.
    */
-  public static function openURL(targetUrl:String)
+  public static function openURL(targetUrl:String):Void
   {
     #if CAN_OPEN_LINKS
     #if linux
@@ -32,6 +32,25 @@ class WindowUtil
     #end
   }
 
+  /**
+   * Runs platform-specific code to open a path in the file explorer.
+   * @param targetPath The path to open.
+   */
+  public static function openFolder(targetPath:String):Void
+  {
+    #if CAN_OPEN_LINKS
+    #if windows
+    Sys.command('explorer', [targetPath]);
+    #elseif mac
+    Sys.command('open', [targetPath]);
+    #elseif linux
+    Sys.command('open', [targetPath]);
+    #end
+    #else
+    throw 'Cannot open URLs on this platform.';
+    #end
+  }
+
   /**
    * Dispatched when the game window is closed.
    */

From 700ebb6a83ccb8d02ceb45f145fd2fc62220f003 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 22 Nov 2023 19:41:52 -0500
Subject: [PATCH 09/16] Add action buttons for notifications

---
 .../ChartEditorNotificationHandler.hx         | 48 +++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
index 606f8a5c8..69ba4f3ba 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
@@ -1,5 +1,7 @@
 package funkin.ui.debug.charting.handlers;
 
+import haxe.ui.components.Button;
+import haxe.ui.containers.HBox;
 import haxe.ui.notifications.Notification;
 import haxe.ui.notifications.NotificationManager;
 import haxe.ui.notifications.NotificationType;
@@ -67,6 +69,19 @@ class ChartEditorNotificationHandler
     return sendNotification(title, body, NotificationType.Info);
   }
 
+  /**
+   * Send a notification with an info icon and one or more actions.
+   * @param state The current state of the chart editor.
+   * @param title The title of the notification.
+   * @param body The body of the notification.
+   * @param actions The actions to add to the notification.
+   * @return The notification that was sent.
+   */
+  public static function info(state:ChartEditorState, title:String, body:String):Notification
+  {
+    return sendNotification(title, body, NotificationType.Info);
+  }
+
   /**
    * Clear all active notifications.
    * @param state The current state of the chart editor.
@@ -86,18 +101,45 @@ class ChartEditorNotificationHandler
     NotificationManager.instance.removeNotification(notif);
   }
 
-  static function sendNotification(title:String, body:String, ?type:NotificationType):Notification
+  static function sendNotification(title:String, body:String, ?type:NotificationType, ?actions:Array<NotificationAction>):Notification
   {
     #if !mac
-    return NotificationManager.instance.addNotification(
+    var actionNames:Array<String> = actions.map(action -> action.text);
+
+    var notif = NotificationManager.instance.addNotification(
       {
         title: title,
         body: body,
         type: type ?? NotificationType.Default,
-        expiryMs: Constants.NOTIFICATION_DISMISS_TIME
+        expiryMs: Constants.NOTIFICATION_DISMISS_TIME,
+        actions: actionNames
       });
+
+    // TODO: Tell Ian that this is REALLY dumb.
+    var actionsContainer:HBox = notif.findComponent('actionsContainer', HBox);
+    actionsContainer.walkComponents(function(component) {
+      if (Std.isOfType(component, Button))
+      {
+        var button:Button = cast component;
+        var action:Null<NotificationAction> = actions.find(action -> action.text == button.text);
+        if (action != null && action.callback != null)
+        {
+          button.onClick = function(_) {
+            action.callback();
+          };
+        }
+      }
+    });
+
+    return notif;
     #else
     trace('WARNING: Notifications are not supported on Mac OS.');
     #end
   }
 }
+
+typedef NotificationAction =
+{
+  text:String,
+  callback:Void->Void
+}

From 4ace7c9cf4d0e59a5c65b49f7ccab10c2d4ea8cf Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 22 Nov 2023 19:42:28 -0500
Subject: [PATCH 10/16] Add "Go to Backups" menu item

---
 assets                                        |  2 +-
 .../ui/debug/charting/ChartEditorState.hx     | 27 +++++++++++++++++++
 .../handlers/ChartEditorDialogHandler.hx      |  4 +--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/assets b/assets
index 4cbffd074..4a0004864 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 4cbffd074bb6d1d5fa13492d19e0736869338ac3
+Subproject commit 4a0004864b620a83f7468dfcc10e0a2036bba872
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 92279ef27..2cd79fdea 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -2126,6 +2126,16 @@ class ChartEditorState extends HaxeUIState
     addUIClickListener('menubarItemAbout', _ -> this.openAboutDialog());
     addUIClickListener('menubarItemWelcomeDialog', _ -> this.openWelcomeDialog(true));
 
+    #if sys
+    addUIClickListener('menubarItemGoToBackupsFolder', _ -> this.openBackupsFolder());
+    #else
+    // Disable the menu item if we're not on a desktop platform.
+    var menubarItemGoToBackupsFolder = findComponent('menubarItemGoToBackupsFolder', MenuItem);
+    if (menubarItemGoToBackupsFolder != null) menubarItemGoToBackupsFolder.disabled = true;
+
+    menubarItemGoToBackupsFolder.disabled = true;
+    #end
+
     addUIClickListener('menubarItemUserGuide', _ -> this.openUserGuideDialog());
 
     addUIChangeListener('menubarItemDownscroll', event -> isViewDownscroll = event.value);
@@ -2259,10 +2269,27 @@ class ChartEditorState extends HaxeUIState
     if (needsAutoSave)
     {
       this.exportAllSongData(true, null);
+      this.infoWithActions('Auto-Save', 'Chart auto-saved to your backups folder.', [
+        {
+          "text": "Take Me There",
+          action: openBackupsFolder,
+        }
+      ], true);
     }
     #end
   }
 
+  /**
+   * Open the backups folder in the file explorer.
+   * Don't call this on HTML5.
+   */
+  function openBackupsFolder():Void
+  {
+    // TODO: Is there a way to open a folder and highlight a file in it?
+    var absoluteBackupsPath:String = Path.join([Sys.getCwd(), ChartEditorImportExportHandler.BACKUPS_PATH]);
+    WindowUtil.openFolder(absoluteBackupsPath);
+  }
+
   /**
    * Called when the window was closed, to save a backup of the chart.
    * @param exitCode The exit code of the window. We use `-1` when calling the function due to a game crash.
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
index 86717132b..2a8560721 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
@@ -288,9 +288,7 @@ class ChartEditorDialogHandler
     var buttonGoToFolder:Null<Button> = dialog.findComponent('buttonGoToFolder', Button);
     if (buttonGoToFolder == null) throw 'Could not locate buttonGoToFolder button in Backup Available dialog';
     buttonGoToFolder.onClick = function(_event) {
-      // TODO: Is there a way to open a folder and highlight a file in it?
-      var absoluteBackupsPath:String = Path.join([Sys.getCwd(), ChartEditorImportExportHandler.BACKUPS_PATH]);
-      WindowUtil.openFolder(absoluteBackupsPath);
+      state.openBackupsFolder();
       // Don't hide the welcome dialog behind this.
       dialog.hideDialog(DialogButton.CANCEL);
     }

From d66141c15afecaa85703973297dbaae4f1e65e14 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Wed, 22 Nov 2023 19:53:56 -0500
Subject: [PATCH 11/16] playhead dragging

---
 .../ui/debug/charting/ChartEditorState.hx     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 4772fab7c..84883b591 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -1956,16 +1956,21 @@ class ChartEditorState extends HaxeUIState
       }
     }
 
+    playbarHead.onDrag = function(_:DragEvent) {
+      if (playbarHeadDragging)
+      {
+        var value:Null<Float> = playbarHead?.value;
+
+        // Set the song position to where the playhead was moved to.
+        scrollPositionInPixels = songLengthInPixels * ((value ?? 0.0) / 100);
+        // Update the conductor and audio tracks to match.
+        moveSongToScrollPosition();
+      }
+    }
+
     playbarHead.onDragEnd = function(_:DragEvent) {
       playbarHeadDragging = false;
 
-      var value:Null<Float> = playbarHead?.value;
-
-      // Set the song position to where the playhead was moved to.
-      scrollPositionInPixels = songLengthInPixels * ((value ?? 0.0) / 100);
-      // Update the conductor and audio tracks to match.
-      moveSongToScrollPosition();
-
       // If we were dragging the playhead while the song was playing, resume playing.
       if (playbarHeadDraggingWasPlaying)
       {

From 668fbd3b37abea4a97014aa6b6b87e393df0af55 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 22 Nov 2023 20:25:25 -0500
Subject: [PATCH 12/16] Fixes for autosave notification

---
 .../ui/debug/charting/ChartEditorState.hx     | 36 ++++++++++---------
 .../ChartEditorNotificationHandler.hx         | 36 ++++++++++---------
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 2cd79fdea..b6ca0db49 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -1650,13 +1650,13 @@ class ChartEditorState extends HaxeUIState
         }
         else
         {
-          this.error('Failure', 'Failed to load chart (${params.fnfcTargetPath})');
+          this.error('Failure', 'Failed to load chart (${chartPath.toString()})');
         }
       }
 
       if (!FileUtil.doesFileExist(chartPath))
       {
-        trace('Previously loaded chart file (${chartPath}) does not exist, disabling link...');
+        trace('Previously loaded chart file (${chartPath.toString()}) does not exist, disabling link...');
         menuItemRecentChart.disabled = true;
       }
       else
@@ -2030,7 +2030,7 @@ class ChartEditorState extends HaxeUIState
         this.exportAllSongData(false, null);
       }
     });
-    addUIClickListener('menubarItemSaveChartAs', _ -> this.exportAllSongData());
+    addUIClickListener('menubarItemSaveChartAs', _ -> this.exportAllSongData(false, null));
     addUIClickListener('menubarItemLoadInst', _ -> this.openUploadInstDialog(true));
     addUIClickListener('menubarItemImportChart', _ -> this.openImportChartDialog('legacy', true));
     addUIClickListener('menubarItemExit', _ -> quitChartEditor());
@@ -2269,12 +2269,13 @@ class ChartEditorState extends HaxeUIState
     if (needsAutoSave)
     {
       this.exportAllSongData(true, null);
-      this.infoWithActions('Auto-Save', 'Chart auto-saved to your backups folder.', [
+      var absoluteBackupsPath:String = Path.join([Sys.getCwd(), ChartEditorImportExportHandler.BACKUPS_PATH]);
+      this.infoWithActions('Auto-Save', 'Chart auto-saved to ${absoluteBackupsPath}.', [
         {
-          "text": "Take Me There",
-          action: openBackupsFolder,
+          text: "Take Me There",
+          callback: openBackupsFolder,
         }
-      ], true);
+      ]);
     }
     #end
   }
@@ -3487,6 +3488,11 @@ class ChartEditorState extends HaxeUIState
           // Finished dragging. Release the note.
           currentPlaceNoteData = null;
         }
+        else
+        {
+          // Cursor should be a grabby hand.
+          if (targetCursorMode == null) targetCursorMode = Grabbing;
+        }
       }
       else
       {
@@ -4031,23 +4037,21 @@ class ChartEditorState extends HaxeUIState
       if (currentWorkingFilePath == null || FlxG.keys.pressed.SHIFT)
       {
         // CTRL + SHIFT + S = Save As
-        this.exportAllSongData(false, null);
+        this.exportAllSongData(false, null, function(path:String) {
+          // CTRL + SHIFT + S Successful
+          this.success('Saved Chart', 'Chart saved successfully to ${path}.');
+        }, function() {
+          // CTRL + SHIFT + S Cancelled
+        });
       }
       else
       {
         // CTRL + S = Save Chart
         this.exportAllSongData(true, currentWorkingFilePath);
+        this.success('Saved Chart', 'Chart saved successfully to ${currentWorkingFilePath}.');
       }
     }
 
-    if (FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.SHIFT && FlxG.keys.justPressed.S)
-    {
-      this.exportAllSongData(false, null, function(path:String) {
-        // CTRL + SHIFT + S Successful
-      }, function() {
-        // CTRL + SHIFT + S Cancelled
-      });
-    }
     // CTRL + Q = Quit to Menu
     if (FlxG.keys.pressed.CONTROL && FlxG.keys.justPressed.Q)
     {
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
index 69ba4f3ba..796e70381 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
@@ -77,9 +77,9 @@ class ChartEditorNotificationHandler
    * @param actions The actions to add to the notification.
    * @return The notification that was sent.
    */
-  public static function info(state:ChartEditorState, title:String, body:String):Notification
+  public static function infoWithActions(state:ChartEditorState, title:String, body:String, actions:Array<NotificationAction>):Notification
   {
-    return sendNotification(title, body, NotificationType.Info);
+    return sendNotification(title, body, NotificationType.Info, actions);
   }
 
   /**
@@ -104,7 +104,7 @@ class ChartEditorNotificationHandler
   static function sendNotification(title:String, body:String, ?type:NotificationType, ?actions:Array<NotificationAction>):Notification
   {
     #if !mac
-    var actionNames:Array<String> = actions.map(action -> action.text);
+    var actionNames:Array<String> = actions == null ? [] : actions.map(action -> action.text);
 
     var notif = NotificationManager.instance.addNotification(
       {
@@ -115,21 +115,25 @@ class ChartEditorNotificationHandler
         actions: actionNames
       });
 
-    // TODO: Tell Ian that this is REALLY dumb.
-    var actionsContainer:HBox = notif.findComponent('actionsContainer', HBox);
-    actionsContainer.walkComponents(function(component) {
-      if (Std.isOfType(component, Button))
-      {
-        var button:Button = cast component;
-        var action:Null<NotificationAction> = actions.find(action -> action.text == button.text);
-        if (action != null && action.callback != null)
+    if (actionNames.length > 0)
+    {
+      // TODO: Tell Ian that this is REALLY dumb.
+      var actionsContainer:HBox = notif.findComponent('actionsContainer', HBox);
+      actionsContainer.walkComponents(function(component) {
+        if (Std.isOfType(component, Button))
         {
-          button.onClick = function(_) {
-            action.callback();
-          };
+          var button:Button = cast component;
+          var action:Null<NotificationAction> = actions.find(action -> action.text == button.text);
+          if (action != null && action.callback != null)
+          {
+            button.onClick = function(_) {
+              action.callback();
+            };
+          }
         }
-      }
-    });
+        return true; // Continue walking.
+      });
+    }
 
     return notif;
     #else

From 645b9b579af8afbba9b6eba7d4a8fddd1aed110f Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Thu, 23 Nov 2023 18:35:57 -0500
Subject: [PATCH 13/16] don't close backup dialog if opening folder

---
 .../ui/debug/charting/handlers/ChartEditorDialogHandler.hx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
index 2a8560721..1b7dd2ca8 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
@@ -290,7 +290,7 @@ class ChartEditorDialogHandler
     buttonGoToFolder.onClick = function(_event) {
       state.openBackupsFolder();
       // Don't hide the welcome dialog behind this.
-      dialog.hideDialog(DialogButton.CANCEL);
+      // dialog.hideDialog(DialogButton.CANCEL);
     }
 
     var buttonOpenBackup:Null<Button> = dialog.findComponent('buttonOpenBackup', Button);

From 2d33461a24cbffab66bc40bf35208a4f58627263 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Thu, 23 Nov 2023 19:48:28 -0500
Subject: [PATCH 14/16] windows file slash fix for opening folders

---
 source/funkin/util/WindowUtil.hx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/funkin/util/WindowUtil.hx b/source/funkin/util/WindowUtil.hx
index ec64b45d6..891bb39f8 100644
--- a/source/funkin/util/WindowUtil.hx
+++ b/source/funkin/util/WindowUtil.hx
@@ -2,6 +2,8 @@ package funkin.util;
 
 import flixel.util.FlxSignal.FlxTypedSignal;
 
+using StringTools;
+
 /**
  * Utilities for operating on the current window, such as changing the title.
  */
@@ -40,7 +42,7 @@ class WindowUtil
   {
     #if CAN_OPEN_LINKS
     #if windows
-    Sys.command('explorer', [targetPath]);
+    Sys.command('explorer', [targetPath.replace("/", "\\")]);
     #elseif mac
     Sys.command('open', [targetPath]);
     #elseif linux

From a2ce1fdd5ef7624039e5c5407d3167d4988f4291 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Thu, 23 Nov 2023 19:54:34 -0500
Subject: [PATCH 15/16] opening and selecting specific file

---
 source/funkin/util/WindowUtil.hx | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/source/funkin/util/WindowUtil.hx b/source/funkin/util/WindowUtil.hx
index 891bb39f8..9f623c39d 100644
--- a/source/funkin/util/WindowUtil.hx
+++ b/source/funkin/util/WindowUtil.hx
@@ -53,6 +53,26 @@ class WindowUtil
     #end
   }
 
+  /**
+   * Runs platform-specific code to open a file explorer and select a specific file.
+   * @param targetPath The path of the file to select.
+   */
+  public static function openSelectFile(targetPath:String):Void
+  {
+    #if CAN_OPEN_LINKS
+    #if windows
+    Sys.command('explorer', ["/select," + targetPath.replace("/", "\\")]);
+    #elseif mac
+    Sys.command('open', ["-R", targetPath]);
+    #elseif linux
+    // TODO: unsure of the linux equivalent to opening a folder and then "selecting" a file.
+    Sys.command('open', [targetPath]);
+    #end
+    #else
+    throw 'Cannot open URLs on this platform.';
+    #end
+  }
+
   /**
    * Dispatched when the game window is closed.
    */

From ebae2512abaebccd9db71e283f6ae87e558c15fe Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Thu, 23 Nov 2023 20:06:58 -0500
Subject: [PATCH 16/16] assets merge update

---
 assets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets b/assets
index 4a0004864..c6aef3e3e 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 4a0004864b620a83f7468dfcc10e0a2036bba872
+Subproject commit c6aef3e3e6abc573c75dc5dbc90059ccdb6da83c