longActions

Prepare10.14

.travis.yml

@@ -0,0 +1,6 @@
+language: swift
+xcode_project: MTMR.xcodeproj
+xcode_scheme: UnitTests
+osx_image: xcode9.3
+install: gem install xcpretty
+script: "xcodebuild test -project MTMR.xcodeproj -scheme 'UnitTests' | xcpretty -c && exit ${PIPESTATUS[0]}"

MTMR.xcodeproj/project.pbxproj

@@ -7,19 +7,26 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		36300E83209F040900B31C71 /* SupportHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0008E542080286C003AD4DD /* SupportHelpers.swift */; };
+		36300E8F20A2CF3400B31C71 /* AppleScriptDefinitionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36300E8E20A2CF3400B31C71 /* AppleScriptDefinitionTests.swift */; };
+		36300E9120A2D2B200B31C71 /* BackgroundColorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36300E9020A2D2B200B31C71 /* BackgroundColorTests.swift */; };
 		368EDDE720812A1D00E10953 /* ScrollViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 368EDDE620812A1D00E10953 /* ScrollViewItem.swift */; };
+		36A778BE20A6C27100B38714 /* GeneralExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36A778BD20A6C27100B38714 /* GeneralExtensions.swift */; };
 		36C2ECD7207B6DAE003CDA33 /* TimeTouchBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECD6207B6DAE003CDA33 /* TimeTouchBarItem.swift */; };
 		36C2ECD9207B74B4003CDA33 /* AppleScriptTouchBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECD8207B74B4003CDA33 /* AppleScriptTouchBarItem.swift */; };
 		36C2ECDB207C3FE7003CDA33 /* ItemsParsing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECDA207C3FE7003CDA33 /* ItemsParsing.swift */; };
 		36C2ECDD207C723B003CDA33 /* ParseConfigTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECDC207C723B003CDA33 /* ParseConfigTests.swift */; };
 		36C2ECDE207C82DE003CDA33 /* ItemsParsing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C2ECDA207C3FE7003CDA33 /* ItemsParsing.swift */; };
 		36C2ECE0207CB1B0003CDA33 /* defaultPreset.json in Resources */ = {isa = PBXBuildFile; fileRef = 36C2ECDF207CB1B0003CDA33 /* defaultPreset.json */; };
+		60173D3E20C0031B002C305F /* LaunchAtLoginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 60173D3D20C0031B002C305F /* LaunchAtLoginController.m */; };
 		6027D1B92080E52A004FFDC7 /* BrightnessViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6027D1B72080E52A004FFDC7 /* BrightnessViewController.swift */; };
 		6027D1BA2080E52A004FFDC7 /* VolumeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6027D1B82080E52A004FFDC7 /* VolumeViewController.swift */; };
 		6042B6A72083E03A00C525C8 /* AppScrubberTouchBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6042B6A62083E03A00C525C8 /* AppScrubberTouchBarItem.swift */; };
 		6042B6AA2083E27000C525C8 /* DeprecatedCarbonAPI.c in Sources */ = {isa = PBXBuildFile; fileRef = 6042B6A92083E27000C525C8 /* DeprecatedCarbonAPI.c */; };
+		60669B4320AD8FA80074E817 /* GroupBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60669B4220AD8FA80074E817 /* GroupBarItem.swift */; };
 		607EEA4B2087835F009DA5F0 /* WeatherBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */; };
 		607EEA4D2087A8DA009DA5F0 /* CurrencyBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607EEA4C2087A8DA009DA5F0 /* CurrencyBarItem.swift */; };
+		60C44AFD20A373A100C0EC91 /* MusicBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60C44AFC20A373A100C0EC91 /* MusicBarItem.swift */; };
 		60F7D454208CC31400ABF5D2 /* InputSourceBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60F7D453208CC31400ABF5D2 /* InputSourceBarItem.swift */; };
 		B0008E552080286C003AD4DD /* SupportHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0008E542080286C003AD4DD /* SupportHelpers.swift */; };
 		B04B7BB72087398C00C835D0 /* BatteryBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B04B7BB62087398C00C835D0 /* BatteryBarItem.swift */; };
@@ -43,21 +50,16 @@
 		B0B17438207D6B590004B740 /* Vox.next.scpt in Resources */ = {isa = PBXBuildFile; fileRef = B0B1742E207D6B590004B740 /* Vox.next.scpt */; };
 		B0B17439207D6B590004B740 /* Vox.nowPlaying.scpt in Resources */ = {isa = PBXBuildFile; fileRef = B0B1742F207D6B590004B740 /* Vox.nowPlaying.scpt */; };
 		B0B1743A207D6B590004B740 /* iTunes.nowPlaying.scpt in Resources */ = {isa = PBXBuildFile; fileRef = B0B17430207D6B590004B740 /* iTunes.nowPlaying.scpt */; };
+		B0F3112520C9E35F0076BB88 /* SupportNSTouchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0F3112420C9E35F0076BB88 /* SupportNSTouchBar.swift */; };
 		B0F8771A207AC1EA00D6E430 /* TouchBarSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = B0F87719207AC1EA00D6E430 /* TouchBarSupport.m */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		B082B262205C7D8000BC04DC /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B082B247205C7D8000BC04DC /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = B082B24E205C7D8000BC04DC;
-			remoteInfo = MTMR;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
+		36300E85209FD16700B31C71 /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = SOURCE_ROOT; };
+		36300E8E20A2CF3400B31C71 /* AppleScriptDefinitionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppleScriptDefinitionTests.swift; sourceTree = "<group>"; };
+		36300E9020A2D2B200B31C71 /* BackgroundColorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundColorTests.swift; sourceTree = "<group>"; };
 		368EDDE620812A1D00E10953 /* ScrollViewItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollViewItem.swift; sourceTree = "<group>"; };
+		36A778BD20A6C27100B38714 /* GeneralExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralExtensions.swift; sourceTree = "<group>"; };
 		36BDC22F207CDA8600FCFEBE /* TECHNICAL_DEBT.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = TECHNICAL_DEBT.md; sourceTree = "<group>"; };
 		36C2ECD2207B3B1D003CDA33 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		36C2ECD6207B6DAE003CDA33 /* TimeTouchBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeTouchBarItem.swift; sourceTree = "<group>"; };
@@ -65,13 +67,17 @@
 		36C2ECDA207C3FE7003CDA33 /* ItemsParsing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemsParsing.swift; sourceTree = "<group>"; };
 		36C2ECDC207C723B003CDA33 /* ParseConfigTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseConfigTests.swift; sourceTree = "<group>"; };
 		36C2ECDF207CB1B0003CDA33 /* defaultPreset.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = defaultPreset.json; sourceTree = "<group>"; };
+		60173D3C20C0031B002C305F /* LaunchAtLoginController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LaunchAtLoginController.h; sourceTree = "<group>"; };
+		60173D3D20C0031B002C305F /* LaunchAtLoginController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LaunchAtLoginController.m; sourceTree = "<group>"; };
 		6027D1B72080E52A004FFDC7 /* BrightnessViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrightnessViewController.swift; sourceTree = "<group>"; };
 		6027D1B82080E52A004FFDC7 /* VolumeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VolumeViewController.swift; sourceTree = "<group>"; };
 		6042B6A62083E03A00C525C8 /* AppScrubberTouchBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppScrubberTouchBarItem.swift; sourceTree = "<group>"; };
 		6042B6A82083E1F500C525C8 /* DeprecatedCarbonAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeprecatedCarbonAPI.h; sourceTree = "<group>"; };
 		6042B6A92083E27000C525C8 /* DeprecatedCarbonAPI.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = DeprecatedCarbonAPI.c; sourceTree = "<group>"; };
+		60669B4220AD8FA80074E817 /* GroupBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupBarItem.swift; sourceTree = "<group>"; };
 		607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeatherBarItem.swift; sourceTree = "<group>"; };
 		607EEA4C2087A8DA009DA5F0 /* CurrencyBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyBarItem.swift; sourceTree = "<group>"; };
+		60C44AFC20A373A100C0EC91 /* MusicBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicBarItem.swift; sourceTree = "<group>"; };
 		60F7D453208CC31400ABF5D2 /* InputSourceBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputSourceBarItem.swift; sourceTree = "<group>"; };
 		B0008E542080286C003AD4DD /* SupportHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportHelpers.swift; sourceTree = "<group>"; };
 		B04B7BB62087398C00C835D0 /* BatteryBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BatteryBarItem.swift; sourceTree = "<group>"; };
@@ -102,6 +108,7 @@
 		B0B1742E207D6B590004B740 /* Vox.next.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vox.next.scpt; sourceTree = "<group>"; };
 		B0B1742F207D6B590004B740 /* Vox.nowPlaying.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vox.nowPlaying.scpt; sourceTree = "<group>"; };
 		B0B17430207D6B590004B740 /* iTunes.nowPlaying.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iTunes.nowPlaying.scpt; sourceTree = "<group>"; };
+		B0F3112420C9E35F0076BB88 /* SupportNSTouchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportNSTouchBar.swift; sourceTree = "<group>"; };
 		B0F87719207AC1EA00D6E430 /* TouchBarSupport.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TouchBarSupport.m; sourceTree = "<group>"; };
 		B0F8771B207AC92700D6E430 /* TouchBarSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TouchBarSupport.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -177,6 +184,8 @@
 				B09EB1E3207C082000D5C1E0 /* HapticFeedback.swift */,
 				368EDDE620812A1D00E10953 /* ScrollViewItem.swift */,
 				B05600D22083E9BB00EB218D /* CustomSlider.swift */,
+				36A778BD20A6C27100B38714 /* GeneralExtensions.swift */,
+				B0F3112420C9E35F0076BB88 /* SupportNSTouchBar.swift */,
 			);
 			path = MTMR;
 			sourceTree = "<group>";
@@ -184,8 +193,11 @@
 		B082B264205C7D8000BC04DC /* MTMRTests */ = {
 			isa = PBXGroup;
 			children = (
+				36300E85209FD16700B31C71 /* .travis.yml */,
 				36C2ECDC207C723B003CDA33 /* ParseConfigTests.swift */,
 				B082B267205C7D8000BC04DC /* Info.plist */,
+				36300E8E20A2CF3400B31C71 /* AppleScriptDefinitionTests.swift */,
+				36300E9020A2D2B200B31C71 /* BackgroundColorTests.swift */,
 			);
 			path = MTMRTests;
 			sourceTree = "<group>";
@@ -216,6 +228,8 @@
 				B0F8771B207AC92700D6E430 /* TouchBarSupport.h */,
 				6042B6A82083E1F500C525C8 /* DeprecatedCarbonAPI.h */,
 				6042B6A92083E27000C525C8 /* DeprecatedCarbonAPI.c */,
+				60173D3C20C0031B002C305F /* LaunchAtLoginController.h */,
+				60173D3D20C0031B002C305F /* LaunchAtLoginController.m */,
 			);
 			path = CBridge;
 			sourceTree = "<group>";
@@ -231,6 +245,8 @@
 				607EEA4C2087A8DA009DA5F0 /* CurrencyBarItem.swift */,
 				6042B6A62083E03A00C525C8 /* AppScrubberTouchBarItem.swift */,
 				60F7D453208CC31400ABF5D2 /* InputSourceBarItem.swift */,
+				60C44AFC20A373A100C0EC91 /* MusicBarItem.swift */,
+				60669B4220AD8FA80074E817 /* GroupBarItem.swift */,
 			);
 			path = Widgets;
 			sourceTree = "<group>";
@@ -266,7 +282,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				B082B263205C7D8000BC04DC /* PBXTargetDependency */,
 			);
 			name = MTMRTests;
 			productName = MTMRTests;
@@ -358,12 +373,17 @@
 				B0008E552080286C003AD4DD /* SupportHelpers.swift in Sources */,
 				6042B6A72083E03A00C525C8 /* AppScrubberTouchBarItem.swift in Sources */,
 				B082B253205C7D8000BC04DC /* AppDelegate.swift in Sources */,
+				60C44AFD20A373A100C0EC91 /* MusicBarItem.swift in Sources */,
 				B059D624205E04F3006E6B86 /* CustomButtonTouchBarItem.swift in Sources */,
+				60173D3E20C0031B002C305F /* LaunchAtLoginController.m in Sources */,
 				6027D1BA2080E52A004FFDC7 /* VolumeViewController.swift in Sources */,
 				607EEA4B2087835F009DA5F0 /* WeatherBarItem.swift in Sources */,
+				B0F3112520C9E35F0076BB88 /* SupportNSTouchBar.swift in Sources */,
 				6042B6AA2083E27000C525C8 /* DeprecatedCarbonAPI.c in Sources */,
 				B09EB1E4207C082000D5C1E0 /* HapticFeedback.swift in Sources */,
 				60F7D454208CC31400ABF5D2 /* InputSourceBarItem.swift in Sources */,
+				36A778BE20A6C27100B38714 /* GeneralExtensions.swift in Sources */,
+				60669B4320AD8FA80074E817 /* GroupBarItem.swift in Sources */,
 				36C2ECDB207C3FE7003CDA33 /* ItemsParsing.swift in Sources */,
 				B0A7E9AA205D6AA400EEF070 /* KeyPress.swift in Sources */,
 				36C2ECD7207B6DAE003CDA33 /* TimeTouchBarItem.swift in Sources */,
@@ -378,21 +398,16 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				36300E9120A2D2B200B31C71 /* BackgroundColorTests.swift in Sources */,
+				36300E8F20A2CF3400B31C71 /* AppleScriptDefinitionTests.swift in Sources */,
 				36C2ECDD207C723B003CDA33 /* ParseConfigTests.swift in Sources */,
+				36300E83209F040900B31C71 /* SupportHelpers.swift in Sources */,
 				36C2ECDE207C82DE003CDA33 /* ItemsParsing.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		B082B263205C7D8000BC04DC /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = B082B24E205C7D8000BC04DC /* MTMR */;
