Merge pull request #740 from glouel/master

pl support/beta 6 stuff that wasn't merged
JohnCoates · Apr 11, 2019 · 8921304 · 8921304
2 parents 9166a7e + 272d03a
commit 8921304
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 8 deletions.
diff --git a/Aerial.xcodeproj/project.pbxproj b/Aerial.xcodeproj/project.pbxproj
@@ -44,6 +44,8 @@
 		03D37FDA22145487005A146F /* es.json in Resources */ = {isa = PBXBuildFile; fileRef = 03D37FD722145487005A146F /* es.json */; };
 		03D37FDB22145487005A146F /* fr.json in Resources */ = {isa = PBXBuildFile; fileRef = 03D37FD822145487005A146F /* fr.json */; };
 		03D37FDC22145487005A146F /* fr.json in Resources */ = {isa = PBXBuildFile; fileRef = 03D37FD822145487005A146F /* fr.json */; };
+		03D3DAC4221F286700BDA52F /* pl.json in Resources */ = {isa = PBXBuildFile; fileRef = 03D3DAC3221F286700BDA52F /* pl.json */; };
+		03D3DAC5221F286D00BDA52F /* pl.json in Resources */ = {isa = PBXBuildFile; fileRef = 03D3DAC3221F286700BDA52F /* pl.json */; };
 		03E8730C2165013C002B469B /* DownloadManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E8730B2165013C002B469B /* DownloadManager.swift */; };
 		03E8730F216501ED002B469B /* AsynchronousOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E8730E216501ED002B469B /* AsynchronousOperation.swift */; };
 		03E8731021662AEB002B469B /* DownloadManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E8730B2165013C002B469B /* DownloadManager.swift */; };
