Skip to content

Commit ce6749b

Browse files
author
Caldis_Chen
committed
Merge branch 'master' of https://github.com/Caldis/Mos 
2 parents 0623dd7 + 9f68ec2 commit ce6749b

File tree

25 files changed

+335
-201
lines changed

25 files changed

+335
-201
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ Fixed a problem that could cause Mos to crash.
215215

216216
## New Feature
217217

218-
Add white list mode in Ignore panel.
218+
Add allow list mode in Ignore panel.
219219

220220
Add Peak setting in Advance panel.
221221

‎Mos.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
0BB0F1C020F3A05D00909B7D /* WelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BB0F1BF20F3A05D00909B7D /* WelcomeViewController.swift */; };
2424
0BC2AD2F20F3BA090084416B /* PreferencesContributorsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BC2AD2E20F3BA090084416B /* PreferencesContributorsViewController.swift */; };
2525
0BD39F68204EFC6C000CCC42 /* StatusItemManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BD39F67204EFC6C000CCC42 /* StatusItemManager.swift */; };
26-
0BE4C93B20617C6E0001EA0E /* ScrollFiller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BE4C93A20617C6E0001EA0E /* ScrollFiller.swift */; };
26+
0BE4C93B20617C6E0001EA0E /* ScrollFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BE4C93A20617C6E0001EA0E /* ScrollFilter.swift */; };
2727
0BE5A292253A1168006D61C0 /* LoginServiceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 0BE5A291253A1168006D61C0 /* LoginServiceKit */; };
2828
0BE5A296253A119C006D61C0 /* Charts in Frameworks */ = {isa = PBXBuildFile; productRef = 0BE5A295253A119C006D61C0 /* Charts */; };
2929
22003C6E1E8555F0001220BC /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22003C6D1E8555F0001220BC /* Utils.swift */; };
@@ -90,7 +90,7 @@
9090
0BB0F1BF20F3A05D00909B7D /* WelcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeViewController.swift; sourceTree = "<group>"; };
9191
0BC2AD2E20F3BA090084416B /* PreferencesContributorsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesContributorsViewController.swift; sourceTree = "<group>"; };
9292
0BD39F67204EFC6C000CCC42 /* StatusItemManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusItemManager.swift; sourceTree = "<group>"; };
93-
0BE4C93A20617C6E0001EA0E /* ScrollFiller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollFiller.swift; sourceTree = "<group>"; };
93+
0BE4C93A20617C6E0001EA0E /* ScrollFilter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollFilter.swift; sourceTree = "<group>"; };
9494
22003C6D1E8555F0001220BC /* Utils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
9595
22142DA01E25344E00E4BFBF /* Mos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Mos.app; sourceTree = BUILT_PRODUCTS_DIR; };
9696
22142DA31E25344E00E4BFBF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -145,7 +145,7 @@
145145
children = (
146146
2291A8A21E2A5400004181B8 /* ScrollCore.swift */,
147147
0B12EF1C203ADD230058B169 /* ScrollUtils.swift */,
148-
0BE4C93A20617C6E0001EA0E /* ScrollFiller.swift */,
148+
0BE4C93A20617C6E0001EA0E /* ScrollFilter.swift */,
149149
0B6D3B692041C348004CC064 /* ScrollEvent.swift */,
150150
0B474328258E12A200A5F8A3 /* ScrollPhase.swift */,
151151
0B99C5FB2577FC9200021578 /* ScrollPoster.swift */,
@@ -444,7 +444,7 @@
444444
23E9673F23613D1100E652F6 /* PreferencesExceptionInputViewController.swift in Sources */,
445445
232E50A7236B372100265C58 /* PreferencesAdvanceWithApplicationViewController.swift in Sources */,
446446
22A32B331E334B2E00A5CF38 /* PreferencesAboutViewController.swift in Sources */,
447-
0BE4C93B20617C6E0001EA0E /* ScrollFiller.swift in Sources */,
447+
0BE4C93B20617C6E0001EA0E /* ScrollFilter.swift in Sources */,
448448
0B6D3B682041A790004CC064 /* WindowManager.swift in Sources */,
449449
0B12EF1A203AD9C80058B169 /* Options.swift in Sources */,
450450
228093501E2B5DA90061A00F /* PreferencesGeneralViewController.swift in Sources */,
@@ -622,7 +622,7 @@
622622
CODE_SIGN_IDENTITY = "-";
623623
CODE_SIGN_STYLE = Automatic;
624624
COMBINE_HIDPI_IMAGES = YES;
625-
CURRENT_PROJECT_VERSION = 2021.06.01;
625+
CURRENT_PROJECT_VERSION = 2022.09.12;
626626
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
627627
DEVELOPMENT_ASSET_PATHS = "";
628628
DEVELOPMENT_TEAM = 2H959AEV62;
@@ -633,7 +633,7 @@
633633
"@executable_path/../Frameworks",
634634
);
635635
MACOSX_DEPLOYMENT_TARGET = 10.11;
636-
MARKETING_VERSION = 3.3.4;
636+
MARKETING_VERSION = 3.4.0;
637637
MTL_ENABLE_DEBUG_INFO = NO;
638638
PRODUCT_BUNDLE_IDENTIFIER = com.caldis.Mos;
639639
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -656,7 +656,7 @@
656656
CODE_SIGN_IDENTITY = "-";
657657
CODE_SIGN_STYLE = Automatic;
658658
COMBINE_HIDPI_IMAGES = YES;
659-
CURRENT_PROJECT_VERSION = 2021.06.01;
659+
CURRENT_PROJECT_VERSION = 2022.09.12;
660660
DEVELOPMENT_ASSET_PATHS = "";
661661
DEVELOPMENT_TEAM = 2H959AEV62;
662662
ENABLE_HARDENED_RUNTIME = NO;
@@ -667,7 +667,7 @@
667667
"@executable_path/../Frameworks",
668668
);
669669
MACOSX_DEPLOYMENT_TARGET = 10.11;
670-
MARKETING_VERSION = 3.3.4;
670+
MARKETING_VERSION = 3.4.0;
671671
MTL_ENABLE_DEBUG_INFO = NO;
672672
PRODUCT_BUNDLE_IDENTIFIER = com.caldis.Mos;
673673
PRODUCT_NAME = "$(TARGET_NAME)";

