From 218098b6ac40640f1097456be299f64f496aec3b Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Tue, 19 Mar 2019 22:01:15 -0700 Subject: [PATCH] Move some prefs stuff into separate folders. Finish drawing the custom square in Accounts prefs. --- NetNewsWire.xcodeproj/project.pbxproj | 73 +++++++++++++------ NetNewsWire/Base.lproj/Preferences.storyboard | 38 +++------- .../AccountsControlsBackgroundView.swift | 54 ++++++++++++++ .../AccountsPreferencesViewController.swift | 0 .../AccountsControlsBackgroundView.swift | 23 ------ .../AdvancedPreferencesViewController.swift | 0 .../GeneralPrefencesViewController.swift | 0 7 files changed, 116 insertions(+), 72 deletions(-) create mode 100644 NetNewsWire/Preferences/Accounts/AccountsControlsBackgroundView.swift rename NetNewsWire/Preferences/{ => Accounts}/AccountsPreferencesViewController.swift (100%) delete mode 100644 NetNewsWire/Preferences/AccountsControlsBackgroundView.swift rename NetNewsWire/Preferences/{ => Advanced}/AdvancedPreferencesViewController.swift (100%) rename NetNewsWire/Preferences/{ => General}/GeneralPrefencesViewController.swift (100%) diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 9c3bc6742..d87776262 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -61,7 +61,6 @@ 840F7C3421BDA4B40057E851 /* Author+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5A2678B20130ECF00A8D3C0 /* Author+Scriptability.swift */; }; 840F7C3521BDA4B40057E851 /* PseudoFeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F2D5351FC22FCB00998D64 /* PseudoFeed.swift */; }; 840F7C3621BDA4B40057E851 /* NSScriptCommand+NetNewsWire.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57BE6DF204CD35F00D11AAC /* NSScriptCommand+NetNewsWire.swift */; }; - 840F7C3721BDA4B40057E851 /* GeneralPrefencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84754C89213E471B009CFDFB /* GeneralPrefencesViewController.swift */; }; 840F7C3821BDA4B40057E851 /* Article+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D553737C20186C1F006D8857 /* Article+Scriptability.swift */; }; 840F7C3921BDA4B40057E851 /* SmartFeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845EE7C01FC2488C00854A1F /* SmartFeed.swift */; }; 840F7C3A21BDA4B40057E851 /* MarkStatusCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84702AA31FA27AC0006B8943 /* MarkStatusCommand.swift */; }; @@ -195,8 +194,14 @@ 8426119E1FCB6ED40086A189 /* HTMLMetadataDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8426119D1FCB6ED40086A189 /* HTMLMetadataDownloader.swift */; }; 842611A01FCB72600086A189 /* FeaturedImageDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8426119F1FCB72600086A189 /* FeaturedImageDownloader.swift */; }; 842611A21FCB769D0086A189 /* RSHTMLMetadata+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842611A11FCB769D0086A189 /* RSHTMLMetadata+Extension.swift */; }; - 842AE5A72240ADED004A742C /* AccountsControlsBackgroundView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5A62240ADED004A742C /* AccountsControlsBackgroundView.swift */; }; - 842AE5A82240ADED004A742C /* AccountsControlsBackgroundView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5A62240ADED004A742C /* AccountsControlsBackgroundView.swift */; }; + 842AE5B92241F37B004A742C /* AccountsControlsBackgroundView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5B72241F37B004A742C /* AccountsControlsBackgroundView.swift */; }; + 842AE5BA2241F37B004A742C /* AccountsControlsBackgroundView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5B72241F37B004A742C /* AccountsControlsBackgroundView.swift */; }; + 842AE5BB2241F37B004A742C /* AccountsPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5B82241F37B004A742C /* AccountsPreferencesViewController.swift */; }; + 842AE5BC2241F37B004A742C /* AccountsPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5B82241F37B004A742C /* AccountsPreferencesViewController.swift */; }; + 842AE5BF2241F396004A742C /* GeneralPrefencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5BE2241F396004A742C /* GeneralPrefencesViewController.swift */; }; + 842AE5C02241F396004A742C /* GeneralPrefencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5BE2241F396004A742C /* GeneralPrefencesViewController.swift */; }; + 842AE5C32241F39C004A742C /* AdvancedPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5C22241F39C004A742C /* AdvancedPreferencesViewController.swift */; }; + 842AE5C42241F39C004A742C /* AdvancedPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842AE5C22241F39C004A742C /* AdvancedPreferencesViewController.swift */; }; 842E45CE1ED8C308000A8B52 /* AppNotifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842E45CD1ED8C308000A8B52 /* AppNotifications.swift */; }; 842E45DD1ED8C54B000A8B52 /* Browser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842E45DC1ED8C54B000A8B52 /* Browser.swift */; }; 842E45E31ED8C681000A8B52 /* KeyboardDelegateProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842E45E21ED8C681000A8B52 /* KeyboardDelegateProtocol.swift */; }; @@ -212,7 +217,6 @@ 844B5B691FEA20DF00C7C76A /* SidebarKeyboardShortcuts.plist in Resources */ = {isa = PBXBuildFile; fileRef = 844B5B681FEA20DF00C7C76A /* SidebarKeyboardShortcuts.plist */; }; 845213231FCA5B11003B6E93 /* ImageDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845213221FCA5B10003B6E93 /* ImageDownloader.swift */; }; 845479881FEB77C000AD8B59 /* TimelineKeyboardShortcuts.plist in Resources */ = {isa = PBXBuildFile; fileRef = 845479871FEB77C000AD8B59 /* TimelineKeyboardShortcuts.plist */; }; - 84595CA221E9C880003E15A4 /* AdvancedPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84595CA121E9C880003E15A4 /* AdvancedPreferencesViewController.swift */; }; 845A29091FC74B8E007B49E3 /* SingleFaviconDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845A29081FC74B8E007B49E3 /* SingleFaviconDownloader.swift */; }; 845A29221FC9251E007B49E3 /* SidebarCellLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845A29211FC9251E007B49E3 /* SidebarCellLayout.swift */; }; 845A29241FC9255E007B49E3 /* SidebarCellAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845A29231FC9255E007B49E3 /* SidebarCellAppearance.swift */; }; @@ -222,7 +226,6 @@ 846E773E1F6EF67A00A165E2 /* Account.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 846E773A1F6EF5D700A165E2 /* Account.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 84702AA41FA27AC0006B8943 /* MarkStatusCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84702AA31FA27AC0006B8943 /* MarkStatusCommand.swift */; }; 8472058120142E8900AD578B /* FeedInspectorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8472058020142E8900AD578B /* FeedInspectorViewController.swift */; }; - 84754C8A213E471B009CFDFB /* GeneralPrefencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84754C89213E471B009CFDFB /* GeneralPrefencesViewController.swift */; }; 8477ACBE22238E9500DF7F37 /* SearchFeedDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8477ACBD22238E9500DF7F37 /* SearchFeedDelegate.swift */; }; 8477ACBF22238E9500DF7F37 /* SearchFeedDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8477ACBD22238E9500DF7F37 /* SearchFeedDelegate.swift */; }; 848B937221C8C5540038DC0D /* CrashReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848B937121C8C5540038DC0D /* CrashReporter.swift */; }; @@ -301,8 +304,6 @@ 84CC88181FE59CBF00644329 /* SmartFeedsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CC88171FE59CBF00644329 /* SmartFeedsController.swift */; }; 84D52E951FE588BB00D14F5B /* DetailStatusBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D52E941FE588BB00D14F5B /* DetailStatusBarView.swift */; }; 84DAEE301F86CAFE0058304B /* OPMLImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DAEE2F1F86CAFE0058304B /* OPMLImporter.swift */; }; - 84E01AFD223F3050009D63C3 /* AccountsPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E01AFC223F3050009D63C3 /* AccountsPreferencesViewController.swift */; }; - 84E01AFE223F3050009D63C3 /* AccountsPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E01AFC223F3050009D63C3 /* AccountsPreferencesViewController.swift */; }; 84E185B3203B74E500F69BFA /* SingleLineTextFieldSizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E185B2203B74E500F69BFA /* SingleLineTextFieldSizer.swift */; }; 84E185C3203BB12600F69BFA /* MultilineTextFieldSizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E185C2203BB12600F69BFA /* MultilineTextFieldSizer.swift */; }; 84E46C7D1F75EF7B005ECFB3 /* AppDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E46C7C1F75EF7B005ECFB3 /* AppDefaults.swift */; }; @@ -791,7 +792,10 @@ 8426119D1FCB6ED40086A189 /* HTMLMetadataDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTMLMetadataDownloader.swift; sourceTree = ""; }; 8426119F1FCB72600086A189 /* FeaturedImageDownloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturedImageDownloader.swift; sourceTree = ""; }; 842611A11FCB769D0086A189 /* RSHTMLMetadata+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RSHTMLMetadata+Extension.swift"; sourceTree = ""; }; - 842AE5A62240ADED004A742C /* AccountsControlsBackgroundView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AccountsControlsBackgroundView.swift; path = NetNewsWire/Preferences/AccountsControlsBackgroundView.swift; sourceTree = ""; }; + 842AE5B72241F37B004A742C /* AccountsControlsBackgroundView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountsControlsBackgroundView.swift; sourceTree = ""; }; + 842AE5B82241F37B004A742C /* AccountsPreferencesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountsPreferencesViewController.swift; sourceTree = ""; }; + 842AE5BE2241F396004A742C /* GeneralPrefencesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneralPrefencesViewController.swift; sourceTree = ""; }; + 842AE5C22241F39C004A742C /* AdvancedPreferencesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdvancedPreferencesViewController.swift; sourceTree = ""; }; 842E45CD1ED8C308000A8B52 /* AppNotifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppNotifications.swift; path = NetNewsWire/AppNotifications.swift; sourceTree = ""; }; 842E45DC1ED8C54B000A8B52 /* Browser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Browser.swift; path = NetNewsWire/Browser.swift; sourceTree = ""; }; 842E45E21ED8C681000A8B52 /* KeyboardDelegateProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardDelegateProtocol.swift; sourceTree = ""; }; @@ -809,7 +813,6 @@ 84513F8F1FAA63950023A1A9 /* FeedListControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedListControlsView.swift; sourceTree = ""; }; 845213221FCA5B10003B6E93 /* ImageDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageDownloader.swift; sourceTree = ""; }; 845479871FEB77C000AD8B59 /* TimelineKeyboardShortcuts.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TimelineKeyboardShortcuts.plist; sourceTree = ""; }; - 84595CA121E9C880003E15A4 /* AdvancedPreferencesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AdvancedPreferencesViewController.swift; path = NetNewsWire/Preferences/AdvancedPreferencesViewController.swift; sourceTree = ""; }; 845A29081FC74B8E007B49E3 /* SingleFaviconDownloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleFaviconDownloader.swift; sourceTree = ""; }; 845A29211FC9251E007B49E3 /* SidebarCellLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarCellLayout.swift; sourceTree = ""; }; 845A29231FC9255E007B49E3 /* SidebarCellAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarCellAppearance.swift; sourceTree = ""; }; @@ -819,7 +822,6 @@ 846E77301F6EF5D600A165E2 /* Account.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Account.xcodeproj; path = Frameworks/Account/Account.xcodeproj; sourceTree = ""; }; 84702AA31FA27AC0006B8943 /* MarkStatusCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkStatusCommand.swift; sourceTree = ""; }; 8472058020142E8900AD578B /* FeedInspectorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedInspectorViewController.swift; sourceTree = ""; }; - 84754C89213E471B009CFDFB /* GeneralPrefencesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = GeneralPrefencesViewController.swift; path = NetNewsWire/Preferences/GeneralPrefencesViewController.swift; sourceTree = ""; }; 847752FE2008879500D93690 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; 8477ACBD22238E9500DF7F37 /* SearchFeedDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchFeedDelegate.swift; sourceTree = ""; }; 848B930921C8B0BF0038DC0D /* Subscribe-to-Feed-MAS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Subscribe-to-Feed-MAS-Info.plist"; sourceTree = ""; }; @@ -903,7 +905,6 @@ 84CC88171FE59CBF00644329 /* SmartFeedsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartFeedsController.swift; sourceTree = ""; }; 84D52E941FE588BB00D14F5B /* DetailStatusBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailStatusBarView.swift; sourceTree = ""; }; 84DAEE2F1F86CAFE0058304B /* OPMLImporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OPMLImporter.swift; sourceTree = ""; }; - 84E01AFC223F3050009D63C3 /* AccountsPreferencesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AccountsPreferencesViewController.swift; path = NetNewsWire/Preferences/AccountsPreferencesViewController.swift; sourceTree = ""; }; 84E185B2203B74E500F69BFA /* SingleLineTextFieldSizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleLineTextFieldSizer.swift; sourceTree = ""; }; 84E185C2203BB12600F69BFA /* MultilineTextFieldSizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultilineTextFieldSizer.swift; sourceTree = ""; }; 84E46C7C1F75EF7B005ECFB3 /* AppDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDefaults.swift; path = NetNewsWire/AppDefaults.swift; sourceTree = ""; }; @@ -1125,15 +1126,42 @@ path = NetNewsWire/HTMLMetadata; sourceTree = ""; }; + 842AE5B62241F37B004A742C /* Accounts */ = { + isa = PBXGroup; + children = ( + 842AE5B82241F37B004A742C /* AccountsPreferencesViewController.swift */, + 842AE5B72241F37B004A742C /* AccountsControlsBackgroundView.swift */, + ); + name = Accounts; + path = NetNewsWire/Preferences/Accounts; + sourceTree = ""; + }; + 842AE5BD2241F396004A742C /* General */ = { + isa = PBXGroup; + children = ( + 842AE5BE2241F396004A742C /* GeneralPrefencesViewController.swift */, + ); + name = General; + path = NetNewsWire/Preferences/General; + sourceTree = ""; + }; + 842AE5C12241F39C004A742C /* Advanced */ = { + isa = PBXGroup; + children = ( + 842AE5C22241F39C004A742C /* AdvancedPreferencesViewController.swift */, + ); + name = Advanced; + path = NetNewsWire/Preferences/Advanced; + sourceTree = ""; + }; 842E45E01ED8C587000A8B52 /* Preferences */ = { isa = PBXGroup; children = ( 849A97A41ED9F94D007D329B /* Preferences.storyboard */, 849A97841ED9ECCD007D329B /* PreferencesWindowController.swift */, - 84754C89213E471B009CFDFB /* GeneralPrefencesViewController.swift */, - 84E01AFC223F3050009D63C3 /* AccountsPreferencesViewController.swift */, - 842AE5A62240ADED004A742C /* AccountsControlsBackgroundView.swift */, - 84595CA121E9C880003E15A4 /* AdvancedPreferencesViewController.swift */, + 842AE5BD2241F396004A742C /* General */, + 842AE5B62241F37B004A742C /* Accounts */, + 842AE5C12241F39C004A742C /* Advanced */, ); name = Preferences; sourceTree = ""; @@ -2397,6 +2425,7 @@ 840F7C2121BDA4B40057E851 /* AppDefaults.swift in Sources */, 840F7C2221BDA4B40057E851 /* Account+Scriptability.swift in Sources */, 840F7C2321BDA4B40057E851 /* NothingInspectorViewController.swift in Sources */, + 842AE5C02241F396004A742C /* GeneralPrefencesViewController.swift in Sources */, 840F7C2521BDA4B40057E851 /* AppNotifications.swift in Sources */, 8405DD8B2213E0E3008CE1BF /* DetailContainerView.swift in Sources */, 840F7C2621BDA4B40057E851 /* TimelineKeyboardDelegate.swift in Sources */, @@ -2405,6 +2434,7 @@ 840F7C2921BDA4B40057E851 /* KeyboardDelegateProtocol.swift in Sources */, 840F7C2A21BDA4B40057E851 /* AppleEventUtils.swift in Sources */, 840F7C2B21BDA4B40057E851 /* OPMLExporter.swift in Sources */, + 842AE5C42241F39C004A742C /* AdvancedPreferencesViewController.swift in Sources */, 840F7C2C21BDA4B40057E851 /* MainWindowController.swift in Sources */, 840F7C2E21BDA4B40057E851 /* UnreadFeed.swift in Sources */, 840F7C2F21BDA4B40057E851 /* SidebarCellLayout.swift in Sources */, @@ -2416,14 +2446,12 @@ 840F7C3421BDA4B40057E851 /* Author+Scriptability.swift in Sources */, 840F7C3521BDA4B40057E851 /* PseudoFeed.swift in Sources */, 840F7C3621BDA4B40057E851 /* NSScriptCommand+NetNewsWire.swift in Sources */, - 840F7C3721BDA4B40057E851 /* GeneralPrefencesViewController.swift in Sources */, 840F7C3821BDA4B40057E851 /* Article+Scriptability.swift in Sources */, 840F7C3921BDA4B40057E851 /* SmartFeed.swift in Sources */, 840F7C3A21BDA4B40057E851 /* MarkStatusCommand.swift in Sources */, 840F7C3B21BDA4B40057E851 /* NSApplication+Scriptability.swift in Sources */, 840F7C3C21BDA4B40057E851 /* SidebarCell.swift in Sources */, 840F7C3D21BDA4B40057E851 /* SidebarTreeControllerDelegate.swift in Sources */, - 842AE5A82240ADED004A742C /* AccountsControlsBackgroundView.swift in Sources */, 840F7C3E21BDA4B40057E851 /* UnreadCountView.swift in Sources */, 840F7C3F21BDA4B40057E851 /* FeedIconDownloader.swift in Sources */, 840F7C4021BDA4B40057E851 /* MarkCommandValidationStatus.swift in Sources */, @@ -2439,6 +2467,7 @@ 840F7C4921BDA4B40057E851 /* SidebarViewController+ContextualMenus.swift in Sources */, 840F7C4A21BDA4B40057E851 /* RSHTMLMetadata+Extension.swift in Sources */, 840F7C4B21BDA4B40057E851 /* SendToMarsEditCommand.swift in Sources */, + 842AE5BC2241F37B004A742C /* AccountsPreferencesViewController.swift in Sources */, 840F7C4C21BDA4B40057E851 /* ScriptingObjectContainer.swift in Sources */, 840F7C4D21BDA4B40057E851 /* ArticleStylesManager.swift in Sources */, 840F7C4E21BDA4B40057E851 /* SharingServiceDelegate.swift in Sources */, @@ -2484,6 +2513,7 @@ 840F7C7521BDA4B40057E851 /* DeleteFromSidebarCommand.swift in Sources */, 840F7C7621BDA4B40057E851 /* AddFeedWindowController.swift in Sources */, 840F7C7721BDA4B40057E851 /* TimelineTableView.swift in Sources */, + 842AE5BA2241F37B004A742C /* AccountsControlsBackgroundView.swift in Sources */, 840F7C7921BDA4B40057E851 /* DetailStatusBarView.swift in Sources */, 840F7C7A21BDA4B40057E851 /* MainWindowController+Scriptability.swift in Sources */, 840F7C7C21BDA4B40057E851 /* SmallIconProvider.swift in Sources */, @@ -2496,7 +2526,6 @@ 840F7C8321BDA4B40057E851 /* Feed+Scriptability.swift in Sources */, 840F7C8421BDA4B40057E851 /* AuthorAvatarDownloader.swift in Sources */, 840F7C8521BDA4B40057E851 /* SingleLineTextFieldSizer.swift in Sources */, - 84E01AFE223F3050009D63C3 /* AccountsPreferencesViewController.swift in Sources */, 840F7C8721BDA4B40057E851 /* TimelineTableCellView.swift in Sources */, 840F7C8821BDA4B40057E851 /* TimelineCellAppearance.swift in Sources */, 840F7C8921BDA4B40057E851 /* InitialFeedDownloader.swift in Sources */, @@ -2520,6 +2549,7 @@ 84F204E01FAACBB30076E152 /* ArticleArray.swift in Sources */, 849C64641ED37A5D003D8FC0 /* AppDelegate.swift in Sources */, 848B937221C8C5540038DC0D /* CrashReporter.swift in Sources */, + 842AE5BB2241F37B004A742C /* AccountsPreferencesViewController.swift in Sources */, 84BBB12E20142A4700F054F5 /* InspectorWindowController.swift in Sources */, 84E46C7D1F75EF7B005ECFB3 /* AppDefaults.swift in Sources */, D5907D972004B7EB005947E5 /* Account+Scriptability.swift in Sources */, @@ -2533,7 +2563,6 @@ 8444C8F21FED81840051386C /* OPMLExporter.swift in Sources */, 849A975E1ED9EB72007D329B /* MainWindowController.swift in Sources */, 84F2D53A1FC2308B00998D64 /* UnreadFeed.swift in Sources */, - 84595CA221E9C880003E15A4 /* AdvancedPreferencesViewController.swift in Sources */, 845A29221FC9251E007B49E3 /* SidebarCellLayout.swift in Sources */, 84AD1EBA2031649C00BC20B7 /* SmartFeedPasteboardWriter.swift in Sources */, 84CC88181FE59CBF00644329 /* SmartFeedsController.swift in Sources */, @@ -2544,7 +2573,7 @@ D5A2678C20130ECF00A8D3C0 /* Author+Scriptability.swift in Sources */, 84F2D5371FC22FCC00998D64 /* PseudoFeed.swift in Sources */, D57BE6E0204CD35F00D11AAC /* NSScriptCommand+NetNewsWire.swift in Sources */, - 84754C8A213E471B009CFDFB /* GeneralPrefencesViewController.swift in Sources */, + 842AE5BF2241F396004A742C /* GeneralPrefencesViewController.swift in Sources */, D553738B20186C20006D8857 /* Article+Scriptability.swift in Sources */, 845EE7C11FC2488C00854A1F /* SmartFeed.swift in Sources */, 84702AA41FA27AC0006B8943 /* MarkStatusCommand.swift in Sources */, @@ -2566,7 +2595,6 @@ 84FF69B11FC3793300DC198E /* FaviconURLFinder.swift in Sources */, 84B7178C201E66580091657D /* SidebarViewController+ContextualMenus.swift in Sources */, 842611A21FCB769D0086A189 /* RSHTMLMetadata+Extension.swift in Sources */, - 84E01AFD223F3050009D63C3 /* AccountsPreferencesViewController.swift in Sources */, 84A1500520048DDF0046AD9A /* SendToMarsEditCommand.swift in Sources */, D5907DB22004BB37005947E5 /* ScriptingObjectContainer.swift in Sources */, 849A978A1ED9ECEF007D329B /* ArticleStylesManager.swift in Sources */, @@ -2582,6 +2610,7 @@ 845A29241FC9255E007B49E3 /* SidebarCellAppearance.swift in Sources */, 84F3EE1620DEC97E003FADEB /* FeedFinder.swift in Sources */, 845EE7B11FC2366500854A1F /* StarredFeedDelegate.swift in Sources */, + 842AE5B92241F37B004A742C /* AccountsControlsBackgroundView.swift in Sources */, 848F6AE51FC29CFB002D422E /* FaviconDownloader.swift in Sources */, 84F3EE1820DEC97E003FADEB /* FeedSpecifier.swift in Sources */, 849EE72120391F560082A1EA /* SharingServicePickerDelegate.swift in Sources */, @@ -2613,7 +2642,6 @@ 849A977B1ED9EC04007D329B /* UnreadIndicatorView.swift in Sources */, 84B99C9D1FAE83C600ECDEDB /* DeleteFromSidebarCommand.swift in Sources */, 849A97541ED9EAC0007D329B /* AddFeedWindowController.swift in Sources */, - 842AE5A72240ADED004A742C /* AccountsControlsBackgroundView.swift in Sources */, 849A976D1ED9EBC8007D329B /* TimelineTableView.swift in Sources */, 84D52E951FE588BB00D14F5B /* DetailStatusBarView.swift in Sources */, D5E4CC64202C1AC1009B4FFC /* MainWindowController+Scriptability.swift in Sources */, @@ -2629,6 +2657,7 @@ 84E185B3203B74E500F69BFA /* SingleLineTextFieldSizer.swift in Sources */, 849A977A1ED9EC04007D329B /* TimelineTableCellView.swift in Sources */, 849A97761ED9EC04007D329B /* TimelineCellAppearance.swift in Sources */, + 842AE5C32241F39C004A742C /* AdvancedPreferencesViewController.swift in Sources */, 849A97A21ED9F180007D329B /* InitialFeedDownloader.swift in Sources */, 849A977F1ED9EC42007D329B /* ArticleRenderer.swift in Sources */, ); diff --git a/NetNewsWire/Base.lproj/Preferences.storyboard b/NetNewsWire/Base.lproj/Preferences.storyboard index 4f4f925c7..ea8742dcb 100644 --- a/NetNewsWire/Base.lproj/Preferences.storyboard +++ b/NetNewsWire/Base.lproj/Preferences.storyboard @@ -24,7 +24,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -244,24 +244,24 @@ - + - + - + - - + + - + - + @@ -322,22 +322,6 @@ - - - - - - - - - - - - - - - - @@ -349,7 +333,7 @@ - + @@ -379,7 +363,7 @@ - + diff --git a/NetNewsWire/Preferences/Accounts/AccountsControlsBackgroundView.swift b/NetNewsWire/Preferences/Accounts/AccountsControlsBackgroundView.swift new file mode 100644 index 000000000..531b1e2a2 --- /dev/null +++ b/NetNewsWire/Preferences/Accounts/AccountsControlsBackgroundView.swift @@ -0,0 +1,54 @@ +// +// AccountsControlsBackgroundView.swift +// NetNewsWire +// +// Created by Brent Simmons on 3/18/19. +// Copyright © 2019 Ranchero Software. All rights reserved. +// + +import AppKit +import RSCore + +final class AccountsControlsBackgroundView: NSView { + + private static let lightModeFillColor = NSColor(white: 0.97, alpha: 1.0) + private static let darkModeFillColor = NSColor(white: 0.24, alpha: 1.0) + + private static let lightModeBorderColor = NSColor(white: 0.71, alpha: 1.0) + private static let darkModeBorderColor = NSColor(white: 0.5, alpha: 1.0) + + override var isFlipped: Bool { + return true + } + + override var isOpaque: Bool { + return true + } + + override func draw(_ dirtyRect: NSRect) { + let fillColor = self.effectiveAppearance.isDarkMode ? AccountsControlsBackgroundView.darkModeFillColor : AccountsControlsBackgroundView.lightModeFillColor + fillColor.setFill() + dirtyRect.fill() + + let borderColor = self.effectiveAppearance.isDarkMode ? AccountsControlsBackgroundView.darkModeBorderColor : AccountsControlsBackgroundView.lightModeBorderColor + borderColor.set() + + let topPath = NSBezierPath() + topPath.lineWidth = 1.0 + topPath.move(to: NSPoint(x: 0.0, y: 0.5)) + topPath.line(to: NSPoint(x: bounds.maxX + 0.0, y: 0.5)) + topPath.stroke() + + let rightPath = NSBezierPath() + rightPath.lineWidth = 1.0 + rightPath.move(to: NSPoint(x: bounds.maxX - 0.5, y: 1)) + rightPath.line(to: NSPoint(x: bounds.maxX - 0.5, y: bounds.maxY)) + rightPath.stroke() + + let bottomPath = NSBezierPath() + bottomPath.lineWidth = 1.0 + bottomPath.move(to: NSPoint(x: 0.0, y: bounds.maxY - 0.5)) + bottomPath.line(to: NSPoint(x: bounds.maxX - 1.0, y: bounds.maxY - 0.5)) + bottomPath.stroke() + } +} diff --git a/NetNewsWire/Preferences/AccountsPreferencesViewController.swift b/NetNewsWire/Preferences/Accounts/AccountsPreferencesViewController.swift similarity index 100% rename from NetNewsWire/Preferences/AccountsPreferencesViewController.swift rename to NetNewsWire/Preferences/Accounts/AccountsPreferencesViewController.swift diff --git a/NetNewsWire/Preferences/AccountsControlsBackgroundView.swift b/NetNewsWire/Preferences/AccountsControlsBackgroundView.swift deleted file mode 100644 index 71a4ce1be..000000000 --- a/NetNewsWire/Preferences/AccountsControlsBackgroundView.swift +++ /dev/null @@ -1,23 +0,0 @@ -// -// AccountsControlsBackgroundView.swift -// NetNewsWire -// -// Created by Brent Simmons on 3/18/19. -// Copyright © 2019 Ranchero Software. All rights reserved. -// - -import AppKit -import RSCore - -final class AccountsControlsBackgroundView: NSView { - - private static let lightGrayColor = NSColor.rs_color(withHexString: "f7f7f7")! - private static let darkGrayColor = NSColor.rs_color(withHexString: "52565a")! - - override func draw(_ dirtyRect: NSRect) { - - let color = self.effectiveAppearance.isDarkMode ? AccountsControlsBackgroundView.darkGrayColor : AccountsControlsBackgroundView.lightGrayColor - color.set() - dirtyRect.fill() - } -} diff --git a/NetNewsWire/Preferences/AdvancedPreferencesViewController.swift b/NetNewsWire/Preferences/Advanced/AdvancedPreferencesViewController.swift similarity index 100% rename from NetNewsWire/Preferences/AdvancedPreferencesViewController.swift rename to NetNewsWire/Preferences/Advanced/AdvancedPreferencesViewController.swift diff --git a/NetNewsWire/Preferences/GeneralPrefencesViewController.swift b/NetNewsWire/Preferences/General/GeneralPrefencesViewController.swift similarity index 100% rename from NetNewsWire/Preferences/GeneralPrefencesViewController.swift rename to NetNewsWire/Preferences/General/GeneralPrefencesViewController.swift