Fixed truncated text on thumbnails. Fixed the disappearing cursor bug. Updated to build using Xcode 14.2.

Author: chuchusoft

Controllers/PGPreferenceWindowController.m

@@ -81,7 +81,7 @@ - (IBAction)changePane:(NSToolbarItem *)sender
 - (NSColor *)backgroundPatternColor
 {
 //	NSColor *const color = [[NSUserDefaults standardUserDefaults] PG_decodedObjectForKey:@"PGBackgroundColor"];
-	NSColor *const color = [[NSUserDefaults standardUserDefaults] PG_decodeObjectOfClass:[NSColor class] forKey:@"PGBackgroundColor"];
+	NSColor *const color = [[NSUserDefaults standardUserDefaults] PG_decodeObjectOfClass:[NSColor class] forKey:PGBackgroundColorKey];
 	return [[[NSUserDefaults standardUserDefaults] objectForKey:@"PGBackgroundPattern"] unsignedIntegerValue] == PGCheckerboardPattern ? [color PG_checkerboardPatternColor] : color;
 }
 - (NSScreen *)displayScreen

History.txt

@@ -1,3 +1,9 @@
+2.2.1 (2023-04-30)
+- the folder count and size text would not fully display on the thumbnail if the
+  name displayed above it was short. Fixed.
+- the cursor would disappear sometimes. Fixed.
+- updated to build using Xcode 14.2.
+
 2.2.0 (2022-11-05)
 - Intel version: requires macOS 10.14 or later (only tested under 10.14;
   the app might work as far back as 10.6)

Info.plist

@@ -641,7 +641,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleHelpBookFolder</key>
 	<string>Sequential.help</string>
 	<key>CFBundleHelpBookName</key>
@@ -657,7 +657,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -674,7 +674,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSArchitecturePriority</key>
@@ -729,15 +729,9 @@
 			</array>
 			<key>PGBundleTypeFourCCs</key>
 			<array>
-				<data>
-				UEsDBA==
-				</data>
-				<data>
-				UmFyIQ==
-				</data>
-				<data>
-				N3rCvMKv
-				</data>
+				<data>UEsDBA==</data>
+				<data>UmFyIQ==</data>
+				<data>N3rCvMKv</data>
 			</array>
 		</dict>
 		<key>PGFlickrAdapter</key>
@@ -920,9 +914,7 @@
 			</array>
 			<key>PGBundleTypeFourCC</key>
 			<array>
-				<data>
-				JVBERg==
-				</data>
+				<data>JVBERg==</data>
 			</array>
 		</dict>
 		<key>PGResourceAdapter</key>

Models/PGArchiveAdapter.m

