Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire

Appcasts/netnewswire-beta.xml

@@ -6,6 +6,19 @@
         <description>Most recent NetNewsWire changes with links to updates.</description>
         <language>en</language>
 
+			<item>
+         <title>NetNewsWire 5.0b6</title>
+            <description><![CDATA[
+            	<p>Okay — one last beta! Pretty sure, at least.</p>
+            	<p>Fixes a bug with undoing deleting feeds or folders. The sidebar wouldn’t update afterward to show that the feed is back. Now it does.</p>
+            	<p>Opens preferences window in center of screen.</p>
+           		<p>Centers main window on first launch.</p>
+ 							]]></description>
+            <pubDate>Fri, 23 Aug 2019 18:50:00 -0700</pubDate>
+            <enclosure url="https://github.com/brentsimmons/NetNewsWire/releases/download/mac-5.0b6/NetNewsWire5.0b6.zip" sparkle:version="2608" sparkle:shortVersionString="5.0b6" length="5174618" type="application/zip" />
+            <sparkle:minimumSystemVersion>10.14.4</sparkle:minimumSystemVersion>
+        </item>
+
 			<item>
          <title>NetNewsWire 5.0b5</title>
             <description><![CDATA[

Appcasts/netnewswire-release.xml

@@ -7,14 +7,15 @@
         <language>en</language>
 
 			<item>
-         <title>NetNewsWire 5.0b5</title>
+         <title>NetNewsWire 5.0b6</title>
             <description><![CDATA[
-            	<p>This is probably the last beta before the 5.0 release.</p>
+            	<p>Okay — one last beta! Pretty sure, at least.</p>
-            	<p>Preferences > Advanced now has app updating options — you can follow test builds or release builds. Release builds is the default. If you want to continue to get test builds, you’ll have to check the box next to “Test builds.”</p>
+            	<p>Fixes a bug with undoing deleting feeds or folders. The sidebar wouldn’t update afterward to show that the feed is back. Now it does.</p>
-            	<p>Fixed a bug where smart feeds and folders wouldn’t re-fetch after a feed or folder was deleted, and so they might contain articles that should have been removed.</p>
+            	<p>Opens preferences window in center of screen.</p>
+           		<p>Centers main window on first launch.</p>
  							]]></description>
-            <pubDate>Wed, 21 Aug 2019 22:05:00 -0700</pubDate>
+            <pubDate>Fri, 23 Aug 2019 18:50:00 -0700</pubDate>
-            <enclosure url="https://github.com/brentsimmons/NetNewsWire/releases/download/mac-5.0b5/NetNewsWire5.0b5.zip" sparkle:version="2607" sparkle:shortVersionString="5.0b5" length="5174826" type="application/zip" />
+            <enclosure url="https://github.com/brentsimmons/NetNewsWire/releases/download/mac-5.0b6/NetNewsWire5.0b6.zip" sparkle:version="2608" sparkle:shortVersionString="5.0b6" length="5174618" type="application/zip" />
             <sparkle:minimumSystemVersion>10.14.4</sparkle:minimumSystemVersion>
         </item>
 

Mac/AppDelegate.swift

@@ -146,6 +146,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 
 		updateSortMenuItems()
         createAndShowMainWindow()
+		if isFirstRun {
+			mainWindowController?.window?.center()
+		}
 
 		NotificationCenter.default.addObserver(self, selector: #selector(feedSettingDidChange(_:)), name: .FeedSettingDidChange, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(userDefaultsDidChange(_:)), name: UserDefaults.didChangeNotification, object: nil)

Mac/MainWindow/Sidebar/SidebarViewController.swift

@@ -363,11 +363,10 @@ private extension SidebarViewController {
 
 	func rebuildTreeAndReloadDataIfNeeded() {
 		if !animatingChanges && !BatchUpdate.shared.isPerforming {
-			if treeController.rebuild() {
+			treeController.rebuild()
 			outlineView.reloadData()
 		}
 	}
-	}
 
 	func restoreSelection(to nodes: [Node], sendNotificationIfChanged: Bool) {
 		if selectedNodes == nodes { // Nothing to do?

Mac/Preferences/PreferencesWindowController.swift

@@ -29,7 +29,6 @@ private struct ToolbarItemIdentifier {
 
 class PreferencesWindowController : NSWindowController, NSToolbarDelegate {
 	
-	private let windowFrameName = "Preferences"
 	private let windowWidth = CGFloat(512.0) // Width is constant for all views; only the height changes
 	private var viewControllers = [String: NSViewController]()
 	private let toolbarItemSpecs: [PreferencesToolbarItemSpec] = {
@@ -51,9 +50,9 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate {
 		window?.showsToolbarButton = false
 		window?.toolbar = toolbar
 
-		window?.setFrameAutosaveName(NSWindow.FrameAutosaveName(windowFrameName))
-		
 		switchToViewAtIndex(0)
+
+		window?.center()
 	}
 
 	// MARK: Actions

Mac/Resources/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0b5</string>
+	<string>5.0</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -33,7 +33,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2607</string>
+	<string>2609</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.news</string>
 	<key>LSMinimumSystemVersion</key>