‎Mos.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 22 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Mos.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1340"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "22142D9F1E25344E00E4BFBF"
18+
BuildableName = "Mos.app"
19+
BlueprintName = "Mos"
20+
ReferencedContainer = "container:Mos.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
enableAddressSanitizer = "YES"
31+
enableASanStackUseAfterReturn = "YES">
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "22142D9F1E25344E00E4BFBF"
36+
BuildableName = "Mos.app"
37+
BlueprintName = "Mos"
38+
ReferencedContainer = "container:Mos.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
41+
<AdditionalOptions>
42+
<AdditionalOption
43+
key = "NSZombieEnabled"
44+
value = "YES"
45+
isEnabled = "YES">
46+
</AdditionalOption>
47+
<AdditionalOption
48+
key = "MallocScribble"
49+
value = ""
50+
isEnabled = "YES">
51+
</AdditionalOption>
52+
</AdditionalOptions>
53+
<Testables>
54+
</Testables>
55+
</TestAction>
56+
<LaunchAction
57+
buildConfiguration = "Debug"
58+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
59+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
enableASanStackUseAfterReturn = "YES"
61+
language = "en"
62+
launchStyle = "0"
63+
useCustomWorkingDirectory = "NO"
64+
ignoresPersistentStateOnLaunch = "NO"
65+
debugDocumentVersioning = "YES"
66+
debugServiceExtension = "internal"
67+
enableGPUValidationMode = "1"
68+
allowLocationSimulation = "YES">
69+
<BuildableProductRunnable
70+
runnableDebuggingMode = "0">
71+
<BuildableReference
72+
BuildableIdentifier = "primary"
73+
BlueprintIdentifier = "22142D9F1E25344E00E4BFBF"
74+
BuildableName = "Mos.app"
75+
BlueprintName = "Mos"
76+
ReferencedContainer = "container:Mos.xcodeproj">
77+
</BuildableReference>
78+
</BuildableProductRunnable>
79+
<AdditionalOptions>
80+
<AdditionalOption
81+
key = "MallocStackLogging"
82+
value = ""
83+
isEnabled = "YES">
84+
</AdditionalOption>
85+
<AdditionalOption
86+
key = "DYLD_INSERT_LIBRARIES"
87+
value = "/usr/lib/libgmalloc.dylib"
88+
isEnabled = "YES">
89+
</AdditionalOption>
90+
<AdditionalOption
91+
key = "PrefersMallocStackLoggingLite"
92+
value = ""
93+
isEnabled = "YES">
94+
</AdditionalOption>
95+
<AdditionalOption
96+
key = "NSZombieEnabled"
97+
value = "YES"
98+
isEnabled = "YES">
99+
</AdditionalOption>
100+
<AdditionalOption
101+
key = "MallocGuardEdges"
102+
value = ""
103+
isEnabled = "YES">
104+
</AdditionalOption>
105+
<AdditionalOption
106+
key = "MallocScribble"
107+
value = ""
108+
isEnabled = "YES">
109+
</AdditionalOption>
110+
</AdditionalOptions>
111+
</LaunchAction>
112+
<ProfileAction
113+
buildConfiguration = "Release"
114+
shouldUseLaunchSchemeArgsEnv = "YES"
115+
savedToolIdentifier = ""
116+
useCustomWorkingDirectory = "NO"
117+
debugDocumentVersioning = "YES">
118+
<BuildableProductRunnable
119+
runnableDebuggingMode = "0">
120+
<BuildableReference
121+
BuildableIdentifier = "primary"
122+
BlueprintIdentifier = "22142D9F1E25344E00E4BFBF"
123+
BuildableName = "Mos.app"
124+
BlueprintName = "Mos"
125+
ReferencedContainer = "container:Mos.xcodeproj">
126+
</BuildableReference>
127+
</BuildableProductRunnable>
128+
</ProfileAction>
129+
<AnalyzeAction
130+
buildConfiguration = "Debug">
131+
</AnalyzeAction>
132+
<ArchiveAction
133+
buildConfiguration = "Release"
134+
revealArchiveInOrganizer = "YES">
135+
</ArchiveAction>
136+
</Scheme>

