From f56b2ad96842f36da55e91b6d468458b8bc3ae73 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Sat, 9 Mar 2019 16:54:44 +0530 Subject: [PATCH] on-demand: macOS: Remove unused class PopupRow Signed-off-by: Roopesh Chander --- WireGuard/WireGuard.xcodeproj/project.pbxproj | 4 - .../WireGuard/UI/macOS/View/PopupRow.swift | 75 ------------------- 2 files changed, 79 deletions(-) delete mode 100644 WireGuard/WireGuard/UI/macOS/View/PopupRow.swift diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj index e149a33..e2caa22 100644 --- a/WireGuard/WireGuard.xcodeproj/project.pbxproj +++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj @@ -89,7 +89,6 @@ 6F919EDA218C65C50023B400 /* wireguard_doc_logo_44x58.png in Resources */ = {isa = PBXBuildFile; fileRef = 6F919ED6218C65C50023B400 /* wireguard_doc_logo_44x58.png */; }; 6F919EDB218C65C50023B400 /* wireguard_doc_logo_64x64.png in Resources */ = {isa = PBXBuildFile; fileRef = 6F919ED7218C65C50023B400 /* wireguard_doc_logo_64x64.png */; }; 6F919EDC218C65C50023B400 /* wireguard_doc_logo_320x320.png in Resources */ = {isa = PBXBuildFile; fileRef = 6F919ED8218C65C50023B400 /* wireguard_doc_logo_320x320.png */; }; - 6F9B582921E8D6D100544D02 /* PopupRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F9B582721E8CD4300544D02 /* PopupRow.swift */; }; 6F9B8A8E223398610041B9C4 /* SSIDOptionDetailTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F9B8A8D223398610041B9C4 /* SSIDOptionDetailTableViewController.swift */; }; 6FB1017921C57DE600766195 /* MockTunnels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FB1017821C57DE600766195 /* MockTunnels.swift */; }; 6FB17946222FD5960018AE71 /* OnDemandWiFiControls.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FB17945222FD5960018AE71 /* OnDemandWiFiControls.swift */; }; @@ -314,7 +313,6 @@ 6F919ED6218C65C50023B400 /* wireguard_doc_logo_44x58.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wireguard_doc_logo_44x58.png; sourceTree = ""; }; 6F919ED7218C65C50023B400 /* wireguard_doc_logo_64x64.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wireguard_doc_logo_64x64.png; sourceTree = ""; }; 6F919ED8218C65C50023B400 /* wireguard_doc_logo_320x320.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wireguard_doc_logo_320x320.png; sourceTree = ""; }; - 6F9B582721E8CD4300544D02 /* PopupRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupRow.swift; sourceTree = ""; }; 6F9B8A8D223398610041B9C4 /* SSIDOptionDetailTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSIDOptionDetailTableViewController.swift; sourceTree = ""; }; 6FB1017821C57DE600766195 /* MockTunnels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockTunnels.swift; sourceTree = ""; }; 6FB17945222FD5960018AE71 /* OnDemandWiFiControls.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnDemandWiFiControls.swift; sourceTree = ""; }; @@ -447,7 +445,6 @@ 6F613D9A21DE33B8004B217A /* KeyValueRow.swift */, 5F52D0BA21E3781B00283CEA /* ConfTextView.swift */, 5F52D0BC21E3785C00283CEA /* ConfTextStorage.swift */, - 6F9B582721E8CD4300544D02 /* PopupRow.swift */, 6FE3661C21F64F6B00F78C7D /* ConfTextColorTheme.swift */, 6F5EA59A223E58A8002B380A /* ButtonRow.swift */, 6F864769222FB87C006925D9 /* ControlRow.swift */, @@ -1190,7 +1187,6 @@ 6FB1BDCA21D50F1700A991BF /* x25519.c in Sources */, 6FB1BDCB21D50F1700A991BF /* Curve25519.swift in Sources */, 6B586C55220CBA6D00427C51 /* Data+KeyEncoding.swift in Sources */, - 6F9B582921E8D6D100544D02 /* PopupRow.swift in Sources */, 6BAC16E6221634B300A5FB78 /* AppStorePrivacyNotice.swift in Sources */, 6FB17946222FD5960018AE71 /* OnDemandWiFiControls.swift in Sources */, 6FB1BDBB21D50F0200A991BF /* Localizable.strings in Sources */, diff --git a/WireGuard/WireGuard/UI/macOS/View/PopupRow.swift b/WireGuard/WireGuard/UI/macOS/View/PopupRow.swift deleted file mode 100644 index 6f4a56c..0000000 --- a/WireGuard/WireGuard/UI/macOS/View/PopupRow.swift +++ /dev/null @@ -1,75 +0,0 @@ -// SPDX-License-Identifier: MIT -// Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. - -import Cocoa - -class PopupRow: NSView { - let keyLabel: NSTextField = { - let keyLabel = NSTextField() - keyLabel.isEditable = false - keyLabel.isSelectable = false - keyLabel.isBordered = false - keyLabel.alignment = .right - keyLabel.maximumNumberOfLines = 1 - keyLabel.lineBreakMode = .byTruncatingTail - keyLabel.backgroundColor = .clear - return keyLabel - }() - - let valuePopup = NSPopUpButton() - - var key: String { - get { return keyLabel.stringValue } - set(value) { keyLabel.stringValue = value } - } - - var valueOptions: [String] { - get { return valuePopup.itemTitles } - set(value) { - valuePopup.removeAllItems() - valuePopup.addItems(withTitles: value) - } - } - - var selectedOptionIndex: Int { - get { return valuePopup.indexOfSelectedItem } - set(value) { valuePopup.selectItem(at: value) } - } - - override var intrinsicContentSize: NSSize { - let height = max(keyLabel.intrinsicContentSize.height, valuePopup.intrinsicContentSize.height) - return NSSize(width: NSView.noIntrinsicMetric, height: height) - } - - init() { - super.init(frame: CGRect.zero) - - addSubview(keyLabel) - addSubview(valuePopup) - keyLabel.translatesAutoresizingMaskIntoConstraints = false - valuePopup.translatesAutoresizingMaskIntoConstraints = false - - NSLayoutConstraint.activate([ - keyLabel.centerYAnchor.constraint(equalTo: self.centerYAnchor), - keyLabel.firstBaselineAnchor.constraint(equalTo: valuePopup.firstBaselineAnchor), - self.leadingAnchor.constraint(equalTo: keyLabel.leadingAnchor), - keyLabel.trailingAnchor.constraint(equalTo: valuePopup.leadingAnchor, constant: -5) - ]) - - keyLabel.setContentCompressionResistancePriority(.defaultHigh + 2, for: .horizontal) - keyLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal) - - let widthConstraint = keyLabel.widthAnchor.constraint(equalToConstant: 150) - widthConstraint.priority = .defaultHigh + 1 - widthConstraint.isActive = true - } - - required init?(coder decoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - override func prepareForReuse() { - key = "" - valueOptions = [] - } -}