diff --git a/.gitmodules b/.gitmodules index fb6366931..319d02892 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,6 +16,3 @@ [submodule "Frameworks/libatrac9/libatrac9"] path = Frameworks/libatrac9/libatrac9 url = https://github.com/Thealexbarney/LibAtrac9.git -[submodule "Frameworks/Sparkle"] - path = Frameworks/Sparkle - url = https://git.lopez-snowhill.net/chris/Sparkle.git diff --git a/Application/AppController.m b/Application/AppController.m index fead99688..6ef0ca67e 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -12,6 +12,7 @@ #import "SpotlightWindowController.h" #import "StringToURLTransformer.h" #import "FontSizetoLineHeightTransformer.h" +#import "Cog-Swift.h" #import "PathNode.h" #import @@ -36,6 +37,9 @@ NSValueTransformer *miniModeMenuTitleTransformer = [[MiniModeMenuTitleTransformer alloc] init]; [NSValueTransformer setValueTransformer:miniModeMenuTitleTransformer forName:@"MiniModeMenuTitleTransformer"]; + + NSValueTransformer *playbackStatusToHiddenTransformer = [[PlaybackStatusToHiddenTransformer alloc] init]; + [NSValueTransformer setValueTransformer:playbackStatusToHiddenTransformer forName:@"PlaybackStatusToHiddenTransformer"]; } diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib index 52fe14525..d71e64c6f 100644 --- a/Base.lproj/MainMenu.xib +++ b/Base.lproj/MainMenu.xib @@ -14,52 +14,51 @@ - + - + - - - - - - - - - + + - - + - + - + - + - + @@ -97,7 +96,7 @@ - + @@ -118,7 +117,7 @@ - + @@ -308,8 +307,35 @@ - - + + + + + + + + + + + + + Total Duration: %{value1}@ + + + + + + + + + + + + + + + + @@ -319,15 +345,15 @@ - + - + - - - - + + + + @@ -414,12 +440,12 @@ - + - + - + - + - + - + - + - + - + - +