‎Mos.xcodeproj/xcuserdata/Caldis.xcuserdatad/xcschemes/Mos.xcscheme‎ renamed to ‎Mos.xcodeproj/xcshareddata/xcschemes/Profile.xcscheme‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1340"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,22 +27,13 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<MacroExpansion>
31-
<BuildableReference
32-
BuildableIdentifier = "primary"
33-
BlueprintIdentifier = "22142D9F1E25344E00E4BFBF"
34-
BuildableName = "Mos.app"
35-
BlueprintName = "Mos"
36-
ReferencedContainer = "container:Mos.xcodeproj">
37-
</BuildableReference>
38-
</MacroExpansion>
3930
<Testables>
4031
</Testables>
4132
</TestAction>
4233
<LaunchAction
4334
buildConfiguration = "Debug"
44-
selectedDebuggerIdentifier = ""
45-
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4637
launchStyle = "0"
4738
useCustomWorkingDirectory = "NO"
4839
ignoresPersistentStateOnLaunch = "NO"

‎Mos.xcodeproj/xcuserdata/Caldis.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,18 @@
33
uuid = "32EA6F78-F020-42D7-AE40-730D164E821A"
44
type = "1"
55
version = "2.0">
6+
<Breakpoints>
7+
<BreakpointProxy
8+
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
9+
<BreakpointContent
10+
uuid = "737FF52F-5223-411B-8F37-5CE0D46FACB4"
11+
shouldBeEnabled = "Yes"
12+
ignoreCount = "0"
13+
continueAfterRunningActions = "No"
14+
breakpointStackSelectionBehavior = "1"
15+
scope = "1"
16+
stopOnStyle = "0">
17+
</BreakpointContent>
18+
</BreakpointProxy>
19+
</Breakpoints>
620
</Bucket>

