nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 02:22:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved views/windows closer to controllers

Browse Source
This commit is contained in:
michael starke
2017-02-02 17:24:42 +01:00
parent ad1734e7f5
commit 03f5ca42a2
10 changed files with 177 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
MacPass.xcodeproj/project.pbxproj
View File

@@ -26,6 +26,8 @@
4C17F105184E630200E85625 /* 14_BatteryTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C17F104184E630200E85625 /* 14_BatteryTemplate.pdf */; };
4C17F108184E6B6C00E85625 /* 31_PrintTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C17F106184E6B6C00E85625 /* 31_PrintTemplate.pdf */; };
4C17F109184E6B6C00E85625 /* 30_TerminalTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C17F107184E6B6C00E85625 /* 30_TerminalTemplate.pdf */; };
4C1BDF2B1E4392640012A3F0 /* MPPluginDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1BDF291E4392640012A3F0 /* MPPluginDataViewController.m */; };
4C1BDF2C1E4392640012A3F0 /* MPPluginDataViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C1BDF2A1E4392640012A3F0 /* MPPluginDataViewController.xib */; };
4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */; };
4C1E9885185F71A800943563 /* MPContextBarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1E9884185F71A800943563 /* MPContextBarViewController.m */; };
4C1F7FA21E3A12E600D6A40E /* MPModifiedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C1F7FA11E3A12E600D6A40E /* MPModifiedKey.m */; };
@@ -322,6 +324,9 @@
4C17F104184E630200E85625 /* 14_BatteryTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 14_BatteryTemplate.pdf; sourceTree = "<group>"; };
4C17F106184E6B6C00E85625 /* 31_PrintTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 31_PrintTemplate.pdf; sourceTree = "<group>"; };
4C17F107184E6B6C00E85625 /* 30_TerminalTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 30_TerminalTemplate.pdf; sourceTree = "<group>"; };
4C1BDF281E4392640012A3F0 /* MPPluginDataViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPluginDataViewController.h; sourceTree = "<group>"; };
4C1BDF291E4392640012A3F0 /* MPPluginDataViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPluginDataViewController.m; sourceTree = "<group>"; };
4C1BDF2A1E4392640012A3F0 /* MPPluginDataViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MPPluginDataViewController.xib; sourceTree = "<group>"; };
4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordCreatorWindow.xib; sourceTree = "<group>"; };
4C1E9883185F71A800943563 /* MPContextBarViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPContextBarViewController.h; sourceTree = "<group>"; };
4C1E9884185F71A800943563 /* MPContextBarViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPContextBarViewController.m; sourceTree = "<group>"; };
@@ -843,19 +848,8 @@
isa = PBXGroup;
children = (
4C6AEF041A0441F800CA2420 /* AccessoryViews */,
4CF78060176E75180032EE71 /* Settings */,
4C25D58616CF0FAA00F6806C /* EntryView.xib */,
4C3FFD9D16DAF60600DF9186 /* ContextBar.xib */,
4C77E37B15B84A240093A587 /* MainMenu.xib */,
4C61EA0416D2FFE200AC519E /* OutlineView.xib */,
4CF78061176E752E0032EE71 /* PasswordInputs */,
4C4B7EF517A46815000234C7 /* Inspector */,
4C7155DA1A10DB6D00979307 /* IconSelection.xib */,
4C2C8B331787500E009649F3 /* UnprotectedWarningView.xib */,
6021FE7918E15FF300C3BC51 /* DatePickingView.xib */,
4C26C34A18D8D5A300CF1A1C /* PreviewView.xib */,
4CD820231A32173100399DBB /* ReferenceBuilderView.xib */,
4CAAA8261D787B8B00CDE977 /* AutotypeBuilderView.xib */,
4CE8247316E2F2B900573141 /* MPOverlayView.h */,
4CE8247416E2F2B900573141 /* MPOverlayView.m */,
4CFC53BD16E94729007396BE /* MPShadowBox.h */,
@@ -1032,14 +1026,19 @@
children = (
4CA0B2F715BCAF6700654E32 /* MPGeneralSettingsController.h */,
4CA0B2F815BCAF6700654E32 /* MPGeneralSettingsController.m */,
4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */,
4CF78062176E75AD0032EE71 /* MPIntegrationSettingsController.h */,
4CF78063176E75AD0032EE71 /* MPIntegrationSettingsController.m */,
6021FE5818E1429500C3BC51 /* IntegrationSettings.xib */,
4CD7223917A7CB0700F5A1E1 /* MPWorkflowSettingsController.h */,
4CD7223A17A7CB0700F5A1E1 /* MPWorkflowSettingsController.m */,
6021FE6318E15D9100C3BC51 /* WorkflowSettings.xib */,
4CFB18E218A17FA20097A34B /* MPUpdateSettingsController.h */,
4CFB18E318A17FA20097A34B /* MPUpdateSettingsController.m */,
6021FE6E18E15E6D00C3BC51 /* UpdateSettings.xib */,
4C25703C1BF11C2300D39416 /* MPPluginSettingsController.h */,
4C25703D1BF11C2300D39416 /* MPPluginSettingsController.m */,
4C0DBEF71BF508DE00F9B287 /* PluginSettings.xib */,
);
name = Settings;
sourceTree = "<group>";
@@ -1047,8 +1046,14 @@
4C4B7EF517A46815000234C7 /* Inspector */ = {
isa = PBXGroup;
children = (
4C77547316E55FE800970E02 /* MPInspectorViewController.h */,
4C77547416E55FE800970E02 /* MPInspectorViewController.m */,
4C76156F1764C0E20015A1A6 /* InspectorView.xib */,
4C4B7EEB17A467E1000234C7 /* MPGroupInspectorViewController.h */,
4C4B7EEC17A467E1000234C7 /* MPGroupInspectorViewController.m */,
6021FE4D18E13F1D00C3BC51 /* GroupInspectorView.xib */,
4C4B7EF017A467FC000234C7 /* MPEntryInspectorViewController.h */,
4C4B7EF117A467FC000234C7 /* MPEntryInspectorViewController.m */,
6021FE3D18E1341900C3BC51 /* EntryInspectorView.xib */,
);
name = Inspector;
@@ -1295,32 +1300,40 @@
4C2E382516D1470200037A9D /* MPViewController.m */,
4C65FAE616D16DDB006E0577 /* MPPasswordInputController.h */,
4C65FAE716D16DDB006E0577 /* MPPasswordInputController.m */,
4C76156A1764C0C40015A1A6 /* PasswordInputView.xib */,
4C5A11FB1708DE8700223D8A /* MPPasswordCreatorViewController.h */,
4C5A11FC1708DE8700223D8A /* MPPasswordCreatorViewController.m */,
6021FE8F18E1617300C3BC51 /* PasswordCreatorView.xib */,
4CDF01A116D1B76700D0AC08 /* MPEntryViewController.h */,
4CDF01A216D1B76700D0AC08 /* MPEntryViewController.m */,
4C25D58616CF0FAA00F6806C /* EntryView.xib */,
4C61EA0116D2FD0800AC519E /* MPOutlineViewController.h */,
4C61EA0216D2FD0800AC519E /* MPOutlineViewController.m */,
4C61EA0416D2FFE200AC519E /* OutlineView.xib */,
4CE39ABD16ECE34A000FE29D /* MPIconSelectViewController.h */,
4CE39ABE16ECE34A000FE29D /* MPIconSelectViewController.m */,
4C7155DA1A10DB6D00979307 /* IconSelection.xib */,
4C4B7EE617A45EC5000234C7 /* MPDatePickingViewController.h */,
4C4B7EE717A45EC5000234C7 /* MPDatePickingViewController.m */,
4C77547316E55FE800970E02 /* MPInspectorViewController.h */,
4C77547416E55FE800970E02 /* MPInspectorViewController.m */,
4C4B7EEB17A467E1000234C7 /* MPGroupInspectorViewController.h */,
4C4B7EEC17A467E1000234C7 /* MPGroupInspectorViewController.m */,
4C4B7EF017A467FC000234C7 /* MPEntryInspectorViewController.h */,
4C4B7EF117A467FC000234C7 /* MPEntryInspectorViewController.m */,
6021FE7918E15FF300C3BC51 /* DatePickingView.xib */,
4C4B7EF517A46815000234C7 /* Inspector */,
4C0F647917B6BC9C00D9522A /* MPSavePanelAccessoryViewController.h */,
4C0F647A17B6BC9C00D9522A /* MPSavePanelAccessoryViewController.m */,
4C1E9883185F71A800943563 /* MPContextBarViewController.h */,
4C1E9884185F71A800943563 /* MPContextBarViewController.m */,
4C3FFD9D16DAF60600DF9186 /* ContextBar.xib */,
4C26C34818D8D5A300CF1A1C /* MPPreviewViewController.h */,
4C26C34918D8D5A300CF1A1C /* MPPreviewViewController.m */,
4C26C34A18D8D5A300CF1A1C /* PreviewView.xib */,
4CE30ACA1A312B7F0063FCC6 /* MPReferenceBuilderViewController.h */,
4CE30ACB1A312B7F0063FCC6 /* MPReferenceBuilderViewController.m */,
4CD820231A32173100399DBB /* ReferenceBuilderView.xib */,
4CAAA8241D787B8B00CDE977 /* MPAutotypeBuilderViewController.h */,
4CAAA8251D787B8B00CDE977 /* MPAutotypeBuilderViewController.m */,
4CAAA8261D787B8B00CDE977 /* AutotypeBuilderView.xib */,
4C1BDF281E4392640012A3F0 /* MPPluginDataViewController.h */,
4C1BDF291E4392640012A3F0 /* MPPluginDataViewController.m */,
4C1BDF2A1E4392640012A3F0 /* MPPluginDataViewController.xib */,
);
name = "View Controller";
sourceTree = "<group>";
@@ -1364,16 +1377,22 @@
children = (
4CA0B2FA15BCAF8600654E32 /* MPSettingsWindowController.h */,
4CA0B2FB15BCAF8600654E32 /* MPSettingsWindowController.m */,
4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */,
4C83814015BF4677001AE468 /* MPDocumentWindowController.h */,
4C83814115BF4677001AE468 /* MPDocumentWindowController.m */,
4CD884B615BD47080042BBF8 /* DocumentWindow.xib */,
4CE8246D16E2E93400573141 /* MPOverlayWindowController.h */,
4CE8246E16E2E93400573141 /* MPOverlayWindowController.m */,
4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */,
4CD5D703177A5F3300100649 /* MPDatabaseSettingsWindowController.h */,
4CD5D704177A5F3300100649 /* MPDatabaseSettingsWindowController.m */,
6021FE9A18E1650F00C3BC51 /* DatabaseSettingsWindow.xib */,
4C0728BB17B5B7F7005A7DD9 /* MPPasswordEditWindowController.h */,
4C0728BC17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m */,
6021FE8418E160BC00C3BC51 /* PasswordEditWindow.xib */,
4C0B038918E36DA400B9F9C9 /* MPFixAutotypeWindowController.h */,
4C0B038A18E36DA400B9F9C9 /* MPFixAutotypeWindowController.m */,
4C0B038B18E36DA400B9F9C9 /* FixAutotypeWindow.xib */,
);
name = "Window Controller";
sourceTree = "<group>";
@@ -1394,13 +1413,7 @@
4CE8247216E2E99F00573141 /* Windows */ = {
isa = PBXGroup;
children = (
4C0B038B18E36DA400B9F9C9 /* FixAutotypeWindow.xib */,
4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */,
4CD884B615BD47080042BBF8 /* DocumentWindow.xib */,
4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */,
4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */,
6021FE9A18E1650F00C3BC51 /* DatabaseSettingsWindow.xib */,
6021FE8418E160BC00C3BC51 /* PasswordEditWindow.xib */,
4C7F8B6A1A10B68400CCB83D /* WelcomeWindow.xib */,
4C0DD6C518B2A44700FCB193 /* AutotypeCandidateSelectionWindow.xib */,
4CB915931A0159A20089CE5B /* DuplicateEntryOptionsWindow.xib */,
@@ -1422,27 +1435,6 @@
name = Icons;
sourceTree = "<group>";
};
4CF78060176E75180032EE71 /* Settings */ = {
isa = PBXGroup;
children = (
4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */,
6021FE5818E1429500C3BC51 /* IntegrationSettings.xib */,
6021FE6318E15D9100C3BC51 /* WorkflowSettings.xib */,
6021FE6E18E15E6D00C3BC51 /* UpdateSettings.xib */,
4C0DBEF71BF508DE00F9B287 /* PluginSettings.xib */,
);
name = Settings;
sourceTree = "<group>";
};
4CF78061176E752E0032EE71 /* PasswordInputs */ = {
isa = PBXGroup;
children = (
4C76156A1764C0C40015A1A6 /* PasswordInputView.xib */,
6021FE8F18E1617300C3BC51 /* PasswordCreatorView.xib */,
);
name = PasswordInputs;
sourceTree = "<group>";
};
4CF9ECAE1BFDEC5700C58E99 /* Plugin */ = {
isa = PBXGroup;
children = (
@@ -1665,6 +1657,7 @@
4C53A7A51864C39D000DFF0D /* KPKLocalizable.strings in Resources */,
4C3826761AD04C24007D7D67 /* harddiskTemplate.pdf in Resources */,
4C0DBEF51BF508DE00F9B287 /* PluginSettings.xib in Resources */,
4C1BDF2C1E4392640012A3F0 /* MPPluginDataViewController.xib in Resources */,
4C7F8B681A10B68400CCB83D /* WelcomeWindow.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1799,6 +1792,7 @@
4C4B7EEE17A467E1000234C7 /* MPGroupInspectorViewController.m in Sources */,
4C7B63721C0CB51F00D7038C /* TTTCryptographyTransformers.m in Sources */,
4C4B7EF317A467FC000234C7 /* MPEntryInspectorViewController.m in Sources */,
4C1BDF2B1E4392640012A3F0 /* MPPluginDataViewController.m in Sources */,
4C4B7EF817A4B335000234C7 /* MPUniqueCharactersFormatter.m in Sources */,
4C8B36AB17A6ED4B005E1FF1 /* MPOutlineContextMenuDelegate.m in Sources */,
4CD7223B17A7CB0700F5A1E1 /* MPWorkflowSettingsController.m in Sources */,

88
MacPass/Base.lproj/EntryInspectorView.xib
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
@@ -39,10 +39,10 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<view translatesAutoresizingMaskIntoConstraints="NO" id="3">
<rect key="frame" x="0.0" y="0.0" width="293" height="529"/>
<rect key="frame" x="0.0" y="0.0" width="293" height="421"/>
<subviews>
<segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="82">
<rect key="frame" x="35" y="505" width="224" height="19"/>
<rect key="frame" x="35" y="397" width="224" height="19"/>
<segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="texturedSquare" trackingMode="selectOne" id="238">
<font key="font" metaFont="smallSystem"/>
<segments>
@@ -54,7 +54,7 @@
</segmentedCell>
</segmentedControl>
<tabView drawsBackground="NO" type="noTabsNoBorder" initialItem="110" translatesAutoresizingMaskIntoConstraints="NO" id="83">
<rect key="frame" x="0.0" y="0.0" width="293" height="503"/>
<rect key="frame" x="0.0" y="0.0" width="293" height="395"/>
<font key="font" metaFont="system"/>
<tabViewItems>
<tabViewItem label="General" identifier="1" id="110">
@@ -241,17 +241,14 @@
<constraint firstAttribute="bottom" secondItem="125" secondAttribute="bottom" constant="26" id="281"/>
</constraints>
</view>
<connections>
<outlet property="initialFirstResponder" destination="124" id="HDR-d9-QyI"/>
</connections>
</tabViewItem>
<tabViewItem label="Fields" identifier="" id="108">
<tabViewItem label="CustomFields" identifier="" id="108">
<view key="view" id="178">
<rect key="frame" x="0.0" y="0.0" width="293" height="503"/>
<rect key="frame" x="0.0" y="0.0" width="293" height="395"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="179">
<rect key="frame" x="241" y="464" width="32" height="25"/>
<rect key="frame" x="241" y="356" width="32" height="25"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="231"/>
</constraints>
@@ -264,21 +261,21 @@
</connections>
</button>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="181">
<rect key="frame" x="18" y="469" width="79" height="14"/>
<rect key="frame" x="18" y="361" width="79" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Custom Fields" id="190">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="disabledControlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<scrollView borderType="line" autohidesScrollers="YES" horizontalLineScroll="56" horizontalPageScroll="10" verticalLineScroll="56" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="180" customClass="HNHUIScrollView">
<rect key="frame" x="16" y="26" width="261" height="432"/>
<scrollView borderType="line" autohidesScrollers="YES" horizontalLineScroll="56" horizontalPageScroll="10" verticalLineScroll="56" verticalPageScroll="10" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="180" customClass="HNHUIScrollView">
<rect key="frame" x="16" y="20" width="261" height="330"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="k8G-zp-BXZ">
<rect key="frame" x="1" y="1" width="259" height="430"/>
<autoresizingMask key="autoresizingMask"/>
<rect key="frame" x="1" y="1" width="259" height="328"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="54" rowSizeStyle="automatic" viewBased="YES" id="193">
<rect key="frame" x="0.0" y="0.0" width="259" height="430"/>
<rect key="frame" x="0.0" y="0.0" width="259" height="328"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -329,7 +326,7 @@
<constraints>
<constraint firstAttribute="width" constant="32" id="215"/>
</constraints>
<buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSRemoveTemplate" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="216">
<buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSRemoveTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="216">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
@@ -404,7 +401,7 @@
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="Car-Dj-KWv"/>
</constraints>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="192">
<rect key="frame" x="1" y="119" width="223" height="15"/>
<rect key="frame" x="1" y="130" width="259" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="191">
@@ -414,19 +411,16 @@
</scrollView>
</subviews>
<constraints>
<constraint firstItem="181" firstAttribute="top" secondItem="178" secondAttribute="top" constant="20" symbolic="YES" id="182"/>
<constraint firstItem="181" firstAttribute="leading" secondItem="178" secondAttribute="leading" constant="20" symbolic="YES" id="183"/>
<constraint firstItem="180" firstAttribute="leading" secondItem="178" secondAttribute="leading" constant="16" id="184" userLabel="Horizontal Space - Scroll View - Table View - View"/>
<constraint firstItem="180" firstAttribute="top" secondItem="179" secondAttribute="bottom" constant="8" symbolic="YES" id="185"/>
<constraint firstAttribute="trailing" secondItem="180" secondAttribute="trailing" constant="16" id="186"/>
<constraint firstAttribute="trailing" secondItem="179" secondAttribute="trailing" constant="20" symbolic="YES" id="188"/>
<constraint firstItem="179" firstAttribute="baseline" secondItem="181" secondAttribute="baseline" id="189"/>
<constraint firstAttribute="bottom" secondItem="180" secondAttribute="bottom" constant="26" id="280"/>
<constraint firstItem="180" firstAttribute="top" secondItem="179" secondAttribute="bottom" constant="8" symbolic="YES" id="8Pv-sU-zUE"/>
<constraint firstItem="180" firstAttribute="leading" secondItem="178" secondAttribute="leading" constant="16" id="Ddi-Em-9i9"/>
<constraint firstItem="181" firstAttribute="top" secondItem="178" secondAttribute="top" constant="20" symbolic="YES" id="IDm-Hm-H94"/>
<constraint firstAttribute="trailing" secondItem="179" secondAttribute="trailing" constant="20" symbolic="YES" id="YIb-vM-ibK"/>
<constraint firstItem="179" firstAttribute="baseline" secondItem="181" secondAttribute="baseline" id="jwt-pt-9Kw"/>
<constraint firstAttribute="bottom" secondItem="180" secondAttribute="bottom" constant="20" symbolic="YES" id="pwo-bN-16i"/>
<constraint firstItem="181" firstAttribute="leading" secondItem="178" secondAttribute="leading" constant="20" symbolic="YES" id="zjP-O5-h3E"/>
<constraint firstAttribute="trailing" secondItem="180" secondAttribute="trailing" constant="16" id="ztn-Z6-oAK"/>
</constraints>
</view>
<connections>
<outlet property="initialFirstResponder" destination="179" id="wSu-XB-L1r"/>
</connections>
</tabViewItem>
<tabViewItem label="Autotype" identifier="" id="hK7-Dx-yjH">
<view key="view" id="2py-ab-4ZU">
@@ -447,10 +441,10 @@
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="82" secondAttribute="trailing" constant="20" symbolic="YES" id="4df-0Y-ggz"/>
<constraint firstItem="82" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="3" secondAttribute="leading" constant="20" symbolic="YES" id="zU6-5h-Swa"/>
</constraints>
<point key="canvasLocation" x="494.5" y="-467.5"/>
<point key="canvasLocation" x="955" y="-542"/>
</view>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="4" customClass="HNHUIScrollDocumentViewAdapter">
<rect key="frame" x="0.0" y="0.0" width="252" height="457"/>
<rect key="frame" x="0.0" y="0.0" width="291" height="457"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="52">
<rect key="frame" x="18" y="438" width="28" height="14"/>
@@ -461,7 +455,7 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="53" customClass="HNHUIRoundedTextField">
<rect key="frame" x="20" y="408" width="212" height="22"/>
<rect key="frame" x="20" y="408" width="251" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="7Xj-3i-fBY"/>
</constraints>
@@ -483,7 +477,7 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="55" customClass="HNHUIRoundedTextField">
<rect key="frame" x="20" y="352" width="212" height="22"/>
<rect key="frame" x="20" y="352" width="251" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="0l5-fD-0eW"/>
</constraints>
@@ -497,7 +491,7 @@
</connections>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="56" customClass="HNHUIRoundedTextField">
<rect key="frame" x="20" y="214" width="212" height="22"/>
<rect key="frame" x="20" y="214" width="251" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="SoS-8e-rkN"/>
</constraints>
@@ -527,7 +521,7 @@
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="59">
<rect key="frame" x="20" y="264" width="212" height="25"/>
<rect key="frame" x="20" y="264" width="251" height="25"/>
<buttonCell key="cell" type="roundTextured" title="Generate" bezelStyle="texturedRounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="64">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -538,7 +532,7 @@
</connections>
</button>
<secureTextField verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="60" customClass="HNHUIRoundedSecureTextField">
<rect key="frame" x="20" y="296" width="172" height="22"/>
<rect key="frame" x="20" y="296" width="211" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="VFI-jo-tOU"/>
</constraints>
@@ -555,7 +549,7 @@
</connections>
</secureTextField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="61">
<rect key="frame" x="200" y="294" width="32" height="25"/>
<rect key="frame" x="239" y="294" width="32" height="25"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="rSr-fw-11t"/>
</constraints>
@@ -581,7 +575,7 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8">
<rect key="frame" x="200" y="182" width="32" height="25"/>
<rect key="frame" x="239" y="182" width="32" height="25"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="Ped-nx-uti"/>
</constraints>
@@ -595,7 +589,7 @@
</connections>
</button>
<tokenField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5">
<rect key="frame" x="20" y="77" width="212" height="77"/>
<rect key="frame" x="20" y="77" width="251" height="77"/>
<constraints>
<constraint firstAttribute="height" constant="77" id="80"/>
</constraints>
@@ -625,7 +619,7 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="IpW-b2-jWu" customClass="HNHUIRoundedTextField">
<rect key="frame" x="20" y="20" width="212" height="22"/>
<rect key="frame" x="20" y="20" width="251" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="Zfy-mh-1TF"/>
</constraints>
@@ -670,7 +664,6 @@
<constraint firstAttribute="trailing" secondItem="5" secondAttribute="trailing" constant="20" symbolic="YES" id="50"/>
<constraint firstItem="IpW-b2-jWu" firstAttribute="leading" secondItem="4" secondAttribute="leading" constant="20" id="51R-pR-KLO"/>
<constraint firstItem="0U8-TS-giU" firstAttribute="top" secondItem="5" secondAttribute="bottom" constant="13" id="8Kl-4a-t4Y"/>
<constraint firstAttribute="bottom" secondItem="IpW-b2-jWu" secondAttribute="bottom" constant="20" id="CCu-IU-6XI"/>
<constraint firstAttribute="trailing" secondItem="IpW-b2-jWu" secondAttribute="trailing" constant="20" id="D0t-s7-2hT"/>
<constraint firstItem="7" firstAttribute="top" secondItem="56" secondAttribute="bottom" constant="12" id="Gh9-Lg-kcm"/>
<constraint firstItem="IpW-b2-jWu" firstAttribute="top" secondItem="0U8-TS-giU" secondAttribute="bottom" constant="8" symbolic="YES" id="HSM-Aj-X9I"/>
@@ -679,8 +672,9 @@
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="0U8-TS-giU" secondAttribute="trailing" constant="20" symbolic="YES" id="a5R-eI-VuV"/>
<constraint firstItem="0U8-TS-giU" firstAttribute="leading" secondItem="4" secondAttribute="leading" constant="20" id="kLH-Bj-C5m"/>
<constraint firstItem="57" firstAttribute="top" secondItem="59" secondAttribute="bottom" constant="8" symbolic="YES" id="lYe-am-xJx"/>
<constraint firstAttribute="bottom" secondItem="IpW-b2-jWu" secondAttribute="bottom" constant="20" symbolic="YES" id="w8h-As-nba"/>
</constraints>
<point key="canvasLocation" x="142" y="-483.5"/>
<point key="canvasLocation" x="595" y="-523"/>
</customView>
<view translatesAutoresizingMaskIntoConstraints="NO" id="zv7-wE-Bmg" customClass="HNHUIScrollDocumentViewAdapter">
<rect key="frame" x="0.0" y="0.0" width="301" height="424"/>
@@ -795,8 +789,8 @@
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
<button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Iy9-9L-Aev">
<rect key="frame" x="249" y="106" width="32" height="21"/>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Iy9-9L-Aev">
<rect key="frame" x="249" y="110" width="32" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="18" id="VeX-Jj-eA9"/>
<constraint firstAttribute="width" constant="32" id="mjs-Yf-Cb2"/>
@@ -809,8 +803,8 @@
<action selector="addWindowAssociation:" target="-2" id="U5q-Gf-tsI"/>
</connections>
</button>
<button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AAj-Ak-z46">
<rect key="frame" x="209" y="106" width="32" height="21"/>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AAj-Ak-z46">
<rect key="frame" x="209" y="110" width="32" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="vWY-ez-gy9"/>
<constraint firstAttribute="height" constant="18" id="xwN-WB-cn2"/>
@@ -935,7 +929,7 @@
<constraint firstAttribute="trailing" secondItem="45R-v4-ywl" secondAttribute="trailing" constant="20" symbolic="YES" id="uUm-S5-cxM"/>
<constraint firstAttribute="trailing" secondItem="z03-zW-GN3" secondAttribute="trailing" constant="20" symbolic="YES" id="wiq-pY-TG8"/>
</constraints>
<point key="canvasLocation" x="-205.5" y="-500"/>
<point key="canvasLocation" x="236" y="-539"/>
</view>
</objects>
<resources>

32
MacPass/Base.lproj/PasswordInputView.xib
View File

@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="MPPasswordInputController">
@@ -21,8 +22,8 @@
<customView horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="1">
<rect key="frame" x="0.0" y="0.0" width="524" height="303"/>
<subviews>
<button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2">
<rect key="frame" x="320" y="64" width="83" height="32"/>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2">
<rect key="frame" x="318" y="64" width="83" height="32"/>
<buttonCell key="cell" type="push" title="Unlock" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -34,8 +35,8 @@ DQ
<action selector="_decrypt:" target="-2" id="295"/>
</connections>
</button>
<textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="17">
<rect key="frame" x="115" y="112" width="46" height="17"/>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="17">
<rect key="frame" x="116" y="112" width="45" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Keyfile" id="18">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -56,8 +57,8 @@ DQ
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="02_MessageBoxWarningTemplate" id="263"/>
</imageView>
<textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="268">
<rect key="frame" x="206" y="172" width="112" height="17"/>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="268">
<rect key="frame" x="207" y="172" width="110" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Wrong password!" id="269">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -78,15 +79,15 @@ DQ
</allowedInputSourceLocales>
</secureTextFieldCell>
</secureTextField>
<button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="408">
<rect key="frame" x="366" y="140" width="31" height="25"/>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="408">
<rect key="frame" x="366" y="140" width="29" height="25"/>
<buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSQuickLookTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="409">
<behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="486">
<rect key="frame" x="366" y="107" width="31" height="25"/>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="486">
<rect key="frame" x="366" y="107" width="29" height="25"/>
<buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSStopProgressTemplate" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="487">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -95,8 +96,8 @@ DQ
<action selector="resetKeyFile:" target="-2" id="2Zh-0g-L0i"/>
</connections>
</button>
<button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d8O-Ha-rrS">
<rect key="frame" x="81" y="143" width="80" height="18"/>
<button translatesAutoresizingMaskIntoConstraints="NO" id="d8O-Ha-rrS">
<rect key="frame" x="80" y="143" width="81" height="18"/>
<buttonCell key="cell" type="check" title="Password" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="IU9-5u-jn9">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -129,6 +130,7 @@ DQ
<constraint firstItem="d8O-Ha-rrS" firstAttribute="centerY" secondItem="338" secondAttribute="centerY" id="kgB-jV-OGy"/>
<constraint firstItem="d8O-Ha-rrS" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="1" secondAttribute="leading" constant="20" symbolic="YES" id="vxq-YP-UhR"/>
</constraints>
<point key="canvasLocation" x="407" y="176"/>
</customView>
</objects>
<resources>

19
MacPass/DuplicateEntryOptionsWindow.xib
View File

@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner"/>
@@ -12,34 +13,34 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="364" height="115"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
<view key="contentView" id="EiT-Mj-1SZ">
<rect key="frame" x="0.0" y="0.0" width="364" height="115"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button translatesAutoresizingMaskIntoConstraints="NO" id="KYV-1i-31e">
<rect key="frame" x="18" y="79" width="320" height="18"/>
<rect key="frame" x="18" y="79" width="312" height="18"/>
<buttonCell key="cell" type="check" title="Replace password and username with refernces" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="O9X-XH-n8o">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="DG4-bd-Jhl">
<rect key="frame" x="18" y="59" width="129" height="18"/>
<rect key="frame" x="18" y="59" width="125" height="18"/>
<buttonCell key="cell" type="check" title="Duplicate history" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="dXl-KS-4rE">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TFC-xG-RlB">
<rect key="frame" x="214" y="13" width="136" height="32"/>
<rect key="frame" x="217" y="13" width="133" height="32"/>
<buttonCell key="cell" type="push" title="Duplicate Entry" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="WqI-qH-ARf">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0j0-db-9Wu">
<rect key="frame" x="132" y="13" width="82" height="32"/>
<rect key="frame" x="135" y="13" width="82" height="32"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="x6e-bE-Y6R">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -63,7 +64,7 @@ Gw
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="DG4-bd-Jhl" secondAttribute="trailing" constant="20" symbolic="YES" id="xnL-R7-g2p"/>
</constraints>
</view>
<point key="canvasLocation" x="419" y="402.5"/>
<point key="canvasLocation" x="79" y="236"/>
</window>
</objects>
</document>

24
MacPass/EntryView.xib
View File

@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="MPEntryViewController">
@@ -44,11 +45,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="StringCell" id="269">
<rect key="frame" x="1" y="1" width="105" height="17"/>
<rect key="frame" x="1" y="1" width="104" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="270">
<rect key="frame" x="1" y="0.0" width="103" height="17"/>
<rect key="frame" x="1" y="0.0" width="102" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="271">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -81,7 +82,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="ImageCell" id="297">
<rect key="frame" x="109" y="1" width="144" height="17"/>
<rect key="frame" x="109" y="1" width="145" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="298">
@@ -93,7 +94,7 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSActionTemplate" id="301"/>
</imageView>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="299">
<rect key="frame" x="26" y="0.0" width="117" height="17"/>
<rect key="frame" x="26" y="0.0" width="118" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="300">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -130,11 +131,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="PasswordCell" id="428">
<rect key="frame" x="256" y="1" width="119" height="17"/>
<rect key="frame" x="256" y="1" width="118" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="429" customClass="NSSecureTextField">
<rect key="frame" x="1" y="0.0" width="117" height="17"/>
<rect key="frame" x="1" y="0.0" width="116" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="430">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -207,8 +208,8 @@
<rect key="frame" x="494" y="1" width="199" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="617">
<rect key="frame" x="1" y="0.0" width="196" height="17"/>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="617">
<rect key="frame" x="1" y="0.0" width="197" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="618">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -230,7 +231,6 @@
</tableColumns>
</tableView>
</subviews>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="56">
<rect key="frame" x="0.0" y="579" width="694" height="16"/>

1
MacPass/MPEntryInspectorViewController.h
View File

@@ -28,6 +28,7 @@
@property (weak) IBOutlet NSSegmentedControl *infoTabControl;
@property (weak) IBOutlet NSTableView *attachmentTableView;
@property (weak) IBOutlet NSTableView *customFieldsTableView;
@property (weak) IBOutlet NSTableView *pluginDataTableView;
@property (weak) IBOutlet NSButton *generatePasswordButton;
@property (weak) IBOutlet NSButton *togglePassword;

7
MacPass/MPEntryInspectorViewController.m
View File

@@ -101,17 +101,17 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
[self.infoTabControl bind:NSSelectedIndexBinding toObject:self withKeyPath:NSStringFromSelector(@selector(activeTab)) options:nil];
[self.tabView bind:NSSelectedIndexBinding toObject:self withKeyPath:NSStringFromSelector(@selector(activeTab)) options:nil];
/* Set background to clearcolor so we can draw in the scrollview */
self.attachmentTableView.backgroundColor = [NSColor clearColor];
[self.attachmentTableView bind:NSContentBinding toObject:_attachmentsController withKeyPath:NSStringFromSelector(@selector(arrangedObjects)) options:nil];
self.attachmentTableView.delegate = _attachmentTableDelegate;
self.attachmentTableView.dataSource = _attachmentDataSource;
[self.attachmentTableView registerForDraggedTypes:@[NSFilenamesPboardType]];
/* Set background to clearcolor so we can draw in the scrollview */
self.customFieldsTableView.backgroundColor = [NSColor clearColor];
[self.customFieldsTableView bind:NSContentBinding toObject:_customFieldsController withKeyPath:NSStringFromSelector(@selector(arrangedObjects)) options:nil];
self.customFieldsTableView.delegate = _customFieldTableDelegate;
self.windowAssociationsTableView.backgroundColor = [NSColor clearColor];
self.windowAssociationsTableView.delegate = _windowAssociationsTableDelegate;
[self.windowAssociationsTableView bind:NSContentBinding toObject:_windowAssociationsController withKeyPath:NSStringFromSelector(@selector(arrangedObjects)) options:nil];
@@ -453,6 +453,7 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
options:nil];
}
#pragma mark -
#pragma mark MPDocument Notifications

13
MacPass/MPPluginDataViewController.h Normal file
View File

@@ -0,0 +1,13 @@
//
// MPPluginDataViewController.h
// MacPass
//
// Created by Michael Starke on 02/02/2017.
// Copyright © 2017 HicknHack Software GmbH. All rights reserved.
//
#import "MPViewController.h"
@interface MPPluginDataViewController : MPViewController
@end

22
MacPass/MPPluginDataViewController.m Normal file
View File

@@ -0,0 +1,22 @@
//
// MPPluginDataViewController.m
// MacPass
//
// Created by Michael Starke on 02/02/2017.
// Copyright © 2017 HicknHack Software GmbH. All rights reserved.
//
#import "MPPluginDataViewController.h"
@interface MPPluginDataViewController ()
@end
@implementation MPPluginDataViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do view setup here.
}
@end

19
MacPass/MPPluginDataViewController.xib Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="MPPluginDataViewController">
<connections>
<outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="Hz6-mo-xeY">
<rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</customView>
</objects>
</document>