@@ -110,7 +110,7 @@ - (NSArray *)nodesUnderPath:(NSString *)path
 	NSUInteger i = [indexes firstIndex];
 	for(; NSNotFound != i; i = [indexes indexGreaterThanIndex:i]) {
 		@autoreleasepool {	//	REQUIRED otherwise the heap blows up (try it on a 50000 entry zip file)
-			NSString *const entryPath = [_archive nameOfEntry:i];
+			NSString *const entryPath = [_archive nameOfEntry:(int) i];
 			if(!entryPath)
 				continue;
 
@@ -182,7 +182,7 @@ - (NSArray *)nodesUnderPath:(NSString *)path
 #endif
 
 			BOOL const isEntrylessFolder = !PGEqualObjects(subpath, entryPath);
-			BOOL const isFile = !isEntrylessFolder && ![_archive entryIsDirectory:i];
+			BOOL const isFile = !isEntrylessFolder && ![_archive entryIsDirectory:(int) i];
 //NSLog(@"%@\tsubpath '%@', isEntrylessFolder %u, isFile %u", StringAtDepth(depth),
 //	  [subpath substringFromIndex:194], isEntrylessFolder, isFile);
 
@@ -191,7 +191,7 @@ - (NSArray *)nodesUnderPath:(NSString *)path
 			[identifier setNaturalDisplayName:[subpath lastPathComponent]];
 			PGNode *const node = [[[PGNode alloc] initWithParent:parent identifier:identifier] autorelease];
 			if(isFile)
-				[node setDataProvider:[[[PGArchiveDataProvider alloc] initWithArchive:_archive entry:i] autorelease]];
+				[node setDataProvider:[[[PGArchiveDataProvider alloc] initWithArchive:_archive entry:(int) i] autorelease]];
 			else {
 				[node setDataProvider:[[[PGFolderDataProvider alloc] init] autorelease]];
 				if(isEntrylessFolder) {
@@ -505,10 +505,10 @@ - (NSString *)PG_commonRootPath
 	NSInteger i;
 	NSString *root = nil;
 	for(i = 0; i < [self numberOfEntries]; i++) {
-		NSString *entryName = [self nameOfEntry:i];
+		NSString *entryName = [self nameOfEntry:(int) i];
 		if(PG_entryIsInvisibleForName(entryName))//if([self PG_entryIsInvisibleForName:entryName])
 			continue;
-		if(![self entryIsDirectory:i]) entryName = [entryName stringByDeletingLastPathComponent];
+		if(![self entryIsDirectory:(int) i]) entryName = [entryName stringByDeletingLastPathComponent];
 		else if([entryName hasSuffix:@"/"]) entryName = [entryName substringToIndex:[entryName length] - 1];
 		if(!root) root = entryName;
 		else while(!PGEqualObjects(root, entryName)) {
@@ -520,7 +520,7 @@ - (NSString *)PG_commonRootPath
 }
 - (OSType)PG_OSTypeForEntry:(int)entry
 {
-	return [self entryIsDirectory:entry] ? 'fold' : [[[self attributesOfEntry:entry] objectForKey:NSFileHFSTypeCode] unsignedLongValue];
+	return [self entryIsDirectory:entry] ? 'fold' : [[[self attributesOfEntry:entry] objectForKey:NSFileHFSTypeCode] unsignedIntValue];
 }
 
 @end

Models/PGNode.m

@@ -75,7 +75,7 @@ + (NSArray *)pasteboardTypes
 
 + (void)initialize
 {
-	srandom(time(NULL)); // Used by our shuffle sort.
+	srandom((unsigned) time(NULL)); // Used by our shuffle sort.
 }
 
 #pragma mark -PGNode

README.md

@@ -1,26 +1,39 @@
-#  Sequential 2.2.0 (2022-11-05).
+# Sequential 2.2.1 (2023-04-30).
 
+Sequential is an image and comic viewer for macOS.
+
+Sequential can displays images in folders, PDF files, and archives of
+these formats: ZIP CBZ RAR CBR 7z.
 
 This is a modernized build of Sequential for Intel and Apple Silicon Macs
 running 10.14 (Intel) or 11.4 (Apple Silicon) or later.
 
 The last build came out in 2010 so this program needed some work to get it
-working for modern Macs.
+to build and run on modern Macs. Several bugs have been fixed and some
+feature enhancements have been added.
+
+There are parts of the application which probably won’t work properly
+(HTML URLs may not display correctly) and it may have bugs and crashes.
+Caveat emptor. For folders, PDFs and archives, the application works well.
 
 The codebase (and its dependencies) have been updated to build with Xcode
-13.2. Sequential is now built as an Universal app and has been tested on
+14.2. Sequential is now built as an Universal app and has been tested on
 macOS 10.14 (on an Intel Mac) and macOS 11.7.1 (on an Apple Silicon Mac).
 
 
 
 
+## Source code
+
+The modernized Sequential source code is at <https://github.com/chuchusoft/Sequential>.
+
 The original Sequential source code is at <https://github.com/btrask/Sequential>.
 
 
 
 
 
-Building instructions
+## Building instructions
 
 - decompress the source archive into a folder
   - dependencies are included in the source archive
@@ -33,14 +46,14 @@ Building instructions
 
 
 
-Distribution instructions
+## Distribution instructions
 
 - update the History file
 
 - to create the source backup archive:
 
 % cd ~/folder_containing_sequential_sources
-% tar -c -v -J -H -f Sequential_all.tar.xz --exclude=xcuserdata --exclude=.DS_Store Sequential XADMaster UniversalDetector
+% tar -c -v -J -H -f Sequential_all.tar.xz --exclude=xcuserdata --exclude=.DS_Store --exclude=.git  --exclude=.gitignore --exclude=.gitattributes --exclude=Sequential/docs --exclude=XADMaster/Windows Sequential XADMaster UniversalDetector
 
 - to distribute the built app:
 

Sequential.xcodeproj/project.pbxproj

@@ -576,6 +576,7 @@
 		2A37F4AEFDCFA73011CA2CEA /* PGDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PGDocument.h; sourceTree = "<group>"; };
 		2A37F4B0FDCFA73011CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		4BC3A8DC29169EA300BF9C9E /* index.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = index.html; sourceTree = "<group>"; };
+		4BC3A8EA2916A48B00BF9C9E /* _config.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = _config.yml; sourceTree = "<group>"; };
 		4BC63F6D291628360099C1FF /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		8D15AC360486D014006FF6A4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8D15AC370486D014006FF6A4 /* Sequential.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Sequential.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -916,6 +917,7 @@
 		4B10782F29169DB300AEF257 /* docs */ = {
 			isa = PBXGroup;
 			children = (
+				4BC3A8EA2916A48B00BF9C9E /* _config.yml */,
 				4BC3A8DC29169EA300BF9C9E /* index.html */,
 			);
 			path = docs;

Views/PGClipView.m

@@ -368,14 +368,21 @@ - (BOOL)handleMouseDown:(NSEvent *)firstEvent
 		handled = YES;
 		[NSCursor pop];
 		if(PGMouseHiddenDraggingStyle) {
-#if 0	//	2021/07/21 disabled because it's using deprecated APIs and it's unsure what this is doing
 			CGAssociateMouseAndMouseCursorPosition(true);
+#if 1
+			//	2022/11/09 this is probably wrong...
+		//	NSPoint const screenPoint = PGPointInRect([[self window] convertBaseToScreen:finalPoint], [[self window] PG_contentRect]);
+			NSPoint const screenPoint = PGPointInRect([self.window convertPointToScreen:finalPoint], [self.window PG_contentRect]);
+			CGDisplayMoveCursorToPoint(CGMainDisplayID(),	//CGDirectDisplayID display,
+				CGPointMake(round(screenPoint.x), round(CGDisplayPixelsHigh(kCGDirectMainDisplay) - screenPoint.y)));
+#else
+			//	2021/07/21 disabled because it's using deprecated APIs and it's unsure what this is doing
 			NXEventHandle const handle = NXOpenEventStatus();
 			NSPoint const screenPoint = PGPointInRect([[self window] convertBaseToScreen:finalPoint], [[self window] PG_contentRect]);
 			IOHIDSetMouseLocation((io_connect_t)handle, round(screenPoint.x), round(CGDisplayPixelsHigh(kCGDirectMainDisplay) - screenPoint.y)); // Use this function instead of CGDisplayMoveCursorToPoint() because it doesn't make the mouse lag briefly after being moved.
 			NXCloseEventStatus(handle);
-			[NSCursor unhide];
 #endif
+			[NSCursor unhide];
 		}
 		dragMode = PGNotDragging;
 	} else handled = [[self delegate] clipView:self handleMouseEvent:firstEvent first:_firstMouse];