Reduce update intervals

leonspok · Dec 13, 2016 · 2d519a1 · 2d519a1
1 parent f4a271b
commit 2d519a1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/Irvue Screensaver/ConfigureSheet.xib b/Irvue Screensaver/ConfigureSheet.xib
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
         <capability name="box content view" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -27,7 +26,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="116" width="509" height="378"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
             <view key="contentView" id="uH8-h8-Dbe">
                 <rect key="frame" x="0.0" y="0.0" width="509" height="378"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -145,7 +144,7 @@
                             <subviews>
                                 <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="45b-G2-f7o">
                                     <rect key="frame" x="18" y="46" width="435" height="24"/>
-                                    <sliderCell key="cell" state="on" alignment="left" minValue="1" maxValue="120" doubleValue="5" tickMarkPosition="below" numberOfTickMarks="10" sliderType="linear" id="Jre-rs-Aik"/>
+                                    <sliderCell key="cell" state="on" alignment="left" minValue="15" maxValue="300" doubleValue="60" tickMarkPosition="below" numberOfTickMarks="20" allowsTickMarkValuesOnly="YES" sliderType="linear" id="Jre-rs-Aik"/>
                                     <connections>
                                         <action selector="updateIntervalChanged:" target="-2" id="mD8-Vu-XMd"/>
                                     </connections>

diff --git a/Irvue Screensaver/Info.plist b/Irvue Screensaver/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.3</string>
 	<key>CFBundleVersion</key>
-	<string>1020</string>
+	<string>1030</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2016 Leonspok. All rights reserved.</string>
 	<key>NSPrincipalClass</key>

diff --git a/Irvue Screensaver/Irvue_ScreensaverView.m b/Irvue Screensaver/Irvue_ScreensaverView.m
@@ -88,7 +88,7 @@ - (void)setUpdateInterval:(NSTimeInterval)updateInterval {
 - (NSTimeInterval)updateInterval {
 	NSNumber *number = [self.defaults objectForKey:kUpdateIntervalKey];
 	if (!number) {
-		[self setUpdateInterval:600.0f];
+		[self setUpdateInterval:60.0f];
 		return [self updateInterval];
 	}
 	return [number doubleValue];
@@ -524,9 +524,10 @@ - (IBAction)selectedSearch:(id)sender {
 }
 
 - (IBAction)updateIntervalChanged:(id)sender {
-	self.updateInterval = self.updateIntervalSlider.doubleValue*60.0;
-	long minutes = (long)round(self.updateInterval/60);
-	NSString *timeStr = (minutes == 1)? @"minute" : [NSString stringWithFormat:@"%ld minutes", minutes];
+	self.updateInterval = self.updateIntervalSlider.doubleValue;
+	NSInteger minutes = ((NSInteger)round(self.updateInterval))/60;
+	NSInteger seconds = ((NSInteger)self.updateInterval)%60;
+	NSString *timeStr = [NSString stringWithFormat:@"%02ld:%02ld", (long)minutes, (long)seconds];
 	self.updateIntervalLabel.stringValue = [NSString stringWithFormat:@"Photos will update every %@", timeStr];
 }
 
@@ -561,7 +562,7 @@ - (IBAction)close:(id)sender {
 		}
 	}
 	[self.defaults synchronize];
-	self.updateInterval = self.updateIntervalSlider.doubleValue*60.0;
+	self.updateInterval = self.updateIntervalSlider.doubleValue;
 }
 
 @end
diff --git a/ScreenSaverRunner/AppDelegate.m b/ScreenSaverRunner/AppDelegate.m
@@ -20,10 +20,10 @@ @implementation AppDelegate
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 	self.screenSaver = [[Irvue_ScreensaverView alloc] initWithFrame:self.window.contentView.bounds isPreview:YES];
 	[self.screenSaver setAutoresizingMask:NSViewHeightSizable|NSViewWidthSizable];
-	[self.screenSaver setSource:PhotosSourceSearch];
-	[self.screenSaver.defaults setObject:@"city" forKey:@"search_query"];
-	[self.screenSaver.defaults synchronize];
-	[self.screenSaver setUpdateInterval:5.0f];
+//	[self.screenSaver setSource:PhotosSourceSearch];
+//	[self.screenSaver.defaults setObject:@"city" forKey:@"search_query"];
+//	[self.screenSaver.defaults synchronize];
+//	[self.screenSaver setUpdateInterval:5.0f];
 	[self.window.contentView addSubview:self.screenSaver];
 }