Skip to content

Commit 374f54d

Browse files
1024jp1024jp
committed
Migrate OutlineInspectorView to SwiftUI
1 parent af3e86f commit 374f54d

23 files changed

+520
-972
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
- Add “Hexadecimal with Alpha” format to the Color Code panel.
1616
- Tweak the background color of the “Anura (Dark)” theme.
17+
- [dev] Migrate the inspector pane to SwiftUI.
1718

1819

1920
### Fixes

‎CotEditor.xcodeproj/project.pbxproj

+7-23
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,6 @@
646646
2ACDE29D2406B9C000FC31EC /* GeneralPane.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2AC20A6F1E70819E0093B9C6 /* GeneralPane.storyboard */; };
647647
2ACDE2A22406B9C000FC31EC /* KeyBindingsPane.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A10D1081E708CDF0027192A /* KeyBindingsPane.storyboard */; };
648648
2ACDE2A32406B9C000FC31EC /* MultipleReplacePanel.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A3D63F91E769DDF00F538E1 /* MultipleReplacePanel.storyboard */; };
649-
2ACDE2A52406B9C000FC31EC /* OutlineView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2AE7A8D420450C0000830830 /* OutlineView.storyboard */; };
650649
2ACDE2AD2406B9C000FC31EC /* SyntaxCommentsEditView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2AB2243C21A7D8DF00F6201F /* SyntaxCommentsEditView.storyboard */; };
651650
2ACDE2AE2406B9C000FC31EC /* SyntaxCompletionsEditView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2AB2242721A7D51800F6201F /* SyntaxCompletionsEditView.storyboard */; };
652651
2ACDE2AF2406B9C000FC31EC /* SyntaxEditView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2AB2245221A809A000F6201F /* SyntaxEditView.storyboard */; };
@@ -715,9 +714,8 @@
715714
2AE73F41203D2FBB00D8903B /* NSLayoutManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE73F3F203D2FBB00D8903B /* NSLayoutManager.swift */; };
716715
2AE73F43203E753C00D8903B /* NSTextView+Selection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE73F42203E753C00D8903B /* NSTextView+Selection.swift */; };
717716
2AE73F44203E753C00D8903B /* NSTextView+Selection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE73F42203E753C00D8903B /* NSTextView+Selection.swift */; };
718-
2AE7A8D620450C0000830830 /* OutlineView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2AE7A8D420450C0000830830 /* OutlineView.storyboard */; };
719-
2AE7A8D920450FE600830830 /* OutlineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE7A8D820450FE600830830 /* OutlineViewController.swift */; };
720-
2AE7A8DA20450FE600830830 /* OutlineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE7A8D820450FE600830830 /* OutlineViewController.swift */; };
717+
2AE7A8D920450FE600830830 /* OutlineInspectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE7A8D820450FE600830830 /* OutlineInspectorView.swift */; };
718+
2AE7A8DA20450FE600830830 /* OutlineInspectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE7A8D820450FE600830830 /* OutlineInspectorView.swift */; };
721719
2AE95A1A2A86270000E85CF5 /* HoleContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE95A192A86270000E85CF5 /* HoleContentView.swift */; };
722720
2AE95A1B2A86270000E85CF5 /* HoleContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE95A192A86270000E85CF5 /* HoleContentView.swift */; };
723721
2AEAA8232096380C001A175C /* HighlightExtractors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AEAA8222096380C001A175C /* HighlightExtractors.swift */; };
@@ -1040,7 +1038,6 @@
10401038
2A5E6FEA2A73452100E33EA7 /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/SyntaxCommentsEditView.xcstrings; sourceTree = "<group>"; };
10411039
2A5E6FEB2A73469400E33EA7 /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/SyntaxTermsEditView.xcstrings; sourceTree = "<group>"; };
10421040
2A5EA1612A88E8B000D16730 /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/StatusBar.xcstrings; sourceTree = "<group>"; };
1043-
2A5EA1632A88EAC100D16730 /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/OutlineView.xcstrings; sourceTree = "<group>"; };
10441041
2A5EA1662A88F54800D16730 /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/PrintPanelAccessory.xcstrings; sourceTree = "<group>"; };
10451042
2A5EA1672A88F70C00D16730 /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/Main.xcstrings; sourceTree = "<group>"; };
10461043
2A5EDDBA241B649C00A07810 /* moof.textClipping */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = moof.textClipping; path = TestFiles/moof.textClipping; sourceTree = "<group>"; };
@@ -1303,8 +1300,7 @@
13031300
2AE73F3C2039A29300D8903B /* URL+ExtendedAttribute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+ExtendedAttribute.swift"; sourceTree = "<group>"; };
13041301
2AE73F3F203D2FBB00D8903B /* NSLayoutManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSLayoutManager.swift; sourceTree = "<group>"; };
13051302
2AE73F42203E753C00D8903B /* NSTextView+Selection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextView+Selection.swift"; sourceTree = "<group>"; };
1306-
2AE7A8D520450C0000830830 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/OutlineView.storyboard; sourceTree = "<group>"; };
1307-
2AE7A8D820450FE600830830 /* OutlineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlineViewController.swift; sourceTree = "<group>"; };
1303+
2AE7A8D820450FE600830830 /* OutlineInspectorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlineInspectorView.swift; sourceTree = "<group>"; };
13081304
2AE95A192A86270000E85CF5 /* HoleContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HoleContentView.swift; sourceTree = "<group>"; };
13091305
2AEAA8222096380C001A175C /* HighlightExtractors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightExtractors.swift; sourceTree = "<group>"; };
13101306
2AEBD259246BB4C200EC97A3 /* NSAttributedStringTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSAttributedStringTests.swift; sourceTree = "<group>"; };
@@ -1573,7 +1569,6 @@
15731569
2AACB1CC1D195ABD0073775B /* ShortcutField.swift */,
15741570
2A5DCE4E1D185F1B00D5D74C /* CharacterField.swift */,
15751571
2A1814BD21CFC9CF00602214 /* RegularExpressionTextField.swift */,
1576-
2A0A602A27ABD74500725B70 /* FilterField.swift */,
15771572
2A10D1471E7477D30027192A /* StyledButton.swift */,
15781573
2A63A9D724E8C8F70017ACBB /* OutlinePopUpButton.swift */,
15791574
2A19AF852AE0D15300EFFDCB /* FormPopUpButton.swift */,
@@ -1970,7 +1965,6 @@
19701965
2A436DDC1A426EAE00275FD4 /* Document Window */ = {
19711966
isa = PBXGroup;
19721967
children = (
1973-
2AE7A8D420450C0000830830 /* OutlineView.storyboard */,
19741968
2A6602CE1D05BD72003E8D87 /* StatusBar.storyboard */,
19751969
2A5F7CA31D152589001D83BC /* NavigationBar.storyboard */,
19761970
2A7F4E022871F46D0029CE66 /* PrintPanelAccessory.storyboard */,
@@ -2308,7 +2302,7 @@
23082302
children = (
23092303
2AAB4BFE1D2444930049A68B /* InspectorViewController.swift */,
23102304
2AAB4BF81D2435AC0049A68B /* DocumentInspectorView.swift */,
2311-
2AE7A8D820450FE600830830 /* OutlineViewController.swift */,
2305+
2AE7A8D820450FE600830830 /* OutlineInspectorView.swift */,
23122306
2A2B085F28046E3B0028D733 /* WarningInspectorView.swift */,
23132307
2AAB4BFB1D2437EA0049A68B /* IncompatibleCharactersView.swift */,
23142308
2AF6A5C528053179005F580B /* InconsistentLineEndingsView.swift */,
@@ -2328,6 +2322,7 @@
23282322
2AF601CB296F925200F6F1E8 /* Views */ = {
23292323
isa = PBXGroup;
23302324
children = (
2325+
2A0A602A27ABD74500725B70 /* FilterField.swift */,
23312326
2A73B9322A8F6620002F3A16 /* RegexTextField.swift */,
23322327
2A26156D2977B87F008C2240 /* StepperNumberField.swift */,
23332328
2A1083EF2944837E00751DAE /* InsetTextField.swift */,
@@ -2613,7 +2608,6 @@
26132608
2ACDE2A22406B9C000FC31EC /* KeyBindingsPane.storyboard in Resources */,
26142609
2ACDE2A32406B9C000FC31EC /* MultipleReplacePanel.storyboard in Resources */,
26152610
2ACDE2962406B9C000FC31EC /* NavigationBar.storyboard in Resources */,
2616-
2ACDE2A52406B9C000FC31EC /* OutlineView.storyboard in Resources */,
26172611
2A7F4DFF2871F46D0029CE66 /* PrintPanelAccessory.storyboard in Resources */,
26182612
2ACDE2992406B9C000FC31EC /* SnippetsPane.storyboard in Resources */,
26192613
2ACDE2952406B9C000FC31EC /* StatusBar.storyboard in Resources */,
@@ -2674,7 +2668,6 @@
26742668
2A10D10A1E708CDF0027192A /* KeyBindingsPane.storyboard in Resources */,
26752669
2A3D63FB1E769DDF00F538E1 /* MultipleReplacePanel.storyboard in Resources */,
26762670
2A5F7CA51D152589001D83BC /* NavigationBar.storyboard in Resources */,
2677-
2AE7A8D620450C0000830830 /* OutlineView.storyboard in Resources */,
26782671
2A7F4E002871F46D0029CE66 /* PrintPanelAccessory.storyboard in Resources */,
26792672
2ADF3C011E6D7345009125BB /* SnippetsPane.storyboard in Resources */,
26802673
2A6602D01D05BD72003E8D87 /* StatusBar.storyboard in Resources */,
@@ -2994,9 +2987,9 @@
29942987
2A88E7721E81A2C7000019C6 /* OrderedSet.swift in Sources */,
29952988
2A8458962A073C830056B1EA /* OutlineDefinition.swift in Sources */,
29962989
2A4714E7209630510093E27F /* OutlineExtractor.swift in Sources */,
2990+
2AE7A8DA20450FE600830830 /* OutlineInspectorView.swift in Sources */,
29972991
2AAD61F51D2BA0E0008FE772 /* OutlineItem.swift in Sources */,
29982992
2A63A9D824E8C8F70017ACBB /* OutlinePopUpButton.swift in Sources */,
2999-
2AE7A8DA20450FE600830830 /* OutlineViewController.swift in Sources */,
30002993
2ACDC0981D172B2A009B72D6 /* PaddingTextFieldCell.swift in Sources */,
30012994
2A9C370C1D66E99400774BA4 /* Pair.swift in Sources */,
30022995
2A1893A81FFF16A400AD244F /* PatternSortView.swift in Sources */,
@@ -3357,9 +3350,9 @@
33573350
2A88E7711E81A2C7000019C6 /* OrderedSet.swift in Sources */,
33583351
2A8458972A073C830056B1EA /* OutlineDefinition.swift in Sources */,
33593352
2A4714E6209630510093E27F /* OutlineExtractor.swift in Sources */,
3353+
2AE7A8D920450FE600830830 /* OutlineInspectorView.swift in Sources */,
33603354
2AAD61F41D2BA0E0008FE772 /* OutlineItem.swift in Sources */,
33613355
2A63A9D924E8C8F70017ACBB /* OutlinePopUpButton.swift in Sources */,
3362-
2AE7A8D920450FE600830830 /* OutlineViewController.swift in Sources */,
33633356
2ACDC0971D172B2A009B72D6 /* PaddingTextFieldCell.swift in Sources */,
33643357
2A9C370B1D66E99400774BA4 /* Pair.swift in Sources */,
33653358
2A1893A71FFF16A400AD244F /* PatternSortView.swift in Sources */,
@@ -3877,15 +3870,6 @@
38773870
name = Credits.css;
38783871
sourceTree = "<group>";
38793872
};
3880-
2AE7A8D420450C0000830830 /* OutlineView.storyboard */ = {
3881-
isa = PBXVariantGroup;
3882-
children = (
3883-
2AE7A8D520450C0000830830 /* Base */,
3884-
2A5EA1632A88EAC100D16730 /* mul */,
3885-
);
3886-
name = OutlineView.storyboard;
3887-
sourceTree = "<group>";
3888-
};
38893873
/* End PBXVariantGroup section */
38903874

38913875
/* Begin XCBuildConfiguration section */

0 commit comments

Comments
 (0)