‎Mos.xcodeproj/xcuserdata/Caldis.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<dict>
55
<key>SchemeUserState</key>
66
<dict>
7-
<key>Mos.xcscheme</key>
7+
<key>Debug.xcscheme_^#shared#^_</key>
88
<dict>
99
<key>orderHint</key>
1010
<integer>0</integer>
@@ -51,6 +51,11 @@
5151
<key>orderHint</key>
5252
<integer>1</integer>
5353
</dict>
54+
<key>Profile.xcscheme_^#shared#^_</key>
55+
<dict>
56+
<key>orderHint</key>
57+
<integer>4</integer>
58+
</dict>
5459
</dict>
5560
<key>SuppressBuildableAutocreation</key>
5661
<dict>

‎Mos/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import Cocoa
1010

11-
@NSApplicationMain
11+
@main
1212
class AppDelegate: NSObject, NSApplicationDelegate {
1313

1414
// 运行前预处理

‎Mos/Base.lproj/Main.storyboard‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,12 +1111,12 @@
11111111
<constraints>
11121112
<constraint firstAttribute="width" relation="greaterThanOrEqual" id="NS2-ZW-iDh"/>
11131113
</constraints>
1114-
<buttonCell key="cell" type="check" title="Whitelist Mode" bezelStyle="regularSquare" imagePosition="left" alignment="right" controlSize="small" inset="2" id="Ksp-g1-48g">
1114+
<buttonCell key="cell" type="check" title="Allow list Mode" bezelStyle="regularSquare" imagePosition="left" alignment="right" controlSize="small" inset="2" id="Ksp-g1-48g">
11151115
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
11161116
<font key="font" metaFont="menu" size="11"/>
11171117
</buttonCell>
11181118
<connections>
1119-
<action selector="whiteListModeClick:" target="bga-wG-iim" id="MZ6-m7-C6o"/>
1119+
<action selector="allowListModeClick:" target="bga-wG-iim" id="MZ6-m7-C6o"/>
11201120
</connections>
11211121
</button>
11221122
<button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8FH-Zr-4mB">
@@ -1180,7 +1180,7 @@
11801180
<outlet property="runningAndInstalledManuItem" destination="R0d-21-g6W" id="a14-sX-cP3"/>
11811181
<outlet property="runningAndInstalledMenuChildrenContainer" destination="tXQ-GJ-k5M" id="kvh-JP-b9D"/>
11821182
<outlet property="tableView" destination="LmV-gi-3fE" id="GOb-17-dvX"/>
1183-
<outlet property="whitelistModeCheckBox" destination="gnb-pe-ZN5" id="HTP-3G-Zme"/>
1183+
<outlet property="allowlistModeCheckBox" destination="gnb-pe-ZN5" id="HTP-3G-Zme"/>
11841184
</connections>
11851185
</viewController>
11861186
<menu id="v6G-mQ-Ddk">
@@ -1333,17 +1333,17 @@ Gw
13331333
</objects>
13341334
<point key="canvasLocation" x="1480.5" y="1849.5"/>
13351335
</scene>
1336-
<!--Exception whitelist hint-->
1336+
<!--Exception allowlist hint-->
13371337
<scene sceneID="57E-oo-PEW">
13381338
<objects>
1339-
<viewController id="o12-9v-Ej5" userLabel="Exception whitelist hint" sceneMemberID="viewController">
1339+
<viewController id="o12-9v-Ej5" userLabel="Exception allowlist hint" sceneMemberID="viewController">
13401340
<view key="view" id="wdx-Jb-jwG">
13411341
<rect key="frame" x="0.0" y="0.0" width="224" height="42"/>
13421342
<autoresizingMask key="autoresizingMask"/>
13431343
<subviews>
13441344
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KGW-PK-8DX">
13451345
<rect key="frame" x="10" y="10" width="204" height="22"/>
1346-
<textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" title="The whitelist mode will make Mos only apply to apps within the exception list." id="v26-RK-BtL">
1346+
<textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" title="The allow list mode will make Mos only apply to apps within the exception list." id="v26-RK-BtL">
13471347
<font key="font" metaFont="label" size="9"/>
13481348
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
13491349
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

0 commit comments

Comments
 (0)