From 7b4c4fc14c56048ac203f249f6fc5f6198379578 Mon Sep 17 00:00:00 2001 From: Brandon Evans Date: Wed, 30 Dec 2020 09:05:39 -0700 Subject: [PATCH] Use term "info pane" consistently instead of "inspector pane" --- Xcodes.xcodeproj/project.pbxproj | 8 ++++---- Xcodes/Frontend/MainWindow.swift | 2 +- .../{InspectorPane.swift => InfoPane.swift} | 12 ++++++------ Xcodes/Frontend/XcodeList/MainToolbar.swift | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) rename Xcodes/Frontend/XcodeList/{InspectorPane.swift => InfoPane.swift} (96%) diff --git a/Xcodes.xcodeproj/project.pbxproj b/Xcodes.xcodeproj/project.pbxproj index f3178bb..f0a8f89 100644 --- a/Xcodes.xcodeproj/project.pbxproj +++ b/Xcodes.xcodeproj/project.pbxproj @@ -75,7 +75,7 @@ CAFBDB912598FE80003DCC5A /* SelectedXcode.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFBDB902598FE80003DCC5A /* SelectedXcode.swift */; }; CAFBDB952598FE96003DCC5A /* FocusedValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFBDB942598FE96003DCC5A /* FocusedValues.swift */; }; CAFBDC4E2599B33D003DCC5A /* MainToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFBDC4D2599B33D003DCC5A /* MainToolbar.swift */; }; - CAFBDC68259A308B003DCC5A /* InspectorPane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFBDC67259A308B003DCC5A /* InspectorPane.swift */; }; + CAFBDC68259A308B003DCC5A /* InfoPane.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFBDC67259A308B003DCC5A /* InfoPane.swift */; }; CAFBDC6C259A3098003DCC5A /* View+Conditional.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFBDC6B259A3098003DCC5A /* View+Conditional.swift */; }; CAFFFED8259CDA5000903F81 /* XcodeListViewRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFFFED7259CDA5000903F81 /* XcodeListViewRow.swift */; }; /* End PBXBuildFile section */ @@ -200,7 +200,7 @@ CAFBDB942598FE96003DCC5A /* FocusedValues.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FocusedValues.swift; sourceTree = ""; }; CAFBDBA525990C76003DCC5A /* SimpleXPCApp.LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = SimpleXPCApp.LICENSE; sourceTree = ""; }; CAFBDC4D2599B33D003DCC5A /* MainToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainToolbar.swift; sourceTree = ""; }; - CAFBDC67259A308B003DCC5A /* InspectorPane.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectorPane.swift; sourceTree = ""; }; + CAFBDC67259A308B003DCC5A /* InfoPane.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoPane.swift; sourceTree = ""; }; CAFBDC6B259A3098003DCC5A /* View+Conditional.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Conditional.swift"; sourceTree = ""; }; CAFFFED7259CDA5000903F81 /* XcodeListViewRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodeListViewRow.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -307,7 +307,7 @@ isa = PBXGroup; children = ( CA39711824495F0E00AFFB77 /* AppStoreButtonStyle.swift */, - CAFBDC67259A308B003DCC5A /* InspectorPane.swift */, + CAFBDC67259A308B003DCC5A /* InfoPane.swift */, CAFBDC4D2599B33D003DCC5A /* MainToolbar.swift */, CA44901E2463AD34003D8213 /* Tag.swift */, CAE42486259A68A300B8B246 /* XcodeListCategory.swift */, @@ -654,7 +654,7 @@ CA73510D257BFCEF00EA9CF8 /* NSAttributedString+.swift in Sources */, CAFBDB952598FE96003DCC5A /* FocusedValues.swift in Sources */, CABFA9C22592EEEA00380FEE /* Promise+.swift in Sources */, - CAFBDC68259A308B003DCC5A /* InspectorPane.swift in Sources */, + CAFBDC68259A308B003DCC5A /* InfoPane.swift in Sources */, CAA1CB4D255A5CFD003FD669 /* SignInPhoneListView.swift in Sources */, CAFBDC6C259A3098003DCC5A /* View+Conditional.swift in Sources */, CABFA9CF2592EEEA00380FEE /* Process.swift in Sources */, diff --git a/Xcodes/Frontend/MainWindow.swift b/Xcodes/Frontend/MainWindow.swift index 2de7592..fe78e1b 100644 --- a/Xcodes/Frontend/MainWindow.swift +++ b/Xcodes/Frontend/MainWindow.swift @@ -14,7 +14,7 @@ struct MainWindow: View { .frame(minWidth: 300) .layoutPriority(1) - InspectorPane(selectedXcodeID: selectedXcodeID) + InfoPane(selectedXcodeID: selectedXcodeID) .frame(minWidth: 300, maxWidth: .infinity) .frame(width: isShowingInfoPane ? nil : 0) .isHidden(!isShowingInfoPane) diff --git a/Xcodes/Frontend/XcodeList/InspectorPane.swift b/Xcodes/Frontend/XcodeList/InfoPane.swift similarity index 96% rename from Xcodes/Frontend/XcodeList/InspectorPane.swift rename to Xcodes/Frontend/XcodeList/InfoPane.swift index 66da445..9395fab 100644 --- a/Xcodes/Frontend/XcodeList/InspectorPane.swift +++ b/Xcodes/Frontend/XcodeList/InfoPane.swift @@ -4,7 +4,7 @@ import Version import struct XCModel.SDKs import struct XCModel.Compilers -struct InspectorPane: View { +struct InfoPane: View { @EnvironmentObject var appState: AppState let selectedXcodeID: Xcode.ID? @SwiftUI.Environment(\.openURL) var openURL: OpenURLAction @@ -167,10 +167,10 @@ struct InspectorPane: View { } } -struct InspectorPane_Previews: PreviewProvider { +struct InfoPane_Previews: PreviewProvider { static var previews: some View { Group { - InspectorPane(selectedXcodeID: Version(major: 12, minor: 3, patch: 0)) + InfoPane(selectedXcodeID: Version(major: 12, minor: 3, patch: 0)) .environmentObject(configure(AppState()) { $0.allXcodes = [ .init( @@ -198,7 +198,7 @@ struct InspectorPane_Previews: PreviewProvider { }) .previewDisplayName("Populated, Installed, Selected") - InspectorPane(selectedXcodeID: Version(major: 12, minor: 3, patch: 0)) + InfoPane(selectedXcodeID: Version(major: 12, minor: 3, patch: 0)) .environmentObject(configure(AppState()) { $0.allXcodes = [ .init( @@ -224,7 +224,7 @@ struct InspectorPane_Previews: PreviewProvider { }) .previewDisplayName("Populated, Installed, Unselected") - InspectorPane(selectedXcodeID: Version(major: 12, minor: 3, patch: 0)) + InfoPane(selectedXcodeID: Version(major: 12, minor: 3, patch: 0)) .environmentObject(configure(AppState()) { $0.allXcodes = [ .init( @@ -250,7 +250,7 @@ struct InspectorPane_Previews: PreviewProvider { }) .previewDisplayName("Populated, Uninstalled") - InspectorPane(selectedXcodeID: nil) + InfoPane(selectedXcodeID: nil) .environmentObject(configure(AppState()) { $0.allXcodes = [ ] diff --git a/Xcodes/Frontend/XcodeList/MainToolbar.swift b/Xcodes/Frontend/XcodeList/MainToolbar.swift index 8c804b8..392ae32 100644 --- a/Xcodes/Frontend/XcodeList/MainToolbar.swift +++ b/Xcodes/Frontend/XcodeList/MainToolbar.swift @@ -40,10 +40,10 @@ struct MainToolbarModifier: ViewModifier { Button(action: { isShowingInfoPane.toggle() }) { if isShowingInfoPane { - Label("Inspector", systemImage: "info.circle.fill") + Label("Info", systemImage: "info.circle.fill") .foregroundColor(.accentColor) } else { - Label("Inspector", systemImage: "info.circle") + Label("Info", systemImage: "info.circle") } } .keyboardShortcut(KeyboardShortcut("i", modifiers: [.command, .option]))