From 3447ebcec0580f8a00179f3bb6e9c472db812cb2 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 23 Aug 2019 15:52:07 -0700 Subject: [PATCH 1/7] Reload data after a batch update. Fix #872. --- Mac/MainWindow/Sidebar/SidebarViewController.swift | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Mac/MainWindow/Sidebar/SidebarViewController.swift b/Mac/MainWindow/Sidebar/SidebarViewController.swift index 1a8636780..a14fe0dba 100644 --- a/Mac/MainWindow/Sidebar/SidebarViewController.swift +++ b/Mac/MainWindow/Sidebar/SidebarViewController.swift @@ -363,9 +363,8 @@ private extension SidebarViewController { func rebuildTreeAndReloadDataIfNeeded() { if !animatingChanges && !BatchUpdate.shared.isPerforming { - if treeController.rebuild() { - outlineView.reloadData() - } + treeController.rebuild() + outlineView.reloadData() } } From cc7321e936f8ad13e652865e17647a7db10f891c Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 23 Aug 2019 16:22:06 -0700 Subject: [PATCH 2/7] Center the preferences window. Fix #769. --- Mac/Preferences/PreferencesWindowController.swift | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Mac/Preferences/PreferencesWindowController.swift b/Mac/Preferences/PreferencesWindowController.swift index 2ed8628c9..1799eb61b 100644 --- a/Mac/Preferences/PreferencesWindowController.swift +++ b/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] = { @@ -50,9 +49,8 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate { window?.showsToolbarButton = false window?.toolbar = toolbar + window?.center() - window?.setFrameAutosaveName(NSWindow.FrameAutosaveName(windowFrameName)) - switchToViewAtIndex(0) } From 4bead42b5ae5cf3e67b97633f3bc168ebd6c5349 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 23 Aug 2019 18:30:14 -0700 Subject: [PATCH 3/7] Center prefs window after switching to the proper view. --- Mac/Preferences/PreferencesWindowController.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mac/Preferences/PreferencesWindowController.swift b/Mac/Preferences/PreferencesWindowController.swift index 1799eb61b..d8ae463bc 100644 --- a/Mac/Preferences/PreferencesWindowController.swift +++ b/Mac/Preferences/PreferencesWindowController.swift @@ -49,9 +49,10 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate { window?.showsToolbarButton = false window?.toolbar = toolbar - window?.center() switchToViewAtIndex(0) + + window?.center() } // MARK: Actions From dd62a3325ad714c8e8e7e12b0da95b3c4e355258 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 23 Aug 2019 18:30:28 -0700 Subject: [PATCH 4/7] Center the main window on first run. --- Mac/AppDelegate.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index 3c1dd932c..53a823fcb 100644 --- a/Mac/AppDelegate.swift +++ b/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) From 739eb5183ee7727c3fc7eb85d8136661a485675f Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 23 Aug 2019 18:31:04 -0700 Subject: [PATCH 5/7] Bump version and build numbers. --- Mac/Resources/Info.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mac/Resources/Info.plist b/Mac/Resources/Info.plist index 230c42b35..d6d1f694e 100644 --- a/Mac/Resources/Info.plist +++ b/Mac/Resources/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 5.0b5 + 5.0b6 CFBundleURLTypes @@ -33,7 +33,7 @@ CFBundleVersion - 2607 + 2608 LSApplicationCategoryType public.app-category.news LSMinimumSystemVersion From fd7de40d843beb38ce161acc2bc79ad55c0d55d1 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 23 Aug 2019 18:55:00 -0700 Subject: [PATCH 6/7] Update appcasts. --- Appcasts/netnewswire-beta.xml | 13 +++++++++++++ Appcasts/netnewswire-release.xml | 13 +++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Appcasts/netnewswire-beta.xml b/Appcasts/netnewswire-beta.xml index 5de1428ae..a14b54294 100755 --- a/Appcasts/netnewswire-beta.xml +++ b/Appcasts/netnewswire-beta.xml @@ -6,6 +6,19 @@ Most recent NetNewsWire changes with links to updates. en + + NetNewsWire 5.0b6 + Okay — one last beta! Pretty sure, at least.

+

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.

+

Opens preferences window in center of screen.

+

Centers main window on first launch.

+ ]]> + Fri, 23 Aug 2019 18:50:00 -0700 + + 10.14.4 + + NetNewsWire 5.0b5 en - NetNewsWire 5.0b5 + NetNewsWire 5.0b6 This is probably the last beta before the 5.0 release.

-

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.”

-

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.

+

Okay — one last beta! Pretty sure, at least.

+

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.

+

Opens preferences window in center of screen.

+

Centers main window on first launch.

]]> - Wed, 21 Aug 2019 22:05:00 -0700 - + Fri, 23 Aug 2019 18:50:00 -0700 + 10.14.4 From c3aebe786818fd030e4ddcde60ebb038b0173930 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 23 Aug 2019 21:59:44 -0700 Subject: [PATCH 7/7] Bump version and build. --- Mac/Resources/Info.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mac/Resources/Info.plist b/Mac/Resources/Info.plist index d6d1f694e..bffec6487 100644 --- a/Mac/Resources/Info.plist +++ b/Mac/Resources/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 5.0b6 + 5.0 CFBundleURLTypes @@ -33,7 +33,7 @@ CFBundleVersion - 2608 + 2609 LSApplicationCategoryType public.app-category.news LSMinimumSystemVersion