Skip to content

Commit

Permalink
Merge pull request #564 from glouel/feature/v1.4.2
Browse files Browse the repository at this point in the history 
Feature/v1.4.2
  • Loading branch information
@glouel
glouel authored Oct 21, 2018
2 parents 68babc1 + 1cc9aa0 commit e47d063
Show file tree
Hide file tree
Showing 40 changed files with 2,030 additions and 921 deletions.
Binary file removed Aerial.saver/Contents/Frameworks/libswiftAVFoundation.dylib
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Frameworks/libswiftAppKit.dylib
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Frameworks/libswiftCore.dylib
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Frameworks/libswiftCoreAudio.dylib
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Frameworks/libswiftCoreData.dylib
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Frameworks/libswiftCoreGraphics.dylib
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Frameworks/libswiftCoreImage.dylib
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Frameworks/libswiftCoreMedia.dylib
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Frameworks/libswiftDarwin.dylib
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Frameworks/libswiftDispatch.dylib
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Frameworks/libswiftFoundation.dylib
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Frameworks/libswiftObjectiveC.dylib
View file
Binary file not shown.
53 changes: 0 additions & 53 deletions Aerial.saver/Contents/Info.plist
View file

This file was deleted.

Binary file removed Aerial.saver/Contents/MacOS/Aerial
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Resources/PreferencesWindow.nib
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Resources/icon-day.pdf
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Resources/icon-night.pdf
View file
Binary file not shown.
Binary file removed Aerial.saver/Contents/Resources/thumbnail.png
View file
Binary file not shown.
26 changes: 20 additions & 6 deletions Aerial.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,16 @@
030D9B7C21551A8D00961E95 /* AerialPlayerItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7E2E5D1FC62E8B00E5F320 /* AerialPlayerItem.swift */; };
03233B68217272640077D3F9 /* PoiStringProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03233B67217272640077D3F9 /* PoiStringProvider.swift */; };
03233B692172762C0077D3F9 /* PoiStringProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03233B67217272640077D3F9 /* PoiStringProvider.swift */; };
033192E1217B78240073B580 /* en.json in Resources */ = {isa = PBXBuildFile; fileRef = 033192E0217B78240073B580 /* en.json */; };
033192E2217B78240073B580 /* en.json in Resources */ = {isa = PBXBuildFile; fileRef = 033192E0217B78240073B580 /* en.json */; };
033D62AB216CADCD00F3AF83 /* icon-day-dark.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 033D62AA216CADCD00F3AF83 /* icon-day-dark.pdf */; };
033D62AC216CADCD00F3AF83 /* icon-day-dark.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 033D62AA216CADCD00F3AF83 /* icon-day-dark.pdf */; };
033D62AD216CADCD00F3AF83 /* icon-day-dark.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 033D62AA216CADCD00F3AF83 /* icon-day-dark.pdf */; };
033D62AF216CAE2C00F3AF83 /* icon-night-dark.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 033D62AE216CAE2C00F3AF83 /* icon-night-dark.pdf */; };
033D62B0216CAE2C00F3AF83 /* icon-night-dark.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 033D62AE216CAE2C00F3AF83 /* icon-night-dark.pdf */; };
033D62B1216CAE2C00F3AF83 /* icon-night-dark.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 033D62AE216CAE2C00F3AF83 /* icon-night-dark.pdf */; };
03893CB3217749F0008E7125 /* ErrorLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03893CB2217749F0008E7125 /* ErrorLog.swift */; };
03893CB4217753AC008E7125 /* ErrorLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03893CB2217749F0008E7125 /* ErrorLog.swift */; };
0393857A2175D4B80040B850 /* AVPlayerViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039385792175D4B80040B850 /* AVPlayerViewExtension.swift */; };
0393857B2175D4B80040B850 /* AVPlayerViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039385792175D4B80040B850 /* AVPlayerViewExtension.swift */; };
0393857C2175D4B80040B850 /* AVPlayerViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039385792175D4B80040B850 /* AVPlayerViewExtension.swift */; };
Expand Down Expand Up @@ -59,8 +63,6 @@
FAC36F651BE1772F007F2A20 /* CollectionType+Shuffling.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC36F631BE1772F007F2A20 /* CollectionType+Shuffling.swift */; };
FAC36F671BE1778C007F2A20 /* ManifestLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC36F661BE1778C007F2A20 /* ManifestLoader.swift */; };
FAC36F681BE1778C007F2A20 /* ManifestLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC36F661BE1778C007F2A20 /* ManifestLoader.swift */; };
FAC36F6A1BE1780B007F2A20 /* Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC36F691BE1780B007F2A20 /* Debug.swift */; };
FAC36F6B1BE1780B007F2A20 /* Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC36F691BE1780B007F2A20 /* Debug.swift */; };
FAF450211BE2B45D00C1F98A /* VideoLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAF450201BE2B45D00C1F98A /* VideoLoader.swift */; };
FAF450221BE2B45D00C1F98A /* VideoLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAF450201BE2B45D00C1F98A /* VideoLoader.swift */; };
FAF450241BE2D2FD00C1F98A /* VideoCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAF450231BE2D2FD00C1F98A /* VideoCache.swift */; };
Expand All @@ -79,8 +81,10 @@

