Refactor welcome.d using incFileOpen()

* resolves #145 * Allow users to configure exit behavior * A window pops up when the project is closed, exited, or new. * NewProjectAskHandler, CloseAskHandler, ExitAskHandler * Import pop-up windows is currently not supported. I think `kra.d` and `psd.d` shoud be refactored first. * nijigenerate/nijigenerate#30 * nijigenerate/nijigenerate#29 * Pop-up window when "open" is not currently supported
Inochi2D · Sep 23, 2024 · 56b4095 · 56b4095
1 parent a75157e
commit 56b4095
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/source/creator/io/save.d b/source/creator/io/save.d
@@ -16,13 +16,16 @@ import creator;
 import tinyfiledialogs;
 import i18n;
 
-void incFileOpen() {
+bool incFileOpen() {
     const TFD_Filter[] filters = [
         { ["*.inx"], "Inochi Creator Project (*.inx)" }
     ];
 
     string file = incShowOpenDialog(filters, _("Open..."));
-    if (file) incOpenProject(file);
+    // FileException should handle in incOpenProject, so we don't write try/catch here
+    if (file) return incOpenProject(file);
+
+    return false;
 }
 
 bool incFileSave() {

diff --git a/source/creator/windows/welcome.d b/source/creator/windows/welcome.d
@@ -231,16 +231,8 @@ protected:
                             }
 
                             if (incTextLinkWithIcon("", _("Open..."))) {
-                                const TFD_Filter[] filters = [
-                                    { ["*.inx"], "Inochi Creator Project (*.inx)" }
-                                ];
-
-                                string file = incShowOpenDialog(filters, _("Open..."));
-                                if (file) {
-                                    // FileException should handle in incOpenProject, so we don't write try/catch here
-                                    if (incOpenProject(file))
-                                        this.close();
-                                }
+                                if (incFileOpen())
+                                    this.close();
                             }