Skip to content

Commit 2480b52

Browse files
lukhnoslukhnos
authored
Merge pull request openvanilla#880 from zonble/prefs
Update the preferences window to SwiftUI
2 parents d5e06b9 + 446d7b1 commit 2480b52

11 files changed

Lines changed: 1655 additions & 476 deletions

‎McBopomofo.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
6A0D4F0815FC0DA600ABF4B3 /* Bopomofo.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 6A0D4EEF15FC0DA600ABF4B3 /* Bopomofo.tiff */; };
1111
6A0D4F0915FC0DA600ABF4B3 /* Bopomofo@2x.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 6A0D4EF015FC0DA600ABF4B3 /* Bopomofo@2x.tiff */; };
1212
6A0D4F4515FC0EB100ABF4B3 /* Mandarin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A0D4F2015FC0EB100ABF4B3 /* Mandarin.cpp */; };
13-
6A0D4F5315FC0EE100ABF4B3 /* preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6A0D4F4E15FC0EE100ABF4B3 /* preferences.xib */; };
1413
6A187E2616004C5900466B2E /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6A187E2816004C5900466B2E /* MainMenu.xib */; };
1514
6A2E40F6253A69DA00D1AE1D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6A2E40F5253A69DA00D1AE1D /* Images.xcassets */; };
1615
6A2E40F9253A6AA000D1AE1D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6A2E40F5253A69DA00D1AE1D /* Images.xcassets */; };
@@ -44,6 +43,9 @@
4443
6AFF97F2253B299E007F1C49 /* NonModalAlertWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6AFF97F0253B299E007F1C49 /* NonModalAlertWindowController.xib */; };
4544
B058C5272AC9DF51002EDD66 /* ServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B058C5262AC9DF51002EDD66 /* ServiceProvider.swift */; };
4645
B0781B352ACA2655003D9F75 /* ServicesMenu.strings in Resources */ = {isa = PBXBuildFile; fileRef = B0781B372ACA2655003D9F75 /* ServicesMenu.strings */; };
46+
D402D66A3002779000CF3746 /* PreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D402D6673002779000CF3746 /* PreferencesView.swift */; };
47+
D402D66C3002779000CF3746 /* PreferencesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D402D6683002779000CF3746 /* PreferencesWindowController.swift */; };
48+
D402D66D3002779000CF3746 /* PreferencesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D402D6663002779000CF3746 /* PreferencesModel.swift */; };
4749
D40EFFA22EB669F900C1728A /* InfoCollector in Frameworks */ = {isa = PBXBuildFile; productRef = D40EFFA12EB669F900C1728A /* InfoCollector */; };
4850
D41355D8278D74B5005E5CBD /* LanguageModelManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = D41355D7278D7409005E5CBD /* LanguageModelManager.mm */; };
4951
D41355DB278E6D17005E5CBD /* McBopomofoLM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D41355D9278E6D17005E5CBD /* McBopomofoLM.cpp */; };
@@ -75,7 +77,6 @@
7577
D47D73A827A6C84F00255A50 /* associated-phrases-v2.txt in Resources */ = {isa = PBXBuildFile; fileRef = D47D73A727A6C84F00255A50 /* associated-phrases-v2.txt */; };
7678
D47D73A927A6C84F00255A50 /* associated-phrases-v2.txt in Resources */ = {isa = PBXBuildFile; fileRef = D47D73A727A6C84F00255A50 /* associated-phrases-v2.txt */; };
7779
D47D73C327A7200500255A50 /* FSEventStreamHelper in Frameworks */ = {isa = PBXBuildFile; productRef = D47D73C227A7200500255A50 /* FSEventStreamHelper */; };
78-
D47F7DCE278BFB57002F9DD7 /* PreferencesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D47F7DCD278BFB57002F9DD7 /* PreferencesWindowController.swift */; };
7980
D47F7DD0278C0897002F9DD7 /* NonModalAlertWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D47F7DCF278C0897002F9DD7 /* NonModalAlertWindowController.swift */; };
8081
D47F7DD3278C1263002F9DD7 /* UserOverrideModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D47F7DD2278C1263002F9DD7 /* UserOverrideModel.cpp */; };
8182
D485D3B92796A8A000657FF3 /* PreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D485D3B82796A8A000657FF3 /* PreferencesTests.swift */; };
@@ -133,10 +134,8 @@
133134
6A0D4EF615FC0DA600ABF4B3 /* McBopomofo-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "McBopomofo-Prefix.pch"; sourceTree = "<group>"; };
134135
6A0D4F2015FC0EB100ABF4B3 /* Mandarin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mandarin.cpp; sourceTree = "<group>"; };
135136
6A0D4F2115FC0EB100ABF4B3 /* Mandarin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mandarin.h; sourceTree = "<group>"; };
136-
6A0D4F5615FC0EF900ABF4B3 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "Source/zh-Hant.lproj/preferences.xib"; sourceTree = "<group>"; };
137137
6A15B32421A51F2300B92CD3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
138138
6A15B32521A51F2300B92CD3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
139-
6A15B32721A51F2300B92CD3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Source/Base.lproj/preferences.xib; sourceTree = "<group>"; };
140139
6A187E2916004C7300466B2E /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/MainMenu.xib"; sourceTree = "<group>"; };
141140
6A2E40F5253A69DA00D1AE1D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
142141
6A38BBF615FC117A00A8A51F /* data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = data.txt; sourceTree = "<group>"; };
@@ -189,6 +188,9 @@
189188
B058C5262AC9DF51002EDD66 /* ServiceProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServiceProvider.swift; sourceTree = "<group>"; };
190189
B0781B362ACA2655003D9F75 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/ServicesMenu.strings; sourceTree = "<group>"; };
191190
B0781B382ACA2659003D9F75 /* zh-Hant */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/ServicesMenu.strings"; sourceTree = "<group>"; };
191+
D402D6663002779000CF3746 /* PreferencesModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesModel.swift; sourceTree = "<group>"; };
192+
D402D6673002779000CF3746 /* PreferencesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesView.swift; sourceTree = "<group>"; };
193+
D402D6683002779000CF3746 /* PreferencesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesWindowController.swift; sourceTree = "<group>"; };
192194
D40EFFA02EB669BB00C1728A /* InfoCollector */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = InfoCollector; path = Packages/InfoCollector; sourceTree = "<group>"; };
193195
D41355D6278D7409005E5CBD /* LanguageModelManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LanguageModelManager.h; sourceTree = "<group>"; };
194196
D41355D7278D7409005E5CBD /* LanguageModelManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LanguageModelManager.mm; sourceTree = "<group>"; };
@@ -223,7 +225,6 @@
223225
D47D73A327A5D43900255A50 /* KeyHandlerBopomofoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyHandlerBopomofoTests.swift; sourceTree = "<group>"; };
224226
D47D73A727A6C84F00255A50 /* associated-phrases-v2.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "associated-phrases-v2.txt"; sourceTree = "<group>"; };
225227
D47D73C027A71FFA00255A50 /* FSEventStreamHelper */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FSEventStreamHelper; path = Packages/FSEventStreamHelper; sourceTree = "<group>"; };
226-
D47F7DCD278BFB57002F9DD7 /* PreferencesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesWindowController.swift; sourceTree = "<group>"; };
227228
D47F7DCF278C0897002F9DD7 /* NonModalAlertWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonModalAlertWindowController.swift; sourceTree = "<group>"; };
228229
D47F7DD1278C1263002F9DD7 /* UserOverrideModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserOverrideModel.h; sourceTree = "<group>"; };
229230
D47F7DD2278C1263002F9DD7 /* UserOverrideModel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserOverrideModel.cpp; sourceTree = "<group>"; };
@@ -321,6 +322,7 @@
321322
6A0D4EC215FC0D3C00ABF4B3 /* Source */ = {
322323
isa = PBXGroup;
323324
children = (
325+
D402D6693002779000CF3746 /* PreferencesUI */,
324326
6A38BBDD15FC115800A8A51F /* Data */,
325327
6A0D4F1215FC0EB100ABF4B3 /* Engine */,
326328
6ACA41E715FC1D9000935EF6 /* Installer */,
@@ -341,7 +343,6 @@
341343
D427F76B278CA1BA004A2160 /* AppDelegate.swift */,
342344
D44FB74427915555003C80A6 /* Preferences.swift */,
343345
D47F7DCF278C0897002F9DD7 /* NonModalAlertWindowController.swift */,
344-
D47F7DCD278BFB57002F9DD7 /* PreferencesWindowController.swift */,
345346
D41B626D2B87B5C100583148 /* ServiceProviderInputHelper.h */,
346347
D41B626E2B87B5C100583148 /* ServiceProviderInputHelper.mm */,
347348
B058C5262AC9DF51002EDD66 /* ServiceProvider.swift */,
@@ -417,7 +418,6 @@
417418
D4E33D8827A838CF006DB1CF /* Localizable.strings */,
418419
B0781B372ACA2655003D9F75 /* ServicesMenu.strings */,
419420
6A187E2816004C5900466B2E /* MainMenu.xib */,
420-
6A0D4F4E15FC0EE100ABF4B3 /* preferences.xib */,
421421
D4EE67592B39968900F062DE /* dictionary_service.json */,
422422
);
423423
name = Resources;
@@ -476,6 +476,16 @@
476476
path = Installer;
477477
sourceTree = "<group>";
478478
};
479+
D402D6693002779000CF3746 /* PreferencesUI */ = {
480+
isa = PBXGroup;
481+
children = (
482+
D402D6663002779000CF3746 /* PreferencesModel.swift */,
483+
D402D6673002779000CF3746 /* PreferencesView.swift */,
484+
D402D6683002779000CF3746 /* PreferencesWindowController.swift */,
485+
);
486+
path = PreferencesUI;
487+
sourceTree = "<group>";
488+
};
479489
D427F766278C9CBD004A2160 /* Packages */ = {
480490
isa = PBXGroup;
481491
children = (
@@ -670,7 +680,6 @@
670680
6A0D4F0915FC0DA600ABF4B3 /* Bopomofo@2x.tiff in Resources */,
671681
6A6ED16D2797650A0012872E /* template-exclude-phrases-plain-bpmf.txt in Resources */,
672682
B0781B352ACA2655003D9F75 /* ServicesMenu.strings in Resources */,
673-
6A0D4F5315FC0EE100ABF4B3 /* preferences.xib in Resources */,
674683
6A2E40F6253A69DA00D1AE1D /* Images.xcassets in Resources */,
675684
D4E33D8F27A838F0006DB1CF /* InfoPlist.strings in Resources */,
676685
6A38BC1515FC117A00A8A51F /* data.txt in Resources */,
@@ -739,7 +748,6 @@
739748
6A4F5F982879E838008C4307 /* reading_grid.cpp in Sources */,
740749
D47F7DD0278C0897002F9DD7 /* NonModalAlertWindowController.swift in Sources */,
741750
D456576E279E4F7B00DF6BC9 /* KeyHandlerInput.swift in Sources */,
742-
D47F7DCE278BFB57002F9DD7 /* PreferencesWindowController.swift in Sources */,
743751
D41355DB278E6D17005E5CBD /* McBopomofoLM.cpp in Sources */,
744752
D47F7DD3278C1263002F9DD7 /* UserOverrideModel.cpp in Sources */,
745753
6A0D4F4515FC0EB100ABF4B3 /* Mandarin.cpp in Sources */,
@@ -750,6 +758,9 @@
750758
D43FC40B2B23788400ED5A1C /* InputMacro.swift in Sources */,
751759
6ADF5B1A2BA513E000577D98 /* MemoryMappedFile.cpp in Sources */,
752760
B058C5272AC9DF51002EDD66 /* ServiceProvider.swift in Sources */,
761+
D402D66A3002779000CF3746 /* PreferencesView.swift in Sources */,
762+
D402D66C3002779000CF3746 /* PreferencesWindowController.swift in Sources */,
763+
D402D66D3002779000CF3746 /* PreferencesModel.swift in Sources */,
753764
6ADF5B192BA513E000577D98 /* AssociatedPhrasesV2.cpp in Sources */,
754765
6ADF5B1B2BA513E000577D98 /* UTF8Helper.cpp in Sources */,
755766
D41355D8278D74B5005E5CBD /* LanguageModelManager.mm in Sources */,
@@ -803,16 +814,6 @@
803814
/* End PBXTargetDependency section */
804815

805816
/* Begin PBXVariantGroup section */
806-
6A0D4F4E15FC0EE100ABF4B3 /* preferences.xib */ = {
807-
isa = PBXVariantGroup;
808-
children = (
809-
6A0D4F5615FC0EF900ABF4B3 /* zh-Hant */,
810-
6A15B32721A51F2300B92CD3 /* Base */,
811-
);
812-
name = preferences.xib;
813-
path = ..;
814-
sourceTree = "<group>";
815-
};
816817
6A187E2816004C5900466B2E /* MainMenu.xib */ = {
817818
isa = PBXVariantGroup;
818819
children = (

0 commit comments

Comments
 (0)