Expand editor and launcher settings

Author: S1mplector

editor/src/main/java/com/jvn/editor/EditorApp.java

@@ -264,10 +264,25 @@ private Window dialogOwner() {
   }
 
   private void setEditorTheme(EditorTheme.Theme theme) {
+    setEditorTheme(theme, true);
+  }
+
+  private void setEditorTheme(EditorTheme.Theme theme, boolean persist) {
     EditorTheme.Theme target = theme == null ? EditorTheme.Theme.DARK : theme;
-    if (target == EditorTheme.theme()) return;
-    EditorTheme.setTheme(target);
-    applyThemeToOpenWindows();
+    boolean changed = target != EditorTheme.theme();
+    if (changed) {
+      EditorTheme.setTheme(target);
+      applyThemeToOpenWindows();
+    }
+    if (persist && editorPreferences != null) {
+      editorPreferences.setEditorTheme(target == EditorTheme.Theme.LIGHT
+          ? EditorPreferences.LAUNCHER_THEME_LIGHT
+          : EditorPreferences.LAUNCHER_THEME_DARK);
+      persistEditorPreferences();
+      if (editorSettingsView != null) {
+        editorSettingsView.loadIntoForm(editorPreferences);
+      }
+    }
     if (status != null) {
       status.setText("Theme: " + (target == EditorTheme.Theme.LIGHT ? "Light" : "Dark"));
     }
@@ -313,7 +328,9 @@ private void doRunProject(Stage stage) {
 
   private void doRunProject(File root) {
     if (root == null) return;
-    if (!saveDirtyEditorsBeforeRun()) return;
+    if (editorPreferences == null || editorPreferences.isAutoSaveBeforeRun()) {
+      if (!saveDirtyEditorsBeforeRun()) return;
+    }
     Properties mf = loadManifest(root);
     if (mf == null) { status.setText("jvn.project not found"); return; }
     String type = mf.getProperty("type", "gradle").trim();
@@ -504,7 +521,9 @@ private void runVnProjectInRuntime(File root, Properties mf) {
     if (!runtimeAudio.isBlank()) runtimeArgs.append(" --audio ").append(quoteCliArg(runtimeAudio));
     String runtimeLocale = mf.getProperty("runtime.locale", "").trim();
     if (!runtimeLocale.isBlank()) runtimeArgs.append(" --locale ").append(quoteCliArg(runtimeLocale));
-    runtimeArgs.append(" --perf-hud");
+    if (editorPreferences == null || editorPreferences.isEditorRuntimePerfHud()) {
+      runtimeArgs.append(" --perf-hud");
+    }
 
     runGradle(workspaceRoot, ":runtime:run", new String[] { "--args=" + runtimeArgs }, "JVN Runtime");
     status.setText("Launching runtime: " + root.getName());
@@ -2922,6 +2941,10 @@ private void applyEditorPreferences(EditorPreferences preferences) {
       targetFps = maxFps;
       minFrameIntervalNs = (long) (1_000_000_000.0 / targetFps);
     }
+    setEditorTheme(EditorPreferences.LAUNCHER_THEME_LIGHT.equals(editorPreferences.getEditorTheme())
+        ? EditorTheme.Theme.LIGHT
+        : EditorTheme.Theme.DARK,
+        false);
     applyCodeEditorFontSizePreference();
     applyWelcomeTabPreference();
     applyDefaultSidebarPreferences();

editor/src/main/java/com/jvn/editor/JvnLauncherApp.java

@@ -689,6 +689,17 @@ private void runSelectedProject() {
       EditorDialogs.info(primaryStage, "Run Project", "Select a project first.");
       return;
     }
+    if (editorPreferences != null
+        && editorPreferences.isLauncherConfirmRunProject()
+        && !EditorDialogs.confirm(
+            primaryStage,
+            "Run Project",
+            "Run " + displayProjectName(currentProject) + " from the launcher?",
+            "Run",
+            false)) {
+      statusLabel.setText("Run cancelled");
+      return;
+    }
 
     Properties manifest = loadManifest(currentProject);
     if (manifest == null) {
@@ -801,7 +812,9 @@ private void runVnProjectInRuntime(File root, Properties manifest) {
     if (!runtimeAudio.isBlank()) runtimeArgs.append(" --audio ").append(quoteCliArg(runtimeAudio));
     String runtimeLocale = manifest.getProperty("runtime.locale", "").trim();
     if (!runtimeLocale.isBlank()) runtimeArgs.append(" --locale ").append(quoteCliArg(runtimeLocale));
-    runtimeArgs.append(" --perf-hud");
+    if (editorPreferences == null || editorPreferences.isLauncherRuntimePerfHud()) {
+      runtimeArgs.append(" --perf-hud");
+    }
 
     runGradle(workspace, ":runtime:run", new String[] {"--args=" + runtimeArgs}, "JVN Runtime");
   }
@@ -817,7 +830,10 @@ private void launchEditor(File projectDir, File startupFile) {
       command.addAll(resolveForwardedJvmArgs());
       command.add("-cp");
       command.add(System.getProperty("java.class.path", ""));
-      command.add("-Djvn.editor.theme=" + (EditorTheme.theme() == EditorTheme.Theme.LIGHT ? "light" : "dark"));
+      String editorTheme = editorPreferences == null
+          ? EditorPreferences.LAUNCHER_THEME_DARK
+          : EditorPreferences.normalizeEditorTheme(editorPreferences.getEditorTheme());
+      command.add("-Djvn.editor.theme=" + editorTheme);
       if (projectDir != null && projectDir.isDirectory()) {
         command.add("-D" + EDITOR_OPEN_PROJECT_PROPERTY + "=" + projectDir.getAbsolutePath());
       }
@@ -842,9 +858,11 @@ private void launchEditor(File projectDir, File startupFile) {
             : "Editor launched for " + projectDir.getName());
       }
 
-      primaryStage.hide();
-      editorProcess.onExit().thenRunAsync(
-          () -> Platform.runLater(() -> primaryStage.show()));
+      if (editorPreferences == null || !editorPreferences.isLauncherKeepOpenAfterEditorLaunch()) {
+        primaryStage.hide();
+        editorProcess.onExit().thenRunAsync(
+            () -> Platform.runLater(() -> primaryStage.show()));
+      }
     } catch (Exception ex) {
       EditorDialogs.error(primaryStage, "Open Editor", "Failed to launch editor: " + ex.getMessage());
     }

editor/src/main/java/com/jvn/editor/ui/EditorPreferences.java

@@ -18,13 +18,19 @@ public final class EditorPreferences {
 
   private int codeEditorFontSize;
   private int editorMaxFps = DEFAULT_EDITOR_MAX_FPS;
+  private String editorTheme;
   private boolean showWelcomeOnStartup;
   private boolean loadSidebarExtensionsOnDemand;
+  private boolean autoSaveBeforeRun;
+  private boolean editorRuntimePerfHud;
   private String defaultTextEditor;
   private String customTextEditorCommand;
   private String launcherTheme;
   private boolean launcherRestoreLastProject;
   private String launcherLastProjectPath;
+  private boolean launcherKeepOpenAfterEditorLaunch;
+  private boolean launcherConfirmRunProject;
+  private boolean launcherRuntimePerfHud;
   private final EnumMap<EditorSidebarPanel, EditorPanelPlacement> panelPlacements =
       new EnumMap<>(EditorSidebarPanel.class);
   private final EnumMap<EditorSidebarPanel, Boolean> chooserVisibility =
@@ -33,37 +39,55 @@ public final class EditorPreferences {
   public EditorPreferences() {
     this(
         DEFAULT_CODE_EDITOR_FONT_SIZE,
+        LAUNCHER_THEME_DARK,
+        true,
+        true,
         true,
         true,
         TEXT_EDITOR_JVN,
         "",
         LAUNCHER_THEME_DARK,
         true,
         "",
+        false,
+        false,
+        true,
         EditorSidebarPanel.defaultPlacements(),
         EditorSidebarPanel.defaultChooserVisibility());
   }
 
   public EditorPreferences(
       int codeEditorFontSize,
+      String editorTheme,
       boolean showWelcomeOnStartup,
       boolean loadSidebarExtensionsOnDemand,
+      boolean autoSaveBeforeRun,
+      boolean editorRuntimePerfHud,
       String defaultTextEditor,
       String customTextEditorCommand,
       String launcherTheme,
       boolean launcherRestoreLastProject,
       String launcherLastProjectPath,
+      boolean launcherKeepOpenAfterEditorLaunch,
+      boolean launcherConfirmRunProject,
+      boolean launcherRuntimePerfHud,
       Map<EditorSidebarPanel, EditorPanelPlacement> placements,
       Map<EditorSidebarPanel, Boolean> chooserVisibility) {
     this.codeEditorFontSize =
         clampCodeEditorFontSize(codeEditorFontSize);
+    this.editorTheme = normalizeTheme(editorTheme);
     this.showWelcomeOnStartup = showWelcomeOnStartup;
     this.loadSidebarExtensionsOnDemand = loadSidebarExtensionsOnDemand;
+    this.autoSaveBeforeRun = autoSaveBeforeRun;
+    this.editorRuntimePerfHud = editorRuntimePerfHud;
     this.defaultTextEditor = normalizeTextEditor(defaultTextEditor);
     this.customTextEditorCommand = cleanText(customTextEditorCommand);
     this.launcherTheme = normalizeLauncherTheme(launcherTheme);
     this.launcherRestoreLastProject = launcherRestoreLastProject;
     this.launcherLastProjectPath = cleanText(launcherLastProjectPath);
+    this.launcherKeepOpenAfterEditorLaunch = launcherKeepOpenAfterEditorLaunch;
+    this.launcherConfirmRunProject = launcherConfirmRunProject;
+    this.launcherRuntimePerfHud = launcherRuntimePerfHud;
     panelPlacements.putAll(EditorSidebarPanel.defaultPlacements());
     this.chooserVisibility.putAll(EditorSidebarPanel.defaultChooserVisibility());
     if (placements != null) {
@@ -105,6 +129,14 @@ public void setEditorMaxFps(int editorMaxFps) {
     }
   }
 
+  public String getEditorTheme() {
+    return editorTheme;
+  }
+
+  public void setEditorTheme(String editorTheme) {
+    this.editorTheme = normalizeTheme(editorTheme);
+  }
+
   public boolean isShowWelcomeOnStartup() {
     return showWelcomeOnStartup;
   }
@@ -121,6 +153,22 @@ public void setLoadSidebarExtensionsOnDemand(boolean loadSidebarExtensionsOnDema
     this.loadSidebarExtensionsOnDemand = loadSidebarExtensionsOnDemand;
   }
 
+  public boolean isAutoSaveBeforeRun() {
+    return autoSaveBeforeRun;
+  }
+
+  public void setAutoSaveBeforeRun(boolean autoSaveBeforeRun) {
+    this.autoSaveBeforeRun = autoSaveBeforeRun;
+  }
+
+  public boolean isEditorRuntimePerfHud() {
+    return editorRuntimePerfHud;
+  }
+
+  public void setEditorRuntimePerfHud(boolean editorRuntimePerfHud) {
+    this.editorRuntimePerfHud = editorRuntimePerfHud;
+  }
+
   public String getDefaultTextEditor() {
     return defaultTextEditor;
   }
@@ -161,6 +209,30 @@ public void setLauncherLastProjectPath(String launcherLastProjectPath) {
     this.launcherLastProjectPath = cleanText(launcherLastProjectPath);
   }
 
+  public boolean isLauncherKeepOpenAfterEditorLaunch() {
+    return launcherKeepOpenAfterEditorLaunch;
+  }
+
+  public void setLauncherKeepOpenAfterEditorLaunch(boolean launcherKeepOpenAfterEditorLaunch) {
+    this.launcherKeepOpenAfterEditorLaunch = launcherKeepOpenAfterEditorLaunch;
+  }
+
+  public boolean isLauncherConfirmRunProject() {
+    return launcherConfirmRunProject;
+  }
+
+  public void setLauncherConfirmRunProject(boolean launcherConfirmRunProject) {
+    this.launcherConfirmRunProject = launcherConfirmRunProject;
+  }
+
+  public boolean isLauncherRuntimePerfHud() {
+    return launcherRuntimePerfHud;
+  }
+
+  public void setLauncherRuntimePerfHud(boolean launcherRuntimePerfHud) {
+    this.launcherRuntimePerfHud = launcherRuntimePerfHud;
+  }
+
   public EditorPanelPlacement getPlacement(EditorSidebarPanel panel) {
     if (panel == null) return EditorPanelPlacement.HIDDEN;
     return panelPlacements.getOrDefault(panel, panel.defaultPlacement());
@@ -192,13 +264,19 @@ public EnumMap<EditorSidebarPanel, Boolean> copyChooserVisibility() {
   public EditorPreferences copy() {
     EditorPreferences c = new EditorPreferences(
         codeEditorFontSize,
+        editorTheme,
         showWelcomeOnStartup,
         loadSidebarExtensionsOnDemand,
+        autoSaveBeforeRun,
+        editorRuntimePerfHud,
         defaultTextEditor,
         customTextEditorCommand,
         launcherTheme,
         launcherRestoreLastProject,
         launcherLastProjectPath,
+        launcherKeepOpenAfterEditorLaunch,
+        launcherConfirmRunProject,
+        launcherRuntimePerfHud,
         panelPlacements,
         chooserVisibility);
     c.editorMaxFps = this.editorMaxFps;
@@ -217,6 +295,14 @@ public static String normalizeTextEditor(String value) {
   }
 
   public static String normalizeLauncherTheme(String value) {
+    return normalizeTheme(value);
+  }
+
+  public static String normalizeEditorTheme(String value) {
+    return normalizeTheme(value);
+  }
+
+  private static String normalizeTheme(String value) {
     String normalized = cleanText(value).toLowerCase();
     return LAUNCHER_THEME_LIGHT.equals(normalized) ? LAUNCHER_THEME_LIGHT : LAUNCHER_THEME_DARK;
   }

editor/src/main/java/com/jvn/editor/ui/EditorPreferencesStore.java

@@ -10,13 +10,20 @@
 public final class EditorPreferencesStore {
   static final String KEY_CODE_EDITOR_FONT_SIZE = "codeEditorFontSize";
   static final String KEY_EDITOR_MAX_FPS = "editorMaxFps";
+  static final String KEY_EDITOR_THEME = "editor.theme";
   static final String KEY_SHOW_WELCOME_ON_STARTUP = "showWelcomeOnStartup";
   static final String KEY_LOAD_SIDEBAR_EXTENSIONS_ON_DEMAND = "loadSidebarExtensionsOnDemand";
+  static final String KEY_AUTO_SAVE_BEFORE_RUN = "autoSaveBeforeRun";
+  static final String KEY_EDITOR_RUNTIME_PERF_HUD = "editor.runtimePerfHud";
   static final String KEY_DEFAULT_TEXT_EDITOR = "defaultTextEditor";
   static final String KEY_CUSTOM_TEXT_EDITOR_COMMAND = "customTextEditorCommand";
   static final String KEY_LAUNCHER_THEME = "launcher.theme";
   static final String KEY_LAUNCHER_RESTORE_LAST_PROJECT = "launcher.restoreLastProject";
   static final String KEY_LAUNCHER_LAST_PROJECT_PATH = "launcher.lastProjectPath";
+  static final String KEY_LAUNCHER_KEEP_OPEN_AFTER_EDITOR_LAUNCH =
+      "launcher.keepOpenAfterEditorLaunch";
+  static final String KEY_LAUNCHER_CONFIRM_RUN_PROJECT = "launcher.confirmRunProject";
+  static final String KEY_LAUNCHER_RUNTIME_PERF_HUD = "launcher.runtimePerfHud";
   static final String KEY_PANEL_PREFIX = "panel.";
   static final String KEY_PANEL_SUFFIX = ".placement";
   static final String KEY_CHOOSER_SUFFIX = ".chooserVisible";
@@ -72,12 +79,21 @@ static Properties toProperties(EditorPreferences preferences) {
     props.setProperty(
         KEY_EDITOR_MAX_FPS,
         Integer.toString(preferences.getEditorMaxFps()));
+    props.setProperty(
+        KEY_EDITOR_THEME,
+        preferences.getEditorTheme());
     props.setProperty(
         KEY_SHOW_WELCOME_ON_STARTUP,
         Boolean.toString(preferences.isShowWelcomeOnStartup()));
     props.setProperty(
         KEY_LOAD_SIDEBAR_EXTENSIONS_ON_DEMAND,
         Boolean.toString(preferences.isLoadSidebarExtensionsOnDemand()));
+    props.setProperty(
+        KEY_AUTO_SAVE_BEFORE_RUN,
+        Boolean.toString(preferences.isAutoSaveBeforeRun()));
+    props.setProperty(
+        KEY_EDITOR_RUNTIME_PERF_HUD,
+        Boolean.toString(preferences.isEditorRuntimePerfHud()));
     props.setProperty(
         KEY_DEFAULT_TEXT_EDITOR,
         preferences.getDefaultTextEditor());
@@ -93,6 +109,15 @@ static Properties toProperties(EditorPreferences preferences) {
     props.setProperty(
         KEY_LAUNCHER_LAST_PROJECT_PATH,
         preferences.getLauncherLastProjectPath());
+    props.setProperty(
+        KEY_LAUNCHER_KEEP_OPEN_AFTER_EDITOR_LAUNCH,
+        Boolean.toString(preferences.isLauncherKeepOpenAfterEditorLaunch()));
+    props.setProperty(
+        KEY_LAUNCHER_CONFIRM_RUN_PROJECT,
+        Boolean.toString(preferences.isLauncherConfirmRunProject()));
+    props.setProperty(
+        KEY_LAUNCHER_RUNTIME_PERF_HUD,
+        Boolean.toString(preferences.isLauncherRuntimePerfHud()));
     for (EditorSidebarPanel panel : EditorSidebarPanel.values()) {
       props.setProperty(
           KEY_PANEL_PREFIX + panel.key() + KEY_PANEL_SUFFIX,
@@ -113,10 +138,17 @@ static EditorPreferences fromProperties(Properties props) {
     preferences.setEditorMaxFps(parseInt(
         props.getProperty(KEY_EDITOR_MAX_FPS),
         EditorPreferences.DEFAULT_EDITOR_MAX_FPS));
+    preferences.setEditorTheme(props.getProperty(
+        KEY_EDITOR_THEME,
+        EditorPreferences.LAUNCHER_THEME_DARK));
     preferences.setShowWelcomeOnStartup(Boolean.parseBoolean(
         props.getProperty(KEY_SHOW_WELCOME_ON_STARTUP, "true")));
     preferences.setLoadSidebarExtensionsOnDemand(parseBoolean(
         props.getProperty(KEY_LOAD_SIDEBAR_EXTENSIONS_ON_DEMAND), true));
+    preferences.setAutoSaveBeforeRun(parseBoolean(
+        props.getProperty(KEY_AUTO_SAVE_BEFORE_RUN), true));
+    preferences.setEditorRuntimePerfHud(parseBoolean(
+        props.getProperty(KEY_EDITOR_RUNTIME_PERF_HUD), true));
     preferences.setDefaultTextEditor(props.getProperty(
         KEY_DEFAULT_TEXT_EDITOR,
         EditorPreferences.TEXT_EDITOR_JVN));
@@ -131,6 +163,12 @@ static EditorPreferences fromProperties(Properties props) {
     preferences.setLauncherLastProjectPath(props.getProperty(
         KEY_LAUNCHER_LAST_PROJECT_PATH,
         ""));
+    preferences.setLauncherKeepOpenAfterEditorLaunch(parseBoolean(
+        props.getProperty(KEY_LAUNCHER_KEEP_OPEN_AFTER_EDITOR_LAUNCH), false));
+    preferences.setLauncherConfirmRunProject(parseBoolean(
+        props.getProperty(KEY_LAUNCHER_CONFIRM_RUN_PROJECT), false));
+    preferences.setLauncherRuntimePerfHud(parseBoolean(
+        props.getProperty(KEY_LAUNCHER_RUNTIME_PERF_HUD), true));
     for (EditorSidebarPanel panel : EditorSidebarPanel.values()) {
       String key = KEY_PANEL_PREFIX + panel.key() + KEY_PANEL_SUFFIX;
       EditorPanelPlacement placement = parsePlacement(props.getProperty(key), panel.defaultPlacement());