@@ -115,6 +117,7 @@
 		03A2CB9B216BA9AF0061E8E8 /* VideoManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoManager.swift; sourceTree = "<group>"; };
 		03D37FD722145487005A146F /* es.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = es.json; sourceTree = "<group>"; };
 		03D37FD822145487005A146F /* fr.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = fr.json; sourceTree = "<group>"; };
+		03D3DAC3221F286700BDA52F /* pl.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = pl.json; sourceTree = "<group>"; };
 		03E8730B2165013C002B469B /* DownloadManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadManager.swift; sourceTree = "<group>"; };
 		03E8730E216501ED002B469B /* AsynchronousOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsynchronousOperation.swift; sourceTree = "<group>"; };
 		03E8731221675FE0002B469B /* TimeManagement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeManagement.swift; sourceTree = "<group>"; };
@@ -190,6 +193,7 @@
 		033192DF217B77E90073B580 /* Community */ = {
 			isa = PBXGroup;
 			children = (
+				03D3DAC3221F286700BDA52F /* pl.json */,
 				03D37FD722145487005A146F /* es.json */,
 				03D37FD822145487005A146F /* fr.json */,
 				033192E0217B78240073B580 /* en.json */,
@@ -513,6 +517,7 @@
 				0369985E2196129C00E359D3 /* missingvideos.json in Resources */,
 				033D62B0216CAE2C00F3AF83 /* icon-night-dark.pdf in Resources */,
 				0395835621807D1F008E8F9C /* thumbnail.png in Resources */,
+				03D3DAC5221F286D00BDA52F /* pl.json in Resources */,
 				FAC36F481BE1756D007F2A20 /* Assets.xcassets in Resources */,
 				033D62AC216CADCD00F3AF83 /* icon-day-dark.pdf in Resources */,
 				FAC36F4A1BE1756D007F2A20 /* MainMenu.xib in Resources */,
@@ -538,6 +543,7 @@
 				FAC36F531BE1756D007F2A20 /* PreferencesWindow.xib in Resources */,
 				03D37FDB22145487005A146F /* fr.json in Resources */,
 				FAC36F4D1BE1756D007F2A20 /* icon-day.pdf in Resources */,
+				03D3DAC4221F286700BDA52F /* pl.json in Resources */,
 				033D62AB216CADCD00F3AF83 /* icon-day-dark.pdf in Resources */,
 				0395835321807D1F008E8F9C /* [email protected] in Resources */,
 				0395835521807D1F008E8F9C /* thumbnail.png in Resources */,

diff --git a/Aerial/App/Resources/Info.plist b/Aerial/App/Resources/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.7test8</string>
+	<string>1.4.7beta6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Aerial/Source/Controllers/Preferences.swift b/Aerial/Source/Controllers/Preferences.swift
@@ -96,7 +96,7 @@ final class Preferences {
     }
 
     enum MultiMonitorMode: Int {
-        case mainOnly, mirrored, independant
+        case mainOnly, mirrored, independant, secondaryOnly
     }
 
     enum TimeMode: Int {

diff --git a/Aerial/Source/Models/Cache/PoiStringProvider.swift b/Aerial/Source/Models/Cache/PoiStringProvider.swift
@@ -163,7 +163,7 @@ final class PoiStringProvider {
             let cc = locale.languageCode
             // Just in case, cause we had a crash earlier with the fr one for some reason...
             // This is probably no longer needed
-            if cc == "en" || cc == "es" || cc == "fr" {
+            if cc == "en" || cc == "es" || cc == "fr" || cc == "pl" {
                 if preferences.localizeDescriptions {
                     let path = Bundle(for: PoiStringProvider.self).path(forResource: cc, ofType: "json")
                     if path != nil {

diff --git a/Aerial/Source/Views/AerialView.swift b/Aerial/Source/Views/AerialView.swift
@@ -86,6 +86,7 @@ final class AerialView: ScreenSaverView {
 
     static var singlePlayerAlreadySetup: Bool = false
     static var sharedPlayerIndex: Int?
+    static var didSkipMain: Bool = false
 
     class var sharedPlayer: AVPlayer {
         struct Static {
@@ -179,7 +180,7 @@ final class AerialView: ScreenSaverView {
     // swiftlint:disable:next cyclomatic_complexity
     func setup() {
         // Initialize Sparkle updater
-        //_ = SUUpdater.init(for: Bundle(for: AerialView.self))
+        _ = SUUpdater.init(for: Bundle(for: AerialView.self))
 
         debugLog("\(self.description) AerialView setup init")
         let preferences = Preferences.sharedInstance
@@ -236,6 +237,14 @@ final class AerialView: ScreenSaverView {
                 return
             }
 
+            if preferences.multiMonitorMode == Preferences.MultiMonitorMode.secondaryOnly.rawValue {
+                if !AerialView.didSkipMain {
+                    AerialView.didSkipMain = true
+                    isDisabled = true
+                    return
+                }
+            }
+
             // check if we should share preview's player
             //let noPlayers = (AerialView.players.count == 0)
             let previewPlayerExists = (AerialView.previewPlayer != nil)

diff --git a/Resources/Info.plist b/Resources/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.7test8</string>
+	<string>1.4.7beta6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.7test8</string>
+	<string>1.4.7beta6</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Resources/PreferencesWindow.xib b/Resources/PreferencesWindow.xib
@@ -144,7 +144,7 @@
                                 <font key="font" metaFont="system"/>
                                 <tabViewItems>
                                     <tabViewItem label="Videos" identifier="1" id="dfl-QA-fvD">
-                                        <view key="view" id="zsM-Ha-kCO">
+                                        <view key="view" ambiguous="YES" id="zsM-Ha-kCO">
                                             <rect key="frame" x="10" y="33" width="614" height="381"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
@@ -422,6 +422,9 @@ is disabled
                                                                 <menuItem title="Only on Main Display" state="on" id="ajH-jt-gZt"/>
                                                                 <menuItem title="Mirrored on All Displays" id="V9X-dq-asD"/>
                                                                 <menuItem title="Different on Each Display" id="pui-N6-dxE"/>
+                                                                <menuItem title="Only on Secondary Displays" id="bRZ-vP-z9k" userLabel="Only on Secondary Displays">
+                                                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                                                </menuItem>
                                                             </items>
                                                         </menu>
                                                     </popUpButtonCell>
@@ -913,7 +916,7 @@ should appear</string>
                                         </view>
                                     </tabViewItem>
                                     <tabViewItem label="Time" identifier="" id="PtY-yV-jgj">
-                                        <view key="view" ambiguous="YES" id="ziy-Hg-uzO">
+                                        <view key="view" id="ziy-Hg-uzO">
                                             <rect key="frame" x="10" y="33" width="614" height="381"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>