-			targetProxy = B082B262205C7D8000BC04DC /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		B082B258205C7D8000BC04DC /* Main.storyboard */ = {
 			isa = PBXVariantGroup;

MTMR.xcodeproj/xcshareddata/xcschemes/MTMR.xcscheme

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0920"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B082B24E205C7D8000BC04DC"
+               BuildableName = "MTMR.app"
+               BlueprintName = "MTMR"
+               ReferencedContainer = "container:MTMR.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B082B260205C7D8000BC04DC"
+               BuildableName = "MTMRTests.xctest"
+               BlueprintName = "MTMRTests"
+               ReferencedContainer = "container:MTMR.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B082B24E205C7D8000BC04DC"
+            BuildableName = "MTMR.app"
+            BlueprintName = "MTMR"
+            ReferencedContainer = "container:MTMR.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B082B24E205C7D8000BC04DC"
+            BuildableName = "MTMR.app"
+            BlueprintName = "MTMR"
+            ReferencedContainer = "container:MTMR.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B082B24E205C7D8000BC04DC"
+            BuildableName = "MTMR.app"
+            BlueprintName = "MTMR"
+            ReferencedContainer = "container:MTMR.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

MTMR.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0920"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B082B260205C7D8000BC04DC"
+               BuildableName = "MTMRTests.xctest"
+               BlueprintName = "MTMRTests"
+               ReferencedContainer = "container:MTMR.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

MTMR/AppDelegate.swift

@@ -14,6 +14,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     private var fileSystemSource: DispatchSourceFileSystemObject?
     
     func applicationDidFinishLaunching(_ aNotification: Notification) {
+        let _ = AXIsProcessTrustedWithOptions([kAXTrustedCheckOptionPrompt.takeRetainedValue() as NSString: true] as NSDictionary)
+        
         TouchBarController.shared.setupControlStripPresence()
         
         if let button = statusItem.button {
@@ -28,7 +30,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         
     }
     
-    @objc func openPrefereces(_ sender: Any?) {
+    @objc func openPreferences(_ sender: Any?) {
         let task = Process()
         let appSupportDirectory = NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR")
         let presetPath = appSupportDirectory.appending("/items.json")
@@ -37,8 +39,26 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         task.launch()
     }
     
-    @objc func updatePreset(_ sender: Any?) {
+    @objc func toggleControlStrip(_ sender: Any?) {
-        TouchBarController.shared.createAndUpdatePreset()
+        TouchBarController.shared.controlStripState = !TouchBarController.shared.controlStripState
+        createMenu()
+        TouchBarController.shared.resetControlStrip()
+    }
+    
+    @objc func toggleBlackListedApp(_ sender: Any?) {
+        let appIdentifier = TouchBarController.shared.frontmostApplicationIdentifier
+        if appIdentifier != nil {
+            if let index = TouchBarController.shared.blacklistAppIdentifiers.index(of: appIdentifier!) {
+                TouchBarController.shared.blacklistAppIdentifiers.remove(at: index)
+            } else {
+                TouchBarController.shared.blacklistAppIdentifiers.append(appIdentifier!)
+            }
+            
+            UserDefaults.standard.set(TouchBarController.shared.blacklistAppIdentifiers, forKey: "com.toxblh.mtmr.blackListedApps")
+            UserDefaults.standard.synchronize()
+            
+            TouchBarController.shared.updateActiveApp()
+        }
     }
     
     @objc func openPreset(_ sender: Any?) {
@@ -53,31 +73,42 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         dialog.allowedFileTypes        = ["json"]
         dialog.directoryURL = NSURL.fileURL(withPath: NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR"), isDirectory: true)
         
-        if (dialog.runModal() == NSApplication.ModalResponse.OK) {
+        if dialog.runModal() == .OK, let path = dialog.url?.path {
-            let result = dialog.url
+            TouchBarController.shared.reloadPreset(path: path)
-            
-            if (result != nil) {
-                let path = result!.path
-                let jsonData = path.fileData
-                let jsonItems = jsonData?.barItemDefinitions() ?? [BarItemDefinition(type: .staticButton(title: "bad preset"), action: .none, longAction: .none, additionalParameters: [:])]
-                
-                TouchBarController.shared.createAndUpdatePreset(jsonItems: jsonItems)
-            }
         }
     }
     
+    @objc func toggleStartAtLogin(_ sender: Any?) {
+        LaunchAtLoginController().setLaunchAtLogin(!LaunchAtLoginController().launchAtLogin, for: NSURL.fileURL(withPath: Bundle.main.bundlePath))
+        createMenu()
+    }
+    
     func createMenu() {
         let menu = NSMenu()
-        menu.addItem(withTitle: "Preferences", action: #selector(openPrefereces(_:)), keyEquivalent: ",")
+        
-        menu.addItem(withTitle: "Reload Preset", action: #selector(updatePreset(_:)), keyEquivalent: "r")
+        let startAtLogin = NSMenuItem(title: "Start at login", action: #selector(toggleStartAtLogin(_:)), keyEquivalent: "L")
-        menu.addItem(withTitle: "Open Preset", action: #selector(openPreset(_:)), keyEquivalent: "O")
+        startAtLogin.state = LaunchAtLoginController().launchAtLogin ? .on : .off
+        
+        let hideControlStrip = NSMenuItem(title: "Hide Control Strip", action: #selector(toggleControlStrip(_:)), keyEquivalent: "T")
+        hideControlStrip.state = TouchBarController.shared.controlStripState ? .on : .off
+        
+        let settingSeparator = NSMenuItem(title: "Settings", action: nil, keyEquivalent: "")
+        settingSeparator.isEnabled = false
+       
+        menu.addItem(withTitle: "Preferences", action: #selector(openPreferences(_:)), keyEquivalent: ",")
+        menu.addItem(withTitle: "Open preset", action: #selector(openPreset(_:)), keyEquivalent: "O")
+        menu.addItem(NSMenuItem.separator())
+        menu.addItem(settingSeparator)
+        menu.addItem(hideControlStrip)
+        menu.addItem(withTitle: "Toggle current app in blacklist" , action: #selector(toggleBlackListedApp(_:)), keyEquivalent: "B")
+        menu.addItem(startAtLogin)
         menu.addItem(NSMenuItem.separator())
         menu.addItem(withTitle: "Quit", action: #selector(NSApplication.terminate(_:)), keyEquivalent: "q")
         statusItem.menu = menu
     }
 
     func reloadOnDefaultConfigChanged() {
-        let file = NSURL.fileURL(withPath: NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR/items.json"))
+        let file = NSURL.fileURL(withPath: standardConfigPath)
         
         let fd = open(file.path, O_EVTONLY)
         
@@ -86,7 +117,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         self.fileSystemSource?.setEventHandler(handler: {
             print("Config changed, reloading...")
             DispatchQueue.main.async {
-                TouchBarController.shared.createAndUpdatePreset()
+                TouchBarController.shared.reloadPreset(path: file.path)
             }
         })
         

MTMR/AppleScriptTouchBarItem.swift

@@ -5,24 +5,24 @@ class AppleScriptTouchBarItem: CustomButtonTouchBarItem {
     private let interval: TimeInterval
     private var forceHideConstraint: NSLayoutConstraint!
     
-    init?(identifier: NSTouchBarItem.Identifier, source: SourceProtocol, interval: TimeInterval, onTap: @escaping ()->(), onLongTap: @escaping ()->()) {
+    init?(identifier: NSTouchBarItem.Identifier, source: SourceProtocol, interval: TimeInterval) {
         self.interval = interval
-        super.init(identifier: identifier, title: "⏳", onTap: onTap, onLongTap: onLongTap)
+        super.init(identifier: identifier, title: "⏳")
         self.forceHideConstraint = self.view.widthAnchor.constraint(equalToConstant: 0)
         guard let script = source.appleScript else {
-            button.title = "no script"
+            self.title = "no script"
             return
         }
         self.script = script
-        button.bezelColor = .clear
+        self.isBordered = false
-        DispatchQueue.main.async {
+        DispatchQueue.appleScriptQueue.async {
             var error: NSDictionary?
             guard script.compileAndReturnError(&error) else {
                 #if DEBUG
                     print(error?.description ?? "unknown error")
                 #endif
                 DispatchQueue.main.async {
-                    self.button.title = "error"
+                    self.title = "error"
                 }
                 return
             }
@@ -36,14 +36,17 @@ class AppleScriptTouchBarItem: CustomButtonTouchBarItem {
     
     func refreshAndSchedule() {
         #if DEBUG
-            print("refresh happened")
+            print("refresh happened (interval \(self.interval)), self \(self.identifier.rawValue))")
         #endif
         let scriptResult = self.execute()
         DispatchQueue.main.async {
-            self.button.title = scriptResult
+            self.title = scriptResult
             self.forceHideConstraint.isActive = scriptResult == ""
+            #if DEBUG
+            print("did set new script result title \(scriptResult)")
+            #endif
         }
-        DispatchQueue.main.asyncAfter(deadline: .now() + self.interval) { [weak self] in
+        DispatchQueue.appleScriptQueue.asyncAfter(deadline: .now() + self.interval) { [weak self] in
             self?.refreshAndSchedule()
         }
     }
@@ -60,9 +63,6 @@ class AppleScriptTouchBarItem: CustomButtonTouchBarItem {
 
 }
 
-extension SourceProtocol {
+extension DispatchQueue {
-    var appleScript: NSAppleScript? {
+    static let appleScriptQueue = DispatchQueue(label: "mtmr.applescript")
-        guard let source = self.string else { return nil }
-        return NSAppleScript(source: source)
-    }
 }

MTMR/CBridge/LaunchAtLoginController.h

@@ -0,0 +1,35 @@
+//
+//  LaunchAtLoginController.h
+//
+//  Copyright 2011 Tomáš Znamenáček
+//  Copyright 2010 Ben Clark-Robinson
+//
+//  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.
+
+@import Foundation;
+@import CoreServices;
+
+@interface LaunchAtLoginController : NSObject {}
+
+@property(assign) BOOL launchAtLogin;
+
+- (BOOL) willLaunchAtLogin: (NSURL*) itemURL;
+- (void) setLaunchAtLogin: (BOOL) enabled forURL: (NSURL*) itemURL;
+
+@end

MTMR/CBridge/LaunchAtLoginController.m

@@ -0,0 +1,128 @@
+//
+//  LaunchAtLoginController.m
+//
+//  Copyright 2011 Tomáš Znamenáček
+//  Copyright 2010 Ben Clark-Robinson
+//
+//  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.
+
+#import "LaunchAtLoginController.h"
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
+static NSString *const StartAtLoginKey = @"launchAtLogin";
+
+@interface LaunchAtLoginController ()
+@property(assign) LSSharedFileListRef loginItems;
+@end
+
+@implementation LaunchAtLoginController
+@synthesize loginItems;
+
+#pragma mark Change Observing
+
+void sharedFileListDidChange(LSSharedFileListRef inList, void *context)
+{
+    LaunchAtLoginController *self = (__bridge id) context;
+    [self willChangeValueForKey:StartAtLoginKey];
+    [self didChangeValueForKey:StartAtLoginKey];
+}
+
+#pragma mark Initialization
+
+- (id) init
+{
+    self = [super init];
+    loginItems = LSSharedFileListCreate(NULL, kLSSharedFileListSessionLoginItems, NULL);
+    LSSharedFileListAddObserver(loginItems, CFRunLoopGetMain(),
+                                (CFStringRef)NSDefaultRunLoopMode, sharedFileListDidChange, (voidPtr)CFBridgingRetain(self));
+    return self;
+}
+
+- (void) dealloc
+{
+    LSSharedFileListRemoveObserver(loginItems, CFRunLoopGetMain(),
+                                   (CFStringRef)NSDefaultRunLoopMode, sharedFileListDidChange, (__bridge void *)(self));
+    CFRelease(loginItems);
+}
+
+#pragma mark Launch List Control
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+LSSharedFileListItemRef copyItemWithURLinFileList(NSURL* wantedURL, LSSharedFileListRef fileList) {
+    if (wantedURL == NULL || fileList == NULL)
+        return NULL;
+    
+    NSArray *listSnapshot = (__bridge_transfer NSArray *)LSSharedFileListCopySnapshot(fileList, NULL);
+    for(NSUInteger i = 0; i< [listSnapshot count]; i++) {
+        LSSharedFileListItemRef item = (__bridge LSSharedFileListItemRef)[listSnapshot objectAtIndex:i];
+        UInt32 resolutionFlags = kLSSharedFileListNoUserInteraction | kLSSharedFileListDoNotMountVolumes;
+        CFURLRef currentItemURL = NULL;
+        LSSharedFileListItemResolve(item, resolutionFlags, &currentItemURL, NULL);
+        if (currentItemURL && [(__bridge_transfer NSURL*)currentItemURL isEqual:wantedURL]) {
+            CFRetain(item);
+            return item;
+        }
+    }
+    
+    return NULL;
+}
+#pragma clang diagnostic pop
+
+- (BOOL) willLaunchAtLogin: (NSURL*) itemURL
+{
+    return !!copyItemWithURLinFileList(itemURL, loginItems);
+}
+
+- (void) setLaunchAtLogin: (BOOL) enabled forURL: (NSURL*) itemURL
+{
+    LSSharedFileListItemRef appItem = copyItemWithURLinFileList(itemURL, loginItems);
+    if (enabled && !appItem) {
+        LSSharedFileListInsertItemURL(loginItems, kLSSharedFileListItemBeforeFirst,
+                                      NULL, NULL, (__bridge CFURLRef)itemURL, NULL, NULL);
+    } else if (!enabled && appItem) {
+        LSSharedFileListItemRemove(loginItems, appItem);
+    }
+    if (appItem) {
+        CFRelease(appItem);
+    }
+}
+
+#pragma mark Basic Interface
+
+- (NSURL*) appURL
+{
+    return [NSURL fileURLWithPath:[[NSBundle mainBundle] bundlePath]];
+}
+
+- (void) setLaunchAtLogin: (BOOL) enabled
+{
+    [self willChangeValueForKey:StartAtLoginKey];
+    [self setLaunchAtLogin:enabled forURL:[self appURL]];
+    [self didChangeValueForKey:StartAtLoginKey];
+}
+
+- (BOOL) launchAtLogin
+{
+    return [self willLaunchAtLogin:[self appURL]];
+}
+
+@end
+#pragma clang diagnostic pop

MTMR/CBridge/TouchBarPrivateApi-Bridging.h

@@ -9,6 +9,7 @@
 #import "TouchBarPrivateApi.h"
 #import "TouchBarSupport.h"
 #import "DeprecatedCarbonAPI.h"
+#include "LaunchAtLoginController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

MTMR/CBridge/TouchBarPrivateApi.h

@@ -17,13 +17,16 @@ extern void DFRSystemModalShowsCloseBoxWhenFrontMost(BOOL);
 
 @interface NSTouchBar (PrivateMethods)
 
-// presentSystemModalFunctionBar:placement:systemTrayItemIdentifier:
+// macOS 10.14
++ (void)presentSystemModalTouchBar:(NSTouchBar *)touchBar placement:(long long)placement systemTrayItemIdentifier:(NSTouchBarItemIdentifier)identifier;
++ (void)presentSystemModalTouchBar:(NSTouchBar *)touchBar systemTrayItemIdentifier:(NSTouchBarItemIdentifier)identifier;
++ (void)dismissSystemModalTouchBar:(NSTouchBar *)touchBar;
++ (void)minimizeSystemModalTouchBar:(NSTouchBar *)touchBar;
+
+// macOS 10.13
 + (void)presentSystemModalFunctionBar:(NSTouchBar *)touchBar placement:(long long)placement systemTrayItemIdentifier:(NSTouchBarItemIdentifier)identifier;
-
 + (void)presentSystemModalFunctionBar:(NSTouchBar *)touchBar systemTrayItemIdentifier:(NSTouchBarItemIdentifier)identifier;
-
 + (void)dismissSystemModalFunctionBar:(NSTouchBar *)touchBar;
-
 + (void)minimizeSystemModalFunctionBar:(NSTouchBar *)touchBar;
 
 @end

MTMR/CBridge/TouchBarSupport.h

@@ -10,8 +10,6 @@
 
 @interface MediaKeys : NSObject
 
-+ (void)decreaseVolume;
++ (void)HIDPostAuxKey:(UInt8)keyCode;
-+ (void)increaseVolume;
-+ (void)muteVolume;
 
 @end

MTMR/CBridge/TouchBarSupport.m

@@ -7,6 +7,7 @@
 //
 
 #import "TouchBarSupport.h"
+#import <IOKit/hidsystem/ev_keymap.h>
 
 @implementation MediaKeys
 
@@ -30,7 +31,7 @@ static io_connect_t get_event_driver(void)
 }
 
 
-static void HIDPostAuxKey( const UInt8 auxKeyCode )
+static void HIDReleaseAuxKey( const UInt8 auxKeyCode )
 {
     NXEventData   event;
     kern_return_t kr;
@@ -51,16 +52,8 @@ static void HIDPostAuxKey( const UInt8 auxKeyCode )
     kr = IOHIDPostEvent( get_event_driver(), NX_SYSDEFINED, loc, &event, kNXEventDataVersion, 0, FALSE );
 }
 
-+ (void)decreaseVolume {
++ (void)HIDPostAuxKey: (UInt8)keyCode {
-    HIDPostAuxKey(NX_KEYTYPE_SOUND_DOWN);
+    HIDReleaseAuxKey(keyCode);
-}
-
-+ (void)increaseVolume {
-    HIDPostAuxKey(NX_KEYTYPE_SOUND_UP);
-}
-
-+ (void)muteVolume {
-    HIDPostAuxKey(NX_KEYTYPE_MUTE);
 }
 
 @end

MTMR/CustomButtonTouchBarItem.swift

@@ -9,22 +9,18 @@
 import Cocoa
 
 class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
-    private let tapClosure: () -> ()?
+    var tapClosure: (() -> ())?
-    private let longTapClosure: () -> ()?
+    var longTapClosure: (() -> ())?
-    private(set) var button: NSButton!
+    private var button: NSButton!
     
     private var singleClick: NSClickGestureRecognizer!
     private var longClick: NSPressGestureRecognizer!
 
-    init(identifier: NSTouchBarItem.Identifier, title: String, onTap callback: @escaping () -> (), onLongTap callbackLong: @escaping () -> (), bezelColor: NSColor? = .clear) {
+    init(identifier: NSTouchBarItem.Identifier, title: String) {
-        self.tapClosure = callback
+        self.attributedTitle = title.defaultTouchbarAttributedString
-        self.longTapClosure = callbackLong
         
         super.init(identifier: identifier)
-        button = NSButton(title: title, target: self, action: nil)
+        button = CustomHeightButton(title: title, target: nil, action: nil)
-        button.bezelColor = bezelColor
-        button.title = title
-        self.view = button
         
         longClick = NSPressGestureRecognizer(target: self, action: #selector(handleGestureLong))
         longClick.allowedTouchTypes = .direct
@@ -34,14 +30,71 @@ class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegat
         singleClick.allowedTouchTypes = .direct
         singleClick.delegate = self
         
-        self.view.addGestureRecognizer(longClick)
+        reinstallButton()
-        self.view.addGestureRecognizer(singleClick)
+        button.attributedTitle = attributedTitle
     }
     
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
     
+    var isBordered: Bool = true {
+        didSet {
+            reinstallButton()
+        }
+    }
+    
+    var backgroundColor: NSColor? {
+        didSet {
+            reinstallButton()
+        }
+    }
+    
+    var title: String {
+        get {
+            return self.attributedTitle.string
+        }
+        set {
+            self.attributedTitle = newValue.defaultTouchbarAttributedString
+        }
+    }
+    
+    var attributedTitle: NSAttributedString {
+        didSet {
+            self.button?.imagePosition = attributedTitle.length > 0 ? .imageLeading : .imageOnly
+            self.button?.attributedTitle = attributedTitle
+        }
+    }
+    
+    var image: NSImage? {
+        didSet {
+            button.image = image
+        }
+    }
+    
+    private func reinstallButton() {
+        let title = button.attributedTitle
+        let image = button.image
+        let cell = CustomButtonCell(parentItem: self)
+        button.cell = cell
+        if let color = backgroundColor {
+            cell.isBordered = true
+            button.bezelColor = color
+            cell.backgroundColor = color
+        } else {
+            button.isBordered = isBordered
+            button.bezelStyle = isBordered ? .rounded : .inline
+        }
+        button.imageScaling = .scaleProportionallyDown
+        button.imageHugsTitle = true
+        button.attributedTitle = title
+        self.button?.imagePosition = title.length > 0 ? .imageLeading : .imageOnly
+        button.image = image
+        self.view = button
+        
+        self.view.addGestureRecognizer(longClick)
+        self.view.addGestureRecognizer(singleClick)
+    }
 
     func gestureRecognizer(_ gestureRecognizer: NSGestureRecognizer, shouldRequireFailureOf otherGestureRecognizer: NSGestureRecognizer) -> Bool {
         if gestureRecognizer == singleClick && otherGestureRecognizer == longClick {
@@ -55,7 +108,7 @@ class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegat
         switch gr.state {
         case .ended:
             hf.tap(strong: 2)
-            self.tapClosure()
+            self.tapClosure?()
             break
         default:
             break
@@ -66,12 +119,12 @@ class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegat
         let hf: HapticFeedback = HapticFeedback()
         switch gr.state {
         case .began:
-            if self.longTapClosure != nil {
+            if let closure = self.longTapClosure {
                 hf.tap(strong: 2)
-                self.tapClosure()
+                closure()
-            } else {
+            } else if let closure = self.tapClosure {
                 hf.tap(strong: 6)
-                self.longTapClosure()
+                closure()
                 print("long click")
             }
             break
@@ -82,3 +135,52 @@ class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegat
     }
 }
 
+class CustomHeightButton : NSButton {
+    
+    override var intrinsicContentSize: NSSize {
+        var size = super.intrinsicContentSize
+        size.height = 30
+        return size
+    }
+    
+}
+
+class CustomButtonCell: NSButtonCell {
+    weak var parentItem: CustomButtonTouchBarItem?
+    
+    init(parentItem: CustomButtonTouchBarItem) {
+        super.init(textCell: "")
+        self.parentItem = parentItem
+    }
+    
+    override func highlight(_ flag: Bool, withFrame cellFrame: NSRect, in controlView: NSView) {
+        super.highlight(flag, withFrame: cellFrame, in: controlView)
+        if !self.isBordered {
+            if flag {
+                self.setAttributedTitle(self.attributedTitle, withColor: .lightGray)
+            } else if let parentItem = self.parentItem {
+                self.attributedTitle = parentItem.attributedTitle
+            }
+        }
+    }
+    
+    required init(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    func setAttributedTitle(_ title: NSAttributedString, withColor color: NSColor) {
+        let attrTitle = NSMutableAttributedString(attributedString: title)
+        attrTitle.addAttributes([.foregroundColor: color], range: NSRange(location: 0, length: attrTitle.length))
+        self.attributedTitle = attrTitle
+    }
+    
+}
+
+extension String {
+    var defaultTouchbarAttributedString: NSAttributedString {
+        let attrTitle = NSMutableAttributedString(string: self, attributes: [.foregroundColor: NSColor.white, .font: NSFont.systemFont(ofSize: 15, weight: .regular), .baselineOffset: 1])
+        attrTitle.setAlignment(.center, range: NSRange(location: 0, length: self.count))
+        return attrTitle
+    }
+}
+

MTMR/CustomSlider.swift

@@ -49,19 +49,19 @@ class CustomSliderCell: NSSliderCell {
     override func drawBar(inside aRect: NSRect, flipped: Bool) {
         _barRect = aRect
         
-        var rect = aRect
-        rect.size.height = CGFloat(4)
         let barRadius = CGFloat(2)
-        let value = CGFloat((self.doubleValue - self.minValue) / (self.maxValue - self.minValue))
+
-        let finalWidth = CGFloat(value * (self.controlView!.frame.size.width - 12))
+        var bgRect = aRect
+        bgRect.size.height = CGFloat(4)
         
-        var leftRect = rect
+        let bg = NSBezierPath(roundedRect: bgRect, xRadius: barRadius, yRadius: barRadius)
-        leftRect.size.width = finalWidth
-        let bg = NSBezierPath(roundedRect: rect, xRadius: barRadius, yRadius: barRadius)
         NSColor.lightGray.setFill()
         bg.fill()
         
-        let active = NSBezierPath(roundedRect: leftRect, xRadius: barRadius, yRadius: barRadius)
+        var activeRect = bgRect
+
+        activeRect.size.width = CGFloat((Double(bgRect.size.width) / (self.maxValue - self.minValue)) * self.doubleValue)
+        let active = NSBezierPath(roundedRect: activeRect, xRadius: barRadius, yRadius: barRadius)
         NSColor.darkGray.setFill()
         active.fill()
     }

MTMR/GeneralExtensions.swift

@@ -0,0 +1,19 @@
+import Foundation
+
+#if swift(>=4.1)
+    // compactMap supported
+#else
+    extension Sequence {
+        func compactMap<ElementOfResult>(_ transform: (Self.Element) throws -> ElementOfResult?) rethrows -> [ElementOfResult] {
+            return try flatMap(transform)
+        }
+    }
+#endif
+
+extension String {
+    
+    var ifNotEmpty: String? {
+        return self.count > 0 ? self : nil
+    }
+    
+}

MTMR/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.13</string>
+	<string>0.16.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
@@ -26,8 +26,12 @@
 	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2018 Anton Palgunov. All rights reserved.</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>Weather widget need your location for correct work</string>
 	<key>NSLocationUsageDescription</key>
-	<string>...</string>
+	<string>Weather widget need your location for correct work</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Weather widget need your location for correct work</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>

MTMR/ItemsParsing.swift

@@ -3,7 +3,7 @@ import AppKit
 
 extension Data {
     func barItemDefinitions() -> [BarItemDefinition]? {
-      return try? JSONDecoder().decode([BarItemDefinition].self, from: self.utf8string!.stripComments().data(using: .utf8)!)
+        return try? JSONDecoder().decode([BarItemDefinition].self, from: self.utf8string!.stripComments().data(using: .utf8)!)
     }
 }
 
@@ -12,23 +12,24 @@ struct BarItemDefinition: Decodable {
     let action: ActionType
     let longAction: LongActionType
     let additionalParameters: [GeneralParameters.CodingKeys: GeneralParameter]
-
+    
     private enum CodingKeys: String, CodingKey {
         case type
     }
-
+    
     init(type: ItemType, action: ActionType, longAction: LongActionType, additionalParameters: [GeneralParameters.CodingKeys:GeneralParameter]) {
         self.type = type
         self.action = action
         self.longAction = longAction
         self.additionalParameters = additionalParameters
     }
-
+    
     init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         let type = try container.decode(String.self, forKey: .type)
         let parametersDecoder = SupportedTypesHolder.sharedInstance.lookup(by: type)
         var additionalParameters = try GeneralParameters(from: decoder).parameters
+        
         if let result = try? parametersDecoder(decoder),
             case let (itemType, action, longAction, parameters) = result {
             parameters.forEach { additionalParameters[$0] = $1 }
@@ -37,46 +38,56 @@ struct BarItemDefinition: Decodable {
             self.init(type: .staticButton(title: "unknown"), action: .none, longAction: .none, additionalParameters: additionalParameters)
         }
     }
-
+    
 }
 
 class SupportedTypesHolder {
     typealias ParametersDecoder = (Decoder) throws ->(item: ItemType, action: ActionType, longAction: LongActionType, parameters: [GeneralParameters.CodingKeys: GeneralParameter])
     private var supportedTypes: [String: ParametersDecoder] = [
         "escape": { _ in return (item: .staticButton(title: "esc"), action: .keyPress(keycode: 53), longAction: .none, parameters: [.align: .align(.left)])  },
+        
         "delete": { _ in return (item: .staticButton(title: "del"), action: .keyPress(keycode: 117), longAction: .none, parameters: [:])},
+        
         "brightnessUp": { _ in
             let imageParameter = GeneralParameter.image(source: #imageLiteral(resourceName: "brightnessUp"))
-            return (item: .staticButton(title: ""), action: .keyPress(keycode: 113), longAction: .none, parameters: [.image: imageParameter])
+            return (item: .staticButton(title: ""), action: .keyPress(keycode: 144), longAction: .none, parameters: [.image: imageParameter])
         },
+        
         "brightnessDown": { _ in
             let imageParameter = GeneralParameter.image(source: #imageLiteral(resourceName: "brightnessDown"))
-            return (item: .staticButton(title: ""), action: .keyPress(keycode: 107), longAction: .none, parameters: [.image: imageParameter])
+            return (item: .staticButton(title: ""), action: .keyPress(keycode: 145), longAction: .none, parameters: [.image: imageParameter])
         },
+        
         "volumeDown": { _ in
             let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarVolumeDownTemplate)!)
             return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_SOUND_DOWN), longAction: .none, parameters: [.image: imageParameter])
         },
+        
         "volumeUp": { _ in
             let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarVolumeUpTemplate)!)
             return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_SOUND_UP), longAction: .none, parameters: [.image: imageParameter])
         },
+        
         "mute": { _ in
             let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarAudioOutputMuteTemplate)!)
             return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_MUTE), longAction: .none, parameters: [.image: imageParameter])
         },
+        
         "previous": { _ in
             let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarRewindTemplate)!)
             return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_PREVIOUS), longAction: .none, parameters: [.image: imageParameter])
         },
+        
         "play": { _ in
             let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarPlayPauseTemplate)!)
             return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_PLAY), longAction: .none, parameters: [.image: imageParameter])
         },
+        
         "next": { _ in
             let imageParameter = GeneralParameter.image(source: NSImage(named: .touchBarFastForwardTemplate)!)
             return (item: .staticButton(title: ""), action: .hidKey(keycode: NX_KEYTYPE_NEXT), longAction: .none, parameters: [.image: imageParameter])
         },
+        
         "weather": { decoder in
             enum CodingKeys: String, CodingKey { case refreshInterval; case units; case api_key ; case icon_type }
             let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -88,6 +99,7 @@ class SupportedTypesHolder {
             let longAction = try LongActionType(from: decoder)
             return (item: .weather(interval: interval ?? 1800.00, units: units ?? "metric", api_key: api_key ?? "32c4256d09a4c52b38aecddba7a078f6", icon_type: icon_type ?? "text"), action: action, longAction: longAction, parameters: [:])
         },
+        
         "currency": { decoder in
             enum CodingKeys: String, CodingKey { case refreshInterval; case from; case to }
             let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -98,12 +110,15 @@ class SupportedTypesHolder {
             let longAction = try LongActionType(from: decoder)
             return (item: .currency(interval: interval ?? 600.00, from: from ?? "RUB", to: to ?? "USD"), action: action, longAction: longAction, parameters: [:])
         },
+        
         "dock": { decoder in
             return (item: .dock(), action: .none, longAction: .none, parameters: [:])
         },
+        
         "inputsource": { decoder in
             return (item: .inputsource(), action: .none, longAction: .none, parameters: [:])
         },
+        
         "volume": { decoder in
             enum CodingKeys: String, CodingKey { case image }
             let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -113,6 +128,7 @@ class SupportedTypesHolder {
                 return (item: .volume(), action: .none, longAction: .none, parameters: [:])
             }
         },
+        
         "brightness": { decoder in
             enum CodingKeys: String, CodingKey { case refreshInterval; case image }
             let container = try decoder.container(keyedBy: CodingKeys.self)
@@ -123,22 +139,48 @@ class SupportedTypesHolder {
                 return (item: .brightness(refreshInterval: interval ?? 0.5), action: .none, longAction: .none, parameters: [:])
             }
         },
+        
         "sleep": { _ in return (item: .staticButton(title: "☕️"), action: .shellScript(executable: "/usr/bin/pmset", parameters: ["sleepnow"]), longAction: .none, parameters: [:]) },
+        
         "displaySleep": { _ in return (item: .staticButton(title: "☕️"), action: .shellScript(executable: "/usr/bin/pmset", parameters: ["displaysleepnow"]), longAction: .none,  parameters: [:])},
-    ]
+        
-
+        "music": { decoder in
+            enum CodingKeys: String, CodingKey { case refreshInterval }
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval)
+            return (
+                item: .music(interval: interval ?? 1800.00),
+                action: .none,
+                longAction: .none,
+                parameters: [:]
+            )
+        },
+        
+        "group": { decoder in
+            enum CodingKeys: CodingKey { case items }
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            let items = try container.decode([BarItemDefinition].self, forKey: .items)
+            return (
+                item: .groupBar(items: items),
+                action: .none,
+                longAction: .none,
+                parameters: [:]
+            )
+        },
+        ]
+    
     static let sharedInstance = SupportedTypesHolder()
-
+    
     func lookup(by type: String) -> ParametersDecoder {
         return supportedTypes[type] ?? { decoder in
             return (item: try ItemType(from: decoder), action: try ActionType(from: decoder), longAction: try LongActionType(from: decoder), parameters: [:])
         }
     }
-
+    
     func register(typename: String, decoder: @escaping ParametersDecoder) {
         supportedTypes[typename] = decoder
     }
-
+    
     func register(typename: String, item: ItemType, action: ActionType, longAction: LongActionType) {
         register(typename: typename) { _ in
             return (item: item, action: action, longAction: longAction, parameters: [:])
@@ -157,7 +199,9 @@ enum ItemType: Decodable {
     case weather(interval: Double, units: String, api_key: String, icon_type: String)
     case currency(interval: Double, from: String, to: String)
     case inputsource()
-
+    case music(interval: Double)
+    case groupBar(items: [BarItemDefinition])
+    
     private enum CodingKeys: String, CodingKey {
         case type
         case title
@@ -172,8 +216,9 @@ enum ItemType: Decodable {
         case image
         case url
         case longUrl
+        case items
     }
-
+    
     enum ItemTypeRaw: String, Decodable {
         case staticButton
         case appleScriptTitledButton
@@ -185,57 +230,77 @@ enum ItemType: Decodable {
         case weather
         case currency
         case inputsource
+        case music
+        case groupBar
     }
-
+    
     init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         let type = try container.decode(ItemTypeRaw.self, forKey: .type)
         switch type {
+            
         case .appleScriptTitledButton:
             let source = try container.decode(Source.self, forKey: .source)
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 1800.0
             self = .appleScriptTitledButton(source: source, refreshInterval: interval)
+            
         case .staticButton:
             let title = try container.decode(String.self, forKey: .title)
             self = .staticButton(title: title)
+            
         case .timeButton:
             let template = try container.decodeIfPresent(String.self, forKey: .formatTemplate) ?? "HH:mm"
             self = .timeButton(formatTemplate: template)
+            
         case .battery:
             self = .battery()
+            
         case .dock:
             self = .dock()
+            
         case .volume:
             self = .volume()
+            
         case .brightness:
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 0.5
             self = .brightness(refreshInterval: interval)
+            
         case .weather:
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 1800.0
             let units = try container.decodeIfPresent(String.self, forKey: .units) ?? "metric"
             let api_key = try container.decodeIfPresent(String.self, forKey: .api_key) ?? "32c4256d09a4c52b38aecddba7a078f6"
             let icon_type = try container.decodeIfPresent(String.self, forKey: .icon_type) ?? "text"
             self = .weather(interval: interval, units: units, api_key: api_key, icon_type: icon_type)
+            
         case .currency:
             let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 600.0
             let from = try container.decodeIfPresent(String.self, forKey: .from) ?? "RUB"
             let to = try container.decodeIfPresent(String.self, forKey: .to) ?? "USD"
             self = .currency(interval: interval, from: from, to: to)
+            
         case .inputsource:
             self = .inputsource()
+            
+        case .music:
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 1800.0
+            self = .music(interval: interval)
+            
+        case .groupBar:
+            let items = try container.decode([BarItemDefinition].self, forKey: .items)
+            self = .groupBar(items: items)
         }
     }
 }
 
 enum ActionType: Decodable {
     case none
-    case hidKey(keycode: Int)
+    case hidKey(keycode: Int32)
     case keyPress(keycode: Int)
-    case appleSctipt(source: SourceProtocol)
+    case appleScript(source: SourceProtocol)
     case shellScript(executable: String, parameters: [String])
     case custom(closure: ()->())
     case openUrl(url: String)
-
+    
     private enum CodingKeys: String, CodingKey {
         case action
         case keycode
@@ -244,7 +309,7 @@ enum ActionType: Decodable {
         case shellArguments
         case url
     }
-
+    
     private enum ActionTypeRaw: String, Decodable {
         case hidKey
         case keyPress
@@ -252,29 +317,35 @@ enum ActionType: Decodable {
         case shellScript
         case openUrl
     }
-
+    
     init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         let type = try container.decodeIfPresent(ActionTypeRaw.self, forKey: .action)
+        
         switch type {
-        case .some(.hidKey):
+            case .some(.hidKey):
-            let keycode = try container.decode(Int.self, forKey: .keycode)
+                let keycode = try container.decode(Int32.self, forKey: .keycode)
-            self = .hidKey(keycode: keycode)
+                self = .hidKey(keycode: keycode)
-        case .some(.keyPress):
+            
-            let keycode = try container.decode(Int.self, forKey: .keycode)
+            case .some(.keyPress):
-            self = .keyPress(keycode: keycode)
+                let keycode = try container.decode(Int.self, forKey: .keycode)
-        case .some(.appleScript):
+                self = .keyPress(keycode: keycode)
-            let source = try container.decode(Source.self, forKey: .actionAppleScript)
+            
-            self = .appleSctipt(source: source)
+            case .some(.appleScript):
-        case .some(.shellScript):
+                let source = try container.decode(Source.self, forKey: .actionAppleScript)
-            let executable = try container.decode(String.self, forKey: .executablePath)
+                self = .appleScript(source: source)
-            let parameters = try container.decodeIfPresent([String].self, forKey: .shellArguments) ?? []
+            
-            self = .shellScript(executable: executable, parameters: parameters)
+            case .some(.shellScript):
-        case .some(.openUrl):
+                let executable = try container.decode(String.self, forKey: .executablePath)
-            let url = try container.decode(String.self, forKey: .url)
+                let parameters = try container.decodeIfPresent([String].self, forKey: .shellArguments) ?? []
-            self = .openUrl(url: url)
+                self = .shellScript(executable: executable, parameters: parameters)
-        case .none:
+            
-            self = .none
+            case .some(.openUrl):
+                let url = try container.decode(String.self, forKey: .url)
+                self = .openUrl(url: url)
+            
+            case .none:
+                self = .none
         }
     }
 }
@@ -282,19 +353,19 @@ enum ActionType: Decodable {
 
 enum LongActionType: Decodable {
     case none
-    case hidKey(keycode: Int)
+    case hidKey(keycode: Int32)
     case keyPress(keycode: Int)
-    case appleSctipt(source: SourceProtocol)
+    case appleScript(source: SourceProtocol)
     case shellScript(executable: String, parameters: [String])
     case custom(closure: ()->())
     case openUrl(url: String)
     
     private enum CodingKeys: String, CodingKey {
         case longAction
-        case keycode
+        case longKeycode
-        case actionAppleScript
+        case longActionAppleScript
-        case executablePath
+        case longExecutablePath
-        case shellArguments
+        case longShellArguments
         case longUrl
     }
     
@@ -309,114 +380,95 @@ enum LongActionType: Decodable {
     init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         let longType = try container.decodeIfPresent(LongActionTypeRaw.self, forKey: .longAction)
+        
         switch longType {
-        case .some(.hidKey):
+            case .some(.hidKey):
-            let keycode = try container.decode(Int.self, forKey: .keycode)
+                let keycode = try container.decode(Int32.self, forKey: .longKeycode)
-            self = .hidKey(keycode: keycode)
+                self = .hidKey(keycode: keycode)
-        case .some(.keyPress):
+            
-            let keycode = try container.decode(Int.self, forKey: .keycode)
+            case .some(.keyPress):
-            self = .keyPress(keycode: keycode)
+                let keycode = try container.decode(Int.self, forKey: .longKeycode)
-        case .some(.appleScript):
+                self = .keyPress(keycode: keycode)
-            let source = try container.decode(Source.self, forKey: .actionAppleScript)
+            
-            self = .appleSctipt(source: source)
+            case .some(.appleScript):
-        case .some(.shellScript):
+                let source = try container.decode(Source.self, forKey: .longActionAppleScript)
-            let executable = try container.decode(String.self, forKey: .executablePath)
+                self = .appleScript(source: source)
-            let parameters = try container.decodeIfPresent([String].self, forKey: .shellArguments) ?? []
+            
-            self = .shellScript(executable: executable, parameters: parameters)
+            case .some(.shellScript):
-        case .some(.openUrl):
+                let executable = try container.decode(String.self, forKey: .longExecutablePath)
-            let longUrl = try container.decode(String.self, forKey: .longUrl)
+                let parameters = try container.decodeIfPresent([String].self, forKey: .longShellArguments) ?? []
-            self = .openUrl(url: longUrl)
+                self = .shellScript(executable: executable, parameters: parameters)
-        case .none:
+            
-            self = .none
+            case .some(.openUrl):
+                let longUrl = try container.decode(String.self, forKey: .longUrl)
+                self = .openUrl(url: longUrl)
+            
+            case .none:
+                self = .none
         }
     }
 }
 
-extension ItemType: Equatable {}
-func ==(lhs: ItemType, rhs: ItemType) -> Bool {
-    switch (lhs, rhs) {
-    case let (.staticButton(a), .staticButton(b)):
-        return a == b
-    case let (.appleScriptTitledButton(a, b), .appleScriptTitledButton(c, d)):
-        return a == c && b == d
-
-    default:
-        return false
-    }
-}
-
-extension ActionType: Equatable {}
-func ==(lhs: ActionType, rhs: ActionType) -> Bool {
-    switch (lhs, rhs) {
-    case (.none, .none):
-        return true
-    case let (.hidKey(a), .hidKey(b)),
-         let (.keyPress(a), .keyPress(b)):
-        return a == b
-    case let (.appleSctipt(a), .appleSctipt(b)):
-        return a == b
-    case let (.shellScript(a, b), .shellScript(c, d)):
-        return a == c && b == d
-    case let (.openUrl(a), .openUrl(b)):
-        return a == b
-    default:
-        return false
-    }
-}
-
-
-extension LongActionType: Equatable {}
-func ==(lhs: LongActionType, rhs: LongActionType) -> Bool {
-    switch (lhs, rhs) {
-    case (.none, .none):
-        return true
-    case let (.hidKey(a), .hidKey(b)),
-         let (.keyPress(a), .keyPress(b)):
-        return a == b
-    case let (.appleSctipt(a), .appleSctipt(b)):
-        return a == b
-    case let (.shellScript(a, b), .shellScript(c, d)):
-        return a == c && b == d
-    case let (.openUrl(a), .openUrl(b)):
-        return a == b
-    default:
-        return false
-    }
-}
 
 enum GeneralParameter {
     case width(_: CGFloat)
     case image(source: SourceProtocol)
     case align(_: Align)
+    case bordered(_: Bool)
+    case background(_:NSColor)
+    case title(_:String)
 }
 
 struct GeneralParameters: Decodable {
     let parameters: [GeneralParameters.CodingKeys: GeneralParameter]
-
+    
     enum CodingKeys: String, CodingKey {
         case width
         case image
         case align
+        case bordered
+        case background
+        case title
     }
+    
     init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         var result: [GeneralParameters.CodingKeys: GeneralParameter] = [:]
+        
         if let value = try container.decodeIfPresent(CGFloat.self, forKey: .width) {
             result[.width] = .width(value)
         }
+        
         if let imageSource = try container.decodeIfPresent(Source.self, forKey: .image) {
             result[.image] = .image(source: imageSource)
         }
+        
         let align = try container.decodeIfPresent(Align.self, forKey: .align) ?? .center
         result[.align] = .align(align)
+        
+        if let borderedFlag = try container.decodeIfPresent(Bool.self, forKey: .bordered) {
+            result[.bordered] = .bordered(borderedFlag)
+        }
+        
+        if let backgroundColor = try container.decodeIfPresent(String.self, forKey: .background)?.hexColor {
+            result[.background] = .background(backgroundColor)
+        }
+        
+        if let title = try container.decodeIfPresent(String.self, forKey: .title) {
+            result[.title] = .title(title)
+        }
+        
         parameters = result
     }
 }
+
 protocol SourceProtocol {
     var data: Data? { get }
     var string: String? { get }
     var image: NSImage? { get }
+    var appleScript: NSAppleScript? { get }
 }
+
 struct Source: Decodable, SourceProtocol {
     let filePath: String?
     let base64: String?
@@ -431,50 +483,69 @@ struct Source: Decodable, SourceProtocol {
     var data: Data? {
         return base64?.base64Data ?? inline?.data(using: .utf8) ?? filePath?.fileData
     }
+    
     var string: String? {
-        return inline ?? self.data?.utf8string
+        return inline ?? filePath?.fileString
     }
+    
     var image: NSImage? {
         return data?.image
     }
-
+    
+    var appleScript: NSAppleScript? {
+        return filePath?.fileURL.appleScript ?? self.string?.appleScript
+    }
+    
     private init(filePath: String?, base64: String?, inline: String?) {
         self.filePath = filePath
         self.base64 = base64
         self.inline = inline
     }
+    
     init(filePath: String) {
         self.init(filePath: filePath, base64: nil, inline: nil)
     }
 }
+
 extension NSImage: SourceProtocol {
     var data: Data? {
         return nil
     }
+    
     var string: String? {
         return nil
     }
+    
     var image: NSImage? {
         return self
     }
-}
+    
-extension SourceProtocol where Self: Equatable {}
+    var appleScript: NSAppleScript? {
-func ==(left: SourceProtocol, right: SourceProtocol) -> Bool {
+        return nil
-    return left.data == right.data
+    }
 }
 
 extension String {
     var base64Data: Data? {
         return Data(base64Encoded: self)
     }
+    
     var fileData: Data? {
         return try? Data(contentsOf: URL(fileURLWithPath: self))
     }
+    
+    var fileString: String? {
+        var encoding: String.Encoding = .utf8
+        return try? String(contentsOfFile: self, usedEncoding: &encoding)
+    }
+    
 }
+
 extension Data {
     var utf8string: String? {
         return String(data: self, encoding: .utf8)
     }
+    
     var image: NSImage? {
         return NSImage(data: self)?.resize(maxSize: NSSize(width: 24, height: 24))
     }
@@ -485,3 +556,20 @@ enum Align: String, Decodable {
     case center
     case right
 }
+
+extension String {
+    var fileURL: URL {
+        return URL(fileURLWithPath: self)
+    }
+    
+    var appleScript: NSAppleScript? {
+        return NSAppleScript(source: self)
+    }
+}
+
+extension URL {
+    var appleScript: NSAppleScript? {
+        guard FileManager.default.fileExists(atPath: self.path) else { return nil }
+        return NSAppleScript(contentsOf: self, error: nil)
+    }
+}

MTMR/KeyPress.swift

@@ -29,45 +29,7 @@ extension KeyPress {
     }
 }
 
-func doKey(_ key: Int, down: Bool) {
+func HIDPostAuxKey(_ key: Int32) {
-    let flags = NSEvent.ModifierFlags(rawValue: down ? 0xa00 : 0xb00)
+    let key = UInt8(key)
-    let data1 = (key << 16) | ((down ? 0xa : 0xb) << 8)
+    MediaKeys.hidPostAuxKey(key)
-    
-    let ev = NSEvent.otherEvent(
-        with: NSEvent.EventType.systemDefined,
-        location: NSPoint(x:0.0, y:0.0),
-        modifierFlags: flags,
-        timestamp: TimeInterval(0),
-        windowNumber: 0,
-        context: nil,
-        // context: 0,
-        subtype: 8,
-        data1: data1,
-        data2: -1
-    )
-    let cev = ev!.cgEvent!
-    cev.post(tap: CGEventTapLocation(rawValue: 0)!)
 }
-
-func HIDPostAuxKey(_ key: Int) {
-    doKey(key, down: true)
-    doKey(key, down: false)
-}
-
-
-//     hidsystem/ev_keymap.h
-let NX_KEYTYPE_SOUND_UP   = 0
-let NX_KEYTYPE_SOUND_DOWN = 1
-let NX_KEYTYPE_MUTE = 7
-
-let NX_KEYTYPE_BRIGHTNESS_UP    = 2
-let NX_KEYTYPE_BRIGHTNESS_DOWN  = 3
-
-let NX_KEYTYPE_PLAY       = 16
-let NX_KEYTYPE_NEXT       = 17
-let NX_KEYTYPE_PREVIOUS   = 18
-
-
-
-
-

MTMR/ScrollViewItem.swift

@@ -1,6 +1,8 @@
 import Foundation
 
-class ScrollViewItem: NSCustomTouchBarItem {
+class ScrollViewItem: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
+    var twofingersPrev: CGFloat = 0.0
+    var threefingersPrev: CGFloat = 0.0
     
     init(identifier: NSTouchBarItem.Identifier, items: [NSTouchBarItem]) {
         super.init(identifier: identifier)
@@ -11,10 +13,63 @@ class ScrollViewItem: NSCustomTouchBarItem {
         let scrollView = NSScrollView(frame: CGRect(origin: .zero, size: stackView.fittingSize))
         scrollView.documentView = stackView
         self.view = scrollView
+        
+        let twofingers = NSPanGestureRecognizer(target: self, action: #selector(twofingersHandler(_:)))
+        twofingers.allowedTouchTypes = .direct
+        twofingers.numberOfTouchesRequired = 2
+        self.view.addGestureRecognizer(twofingers)
+        
+        let threefingers = NSPanGestureRecognizer(target: self, action: #selector(threefingersHandler(_:)))
+        threefingers.allowedTouchTypes = .direct
+        threefingers.numberOfTouchesRequired = 3
+        self.view.addGestureRecognizer(threefingers)
     }
     
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
     
+    @objc func twofingersHandler(_ sender: NSGestureRecognizer?) { // Volume
+        let position = (sender?.location(in: sender?.view).x)!
+        
+        switch sender!.state {
+        case .began:
+            twofingersPrev = position
+        case .changed:
+            if (((position-twofingersPrev) > 10) || ((twofingersPrev-position) > 10)) {
+                if position > twofingersPrev {
+                    HIDPostAuxKey(NX_KEYTYPE_SOUND_UP)
+                } else if position < twofingersPrev {
+                    HIDPostAuxKey(NX_KEYTYPE_SOUND_DOWN)
+                }
+                twofingersPrev = position
+            }
+        case .ended:
+            twofingersPrev = 0.0
+        default:
+            break
+        }
+    }
+    
+    @objc func threefingersHandler(_ sender: NSGestureRecognizer?) { // Brightness
+        let position = (sender?.location(in: sender?.view).x)!
+        
+        switch sender!.state {
+        case .began:
+            threefingersPrev = position
+        case .changed:
+            if (((position-threefingersPrev) > 15) || ((threefingersPrev-position) > 15)) {
+                if position > threefingersPrev {
+                    GenericKeyPress(keyCode: CGKeyCode(144)).send()
+                } else if position < threefingersPrev {
+                    GenericKeyPress(keyCode: CGKeyCode(145)).send()
+                }
+                threefingersPrev = position
+            }
+        case .ended:
+            threefingersPrev = 0.0
+        default:
+            break
+        }
+    }
 }

MTMR/SupportHelpers.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import AppKit
 
 extension String {
     func trim() -> String {
@@ -17,6 +18,24 @@ extension String {
         // ((\s|,)\/\*[\s\S]*?\*\/)|(( |, ")\/\/.*)
         return self.replacingOccurrences(of: "((\\s|,)\\/\\*[\\s\\S]*?\\*\\/)|(( |, \\\")\\/\\/.*)", with: "", options: .regularExpression)
     }
+    
+    var hexColor: NSColor? {
+        let hex = trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
+        var int = UInt32()
+        Scanner(string: hex).scanHexInt32(&int)
+        let a, r, g, b: UInt32
+        switch hex.count {
+        case 3: // RGB (12-bit)
+            (r, g, b, a) = ((int >> 8) * 17, (int >> 4 & 0xF) * 17, (int & 0xF) * 17, 255)
+        case 6: // RGB (24-bit)
+            (r, g, b, a) = (int >> 16, int >> 8 & 0xFF, int & 0xFF, 255)
+        case 8: // ARGB (32-bit)
+            (r, g, b, a) = (int >> 24, int >> 16 & 0xFF, int >> 8 & 0xFF, int & 0xFF)
+        default:
+            return nil
+        }
+        return NSColor(red: CGFloat(r) / 255, green: CGFloat(g) / 255, blue: CGFloat(b) / 255, alpha: CGFloat(a) / 255)
+    }
 }
 
 extension NSImage {

MTMR/SupportNSTouchBar.swift

@@ -0,0 +1,31 @@
+//
+//  ExtendNSTouchBar.swift
+//  MTMR
+//
+//  Created by Anton Palgunov on 07/06/2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+func presentSystemModal(_ touchBar: NSTouchBar!, systemTrayItemIdentifier identifier: NSTouchBarItem.Identifier!) -> Void {
+    if #available(OSX 10.14, *) {
+        NSTouchBar.presentSystemModalTouchBar(touchBar, systemTrayItemIdentifier: identifier)
+    } else {
+        NSTouchBar.presentSystemModalFunctionBar(touchBar, systemTrayItemIdentifier: identifier)
+    }
+}
+
+func presentSystemModal(_ touchBar: NSTouchBar!, placement: Int64, systemTrayItemIdentifier identifier: NSTouchBarItem.Identifier!) -> Void {
+    if #available(OSX 10.14, *) {
+        NSTouchBar.presentSystemModalTouchBar(touchBar, placement: placement, systemTrayItemIdentifier: identifier)
+    } else {
+        NSTouchBar.presentSystemModalFunctionBar(touchBar, placement: placement, systemTrayItemIdentifier: identifier)
+    }
+}
+
+func minimizeSystemModal(_ touchBar: NSTouchBar!) -> Void {
+    if #available(OSX 10.14, *) {
+        NSTouchBar.minimizeSystemModalTouchBar(touchBar)
+    } else {
+        NSTouchBar.minimizeSystemModalFunctionBar(touchBar)
+    }
+}

MTMR/TouchBarController.swift

@@ -13,6 +13,9 @@ struct ExactItem {
     let presetItem: BarItemDefinition
 }
 
+let appSupportDirectory = NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR")
+let standardConfigPath = appSupportDirectory.appending("/items.json")
+
 extension ItemType {
 
     var identifierBase: String {
@@ -37,6 +40,10 @@ extension ItemType {
             return "com.toxblh.mtmr.currency"
         case .inputsource():
             return "com.toxblh.mtmr.inputsource."
+        case .music(interval: _):
+            return "com.toxblh.mtmr.music."
+        case .groupBar(items: _):
+            return "com.toxblh.mtmr.groupBar."
         }
     }
 
@@ -50,8 +57,10 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
 
     static let shared = TouchBarController()
 
-    let touchBar = NSTouchBar()
+    var touchBar: NSTouchBar!
 
+    fileprivate var lastPresetPath = ""
+    var jsonItems: [BarItemDefinition] = []
     var itemDefinitions: [NSTouchBarItem.Identifier: BarItemDefinition] = [:]
     var items: [NSTouchBarItem.Identifier: NSTouchBarItem] = [:]
     var leftIdentifiers: [NSTouchBarItem.Identifier] = []
@@ -61,25 +70,60 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
     var scrollArea: NSCustomTouchBarItem?
     var centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString))
 
+    var controlStripState: Bool {
+        get {
+            return UserDefaults.standard.bool(forKey: "com.toxblh.mtmr.settings.showControlStrip")
+        }
+        set {
+            UserDefaults.standard.set(!controlStripState, forKey: "com.toxblh.mtmr.settings.showControlStrip")
+        }
+    }
+    
+    var touchbarNeedRefresh: Bool = true
+    
+    var blacklistAppIdentifiers: [String] = []
+    var frontmostApplicationIdentifier: String? {
+        get {
+            guard let frontmostId = NSWorkspace.shared.frontmostApplication?.bundleIdentifier else { return nil }
+            return frontmostId
+        }
+    }
+    
     private override init() {
         super.init()
         SupportedTypesHolder.sharedInstance.register(typename: "exitTouchbar", item: .staticButton(title: "exit"), action: .custom(closure: { [weak self] in self?.dismissTouchBar()}), longAction: .none)
+        
+        SupportedTypesHolder.sharedInstance.register(typename: "close") { _ in
+            return (item: .staticButton(title: ""), action: .custom(closure: { [weak self] in
+                guard let `self` = self else { return }
+                self.reloadPreset(path: self.lastPresetPath)
+            }), longAction: .none, parameters: [.width: .width(30), .image: .image(source: (NSImage(named: .stopProgressFreestandingTemplate))!)])
+        }
 
-        createAndUpdatePreset()
+        if let blackListed = UserDefaults.standard.stringArray(forKey: "com.toxblh.mtmr.blackListedApps") {
+            self.blacklistAppIdentifiers = blackListed
+        }
+        
+        NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didLaunchApplicationNotification, object: nil)
+        NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didTerminateApplicationNotification, object: nil)
+        NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(activeApplicationChanged), name: NSWorkspace.didActivateApplicationNotification, object: nil)
+        
+        reloadStandardConfig()
     }
     
-    func createAndUpdatePreset(jsonItems: [BarItemDefinition]? = nil) {
+    func createAndUpdatePreset(newJsonItems: [BarItemDefinition]) {
-        var jsonItems = jsonItems
+        if let oldBar = self.touchBar {
+            minimizeSystemModal(oldBar)
+        }
+        self.touchBar = NSTouchBar()
+        self.jsonItems = newJsonItems
         self.itemDefinitions = [:]
         self.items = [:]
         self.leftIdentifiers = []
         self.centerItems = []
         self.rightIdentifiers = []
         
-        if (jsonItems == nil) {
+        loadItemDefinitions(jsonItems: self.jsonItems)
-            jsonItems = readConfig()
-        }
-        loadItemDefinitions(jsonItems: jsonItems!)
         createItems()
         
         centerItems = centerIdentifiers.compactMap({ (identifier) -> NSTouchBarItem? in
@@ -92,26 +136,48 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
         touchBar.delegate = self
         touchBar.defaultItemIdentifiers = []
         touchBar.defaultItemIdentifiers = self.leftIdentifiers + [centerScrollArea] + self.rightIdentifiers
-        self.presentTouchBar()
+        
+        self.updateActiveApp()
     }
     
-    func readConfig() -> [BarItemDefinition]?  {
+    @objc func activeApplicationChanged(_ n: Notification) {
-        let appSupportDirectory = NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true).first!.appending("/MTMR")
+        updateActiveApp()
-        let presetPath = appSupportDirectory.appending("/items.json")
+    }
+    
+    func updateActiveApp() {
+        if self.blacklistAppIdentifiers.index(of: self.frontmostApplicationIdentifier!) != nil {
+            DFRElementSetControlStripPresenceForIdentifier(.controlStripItem, false)
+            self.touchbarNeedRefresh = true
+        } else {
+            presentTouchBar()
+            self.touchbarNeedRefresh = false
+        }
+    }
+    
+    func reloadStandardConfig() {
+        let presetPath = standardConfigPath
         if !FileManager.default.fileExists(atPath: presetPath),
             let defaultPreset = Bundle.main.path(forResource: "defaultPreset", ofType: "json") {
             try? FileManager.default.createDirectory(atPath: appSupportDirectory, withIntermediateDirectories: true, attributes: nil)
             try? FileManager.default.copyItem(atPath: defaultPreset, toPath: presetPath)
         }
         
-        let jsonData = presetPath.fileData
+        reloadPreset(path: presetPath)
-        
+    }
-        return jsonData?.barItemDefinitions() ?? [BarItemDefinition(type: .staticButton(title: "bad preset"), action: .none, longAction: .none, additionalParameters: [:])]
+    
+    func reloadPreset(path: String) {
+        lastPresetPath = path
+        let items = path.fileData?.barItemDefinitions() ?? [BarItemDefinition(type: .staticButton(title: "bad preset"), action: .none, longAction: .none, additionalParameters: [:])]
+        touchbarNeedRefresh = true
+        createAndUpdatePreset(newJsonItems: items)
     }
     
     func loadItemDefinitions(jsonItems: [BarItemDefinition]) {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "HH-mm-ss"
+        let time = dateFormatter.string(from: Date())
         for item in jsonItems {
-            let identifierString = item.type.identifierBase.appending(UUID().uuidString)
+            let identifierString = item.type.identifierBase.appending(time + "--" + UUID().uuidString)
             let identifier = NSTouchBarItem.Identifier(identifierString)
             itemDefinitions[identifier] = item
             if item.align == .left {
@@ -135,7 +201,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
     @objc func setupControlStripPresence() {
         DFRSystemModalShowsCloseBoxWhenFrontMost(false)
         let item = NSCustomTouchBarItem(identifier: .controlStripItem)
-        item.view = NSButton(image: #imageLiteral(resourceName: "Strip"), target: self, action: #selector(presentTouchBar))
+        item.view = NSButton(image: #imageLiteral(resourceName: "StatusImage"), target: self, action: #selector(presentTouchBar))
         NSTouchBarItem.addSystemTrayItem(item)
         DFRElementSetControlStripPresenceForIdentifier(.controlStripItem, true)
     }
@@ -145,11 +211,23 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
     }
 
     @objc private func presentTouchBar() {
-        NSTouchBar.presentSystemModalFunctionBar(touchBar, placement: 1, systemTrayItemIdentifier: .controlStripItem)
+        if touchbarNeedRefresh {
+            if self.controlStripState {
+                presentSystemModal(touchBar, systemTrayItemIdentifier: .controlStripItem)
+            } else {
+                presentSystemModal(touchBar, placement: 1, systemTrayItemIdentifier: .controlStripItem)
+            }
+        }
     }
 
     @objc private func dismissTouchBar() {
-        NSTouchBar.minimizeSystemModalFunctionBar(touchBar)
+        self.touchbarNeedRefresh = true
+        minimizeSystemModal(touchBar)
+    }
+    
+    @objc func resetControlStrip() {
+        dismissTouchBar()
+        presentTouchBar()
     }
 
     func touchBar(_ touchBar: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItem.Identifier) -> NSTouchBarItem? {
@@ -166,19 +244,17 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
     }
     
     func createItem(forIdentifier identifier: NSTouchBarItem.Identifier, definition item: BarItemDefinition) -> NSTouchBarItem? {
-        let action = self.action(forItem: item)
-        let longAction = self.longAction(forItem: item)
 
         var barItem: NSTouchBarItem!
         switch item.type {
         case .staticButton(title: let title):
-            barItem = CustomButtonTouchBarItem(identifier: identifier, title: title, onTap: action, onLongTap: longAction, bezelColor: NSColor.controlColor)
+            barItem = CustomButtonTouchBarItem(identifier: identifier, title: title)
         case .appleScriptTitledButton(source: let source, refreshInterval: let interval):
-            barItem = AppleScriptTouchBarItem(identifier: identifier, source: source, interval: interval, onTap: action, onLongTap: longAction)
+            barItem = AppleScriptTouchBarItem(identifier: identifier, source: source, interval: interval)
         case .timeButton(formatTemplate: let template):
-            barItem = TimeTouchBarItem(identifier: identifier, formatTemplate: template, onTap: action, onLongTap: longAction)
+            barItem = TimeTouchBarItem(identifier: identifier, formatTemplate: template)
         case .battery():
-            barItem = BatteryBarItem(identifier: identifier, onTap: action, onLongTap: longAction)
+            barItem = BatteryBarItem(identifier: identifier)
         case .dock:
             barItem = AppScrubberTouchBarItem(identifier: identifier)
         case .volume:
@@ -194,42 +270,63 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
                 barItem = BrightnessViewController(identifier: identifier, refreshInterval: interval)
             }
         case .weather(interval: let interval, units: let units, api_key: let api_key, icon_type: let icon_type):
-            barItem = WeatherBarItem(identifier: identifier, interval: interval, units: units, api_key: api_key, icon_type: icon_type, onTap: action, onLongTap: longAction)
+            barItem = WeatherBarItem(identifier: identifier, interval: interval, units: units, api_key: api_key, icon_type: icon_type)
         case .currency(interval: let interval, from: let from, to: let to):
-            barItem = CurrencyBarItem(identifier: identifier, interval: interval, from: from, to: to, onTap: action, onLongTap: longAction)
+            barItem = CurrencyBarItem(identifier: identifier, interval: interval, from: from, to: to)
         case .inputsource():
-            barItem = InputSourceBarItem(identifier: identifier, onTap: action, onLongTap: longAction)
+            barItem = InputSourceBarItem(identifier: identifier)
+        case .music(interval: let interval):
+            barItem = MusicBarItem(identifier: identifier, interval: interval)
+        case .groupBar(items: let items):
+            barItem = GroupBarItem(identifier: identifier, items: items)
         }
         
+        if let action = self.action(forItem: item), let item = barItem as? CustomButtonTouchBarItem {
+            item.tapClosure = action
+        }
+        if let longAction = self.longAction(forItem: item), let item = barItem as? CustomButtonTouchBarItem {
+            item.longTapClosure = longAction
+        }
+        if case .bordered(let bordered)? = item.additionalParameters[.bordered], let item = barItem as? CustomButtonTouchBarItem {
+            item.isBordered = bordered
+        }
+        if case .background(let color)? = item.additionalParameters[.background], let item = barItem as? CustomButtonTouchBarItem {
+            item.backgroundColor = color
+        }
         if case .width(let value)? = item.additionalParameters[.width], let widthBarItem = barItem as? CanSetWidth {
             widthBarItem.setWidth(value: value)
         }
         if case .image(let source)? = item.additionalParameters[.image], let item = barItem as? CustomButtonTouchBarItem {
-            let button = item.button!
+            item.image = source.image
-            button.image = source.image
+        }
-            button.imagePosition = .imageLeading
+        if case .title(let value)? = item.additionalParameters[.title] {
-            button.imageHugsTitle = true
+            if let item = barItem as? GroupBarItem {
-            button.bezelColor = .clear
+                item.collapsedRepresentationLabel = value
+            } else if let item = barItem as? CustomButtonTouchBarItem {
+                item.title = value
+            }
         }
         return barItem
     }
 
-    func action(forItem item: BarItemDefinition) -> ()->() {
+    func action(forItem item: BarItemDefinition) -> (()->())? {
         switch item.action {
         case .hidKey(keycode: let keycode):
             return { HIDPostAuxKey(keycode) }
         case .keyPress(keycode: let keycode):
             return { GenericKeyPress(keyCode: CGKeyCode(keycode)).send() }
-        case .appleSctipt(source: let source):
+        case .appleScript(source: let source):
             guard let appleScript = source.appleScript else {
                 print("cannot create apple script for item \(item)")
                 return {}
             }
             return {
-                var error: NSDictionary?
+                DispatchQueue.appleScriptQueue.async {
-                appleScript.executeAndReturnError(&error)
+                    var error: NSDictionary?
-                if let error = error {
+                    appleScript.executeAndReturnError(&error)
-                    print("error \(error) when handling \(item) ")
+                    if let error = error {
+                        print("error \(error) when handling \(item) ")
+                    }
                 }
             }
         case .shellScript(executable: let executable, parameters: let parameters):
@@ -252,18 +349,18 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
         case .custom(closure: let closure):
             return closure
         case .none:
-            return {}
+            return nil
         }
     }
 
     
-    func longAction(forItem item: BarItemDefinition) -> ()->() {
+    func longAction(forItem item: BarItemDefinition) -> (()->())? {
         switch item.longAction {
         case .hidKey(keycode: let keycode):
             return { HIDPostAuxKey(keycode) }
         case .keyPress(keycode: let keycode):
             return { GenericKeyPress(keyCode: CGKeyCode(keycode)).send() }
-        case .appleSctipt(source: let source):
+        case .appleScript(source: let source):
             guard let appleScript = source.appleScript else {
                 print("cannot create apple script for item \(item)")
                 return {}
@@ -295,7 +392,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
         case .custom(closure: let closure):
             return closure
         case .none:
-            return {}
+            return nil
         }
     }
 }

MTMR/Widgets/AppScrubberTouchBarItem.swift

@@ -178,7 +178,9 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub
         
         if (self.ticks > maxTicks) {
             if let processIdentifier = applications[selected].pid {
-                NSRunningApplication(processIdentifier: processIdentifier)?.forceTerminate()
+                if !(NSRunningApplication(processIdentifier: processIdentifier)?.terminate())! {
+                    NSRunningApplication(processIdentifier: processIdentifier)?.forceTerminate()
+                }
             }
         } else {
             hf.tap(strong: 6)
@@ -229,7 +231,7 @@ class AppScrubberTouchBarItem: NSCustomTouchBarItem, NSScrubberDelegate, NSScrub
     public func getDockPersistentAppsList() -> [DockItem] {
         var returnable: [DockItem] = []
         
-        for (index, bundleIdentifier) in persistentAppIdentifiers.enumerated() {
+        for bundleIdentifier in persistentAppIdentifiers {
             if !self.runningAppsIdentifiers.contains(bundleIdentifier) {
                 let dockItem = DockItem(bundleIdentifier: bundleIdentifier, icon: getIcon(forBundleIdentifier: bundleIdentifier))
                 returnable.append(dockItem)

MTMR/Widgets/BatteryBarItem.swift

@@ -10,20 +10,28 @@ import IOKit.ps
 import Foundation
 
 class BatteryBarItem: CustomButtonTouchBarItem {
-    private var timer: Timer!
+    private let batteryInfo = BatteryInfo()
     
-    init(identifier: NSTouchBarItem.Identifier, onTap: @escaping () -> (), onLongTap: @escaping () -> ()) {
+    init(identifier: NSTouchBarItem.Identifier) {
-        super.init(identifier: identifier, title: " ", onTap: onTap, onLongTap: onLongTap)
+        super.init(identifier: identifier, title: " ")
-        self.view = button
         
-        let batteryInfo = BatteryInfo(button: button)
+        batteryInfo.start { [weak self] in
-        batteryInfo.start()
+            self?.refresh()
-        batteryInfo.updateInfo()
+        }
+        self.refresh()
     }
     
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+    
+    func refresh() {
+        self.attributedTitle = self.batteryInfo.formattedInfo()
+    }
+    
+    deinit {
+        batteryInfo.stop()
+    }
 }
 
 class BatteryInfo: NSObject {
@@ -34,18 +42,11 @@ class BatteryInfo: NSObject {
     var isCharging: Bool = false
     var ACPower: String = ""
     var timeRemaining: String = ""
-    
+    var notifyBlock: ()->() = {}
-    var button: NSButton?
     var loop:CFRunLoopSource?
     
-    init(button: NSButton) {
+    func start(notifyBlock: @escaping ()->()) {
-        super.init()
+        self.notifyBlock = notifyBlock
-        
-        self.button = button
-        self.start()
-    }
-    
-    func start() {
         let opaque = Unmanaged.passRetained(self).toOpaque()
         let context = UnsafeMutableRawPointer(opaque)
         loop = IOPSNotificationCreateRunLoopSource({ (context) in
@@ -54,16 +55,17 @@ class BatteryInfo: NSObject {
             }
             
             let watcher = Unmanaged<BatteryInfo>.fromOpaque(ctx).takeUnretainedValue()
-            watcher.updateInfo()
+            watcher.notifyBlock()
-            }, context).takeRetainedValue() as CFRunLoopSource
+        }, context).takeRetainedValue() as CFRunLoopSource
         CFRunLoopAddSource(CFRunLoopGetCurrent(), loop, CFRunLoopMode.defaultMode)
     }
     
     func stop() {
-        if !(self.loop != nil) {
+        self.notifyBlock = {}
+        guard let loop = self.loop else {
             return
         }
-        CFRunLoopRemoveSource(CFRunLoopGetCurrent(), self.loop, CFRunLoopMode.defaultMode)
+        CFRunLoopRemoveSource(CFRunLoopGetCurrent(), loop, CFRunLoopMode.defaultMode)
         self.loop = nil
     }
     
@@ -108,28 +110,38 @@ class BatteryInfo: NSObject {
     
     func getFormattedTime(time: Int) -> String {
         if (time > 0) {
-            let timeFormatted = NSString(format: " (%d:%02d)", time / 60, time % 60) as String
+            let timeFormatted = NSString(format: " %d:%02d", time / 60, time % 60) as String
             return timeFormatted
-        } else if (time == 0) {
-            return ""
         }
         
-        return " (?)"
+        return ""
     }
     
-    public func updateInfo() {
+    public func formattedInfo() -> NSAttributedString {
         var title = ""
         self.getPSInfo()
         
         if ACPower == "AC Power" {
-            title += "⚡️"
+            if current < 100 {
+                title += "⚡️"
+            }
             timeRemaining = getFormattedTime(time: timeToFull)
         } else {
             timeRemaining = getFormattedTime(time: timeToEmpty)
         }
         
-        title += String(current) + "%" + timeRemaining
+        title += String(current) + "%"
-        button?.title = title
+        
+        var color = NSColor.white
+        if current <= 10 && ACPower != "AC Power" {
+            color = NSColor.red
+        }
+        
+        let newTitle = NSMutableAttributedString(string: title as String, attributes: [.foregroundColor: color, .font: NSFont.systemFont(ofSize: 15), .baselineOffset: 1])
+        let newTitleSecond = NSMutableAttributedString(string: timeRemaining as String, attributes: [NSAttributedStringKey.foregroundColor: color, NSAttributedStringKey.font: NSFont.systemFont(ofSize: 8, weight: .regular), NSAttributedStringKey.baselineOffset: 7])
+        newTitle.append(newTitleSecond)
+        newTitle.setAlignment(.center, range: NSRange(location: 0, length: title.count))
+        return newTitle
     }
     
 }

MTMR/Widgets/CurrencyBarItem.swift

@@ -36,7 +36,7 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
         "ETH": "Ξ",
     ]
 
-    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, from: String, to: String, onTap: @escaping () -> (), onLongTap: @escaping () -> ()) {
+    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, from: String, to: String) {
         activity = NSBackgroundActivityScheduler(identifier: "\(identifier.rawValue).updatecheck")
         activity.interval = interval
         self.from = from
@@ -48,9 +48,7 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
             self.prefix = from
         }
 
-        super.init(identifier: identifier, title: "⏳", onTap: onTap, onLongTap: onLongTap)
+        super.init(identifier: identifier, title: "⏳")
-
-        self.view = button
 
         activity.repeats = true
         activity.qualityOfService = .utility
@@ -107,14 +105,11 @@ class CurrencyBarItem: CustomButtonTouchBarItem {
         }
         self.oldValue = value
 
-        button.title = String(format: "%@%.2f", self.prefix, value)
+        let title = String(format: "%@%.2f", self.prefix, value)
 
-        let textRange = NSRange(location: 0, length: button.title.count)
+        let regularFont = self.attributedTitle.attribute(.font, at: 0, effectiveRange: nil) as? NSFont ?? NSFont.systemFont(ofSize: 15)
-        let newTitle = NSMutableAttributedString(string: button.title)
+        let newTitle = NSMutableAttributedString(string: title as String, attributes: [.foregroundColor: color, .font: regularFont])
-        newTitle.addAttribute(NSAttributedStringKey.foregroundColor, value: color, range: textRange)
+        newTitle.setAlignment(.center, range: NSRange(location: 0, length: title.count))
-        newTitle.addAttribute(NSAttributedStringKey.font, value: button.font!, range: textRange)
+        self.attributedTitle = newTitle
-        newTitle.setAlignment(.center, range: textRange)
-
-        button.attributedTitle = newTitle
     }
 }

MTMR/Widgets/GroupBarItem.swift

@@ -0,0 +1,103 @@
+//
+//  GroupBarItem.swift
+//  MTMR
+//
+//  Created by Daniel Apatin on 11.05.2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+import Cocoa
+
+class GroupBarItem: NSPopoverTouchBarItem, NSTouchBarDelegate {
+    
+    var jsonItems: [BarItemDefinition]
+    
+    var itemDefinitions: [NSTouchBarItem.Identifier: BarItemDefinition] = [:]
+    var items: [NSTouchBarItem.Identifier: NSTouchBarItem] = [:]
+    var leftIdentifiers: [NSTouchBarItem.Identifier] = []
+    var centerIdentifiers: [NSTouchBarItem.Identifier] = []
+    var centerItems: [NSTouchBarItem] = []
+    var rightIdentifiers: [NSTouchBarItem.Identifier] = []
+    var scrollArea: NSCustomTouchBarItem?
+    var centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString))
+    
+    init(identifier: NSTouchBarItem.Identifier, items: [BarItemDefinition]) {
+        jsonItems = items
+        super.init(identifier: identifier)
+        self.popoverTouchBar.delegate = self
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    deinit {
+        
+    }
+    
+    @objc override func showPopover(_ sender: Any?) {
+        self.itemDefinitions = [:]
+        self.items = [:]
+        self.leftIdentifiers = []
+        self.centerItems = []
+        self.rightIdentifiers = []
+        
+        self.loadItemDefinitions(jsonItems: jsonItems)
+        self.createItems()
+        
+        centerItems = centerIdentifiers.compactMap({ (identifier) -> NSTouchBarItem? in
+            return items[identifier]
+        })
+        
+        self.centerScrollArea = NSTouchBarItem.Identifier("com.toxblh.mtmr.scrollArea.".appending(UUID().uuidString))
+        self.scrollArea = ScrollViewItem(identifier: centerScrollArea, items: centerItems)
+        
+        TouchBarController.shared.touchBar.delegate = self
+        TouchBarController.shared.touchBar.defaultItemIdentifiers = []
+        TouchBarController.shared.touchBar.defaultItemIdentifiers = self.leftIdentifiers + [centerScrollArea] + self.rightIdentifiers
+        
+        if TouchBarController.shared.controlStripState {
+            presentSystemModal(TouchBarController.shared.touchBar, systemTrayItemIdentifier: .controlStripItem)
+        } else {
+            presentSystemModal(TouchBarController.shared.touchBar, placement: 1, systemTrayItemIdentifier: .controlStripItem)
+        }
+    }
+    
+    func touchBar(_ touchBar: NSTouchBar, makeItemForIdentifier identifier: NSTouchBarItem.Identifier) -> NSTouchBarItem? {
+        if identifier == centerScrollArea {
+            return self.scrollArea
+        }
+        
+        guard let item = self.items[identifier],
+            let definition = self.itemDefinitions[identifier],
+            definition.align != .center else {
+                return nil
+        }
+        return item
+    }
+    
+    func loadItemDefinitions(jsonItems: [BarItemDefinition]) {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "HH-mm-ss"
+        let time = dateFormatter.string(from: Date())
+        for item in jsonItems {
+            let identifierString = item.type.identifierBase.appending(time + "--" + UUID().uuidString)
+            let identifier = NSTouchBarItem.Identifier(identifierString)
+            itemDefinitions[identifier] = item
+            if item.align == .left {
+                leftIdentifiers.append(identifier)
+            }
+            if item.align == .right {
+                rightIdentifiers.append(identifier)
+            }
+            if item.align == .center {
+                centerIdentifiers.append(identifier)
+            }
+        }
+    }
+    
+    func createItems() {
+        for (identifier, definition) in self.itemDefinitions {
+            self.items[identifier] = TouchBarController.shared.createItem(forIdentifier: identifier, definition: definition)
+        }
+    }
+}

MTMR/Widgets/InputSourceBarItem.swift

@@ -11,40 +11,45 @@ import Cocoa
 class InputSourceBarItem: CustomButtonTouchBarItem {
 
     fileprivate var notificationCenter: CFNotificationCenter
+    let buttonSize = NSSize(width: 21, height: 21)
 
-    init(identifier: NSTouchBarItem.Identifier, onTap: @escaping () -> (), onLongTap: @escaping () -> ()) {
+    init(identifier: NSTouchBarItem.Identifier) {
         notificationCenter = CFNotificationCenterGetDistributedCenter();
-        super.init(identifier: identifier, title: "⏳", onTap: onTap, onLongTap: onLongTap)
+        super.init(identifier: identifier, title: "⏳")
 
         observeIputSourceChangedNotification();
         textInputSourceDidChange()
-
+        self.tapClosure = { [weak self] in
-        self.button.action = #selector(switchInputSource)
+            self?.switchInputSource()
+        }
     }
 
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-
+    
+    deinit {
+        CFNotificationCenterRemoveEveryObserver(notificationCenter, UnsafeRawPointer(Unmanaged.passUnretained(self).toOpaque()));
+    }
+    
     @objc public func textInputSourceDidChange() {
         let currentSource = TISCopyCurrentKeyboardInputSource().takeUnretainedValue()
 
         var iconImage: NSImage? = nil
 
-        if let imageURL = currentSource.iconImageURL {
+        if let imageURL = currentSource.iconImageURL,
-            if let image = NSImage(contentsOf: imageURL) {
+            let image = NSImage(contentsOf: imageURL) {
-                iconImage = image
+            iconImage = image
-            }
+        } else if let iconRef = currentSource.iconRef {
-        }
-
-        if iconImage == nil, let iconRef = currentSource.iconRef {
             iconImage = NSImage(iconRef: iconRef)
         }
 
-        if (iconImage != nil) {
+        if let iconImage = iconImage {
-            self.button.image = iconImage
+            iconImage.size = buttonSize
+            self.image = iconImage
+            self.title = ""
         } else {
-            self.button.title = currentSource.name
+            self.title = currentSource.name
         }
     }
 

MTMR/Widgets/MusicBarItem.swift

@@ -0,0 +1,381 @@
+//
+//  MusicBarItem.swift
+//  MTMR
+//
+//  Created by Daniel Apatin on 05.05.2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+import Cocoa
+import ScriptingBridge
+
+class MusicBarItem: CustomButtonTouchBarItem {
+    private let interval: TimeInterval
+    private var songTitle: String?
+    private var timer: Timer?
+    let buttonSize = NSSize(width: 21, height: 21)
+    
+    let playerBundleIdentifiers = [
+        "com.apple.iTunes",
+        "com.spotify.client",
+        "com.coppertino.Vox",
+        "com.google.Chrome",
+        "com.apple.Safari"
+    ]
+    
+    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval) {
+        self.interval = interval
+        
+        super.init(identifier: identifier, title: "⏳")
+        self.isBordered = false
+        
+        self.tapClosure = { [weak self] in self?.playPause() }
+        self.longTapClosure = { [weak self] in self?.nextTrack() }
+        
+        self.refreshAndSchedule()
+    }
+    
+    @objc func marquee(){
+        let str = self.title
+        if (str.count > 10) {
+            let indexFirst = str.index(str.startIndex, offsetBy: 0)
+            let indexSecond = str.index(str.startIndex, offsetBy: 1)
+            self.title = String(str.suffix(from: indexSecond)) + String(str[indexFirst])
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc func playPause() {
+        for ident in playerBundleIdentifiers {
+            if let musicPlayer = SBApplication(bundleIdentifier: ident) {
+                if (musicPlayer.isRunning) {
+                    if (musicPlayer.className == "SpotifyApplication") {
+                        let mp = (musicPlayer as SpotifyApplication)
+                        mp.playpause!()
+                        return
+                    } else if (musicPlayer.className == "ITunesApplication") {
+                        let mp = (musicPlayer as iTunesApplication)
+                        mp.playpause!()
+                        return
+                    } else if (musicPlayer.className == "VOXApplication") {
+                        let mp = (musicPlayer as VoxApplication)
+                        mp.playpause!()
+                        return
+                    } else if (musicPlayer.className == "SafariApplication") {
+                        // You must enable the 'Allow JavaScript from Apple Events' option in Safari's Develop menu to use 'do JavaScript'.
+                        let safariApplication = musicPlayer as SafariApplication
+                        let safariWindows = safariApplication.windows?().compactMap({ $0 as? SafariWindow })
+                        for window in safariWindows! {
+                            for tab in window.tabs!() {
+                                let tab = tab as! SafariTab
+                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                                    _ = safariApplication.doJavaScript!("document.getElementsByClassName('player-controls__btn_play')[0].click()", in: tab)
+                                    return
+                                } else if ((tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))!) {
+                                    _ = safariApplication.doJavaScript!("document.getElementsByClassName('audio_page_player_play')[0].click()", in: tab)
+                                    return
+                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                                    _ = safariApplication.doJavaScript!("document.getElementById('movie_player').click()", in: tab)
+                                    return
+                                }
+                            }
+                        }
+                    }
+                    //                    else if (musicPlayer.className == "GoogleChromeApplication") {
+                    //                        let chromeApplication = musicPlayer as GoogleChromeApplication
+                    //                        let chromeWindows = chromeApplication.windows?().compactMap({ $0 as? GoogleChromeWindow })
+                    //                        for window in chromeWindows! {
+                    //                            for tab in window.tabs!() {
+                    //                                let tab = tab as! GoogleChromeTab
+                    //                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                    //                                    chromeApplication.executeJavaScript!(javascript: "document.getElementsByClassName('player-controls__btn_play')[0].click()")
+                    //                                    break
+                    //                                } else if ((tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))!) {
+                    //                                    chromeApplication.executeJavaScript!(javascript: "document.getElementsByClassName('audio_page_player_ctrl')[0].click()")
+                    //                                    break
+                    //                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                    //                                    chromeApplication.executeJavaScript!(javascript: "alert(document.title)") // , id: tab
+                    //                                    break // document.getElementById('movie_player').click()
+                    //                                }
+                    //                            }
+                    //                        }
+                    //                    }
+                    break
+                }
+            }
+        }
+    }
+    
+    @objc func nextTrack() {
+        for ident in playerBundleIdentifiers {
+            if let musicPlayer = SBApplication(bundleIdentifier: ident) {
+                if (musicPlayer.isRunning) {
+                    if (musicPlayer.className == "SpotifyApplication") {
+                        let mp = (musicPlayer as SpotifyApplication)
+                        mp.nextTrack!()
+                        updatePlayer()
+                        return
+                    } else if (musicPlayer.className == "ITunesApplication") {
+                        let mp = (musicPlayer as iTunesApplication)
+                        mp.nextTrack!()
+                        updatePlayer()
+                        return
+                    } else if (musicPlayer.className == "VOXApplication") {
+                        let mp = (musicPlayer as VoxApplication)
+                        mp.next!()
+                        updatePlayer()
+                        return
+                    } else if (musicPlayer.className == "SafariApplication") {
+                        // You must enable the 'Allow JavaScript from Apple Events' option in Safari's Develop menu to use 'do JavaScript'.
+                        let safariApplication = musicPlayer as SafariApplication
+                        let safariWindows = safariApplication.windows?().compactMap({ $0 as? SafariWindow })
+                        for window in safariWindows! {
+                            for tab in window.tabs!() {
+                                let tab = tab as! SafariTab
+                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                                    _ = safariApplication.doJavaScript!("document.getElementsByClassName('player-controls__btn_next')[0].click()", in: tab)
+                                    updatePlayer()
+                                    return
+                                } else if ((tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))!) {
+                                    _ = safariApplication.doJavaScript!("document.getElementsByClassName('audio_page_player_next')[0].click()", in: tab)
+                                    updatePlayer()
+                                    return
+                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                                    _ = safariApplication.doJavaScript!("document.getElementsByClassName('ytp-next-button')[0].click()", in: tab)
+                                    updatePlayer()
+                                    return
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    func refreshAndSchedule() {
+        DispatchQueue.main.async {
+            self.updatePlayer()
+            DispatchQueue.main.asyncAfter(deadline: .now() + self.interval) { [weak self] in
+                self?.refreshAndSchedule()
+            }
+        }
+    }
+    
+    func updatePlayer() {
+        var iconUpdated = false
+        var titleUpdated = false
+        
+        for var ident in playerBundleIdentifiers {
+            if let musicPlayer = SBApplication(bundleIdentifier: ident) {
+                if (musicPlayer.isRunning) {
+                    var tempTitle = ""
+                    if (musicPlayer.className == "SpotifyApplication") {
+                        tempTitle = (musicPlayer as SpotifyApplication).title
+                    } else if (musicPlayer.className == "ITunesApplication") {
+                        tempTitle = (musicPlayer as iTunesApplication).title
+                    } else if (musicPlayer.className == "VOXApplication") {
+                        tempTitle = (musicPlayer as VoxApplication).title
+                    } else if (musicPlayer.className == "SafariApplication") {
+                        let safariApplication = musicPlayer as SafariApplication
+                        let safariWindows = safariApplication.windows?().compactMap({ $0 as? SafariWindow })
+                        for window in safariWindows! {
+                            for tab in window.tabs!() {
+                                let tab = tab as! SafariTab
+                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                                    //                                    if (!(tab.name?.hasSuffix("на Яндекс.Музыке"))!) {
+                                    tempTitle = (tab.name)!
+                                    break
+                                    //                                    }
+                                } else if ((tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))!) {
+                                    tempTitle = (tab.name)!
+                                    break
+                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                                    tempTitle = (tab.name)!
+                                    break
+                                }
+                            }
+                        }
+                        if tempTitle == "" {
+                            ident = ""
+                        }
+                    } else if (musicPlayer.className == "GoogleChromeApplication") {
+                        let chromeApplication = musicPlayer as GoogleChromeApplication
+                        let chromeWindows = chromeApplication.windows?().compactMap({ $0 as? GoogleChromeWindow })
+                        for window in chromeWindows! {
+                            for tab in window.tabs!() {
+                                let tab = tab as! GoogleChromeTab
+                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                                    if (!(tab.title?.hasSuffix("на Яндекс.Музыке"))!) {
+                                        tempTitle = tab.title!
+                                        break
+                                    }
+                                } else if ((tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))!) {
+                                    tempTitle = tab.title!
+                                    break
+                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                                    tempTitle = tab.title!
+                                    break
+                                }
+                            }
+                        }
+                        if tempTitle == "" {
+                            ident = ""
+                        }
+                    }
+                    
+                    if (tempTitle == self.songTitle) {
+                        return
+                    } else {
+                        self.songTitle = tempTitle
+                    }
+                    
+                    if let songTitle = self.songTitle?.ifNotEmpty {
+                        self.title = " " + songTitle + "     "
+                        titleUpdated = true
+                        self.timer?.invalidate()
+                        self.timer = nil
+                        self.timer = Timer.scheduledTimer(timeInterval: 0.25, target: self, selector: #selector(self.marquee), userInfo: nil, repeats: true)
+                    }
+                    if let ident = ident.ifNotEmpty,
+                        let appPath = NSWorkspace.shared.absolutePathForApplication(withBundleIdentifier: ident) {
+                        let image = NSWorkspace.shared.icon(forFile: appPath)
+                        image.size = self.buttonSize
+                        self.image = image
+                        iconUpdated = true
+                    }
+                    break
+                }
+            }
+        }
+        
+        DispatchQueue.main.async {
+            if !iconUpdated {
+                self.image = nil
+            }
+            
+            if !titleUpdated {
+                self.title = ""
+            }
+        }
+    }
+}
+
+@objc protocol SpotifyApplication {
+    @objc optional var currentTrack: SpotifyTrack {get}
+    @objc optional func nextTrack()
+    @objc optional func previousTrack()
+    @objc optional func playpause()
+}
+extension SBApplication: SpotifyApplication{}
+
+@objc protocol SpotifyTrack {
+    @objc optional var artist: String {get}
+    @objc optional var name: String {get}
+}
+extension SBObject: SpotifyTrack{}
+
+extension SpotifyApplication {
+    var title: String {
+        guard let t = currentTrack else { return "" }
+        return (t.artist ?? "") + " — " + (t.name ?? "")
+    }
+}
+
+
+@objc protocol iTunesApplication {
+    @objc optional var currentTrack: iTunesTrack {get}
+    @objc optional func playpause()
+    @objc optional func nextTrack()
+    @objc optional func previousTrack()
+}
+extension SBApplication: iTunesApplication{}
+
+@objc protocol iTunesTrack {
+    @objc optional var artist: String {get}
+    @objc optional var name: String {get}
+}
+extension SBObject: iTunesTrack{}
+
+extension iTunesApplication {
+    var title: String {
+        guard let t = currentTrack else { return "" }
+        return (t.artist ?? "") + " — " + (t.name ?? "")
+    }
+}
+
+
+
+@objc protocol VoxApplication {
+    @objc optional func playpause()
+    @objc optional func next()
+    @objc optional func previous()
+    @objc optional var track: String {get}
+    @objc optional var artist: String {get}
+}
+extension SBApplication: VoxApplication{}
+
+extension VoxApplication {
+    var title: String {
+        return (artist ?? "") + " — " + (track ?? "")
+    }
+}
+
+
+@objc public protocol SBObjectProtocol: NSObjectProtocol {
+    func get() -> Any!
+}
+
+@objc public protocol SBApplicationProtocol: SBObjectProtocol {
+    func activate()
+    var delegate: SBApplicationDelegate! { get set }
+}
+
+@objc public protocol SafariApplication: SBApplicationProtocol {
+    @objc optional func windows() -> SBElementArray
+    @objc optional func doJavaScript(_ x: String!, in in_: Any!) -> Any // Applies a string of JavaScript code to a document.
+}
+extension SBApplication: SafariApplication {}
+
+@objc public protocol SafariWindow: SBObjectProtocol {
+    @objc optional var name: String { get } // The title of the window.
+    @objc optional func tabs() -> SBElementArray
+    //    @objc optional var document: SafariDocument { get } // The document whose contents are displayed in the window.
+    //    @objc optional func setCurrentTab(_ currentTab: SafariTab!) // The current tab.
+}
+extension SBObject: SafariWindow {}
+
+//@objc public protocol SafariDocument: SBObjectProtocol {
+//    @objc optional var name: String { get } // Its name.
+//    @objc optional var URL: String { get } // The current URL of the document.
+//}
+//extension SBObject: SafariDocument {}
+
+@objc public protocol SafariTab: SBObjectProtocol {
+    @objc optional var URL: String { get } // The current URL of the tab.
+    @objc optional var name: String { get } // The name of the tab.
+}
+extension SBObject: SafariTab {}
+
+
+
+@objc public protocol GoogleChromeApplication: SBApplicationProtocol {
+    @objc optional func windows() -> SBElementArray
+    @objc optional func executeJavaScript(javascript: String!) -> Any // Applies a string of JavaScript code to a document. //, id: Any!
+}
+extension SBApplication: GoogleChromeApplication {}
+
+@objc public protocol GoogleChromeWindow: SBObjectProtocol {
+    @objc optional var name: String { get } // The title of the window.
+    @objc optional func tabs() -> SBElementArray
+}
+extension SBObject: GoogleChromeWindow {}
+
+@objc public protocol GoogleChromeTab: SBObjectProtocol {
+    @objc optional var URL: String { get } // The current URL of the tab.
+    @objc optional var title: String { get } // The name of the tab.
+}
+extension SBObject: GoogleChromeTab {}

MTMR/Widgets/TimeTouchBarItem.swift

@@ -3,13 +3,12 @@ import Cocoa
 class TimeTouchBarItem: CustomButtonTouchBarItem {
     private let dateFormatter = DateFormatter()
     private var timer: Timer!
-//    private let button = NSButton(title: "", target: nil, action: nil)
     
-    init(identifier: NSTouchBarItem.Identifier, formatTemplate: String, onTap: @escaping () -> (), onLongTap: @escaping () -> ()) {
+    init(identifier: NSTouchBarItem.Identifier, formatTemplate: String) {
         dateFormatter.setLocalizedDateFormatFromTemplate(formatTemplate)
-        super.init(identifier: identifier, title: " ", onTap: onTap, onLongTap: onLongTap)
+        super.init(identifier: identifier, title: " ")
         timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(updateTime), userInfo: nil, repeats: true)
-        self.view = button
+        self.isBordered = false
         updateTime()
     }
     
@@ -18,7 +17,7 @@ class TimeTouchBarItem: CustomButtonTouchBarItem {
     }
     
     @objc func updateTime() {
-        button.title = self.dateFormatter.string(from: Date())
+        self.title = self.dateFormatter.string(from: Date())
     }
     
 }

MTMR/Widgets/WeatherBarItem.swift

@@ -22,7 +22,7 @@ class WeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
     
     private var manager:CLLocationManager!
     
-    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, units: String, api_key: String, icon_type: String? = "text", onTap: @escaping () -> (), onLongTap: @escaping () -> ()) {
+    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, units: String, api_key: String, icon_type: String? = "text") {
         activity = NSBackgroundActivityScheduler(identifier: "\(identifier.rawValue).updatecheck")
         activity.interval = interval
         self.units = units
@@ -42,9 +42,7 @@ class WeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
             iconsSource = iconsText
         }
         
-        super.init(identifier: identifier, title: "⏳", onTap: onTap, onLongTap: onLongTap)
+        super.init(identifier: identifier, title: "⏳")
-
-        self.view = button
         
         let status = CLLocationManager.authorizationStatus()
         if status == .restricted || status == .denied {
@@ -117,7 +115,7 @@ class WeatherBarItem: CustomButtonTouchBarItem, CLLocationManagerDelegate {
     }
     
     func setWeather(text: String) {
-        button.title = text
+        self.title = text
     }
     
     func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {

MTMR/defaultPreset.json

@@ -73,6 +73,7 @@
   { "type": "volumeDown", "width": 34, "align": "right" },
   { "type": "volume", "width": 60, "align": "right" },
   { "type": "volumeUp", "width": 34, "align": "right" },
+  { "type": "inputsource", "align": "right" },
   { "type": "battery", "align": "right" },
   { "type": "timeButton", "align": "right" }
 ]

MTMRTests/AppleScriptDefinitionTests.swift

@@ -0,0 +1,41 @@
+import XCTest
+
+class AppleScriptDefinitionTests: XCTestCase {
+
+    func testInline() {
+        let buttonNoActionFixture = """
+            [  { "type": "appleScriptTitledButton",  "source": { "inline":  "tell everything fine" } } ]
+        """.data(using: .utf8)!
+        let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
+        guard case .appleScriptTitledButton(let source, _)? = result?.first?.type else {
+            XCTFail()
+            return
+        }
+        XCTAssertEqual(source.string, "tell everything fine")
+    }
+    
+    func testPath() {
+        let buttonNoActionFixture = """
+            [  { "type": "appleScriptTitledButton",  "source": { "filePath":  "/ololo/pew" } } ]
+        """.data(using: .utf8)!
+        let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
+        guard case .appleScriptTitledButton(let source, _)? = result?.first?.type else {
+            XCTFail()
+            return
+        }
+        let sourceStruct = source as? Source
+        XCTAssertEqual(sourceStruct?.filePath, "/ololo/pew")
+    }
+    
+    func testRefreshInterval() {
+        let buttonNoActionFixture = """
+            [  { "type": "appleScriptTitledButton",  "source": { "inline":  "tell everything fine" },  "refreshInterval": 305} ]
+        """.data(using: .utf8)!
+        let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
+        guard case .appleScriptTitledButton(_, 305)? = result?.first?.type else {
+            XCTFail()
+            return
+        }
+    }
+    
+}

MTMRTests/BackgroundColorTests.swift

@@ -0,0 +1,29 @@
+import XCTest
+
+class BackgroundColorTests: XCTestCase {
+    
+    func testOpaque() {
+        let buttonNoActionFixture = """
+            [  { "type": "staticButton",  "title": "Pew", "background": "#FF0000" } ]
+        """.data(using: .utf8)!
+        let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
+        guard case .background(let color)? = result?.first?.additionalParameters[.background] else {
+            XCTFail()
+            return
+        }
+        XCTAssertEqual(color, .red)
+    }
+    
+    func testAlpha() {
+        let buttonNoActionFixture = """
+            [  { "type": "staticButton",  "title": "Pew", "background": "#FF000080" } ]
+        """.data(using: .utf8)!
+        let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
+        guard case .background(let color)? = result?.first?.additionalParameters[.background] else {
+            XCTFail()
+            return
+        }
+        XCTAssertEqual(color.alphaComponent, 0.5, accuracy: 0.01)
+    }
+    
+}

MTMRTests/ParseConfigTests.swift

@@ -1,5 +1,4 @@
 import XCTest
-@testable import MTMR
 
 class ParseConfig: XCTestCase {
     
@@ -8,8 +7,14 @@ class ParseConfig: XCTestCase {
             [  { "type": "staticButton",  "title": "Pew" } ]
         """.data(using: .utf8)!
         let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonNoActionFixture)
-        XCTAssertEqual(result?.first?.type, .staticButton(title: "Pew"))
+        guard case .staticButton("Pew")? = result?.first?.type else {
-        XCTAssertEqual(result?.first?.action, .some(.none))
+            XCTFail()
+            return
+        }
+        guard case .none? = result?.first?.action else {
+            XCTFail()
+            return
+        }
     }
 
     func testButtonKeyCodeAction() {
@@ -17,17 +22,48 @@ class ParseConfig: XCTestCase {
             [  { "type": "staticButton",  "title": "Pew", "action": "hidKey", "keycode": 123} ]
         """.data(using: .utf8)!
         let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonKeycodeFixture)
-        XCTAssertEqual(result?.first?.type, .staticButton(title: "Pew"))
+        guard case .staticButton("Pew")? = result?.first?.type else {
-        XCTAssertEqual(result?.first?.action, .hidKey(keycode: 123))
+            XCTFail()
+            return
+        }
+        guard case .hidKey(keycode: 123)? = result?.first?.action else {
+            XCTFail()
+            return
+        }
     }
     
     func testPredefinedItem() {
         let buttonKeycodeFixture = """
-            [  { "type": "brightnessUp" } ]
+            [  { "type": "escape" } ]
         """.data(using: .utf8)!
         let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonKeycodeFixture)
-        XCTAssertEqual(result?.first?.type, .staticButton(title: "🔆"))
+        guard case .staticButton("esc")? = result?.first?.type else {
-        XCTAssertEqual(result?.first?.action, .keyPress(keycode: 113))
+            XCTFail()
+            return
+        }
+        guard case .keyPress(keycode: 53)? = result?.first?.action else {
+            XCTFail()
+            return
+        }
+    }
+    
+    func testExtendedWidthForPredefinedItem() {
+        let buttonKeycodeFixture = """
+            [  { "type": "escape", "width": 110}, ]
+        """.data(using: .utf8)!
+        let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonKeycodeFixture)
+        guard case .staticButton("esc")? = result?.first?.type else {
+            XCTFail()
+            return
+        }
+        guard case .keyPress(keycode: 53)? = result?.first?.action else {
+            XCTFail()
+            return
+        }
+        guard case .width(110)? = result?.first?.additionalParameters[.width] else {
+            XCTFail()
+            return
+        }
     }
     
 }

README.md

@@ -4,12 +4,20 @@
 </p>
 
 # My TouchBar. My rules
+
+*The TouchBar Customization App for your MacBook Pro*
+
 [![GitHub release](https://img.shields.io/github/release/toxblh/MTMR.svg)](https://github.com/Toxblh/MTMR/releases)
+[![license](https://img.shields.io/github/license/Toxblh/MTMR.svg)](https://github.com/Toxblh/MTMR/blob/master/LICENSE) [![Total downloads](https://img.shields.io/github/downloads/Toxblh/MTMR/total.svg)](https://github.com/Toxblh/MTMR/releases/latest) ![minimal system requirements](https://img.shields.io/badge/required-macOS%2010.12.2-blue.svg) ![travis](https://travis-ci.org/Toxblh/MTMR.svg?branch=master)
 
 <p align="center">
     <img src="Resources/TouchBar-v0.8.1.png">
 </p>
 
+**MTMR** Community:
+[<img height="24px" src="https://github.com/discourse/DiscourseMobile/raw/master/icon.png" /> Discourse](https://forum.mtmr.app)
+[<img height="24px" src="https://telegram.org/img/t_logo.png" /> Telegram](https://t.me/joinchat/AmVYGg8vW38c13_3MxdE_g)
+
 My the idea is to create the program like a platform for plugins for customization TouchBar. I very like BTT and a full custom TouchBar (my [BTT preset](https://github.com/Toxblh/btt-touchbar-preset)). And I want to create it. And it's my the first Swift project for MacOS :)
 
 ### Roadmap
@@ -34,8 +42,8 @@ My the idea is to create the program like a platform for plugins for customizati
 - [ ] System for autoupdate (maybe https://sparkle-project.org/)
 
 Settings:
-- [ ] Intarface for plugins and export like presets
+- [ ] Interface for plugins and export like presets
-- [ ] Startup at login
+- [x] Startup at login
 - [ ] Show on/off in Dock
 - [ ] Show on/off in StatusBar
 - [ ] On/off Haptic Feedback
@@ -45,9 +53,8 @@ Maybe:
 
 
 ## Installation
-1. Download last release [Releases](https://github.com/Toxblh/MTMR/releases)
+- Download last [release](https://github.com/Toxblh/MTMR/releases)
-3. Open MTMR
+- Or via Homebrew `brew cask install mtmr`
-4. Open preset `open ~/Library/Application\ Support/MTMR/items.json` and customize it. Restart MTMR to apply changes.
 
 ## Preset
 
@@ -68,6 +75,8 @@ File for customize your preset for MTMR: `open ~/Library/Application\ Support/MT
 - battery
 - currency
 - weather
+- inputsource
+- music (tap for pause, longTap for next)
 
 > Media Keys
 - previous
@@ -78,6 +87,10 @@ File for customize your preset for MTMR: `open ~/Library/Application\ Support/MT
 - sleep
 - displaySleep
 
+## Gestures on central part:
+- two finger slide: change you Volume
+- three finger slide: change you Brightness
+
 ## Built-in slider types:
 
 - brightness
@@ -109,6 +122,17 @@ File for customize your preset for MTMR: `open ~/Library/Application\ Support/MT
   "formatTemplate": "HH:mm" //optional
 ```
 
+## Groups
+```js
+{
+"type": "group",
+"align": "center",
+"bordered": true,
+"title": "stats",
+"items": [{ button }, {button}, ...]
+}
+```
+
 ## Native plugins
 - `weather`
 > Provider: https://openweathermap.org Need allowance location service
@@ -130,6 +154,17 @@ File for customize your preset for MTMR: `open ~/Library/Application\ Support/MT
   "to": "USD",
 ```
 
+- `music`
+```js
+{
+  "type": "music",
+  "align": "center",
+  "width": 80,
+  "bordered": false,
+  "refreshInterval": 2,
+},
+```
+
 ## Actions:
 - `hidKey`
 > https://github.com/aosm/IOHIDFamily/blob/master/IOHIDSystem/IOKit/hidsystem/ev_keymap.h use only numbers
@@ -167,7 +202,21 @@ File for customize your preset for MTMR: `open ~/Library/Application\ Support/MT
  "url": "https://google.com",
 ```
 
-## Additional paramaters:
+## LongActions
+This then you want to use longPress for some operations is will the same values like for Actions but different additional parameters, example:
+```js
+ "longAction": "hidKey",
+ "longKeycode": 53,
+```
+
+- longAction
+- longKeycode
+- longActionAppleScript
+- longExecutablePath
+- longShellArguments
+- longUrl
+
+## Additional parameters:
 
 - `width` allow to restrict how much room a particular button will take
 ```json
@@ -245,4 +294,8 @@ File for customize your preset for MTMR: `open ~/Library/Application\ Support/MT
 
 ## Credits
 
+<a href="https://www.buymeacoffee.com/toxblh" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: auto !important;width: auto !important;" ></a>
+
 Built by [@Toxblh](https://patreon.com/toxblh) and [@ReDetection](http://patreon.com/ReDetection).
+
+[![Analytics](https://ga-beacon.appspot.com/UA-96373624-2/mtmr?pixel)](https://github.com/igrigorik/ga-beacon)

TECHNICAL_DEBT.md

@@ -3,3 +3,4 @@
 * try view controllers on `NSCustomTouchBarItem` instead of subclassing item itself
 * try move away from enums when parse preset – enums are hard to extend
 * find better way to hide bar items
+* extract bar items creating from TouchBarController to separate class, cover with tests

build.sh

@@ -16,8 +16,11 @@ cd Release
 rm -r App.xcarchive
 
 # Prerequisite: npm i -g create-dmg
-create-dmg "${NAME}.app"
+NAME_DMG="${NAME}.app"
+echo $NAME_DMG
+create-dmg $NAME_DMG
+
+VERSION=`mdls -raw -name kMDItemVersion ${NAME}.app`
 
-VERSION=`mdls -raw -name kMDItemVersion MTMR.app`
 echo $VERSION
 zip -r "${NAME}v${VERSION}.zip" "${NAME}.app"