Commit `8847b010a7`

8847b010a7b834c174ec4eaa9c7ab0c5ffa1ca46

parent: 9518e3948b

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-05 04:55 UTC

Org options in Settings

Layout: unified · split

Sources/Orgstar/ContentView.swift +10 −1

     @AppStorage("keymap") private var preset = KeymapPreset.emacs
     @AppStorage("optionAsMeta") private var optionAsMeta = OptionAsMeta.left.rawValue
     @State private var keymap = KeymapPreset.emacs.keymap
+    @AppStorage("tagsColumn") private var tagsColumn = -77
+    @AppStorage("headingAfterSubtree") private var headingAfterSubtree = true
+    @AppStorage("splitLine") private var splitLine = false
+    @AppStorage("alphabeticalLists") private var alphabeticalLists = true
+    private var options: EditingOptions {
+        Preferences.options(tagsColumn: tagsColumn, headingAfterSubtree: headingAfterSubtree, splitLine: splitLine, alphabeticalLists: alphabeticalLists)
+    }
     @State private var selectedFile: String?
     @State private var query = ""
     @FocusState private var searchFocused: Bool
             .navigationSplitViewColumnWidth(min: 160, ideal: 220, max: 360)
         } detail: {
             if session.path != nil {
-                EditorView(session: session, commands: commands, keymap: keymap, optionAsMeta: OptionAsMeta(rawValue: optionAsMeta), onAppCommand: perform)
+                EditorView(session: session, commands: commands, keymap: keymap, optionAsMeta: OptionAsMeta(rawValue: optionAsMeta), options: options, onAppCommand: perform)
                     .safeAreaInset(edge: .bottom, spacing: 0) { EchoArea(commands: commands) }
             } else {
                 ContentUnavailableView(
             }
         }
         .onChange(of: saveMode, initial: true) { _, mode in session.saveMode = mode }
+        .onChange(of: options, initial: true) { _, options in session.options = options }
         .onChange(of: preset, initial: true) { loadKeymap() }
         .sheet(isPresented: $commands.showingPalette) {
             PaletteView(keymap: keymap) { id in

Sources/Orgstar/EditorView.swift +2

     let commands: AppCommands
     let keymap: Keymap
     let optionAsMeta: OptionAsMeta
+    let options: EditingOptions
     let onAppCommand: (String) -> Void
     final class Coordinator {
         if let editor = coordinator.editor {
             if editor.keymap != keymap { editor.keymap = keymap }
             editor.optionAsMeta = optionAsMeta
+            editor.options = options
         }
         container.window?.isDocumentEdited = session.isDirty
         if let request = session.revealRequest, request.id != coordinator.revealID {

Sources/Orgstar/OrgstarApp.swift +26 −3

 @main
 struct OrgstarApp: App {
     @NSApplicationDelegateAdaptor private var delegate: AppDelegate
-    @State private var workspace = Result { try WorkspaceModel(directory: WorkspaceModel.defaultDirectory) }
+    @State private var workspace = Result {
+        try WorkspaceModel(directory: WorkspaceModel.defaultDirectory, settings: .with(todoKeywords: Preferences.orgSettings))
+    }
     @State private var commands = AppCommands()
-    @State private var session = DocumentSession()
+    @State private var session: DocumentSession = {
+        let session = DocumentSession()
+        session.defaults = Preferences.orgSettings
+        return session
+    }()
     var body: some Scene {
         Window("Orgstar", id: "main") {
     @AppStorage("saveMode") private var saveMode = SaveMode.automatic
     @AppStorage("keymap") private var preset = KeymapPreset.emacs
     @AppStorage("optionAsMeta") private var optionAsMeta = OptionAsMeta.left.rawValue
+    @AppStorage("tagsColumn") private var tagsColumn = -77
+    @AppStorage("headingAfterSubtree") private var headingAfterSubtree = true
+    @AppStorage("splitLine") private var splitLine = false
+    @AppStorage("alphabeticalLists") private var alphabeticalLists = true
+    @AppStorage("todoKeywords") private var todoKeywords = Preferences.defaultTodoKeywords
     var body: some View {
         Form {
                 .font(.caption)
                 .foregroundStyle(.secondary)
                 .textSelection(.enabled)
+            Divider()
+            Picker("Tags:", selection: $tagsColumn) {
+                Text("Aligned to end at column 77").tag(-77)
+                Text("One space after the title").tag(0)
+            }
+            Toggle("M-RET adds the new heading after the subtree", isOn: $headingAfterSubtree)
+            Toggle("M-RET splits the line at the caret", isOn: $splitLine)
+            Toggle("Lists can use letters (a. b. c.)", isOn: $alphabeticalLists)
+            TextField("Default TODO keywords:", text: $todoKeywords)
+            Text("For files without #+TODO, in #+TODO syntax. Takes effect when Orgstar restarts.")
+                .font(.caption)
+                .foregroundStyle(.secondary)
         }
         .padding(20)
-        .frame(width: 420)
+        .frame(width: 480)
     }
 }

Sources/Orgstar/Preferences.swift added +20

@@ -0,0 +1,20 @@
	1	import Foundation
	2	import OrgCore
	3
	4	/// Org preferences, stored in user defaults by the Settings window.
	5	enum Preferences {
	6	static let defaultTodoKeywords = "TODO PROJ LOOP STRT WAIT HOLD IDEA \| DONE KILL"
	7
	8	/// TODO keywords for files without `#+TODO`, read at launch.
	9	static var orgSettings: OrgSettings {
	10	let line = UserDefaults.standard.string(forKey: "todoKeywords") ?? defaultTodoKeywords
	11	return OrgSettings.default.withTodoKeywords(line) ?? .default
	12	}
	13
	14	static func options(tagsColumn: Int, headingAfterSubtree: Bool, splitLine: Bool, alphabeticalLists: Bool) -> EditingOptions {
	15	EditingOptions(
	16	tagsColumn: tagsColumn, insertHeadingRespectContent: headingAfterSubtree,
	17	metaReturnMaySplitLine: splitLine, listAllowAlphabetical: alphabeticalLists
	18	)
	19	}
	20	}

Commit 8847b010a7

Commit `8847b010a7`