version 1.4.7 (build 21)

gobbledegook · Dec 15, 2021 · 1ae72e6 · 1ae72e6
1 parent 1c33fec
commit 1ae72e6
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 10 deletions.
diff --git a/CreeveyController.m b/CreeveyController.m
@@ -468,7 +468,7 @@ - (char)trashFile:(NSString *)fullpath numLeft:(NSUInteger)numFiles {
 						NSLocalizedString(@"Cancel", @""),
 						(numFiles > 1 ? NSLocalizedString(@"Continue", @"") : nil),
 						nil,
-						[fullpath lastPathComponent], tag) == NSAlertDefaultReturn)
+						[fullpath lastPathComponent], (int)tag) == NSAlertDefaultReturn)
 		return 2;
 	return 0;
 }

diff --git a/CreeveyMainWindowController.m b/CreeveyMainWindowController.m
@@ -538,7 +538,7 @@ - (void)keyDown:(NSEvent *)e {
 			if (!currCat || (c && c != currCat)) {
 				[statusFld setStringValue:[NSString stringWithFormat:
 					NSLocalizedString(@"%u image(s) updated for Group %i", @""),
-					[a count], c]];
+					(unsigned int)[a count], c]];
 				[self performSelector:@selector(updateStatusFld)
 						   withObject:nil
 						   afterDelay:2];
@@ -611,7 +611,7 @@ - (void)updateExifInfo:(id)sender {
 		} else {
 			id s = [selectedIndexes count]
 			? [NSString stringWithFormat:NSLocalizedString(@"%d images selected.", @""),
-				[selectedIndexes count]]
+				(unsigned int)[selectedIndexes count]]
 			: NSLocalizedString(@"No images selected.", @"");
 			NSMutableDictionary *atts = [NSMutableDictionary dictionaryWithObject:
 												[NSFont userFontOfSize:12] forKey:NSFontAttributeName];
@@ -672,7 +672,7 @@ - (void)wrappingMatrix:(DYWrappingMatrix *)m selectionDidChange:(NSIndexSet *)se
 			 }
 			 s = [NSString stringWithFormat:@"%@ (%@)",
 					 [NSString stringWithFormat:NSLocalizedString(@"%d images selected.", @""),
-					 [selectedIndexes count]],
+					 (unsigned int)[selectedIndexes count]],
 				 FileSize2String(totalSize)];
 			 break;
 	 }

diff --git a/DYImageView.m b/DYImageView.m
@@ -138,7 +138,7 @@ - (void)animateGIF:(NSTimer *)t {
 	gifTimer = nil;
 	if (image != [t userInfo]) return; // stop if image is changed
 
-	NSBitmapImageRep *rep = [[t userInfo] representations][0];
+	NSBitmapImageRep *rep = (NSBitmapImageRep *)[[t userInfo] representations][0];
 	NSNumber *frameCount = [rep valueForProperty:NSImageFrameCount];
 	int n = [[rep valueForProperty:NSImageCurrentFrame] intValue];
 	if (++n == [frameCount intValue]) n = 0;
@@ -164,7 +164,6 @@ - (void)setImage:(NSImage *)anImage zooming:(DYImageViewZoomMode)zoomMode {
 		if (!anImage) return; 
 		[image release];
 		image = [anImage retain];
-		[image setScalesWhenResized:YES];
 		NSImageRep *rep = [image representations][0]; // ** assume not corrupt
 		if ([rep isKindOfClass:[NSBitmapImageRep class]]) {
 			[image setSize:NSMakeSize([rep pixelsWide], [rep pixelsHigh])];

diff --git a/Info.plist b/Info.plist
@@ -50,7 +50,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Phoenix Slides</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Phoenix Slides 1.4.6, Copyright 2005-2021 Dominic Yu, Gold Mountain Software</string>
+	<string>Phoenix Slides 1.4.7, Copyright 2005-2021 Dominic Yu, Gold Mountain Software</string>
 	<key>CFBundleHelpBookFolder</key>
 	<string>Phoenix Slides Help</string>
 	<key>CFBundleHelpBookName</key>
@@ -66,11 +66,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.6</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>CrvY</string>
 	<key>CFBundleVersion</key>
-	<string>20</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSExceptionDomains</key>

diff --git a/SlideshowWindow.m b/SlideshowWindow.m
@@ -479,7 +479,7 @@ - (void)displayImage {
 	} else {
 		if (hideInfoFld) [infoFld setHidden:NO];
 		[infoFld setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Loading [%i/%i] %@...", @""),
-			currentIndex+1, [filenames count], [self currentShortFilename]]];
+			(unsigned int)currentIndex+1, (unsigned int)[filenames count], [self currentShortFilename]]];
 		[infoFld sizeToFit];
 		return;
 	}

