From 235da781dbb05df4a20db3a2fbc4403680984afd Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Sun, 12 Jul 2020 21:47:29 +0800 Subject: [PATCH] adds (old version) to other NNW entries --- .../GeneralPreferencesView.swift | 50 +++++++++++-------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/Multiplatform/macOS/Preferences/Preference Panes/GeneralPreferencesView.swift b/Multiplatform/macOS/Preferences/Preference Panes/GeneralPreferencesView.swift index f20bc1095..8d0056150 100644 --- a/Multiplatform/macOS/Preferences/Preference Panes/GeneralPreferencesView.swift +++ b/Multiplatform/macOS/Preferences/Preference Panes/GeneralPreferencesView.swift @@ -13,31 +13,37 @@ struct GeneralPreferencesView: View { @ObservedObject var preferences: MacPreferencesModel var body: some View { - Form { - Picker("Refresh feeds", - selection: $defaults.interval, - content: { - ForEach(RefreshInterval.allCases, content: { interval in - Text(interval.description()) - .tag(interval.rawValue) - }) - }) - .frame(width: 300, alignment: .center) - - Picker("Default RSS reader", selection: $preferences.readerSelection, content: { - ForEach(0.. 0 && preferences.rssReaders[index].nameMinusAppSuffix.contains("NetNewsWire") { + Text(preferences.rssReaders[index].nameMinusAppSuffix.appending(" (old version)")) + + } else { Text(preferences.rssReaders[index].nameMinusAppSuffix) .tag(index) - }) + } + + }) - - - Toggle("Open webpages in background in browser", isOn: $defaults.openInBrowserInBackground) - - Toggle("Hide Unread Count in Dock", isOn: $defaults.hideDockUnreadCount) - } - .frame(width: 400, alignment: .center) - .lineLimit(2) + }) + + + Toggle("Open webpages in background in browser", isOn: $defaults.openInBrowserInBackground) + + Toggle("Hide Unread Count in Dock", isOn: $defaults.hideDockUnreadCount) + } + .frame(width: 400, alignment: .center) + .lineLimit(2) } }