/* Begin PBXFileReference section */
03233B67217272640077D3F9 /* PoiStringProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PoiStringProvider.swift; sourceTree = "<group>"; };
033192E0217B78240073B580 /* en.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = en.json; sourceTree = "<group>"; };
033D62AA216CADCD00F3AF83 /* icon-day-dark.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "icon-day-dark.pdf"; sourceTree = "<group>"; };
033D62AE216CAE2C00F3AF83 /* icon-night-dark.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "icon-night-dark.pdf"; sourceTree = "<group>"; };
03893CB2217749F0008E7125 /* ErrorLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorLog.swift; sourceTree = "<group>"; };
039385792175D4B80040B850 /* AVPlayerViewExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVPlayerViewExtension.swift; sourceTree = "<group>"; };
03A2CB9B216BA9AF0061E8E8 /* VideoManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoManager.swift; sourceTree = "<group>"; };
03E8730B2165013C002B469B /* DownloadManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadManager.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -110,7 +114,6 @@
FAC36F441BE1756D007F2A20 /* CheckCellView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = CheckCellView.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
FAC36F631BE1772F007F2A20 /* CollectionType+Shuffling.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CollectionType+Shuffling.swift"; sourceTree = "<group>"; };
FAC36F661BE1778C007F2A20 /* ManifestLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = ManifestLoader.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
FAC36F691BE1780B007F2A20 /* Debug.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Debug.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
FACAF1A51BD9FC6000E539DC /* Aerial.saver */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Aerial.saver; sourceTree = BUILT_PRODUCTS_DIR; };
FAF450201BE2B45D00C1F98A /* VideoLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = VideoLoader.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
FAF450231BE2D2FD00C1F98A /* VideoCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = VideoCache.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
Expand Down Expand Up @@ -142,6 +145,14 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
033192DF217B77E90073B580 /* Community */ = {
isa = PBXGroup;
children = (
033192E0217B78240073B580 /* en.json */,
);
path = Community;
sourceTree = "<group>";
};
03E8730D216501B3002B469B /* Downloads */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -191,6 +202,7 @@
FAC36F361BE1756D007F2A20 /* Resources */ = {
isa = PBXGroup;
children = (
033192DF217B77E90073B580 /* Community */,
033D62AA216CADCD00F3AF83 /* icon-day-dark.pdf */,
FAC36F371BE1756D007F2A20 /* icon-day.pdf */,
FAC36F381BE1756D007F2A20 /* icon-night.pdf */,
Expand Down Expand Up @@ -231,7 +243,7 @@
FAC36F621BE17701007F2A20 /* Extensions */,
FAC36F401BE1756D007F2A20 /* AerialVideo.swift */,
FAC36F661BE1778C007F2A20 /* ManifestLoader.swift */,
FAC36F691BE1780B007F2A20 /* Debug.swift */,
03893CB2217749F0008E7125 /* ErrorLog.swift */,
03E8731221675FE0002B469B /* TimeManagement.swift */,
);
path = Models;
Expand Down Expand Up @@ -409,6 +421,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
033192E2217B78240073B580 /* en.json in Resources */,
FAC36F541BE1756D007F2A20 /* PreferencesWindow.xib in Resources */,
FAC36F4E1BE1756D007F2A20 /* icon-day.pdf in Resources */,
033D62B0216CAE2C00F3AF83 /* icon-night-dark.pdf in Resources */,
Expand Down Expand Up @@ -439,6 +452,7 @@
FAC36F551BE1756D007F2A20 /* thumbnail.png in Resources */,
033D62AF216CAE2C00F3AF83 /* icon-night-dark.pdf in Resources */,
FAC36F4F1BE1756D007F2A20 /* icon-night.pdf in Resources */,
033192E1217B78240073B580 /* en.json in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -465,6 +479,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
03893CB4217753AC008E7125 /* ErrorLog.swift in Sources */,
03233B692172762C0077D3F9 /* PoiStringProvider.swift in Sources */,
03A2CB9D216BB1490061E8E8 /* VideoManager.swift in Sources */,
03E87314216760B7002B469B /* TimeManagement.swift in Sources */,
Expand All @@ -476,7 +491,6 @@
FAC36F5C1BE1756D007F2A20 /* AerialView.swift in Sources */,
FAC36F681BE1778C007F2A20 /* ManifestLoader.swift in Sources */,
FAC36F581BE1756D007F2A20 /* PreferencesWindowController.swift in Sources */,
FAC36F6B1BE1780B007F2A20 /* Debug.swift in Sources */,
FAB22A7F1BE17D7D0065C0F5 /* AssetLoaderDelegate.swift in Sources */,
FAC36F601BE175CF007F2A20 /* AppDelegate.swift in Sources */,
FA36BD401BE57F8E00D5E03B /* VideoDownload.swift in Sources */,
Expand Down Expand Up @@ -510,10 +524,10 @@
FAC36F571BE1756D007F2A20 /* PreferencesWindowController.swift in Sources */,
FAC36F671BE1778C007F2A20 /* ManifestLoader.swift in Sources */,
FAC36F591BE1756D007F2A20 /* AerialVideo.swift in Sources */,
03893CB3217749F0008E7125 /* ErrorLog.swift in Sources */,
AA7E2E5E1FC62E8B00E5F320 /* AerialPlayerItem.swift in Sources */,
03A2CB9C216BA9AF0061E8E8 /* VideoManager.swift in Sources */,
FAF450211BE2B45D00C1F98A /* VideoLoader.swift in Sources */,
FAC36F6A1BE1780B007F2A20 /* Debug.swift in Sources */,
03E8731321675FE0002B469B /* TimeManagement.swift in Sources */,
FAB22A7E1BE17D7D0065C0F5 /* AssetLoaderDelegate.swift in Sources */,
03233B68217272640077D3F9 /* PoiStringProvider.swift in Sources */,
Expand Down
15 changes: 8 additions & 7 deletions Aerial/App/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {

func applicationDidFinishLaunching(_ notification: Notification) {
let objects = objectsFromNib(loadNibNamed: "PreferencesWindow")

guard let windowIndex = objects.index(where: { $0 is NSWindow }),
let preferencesWindow = objects[windowIndex] as? NSWindow
else {
fatalError("Missing window object")

// We need to find the correct window in our nib
for object in objects {
if object is NSWindow {
if (object as! NSWindow).identifier!.rawValue == "preferencesWindow" {
setUp(preferencesWindow: (object as! NSWindow))
}
}
}

setUp(preferencesWindow: preferencesWindow)
}

private func setUp(preferencesWindow window: NSWindow) {
Expand Down
2 changes: 1 addition & 1 deletion Aerial/App/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.1</string>
<string>1.4.2test9</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
Loading

0 comments on commit e47d063

Please sign in to comment.