diff --git a/creevey.xcodeproj/project.pbxproj b/creevey.xcodeproj/project.pbxproj
@@ -792,12 +792,14 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_TEAM = 9436CS8LQX;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = creevey_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/libjpeg";
+				MARKETING_VERSION = 1.4.7;
 				PRODUCT_BUNDLE_IDENTIFIER = net.blyt.phoenixslides;
 				PRODUCT_NAME = "Phoenix Slides";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -816,13 +818,15 @@
 				CODE_SIGN_ENTITLEMENTS = "Phoenix Slides.entitlements";
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_TEAM = 9436CS8LQX;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = creevey_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/libjpeg";
+				MARKETING_VERSION = 1.4.7;
 				PRODUCT_BUNDLE_IDENTIFIER = net.blyt.phoenixslides;
 				PRODUCT_NAME = "Phoenix Slides";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/de.lproj/Phoenix Slides Help/index.html b/de.lproj/Phoenix Slides Help/index.html
@@ -360,6 +360,12 @@ <h2><br>
   <a name="vers"></a>Versions Historie (engl.)
 </h2>
 
+2021.12.15 1.4.7
+<ul>
+	<li>improve image interpolation quality in slideshow</li>
+	<li>improve "Check For Update" behavior</li>
+</ul>
+
 2021.11.20 1.4.6
 <ul>
 	<li>fix slideshow window position on macOS 12 (Monterey)</li>

diff --git a/en.lproj/Phoenix Slides Help/index.html b/en.lproj/Phoenix Slides Help/index.html
@@ -298,6 +298,12 @@ <h2>Help Wanted</h2>
 
 <h2><a name="vers"></a>Version History</h2>
 
+2021.12.15 1.4.7
+<ul>
+	<li>improve image interpolation quality in slideshow</li>
+	<li>improve "Check For Update" behavior</li>
+</ul>
+
 2021.11.20 1.4.6
 <ul>
 	<li>fix slideshow window position on macOS 12 (Monterey)</li>

diff --git a/es.lproj/Phoenix Slides Help/index.html b/es.lproj/Phoenix Slides Help/index.html
@@ -217,6 +217,12 @@ <h2>Se requiere ayuda </h2>
 
 <h2><a name="vers"></a>Historial de cambios </h2>
 
+2021.12.15 1.4.7
+<ul>
+	<li>improve image interpolation quality in slideshow</li>
+	<li>improve "Check For Update" behavior</li>
+</ul>
+
 2021.11.20 1.4.6
 <ul>
 	<li>fix slideshow window position on macOS 12 (Monterey)</li>

diff --git a/it.lproj/Phoenix Slides Help/index.html b/it.lproj/Phoenix Slides Help/index.html
@@ -231,6 +231,12 @@ <h2>Richiesta di Aiuto</h2> <p>Cerco aiuto per localizzazioni: se intendete trad
 
 <h2><a name="vers"></a>Storia delle Versioni</h2>
 
+2021.12.15 1.4.7
+<ul>
+	<li>improve image interpolation quality in slideshow</li>
+	<li>improve "Check For Update" behavior</li>
+</ul>
+
 2021.11.20 1.4.6
 <ul>
 	<li>fix slideshow window position on macOS 12 (Monterey)</li>

diff --git a/zh-Hant.lproj/Phoenix Slides Help/index.html b/zh-Hant.lproj/Phoenix Slides Help/index.html
@@ -180,6 +180,12 @@ <h2>Help Wanted</h2>
 
 <h2><a name="vers"></a>版本歷史(英文)</h2>
 
+2021.12.15 1.4.7
+<ul>
+	<li>improve image interpolation quality in slideshow</li>
+	<li>improve "Check For Update" behavior</li>
+</ul>
+
 2021.11.20 1.4.6
 <ul>
 	<li>fix slideshow window position on macOS 12 (Monterey)</li>