Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-26 12:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Plist Editor is now available in Yosemite

Browse Source 
Redone Find and Replace views that now are separate views with fixed constraints.
Added support for OS X 10.10
This commit is contained in:
vectorsigma72 2020-04-24 14:00:50 +02:00
parent ca199712c4
commit 1f53df2339
19 changed files with 493 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CloverApp/Clover.xcodeproj/project.pbxproj
View File

@ -83,6 +83,7 @@
9580403D2413F8CA00F09F2C /* lodepng.c in Sources */ = {isa = PBXBuildFile; fileRef = 9580403C2413F8C900F09F2C /* lodepng.c */; }; 9580403D2413F8CA00F09F2C /* lodepng.c in Sources */ = {isa = PBXBuildFile; fileRef = 9580403C2413F8C900F09F2C /* lodepng.c */; };
958040402414070F00F09F2C /* ThemeImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9580403F2414070F00F09F2C /* ThemeImage.m */; }; 958040402414070F00F09F2C /* ThemeImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9580403F2414070F00F09F2C /* ThemeImage.m */; };
958861DA235F75FB00B64173 /* Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 958861D9235F75FB00B64173 /* Driver.swift */; }; 958861DA235F75FB00B64173 /* Driver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 958861D9235F75FB00B64173 /* Driver.swift */; };
95BFF3D42451C0420088BA8E /* PEFindAndReplace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95BFF3D32451C0420088BA8E /* PEFindAndReplace.swift */; };
95C515222369BAF500E4A3A8 /* NVRAM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C515212369BAF500E4A3A8 /* NVRAM.swift */; }; 95C515222369BAF500E4A3A8 /* NVRAM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C515212369BAF500E4A3A8 /* NVRAM.swift */; };
95C5152F236A0A7400E4A3A8 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C5152E236A0A7400E4A3A8 /* SettingsView.swift */; }; 95C5152F236A0A7400E4A3A8 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C5152E236A0A7400E4A3A8 /* SettingsView.swift */; };
95C51536236B1F7700E4A3A8 /* RunAtLogin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C51535236B1F7700E4A3A8 /* RunAtLogin.swift */; }; 95C51536236B1F7700E4A3A8 /* RunAtLogin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95C51535236B1F7700E4A3A8 /* RunAtLogin.swift */; };
@ -429,6 +430,7 @@
9580403E2414070F00F09F2C /* ThemeImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ThemeImage.h; sourceTree = "<group>"; }; 9580403E2414070F00F09F2C /* ThemeImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ThemeImage.h; sourceTree = "<group>"; };
9580403F2414070F00F09F2C /* ThemeImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ThemeImage.m; sourceTree = "<group>"; }; 9580403F2414070F00F09F2C /* ThemeImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ThemeImage.m; sourceTree = "<group>"; };
958861D9235F75FB00B64173 /* Driver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Driver.swift; sourceTree = "<group>"; }; 958861D9235F75FB00B64173 /* Driver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Driver.swift; sourceTree = "<group>"; };
95BFF3D32451C0420088BA8E /* PEFindAndReplace.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PEFindAndReplace.swift; sourceTree = "<group>"; };
95C515212369BAF500E4A3A8 /* NVRAM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NVRAM.swift; sourceTree = "<group>"; }; 95C515212369BAF500E4A3A8 /* NVRAM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NVRAM.swift; sourceTree = "<group>"; };
95C5152E236A0A7400E4A3A8 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; }; 95C5152E236A0A7400E4A3A8 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
95C51535236B1F7700E4A3A8 /* RunAtLogin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RunAtLogin.swift; sourceTree = "<group>"; }; 95C51535236B1F7700E4A3A8 /* RunAtLogin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RunAtLogin.swift; sourceTree = "<group>"; };
@ -546,6 +548,7 @@
9571A229241C2E7F000D6645 /* PlistEditor.storyboard */, 9571A229241C2E7F000D6645 /* PlistEditor.storyboard */,
9571A225241C01DB000D6645 /* PlistEditorWC.swift */, 9571A225241C01DB000D6645 /* PlistEditorWC.swift */,
9571A223241BFF44000D6645 /* PlistEditorVC.swift */, 9571A223241BFF44000D6645 /* PlistEditorVC.swift */,
95BFF3D32451C0420088BA8E /* PEFindAndReplace.swift */,
9559D52524355A800007FCF3 /* PEConstraints.swift */, 9559D52524355A800007FCF3 /* PEConstraints.swift */,
955500F9241AD7C200618F57 /* PEFindButton.swift */, 955500F9241AD7C200618F57 /* PEFindButton.swift */,
955500FB241AD7C200618F57 /* ReplaceButton.swift */, 955500FB241AD7C200618F57 /* ReplaceButton.swift */,
@ -959,6 +962,7 @@
9559D52624355A810007FCF3 /* PEConstraints.swift in Sources */, 9559D52624355A810007FCF3 /* PEConstraints.swift in Sources */,
954BBE99238196EE0032425F /* Locale.swift in Sources */, 954BBE99238196EE0032425F /* Locale.swift in Sources */,
9555010C241AD7C300618F57 /* PEOutlineView.swift in Sources */, 9555010C241AD7C300618F57 /* PEOutlineView.swift in Sources */,
95BFF3D42451C0420088BA8E /* PEFindAndReplace.swift in Sources */,
95E68ACA235B862F002B37A5 /* AppDelegate.swift in Sources */, 95E68ACA235B862F002B37A5 /* AppDelegate.swift in Sources */,
955BEE1523C6B49C00425AB0 /* ThemeView.swift in Sources */, 955BEE1523C6B49C00425AB0 /* ThemeView.swift in Sources */,
958861DA235F75FB00B64173 /* Driver.swift in Sources */, 958861DA235F75FB00B64173 /* Driver.swift in Sources */,

2
CloverApp/Clover/Plist Editor/Document.swift
View File

