feat: make it more clear how to hide the menubar icon (closes #503)
This commit is contained in:
lwouis committed
1 parent
987b6b2f82
commit
9ca0649368
12 files changed
+114
-101
No files matched your search
@@ -89,7 +89,7 @@
|
||||
BF0C8203D0EFEDEED0F908E8 /* ScreensEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0C822D3BEDAB1F1C9F775E /* ScreensEvents.swift */; };
|
||||
BF0C820C6E89C2D90FA30A4B /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = BF0C8F67ABD271F26FA0EDEF /* Localizable.strings */; };
|
||||
BF0C8224CFD1ED511F3F0063 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = BF0C8D94228D90FE99D4A3C8 /* Localizable.strings */; };
|
||||
BF0C823630E3DEAC576FAFE6 /* menubar-1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BF0C88BF67CF4D71002A60EB /* menubar-1@2x.png */; };
|
||||
BF0C823630E3DEAC576FAFE6 /* menubar-0@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BF0C88BF67CF4D71002A60EB /* menubar-0@2x.png */; };
|
||||
BF0C8249228867A3188E13F3 /* SystemAppearanceEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0C869E544F968051715452 /* SystemAppearanceEvents.swift */; };
|
||||
BF0C827A169F0DE86C8F12AD /* SystemScrollerStyleEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0C8B5D1A9658E64F8ECB56 /* SystemScrollerStyleEvents.swift */; };
|
||||
BF0C828D53D429C2B8B22391 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = BF0C883EBA8FDA9CB61C91FD /* Localizable.strings */; };
|
||||
@@ -98,7 +98,7 @@
|
||||
BF0C83578F7292F307E30751 /* PopupButtonLikeSystemSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0C8A479D2B7FB80531F037 /* PopupButtonLikeSystemSettings.swift */; };
|
||||
BF0C8382435C0087E131BD83 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = BF0C8A900DA32A7F62457CC2 /* InfoPlist.strings */; };
|
||||
BF0C83AB0186CC48FADF66A7 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = BF0C847B2D68EACFAC1B06D1 /* Localizable.strings */; };
|
||||
BF0C83E902F75A97E8FD374A /* menubar-2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BF0C8D3333653ACAEF730DD8 /* menubar-2@2x.png */; };
|
||||
BF0C83E902F75A97E8FD374A /* menubar-1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BF0C8D3333653ACAEF730DD8 /* menubar-1@2x.png */; };
|
||||
BF0C8406805BDEC5B69E8803 /* screen-recording@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BF0C8E25373671B528AD448D /* screen-recording@2x.png */; };
|
||||
BF0C84D7DC2AC65BB1C111EB /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = BF0C8349BA94516E8760BAFA /* Localizable.strings */; };
|
||||
BF0C84E5AC1D423625ABF3E6 /* Mocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0C829EAA93A4C4ADB42CF8 /* Mocks.swift */; };
|
||||
@@ -147,7 +147,7 @@
|
||||
BF0C8C7E96DB48120462DA00 /* TrafficLightButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0C8DF400A1AF64EB0CD0B3 /* TrafficLightButton.swift */; };
|
||||
BF0C8C7F5F9EE501B240D2E3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = BF0C8532DEDE7C1218B90444 /* Localizable.strings */; };
|
||||
BF0C8C8E35FF49CAA4BF5FC4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = BF0C8A970BD1CAD555F31EDA /* Localizable.strings */; };
|
||||
BF0C8C9CA44285E493918A74 /* menubar-3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BF0C8E54658B4DAEA0528200 /* menubar-3@2x.png */; };
|
||||
BF0C8C9CA44285E493918A74 /* menubar-2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BF0C8E54658B4DAEA0528200 /* menubar-2@2x.png */; };
|
||||
BF0C8CBF5B4EE15FDB53C94B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = BF0C861EE84489EF56879CBF /* InfoPlist.strings */; };
|
||||
BF0C8CC5057406014FD612CC /* ATShortcut.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0C8BA452332236D972C60E /* ATShortcut.swift */; };
|
||||
BF0C8D1C57D74106018D073C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = BF0C87F5D4AD51D6950C98B0 /* InfoPlist.strings */; };
|
||||
@@ -348,7 +348,7 @@
|
||||
BF0C81BB57B297B2432C4824 /* test-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "test-release.xcconfig"; sourceTree = "<group>"; };
|
||||
BF0C81D602ED642A48D50B78 /* notarytool */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = notarytool; sourceTree = "<group>"; };
|
||||
BF0C822D3BEDAB1F1C9F775E /* ScreensEvents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScreensEvents.swift; sourceTree = "<group>"; };
|
||||
BF0C828AF7BCC4F47E70B28F /* menubar-2.svg */ = {isa = PBXFileReference; lastKnownFileType = file.svg; path = "menubar-2.svg"; sourceTree = "<group>"; };
|
||||
BF0C828AF7BCC4F47E70B28F /* menubar-1.svg */ = {isa = PBXFileReference; lastKnownFileType = file.svg; path = "menubar-1.svg"; sourceTree = "<group>"; };
|
||||
BF0C829EAA93A4C4ADB42CF8 /* Mocks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mocks.swift; sourceTree = "<group>"; };
|
||||
BF0C82C381FCBCF8109735AC /* pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = pl; path = InfoPlist.strings; sourceTree = "<group>"; };
|
||||
BF0C82D44C2DFAA5D8F60394 /* sq */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = sq; path = Localizable.strings; sourceTree = "<group>"; };
|
||||
@@ -384,7 +384,7 @@
|
||||
BF0C87320241EAE01E38EF53 /* .periphery.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.yaml; path = .periphery.yml; sourceTree = "<group>"; };
|
||||
BF0C873357DBF7008830E73F /* xcbeautify */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = xcbeautify; sourceTree = "<group>"; };
|
||||
BF0C87897C24638DDE4A9889 /* app-icons-style.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "app-icons-style.jpg"; sourceTree = "<group>"; };
|
||||
BF0C87B913292EE53EDE4220 /* menubar-1.svg */ = {isa = PBXFileReference; lastKnownFileType = file.svg; path = "menubar-1.svg"; sourceTree = "<group>"; };
|
||||
BF0C87B913292EE53EDE4220 /* menubar-0.svg */ = {isa = PBXFileReference; lastKnownFileType = file.svg; path = "menubar-0.svg"; sourceTree = "<group>"; };
|
||||
BF0C87C0514B13DACB6E702B /* fa */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = fa; path = Localizable.strings; sourceTree = "<group>"; };
|
||||
BF0C87D65E0436CBC0EF29FA /* uz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = uz; path = Localizable.strings; sourceTree = "<group>"; };
|
||||
BF0C87F376F3DC4C453878A6 /* th */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = th; path = Localizable.strings; sourceTree = "<group>"; };
|
||||
@@ -395,7 +395,7 @@
|
||||
BF0C888D912E73D88919899A /* uk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = uk; path = Localizable.strings; sourceTree = "<group>"; };
|
||||
BF0C889529FF19620EDAC295 /* accessibility@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "accessibility@2x.png"; sourceTree = "<group>"; };
|
||||
BF0C8898ADB2A1B49312E87B /* cs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = cs; path = InfoPlist.strings; sourceTree = "<group>"; };
|
||||
BF0C88BF67CF4D71002A60EB /* menubar-1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menubar-1@2x.png"; sourceTree = "<group>"; };
|
||||
BF0C88BF67CF4D71002A60EB /* menubar-0@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menubar-0@2x.png"; sourceTree = "<group>"; };
|
||||
BF0C88C4940CA76FA801B881 /* preferences-appearance-details.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "preferences-appearance-details.jpg"; sourceTree = "<group>"; };
|
||||
BF0C890AF36F3EFD5CC4D114 /* bg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = bg; path = Localizable.strings; sourceTree = "<group>"; };
|
||||
BF0C89143F55C42D8A398C5A /* ku */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ku; path = Localizable.strings; sourceTree = "<group>"; };
|
||||
@@ -432,7 +432,7 @@
|
||||
BF0C8C6995992F837A9A83A6 /* ca */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ca; path = InfoPlist.strings; sourceTree = "<group>"; };
|
||||
BF0C8CA36F8BD99BF38A45D0 /* bn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = bn; path = InfoPlist.strings; sourceTree = "<group>"; };
|
||||
BF0C8CE7BBC3B9B0CEC008FF /* vi */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = vi; path = Localizable.strings; sourceTree = "<group>"; };
|
||||
BF0C8D3333653ACAEF730DD8 /* menubar-2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menubar-2@2x.png"; sourceTree = "<group>"; };
|
||||
BF0C8D3333653ACAEF730DD8 /* menubar-1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menubar-1@2x.png"; sourceTree = "<group>"; };
|
||||
BF0C8D52C3D33B0669ECF996 /* ro */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ro; path = InfoPlist.strings; sourceTree = "<group>"; };
|
||||
BF0C8D57C86AF492D43A576D /* AppearanceTestable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppearanceTestable.swift; sourceTree = "<group>"; };
|
||||
BF0C8D606B53D315F2D9927B /* KeyRepeatTimer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyRepeatTimer.swift; sourceTree = "<group>"; };
|
||||
@@ -445,7 +445,7 @@
|
||||
BF0C8E1FBCBC7B64C69D933C /* titles-style-full.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "titles-style-full.jpg"; sourceTree = "<group>"; };
|
||||
BF0C8E25373671B528AD448D /* screen-recording@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "screen-recording@2x.png"; sourceTree = "<group>"; };
|
||||
BF0C8E478D68ED85DAE6BF43 /* ga */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ga; path = InfoPlist.strings; sourceTree = "<group>"; };
|
||||
BF0C8E54658B4DAEA0528200 /* menubar-3@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menubar-3@2x.png"; sourceTree = "<group>"; };
|
||||
BF0C8E54658B4DAEA0528200 /* menubar-2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menubar-2@2x.png"; sourceTree = "<group>"; };
|
||||
BF0C8E5D2BD5F7F93DF77DF5 /* sk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = sk; path = InfoPlist.strings; sourceTree = "<group>"; };
|
||||
BF0C8E7B087DCC97A454C0AE /* uk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = uk; path = InfoPlist.strings; sourceTree = "<group>"; };
|
||||
BF0C8EAF02309B9C489E65F4 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
|
||||
@@ -784,11 +784,11 @@
|
||||
BF0C80536B40523C5DB23BE2 /* menubar */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
BF0C88BF67CF4D71002A60EB /* menubar-1@2x.png */,
|
||||
BF0C8D3333653ACAEF730DD8 /* menubar-2@2x.png */,
|
||||
BF0C828AF7BCC4F47E70B28F /* menubar-2.svg */,
|
||||
BF0C8E54658B4DAEA0528200 /* menubar-3@2x.png */,
|
||||
BF0C87B913292EE53EDE4220 /* menubar-1.svg */,
|
||||
BF0C88BF67CF4D71002A60EB /* menubar-0@2x.png */,
|
||||
BF0C8D3333653ACAEF730DD8 /* menubar-1@2x.png */,
|
||||
BF0C828AF7BCC4F47E70B28F /* menubar-1.svg */,
|
||||
BF0C8E54658B4DAEA0528200 /* menubar-2@2x.png */,
|
||||
BF0C87B913292EE53EDE4220 /* menubar-0.svg */,
|
||||
);
|
||||
path = menubar;
|
||||
sourceTree = "<group>";
|
||||
@@ -1934,9 +1934,9 @@
|
||||
D04BAC23045A0A119B527DEB /* InfoPlist.strings in Resources */,
|
||||
D04BA328F7C85DD1A6C1C7ED /* Localizable.strings in Resources */,
|
||||
BF0C852D28E458CDD6FA3E44 /* app.icns in Resources */,
|
||||
BF0C823630E3DEAC576FAFE6 /* menubar-1@2x.png in Resources */,
|
||||
BF0C83E902F75A97E8FD374A /* menubar-2@2x.png in Resources */,
|
||||
BF0C8C9CA44285E493918A74 /* menubar-3@2x.png in Resources */,
|
||||
BF0C823630E3DEAC576FAFE6 /* menubar-0@2x.png in Resources */,
|
||||
BF0C83E902F75A97E8FD374A /* menubar-1@2x.png in Resources */,
|
||||
BF0C8C9CA44285E493918A74 /* menubar-2@2x.png in Resources */,
|
||||
BF0C829583ED47E458528F3A /* accessibility@2x.png in Resources */,
|
||||
BF0C8406805BDEC5B69E8803 /* screen-recording@2x.png in Resources */,
|
||||
BF0C853B271C4407E87FA183 /* InfoPlist.strings in Resources */,
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g filter="url(#filter0_i)">
|
||||
<path d="M4 3.45H18C18.856 3.45 19.55 4.14396 19.55 5V17C19.55 17.856 18.856 18.55 18 18.55H4C3.14396 18.55 2.45 17.856 2.45 17V5C2.45 4.14396 3.14396 3.45 4 3.45Z" stroke="black" stroke-width="0.9"/>
|
||||
</g>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.16239 12.1506C9.16239 11.7772 8.76803 11.5355 8.43537 11.7051L4.66767 13.625C4.30369 13.8105 4.30369 14.3306 4.66767 14.516L8.43537 16.436C8.76803 16.6055 9.16239 16.3639 9.16239 15.9905L9.16239 15.4506C9.16239 15.1744 9.38625 14.9506 9.66239 14.9506H11.7031C11.9793 14.9506 12.2031 14.7267 12.2031 14.4506V13.6906C12.2031 13.4144 11.9793 13.1906 11.7031 13.1906H9.66239C9.38624 13.1906 9.16239 12.9667 9.16239 12.6906L9.16239 12.1506Z" fill="black"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.8405 12.6406C12.8405 13.0139 13.2349 13.2556 13.5676 13.0861L17.3353 11.1661C17.6992 10.9806 17.6992 10.4606 17.3353 10.2751L13.5676 8.35513C13.2349 8.18561 12.8405 8.42726 12.8405 8.80062L12.8405 9.34055C12.8405 9.61669 12.6167 9.84055 12.3405 9.84055H10.2998C10.0237 9.84055 9.7998 10.0644 9.7998 10.3405V11.1005C9.7998 11.3767 10.0237 11.6005 10.2998 11.6005H12.3405C12.6167 11.6005 12.8405 11.8244 12.8405 12.1005L12.8405 12.6406Z" fill="black"/>
|
||||
<circle cx="5.3" cy="6.3" r="0.8" fill="black"/>
|
||||
<circle cx="7.92402" cy="6.3" r="0.8" fill="black"/>
|
||||
<circle cx="10.5754" cy="6.3" r="0.8" fill="black"/>
|
||||
<defs>
|
||||
<filter id="filter0_i" x="2" y="3" width="18" height="16.3718" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
|
||||
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
|
||||
<feOffset dy="0.371818"/>
|
||||
<feGaussianBlur stdDeviation="0.185909"/>
|
||||
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
|
||||
<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.2 0"/>
|
||||
<feBlend mode="normal" in2="shape" result="effect1_innerShadow"/>
|
||||
</filter>
|
||||
</defs>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 456 B |
@@ -1,12 +1,11 @@
|
||||
<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<mask id="path-1-inside-1" fill="white">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 3C2.89543 3 2 3.89543 2 5V17C2 18.1046 2.89543 19 4 19H18C19.1046 19 20 18.1046 20 17V5C20 3.89543 19.1046 3 18 3H4ZM6.1 6.3C6.1 6.74183 5.74183 7.1 5.3 7.1C4.85817 7.1 4.5 6.74183 4.5 6.3C4.5 5.85817 4.85817 5.5 5.3 5.5C5.74183 5.5 6.1 5.85817 6.1 6.3ZM13.5672 13.0861C13.2345 13.2556 12.8402 13.014 12.8402 12.6406V12.1006C12.8402 11.8244 12.6163 11.6006 12.3402 11.6006H10.2995C10.0233 11.6006 9.79945 11.3767 9.79945 11.1006V10.3406C9.79945 10.0644 10.0233 9.84058 10.2995 9.84058H12.3402C12.6163 9.84058 12.8402 9.61672 12.8402 9.34058V8.80065C12.8402 8.42728 13.2345 8.18563 13.5672 8.35515L17.3349 10.2751C17.6989 10.4606 17.6989 10.9806 17.3349 11.1661L13.5672 13.0861ZM8.43521 11.7051C8.76787 11.5356 9.16223 11.7772 9.16223 12.1506V12.6906C9.16223 12.9667 9.38609 13.1906 9.66223 13.1906H11.703C11.9791 13.1906 12.203 13.4145 12.203 13.6906V14.4506C12.203 14.7267 11.9791 14.9506 11.703 14.9506H9.66223C9.38609 14.9506 9.16223 15.1745 9.16223 15.4506V15.9905C9.16223 16.3639 8.76787 16.6055 8.43521 16.436L4.66751 14.516C4.30354 14.3306 4.30354 13.8105 4.66751 13.6251L8.43521 11.7051ZM7.92441 7.1C8.36624 7.1 8.72441 6.74183 8.72441 6.3C8.72441 5.85817 8.36624 5.5 7.92441 5.5C7.48259 5.5 7.12441 5.85817 7.12441 6.3C7.12441 6.74183 7.48259 7.1 7.92441 7.1ZM11.3752 6.3C11.3752 6.74183 11.017 7.1 10.5752 7.1C10.1334 7.1 9.7752 6.74183 9.7752 6.3C9.7752 5.85817 10.1334 5.5 10.5752 5.5C11.017 5.5 11.3752 5.85817 11.3752 6.3Z"/>
|
||||
</mask>
|
||||
<g filter="url(#filter0_i)">
|
||||
<path d="M4 3.45H18C18.856 3.45 19.55 4.14396 19.55 5V17C19.55 17.856 18.856 18.55 18 18.55H4C3.14396 18.55 2.45 17.856 2.45 17V5C2.45 4.14396 3.14396 3.45 4 3.45Z" stroke="black" stroke-width="0.9"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 3C2.89543 3 2 3.89543 2 5V17C2 18.1046 2.89543 19 4 19H18C19.1046 19 20 18.1046 20 17V5C20 3.89543 19.1046 3 18 3H4ZM6.1 6.3C6.1 6.74183 5.74183 7.1 5.3 7.1C4.85817 7.1 4.5 6.74183 4.5 6.3C4.5 5.85817 4.85817 5.5 5.3 5.5C5.74183 5.5 6.1 5.85817 6.1 6.3ZM13.5672 13.0861C13.2345 13.2556 12.8402 13.014 12.8402 12.6406V12.1006C12.8402 11.8244 12.6163 11.6006 12.3402 11.6006H10.2995C10.0233 11.6006 9.79945 11.3767 9.79945 11.1006V10.3406C9.79945 10.0644 10.0233 9.84058 10.2995 9.84058H12.3402C12.6163 9.84058 12.8402 9.61672 12.8402 9.34058V8.80065C12.8402 8.42728 13.2345 8.18563 13.5672 8.35515L17.3349 10.2751C17.6989 10.4606 17.6989 10.9806 17.3349 11.1661L13.5672 13.0861ZM8.43521 11.7051C8.76787 11.5356 9.16223 11.7772 9.16223 12.1506V12.6906C9.16223 12.9667 9.38609 13.1906 9.66223 13.1906H11.703C11.9791 13.1906 12.203 13.4145 12.203 13.6906V14.4506C12.203 14.7267 11.9791 14.9506 11.703 14.9506H9.66223C9.38609 14.9506 9.16223 15.1745 9.16223 15.4506V15.9905C9.16223 16.3639 8.76787 16.6055 8.43521 16.436L4.66751 14.516C4.30354 14.3306 4.30354 13.8105 4.66751 13.6251L8.43521 11.7051ZM7.92441 7.1C8.36624 7.1 8.72441 6.74183 8.72441 6.3C8.72441 5.85817 8.36624 5.5 7.92441 5.5C7.48259 5.5 7.12441 5.85817 7.12441 6.3C7.12441 6.74183 7.48259 7.1 7.92441 7.1ZM11.3752 6.3C11.3752 6.74183 11.017 7.1 10.5752 7.1C10.1334 7.1 9.7752 6.74183 9.7752 6.3C9.7752 5.85817 10.1334 5.5 10.5752 5.5C11.017 5.5 11.3752 5.85817 11.3752 6.3Z" fill="black"/>
|
||||
</g>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.16239 12.1506C9.16239 11.7772 8.76803 11.5355 8.43537 11.7051L4.66767 13.625C4.30369 13.8105 4.30369 14.3306 4.66767 14.516L8.43537 16.436C8.76803 16.6055 9.16239 16.3639 9.16239 15.9905L9.16239 15.4506C9.16239 15.1744 9.38625 14.9506 9.66239 14.9506H11.7031C11.9793 14.9506 12.2031 14.7267 12.2031 14.4506V13.6906C12.2031 13.4144 11.9793 13.1906 11.7031 13.1906H9.66239C9.38624 13.1906 9.16239 12.9667 9.16239 12.6906L9.16239 12.1506Z" fill="black"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.8405 12.6406C12.8405 13.0139 13.2349 13.2556 13.5676 13.0861L17.3353 11.1661C17.6992 10.9806 17.6992 10.4606 17.3353 10.2751L13.5676 8.35513C13.2349 8.18561 12.8405 8.42726 12.8405 8.80062L12.8405 9.34055C12.8405 9.61669 12.6167 9.84055 12.3405 9.84055H10.2998C10.0237 9.84055 9.7998 10.0644 9.7998 10.3405V11.1005C9.7998 11.3767 10.0237 11.6005 10.2998 11.6005H12.3405C12.6167 11.6005 12.8405 11.8244 12.8405 12.1005L12.8405 12.6406Z" fill="black"/>
|
||||
<circle cx="5.3" cy="6.3" r="0.8" fill="black"/>
|
||||
<circle cx="7.92402" cy="6.3" r="0.8" fill="black"/>
|
||||
<circle cx="10.5754" cy="6.3" r="0.8" fill="black"/>
|
||||
<path d="M13.5672 13.0861L13.9758 13.888L13.9758 13.888L13.5672 13.0861ZM13.5672 8.35515L13.1586 9.15704L13.1586 9.15704L13.5672 8.35515ZM17.3349 10.2751L17.7435 9.47325L17.7435 9.47325L17.3349 10.2751ZM17.3349 11.1661L17.7435 11.968L17.7435 11.968L17.3349 11.1661ZM8.43521 11.7051L8.84384 12.507L8.84385 12.507L8.43521 11.7051ZM8.43521 16.436L8.84385 15.6341L8.84385 15.6341L8.43521 16.436ZM4.66751 14.516L5.07615 13.7142L5.07615 13.7142L4.66751 14.516ZM4.66751 13.6251L5.07614 14.4269L5.07615 14.4269L4.66751 13.6251ZM2.9 5C2.9 4.39249 3.39249 3.9 4 3.9V2.1C2.39837 2.1 1.1 3.39837 1.1 5H2.9ZM2.9 17V5H1.1V17H2.9ZM4 18.1C3.39249 18.1 2.9 17.6075 2.9 17H1.1C1.1 18.6016 2.39837 19.9 4 19.9V18.1ZM18 18.1H4V19.9H18V18.1ZM19.1 17C19.1 17.6075 18.6075 18.1 18 18.1V19.9C19.6016 19.9 20.9 18.6016 20.9 17H19.1ZM19.1 5V17H20.9V5H19.1ZM18 3.9C18.6075 3.9 19.1 4.39249 19.1 5H20.9C20.9 3.39837 19.6016 2.1 18 2.1V3.9ZM4 3.9H18V2.1H4V3.9ZM5.3 8C6.23888 8 7 7.23888 7 6.3H5.2C5.2 6.24477 5.24477 6.2 5.3 6.2V8ZM3.6 6.3C3.6 7.23888 4.36112 8 5.3 8V6.2C5.35523 6.2 5.4 6.24477 5.4 6.3H3.6ZM5.3 4.6C4.36112 4.6 3.6 5.36112 3.6 6.3H5.4C5.4 6.35523 5.35523 6.4 5.3 6.4V4.6ZM7 6.3C7 5.36112 6.23888 4.6 5.3 4.6V6.4C5.24477 6.4 5.2 6.35523 5.2 6.3H7ZM11.9402 12.6406C11.9402 13.686 13.0444 14.3626 13.9758 13.888L13.1586 12.2842C13.4247 12.1486 13.7402 12.3419 13.7402 12.6406H11.9402ZM11.9402 12.1006V12.6406H13.7402V12.1006H11.9402ZM12.3402 12.5006C12.1193 12.5006 11.9402 12.3215 11.9402 12.1006H13.7402C13.7402 11.3274 13.1134 10.7006 12.3402 10.7006V12.5006ZM10.2995 12.5006H12.3402V10.7006H10.2995V12.5006ZM8.89945 11.1006C8.89945 11.8738 9.52626 12.5006 10.2995 12.5006V10.7006C10.5204 10.7006 10.6995 10.8797 10.6995 11.1006H8.89945ZM8.89945 10.3406V11.1006H10.6995V10.3406H8.89945ZM10.2995 8.94058C9.52626 8.94058 8.89945 9.56738 8.89945 10.3406H10.6995C10.6995 10.5615 10.5204 10.7406 10.2995 10.7406V8.94058ZM12.3402 8.94058H10.2995V10.7406H12.3402V8.94058ZM11.9402 9.34058C11.9402 9.11966 12.1193 8.94058 12.3402 8.94058V10.7406C13.1134 10.7406 13.7402 10.1138 13.7402 9.34058H11.9402ZM11.9402 8.80065V9.34058H13.7402V8.80065H11.9402ZM13.9758 7.55327C13.0444 7.07861 11.9402 7.75524 11.9402 8.80065H13.7402C13.7402 9.09933 13.4247 9.29266 13.1586 9.15704L13.9758 7.55327ZM17.7435 9.47325L13.9758 7.55327L13.1586 9.15704L16.9263 11.077L17.7435 9.47325ZM17.7435 11.968C18.7627 11.4487 18.7627 9.99259 17.7435 9.47325L16.9263 11.077C16.6351 10.9286 16.6351 10.5126 16.9263 10.3642L17.7435 11.968ZM13.9758 13.888L17.7435 11.968L16.9263 10.3642L13.1586 12.2842L13.9758 13.888ZM10.0622 12.1506C10.0622 11.1052 8.95802 10.4285 8.02658 10.9032L8.84385 12.507C8.57772 12.6426 8.26223 12.4493 8.26223 12.1506H10.0622ZM10.0622 12.6906V12.1506H8.26223V12.6906H10.0622ZM9.66223 12.2906C9.88315 12.2906 10.0622 12.4697 10.0622 12.6906H8.26223C8.26223 13.4638 8.88903 14.0906 9.66223 14.0906V12.2906ZM11.703 12.2906H9.66223V14.0906H11.703V12.2906ZM13.103 13.6906C13.103 12.9174 12.4762 12.2906 11.703 12.2906V14.0906C11.4821 14.0906 11.303 13.9115 11.303 13.6906H13.103ZM13.103 14.4506V13.6906H11.303V14.4506H13.103ZM11.703 15.8506C12.4762 15.8506 13.103 15.2238 13.103 14.4506H11.303C11.303 14.2297 11.4821 14.0506 11.703 14.0506V15.8506ZM9.66223 15.8506H11.703V14.0506H9.66223V15.8506ZM10.0622 15.4506C10.0622 15.6715 9.88314 15.8506 9.66223 15.8506V14.0506C8.88903 14.0506 8.26223 14.6774 8.26223 15.4506H10.0622ZM10.0622 15.9905V15.4506H8.26223V15.9905H10.0622ZM8.02658 17.2379C8.95803 17.7126 10.0622 17.0359 10.0622 15.9905H8.26223C8.26223 15.6918 8.57772 15.4985 8.84385 15.6341L8.02658 17.2379ZM4.25888 15.3179L8.02658 17.2379L8.84385 15.6341L5.07615 13.7142L4.25888 15.3179ZM4.25888 12.8232C3.23975 13.3425 3.23975 14.7986 4.25888 15.3179L5.07615 13.7142C5.36733 13.8625 5.36733 14.2786 5.07614 14.4269L4.25888 12.8232ZM8.02658 10.9032L4.25888 12.8232L5.07615 14.4269L8.84384 12.507L8.02658 10.9032ZM7.82441 6.3C7.82441 6.24477 7.86919 6.2 7.92441 6.2V8C8.8633 8 9.62441 7.23888 9.62441 6.3H7.82441ZM7.92441 6.4C7.86919 6.4 7.82441 6.35523 7.82441 6.3H9.62441C9.62441 5.36112 8.8633 4.6 7.92441 4.6V6.4ZM8.02441 6.3C8.02441 6.35523 7.97964 6.4 7.92441 6.4V4.6C6.98553 4.6 6.22441 5.36112 6.22441 6.3H8.02441ZM7.92441 6.2C7.97964 6.2 8.02441 6.24477 8.02441 6.3H6.22441C6.22441 7.23888 6.98553 8 7.92441 8V6.2ZM10.5752 8C11.5141 8 12.2752 7.23888 12.2752 6.3H10.4752C10.4752 6.24477 10.52 6.2 10.5752 6.2V8ZM8.8752 6.3C8.8752 7.23888 9.63631 8 10.5752 8V6.2C10.6304 6.2 10.6752 6.24477 10.6752 6.3H8.8752ZM10.5752 4.6C9.63631 4.6 8.8752 5.36112 8.8752 6.3H10.6752C10.6752 6.35523 10.6304 6.4 10.5752 6.4V4.6ZM12.2752 6.3C12.2752 5.36112 11.5141 4.6 10.5752 4.6V6.4C10.52 6.4 10.4752 6.35523 10.4752 6.3H12.2752Z" fill="black" mask="url(#path-1-inside-1)"/>
|
||||
<defs>
|
||||
<filter id="filter0_i" x="2" y="3" width="18" height="16.3718" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
|
||||
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 8.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 456 B After Width: | Height: | Size: 324 B |
@@ -1,21 +0,0 @@
|
||||
<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<mask id="path-1-inside-1" fill="white">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 3C2.89543 3 2 3.89543 2 5V17C2 18.1046 2.89543 19 4 19H18C19.1046 19 20 18.1046 20 17V5C20 3.89543 19.1046 3 18 3H4ZM6.1 6.3C6.1 6.74183 5.74183 7.1 5.3 7.1C4.85817 7.1 4.5 6.74183 4.5 6.3C4.5 5.85817 4.85817 5.5 5.3 5.5C5.74183 5.5 6.1 5.85817 6.1 6.3ZM13.5672 13.0861C13.2345 13.2556 12.8402 13.014 12.8402 12.6406V12.1006C12.8402 11.8244 12.6163 11.6006 12.3402 11.6006H10.2995C10.0233 11.6006 9.79945 11.3767 9.79945 11.1006V10.3406C9.79945 10.0644 10.0233 9.84058 10.2995 9.84058H12.3402C12.6163 9.84058 12.8402 9.61672 12.8402 9.34058V8.80065C12.8402 8.42728 13.2345 8.18563 13.5672 8.35515L17.3349 10.2751C17.6989 10.4606 17.6989 10.9806 17.3349 11.1661L13.5672 13.0861ZM8.43521 11.7051C8.76787 11.5356 9.16223 11.7772 9.16223 12.1506V12.6906C9.16223 12.9667 9.38609 13.1906 9.66223 13.1906H11.703C11.9791 13.1906 12.203 13.4145 12.203 13.6906V14.4506C12.203 14.7267 11.9791 14.9506 11.703 14.9506H9.66223C9.38609 14.9506 9.16223 15.1745 9.16223 15.4506V15.9905C9.16223 16.3639 8.76787 16.6055 8.43521 16.436L4.66751 14.516C4.30354 14.3306 4.30354 13.8105 4.66751 13.6251L8.43521 11.7051ZM7.92441 7.1C8.36624 7.1 8.72441 6.74183 8.72441 6.3C8.72441 5.85817 8.36624 5.5 7.92441 5.5C7.48259 5.5 7.12441 5.85817 7.12441 6.3C7.12441 6.74183 7.48259 7.1 7.92441 7.1ZM11.3752 6.3C11.3752 6.74183 11.017 7.1 10.5752 7.1C10.1334 7.1 9.7752 6.74183 9.7752 6.3C9.7752 5.85817 10.1334 5.5 10.5752 5.5C11.017 5.5 11.3752 5.85817 11.3752 6.3Z"/>
|
||||
</mask>
|
||||
<g filter="url(#filter0_i)">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 3C2.89543 3 2 3.89543 2 5V17C2 18.1046 2.89543 19 4 19H18C19.1046 19 20 18.1046 20 17V5C20 3.89543 19.1046 3 18 3H4ZM6.1 6.3C6.1 6.74183 5.74183 7.1 5.3 7.1C4.85817 7.1 4.5 6.74183 4.5 6.3C4.5 5.85817 4.85817 5.5 5.3 5.5C5.74183 5.5 6.1 5.85817 6.1 6.3ZM13.5672 13.0861C13.2345 13.2556 12.8402 13.014 12.8402 12.6406V12.1006C12.8402 11.8244 12.6163 11.6006 12.3402 11.6006H10.2995C10.0233 11.6006 9.79945 11.3767 9.79945 11.1006V10.3406C9.79945 10.0644 10.0233 9.84058 10.2995 9.84058H12.3402C12.6163 9.84058 12.8402 9.61672 12.8402 9.34058V8.80065C12.8402 8.42728 13.2345 8.18563 13.5672 8.35515L17.3349 10.2751C17.6989 10.4606 17.6989 10.9806 17.3349 11.1661L13.5672 13.0861ZM8.43521 11.7051C8.76787 11.5356 9.16223 11.7772 9.16223 12.1506V12.6906C9.16223 12.9667 9.38609 13.1906 9.66223 13.1906H11.703C11.9791 13.1906 12.203 13.4145 12.203 13.6906V14.4506C12.203 14.7267 11.9791 14.9506 11.703 14.9506H9.66223C9.38609 14.9506 9.16223 15.1745 9.16223 15.4506V15.9905C9.16223 16.3639 8.76787 16.6055 8.43521 16.436L4.66751 14.516C4.30354 14.3306 4.30354 13.8105 4.66751 13.6251L8.43521 11.7051ZM7.92441 7.1C8.36624 7.1 8.72441 6.74183 8.72441 6.3C8.72441 5.85817 8.36624 5.5 7.92441 5.5C7.48259 5.5 7.12441 5.85817 7.12441 6.3C7.12441 6.74183 7.48259 7.1 7.92441 7.1ZM11.3752 6.3C11.3752 6.74183 11.017 7.1 10.5752 7.1C10.1334 7.1 9.7752 6.74183 9.7752 6.3C9.7752 5.85817 10.1334 5.5 10.5752 5.5C11.017 5.5 11.3752 5.85817 11.3752 6.3Z" fill="black"/>
|
||||
</g>
|
||||
<path d="M13.5672 13.0861L13.9758 13.888L13.9758 13.888L13.5672 13.0861ZM13.5672 8.35515L13.1586 9.15704L13.1586 9.15704L13.5672 8.35515ZM17.3349 10.2751L17.7435 9.47325L17.7435 9.47325L17.3349 10.2751ZM17.3349 11.1661L17.7435 11.968L17.7435 11.968L17.3349 11.1661ZM8.43521 11.7051L8.84384 12.507L8.84385 12.507L8.43521 11.7051ZM8.43521 16.436L8.84385 15.6341L8.84385 15.6341L8.43521 16.436ZM4.66751 14.516L5.07615 13.7142L5.07615 13.7142L4.66751 14.516ZM4.66751 13.6251L5.07614 14.4269L5.07615 14.4269L4.66751 13.6251ZM2.9 5C2.9 4.39249 3.39249 3.9 4 3.9V2.1C2.39837 2.1 1.1 3.39837 1.1 5H2.9ZM2.9 17V5H1.1V17H2.9ZM4 18.1C3.39249 18.1 2.9 17.6075 2.9 17H1.1C1.1 18.6016 2.39837 19.9 4 19.9V18.1ZM18 18.1H4V19.9H18V18.1ZM19.1 17C19.1 17.6075 18.6075 18.1 18 18.1V19.9C19.6016 19.9 20.9 18.6016 20.9 17H19.1ZM19.1 5V17H20.9V5H19.1ZM18 3.9C18.6075 3.9 19.1 4.39249 19.1 5H20.9C20.9 3.39837 19.6016 2.1 18 2.1V3.9ZM4 3.9H18V2.1H4V3.9ZM5.3 8C6.23888 8 7 7.23888 7 6.3H5.2C5.2 6.24477 5.24477 6.2 5.3 6.2V8ZM3.6 6.3C3.6 7.23888 4.36112 8 5.3 8V6.2C5.35523 6.2 5.4 6.24477 5.4 6.3H3.6ZM5.3 4.6C4.36112 4.6 3.6 5.36112 3.6 6.3H5.4C5.4 6.35523 5.35523 6.4 5.3 6.4V4.6ZM7 6.3C7 5.36112 6.23888 4.6 5.3 4.6V6.4C5.24477 6.4 5.2 6.35523 5.2 6.3H7ZM11.9402 12.6406C11.9402 13.686 13.0444 14.3626 13.9758 13.888L13.1586 12.2842C13.4247 12.1486 13.7402 12.3419 13.7402 12.6406H11.9402ZM11.9402 12.1006V12.6406H13.7402V12.1006H11.9402ZM12.3402 12.5006C12.1193 12.5006 11.9402 12.3215 11.9402 12.1006H13.7402C13.7402 11.3274 13.1134 10.7006 12.3402 10.7006V12.5006ZM10.2995 12.5006H12.3402V10.7006H10.2995V12.5006ZM8.89945 11.1006C8.89945 11.8738 9.52626 12.5006 10.2995 12.5006V10.7006C10.5204 10.7006 10.6995 10.8797 10.6995 11.1006H8.89945ZM8.89945 10.3406V11.1006H10.6995V10.3406H8.89945ZM10.2995 8.94058C9.52626 8.94058 8.89945 9.56738 8.89945 10.3406H10.6995C10.6995 10.5615 10.5204 10.7406 10.2995 10.7406V8.94058ZM12.3402 8.94058H10.2995V10.7406H12.3402V8.94058ZM11.9402 9.34058C11.9402 9.11966 12.1193 8.94058 12.3402 8.94058V10.7406C13.1134 10.7406 13.7402 10.1138 13.7402 9.34058H11.9402ZM11.9402 8.80065V9.34058H13.7402V8.80065H11.9402ZM13.9758 7.55327C13.0444 7.07861 11.9402 7.75524 11.9402 8.80065H13.7402C13.7402 9.09933 13.4247 9.29266 13.1586 9.15704L13.9758 7.55327ZM17.7435 9.47325L13.9758 7.55327L13.1586 9.15704L16.9263 11.077L17.7435 9.47325ZM17.7435 11.968C18.7627 11.4487 18.7627 9.99259 17.7435 9.47325L16.9263 11.077C16.6351 10.9286 16.6351 10.5126 16.9263 10.3642L17.7435 11.968ZM13.9758 13.888L17.7435 11.968L16.9263 10.3642L13.1586 12.2842L13.9758 13.888ZM10.0622 12.1506C10.0622 11.1052 8.95802 10.4285 8.02658 10.9032L8.84385 12.507C8.57772 12.6426 8.26223 12.4493 8.26223 12.1506H10.0622ZM10.0622 12.6906V12.1506H8.26223V12.6906H10.0622ZM9.66223 12.2906C9.88315 12.2906 10.0622 12.4697 10.0622 12.6906H8.26223C8.26223 13.4638 8.88903 14.0906 9.66223 14.0906V12.2906ZM11.703 12.2906H9.66223V14.0906H11.703V12.2906ZM13.103 13.6906C13.103 12.9174 12.4762 12.2906 11.703 12.2906V14.0906C11.4821 14.0906 11.303 13.9115 11.303 13.6906H13.103ZM13.103 14.4506V13.6906H11.303V14.4506H13.103ZM11.703 15.8506C12.4762 15.8506 13.103 15.2238 13.103 14.4506H11.303C11.303 14.2297 11.4821 14.0506 11.703 14.0506V15.8506ZM9.66223 15.8506H11.703V14.0506H9.66223V15.8506ZM10.0622 15.4506C10.0622 15.6715 9.88314 15.8506 9.66223 15.8506V14.0506C8.88903 14.0506 8.26223 14.6774 8.26223 15.4506H10.0622ZM10.0622 15.9905V15.4506H8.26223V15.9905H10.0622ZM8.02658 17.2379C8.95803 17.7126 10.0622 17.0359 10.0622 15.9905H8.26223C8.26223 15.6918 8.57772 15.4985 8.84385 15.6341L8.02658 17.2379ZM4.25888 15.3179L8.02658 17.2379L8.84385 15.6341L5.07615 13.7142L4.25888 15.3179ZM4.25888 12.8232C3.23975 13.3425 3.23975 14.7986 4.25888 15.3179L5.07615 13.7142C5.36733 13.8625 5.36733 14.2786 5.07614 14.4269L4.25888 12.8232ZM8.02658 10.9032L4.25888 12.8232L5.07615 14.4269L8.84384 12.507L8.02658 10.9032ZM7.82441 6.3C7.82441 6.24477 7.86919 6.2 7.92441 6.2V8C8.8633 8 9.62441 7.23888 9.62441 6.3H7.82441ZM7.92441 6.4C7.86919 6.4 7.82441 6.35523 7.82441 6.3H9.62441C9.62441 5.36112 8.8633 4.6 7.92441 4.6V6.4ZM8.02441 6.3C8.02441 6.35523 7.97964 6.4 7.92441 6.4V4.6C6.98553 4.6 6.22441 5.36112 6.22441 6.3H8.02441ZM7.92441 6.2C7.97964 6.2 8.02441 6.24477 8.02441 6.3H6.22441C6.22441 7.23888 6.98553 8 7.92441 8V6.2ZM10.5752 8C11.5141 8 12.2752 7.23888 12.2752 6.3H10.4752C10.4752 6.24477 10.52 6.2 10.5752 6.2V8ZM8.8752 6.3C8.8752 7.23888 9.63631 8 10.5752 8V6.2C10.6304 6.2 10.6752 6.24477 10.6752 6.3H8.8752ZM10.5752 4.6C9.63631 4.6 8.8752 5.36112 8.8752 6.3H10.6752C10.6752 6.35523 10.6304 6.4 10.5752 6.4V4.6ZM12.2752 6.3C12.2752 5.36112 11.5141 4.6 10.5752 4.6V6.4C10.52 6.4 10.4752 6.35523 10.4752 6.3H12.2752Z" fill="black" mask="url(#path-1-inside-1)"/>
|
||||
<defs>
|
||||
<filter id="filter0_i" x="2" y="3" width="18" height="16.3718" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
|
||||
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
|
||||
<feOffset dy="0.371818"/>
|
||||
<feGaussianBlur stdDeviation="0.185909"/>
|
||||
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
|
||||
<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.2 0"/>
|
||||
<feBlend mode="normal" in2="shape" result="effect1_innerShadow"/>
|
||||
</filter>
|
||||
</defs>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 8.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 324 B After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.7 KiB |
+44
-29
@@ -80,6 +80,7 @@ class Preferences {
|
||||
"hideStatusIcons": "false",
|
||||
"startAtLogin": "true",
|
||||
"menubarIcon": MenubarIconPreference.outlined.indexAsString,
|
||||
"menubarIconShown": "true",
|
||||
"language": LanguagePreference.systemDefault.indexAsString,
|
||||
"blacklist": defaultBlacklist(),
|
||||
"updatePolicy": UpdatePolicyPreference.autoCheck.indexAsString,
|
||||
@@ -156,6 +157,7 @@ class Preferences {
|
||||
static var windowOrder: [WindowOrderPreference] { ["windowOrder", "windowOrder2", "windowOrder3", "windowOrder4", "windowOrder5"].map { UserDefaults.standard.macroPref($0, WindowOrderPreference.allCases) } }
|
||||
static var shortcutStyle: [ShortcutStylePreference] { ["shortcutStyle", "shortcutStyle2", "shortcutStyle3", "shortcutStyle4", "shortcutStyle5"].map { UserDefaults.standard.macroPref($0, ShortcutStylePreference.allCases) } }
|
||||
static var menubarIcon: MenubarIconPreference { UserDefaults.standard.macroPref("menubarIcon", MenubarIconPreference.allCases) }
|
||||
static var menubarIconShown: Bool { UserDefaults.standard.bool("menubarIconShown") }
|
||||
static var language: LanguagePreference { UserDefaults.standard.macroPref("language", LanguagePreference.allCases) }
|
||||
|
||||
static func initialize() {
|
||||
@@ -199,38 +201,42 @@ class Preferences {
|
||||
|
||||
static func migratePreferences() {
|
||||
let preferencesKey = "preferencesVersion"
|
||||
if let diskVersion = UserDefaults.standard.string(forKey: preferencesKey) {
|
||||
if diskVersion.compare(App.version, options: .numeric) == .orderedAscending {
|
||||
updateToNewPreferences(diskVersion)
|
||||
if let versionInPlist = UserDefaults.standard.string(forKey: preferencesKey) {
|
||||
if versionInPlist.compare(App.version, options: .numeric) != .orderedDescending {
|
||||
updateToNewPreferences(versionInPlist)
|
||||
}
|
||||
}
|
||||
UserDefaults.standard.set(App.version, forKey: preferencesKey)
|
||||
}
|
||||
|
||||
private static func updateToNewPreferences(_ currentVersion: String) {
|
||||
if currentVersion.compare("6.72.0", options: .numeric) != .orderedDescending {
|
||||
migratePreferencesIndexes()
|
||||
if currentVersion.compare("6.42.0", options: .numeric) != .orderedDescending {
|
||||
migrateBlacklists()
|
||||
if currentVersion.compare("6.28.1", options: .numeric) != .orderedDescending {
|
||||
migrateMinMaxWindowsWidthInRow()
|
||||
if currentVersion.compare("6.27.1", options: .numeric) != .orderedDescending {
|
||||
// "Start at login" new implem doesn't use Login Items; we remove the entry from previous versions
|
||||
(Preferences.self as AvoidDeprecationWarnings.Type).migrateLoginItem()
|
||||
if currentVersion.compare("6.23.0", options: .numeric) != .orderedDescending {
|
||||
// "Show windows from:" got the "Active Space" option removed
|
||||
migrateShowWindowsFrom()
|
||||
if currentVersion.compare("6.18.1", options: .numeric) != .orderedDescending {
|
||||
// nextWindowShortcut used to be able to have modifiers already present in holdShortcut; we remove these
|
||||
migrateNextWindowShortcuts()
|
||||
// dropdowns preferences used to store English text; now they store indexes
|
||||
migrateDropdownsFromTextToIndexes()
|
||||
// the "Hide menubar icon" checkbox was replaced with a dropdown of: icon1, icon2, hidden
|
||||
migrateMenubarIconFromCheckboxToDropdown()
|
||||
// "Show minimized/hidden/fullscreen windows" checkboxes were replaced with dropdowns
|
||||
migrateShowWindowsCheckboxToDropdown()
|
||||
// "Max size on screen" was split into max width and max height
|
||||
migrateMaxSizeOnScreenToWidthAndHeight()
|
||||
private static func updateToNewPreferences(_ versionInPlist: String) {
|
||||
// x.compare(y) is .orderedDescending if x > y
|
||||
if versionInPlist.compare("7.8.0", options: .numeric) != .orderedDescending {
|
||||
migrateMenubarIconWithNewShownToggle()
|
||||
if versionInPlist.compare("7.0.0", options: .numeric) != .orderedDescending {
|
||||
migratePreferencesIndexes()
|
||||
if versionInPlist.compare("6.43.0", options: .numeric) != .orderedDescending {
|
||||
migrateBlacklists()
|
||||
if versionInPlist.compare("6.28.1", options: .numeric) != .orderedDescending {
|
||||
migrateMinMaxWindowsWidthInRow()
|
||||
if versionInPlist.compare("6.27.1", options: .numeric) != .orderedDescending {
|
||||
// "Start at login" new implem doesn't use Login Items; we remove the entry from previous versions
|
||||
(Preferences.self as AvoidDeprecationWarnings.Type).migrateLoginItem()
|
||||
if versionInPlist.compare("6.23.0", options: .numeric) != .orderedDescending {
|
||||
// "Show windows from:" got the "Active Space" option removed
|
||||
migrateShowWindowsFrom()
|
||||
if versionInPlist.compare("6.18.1", options: .numeric) != .orderedDescending {
|
||||
// nextWindowShortcut used to be able to have modifiers already present in holdShortcut; we remove these
|
||||
migrateNextWindowShortcuts()
|
||||
// dropdowns preferences used to store English text; now they store indexes
|
||||
migrateDropdownsFromTextToIndexes()
|
||||
// the "Hide menubar icon" checkbox was replaced with a dropdown of: icon1, icon2, hidden
|
||||
migrateMenubarIconFromCheckboxToDropdown()
|
||||
// "Show minimized/hidden/fullscreen windows" checkboxes were replaced with dropdowns
|
||||
migrateShowWindowsCheckboxToDropdown()
|
||||
// "Max size on screen" was split into max width and max height
|
||||
migrateMaxSizeOnScreenToWidthAndHeight()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -239,6 +245,17 @@ class Preferences {
|
||||
}
|
||||
}
|
||||
|
||||
// we added the new menubarIconShown toggle. It replaces menubarIcon having value "3" which would hide the icon
|
||||
// there are now 2 preferences : menubarIconShown is a boolean, and menubarIcon has values 0, 1, 2
|
||||
private static func migrateMenubarIconWithNewShownToggle() {
|
||||
if let old = UserDefaults.standard.string(forKey: "menubarIcon") {
|
||||
if old == "3" {
|
||||
UserDefaults.standard.set("0", forKey: "menubarIcon")
|
||||
UserDefaults.standard.set("false", forKey: "menubarIconShown")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// we want to rely on preferences numbers to match the enum indexes. This migration realigns existing desyncs
|
||||
private static func migratePreferencesIndexes() {
|
||||
// migrate spacesToShow from 1 to 2. 1 was removed a while ago. 1=active => 2=>visible
|
||||
@@ -484,7 +501,6 @@ enum MenubarIconPreference: CaseIterable, MacroPreference {
|
||||
case outlined
|
||||
case filled
|
||||
case colored
|
||||
case hidden
|
||||
|
||||
var localizedString: LocalizedString {
|
||||
switch self {
|
||||
@@ -492,7 +508,6 @@ enum MenubarIconPreference: CaseIterable, MacroPreference {
|
||||
case .outlined: return " "
|
||||
case .filled: return " "
|
||||
case .colored: return " "
|
||||
case .hidden: return " "
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+9
-16
@@ -50,7 +50,6 @@ class Menubar {
|
||||
statusItem.target = self
|
||||
statusItem.button!.action = #selector(statusItemOnClick)
|
||||
statusItem.button!.sendAction(on: [.leftMouseDown, .rightMouseDown])
|
||||
menubarIconCallback(nil)
|
||||
}
|
||||
|
||||
// NSMenuItem.isHidden isn't reliable with custom views. We add/remove to hide/show these items
|
||||
@@ -75,30 +74,24 @@ class Menubar {
|
||||
}
|
||||
|
||||
static func menubarIconCallback(_: NSControl?) {
|
||||
if Preferences.menubarIcon == .hidden {
|
||||
statusItem.isVisible = false
|
||||
} else {
|
||||
if Preferences.menubarIconShown {
|
||||
loadPreferredIcon()
|
||||
} else {
|
||||
statusItem.isVisible = false
|
||||
}
|
||||
if let menubarIconDropdown = GeneralTab.menubarIconDropdown {
|
||||
menubarIconDropdown.isEnabled = Preferences.menubarIconShown
|
||||
}
|
||||
}
|
||||
|
||||
static private func loadPreferredIcon() {
|
||||
let i = imageIndexFromPreference()
|
||||
let image = NSImage(named: "menubar-" + i)!
|
||||
image.isTemplate = i == "3" ? false : true
|
||||
let i = Preferences.menubarIcon.indexAsString
|
||||
let image = NSImage(named: "menubar-\(i)")!
|
||||
image.isTemplate = i != "2"
|
||||
statusItem.button!.image = image
|
||||
statusItem.isVisible = true
|
||||
statusItem.button!.imageScaling = .scaleProportionallyUpOrDown
|
||||
}
|
||||
|
||||
static private func imageIndexFromPreference() -> String {
|
||||
switch Preferences.menubarIcon {
|
||||
case .outlined: return "1"
|
||||
case .filled: return "2"
|
||||
case .colored: return "3"
|
||||
default: return "4"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class PermissionCallout: StackView {
|
||||
|
||||
@@ -115,7 +115,7 @@ class LabelAndControl: NSObject {
|
||||
return views
|
||||
}
|
||||
|
||||
static func makeSwitch(_ rawName: String, extraAction: ActionClosure? = nil) -> NSControl {
|
||||
static func makeSwitch(_ rawName: String, extraAction: ActionClosure? = nil) -> Switch {
|
||||
let button = Switch(UserDefaults.standard.bool(rawName))
|
||||
_ = setupControl(button, rawName, extraAction: extraAction)
|
||||
return button
|
||||
|
||||
@@ -18,31 +18,37 @@ class GeneralTab {
|
||||
// efficient but more precise behavior and not be coalesced with other timers.
|
||||
"LegacyTimers": true,
|
||||
]
|
||||
static var menubarIconDropdown: NSPopUpButton?
|
||||
private static var menubarIsVisibleObserver: NSKeyValueObservation?
|
||||
|
||||
static func initTab() -> NSView {
|
||||
let startAtLogin = TableGroupView.Row(leftTitle: NSLocalizedString("Start at login", comment: ""),
|
||||
rightViews: [LabelAndControl.makeSwitch("startAtLogin", extraAction: startAtLoginCallback)])
|
||||
menubarIconDropdown = LabelAndControl.makeDropdown("menubarIcon", MenubarIconPreference.allCases, extraAction: Menubar.menubarIconCallback)
|
||||
let menuIconShownToggle = LabelAndControl.makeSwitch("menubarIconShown", extraAction: Menubar.menubarIconCallback)
|
||||
let menubarIcon = TableGroupView.Row(leftTitle: NSLocalizedString("Menubar icon", comment: ""),
|
||||
rightViews: [LabelAndControl.makeDropdown("menubarIcon", MenubarIconPreference.allCases, extraAction: Menubar.menubarIconCallback)])
|
||||
rightViews: [
|
||||
menubarIconDropdown!,
|
||||
menuIconShownToggle,
|
||||
])
|
||||
let language = TableGroupView.Row(leftTitle: NSLocalizedString("Language", comment: ""),
|
||||
rightViews: [LabelAndControl.makeDropdown("language", LanguagePreference.allCases, extraAction: setLanguageCallback)])
|
||||
let resetPreferences = NSButton(title: NSLocalizedString("Reset preferences and restart…", comment: ""), target: self, action: #selector(GeneralTab.resetPreferences))
|
||||
if #available(macOS 11.0, *) { resetPreferences.hasDestructiveAction = true }
|
||||
let menubarIconDropdown = menubarIcon.rightViews[0] as! NSPopUpButton
|
||||
for i in 0...2 {
|
||||
let image = NSImage.initCopy("menubar-" + String(i + 1))
|
||||
for i in 0..<MenubarIconPreference.allCases.count {
|
||||
let image = NSImage.initCopy("menubar-\(i)")
|
||||
image.isTemplate = i < 2
|
||||
menubarIconDropdown.item(at: i)!.image = image
|
||||
menubarIconDropdown!.item(at: i)!.image = image
|
||||
}
|
||||
menubarIconDropdown.item(at: 3)!.image = NSImage(size: NSSize(width: 1, height: menubarIconDropdown.item(at: 0)!.image!.size.height))
|
||||
let cell = menubarIconDropdown.cell! as! NSPopUpButtonCell
|
||||
let cell = menubarIconDropdown!.cell! as! NSPopUpButtonCell
|
||||
cell.bezelStyle = .regularSquare
|
||||
cell.arrowPosition = .arrowAtBottom
|
||||
cell.imagePosition = .imageOverlaps
|
||||
|
||||
startAtLoginCallback(startAtLogin.rightViews[0] as! NSControl)
|
||||
enableDraggingOffMenubarIcon(menubarIconDropdown)
|
||||
|
||||
Menubar.menubarIconCallback(nil)
|
||||
enableDraggingOffMenubarIcon(menuIconShownToggle)
|
||||
|
||||
let table = TableGroupView(width: PreferencesWindow.width)
|
||||
table.addRow(startAtLogin)
|
||||
@@ -56,13 +62,12 @@ class GeneralTab {
|
||||
return view
|
||||
}
|
||||
|
||||
private static func enableDraggingOffMenubarIcon(_ menubarIconDropdown: NSPopUpButton) {
|
||||
private static func enableDraggingOffMenubarIcon(_ menuIconShownToggle: Switch) {
|
||||
Menubar.statusItem.behavior = .removalAllowed
|
||||
menubarIsVisibleObserver = Menubar.statusItem.observe(\.isVisible, options: [.old, .new]) { _, change in
|
||||
if change.oldValue == true && change.newValue == false {
|
||||
let hiddenIndex = MenubarIconPreference.hidden.index
|
||||
menubarIconDropdown.selectItem(at: hiddenIndex)
|
||||
LabelAndControl.controlWasChanged(menubarIconDropdown, "menubarIcon")
|
||||
menuIconShownToggle.state = .off
|
||||
LabelAndControl.controlWasChanged(menuIconShownToggle, nil)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user