32bc22b560 · krz/orgstar

Sources/OrgEditorAppKit/EditorCommands.swift +1 −1

		@@ -31,7 +31,7 @@ public struct EditorCommand: Sendable {
31	31	}
32	32
33	33	public enum EditorCommands {
34		public static let all: [EditorCommand] = Commands.all.map { EditorCommand(id: $0.id, title: $0.title, action: .text($0)) } + [
	34	public static let all: [EditorCommand] = Commands.everything.map { EditorCommand(id: $0.id, title: $0.title, action: .text($0)) } + [
35	35	EditorCommand(id: "org.cycle", title: "Cycle Visibility", action: .view),
36	36	EditorCommand(id: "org.cycle-global", title: "Cycle Global Visibility", action: .view),
37	37

Sources/Orgstar/ContentView.swift +6 −1

		@@ -17,9 +17,14 @@ struct ContentView: View {
17	17	@AppStorage("splitLine") private var splitLine = false
18	18	@AppStorage("alphabeticalLists") private var alphabeticalLists = true
19	19	@AppStorage("fillColumn") private var fillColumn = 80
	20	@AppStorage("hiddenMarkers") private var hiddenMarkers = true
	21	@AppStorage("prettyEntities") private var prettyEntities = true
20	22
21	23	private var options: EditingOptions {
22		Preferences.options(tagsColumn: tagsColumn, headingAfterSubtree: headingAfterSubtree, splitLine: splitLine, alphabeticalLists: alphabeticalLists, fillColumn: fillColumn)
	24	Preferences.options(
	25	tagsColumn: tagsColumn, headingAfterSubtree: headingAfterSubtree, splitLine: splitLine, alphabeticalLists: alphabeticalLists,
	26	fillColumn: fillColumn, hiddenMarkers: hiddenMarkers, prettyEntities: prettyEntities
	27	)
23	28	}
24	29	@State private var selectedFile: String?
25	30	@State private var query = ""

Sources/Orgstar/OrgstarApp.swift +7

		@@ -155,6 +155,8 @@ struct SettingsView: View {
155	155	@AppStorage("splitLine") private var splitLine = false
156	156	@AppStorage("alphabeticalLists") private var alphabeticalLists = true
157	157	@AppStorage("fillColumn") private var fillColumn = 80
	158	@AppStorage("hiddenMarkers") private var hiddenMarkers = true
	159	@AppStorage("prettyEntities") private var prettyEntities = true
158	160	@AppStorage("todoKeywords") private var todoKeywords = Preferences.defaultTodoKeywords
159	161
160	162	var body: some View {
		@@ -186,6 +188,11 @@ struct SettingsView: View {
186	188	Toggle("M-RET splits the line at the caret", isOn: $splitLine)
187	189	Toggle("Lists can use letters (a. b. c.)", isOn: $alphabeticalLists)
188	190	Stepper("M-q fills to column \(fillColumn)", value: $fillColumn, in: 40...200)
	191	Toggle("Emacs hides emphasis markers (org-hide-emphasis-markers)", isOn: $hiddenMarkers)
	192	Toggle("Emacs shows entities as characters (org-pretty-entities)", isOn: $prettyEntities)
	193	Text("Tags, tables and M-q measure text as your Emacs displays it, so both write the same file.")
	194	.font(.caption)
	195	.foregroundStyle(.secondary)
189	196	TextField("Default TODO keywords:", text: $todoKeywords)
190	197	Text("For files without #+TODO, in #+TODO syntax. Takes effect when Orgstar restarts.")
191	198	.font(.caption)

Sources/Orgstar/Preferences.swift +6 −2

		@@ -11,10 +11,14 @@ enum Preferences {
11	11	return OrgSettings.default.withTodoKeywords(line) ?? .default
12	12	}
13	13
14		static func options(tagsColumn: Int, headingAfterSubtree: Bool, splitLine: Bool, alphabeticalLists: Bool, fillColumn: Int) -> EditingOptions {
	14	static func options(
	15	tagsColumn: Int, headingAfterSubtree: Bool, splitLine: Bool, alphabeticalLists: Bool, fillColumn: Int,
	16	hiddenMarkers: Bool, prettyEntities: Bool
	17	) -> EditingOptions {
15	18	EditingOptions(
16	19	tagsColumn: tagsColumn, insertHeadingRespectContent: headingAfterSubtree,
17		metaReturnMaySplitLine: splitLine, listAllowAlphabetical: alphabeticalLists, fillColumn: fillColumn
	20	metaReturnMaySplitLine: splitLine, listAllowAlphabetical: alphabeticalLists, fillColumn: fillColumn,
	21	hideEmphasisMarkers: hiddenMarkers, prettyEntities: prettyEntities, subSuperscriptsNeedBraces: true
18	22	)
19	23	}
20	24	}

Commit 32bc22b560