@ -27,7 +27,7 @@
import Cocoa import Cocoa
@available(OSX 10.11, *) @available(OSX 10.10, *)
final class Document: NSDocument { final class Document: NSDocument {
var data : Data? var data : Data?
var windowController : PlistEditorWC? var windowController : PlistEditorWC?

2
CloverApp/Clover/Plist Editor/PEValueTransformer.swift
View File

@ -27,7 +27,7 @@
import Cocoa import Cocoa
@available(OSX 10.11, *) @available(OSX 10.10, *)
extension PlistEditorVC { extension PlistEditorVC {
@objc func boolPopUpPressed(sender: PEPopUpButton) { @objc func boolPopUpPressed(sender: PEPopUpButton) {
let originalValue : Bool = sender.node!.tagdata!.value as! Bool let originalValue : Bool = sender.node!.tagdata!.value as! Bool

2
CloverApp/Clover/Plist Editor/PE_Undo.swift
View File

@ -28,7 +28,7 @@
import Cocoa import Cocoa
// MARK: Undo and redo support // MARK: Undo and redo support
@available(OSX 10.11, *) @available(OSX 10.10, *)
extension PEOutlineView { extension PEOutlineView {
// MARK: Undo Manager object // MARK: Undo Manager object

2
CloverApp/Clover/Plist Editor/PE_Utils.swift
View File

@ -127,7 +127,7 @@ func gPlistTag(from str: String) -> PlistTag {
In 10.9/10.10 if mentioned programs aren't present the directory containing the desired file will be opened by the Finder. In 10.9/10.10 if mentioned programs aren't present the directory containing the desired file will be opened by the Finder.
*/ */
func loadPlist(at path: String) { func loadPlist(at path: String) {
if #available(OSX 10.11, *) { if #available(OSX 10.10, *) {
let dc = NSDocumentController.shared let dc = NSDocumentController.shared
dc.openDocument(withContentsOf: URL(fileURLWithPath: path), display: true) { dc.openDocument(withContentsOf: URL(fileURLWithPath: path), display: true) {
(document, documentWasAlreadyOpen, error) in (document, documentWasAlreadyOpen, error) in

2
CloverApp/Clover/Plist Editor/Views/PEAlert.swift
View File

@ -27,7 +27,7 @@
import Cocoa import Cocoa
@available(OSX 10.11, *) @available(OSX 10.10, *)
final class PEAlert : NSAlert { final class PEAlert : NSAlert {
var anyString : String? = nil var anyString : String? = nil
var outline: PEOutlineView? = nil var outline: PEOutlineView? = nil

156
CloverApp/Clover/Plist Editor/Views/PEFindAndReplace.swift Normal file
View File

@ -0,0 +1,156 @@
/*
* vector sigma (https://github.com/vectorsigma72)
* Copyright 2020 vector sigma All Rights Reserved.
*
* The source code contained or described herein and all documents related
* to the source code ("Material") are owned by vector sigma.
* Title to the Material remains with vector sigma or its suppliers and licensors.
* The Material is proprietary of vector sigma and is protected by worldwide copyright.
* No part of the Material may be used, copied, reproduced, modified, published,
* uploaded, posted, transmitted, distributed, or disclosed in any way without
* vector sigma's prior express written permission.
*
* No license under any patent, copyright, trade secret or other intellectual
* property right is granted to or conferred upon you by disclosure or delivery
* of the Materials, either expressly, by implication, inducement, estoppel or
* otherwise. Any license under such intellectual property rights must be
* express and approved by vector sigma in writing.
*
* Unless otherwise agreed by vector sigma in writing, you may not remove or alter
* this notice or any other notice embedded in Materials by vector sigma in any way.
*
* The license is granted for the CloverBootloader project (i.e. https://github.com/CloverHackyColor/CloverBootloader)
* and all the users as long as the Material is used only within the
* source code and for the exclusive use of CloverBootloader, which must
* be free from any type of payment or commercial service for the license to be valid.
*/
import Cocoa
@available(OSX 10.10, *)
final class PEFindVC: NSViewController, NSSearchFieldDelegate, NSTextViewDelegate {
var editor : PlistEditorVC?
@IBOutlet var doneBtn: NSButton!
@IBOutlet var showReplaceBtn: ReplaceButton!
@IBOutlet var nextOrPreviousSegment: NSSegmentedControl!
@IBOutlet var searchField: PESearchField!
class func loadFromNib(editor: PlistEditorVC) -> PEFindVC? {
let id = NSStoryboard.SceneIdentifier("FindView")
let vc = NSStoryboard(name: NSStoryboard.Name("PlistEditor"),
bundle: nil).instantiateController(withIdentifier: id) as! PEFindVC
vc.editor = editor
vc.searchField?.countLabel?.placeholderString = ""
if (editor.searchField != nil) {
editor.searchField?.superview?.removeFromSuperview()
}
return vc
}
override func viewDidLoad() {
super.viewDidLoad()
// set up actions
self.editor?.doneBtn = self.doneBtn
self.doneBtn.target = self.editor
self.doneBtn.action = #selector(self.editor?.doneButtonPressed(_:))
self.editor?.showReplaceBtn = self.showReplaceBtn
self.showReplaceBtn.target = self.editor
self.showReplaceBtn.action = #selector(self.editor?.showReplaceView(sender:))
self.editor?.nextOrPreviousSegment = self.nextOrPreviousSegment
self.nextOrPreviousSegment.target = self.editor
self.nextOrPreviousSegment.action = #selector(self.editor?.segmentScrollerPressed(_:))
self.editor?.searchField = self.searchField
self.searchField.placeholderString = localizedSearch
self.searchField.countLabel?.stringValue = ""
if let search = NSPasteboard.init(name: .findPboard).string(forType: .string) {
self.searchField.stringValue = search
if search != self.editor?.currentSearchString {
self.editor?.performDelayedSearch()
}
} else {
self.searchField.stringValue = self.editor?.currentSearchString ?? ""
if let count = self.editor?.searches.count {
self.searchField.countLabel.placeholderString = (count > 0) ? "\(count)" : ""
} else {
self.searchField.countLabel.placeholderString = ""
}
}
}
}
@available(OSX 10.10, *)
final class PEFindAndReplaceVC: NSViewController, NSSearchFieldDelegate {
var editor : PlistEditorVC?
@IBOutlet var doneBtn: NSButton!
@IBOutlet var showFindViewBtn: FindButton!
@IBOutlet var showReplaceBtn: ReplaceButton!
@IBOutlet var nextOrPreviousSegment: NSSegmentedControl!
@IBOutlet var replaceOneOrAllSegment: NSSegmentedControl!
@IBOutlet var searchField: PESearchField!
@IBOutlet var replaceField: PEReplaceField!
class func loadFromNib(editor: PlistEditorVC) -> PEFindAndReplaceVC? {
let id = NSStoryboard.SceneIdentifier("FindAndReplaceView")
let vc = NSStoryboard(name: NSStoryboard.Name("PlistEditor"),
bundle: nil).instantiateController(withIdentifier: id) as! PEFindAndReplaceVC
vc.editor = editor
if (editor.searchField != nil) {
editor.searchField?.superview?.removeFromSuperview()
}
return vc
}
override func viewDidLoad() {
super.viewDidLoad()
// set up actions
self.editor?.doneBtn = self.doneBtn
self.doneBtn.target = self.editor
self.doneBtn.action = #selector(self.editor?.doneButtonPressed(_:))
self.editor?.showFindViewBtn = self.showFindViewBtn
self.showFindViewBtn.target = self.editor
self.showFindViewBtn.action = #selector(self.editor?.showFindView(sender:))
self.editor?.showReplaceBtn = self.showReplaceBtn
self.showReplaceBtn.target = self.editor
self.showReplaceBtn.action = #selector(self.editor?.showReplaceView(sender:))
self.editor?.nextOrPreviousSegment = self.nextOrPreviousSegment
self.nextOrPreviousSegment.target = self.editor
self.nextOrPreviousSegment.action = #selector(self.editor?.segmentScrollerPressed(_:))
self.editor?.searchField = self.searchField
self.searchField.placeholderString = localizedSearch
self.searchField.countLabel?.stringValue = ""
self.editor?.replaceField = self.replaceField
if let search = NSPasteboard.init(name: .findPboard).string(forType: .string) {
self.searchField.stringValue = search
if search != self.editor?.currentSearchString {
self.editor?.performDelayedSearch()
}
} else {
self.searchField.stringValue = self.editor?.currentSearchString ?? ""
if let count = self.editor?.searches.count {
self.searchField.countLabel.placeholderString = (count > 0) ? "\(count)" : ""
} else {
self.searchField.countLabel.placeholderString = ""
}
}
self.replaceField.placeholderString = localizedReplace
self.editor?.replaceField = self.replaceField
self.replaceField.stringValue = self.editor?.currentReplaceString ?? ""
self.editor?.replaceOneOrAllSegment = self.replaceOneOrAllSegment
self.replaceOneOrAllSegment.target = self.editor
self.replaceOneOrAllSegment.action = #selector(self.editor?.replaceOneOrAllSegmentPressed(_:))
for i in 0..<self.replaceOneOrAllSegment.segmentCount {
let label = self.replaceOneOrAllSegment.label(forSegment: i)
self.replaceOneOrAllSegment.setLabel(label!.locale, forSegment: i)
}
}
}

2
CloverApp/Clover/Plist Editor/Views/PEOutlineView.swift
View File

@ -28,7 +28,7 @@
import Cocoa import Cocoa
//MARK: PEOutlineView (NSOutlineView) //MARK: PEOutlineView (NSOutlineView)
@available(OSX 10.11, *) @available(OSX 10.10, *)
final class PEOutlineView: NSOutlineView, NSMenuDelegate { final class PEOutlineView: NSOutlineView, NSMenuDelegate {
var wrongValue : Bool = false var wrongValue : Bool = false
var scrollTimer : Timer? = nil var scrollTimer : Timer? = nil

2
CloverApp/Clover/Plist Editor/Views/PEPopUpButton.swift
View File

@ -27,7 +27,7 @@
import Cocoa import Cocoa
@available(OSX 10.11, *) @available(OSX 10.10, *)
final class PEPopUpButton: NSPopUpButton { final class PEPopUpButton: NSPopUpButton {
internal var n: PENode? internal var n: PENode?
internal var o: PEOutlineView? internal var o: PEOutlineView?

2
CloverApp/Clover/Plist Editor/Views/PEReplaceField.swift
View File

@ -28,7 +28,7 @@
import Cocoa import Cocoa
//MARK: PETextField (NSTextField) //MARK: PETextField (NSTextField)
@available(OSX 10.11, *) @available(OSX 10.10, *)
final class PEReplaceField: NSSearchField { final class PEReplaceField: NSSearchField {
var editorVC : PlistEditorVC? var editorVC : PlistEditorVC?

2
CloverApp/Clover/Plist Editor/Views/PESearchField.swift
View File

@ -28,7 +28,7 @@
import Cocoa import Cocoa
final class PESearchField: NSSearchField { final class PESearchField: NSSearchField {
@IBOutlet var countLabel : NSTextField? = nil @IBOutlet var countLabel : NSTextField!
override func textDidChange(_ aNotification: Notification) { override func textDidChange(_ aNotification: Notification) {
NotificationCenter.default.post(name: PESearchFieldTextDidChange, NotificationCenter.default.post(name: PESearchFieldTextDidChange,

2
CloverApp/Clover/Plist Editor/Views/PETableCellView.swift
View File

@ -29,7 +29,7 @@ import Cocoa
import CoreData import CoreData
//MARK: PETableCellView (NSTableCellView) //MARK: PETableCellView (NSTableCellView)
@available(OSX 10.11, *) @available(OSX 10.10, *)
final class PETableCellView: NSTableCellView { final class PETableCellView: NSTableCellView {
@IBOutlet var addButton : NSButton! @IBOutlet var addButton : NSButton!
@IBOutlet var removeButton : NSButton! @IBOutlet var removeButton : NSButton!

2
CloverApp/Clover/Plist Editor/Views/PETableCellViewPop.swift
View File

@ -28,7 +28,7 @@
import Cocoa import Cocoa
//MARK: PETableCellViewPop (NSTableCellView) //MARK: PETableCellViewPop (NSTableCellView)
@available(OSX 10.11, *) @available(OSX 10.10, *)
final class PETableCellViewPop: NSTableCellView { final class PETableCellViewPop: NSTableCellView {
var type : PETableCellViewType = .tags var type : PETableCellViewType = .tags
@IBOutlet var popup : PEPopUpButton! @IBOutlet var popup : PEPopUpButton!

58
CloverApp/Clover/Plist Editor/Views/PETableRowView.swift
View File

@ -33,7 +33,7 @@ enum RowViewBorderType : Int {
case verticalAndBottom = 3 case verticalAndBottom = 3
} }
@available(OSX 10.11, *) @available(OSX 10.10, *)
final class PETableRowView: NSTableRowView { final class PETableRowView: NSTableRowView {
internal var n: PENode? internal var n: PENode?
internal var o: PEOutlineView? = nil internal var o: PEOutlineView? = nil
@ -68,41 +68,45 @@ final class PETableRowView: NSTableRowView {
} }
func setBorderType() { func setBorderType() {
super.setNeedsDisplay(self.bounds) if #available(OSX 10.11, *) {
super.setNeedsDisplay(self.bounds)
}
} }
override func draw(_ dirtyRect: NSRect) { override func draw(_ dirtyRect: NSRect) {
super.draw(dirtyRect) super.draw(dirtyRect)
var bt : RowViewBorderType = .none if #available(OSX 10.11, *) {
if self.isSelected { var bt : RowViewBorderType = .none
self.highLightAllBorders(in: dirtyRect) if self.isSelected {
} else { self.highLightAllBorders(in: dirtyRect)
let row : Int = self.outline?.selectedRow ?? -1 } else {
if row >= 0 { let row : Int = self.outline?.selectedRow ?? -1
if let selNode = self.outline?.item(atRow: row) as? PENode { if row >= 0 {
// determine if self.node is a child (or sub child of selfNode) if let selNode = self.outline?.item(atRow: row) as? PENode {
let ipsc = "\(self.node!.indexPath)".trimmingCharacters(in: CharacterSet(arrayLiteral: "]")) // determine if self.node is a child (or sub child of selfNode)
let ips = "\(selNode.indexPath)".trimmingCharacters(in: CharacterSet(arrayLiteral: "]")) + "," let ipsc = "\(self.node!.indexPath)".trimmingCharacters(in: CharacterSet(arrayLiteral: "]"))
if ipsc.hasPrefix(ips) { let ips = "\(selNode.indexPath)".trimmingCharacters(in: CharacterSet(arrayLiteral: "]")) + ","
bt = .verticalOnly if ipsc.hasPrefix(ips) {
let childs = selNode.mutableChildren bt = .verticalOnly
if childs.count > 0 && (childs.lastObject as! PENode) == self.node { let childs = selNode.mutableChildren
bt = .verticalAndBottom if childs.count > 0 && (childs.lastObject as! PENode) == self.node {
bt = .verticalAndBottom
}
} }
} }
} }
} }
}
switch bt { switch bt {
case .none: break // taken into account previously case .none: break // taken into account previously
case.verticalAndBottom: case.verticalAndBottom:
self.highLightLeftBorder(in: dirtyRect) self.highLightLeftBorder(in: dirtyRect)
self.highLightRightBorder(in: dirtyRect) self.highLightRightBorder(in: dirtyRect)
self.highLightBottomBorder(in: dirtyRect) self.highLightBottomBorder(in: dirtyRect)
case .verticalOnly: case .verticalOnly:
self.highLightLeftBorder(in: dirtyRect) self.highLightLeftBorder(in: dirtyRect)
self.highLightRightBorder(in: dirtyRect) self.highLightRightBorder(in: dirtyRect)
}
} }
} }

4
CloverApp/Clover/Plist Editor/Views/PETextField.swift
View File

@ -28,7 +28,7 @@
import Cocoa import Cocoa
//MARK: PETextField (NSTextField) //MARK: PETextField (NSTextField)
@available(OSX 10.11, *) @available(OSX 10.10, *)
final class PETextField: NSTextField, NSTextViewDelegate { final class PETextField: NSTextField, NSTextViewDelegate {
var outline : PEOutlineView? = nil var outline : PEOutlineView? = nil
var node : PENode? = nil var node : PENode? = nil
@ -89,7 +89,7 @@ final class PETextField: NSTextField, NSTextViewDelegate {
} }
} }
@available(OSX 10.11, *) @available(OSX 10.10, *)
final class PETextFieldCell : NSTextFieldCell { final class PETextFieldCell : NSTextFieldCell {
override func drawingRect(forBounds rect: NSRect) -> NSRect { override func drawingRect(forBounds rect: NSRect) -> NSRect {

372
CloverApp/Clover/Plist Editor/Views/PlistEditor.storyboard
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<deployment version="101100" identifier="macosx"/> <deployment version="101100" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15702"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<scenes> <scenes>
@ -42,120 +42,8 @@
<customView id="pl5-54-raW"> <customView id="pl5-54-raW">
<rect key="frame" x="0.0" y="0.0" width="568" height="58"/> <rect key="frame" x="0.0" y="0.0" width="568" height="58"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="f5f-vb-JDD" customClass="ReplaceButton" customModule="Clover" customModuleProvider="target">
<rect key="frame" x="0.0" y="24" width="32" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="1ls-PK-4Lv"/>
</constraints>
<buttonCell key="cell" type="push" bezelStyle="rounded" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jFu-Mz-fHK">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="showReplaceViewWithSender:" target="5gI-5U-AMq" id="atr-1K-cE2"/>
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CjQ-1i-oKD" customClass="FindButton" customModule="Clover" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
<buttonCell key="cell" type="push" bezelStyle="rounded" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="rsa-xW-mCe">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="showFindViewWithSender:" target="5gI-5U-AMq" id="tUA-X4-eWw"/>
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ilk-Ta-1NW">
<rect key="frame" x="536" y="23" width="32" height="33"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="2BP-mm-vHy"/>
</constraints>
<buttonCell key="cell" type="push" bezelStyle="rounded" image="NSStopProgressTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="enu-el-QQ6">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Wv-ZY-JzG" customClass="PESearchField" customModule="Clover" customModuleProvider="target">
<rect key="frame" x="30" y="31" width="343" height="21"/>
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="oQI-NZ-Akk">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</searchFieldCell>
<connections>
<outlet property="countLabel" destination="jd2-u3-VLB" id="lgt-7a-34s"/>
</connections>
</searchField>
<searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bgd-lF-t3r" customClass="PEReplaceField" customModule="Clover" customModuleProvider="target">
<rect key="frame" x="30" y="7" width="343" height="21"/>
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="Icu-Xk-a2R">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</searchFieldCell>
</searchField>
<segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="32r-Nm-cON">
<rect key="frame" x="379" y="5" width="182" height="24"/>
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="hrz-X2-ewv">
<font key="font" metaFont="system"/>
<segments>
<segment label="All" width="73"/>
<segment label="Replace" width="105" tag="1"/>
</segments>
</segmentedCell>
</segmentedControl>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jd2-u3-VLB">
<rect key="frame" x="311" y="34" width="37" height="14"/>
<constraints>
<constraint firstAttribute="width" constant="33" id="dsC-nE-aXf"/>
</constraints>
<textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" alignment="right" title="Label" id="Hao-mW-Dwn">
<font key="font" metaFont="message" size="11"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HDq-VH-JlL">
<rect key="frame" x="379" y="29" width="163" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="159" id="Mhz-ZO-mK0"/>
</constraints>
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="I4H-p8-bsp">
<font key="font" metaFont="system"/>
<segments>
<segment image="NSLeftFacingTriangleTemplate" width="78"/>
<segment image="NSRightFacingTriangleTemplate" width="78" tag="1"/>
</segments>
</segmentedCell>
</segmentedControl>
</subviews>
<constraints> <constraints>
<constraint firstItem="bgd-lF-t3r" firstAttribute="baseline" secondItem="CjQ-1i-oKD" secondAttribute="firstBaseline" id="19i-v0-bLC"/>
<constraint firstItem="32r-Nm-cON" firstAttribute="leading" secondItem="bgd-lF-t3r" secondAttribute="trailing" constant="8" symbolic="YES" id="7Cs-e5-3mY"/>
<constraint firstItem="HDq-VH-JlL" firstAttribute="leading" secondItem="7Wv-ZY-JzG" secondAttribute="trailing" constant="8" symbolic="YES" id="7G5-bS-GBT"/>
<constraint firstItem="Ilk-Ta-1NW" firstAttribute="leading" secondItem="HDq-VH-JlL" secondAttribute="trailing" constant="2" id="7Jt-3k-pUB"/>
<constraint firstItem="f5f-vb-JDD" firstAttribute="trailing" secondItem="CjQ-1i-oKD" secondAttribute="trailing" id="8Sy-kh-PjV"/>
<constraint firstItem="bgd-lF-t3r" firstAttribute="baseline" secondItem="32r-Nm-cON" secondAttribute="baseline" id="8mL-f1-sfK"/>
<constraint firstItem="f5f-vb-JDD" firstAttribute="leading" secondItem="pl5-54-raW" secondAttribute="leading" constant="6" id="92x-jk-bMW"/>
<constraint firstItem="jd2-u3-VLB" firstAttribute="firstBaseline" secondItem="HDq-VH-JlL" secondAttribute="baseline" id="DsB-IM-eLK"/>
<constraint firstItem="f5f-vb-JDD" firstAttribute="top" secondItem="7Wv-ZY-JzG" secondAttribute="top" id="EUO-ki-9yh"/>
<constraint firstItem="7Wv-ZY-JzG" firstAttribute="leading" secondItem="f5f-vb-JDD" secondAttribute="trailing" constant="4" id="GGZ-Bi-b5f"/>
<constraint firstItem="7Wv-ZY-JzG" firstAttribute="baseline" secondItem="f5f-vb-JDD" secondAttribute="firstBaseline" id="Jef-9b-99Y"/>
<constraint firstItem="CjQ-1i-oKD" firstAttribute="top" secondItem="bgd-lF-t3r" secondAttribute="top" id="P68-zx-2Ps"/>
<constraint firstItem="7Wv-ZY-JzG" firstAttribute="baseline" secondItem="HDq-VH-JlL" secondAttribute="baseline" id="VRR-ns-fTy"/>
<constraint firstItem="jd2-u3-VLB" firstAttribute="baseline" secondItem="HDq-VH-JlL" secondAttribute="firstBaseline" id="Vo7-0d-7vJ"/>
<constraint firstItem="CjQ-1i-oKD" firstAttribute="top" secondItem="f5f-vb-JDD" secondAttribute="bottom" constant="3" id="W4d-UM-Itx"/>
<constraint firstItem="7Wv-ZY-JzG" firstAttribute="leading" secondItem="bgd-lF-t3r" secondAttribute="leading" id="bOE-a9-1xQ"/>
<constraint firstAttribute="height" constant="58" id="cSS-9y-hU6"/> <constraint firstAttribute="height" constant="58" id="cSS-9y-hU6"/>
<constraint firstAttribute="trailing" secondItem="32r-Nm-cON" secondAttribute="trailing" constant="9" id="e3U-pX-dS1"/>
<constraint firstItem="HDq-VH-JlL" firstAttribute="top" secondItem="Ilk-Ta-1NW" secondAttribute="top" id="ibe-bf-QYG"/>
<constraint firstItem="f5f-vb-JDD" firstAttribute="top" secondItem="pl5-54-raW" secondAttribute="top" constant="6" id="l8K-20-Ma8"/>
<constraint firstItem="HDq-VH-JlL" firstAttribute="leading" secondItem="jd2-u3-VLB" secondAttribute="trailing" constant="35" id="m1y-bt-kbV"/>
<constraint firstItem="jd2-u3-VLB" firstAttribute="centerY" secondItem="Ilk-Ta-1NW" secondAttribute="centerY" id="pLJ-Vu-Qou"/>
<constraint firstItem="f5f-vb-JDD" firstAttribute="leading" secondItem="CjQ-1i-oKD" secondAttribute="leading" id="v7b-0r-gnh"/>
<constraint firstItem="HDq-VH-JlL" firstAttribute="leading" secondItem="32r-Nm-cON" secondAttribute="leading" id="vLw-ST-pEh"/>
<constraint firstAttribute="trailing" secondItem="Ilk-Ta-1NW" secondAttribute="trailing" constant="6" id="ySS-D2-EAo"/>
</constraints> </constraints>
</customView> </customView>
<customView fixedFrame="YES" id="Ejg-Hv-w6Y"> <customView fixedFrame="YES" id="Ejg-Hv-w6Y">
@ -165,11 +53,11 @@
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="10" verticalLineScroll="18" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bIm-n2-Z3h"> <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="10" verticalLineScroll="18" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bIm-n2-Z3h">
<rect key="frame" x="0.0" y="0.0" width="568" height="366"/> <rect key="frame" x="0.0" y="0.0" width="568" height="366"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<clipView key="contentView" ambiguous="YES" id="qrn-6L-y8h"> <clipView key="contentView" id="qrn-6L-y8h">
<rect key="frame" x="1" y="0.0" width="566" height="365"/> <rect key="frame" x="1" y="0.0" width="566" height="365"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<outlineView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="18" headerView="7Nk-Jw-tEm" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="16" outlineTableColumn="X9J-xy-hX5" id="RNB-nt-8rR" customClass="PEOutlineView" customModule="Clover" customModuleProvider="target"> <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="18" headerView="7Nk-Jw-tEm" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="16" outlineTableColumn="X9J-xy-hX5" id="RNB-nt-8rR" customClass="PEOutlineView" customModule="Clover" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="566" height="340"/> <rect key="frame" x="0.0" y="0.0" width="566" height="340"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@ -177,7 +65,6 @@
<tableColumns> <tableColumns>
<tableColumn identifier="keyColumn" width="250" minWidth="130" maxWidth="10000" id="X9J-xy-hX5"> <tableColumn identifier="keyColumn" width="250" minWidth="130" maxWidth="10000" id="X9J-xy-hX5">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Key"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Key">
<font key="font" metaFont="message" size="11"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell> </tableHeaderCell>
@ -201,7 +88,7 @@
<constraint firstAttribute="height" constant="18" id="7tz-s6-Lrv"/> <constraint firstAttribute="height" constant="18" id="7tz-s6-Lrv"/>
</constraints> </constraints>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Table View Cell" id="TeM-gI-jED" customClass="PETextFieldCell" customModule="Clover" customModuleProvider="target"> <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Table View Cell" id="TeM-gI-jED" customClass="PETextFieldCell" customModule="Clover" customModuleProvider="target">
<font key="font" metaFont="message" size="11"/> <font key="font" metaFont="menu" size="11"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell> </textFieldCell>
@ -259,7 +146,6 @@
</tableColumn> </tableColumn>
<tableColumn identifier="typeColumn" width="88" minWidth="88" maxWidth="88" id="bGL-SR-Wh3"> <tableColumn identifier="typeColumn" width="88" minWidth="88" maxWidth="88" id="bGL-SR-Wh3">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Tag"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Tag">
<font key="font" metaFont="message" size="11"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell> </tableHeaderCell>
@ -278,7 +164,7 @@
<rect key="frame" x="3" y="-1" width="82" height="20"/> <rect key="frame" x="3" y="-1" width="82" height="20"/>
<popUpButtonCell key="cell" type="bevel" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" imageScaling="proportionallyDown" inset="2" id="4Az-is-Owj" customClass="PEPopUpButtonCell" customModule="Clover" customModuleProvider="target"> <popUpButtonCell key="cell" type="bevel" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" imageScaling="proportionallyDown" inset="2" id="4Az-is-Owj" customClass="PEPopUpButtonCell" customModule="Clover" customModuleProvider="target">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="message" size="11"/> <font key="font" metaFont="menu" size="11"/>
<menu key="menu" id="79b-Hx-UYz"/> <menu key="menu" id="79b-Hx-UYz"/>
</popUpButtonCell> </popUpButtonCell>
</popUpButton> </popUpButton>
@ -297,7 +183,6 @@
</tableColumn> </tableColumn>
<tableColumn identifier="valueColumn" width="228" minWidth="30" maxWidth="3.4028234663852886e+38" id="0dr-UX-s5d"> <tableColumn identifier="valueColumn" width="228" minWidth="30" maxWidth="3.4028234663852886e+38" id="0dr-UX-s5d">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Value"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Value">
<font key="font" metaFont="message" size="11"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</tableHeaderCell> </tableHeaderCell>
@ -318,7 +203,7 @@
<constraint firstAttribute="height" constant="17" id="2fe-wh-Byc"/> <constraint firstAttribute="height" constant="17" id="2fe-wh-Byc"/>
</constraints> </constraints>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Table View Cell" id="iif-L9-91I" customClass="PETextFieldCell" customModule="Clover" customModuleProvider="target"> <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Table View Cell" id="iif-L9-91I" customClass="PETextFieldCell" customModule="Clover" customModuleProvider="target">
<font key="font" metaFont="message" size="11"/> <font key="font" metaFont="menu" size="11"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell> </textFieldCell>
@ -373,23 +258,250 @@
</constraints> </constraints>
</view> </view>
<connections> <connections>
<outlet property="doneBtn" destination="Ilk-Ta-1NW" id="MPX-vf-UZi"/>
<outlet property="editorView" destination="Ejg-Hv-w6Y" id="VPU-p2-yXS"/> <outlet property="editorView" destination="Ejg-Hv-w6Y" id="VPU-p2-yXS"/>
<outlet property="findAndReplaceViewHeightConstraint" destination="cSS-9y-hU6" id="XwZ-ek-SRP"/> <outlet property="findAndReplaceViewHeightConstraint" destination="cSS-9y-hU6" id="XwZ-ek-SRP"/>
<outlet property="findView" destination="pl5-54-raW" id="3Bq-qj-6Nt"/> <outlet property="findView" destination="pl5-54-raW" id="3Bq-qj-6Nt"/>
<outlet property="nextOrPreviousSegment" destination="HDq-VH-JlL" id="mne-oN-Gv7"/>
<outlet property="outline" destination="RNB-nt-8rR" id="d7w-L8-eki"/> <outlet property="outline" destination="RNB-nt-8rR" id="d7w-L8-eki"/>
<outlet property="replaceField" destination="bgd-lF-t3r" id="Jcl-1E-d3y"/>
<outlet property="replaceOneOrAllSegment" destination="32r-Nm-cON" id="VbA-Xa-A5S"/>
<outlet property="scrollView" destination="bIm-n2-Z3h" id="E8b-BH-UyK"/> <outlet property="scrollView" destination="bIm-n2-Z3h" id="E8b-BH-UyK"/>
<outlet property="searchField" destination="7Wv-ZY-JzG" id="37Q-2C-M6c"/>
<outlet property="showFindViewBtn" destination="CjQ-1i-oKD" id="44h-CB-tqw"/>
<outlet property="showReplaceBtn" destination="f5f-vb-JDD" id="wUY-mZ-0zp"/>
</connections> </connections>
</viewController> </viewController>
<customObject id="2Tp-Fl-jBw" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/> <customObject id="2Tp-Fl-jBw" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="83" y="989"/> <point key="canvasLocation" x="83" y="988.5"/>
</scene>
<!--Find And ReplaceVC-->
<scene sceneID="Ico-HS-jO2">
<objects>
<viewController storyboardIdentifier="FindAndReplaceView" id="mtx-fY-jyf" customClass="PEFindAndReplaceVC" customModule="Clover" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="2do-IN-SxA">
<rect key="frame" x="0.0" y="0.0" width="568" height="61"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="woX-IW-opV" customClass="ReplaceButton" customModule="Clover" customModuleProvider="target">
<rect key="frame" x="0.0" y="27" width="32" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="TMC-bz-mhA"/>
<constraint firstAttribute="width" constant="20" id="oC4-ee-DXZ"/>
<constraint firstAttribute="height" constant="21" id="xfD-sh-Fif"/>
</constraints>
<buttonCell key="cell" type="push" bezelStyle="rounded" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="JYp-5c-sVo">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oNi-B5-Uel" customClass="FindButton" customModule="Clover" customModuleProvider="target">
<rect key="frame" x="0.0" y="-2" width="32" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="UpC-zC-G5z"/>
<constraint firstAttribute="height" constant="21" id="ed8-X4-NaG"/>
</constraints>
<buttonCell key="cell" type="push" bezelStyle="rounded" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="lrk-Ds-qi6">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DJE-mH-htU">
<rect key="frame" x="536" y="27" width="32" height="32"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="OPy-VD-27H"/>
<constraint firstAttribute="width" constant="20" id="Vcv-Rg-YT1"/>
<constraint firstAttribute="width" constant="20" id="rV1-Up-tvZ"/>
</constraints>
<buttonCell key="cell" type="push" bezelStyle="rounded" image="NSStopProgressTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="DJd-YT-ErQ">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bJo-bf-Sea" customClass="PESearchField" customModule="Clover" customModuleProvider="target">
<rect key="frame" x="30" y="33" width="343" height="22"/>
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="bQM-hH-poQ">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</searchFieldCell>
<connections>
<outlet property="countLabel" destination="OsS-HA-N2b" id="Rjk-tm-kM3"/>
<outlet property="delegate" destination="mtx-fY-jyf" id="foS-pt-LRA"/>
</connections>
</searchField>
<searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Plg-kz-YJI" customClass="PEReplaceField" customModule="Clover" customModuleProvider="target">
<rect key="frame" x="30" y="5" width="343" height="22"/>
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="Psz-9U-T70">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</searchFieldCell>
<connections>
<outlet property="delegate" destination="mtx-fY-jyf" id="GOd-JG-V6F"/>
</connections>
</searchField>
<segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="imL-xB-Xfj">
<rect key="frame" x="379" y="4" width="185" height="24"/>
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="UPv-7h-oBl">
<font key="font" metaFont="system"/>
<segments>
<segment label="All" width="73"/>
<segment label="Replace" width="105" tag="1"/>
</segments>
</segmentedCell>
</segmentedControl>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OsS-HA-N2b">
<rect key="frame" x="311" y="36" width="37" height="14"/>
<constraints>
<constraint firstAttribute="width" constant="33" id="yyQ-ra-dCe"/>
</constraints>
<textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" alignment="right" title="Label" id="HiO-XC-AaE">
<font key="font" metaFont="menu" size="11"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PsY-jp-J43">
<rect key="frame" x="379" y="32" width="163" height="24"/>
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="mRj-O7-Czv">
<font key="font" metaFont="system"/>
<segments>
<segment image="NSLeftFacingTriangleTemplate" width="78"/>
<segment image="NSRightFacingTriangleTemplate" width="78" tag="1"/>
</segments>
</segmentedCell>
</segmentedControl>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="Plg-kz-YJI" secondAttribute="bottom" constant="5" id="32N-6C-0df"/>
<constraint firstAttribute="bottom" secondItem="imL-xB-Xfj" secondAttribute="bottom" constant="6" id="FkL-uR-ABI"/>
<constraint firstItem="bJo-bf-Sea" firstAttribute="leading" secondItem="woX-IW-opV" secondAttribute="trailing" constant="4" id="ItD-8G-ufD"/>
<constraint firstItem="bJo-bf-Sea" firstAttribute="leading" secondItem="Plg-kz-YJI" secondAttribute="leading" id="JK8-yd-EUc"/>
<constraint firstItem="woX-IW-opV" firstAttribute="leading" secondItem="2do-IN-SxA" secondAttribute="leading" constant="6" id="L36-gI-DyW"/>
<constraint firstItem="PsY-jp-J43" firstAttribute="leading" secondItem="OsS-HA-N2b" secondAttribute="trailing" constant="35" id="Lm1-wB-1AH"/>
<constraint firstItem="PsY-jp-J43" firstAttribute="leading" secondItem="bJo-bf-Sea" secondAttribute="trailing" constant="8" symbolic="YES" id="MkI-SC-Cx5"/>
<constraint firstItem="oNi-B5-Uel" firstAttribute="top" secondItem="woX-IW-opV" secondAttribute="bottom" constant="8" id="N5J-XC-aha"/>
<constraint firstItem="bJo-bf-Sea" firstAttribute="top" secondItem="2do-IN-SxA" secondAttribute="top" constant="6" id="TKS-9o-IWV"/>
<constraint firstItem="imL-xB-Xfj" firstAttribute="top" secondItem="PsY-jp-J43" secondAttribute="bottom" constant="7" id="Wkg-IN-iFa"/>
<constraint firstItem="DJE-mH-htU" firstAttribute="top" secondItem="2do-IN-SxA" secondAttribute="top" constant="6" id="Xp2-dM-dkP"/>
<constraint firstItem="imL-xB-Xfj" firstAttribute="top" secondItem="DJE-mH-htU" secondAttribute="bottom" constant="7" id="YMD-BC-AMC"/>
<constraint firstItem="woX-IW-opV" firstAttribute="trailing" secondItem="oNi-B5-Uel" secondAttribute="trailing" id="YOC-ht-cQS"/>
<constraint firstItem="Plg-kz-YJI" firstAttribute="top" secondItem="bJo-bf-Sea" secondAttribute="bottom" constant="6" id="buK-Ew-GYx"/>
<constraint firstItem="imL-xB-Xfj" firstAttribute="leading" secondItem="Plg-kz-YJI" secondAttribute="trailing" constant="8" symbolic="YES" id="hUS-7s-k90"/>
<constraint firstItem="woX-IW-opV" firstAttribute="top" secondItem="2do-IN-SxA" secondAttribute="top" constant="6" id="ijh-tf-cBS"/>
<constraint firstItem="PsY-jp-J43" firstAttribute="top" secondItem="2do-IN-SxA" secondAttribute="top" constant="6" id="kA6-Uo-M7r"/>
<constraint firstItem="woX-IW-opV" firstAttribute="leading" secondItem="oNi-B5-Uel" secondAttribute="leading" id="kD9-Ew-wjM"/>
<constraint firstAttribute="bottom" secondItem="oNi-B5-Uel" secondAttribute="bottom" constant="5" id="mm8-XK-Coq"/>
<constraint firstAttribute="trailing" secondItem="DJE-mH-htU" secondAttribute="trailing" constant="6" id="nqb-8T-uXP"/>
<constraint firstItem="DJE-mH-htU" firstAttribute="leading" secondItem="PsY-jp-J43" secondAttribute="trailing" constant="2" id="sED-xj-Za2"/>
<constraint firstAttribute="trailing" secondItem="imL-xB-Xfj" secondAttribute="trailing" constant="6" id="xvS-ey-PFq"/>
<constraint firstItem="bJo-bf-Sea" firstAttribute="baseline" secondItem="OsS-HA-N2b" secondAttribute="baseline" id="zsz-gS-uPa"/>
</constraints>
</view>
<connections>
<outlet property="doneBtn" destination="DJE-mH-htU" id="BA6-7O-DLm"/>
<outlet property="nextOrPreviousSegment" destination="PsY-jp-J43" id="zhS-eW-Lhd"/>
<outlet property="replaceField" destination="Plg-kz-YJI" id="ovr-3x-wYC"/>
<outlet property="replaceOneOrAllSegment" destination="imL-xB-Xfj" id="OtF-pn-DgR"/>
<outlet property="searchField" destination="bJo-bf-Sea" id="N4V-zF-v8X"/>
<outlet property="showFindViewBtn" destination="oNi-B5-Uel" id="ae7-D6-VMK"/>
<outlet property="showReplaceBtn" destination="woX-IW-opV" id="gTn-P5-HI9"/>
</connections>
</viewController>
<customObject id="UoF-sz-Zpd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="83" y="1383.5"/>
</scene>
<!--FindVC-->
<scene sceneID="77F-pT-WPV">
<objects>
<viewController storyboardIdentifier="FindView" id="Ssc-b5-usK" customClass="PEFindVC" customModule="Clover" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" wantsLayer="YES" id="1Hu-gM-0r3">
<rect key="frame" x="0.0" y="0.0" width="568" height="28"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="K85-Om-tNY" customClass="ReplaceButton" customModule="Clover" customModuleProvider="target">
<rect key="frame" x="0.0" y="-3" width="32" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="cJn-G1-54U"/>
<constraint firstAttribute="height" constant="21" id="fno-uA-Jij"/>
</constraints>
<buttonCell key="cell" type="push" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="zWI-Hd-axf">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NZq-Qa-cGf" customClass="PESearchField" customModule="Clover" customModuleProvider="target">
<rect key="frame" x="30" y="3" width="343" height="22"/>
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="ieK-ca-p8W">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</searchFieldCell>
<connections>
<outlet property="countLabel" destination="GXp-h6-QOH" id="NYt-ri-nYc"/>
<outlet property="delegate" destination="Ssc-b5-usK" id="ZS3-0x-xSx"/>
</connections>
</searchField>
<segmentedControl wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2FA-ko-lBw">
<rect key="frame" x="379" y="1" width="163" height="25"/>
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="tgx-j2-FRk">
<font key="font" metaFont="system"/>
<segments>
<segment image="NSLeftFacingTriangleTemplate" width="78"/>
<segment image="NSRightFacingTriangleTemplate" width="78" tag="1"/>
</segments>
</segmentedCell>
</segmentedControl>
<button wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iel-Ig-tMJ">
<rect key="frame" x="536" y="-4" width="32" height="33"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="gYT-ye-mil"/>
<constraint firstAttribute="height" constant="22" id="nPW-eu-zhC"/>
</constraints>
<buttonCell key="cell" type="push" bezelStyle="rounded" image="NSStopProgressTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="e5Y-kT-6sX">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<textField wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GXp-h6-QOH">
<rect key="frame" x="311" y="7" width="37" height="14"/>
<constraints>
<constraint firstAttribute="width" constant="33" id="trX-zS-bKB"/>
</constraints>
<textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" alignment="right" title="Label" id="b2y-Oo-kgc">
<font key="font" metaFont="menu" size="11"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
<constraints>
<constraint firstItem="GXp-h6-QOH" firstAttribute="baseline" secondItem="K85-Om-tNY" secondAttribute="baseline" id="00i-0Y-gTh"/>
<constraint firstAttribute="bottom" secondItem="NZq-Qa-cGf" secondAttribute="bottom" constant="3" id="7mw-Nb-fnb"/>
<constraint firstItem="NZq-Qa-cGf" firstAttribute="top" secondItem="1Hu-gM-0r3" secondAttribute="top" constant="3" id="8bA-8m-nX3"/>
<constraint firstItem="NZq-Qa-cGf" firstAttribute="leading" secondItem="K85-Om-tNY" secondAttribute="trailing" constant="4" id="Dhx-mx-yd6"/>
<constraint firstAttribute="bottom" secondItem="iel-Ig-tMJ" secondAttribute="bottom" constant="3" id="HWh-W8-mSd"/>
<constraint firstItem="2FA-ko-lBw" firstAttribute="leading" secondItem="NZq-Qa-cGf" secondAttribute="trailing" constant="8" id="Ipk-j8-5aO"/>
<constraint firstItem="NZq-Qa-cGf" firstAttribute="leading" secondItem="K85-Om-tNY" secondAttribute="trailing" constant="4" id="MRj-TP-0hj"/>
<constraint firstItem="K85-Om-tNY" firstAttribute="top" secondItem="1Hu-gM-0r3" secondAttribute="top" constant="3" id="NI2-NY-Giu"/>
<constraint firstItem="iel-Ig-tMJ" firstAttribute="leading" secondItem="2FA-ko-lBw" secondAttribute="trailing" constant="2" id="UJc-fj-qXH"/>
<constraint firstItem="2FA-ko-lBw" firstAttribute="leading" secondItem="GXp-h6-QOH" secondAttribute="trailing" constant="35" id="VuB-Qf-wom"/>
<constraint firstAttribute="bottom" secondItem="K85-Om-tNY" secondAttribute="bottom" constant="4" id="WUh-tm-nBN"/>
<constraint firstItem="iel-Ig-tMJ" firstAttribute="leading" secondItem="2FA-ko-lBw" secondAttribute="trailing" constant="2" id="cJm-bu-9v3"/>
<constraint firstItem="iel-Ig-tMJ" firstAttribute="top" secondItem="1Hu-gM-0r3" secondAttribute="top" constant="3" id="dJW-kW-hEg"/>
<constraint firstItem="2FA-ko-lBw" firstAttribute="top" secondItem="1Hu-gM-0r3" secondAttribute="top" constant="3" id="iN5-Ur-nr3"/>
<constraint firstItem="2FA-ko-lBw" firstAttribute="leading" secondItem="NZq-Qa-cGf" secondAttribute="trailing" constant="8" id="iuR-11-CCP"/>
<constraint firstItem="K85-Om-tNY" firstAttribute="leading" secondItem="1Hu-gM-0r3" secondAttribute="leading" constant="6" id="r1J-Yf-Whx"/>
<constraint firstAttribute="bottom" secondItem="2FA-ko-lBw" secondAttribute="bottom" constant="3" id="spR-JF-Msw"/>
<constraint firstAttribute="trailing" secondItem="iel-Ig-tMJ" secondAttribute="trailing" constant="6" id="x8s-eu-54q"/>
</constraints>
</view>
<connections>
<outlet property="doneBtn" destination="iel-Ig-tMJ" id="UO8-Qb-dFb"/>
<outlet property="nextOrPreviousSegment" destination="2FA-ko-lBw" id="6FB-pu-x81"/>
<outlet property="searchField" destination="NZq-Qa-cGf" id="Das-up-5Bc"/>
<outlet property="showReplaceBtn" destination="K85-Om-tNY" id="X3x-rV-riR"/>
</connections>
</viewController>
<customObject id="FN6-H2-4bg" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="83" y="1278"/>
</scene> </scene>
</scenes> </scenes>
<resources> <resources>

86
CloverApp/Clover/Plist Editor/Views/PlistEditorVC.swift
View File

@ -27,7 +27,7 @@
import Cocoa import Cocoa
@available(OSX 10.11, *) @available(OSX 10.10, *)
final class PlistEditorVC: NSViewController, final class PlistEditorVC: NSViewController,
NSOutlineViewDelegate, NSOutlineViewDelegate,
NSOutlineViewDataSource, NSOutlineViewDataSource,
@ -37,13 +37,16 @@ NSSearchFieldDelegate, NSSplitViewDelegate {
@IBOutlet var editorView: NSView! @IBOutlet var editorView: NSView!
@IBOutlet var scrollView : NSScrollView! @IBOutlet var scrollView : NSScrollView!
@IBOutlet var outline : PEOutlineView! @IBOutlet var outline : PEOutlineView!
@IBOutlet var doneBtn: NSButton? var doneBtn: NSButton?
@IBOutlet var showFindViewBtn: FindButton? var showFindViewBtn: FindButton?
@IBOutlet var showReplaceBtn: ReplaceButton? var showReplaceBtn: ReplaceButton?
@IBOutlet var nextOrPreviousSegment: NSSegmentedControl? var nextOrPreviousSegment: NSSegmentedControl?
@IBOutlet var replaceOneOrAllSegment: NSSegmentedControl? var replaceOneOrAllSegment: NSSegmentedControl?
@IBOutlet var searchField: PESearchField? var searchField: PESearchField?
@IBOutlet var replaceField: PEReplaceField? var replaceField: PEReplaceField?
var currentSearchString : String = ""
var currentReplaceString : String = ""
@IBOutlet var findAndReplaceViewHeightConstraint: NSLayoutConstraint! @IBOutlet var findAndReplaceViewHeightConstraint: NSLayoutConstraint!
@ -80,23 +83,6 @@ NSSearchFieldDelegate, NSSplitViewDelegate {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
self.findAndReplaceViewHeightConstraint.constant = 0 self.findAndReplaceViewHeightConstraint.constant = 0
self.searchField?.placeholderString = localizedSearch
self.searchField?.countLabel?.stringValue = ""
self.doneBtn?.target = self
self.doneBtn?.action = #selector(self.doneButtonPressed(_:))
self.nextOrPreviousSegment?.target = self
self.nextOrPreviousSegment?.action = #selector(self.segmentScrollerPressed(_:))
self.replaceOneOrAllSegment?.target = self
self.replaceOneOrAllSegment?.action = #selector(self.replaceOneOrAllSegmentPressed(_:))
if self.replaceOneOrAllSegment != nil {
for i in 0..<self.replaceOneOrAllSegment!.segmentCount {
let label = self.replaceOneOrAllSegment!.label(forSegment: i)
self.replaceOneOrAllSegment!.setLabel(label!.locale, forSegment: i)
}
}
/* /*
Interface Builder is a mess and doesn't want to constraints the scrollView: Interface Builder is a mess and doesn't want to constraints the scrollView:
fu__!, who cares! ..I'll do by my self. fu__!, who cares! ..I'll do by my self.
@ -106,7 +92,6 @@ NSSearchFieldDelegate, NSSplitViewDelegate {
override func viewDidAppear() { override func viewDidAppear() {
super.viewDidAppear() super.viewDidAppear()
self.searchField?.delegate = self
if !self.vcLoaded { if !self.vcLoaded {
self.outline.target = self self.outline.target = self
@ -232,18 +217,29 @@ NSSearchFieldDelegate, NSSplitViewDelegate {
} }
func hideFindAndReplaceView() { func hideFindAndReplaceView() {
if (self.searchField != nil) {
self.searchField?.superview?.removeFromSuperview()
}
self.findAndReplaceViewHeightConstraint.animator().constant = 0 self.findAndReplaceViewHeightConstraint.animator().constant = 0
self.view.window?.makeFirstResponder(self.outline) self.view.window?.makeFirstResponder(self.outline)
} }
@IBAction func showFindView(sender: Any?) { @objc func showFindView(sender: Any?) {
self.findAndReplaceViewHeightConstraint.animator().constant = 28 if let vc = PEFindVC.loadFromNib(editor: self) {
self.view.window?.makeFirstResponder(self.searchField) self.findAndReplaceViewHeightConstraint.constant = 28
self.findView.addSubview(vc.view)
gAddConstraintsToFit(superView: self.findView, subView: vc.view)
self.view.window?.makeFirstResponder(self.searchField)
}
} }
@IBAction func showReplaceView(sender: Any?) { @objc func showReplaceView(sender: Any?) {
self.findAndReplaceViewHeightConstraint.animator().constant = 57 if let vc = PEFindAndReplaceVC.loadFromNib(editor: self) {
self.view.window?.makeFirstResponder(self.replaceField) self.findAndReplaceViewHeightConstraint.constant = 61
self.findView.addSubview(vc.view)
gAddConstraintsToFit(superView: self.findView, subView: vc.view)
self.view.window?.makeFirstResponder(self.replaceField)
}
} }
@objc func customDoubleClick() { @objc func customDoubleClick() {
@ -497,10 +493,14 @@ NSSearchFieldDelegate, NSSplitViewDelegate {
} }
@objc func doneButtonPressed(_ sender: NSButton) { @objc func doneButtonPressed(_ sender: NSButton) {
/*
self.searchField?.stringValue = "" self.searchField?.stringValue = ""
self.replaceField?.stringValue = "" self.replaceField?.stringValue = ""*/
self.performDelayedSearch() self.performDelayedSearch()
self.searchField?.countLabel?.placeholderString = "" self.searchField?.countLabel?.placeholderString = ""
/*
self.currentSearchString = ""
self.currentReplaceString = ""*/
self.hideFindAndReplaceView() self.hideFindAndReplaceView()
} }
@ -520,13 +520,6 @@ NSSearchFieldDelegate, NSSplitViewDelegate {
} }
} }
// not used because no delegate is set)
func controlTextDidChange(_ obj: Notification) {
if (obj.object as AnyObject) as? NSObject == self.searchField {
}
}
// called by NSSearchField subclass // called by NSSearchField subclass
@objc func peSearchFieldTextDidChange(_ obj: Notification) { @objc func peSearchFieldTextDidChange(_ obj: Notification) {
if (self.outline.window != nil) && (obj.object != nil) && (self.outline.window?.isKeyWindow)! { if (self.outline.window != nil) && (obj.object != nil) && (self.outline.window?.isKeyWindow)! {
@ -542,7 +535,7 @@ NSSearchFieldDelegate, NSSplitViewDelegate {
userInfo: nil, userInfo: nil,
repeats: false) repeats: false)
} else if (obj.object is PEReplaceField) && (obj.object as! PEReplaceField) == self.replaceField { } else if (obj.object is PEReplaceField) && (obj.object as! PEReplaceField) == self.replaceField {
// doing nothing self.currentReplaceString = (obj.object as! PEReplaceField).stringValue
} }
} }
} }
@ -554,10 +547,19 @@ NSSearchFieldDelegate, NSSplitViewDelegate {
} }
self.searchTimer = nil self.searchTimer = nil
} }
let pasteboard = NSPasteboard.init(name: .findPboard)
pasteboard.declareTypes([.string, .textFinderOptions], owner: nil)
let plist = [NSPasteboard.PasteboardType.TextFinderOptionKey.textFinderCaseInsensitiveKey : true,
NSPasteboard.PasteboardType.TextFinderOptionKey.textFinderMatchingTypeKey : NSNumber(value: NSTextFinder.MatchingType.contains.rawValue)]
pasteboard.setPropertyList(plist, forType: .string)
pasteboard.setString(self.searchField!.stringValue, forType: .string)
self.currentSearchString = self.searchField!.stringValue
let pattern = self.searchField?.stringValue.lowercased() let pattern = self.searchField?.stringValue.lowercased()
self.searches = self.findAllSearches(with: pattern!) self.searches = self.findAllSearches(with: pattern!)
self.searchField?.countLabel?.placeholderString = "\(self.searches.count)" self.searchField?.countLabel?.placeholderString = "\(self.searches.count)"
for node in self.searches { for node in self.searches {
self.asyncExpand(item: node, expandParentOnly: true) self.asyncExpand(item: node, expandParentOnly: true)
} }

2
CloverApp/Clover/Plist Editor/Views/PlistEditorWC.swift
View File

@ -27,7 +27,7 @@
import Cocoa import Cocoa
@available(OSX 10.11, *) @available(OSX 10.10, *)
class PlistEditorWC: NSWindowController, NSWindowDelegate { class PlistEditorWC: NSWindowController, NSWindowDelegate {
var subview: PlistEditorWC? var subview: PlistEditorWC?
var fixed: Bool = false var fixed: Bool = false

2
CloverApp/Clover/SettingsView.swift
View File

@ -218,7 +218,7 @@ final class SettingsViewController:
self.oemBoardIdField.stringValue = getOEMBoard() ?? kNotAvailable.locale self.oemBoardIdField.stringValue = getOEMBoard() ?? kNotAvailable.locale
// tab 3 // tab 3
self.plistsPopUp.removeAllItems() self.plistsPopUp.removeAllItems()
if #available(OSX 10.11, *) { if #available(OSX 10.10, *) {
self.autoSaveButton.state = UDs.bool(forKey: kAutoSavePlistsKey) ? .on : .off self.autoSaveButton.state = UDs.bool(forKey: kAutoSavePlistsKey) ? .on : .off
} else { } else {
self.autoSaveButton.isEnabled = false self.autoSaveButton.isEnabled = false