diff --git a/Podfile b/Podfile index 4e8a11de..aa542b0b 100644 --- a/Podfile +++ b/Podfile @@ -7,8 +7,4 @@ target 'alt-tab-macos' do pod 'ShortcutRecorder', :git => 'https://github.com/Kentzo/ShortcutRecorder.git', :commit => 'f718220854575bad86fa89dd2bb3decd0b14b2b0' pod 'SwiftyMarkdown', '1.1.0' pod 'Preferences', '1.0.1' - - post_install do |installer| - system('scripts/update_acknowledgments.sh') - end end diff --git a/Podfile.lock b/Podfile.lock index b65b2f14..17c41bb6 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -42,6 +42,6 @@ SPEC CHECKSUMS: Sparkle: ea073ba9c69cee3ebaab8685ba1e732e14d249f7 SwiftyMarkdown: 033abc9dad9a37903f81aec5188cade436f40520 -PODFILE CHECKSUM: e7011f43849744a924e7df7735fb8dfabeb15628 +PODFILE CHECKSUM: ccd8822c0e64188b9aaf554188c72ef13a7c81f4 COCOAPODS: 1.9.1 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index b65b2f14..17c41bb6 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -42,6 +42,6 @@ SPEC CHECKSUMS: Sparkle: ea073ba9c69cee3ebaab8685ba1e732e14d249f7 SwiftyMarkdown: 033abc9dad9a37903f81aec5188cade436f40520 -PODFILE CHECKSUM: e7011f43849744a924e7df7735fb8dfabeb15628 +PODFILE CHECKSUM: ccd8822c0e64188b9aaf554188c72ef13a7c81f4 COCOAPODS: 1.9.1 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index ddba396f..e112f18c 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -23,7 +23,6 @@ 020E098C253F02CF5A2F89A505CA37EE /* nl.lproj in Resources */ = {isa = PBXBuildFile; fileRef = B21676942A82066A5F890982D52AF601 /* nl.lproj */; }; 052DFF48B54864D445EC884543F61EA8 /* Preferences-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BEECA2C7DA4B21D9E8EDAC9D1A93589 /* Preferences-dummy.m */; }; 056DD70A6AF75515312A3B0F3D08A6A7 /* ru.lproj in Resources */ = {isa = PBXBuildFile; fileRef = C53D764C43A51376171AD41E99B8ABE2 /* ru.lproj */; }; - 065C38D92B6E03C9C6D50A9A2BA623A8 /* Pods-alt-tab-macos-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A50F71AC7B7C29C8922102AA39EFE0C /* Pods-alt-tab-macos-dummy.m */; }; 09F6953D0A355AEEDD4DE40E8FD483B6 /* PFMoveApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F2F3145B49D9DB3BAE51E8B7A3930F8 /* PFMoveApplication.h */; settings = {ATTRIBUTES = (Public, ); }; }; 0A1237C0C6C64DAE78E6F4CD771CA4B0 /* da.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 70A6FDD9C55154B728466D71B09FA6C8 /* da.lproj */; }; 0EC5CD27183E62F0F15E6A3F73BA4E78 /* pt.lproj in Resources */ = {isa = PBXBuildFile; fileRef = A26EF044A853930BC884BE7CA27C0709 /* pt.lproj */; }; @@ -54,6 +53,7 @@ 500A10E28FCAAFB0A968CCED417B3275 /* pt_BR.lproj in Resources */ = {isa = PBXBuildFile; fileRef = C9C45730F9EB9F5D8FA6191C6BE61F9B /* pt_BR.lproj */; }; 568560CA36FE09111F664C6BBA404742 /* zh_TW.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 60EF6FF60A94EF54E652E091F59466F8 /* zh_TW.lproj */; }; 5B317668F69ADABCAD5AE47A1CE39D69 /* sk.lproj in Resources */ = {isa = PBXBuildFile; fileRef = CEFC61EA791D4A6418CCFBE1787D6659 /* sk.lproj */; }; + 5B56114FA0E0C817FA294C155CB4E20D /* Pods-alt-tab-macos-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A50F71AC7B7C29C8922102AA39EFE0C /* Pods-alt-tab-macos-dummy.m */; }; 5C51919BE3EF096A7D986B57A51AB0D0 /* SRKeyEquivalentTransformer.h in Headers */ = {isa = PBXBuildFile; fileRef = E3FC5D75A84499105F55009A04A10DD7 /* SRKeyEquivalentTransformer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5E615985AE6C7D5B9238F364549E9677 /* LetsMove-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = CFCC52DA333A8C35C6991FC1CD3DF26E /* LetsMove-dummy.m */; }; 5EC2F2D2F2DF932A3F9E94B95287E797 /* SRShortcut.m in Sources */ = {isa = PBXBuildFile; fileRef = 9315798BAC6D65C43AF979A33F184D6B /* SRShortcut.m */; }; @@ -81,6 +81,7 @@ 890BDCB72A2DE7D73FE21F8DCDE993B1 /* String+SwiftyMarkdown.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3CF45DBF333E311734EDC683223961D /* String+SwiftyMarkdown.swift */; }; 8999CEBAA3A313F1C8544DC1D581B339 /* cs.lproj in Resources */ = {isa = PBXBuildFile; fileRef = E0FB4CDE9491FC1C156B7325AE1D8857 /* cs.lproj */; }; 8C500482DF0DA821FBFD71A84CD466AD /* ko.lproj in Resources */ = {isa = PBXBuildFile; fileRef = EC118EC31AD795CC3304602F21EF2540 /* ko.lproj */; }; + 8F1D782BD8C586C96505E49EEC60BA36 /* Pods-alt-tab-macos-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 9398EB710E40217E35064D9686CCAD21 /* Pods-alt-tab-macos-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8FA35CBA2D53AA65111A9BB84328D8EA /* ShortcutRecorder-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 389D17F51E74ECE6DD3DD97BB7BFC5EC /* ShortcutRecorder-dummy.m */; }; 9620CFD7DD4876E61B96B0159377215C /* ToolbarItemStyleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD9C32777111FCAC14F8E11E1CA40BBB /* ToolbarItemStyleViewController.swift */; }; 985F94722BB2E4A7E884FC402B0B449E /* zh-Hant.lproj in Resources */ = {isa = PBXBuildFile; fileRef = DDCD54AC8BC1D62563C3CB60675A4D26 /* zh-Hant.lproj */; }; @@ -88,7 +89,6 @@ 9B1015EC076147887BA26E2AE160FEF9 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3A5CD5AFD55E86C5D69812AE01A9770 /* Cocoa.framework */; }; 9C725C84B6B0BD6649A2D7CCA3E08FAA /* SwiftyTokeniser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F88F8E80B146D48943BB77C74278C42 /* SwiftyTokeniser.swift */; }; 9D07D75F7C84943BDCE3ABC491CD59D1 /* LetsMove.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DCA1A0D659A7387F595FB5B43D5372C /* LetsMove.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 9E4AB6B87FD57669459AE37396650093 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3A5CD5AFD55E86C5D69812AE01A9770 /* Cocoa.framework */; }; A2CC1A84A9C146A91EF5B68270D0F06C /* de.lproj in Resources */ = {isa = PBXBuildFile; fileRef = DD6AFCD8B457CF70372B8514509C413F /* de.lproj */; }; A2FCC58CB9470201B66FE93E38C2EEBC /* ShortcutRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 873F3E775BAC8098A237A45C06412D91 /* ShortcutRecorder.h */; settings = {ATTRIBUTES = (Public, ); }; }; A46ABA2611D41C8A890D2DF31B4B2504 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3A5CD5AFD55E86C5D69812AE01A9770 /* Cocoa.framework */; }; @@ -96,7 +96,6 @@ A515F0D69E74E71489364F47E1A5513E /* SRModifierFlagsTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 95829DA5F921A137F1F6E2628BA30082 /* SRModifierFlagsTransformer.m */; }; A6543098065FB7C29E24719462ED3CD1 /* UserInteractionPausableWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FF2FDF50A2FD567398771682B97B897 /* UserInteractionPausableWindow.swift */; }; A6C76F2FFFDCF82636C355053430B94D /* ShortcutRecorder-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 6DD1EDE447D15CF5739FA2D077648FC9 /* ShortcutRecorder-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - AB289F194B3CDC80E30BBAF51BFF5E7F /* Pods-alt-tab-macos-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 9398EB710E40217E35064D9686CCAD21 /* Pods-alt-tab-macos-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; AB986179D17EE4638FF869F4B77A08CC /* SRShortcutController.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8BCD816EFD85C046AE89262528583B /* SRShortcutController.h */; settings = {ATTRIBUTES = (Public, ); }; }; AECE89CE5364011E4C71F28D0F0531E6 /* de.lproj in Resources */ = {isa = PBXBuildFile; fileRef = D3F6CAE71B6E9F84B78E07936CBB97C1 /* de.lproj */; }; B125766C333F5D75F1B730C08219F4D9 /* SwiftyMarkdown-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 724F9C6739A2F8BA2CAF538B928201E0 /* SwiftyMarkdown-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -128,44 +127,45 @@ F87380A0F9BFC6970A7E72F4F7A2209D /* ko.lproj in Resources */ = {isa = PBXBuildFile; fileRef = E624C4D4700EB7DE413A83FBB83B005E /* ko.lproj */; }; F8DD35F2A601BAF61B1EA1EA92531663 /* SwiftyMarkdown+iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66B2E269BB4DE600FF5BD4EE9C0AA41 /* SwiftyMarkdown+iOS.swift */; }; FD50D88AF2AB7692F630B7E45B38603E /* sv.lproj in Resources */ = {isa = PBXBuildFile; fileRef = BD8644D140BA89A0A856EC194645F193 /* sv.lproj */; }; + FE5376EB3549F3491ABE070761324AD9 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3A5CD5AFD55E86C5D69812AE01A9770 /* Cocoa.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 410061BAE7EDE480E76AC8475CE707C5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; - proxyType = 1; - remoteGlobalIDString = D94AE99BF0C9025247C40F440DC9DB50; - remoteInfo = ShortcutRecorder; - }; - 88BA29EC06F72FC0B53D452FE24EF6FF /* PBXContainerItemProxy */ = { + 0CCA584C587AEA50E28D24E7599DE7BC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; remoteGlobalIDString = F83960005EA88D0C24A1D277DD0E8667; remoteInfo = LetsMove; }; - A16D43FE9ED0B42859F78A6F9E5A5BC8 /* PBXContainerItemProxy */ = { + 6CE1104FD951FBFE360AB3895E710ABB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; remoteGlobalIDString = 93523582DEC251A9E59F621510B882C3; remoteInfo = SwiftyMarkdown; }; - C37A12F2E7DECBEBE22BD90BAB87EC71 /* PBXContainerItemProxy */ = { + C09E3715D3ED68E8A130C3E458C69ADF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; - remoteGlobalIDString = ED77B4B88587C894E85C361023D67C53; - remoteInfo = Sparkle; + remoteGlobalIDString = D94AE99BF0C9025247C40F440DC9DB50; + remoteInfo = ShortcutRecorder; }; - EED0AC4A25C19A9E18116CFDBC4B7CD8 /* PBXContainerItemProxy */ = { + CDD5E7DB19D441ACE862E1D07C47EFFA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; remoteGlobalIDString = 080990A33C8E049DC557762B0B4240DB; remoteInfo = Preferences; }; + E63A1D71551B560E3990A4EA6424D7C9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; + proxyType = 1; + remoteGlobalIDString = ED77B4B88587C894E85C361023D67C53; + remoteInfo = Sparkle; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -331,14 +331,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 0FF7E8ACE6A07BF9AF24F9EDAF02FB42 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 9E4AB6B87FD57669459AE37396650093 /* Cocoa.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4E8C90F2E82BFDE64B2BAF44FF953C33 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -364,6 +356,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + A12BB3AE73E36B766602C6F87DE12500 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + FE5376EB3549F3491ABE070761324AD9 /* Cocoa.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; C56772F8A8A35AE7A577E131EA84D541 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -744,11 +744,11 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 51E44F5542524808F0A1E9BF1A4A09E3 /* Headers */ = { + 6DC6E73AC74DB7C25774F8832DBFF2B4 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - AB289F194B3CDC80E30BBAF51BFF5E7F /* Pods-alt-tab-macos-umbrella.h in Headers */, + 8F1D782BD8C586C96505E49EEC60BA36 /* Pods-alt-tab-macos-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -821,21 +821,21 @@ }; DA8AE0681767D7A898B5697F983F9881 /* Pods-alt-tab-macos */ = { isa = PBXNativeTarget; - buildConfigurationList = 7ED58B90454ECAFD10715DC2B0BE4987 /* Build configuration list for PBXNativeTarget "Pods-alt-tab-macos" */; + buildConfigurationList = 15DE95FC3B2FB559AB4180FE0147D1B8 /* Build configuration list for PBXNativeTarget "Pods-alt-tab-macos" */; buildPhases = ( - 51E44F5542524808F0A1E9BF1A4A09E3 /* Headers */, - 8B5707E4E14A070B8551B8C82274CF16 /* Sources */, - 0FF7E8ACE6A07BF9AF24F9EDAF02FB42 /* Frameworks */, - BC34D312F3C69A039569ED445E2D49B4 /* Resources */, + 6DC6E73AC74DB7C25774F8832DBFF2B4 /* Headers */, + ADCC4411F6C24402B50570FD741C3BDA /* Sources */, + A12BB3AE73E36B766602C6F87DE12500 /* Frameworks */, + BD18399B11166ED23480931101DB2F69 /* Resources */, ); buildRules = ( ); dependencies = ( - F11DA15E5CDC561582A79B426F5718C3 /* PBXTargetDependency */, - 0CD773D9F4327BB17CCEA7229426248D /* PBXTargetDependency */, - 86027A29851AD1A30F11320DF3B2CCFB /* PBXTargetDependency */, - 59AC954D1CEE7E59F9C62173905EB20B /* PBXTargetDependency */, - 5F66D4B7CCAAE9F48ABA6B7232ED0A07 /* PBXTargetDependency */, + D5BF66ED31D0F837D5A7C5846398214B /* PBXTargetDependency */, + FB95C821DDEE4569E2D3E52EEA5EED2D /* PBXTargetDependency */, + 36B476683688B8A3429A19B2C4715E8A /* PBXTargetDependency */, + 89D637AD43FFD98B7A0DEDED2C65C627 /* PBXTargetDependency */, + 495B1B06F081A4C076783DF48FB4A013 /* PBXTargetDependency */, ); name = "Pods-alt-tab-macos"; productName = "Pods-alt-tab-macos"; @@ -923,7 +923,7 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - BC34D312F3C69A039569ED445E2D49B4 /* Resources */ = { + BD18399B11166ED23480931101DB2F69 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -1019,14 +1019,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 8B5707E4E14A070B8551B8C82274CF16 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 065C38D92B6E03C9C6D50A9A2BA623A8 /* Pods-alt-tab-macos-dummy.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 96FD95D4278368B7BE939B853925C9F0 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1048,38 +1040,46 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + ADCC4411F6C24402B50570FD741C3BDA /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5B56114FA0E0C817FA294C155CB4E20D /* Pods-alt-tab-macos-dummy.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 0CD773D9F4327BB17CCEA7229426248D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Preferences; - target = 080990A33C8E049DC557762B0B4240DB /* Preferences */; - targetProxy = EED0AC4A25C19A9E18116CFDBC4B7CD8 /* PBXContainerItemProxy */; - }; - 59AC954D1CEE7E59F9C62173905EB20B /* PBXTargetDependency */ = { + 36B476683688B8A3429A19B2C4715E8A /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = Sparkle; - target = ED77B4B88587C894E85C361023D67C53 /* Sparkle */; - targetProxy = C37A12F2E7DECBEBE22BD90BAB87EC71 /* PBXContainerItemProxy */; + name = ShortcutRecorder; + target = D94AE99BF0C9025247C40F440DC9DB50 /* ShortcutRecorder */; + targetProxy = C09E3715D3ED68E8A130C3E458C69ADF /* PBXContainerItemProxy */; }; - 5F66D4B7CCAAE9F48ABA6B7232ED0A07 /* PBXTargetDependency */ = { + 495B1B06F081A4C076783DF48FB4A013 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = SwiftyMarkdown; target = 93523582DEC251A9E59F621510B882C3 /* SwiftyMarkdown */; - targetProxy = A16D43FE9ED0B42859F78A6F9E5A5BC8 /* PBXContainerItemProxy */; + targetProxy = 6CE1104FD951FBFE360AB3895E710ABB /* PBXContainerItemProxy */; }; - 86027A29851AD1A30F11320DF3B2CCFB /* PBXTargetDependency */ = { + 89D637AD43FFD98B7A0DEDED2C65C627 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = ShortcutRecorder; - target = D94AE99BF0C9025247C40F440DC9DB50 /* ShortcutRecorder */; - targetProxy = 410061BAE7EDE480E76AC8475CE707C5 /* PBXContainerItemProxy */; + name = Sparkle; + target = ED77B4B88587C894E85C361023D67C53 /* Sparkle */; + targetProxy = E63A1D71551B560E3990A4EA6424D7C9 /* PBXContainerItemProxy */; }; - F11DA15E5CDC561582A79B426F5718C3 /* PBXTargetDependency */ = { + D5BF66ED31D0F837D5A7C5846398214B /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = LetsMove; target = F83960005EA88D0C24A1D277DD0E8667 /* LetsMove */; - targetProxy = 88BA29EC06F72FC0B53D452FE24EF6FF /* PBXContainerItemProxy */; + targetProxy = 0CCA584C587AEA50E28D24E7599DE7BC /* PBXContainerItemProxy */; + }; + FB95C821DDEE4569E2D3E52EEA5EED2D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Preferences; + target = 080990A33C8E049DC557762B0B4240DB /* Preferences */; + targetProxy = CDD5E7DB19D441ACE862E1D07C47EFFA /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1260,6 +1260,42 @@ }; name = Release; }; + 5A56A1D8DBF667DEABBFC341EE436893 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7475BBC3CE1397DCE052D215F2D73234 /* Pods-alt-tab-macos.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_OBJC_WEAK = NO; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = "Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.12; + MODULEMAP_FILE = "Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; 816C679D58750316935F7386A438309D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1358,42 +1394,6 @@ }; name = Debug; }; - 8987C8DF0738315BDEB2127909587175 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = DCA0A6B74F3699962F44535ACC0B5945 /* Pods-alt-tab-macos.debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_ENABLE_OBJC_WEAK = NO; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = "Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MACOSX_DEPLOYMENT_TARGET = 10.12; - MODULEMAP_FILE = "Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; A8142E01EDFD8D2A43D470D404D97B7A /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 73FB426CEB2A10C50A4DEEED7CB5BFFC /* ShortcutRecorder.release.xcconfig */; @@ -1476,11 +1476,10 @@ }; name = Debug; }; - E3A6532BF07F8C7997A4964E040F0640 /* Release */ = { + EF04CAF450752F3FC331757CB84767C4 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7475BBC3CE1397DCE052D215F2D73234 /* Pods-alt-tab-macos.release.xcconfig */; + baseConfigurationReference = 6A62C708622A3ECB9ED597AD909FA362 /* SwiftyMarkdown.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_IDENTITY = ""; @@ -1494,27 +1493,26 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; - INFOPLIST_FILE = "Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos-Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/SwiftyMarkdown/SwiftyMarkdown-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/SwiftyMarkdown/SwiftyMarkdown-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.12; - MODULEMAP_FILE = "Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + MODULEMAP_FILE = "Target Support Files/SwiftyMarkdown/SwiftyMarkdown.modulemap"; + PRODUCT_MODULE_NAME = SwiftyMarkdown; + PRODUCT_NAME = SwiftyMarkdown; SDKROOT = macosx; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - EF04CAF450752F3FC331757CB84767C4 /* Release */ = { + F1272D81B263A77EA098E6440A4649D4 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6A62C708622A3ECB9ED597AD909FA362 /* SwiftyMarkdown.release.xcconfig */; + baseConfigurationReference = 5C2151969666D5447B77FC0B6C7DBAB2 /* ShortcutRecorder.debug.xcconfig */; buildSettings = { ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_OBJC_WEAK = NO; @@ -1529,14 +1527,14 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; - GCC_PREFIX_HEADER = "Target Support Files/SwiftyMarkdown/SwiftyMarkdown-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/SwiftyMarkdown/SwiftyMarkdown-Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/ShortcutRecorder/ShortcutRecorder-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/ShortcutRecorder/ShortcutRecorder-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.12; - MODULEMAP_FILE = "Target Support Files/SwiftyMarkdown/SwiftyMarkdown.modulemap"; - PRODUCT_MODULE_NAME = SwiftyMarkdown; - PRODUCT_NAME = SwiftyMarkdown; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MODULEMAP_FILE = "Target Support Files/ShortcutRecorder/ShortcutRecorder.modulemap"; + PRODUCT_MODULE_NAME = ShortcutRecorder; + PRODUCT_NAME = ShortcutRecorder; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; @@ -1544,12 +1542,13 @@ VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - F1272D81B263A77EA098E6440A4649D4 /* Debug */ = { + FA8A263C40CD32501AD35E0D166E23C2 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5C2151969666D5447B77FC0B6C7DBAB2 /* ShortcutRecorder.debug.xcconfig */; + baseConfigurationReference = DCA0A6B74F3699962F44535ACC0B5945 /* Pods-alt-tab-macos.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_IDENTITY = ""; @@ -1563,18 +1562,19 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; - GCC_PREFIX_HEADER = "Target Support Files/ShortcutRecorder/ShortcutRecorder-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/ShortcutRecorder/ShortcutRecorder-Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.11; - MODULEMAP_FILE = "Target Support Files/ShortcutRecorder/ShortcutRecorder.modulemap"; - PRODUCT_MODULE_NAME = ShortcutRecorder; - PRODUCT_NAME = ShortcutRecorder; + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.12; + MODULEMAP_FILE = "Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1592,6 +1592,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 15DE95FC3B2FB559AB4180FE0147D1B8 /* Build configuration list for PBXNativeTarget "Pods-alt-tab-macos" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + FA8A263C40CD32501AD35E0D166E23C2 /* Debug */, + 5A56A1D8DBF667DEABBFC341EE436893 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 2C8D06A2289713323892B3638F08AC0B /* Build configuration list for PBXAggregateTarget "Sparkle" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1637,15 +1646,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7ED58B90454ECAFD10715DC2B0BE4987 /* Build configuration list for PBXNativeTarget "Pods-alt-tab-macos" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8987C8DF0738315BDEB2127909587175 /* Debug */, - E3A6532BF07F8C7997A4964E040F0640 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = BFDFE7DC352907FC980B868725387E98 /* Project object */; diff --git a/alt-tab-macos.xcodeproj/project.pbxproj b/alt-tab-macos.xcodeproj/project.pbxproj index 406aa506..06317bc6 100644 --- a/alt-tab-macos.xcodeproj/project.pbxproj +++ b/alt-tab-macos.xcodeproj/project.pbxproj @@ -39,6 +39,7 @@ D04BA4575B13F1A148C108E2 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BA459B8804ABFBDA50663 /* InfoPlist.strings */; }; D04BA48B00B4211A465C7337 /* DebugProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BACABD048E62EBE4576CC /* DebugProfile.swift */; }; D04BA4A11F821548EE3C5E95 /* Bash.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BA514F1C4B475B3CA6EB6 /* Bash.swift */; }; + D04BA530F00E5989D66C6A1F /* Contributors.md in Resources */ = {isa = PBXBuildFile; fileRef = D04BA812B8DCB915B8F4B915 /* Contributors.md */; }; D04BA5863E8AD08C36B52F80 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BAC86E60B1B850059BC54 /* Localizable.strings */; }; D04BA6187A91A847844B6ABB /* Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BA015A45DE7AFDC9794FE /* Window.swift */; }; D04BA69012A483201B375D46 /* Acknowledgments.md in Resources */ = {isa = PBXBuildFile; fileRef = D04BAADF01EB8FF8A15AECC6 /* Acknowledgments.md */; }; @@ -130,7 +131,6 @@ D04BA2E723062A1DAC58618F /* setup_ci_pr.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = setup_ci_pr.sh; sourceTree = ""; }; D04BA2E8D5D5CC23456BC8F7 /* tr */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = tr; path = Localizable.strings; sourceTree = ""; }; D04BA32F25860B686DFE818A /* 3 windows - 1 line.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "3 windows - 1 line.jpg"; sourceTree = ""; }; - D04BA332D13755B53E86D550 /* update_acknowledgments.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = update_acknowledgments.sh; sourceTree = ""; }; D04BA3632A2EB5C64A3FEE59 /* hu */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = hu; path = InfoPlist.strings; sourceTree = ""; }; D04BA369B4D9FD6A13936F53 /* bare.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = bare.html; sourceTree = ""; }; D04BA399F1DF2C61FC2C9599 /* menubar-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menubar-icon@2x.png"; sourceTree = ""; }; @@ -590,7 +590,6 @@ D04BAA5ECAE8BB8F8656DEDF /* update_contributors.sh */, D04BAD65AA870A49D2F89DBC /* ensure_generated_files_are_up_to_date.sh */, D04BA4D5DF349429527824A2 /* determine_version.sh */, - D04BA332D13755B53E86D550 /* update_acknowledgments.sh */, D04BAAE6E6823304D66B74F8 /* update_website.sh */, D04BA7A758026814667273DC /* convert_iconset_to_icns.sh */, ); @@ -929,6 +928,7 @@ D04BAAB5C4E78AE375EA7D3C /* Localizable.strings in Resources */, D04BAC463D66BB8E19CF8E2E /* InfoPlist.strings in Resources */, D04BA7B9421871EDBD58F4E3 /* Localizable.strings in Resources */, + D04BA530F00E5989D66C6A1F /* Contributors.md in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/docs/Acknowledgments.md b/docs/Acknowledgments.md index 3008bb71..a5326883 100644 --- a/docs/Acknowledgments.md +++ b/docs/Acknowledgments.md @@ -1,449 +1,18 @@ # Acknowledgments -This application makes use of the following third party libraries: +These third-party libraries are used: -## Preferences +**Preferences** +[Website](https://github.com/sindresorhus/Preferences) - [MIT License](https://github.com/sindresorhus/Preferences/blob/master/license) -MIT License +**ShortcutRecorder** +[Website](https://github.com/Kentzo/ShortcutRecorder) - [CC 4.0 license](https://github.com/Kentzo/ShortcutRecorder/blob/master/LICENSE.txt) -Copyright (c) Sindre Sorhus (sindresorhus.com) +**Sparkle** +[Website](https://github.com/sparkle-project/Sparkle) - [License](https://github.com/sparkle-project/Sparkle/blob/master/LICENSE) -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: +**SwiftyMarkdown** +[Website](https://github.com/SimonFairbairn/SwiftyMarkdown) - [MIT License](https://github.com/SimonFairbairn/SwiftyMarkdown/blob/master/LICENSE) -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -## ShortcutRecorder - -Creative Commons Attribution 4.0 International Public License - -By exercising the Licensed Rights (defined below), You accept and agree -to be bound by the terms and conditions of this Creative Commons -Attribution 4.0 International Public License ("Public License"). To the -extent this Public License may be interpreted as a contract, You are -granted the Licensed Rights in consideration of Your acceptance of -these terms and conditions, and the Licensor grants You such rights in -consideration of benefits the Licensor receives from making the -Licensed Material available under these terms and conditions. - -Section 1 -- Definitions. - - a. Adapted Material means material subject to Copyright and Similar - Rights that is derived from or based upon the Licensed Material - and in which the Licensed Material is translated, altered, - arranged, transformed, or otherwise modified in a manner requiring - permission under the Copyright and Similar Rights held by the - Licensor. For purposes of this Public License, where the Licensed - Material is a musical work, performance, or sound recording, - Adapted Material is always produced where the Licensed Material is - synched in timed relation with a moving image. - - b. Adapter's License means the license You apply to Your Copyright - and Similar Rights in Your contributions to Adapted Material in - accordance with the terms and conditions of this Public License. - - c. Copyright and Similar Rights means copyright and/or similar rights - closely related to copyright including, without limitation, - performance, broadcast, sound recording, and Sui Generis Database - Rights, without regard to how the rights are labeled or - categorized. For purposes of this Public License, the rights - specified in Section 2(b)(1)-(2) are not Copyright and Similar - Rights. - - d. Effective Technological Measures means those measures that, in the - absence of proper authority, may not be circumvented under laws - fulfilling obligations under Article 11 of the WIPO Copyright - Treaty adopted on December 20, 1996, and/or similar international - agreements. - - e. Exceptions and Limitations means fair use, fair dealing, and/or - any other exception or limitation to Copyright and Similar Rights - that applies to Your use of the Licensed Material. - - f. Licensed Material means the artistic or literary work, database, - or other material to which the Licensor applied this Public - License. - - g. Licensed Rights means the rights granted to You subject to the - terms and conditions of this Public License, which are limited to - all Copyright and Similar Rights that apply to Your use of the - Licensed Material and that the Licensor has authority to license. - - h. Licensor means the individual(s) or entity(ies) granting rights - under this Public License. - - i. Share means to provide material to the public by any means or - process that requires permission under the Licensed Rights, such - as reproduction, public display, public performance, distribution, - dissemination, communication, or importation, and to make material - available to the public including in ways that members of the - public may access the material from a place and at a time - individually chosen by them. - - j. Sui Generis Database Rights means rights other than copyright - resulting from Directive 96/9/EC of the European Parliament and of - the Council of 11 March 1996 on the legal protection of databases, - as amended and/or succeeded, as well as other essentially - equivalent rights anywhere in the world. - - k. You means the individual or entity exercising the Licensed Rights - under this Public License. Your has a corresponding meaning. - -Section 2 -- Scope. - - a. License grant. - - 1. Subject to the terms and conditions of this Public License, - the Licensor hereby grants You a worldwide, royalty-free, - non-sublicensable, non-exclusive, irrevocable license to - exercise the Licensed Rights in the Licensed Material to: - - a. reproduce and Share the Licensed Material, in whole or - in part; and - - b. produce, reproduce, and Share Adapted Material. - - 2. Exceptions and Limitations. For the avoidance of doubt, where - Exceptions and Limitations apply to Your use, this Public - License does not apply, and You do not need to comply with - its terms and conditions. - - 3. Term. The term of this Public License is specified in Section - 6(a). - - 4. Media and formats; technical modifications allowed. The - Licensor authorizes You to exercise the Licensed Rights in - all media and formats whether now known or hereafter created, - and to make technical modifications necessary to do so. The - Licensor waives and/or agrees not to assert any right or - authority to forbid You from making technical modifications - necessary to exercise the Licensed Rights, including - technical modifications necessary to circumvent Effective - Technological Measures. For purposes of this Public License, - simply making modifications authorized by this Section 2(a) - (4) never produces Adapted Material. - - 5. Downstream recipients. - - a. Offer from the Licensor -- Licensed Material. Every - recipient of the Licensed Material automatically - receives an offer from the Licensor to exercise the - Licensed Rights under the terms and conditions of this - Public License. - - b. No downstream restrictions. You may not offer or impose - any additional or different terms or conditions on, or - apply any Effective Technological Measures to, the - Licensed Material if doing so restricts exercise of the - Licensed Rights by any recipient of the Licensed - Material. - - 6. No endorsement. Nothing in this Public License constitutes or - may be construed as permission to assert or imply that You - are, or that Your use of the Licensed Material is, connected - with, or sponsored, endorsed, or granted official status by, - the Licensor or others designated to receive attribution as - provided in Section 3(a)(1)(A)(i). - - b. Other rights. - - 1. Moral rights, such as the right of integrity, are not - licensed under this Public License, nor are publicity, - privacy, and/or other similar personality rights; however, to - the extent possible, the Licensor waives and/or agrees not to - assert any such rights held by the Licensor to the limited - extent necessary to allow You to exercise the Licensed - Rights, but not otherwise. - - 2. Patent and trademark rights are not licensed under this - Public License. - - 3. To the extent possible, the Licensor waives any right to - collect royalties from You for the exercise of the Licensed - Rights, whether directly or through a collecting society - under any voluntary or waivable statutory or compulsory - licensing scheme. In all other cases the Licensor expressly - reserves any right to collect such royalties. - -Section 3 -- License Conditions. - -Your exercise of the Licensed Rights is expressly made subject to the -following conditions. - - a. Attribution. - - 1. If You Share the Licensed Material (including in modified - form), You must: - - a. retain the following if it is supplied by the Licensor - with the Licensed Material: - - i. identification of the creator(s) of the Licensed - Material and any others designated to receive - attribution, in any reasonable manner requested by - the Licensor (including by pseudonym if - designated); - - ii. a copyright notice; - - iii. a notice that refers to this Public License; - - iv. a notice that refers to the disclaimer of - warranties; - - v. a URI or hyperlink to the Licensed Material to the - extent reasonably practicable; - - b. indicate if You modified the Licensed Material and - retain an indication of any previous modifications; and - - c. indicate the Licensed Material is licensed under this - Public License, and include the text of, or the URI or - hyperlink to, this Public License. - - 2. You may satisfy the conditions in Section 3(a)(1) in any - reasonable manner based on the medium, means, and context in - which You Share the Licensed Material. For example, it may be - reasonable to satisfy the conditions by providing a URI or - hyperlink to a resource that includes the required - information. - - 3. If requested by the Licensor, You must remove any of the - information required by Section 3(a)(1)(A) to the extent - reasonably practicable. - - 4. If You Share Adapted Material You produce, the Adapter's - License You apply must not prevent recipients of the Adapted - Material from complying with this Public License. - -Section 4 -- Sui Generis Database Rights. - -Where the Licensed Rights include Sui Generis Database Rights that -apply to Your use of the Licensed Material: - - a. for the avoidance of doubt, Section 2(a)(1) grants You the right - to extract, reuse, reproduce, and Share all or a substantial - portion of the contents of the database; - - b. if You include all or a substantial portion of the database - contents in a database in which You have Sui Generis Database - Rights, then the database in which You have Sui Generis Database - Rights (but not its individual contents) is Adapted Material; and - - c. You must comply with the conditions in Section 3(a) if You Share - all or a substantial portion of the contents of the database. - -For the avoidance of doubt, this Section 4 supplements and does not -replace Your obligations under this Public License where the Licensed -Rights include other Copyright and Similar Rights. - -Section 5 -- Disclaimer of Warranties and Limitation of Liability. - - a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE - EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS - AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF - ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, - IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, - WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, - ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT - KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT - ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. - - b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE - TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, - NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, - INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, - COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR - USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN - ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR - DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR - IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. - - c. The disclaimer of warranties and limitation of liability provided - above shall be interpreted in a manner that, to the extent - possible, most closely approximates an absolute disclaimer and - waiver of all liability. - -Section 6 -- Term and Termination. - - a. This Public License applies for the term of the Copyright and - Similar Rights licensed here. However, if You fail to comply with - this Public License, then Your rights under this Public License - terminate automatically. - - b. Where Your right to use the Licensed Material has terminated under - Section 6(a), it reinstates: - - 1. automatically as of the date the violation is cured, provided - it is cured within 30 days of Your discovery of the - violation; or - - 2. upon express reinstatement by the Licensor. - - For the avoidance of doubt, this Section 6(b) does not affect any - right the Licensor may have to seek remedies for Your violations - of this Public License. - - c. For the avoidance of doubt, the Licensor may also offer the - Licensed Material under separate terms or conditions or stop - distributing the Licensed Material at any time; however, doing so - will not terminate this Public License. - - d. Sections 1, 5, 6, 7, and 8 survive termination of this Public - License. - -Section 7 -- Other Terms and Conditions. - - a. The Licensor shall not be bound by any additional or different - terms or conditions communicated by You unless expressly agreed. - - b. Any arrangements, understandings, or agreements regarding the - Licensed Material not stated herein are separate from and - independent of the terms and conditions of this Public License. - -Section 8 -- Interpretation. - - a. For the avoidance of doubt, this Public License does not, and - shall not be interpreted to, reduce, limit, restrict, or impose - conditions on any use of the Licensed Material that could lawfully - be made without permission under this Public License. - - b. To the extent possible, if any provision of this Public License is - deemed unenforceable, it shall be automatically reformed to the - minimum extent necessary to make it enforceable. If the provision - cannot be reformed, it shall be severed from this Public License - without affecting the enforceability of the remaining terms and - conditions. - - c. No term or condition of this Public License will be waived and no - failure to comply consented to unless expressly agreed to by the - Licensor. - - d. Nothing in this Public License constitutes or may be interpreted - as a limitation upon, or waiver of, any privileges and immunities - that apply to the Licensor or You, including from the legal - processes of any jurisdiction or authority. - -======================================================================= - -Creative Commons is not a party to its public -licenses. Notwithstanding, Creative Commons may elect to apply one of -its public licenses to material it publishes and in those instances -will be considered the “Licensor.” The text of the Creative Commons -public licenses is dedicated to the public domain under the CC0 Public -Domain Dedication. Except for the limited purpose of indicating that -material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at -creativecommons.org/policies, Creative Commons does not authorize the -use of the trademark "Creative Commons" or any other trademark or logo -of Creative Commons without its prior written consent including, -without limitation, in connection with any unauthorized modifications -to any of its public licenses or any other arrangements, -understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the -public licenses. - -## Sparkle - -Copyright (c) 2006-2013 Andy Matuschak. -Copyright (c) 2009-2013 Elgato Systems GmbH. -Copyright (c) 2011-2014 Kornel Lesiński. -Copyright (c) 2015-2017 Mayur Pawashe. -Copyright (c) 2014 C.W. Betts. -Copyright (c) 2014 Petroules Corporation. -Copyright (c) 2014 Big Nerd Ranch. -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -================= -EXTERNAL LICENSES -================= - -bspatch.c and bsdiff.c, from bsdiff 4.3 : - Copyright (c) 2003-2005 Colin Percival. - -sais.c and sais.c, from sais-lite (2010/08/07) -: - Copyright (c) 2008-2010 Yuta Mori. - -SUDSAVerifier.m: - Copyright (c) 2011 Mark Hamlin. - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted providing that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -## SwiftyMarkdown - -The MIT License (MIT) - -Copyright (c) 2016 Simon Fairbairn - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -Generated by CocoaPods - https://cocoapods.org +**LetsMove** +[Website](https://github.com/potionfactory/LetsMove) - [Public domain](https://github.com/potionfactory/LetsMove#license) \ No newline at end of file diff --git a/docs/Contributors.md b/docs/Contributors.md index 05122502..eb79077b 100644 --- a/docs/Contributors.md +++ b/docs/Contributors.md @@ -1,6 +1,6 @@ # Contributors -### They helped [develop the app](https://github.com/lwouis/alt-tab-macos/graphs/contributors): +They helped [develop the app](https://github.com/lwouis/alt-tab-macos/graphs/contributors): * [adamnemecek](https://github.com/adamnemecek) * [akx](https://github.com/akx) @@ -14,7 +14,7 @@ * [rbnis](https://github.com/rbnis) * [shaqed](https://github.com/shaqed) -### They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE): +They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE): * 73 * Aarni Koskela diff --git a/scripts/update_acknowledgments.sh b/scripts/update_acknowledgments.sh deleted file mode 100755 index 59c8fd38..00000000 --- a/scripts/update_acknowledgments.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -exu - -( - echo -e "# Acknowledgments\n" - # remove incorrect whitespace from ShortcutRecorder license - # remote first 2 lines (i.e. title) - # force wrap text as some licenses are and some are not - cat -s "Pods/Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos-acknowledgements.markdown" | - tail -n +2 | - sed -e 's/^ \{12\}/ /' | - sed -e 's/^ \{7\}/ /' | - fold -w 80 -s -) >docs/Acknowledgments.md diff --git a/scripts/update_contributors.sh b/scripts/update_contributors.sh index 54646903..5e5bd50b 100755 --- a/scripts/update_contributors.sh +++ b/scripts/update_contributors.sh @@ -8,7 +8,7 @@ projectId="316051" ( echo -e "# Contributors\n" - echo -e "### They helped [develop the app](https://github.com/lwouis/alt-tab-macos/graphs/contributors):\n" + echo -e "They helped [develop the app](https://github.com/lwouis/alt-tab-macos/graphs/contributors):\n" curl https://api.github.com/repos/lwouis/alt-tab-macos/contributors \ -H "Authorization: token $GITHUB_TOKEN" | @@ -17,7 +17,7 @@ projectId="316051" sort -f | sed -e 's/^/* /' - echo -e "\n### They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE):\n" + echo -e "\nThey helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE):\n" ( echo -e "lwouis" diff --git a/src/ui/preferences-window/tabs/AcknowledgmentsTab.swift b/src/ui/preferences-window/tabs/AcknowledgmentsTab.swift index f3493eb8..5ed2f2a2 100644 --- a/src/ui/preferences-window/tabs/AcknowledgmentsTab.swift +++ b/src/ui/preferences-window/tabs/AcknowledgmentsTab.swift @@ -10,23 +10,31 @@ class AcknowledgmentsTab: NSViewController, PreferencePane { let toolbarItemIcon = NSImage(named: NSImage.userAccountsName)! override func loadView() { - let markdownFileUrl = Bundle.main.url(forResource: "Acknowledgments", withExtension: "md")! - let md = SwiftyMarkdown(url: markdownFileUrl)! - md.h1.fontSize = 24 - md.h2.fontSize = 20 - let textView = TextField(md.attributedString()) + let textViews: [TextField] = ["Contributors", "Acknowledgments"].map { + let markdownFileUrl = Bundle.main.url(forResource: $0, withExtension: "md")! + let md = SwiftyMarkdown(url: markdownFileUrl)! + md.h1.fontSize = 16 + md.underlineLinks = false + md.bullet = "•" + let textView = TextField(md.attributedString()) + textView.allowsEditingTextAttributes = true + textView.isSelectable = true + return textView + } + let subGrid = GridView([textViews]) + subGrid.column(at: 1).leadingPadding = 20 + subGrid.fit() let scrollView = ScrollView() scrollView.scrollerKnobStyle = .default - scrollView.documentView!.subviews = [textView] - let height = min(textView.fittingSize.width, AcknowledgmentsTab.maxTabHeight) - scrollView.frame.size = NSSize(width: textView.fittingSize.width, height: height) - scrollView.contentView.frame.size = textView.fittingSize - scrollView.documentView!.frame.size = textView.fittingSize - scrollView.fit(textView.fittingSize.width, height) + scrollView.documentView!.subviews = [subGrid] + let totalWidth = subGrid.fittingSize.width + let totalHeight = min(subGrid.fittingSize.height, AcknowledgmentsTab.maxTabHeight) + scrollView.frame.size = NSSize(width: totalWidth, height: totalHeight) + scrollView.contentView.frame.size = scrollView.frame.size + scrollView.documentView!.frame.size = subGrid.fittingSize + scrollView.fit(totalWidth, totalHeight) - let grid = GridView([[scrollView]]) - grid.fit() - view = grid + view = scrollView } }