Merge pull request #908 from glouel/master

1.7.0 with 11 new videos
JohnCoates · Jan 29, 2020 · fe8954c · fe8954c
2 parents 3c97661 + 3f06d26
commit fe8954c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/Aerial.xcodeproj/project.pbxproj b/Aerial.xcodeproj/project.pbxproj
@@ -1367,15 +1367,15 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application: Guillaume Louel (3L54M5L5KK)";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.6.5beta4;
+				CURRENT_PROJECT_VERSION = 1.7.0;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3L54M5L5KK;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Resources/Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Screen Savers";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 1.6.5beta4;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1396,15 +1396,15 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application: Guillaume Louel (3L54M5L5KK)";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.6.5beta4;
+				CURRENT_PROJECT_VERSION = 1.7.0;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3L54M5L5KK;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Resources/Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Screen Savers";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 1.6.5beta4;
+				MARKETING_VERSION = 1.7.0;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Aerial/Source/Models/AerialVideo.swift b/Aerial/Source/Models/AerialVideo.swift
@@ -56,6 +56,17 @@ private let seaVideos = [
     "581A4F1A-2B6D-468C-A1BE-6F473F06D10B", // Sea Stars
     "687D03A2-18A5-4181-8E85-38F3A13409B9", // Bumpheads
     "537A4DAB-83B0-4B66-BCD1-05E5DBB4A268", // Jacks
+    "C7AD3D0A-7EDF-412C-A237-B3C9D27381A1", // Alaskan Jellies
+    "C6DC4E54-1130-44F8-AF6F-A551D8E8A181", // Alaskan Jellies
+    "27A37B0F-738D-4644-A7A4-E33E7A6C1175", // California Dolphins
+    "EB3F48E7-D30F-4079-858F-1A61331D5026", // California Kelp Forest
+    "CE9B5D5B-B6E7-47C5-8C04-59BF182E98FB", // Costa Rica Dolphins
+    "58C75C62-3290-47B8-849C-56A583173570", // Cownose Rays
+    "3716DD4B-01C0-4F5B-8DD6-DB771EC472FB", // Gray Reef Sharks
+    "DD47D8E1-CB66-4C12-BFEA-2ADB0D8D1E2E", // Humpback Whale
+    "82175C1F-153C-4EC8-AE37-2860EA828004", // Red Sea Coral
+    "149E7795-DBDA-4F5D-B39A-14712F841118", // Tahiti Waves
+    "8C31B06F-91A4-4F7C-93ED-56146D7F48B9", // Tahiti Waves,
 ]
 
 private let timeInformation = [

diff --git a/Aerial/Source/Views/Layers/BatteryLayer.swift b/Aerial/Source/Views/Layers/BatteryLayer.swift
@@ -62,7 +62,12 @@ class BatteryLayer: AnimationLayer {
         var bstring = ""
 
         if !Battery.isUnplugged() {
-            bstring += "Plugged-in"
+            let percent = Battery.getRemainingPercent()
+            if percent == 100 || percent == 0 {
+                bstring += "Charged"
+            } else {
+                bstring += "Charging"
+            }
         }
 
         let percent = Battery.getRemainingPercent()

diff --git a/Resources/PreferencesWindow.xib b/Resources/PreferencesWindow.xib
@@ -164,7 +164,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>
@@ -783,7 +783,7 @@ is disabled
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <clipView key="contentView" ambiguous="YES" drawsBackground="NO" id="CFu-ab-5NJ">
                                                         <rect key="frame" x="1" y="1" width="178" height="372"/>
-                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                        <autoresizingMask key="autoresizingMask"/>
                                                         <subviews>
                                                             <tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowSizeStyle="automatic" viewBased="YES" id="ipD-s9-BUc">
                                                                 <rect key="frame" x="0.0" y="0.0" width="178" height="372"/>
@@ -1162,7 +1162,7 @@ Shift, but macOS 10.12.4 or above and a compatible Mac are required) </string>
                                         </view>
                                     </tabViewItem>
                                     <tabViewItem label="Brightness" identifier="" id="qTo-kf-FbK">
-                                        <view key="view" ambiguous="YES" id="dIK-5r-Sr4">
+                                        <view key="view" id="dIK-5r-Sr4">
                                             <rect key="frame" x="10" y="33" width="614" height="381"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
@@ -3114,7 +3114,7 @@ After changing the folder, please close System Preferences for this to be taken
             <rect key="frame" x="0.0" y="0.0" width="406" height="36"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jdr-GR-4Cj">
+                <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jdr-GR-4Cj">
                     <rect key="frame" x="18" y="10" width="41" height="16"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Show:" id="IgW-XP-t2u">
@@ -3123,7 +3123,7 @@ After changing the folder, please close System Preferences for this to be taken
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <popUpButton toolTip="How long should each text appear" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CMG-LG-sE8">
+                <popUpButton hidden="YES" toolTip="How long should each text appear" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CMG-LG-sE8">
                     <rect key="frame" x="81" y="4" width="132" height="25"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <popUpButtonCell key="cell" type="push" title="Percent" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="9nb-hm-4xw" id="sQ3-t3-8GA">