Merge branch 'arc' into App-Store-1.9.1

Classes/Helpers/CenteredTextLayer.swift

@@ -0,0 +1,24 @@
+//
+//  CenteredTextLayer.swift
+//  Simple Comic
+//
+//  Created by J-rg on 09.12.20.
+//  Copyright © 2020 Dancing Tortoise Software. All rights reserved.
+//
+
+import QuartzCore
+
+@objc
+class CenteredTextLayer: CATextLayer {
+
+	override func draw(in ctx: CGContext) {
+		let height = bounds.size.height
+		let fontSize = self.fontSize
+		let yDiff = (height - fontSize) / 2 - fontSize / 10
+
+		ctx.saveGState()
+		ctx.translateBy(x: 0, y: -yDiff)
+		super.draw(in: ctx)
+		ctx.restoreGState()
+	}
+}

Classes/Preferences/DTPreferencesController.swift

@@ -0,0 +1,16 @@
+//
+//  DTPreferencesController.swift
+//  Simple Comic
+//
+//  Created by J-rg on 20.04.20.
+//  Copyright © 2020 Dancing Tortoise Software. All rights reserved.
+//
+
+import Cocoa
+
+class DTPreferencesController: NSWindowController {
+
+	convenience init() {
+		self.init(windowNibName: "Preferences")
+	}
+}

Classes/Session/DTToolbarItems.swift

@@ -0,0 +1,37 @@
+//
+//  DTToolbarItems.swift
+//  Simple Comic
+//
+//  Created by J-rg on 09.12.20.
+//  Copyright © 2020 Dancing Tortoise Software. All rights reserved.
+//
+
+import Cocoa
+
+class DTToolbarItem: NSToolbarItem {
+
+	override func validate() {
+		guard let toolbarDelegate = toolbar?.delegate as? TSSTSessionWindowController else { return }
+
+		if toolbarDelegate.responds(to: #selector(getter: TSSTSessionWindowController.pageSelectionInProgress)) {
+			(view as? NSControl)?.isEnabled = !(toolbarDelegate.pageSelectionInProgress)
+		}
+	}
+}
+
+class DTPageTurnToolbarItem: DTToolbarItem {
+
+	override func validate() {
+		guard let toolbarDelegate = toolbar?.delegate as? TSSTSessionWindowController else { return }
+
+		if toolbarDelegate.responds(to: #selector(getter: TSSTSessionWindowController.canTurnPageLeft)) {
+			(view as? NSSegmentedControl)?.setEnabled(toolbarDelegate.canTurnPageLeft, forSegment: 0)
+		}
+
+		if toolbarDelegate.responds(to: #selector(getter: TSSTSessionWindowController.canTurnPageRight)) {
+			(view as? NSSegmentedControl)?.setEnabled(toolbarDelegate.canTurnPageRight, forSegment: 1)
+		}
+
+		super.validate()
+	}
+}

Classes/Session/NSWindow+Extensions.swift

@@ -0,0 +1,25 @@
+//
+//  DTWindowCategory.swift
+//  Simple Comic
+//
+//  Created by J-rg on 21.11.20.
+//  Copyright © 2020 Dancing Tortoise Software. All rights reserved.
+//
+
+import Cocoa
+
+@objc
+extension NSWindow {
+
+	var toolbarHeight: CGFloat {
+		get {
+			return frame.height - contentRect(forFrameRect: frame).height
+		}
+	}
+
+	var isFullscreen: Bool {
+		get {
+			return styleMask.contains(.fullScreen)
+		}
+	}
+}

Classes/Session/TSSTPageView.m

@@ -23,7 +23,7 @@
 #import "SimpleComicAppDelegate.h"
 #import "TSSTSessionWindowController.h"
 #import "TSSTManagedSession.h"
-#import "CenteredTextLayer.h"
+#import "Simple_Comic-Swift.h"
 
 typedef NS_ENUM(int, TSSTTurn) {
 	TSSTTurnNone = 0,

Classes/Session/TSSTSessionWindowController.h

@@ -86,7 +86,6 @@ typedef NS_ENUM(NSInteger, PageSelectionMode)  {
 
 @property (copy) NSArray<NSSortDescriptor*> * pageSortDescriptor;
 @property (assign) NSInteger pageTurn;
-@property (copy) NSString * pageNames;
 
 - (instancetype)initWithSession:(TSSTManagedSession *)aSession;
 

Classes/Session/TSSTSessionWindowController.m

@@ -27,7 +27,6 @@
 #import "TSSTPage.h"
 #import "TSSTManagedGroup.h"
 #import "TSSTManagedSession.h"
-#import "DTWindowCategory.h"
 
 #import "Simple_Comic-Swift.h"
 
@@ -39,7 +38,6 @@ @implementation TSSTSessionWindowController
 	TSSTManagedSession * session;
 
 	/** This var is bound to the session window name */
-	NSString *pageNames;
 	NSInteger pageTurn;
 
 	/** Exactly what it sounds like */
@@ -54,7 +52,7 @@ @implementation TSSTSessionWindowController
 	CGFloat savedZoom;
 }
 
-@synthesize pageTurn, pageNames, pageSortDescriptor;
+@synthesize pageTurn, pageSortDescriptor;
 @synthesize pageController;
 @synthesize pageView;
 @synthesize pageScrollView;
@@ -1040,7 +1038,12 @@ - (void)changeViewImages
 			titleString = [NSString stringWithFormat:@"%@ — %@", fileName, titleString];
 		}
 	}
-	self.pageNames = titleString;
+	if (@available(macOS 11.0, *)) {
+		self.window.title = fileName;
+		self.window.subtitle = [titleString stringByReplacingOccurrencesOfString:[NSString stringWithFormat:@"%@ — ", fileName] withString:@""];
+	} else {
+		self.window.title = titleString;
+	}
 	[pageView setFirstPage: pageOne.pageImage secondPageImage: pageTwo.pageImage];
 
 	[self scaleToWindow];

Classes/SimpleComicAppDelegate.m

@@ -25,7 +25,6 @@
 #import "TSSTManagedGroup.h"
 #import "TSSTManagedSession.h"
 #import "TSSTCustomValueTransformers.h"
-#import "DTPreferencesController.h"
 #import "Simple_Comic-Swift.h"
 #import "TSSTManagedSession+CoreDataProperties.h"
 #import <WebPMac/TSSTWebPImageRep.h>