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

Added Autotype layout to entry view.

Browse Source 
Fixed ARC bug in placeholder evaluation
This commit is contained in:
michael starke
2014-02-12 22:17:34 +01:00
parent 422d74ee5c
commit 5661765dbf
9 changed files with 191 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
KeePassKit

Submodule KeePassKit updated: 8b7349b856...fb6b52e86f

153
MacPass/EntryInspectorView.xib
View File

@@ -13,7 +13,6 @@
<outlet property="expiresCheckButton" destination="7" id="286"/> <outlet property="expiresCheckButton" destination="7" id="286"/>
<outlet property="generalView" destination="4" id="270"/> <outlet property="generalView" destination="4" id="270"/>
<outlet property="generatePasswordButton" destination="59" id="282"/> <outlet property="generatePasswordButton" destination="59" id="282"/>
<outlet property="historyTableView" destination="RRd-aS-bh1" id="gTo-oI-jG1"/>
<outlet property="infoTabControl" destination="82" id="264"/> <outlet property="infoTabControl" destination="82" id="264"/>
<outlet property="notesTextView" destination="73" id="267"/> <outlet property="notesTextView" destination="73" id="267"/>
<outlet property="passwordTextField" destination="60" id="263"/> <outlet property="passwordTextField" destination="60" id="263"/>
@@ -32,7 +31,7 @@
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="82"> <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="82">
<rect key="frame" x="40" y="505" width="213" height="19"/> <rect key="frame" x="35" y="505" width="223" height="19"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<segmentedCell key="cell" controlSize="small" alignment="left" style="texturedSquare" trackingMode="selectOne" id="238"> <segmentedCell key="cell" controlSize="small" alignment="left" style="texturedSquare" trackingMode="selectOne" id="238">
<font key="font" metaFont="smallSystem"/> <font key="font" metaFont="smallSystem"/>
@@ -40,7 +39,7 @@
<segment label="General" selected="YES"/> <segment label="General" selected="YES"/>
<segment label="Files" tag="1"/> <segment label="Files" tag="1"/>
<segment label="Custom"/> <segment label="Custom"/>
<segment label="History"/> <segment label="Autotype"/>
</segments> </segments>
</segmentedCell> </segmentedCell>
</segmentedControl> </segmentedControl>
@@ -432,45 +431,58 @@
<outlet property="initialFirstResponder" destination="179" id="wSu-XB-L1r"/> <outlet property="initialFirstResponder" destination="179" id="wSu-XB-L1r"/>
</connections> </connections>
</tabViewItem> </tabViewItem>
<tabViewItem label="History" identifier="" id="hK7-Dx-yjH"> <tabViewItem label="Autotype" identifier="" id="hK7-Dx-yjH">
<view key="view" id="2py-ab-4ZU"> <view key="view" id="2py-ab-4ZU">
<rect key="frame" x="0.0" y="0.0" width="293" height="503"/> <rect key="frame" x="0.0" y="0.0" width="301" height="503"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X0v-Lt-vra"> <button translatesAutoresizingMaskIntoConstraints="NO" id="4eE-dy-HfW">
<rect key="frame" x="20" y="20" width="253" height="463"/> <rect key="frame" x="18" y="475" width="125" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<clipView key="contentView" id="pcm-dD-Buv"> <buttonCell key="cell" type="check" title="Enable Autotype" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="1r7-NA-zwB">
<rect key="frame" x="1" y="17" width="251" height="445"/> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rJc-PJ-eKX" customClass="HNHRoundedTextField">
<rect key="frame" x="20" y="421" width="261" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Custom Entry Sequence" drawsBackground="YES" id="9XK-QO-uew">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0Lb-b7-oLe">
<rect key="frame" x="18" y="451" width="107" height="14"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Autotype Sequence" id="g5F-LX-MJd">
<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 autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wnL-dT-Mg0" customClass="HNHScrollView">
<rect key="frame" x="20" y="183" width="261" height="200"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<clipView key="contentView" id="4DG-Nt-yCb">
<rect key="frame" x="1" y="17" width="259" height="182"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="b0e-MX-sxO" id="RRd-aS-bh1"> <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="Xdf-pa-4xl" id="s8d-5M-6hE">
<rect key="frame" x="0.0" y="0.0" width="251" height="445"/> <rect key="frame" x="0.0" y="0.0" width="259" height="182"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/> <size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns> <tableColumns>
<tableColumn width="116" minWidth="40" maxWidth="1000" id="0vc-aZ-jM2"> <tableColumn width="256" minWidth="40" maxWidth="1000" id="MK7-5E-Bvw">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
<font key="font" metaFont="smallSystem"/> <font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
</tableHeaderCell> </tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="5j5-wL-0vG"> <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="j5G-Tx-rY9">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
</tableColumn>
<tableColumn width="129" minWidth="40" maxWidth="1000" id="unf-zm-IA8">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
</tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="gag-bX-giW">
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -482,25 +494,96 @@
</subviews> </subviews>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView> </clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="Jfw-hJ-Fyy"> <constraints>
<constraint firstAttribute="height" constant="200" id="EqD-yG-pr6"/>
</constraints>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="fps-j3-BZE">
<rect key="frame" x="1" y="1" width="0.0" height="16"/> <rect key="frame" x="1" y="1" width="0.0" height="16"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</scroller> </scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="Bcd-2w-TwA"> <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="PaQ-Ss-Edg">
<rect key="frame" x="-15" y="17" width="16" height="0.0"/> <rect key="frame" x="236" y="17" width="16" height="0.0"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</scroller> </scroller>
<tableHeaderView key="headerView" id="b0e-MX-sxO"> <tableHeaderView key="headerView" id="Xdf-pa-4xl">
<rect key="frame" x="0.0" y="0.0" width="251" height="17"/> <rect key="frame" x="0.0" y="0.0" width="259" height="17"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</tableHeaderView> </tableHeaderView>
</scrollView> </scrollView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="21H-JX-VNm">
<rect key="frame" x="18" y="395" width="115" height="14"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Window Associations" id="NaR-fV-wQ9">
<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>
<comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gfU-RT-JSF">
<rect key="frame" x="20" y="125" width="264" height="26"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="1" id="bTG-IY-i6u">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</comboBoxCell>
</comboBox>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zMA-dY-oyU">
<rect key="frame" x="18" y="157" width="73" height="14"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Window Title" id="XPi-az-tUQ">
<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>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VqB-Iy-d8E" customClass="HNHRoundedTextField">
<rect key="frame" x="20" y="73" width="261" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Custom Window Sequence" drawsBackground="YES" id="Ibi-bg-HHp">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2hz-gE-Iro">
<rect key="frame" x="18" y="103" width="100" height="14"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Window Sequence" id="k0a-bS-BUJ">
<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>
</subviews> </subviews>
<constraints> <constraints>
<constraint firstItem="X0v-Lt-vra" firstAttribute="leading" secondItem="2py-ab-4ZU" secondAttribute="leading" constant="20" id="EqN-Fq-8MQ"/> <constraint firstAttribute="trailing" secondItem="wnL-dT-Mg0" secondAttribute="trailing" constant="20" symbolic="YES" id="8oj-af-pcm"/>
<constraint firstItem="X0v-Lt-vra" firstAttribute="top" secondItem="2py-ab-4ZU" secondAttribute="top" constant="20" id="WWH-5S-0LQ"/> <constraint firstAttribute="trailing" secondItem="gfU-RT-JSF" secondAttribute="trailing" constant="20" symbolic="YES" id="E8x-8i-Eb4"/>
<constraint firstAttribute="bottom" secondItem="X0v-Lt-vra" secondAttribute="bottom" constant="20" id="gz9-HC-gNN"/> <constraint firstItem="gfU-RT-JSF" firstAttribute="top" secondItem="zMA-dY-oyU" secondAttribute="bottom" constant="8" symbolic="YES" id="G5p-u9-ZFK"/>
<constraint firstAttribute="trailing" secondItem="X0v-Lt-vra" secondAttribute="trailing" constant="20" id="tKq-FB-cMc"/> <constraint firstItem="21H-JX-VNm" firstAttribute="top" secondItem="rJc-PJ-eKX" secondAttribute="bottom" constant="12" id="HFP-Ju-SKP"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="4eE-dy-HfW" secondAttribute="trailing" constant="20" symbolic="YES" id="KIr-po-0YF"/>
<constraint firstItem="VqB-Iy-d8E" firstAttribute="top" secondItem="2hz-gE-Iro" secondAttribute="bottom" constant="8" symbolic="YES" id="Lor-Q7-xZc"/>
<constraint firstItem="rJc-PJ-eKX" firstAttribute="leading" secondItem="2py-ab-4ZU" secondAttribute="leading" constant="20" id="OQ3-Ce-z31"/>
<constraint firstAttribute="trailing" secondItem="rJc-PJ-eKX" secondAttribute="trailing" constant="20" id="R7l-NB-8m8"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="zMA-dY-oyU" secondAttribute="trailing" constant="20" symbolic="YES" id="RGN-TG-Uh8"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="0Lb-b7-oLe" secondAttribute="trailing" constant="20" symbolic="YES" id="SoM-Ge-K4V"/>
<constraint firstItem="VqB-Iy-d8E" firstAttribute="leading" secondItem="2py-ab-4ZU" secondAttribute="leading" constant="20" symbolic="YES" id="TZy-dp-342"/>
<constraint firstItem="4eE-dy-HfW" firstAttribute="top" secondItem="2py-ab-4ZU" secondAttribute="top" constant="12" id="XjM-W2-gDB"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="21H-JX-VNm" secondAttribute="trailing" constant="170" id="YhH-dG-tPO"/>
<constraint firstItem="wnL-dT-Mg0" firstAttribute="top" secondItem="21H-JX-VNm" secondAttribute="bottom" constant="12" id="bue-Xr-V5A"/>
<constraint firstItem="zMA-dY-oyU" firstAttribute="leading" secondItem="2py-ab-4ZU" secondAttribute="leading" constant="20" symbolic="YES" id="dDp-tB-7Pa"/>
<constraint firstItem="zMA-dY-oyU" firstAttribute="top" secondItem="wnL-dT-Mg0" secondAttribute="bottom" constant="12" id="fbH-mc-BZI"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="2hz-gE-Iro" secondAttribute="trailing" constant="20" symbolic="YES" id="gab-uH-oLH"/>
<constraint firstItem="21H-JX-VNm" firstAttribute="leading" secondItem="2py-ab-4ZU" secondAttribute="leading" constant="20" id="hsS-I9-cLn"/>
<constraint firstItem="4eE-dy-HfW" firstAttribute="leading" secondItem="2py-ab-4ZU" secondAttribute="leading" constant="20" symbolic="YES" id="mRh-Bk-33E"/>
<constraint firstItem="gfU-RT-JSF" firstAttribute="leading" secondItem="2py-ab-4ZU" secondAttribute="leading" constant="20" symbolic="YES" id="msq-mg-MBO"/>
<constraint firstItem="wnL-dT-Mg0" firstAttribute="leading" secondItem="2py-ab-4ZU" secondAttribute="leading" constant="20" symbolic="YES" id="pF9-RN-Hfh"/>
<constraint firstItem="2hz-gE-Iro" firstAttribute="top" secondItem="gfU-RT-JSF" secondAttribute="bottom" constant="12" id="qLW-zT-nbV"/>
<constraint firstItem="0Lb-b7-oLe" firstAttribute="top" secondItem="4eE-dy-HfW" secondAttribute="bottom" constant="12" id="tL0-cU-OgD"/>
<constraint firstItem="2hz-gE-Iro" firstAttribute="leading" secondItem="2py-ab-4ZU" secondAttribute="leading" constant="20" symbolic="YES" id="v6C-IB-HYv"/>
<constraint firstItem="0Lb-b7-oLe" firstAttribute="leading" secondItem="2py-ab-4ZU" secondAttribute="leading" constant="20" symbolic="YES" id="vnp-NJ-vGw"/>
<constraint firstItem="rJc-PJ-eKX" firstAttribute="top" secondItem="0Lb-b7-oLe" secondAttribute="bottom" constant="8" symbolic="YES" id="yzt-L6-KTD"/>
<constraint firstAttribute="trailing" secondItem="VqB-Iy-d8E" secondAttribute="trailing" constant="20" symbolic="YES" id="zPK-9U-Aky"/>
</constraints> </constraints>
</view> </view>
</tabViewItem> </tabViewItem>

1
MacPass/MPAppDelegate.m
View File

@@ -62,6 +62,7 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
} }
- (void)dealloc { - (void)dealloc {
[self unbind:@"isAllowedToStoreKeyFile"];
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];
} }

1
MacPass/MPDocument.m
View File

@@ -117,7 +117,6 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
} }
- (void)dealloc { - (void)dealloc {
[self unbind:@"isAllowedToStoreKeyFile"];
[self _cleanupLock]; [self _cleanupLock];
} }

1
MacPass/MPEntryInspectorViewController.h
View File

@@ -24,7 +24,6 @@
@property (weak) IBOutlet NSSegmentedControl *infoTabControl; @property (weak) IBOutlet NSSegmentedControl *infoTabControl;
@property (weak) IBOutlet NSTableView *attachmentTableView; @property (weak) IBOutlet NSTableView *attachmentTableView;
@property (weak) IBOutlet NSTableView *customFieldsTableView; @property (weak) IBOutlet NSTableView *customFieldsTableView;
@property (weak) IBOutlet NSTableView *historyTableView;
@property (unsafe_unretained) IBOutlet NSTextView *notesTextView; @property (unsafe_unretained) IBOutlet NSTextView *notesTextView;
@property (weak) IBOutlet NSButton *generatePasswordButton; @property (weak) IBOutlet NSButton *generatePasswordButton;
@property (weak) IBOutlet NSButton *togglePassword; @property (weak) IBOutlet NSButton *togglePassword;

17
MacPass/MPEntryInspectorViewController.m
View File

@@ -25,14 +25,13 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
MPEntryTabGeneral, MPEntryTabGeneral,
MPEntryTabFiles, MPEntryTabFiles,
MPEntryTabCustomFields, MPEntryTabCustomFields,
MPEntryTabHistory MPEntryTabAutotype
}; };
@interface MPEntryInspectorViewController () { @interface MPEntryInspectorViewController () {
@private @private
NSArrayController *_attachmentsController; NSArrayController *_attachmentsController;
NSArrayController *_customFieldsController; NSArrayController *_customFieldsController;
NSArrayController *_historyController;
MPAttachmentTableViewDelegate *_attachmentTableDelegate; MPAttachmentTableViewDelegate *_attachmentTableDelegate;
MPCustomFieldTableViewDelegate *_customFieldTableDelegate; MPCustomFieldTableViewDelegate *_customFieldTableDelegate;
MPAttachmentTableDataSource *_attachmentDataSource; MPAttachmentTableDataSource *_attachmentDataSource;
@@ -59,7 +58,6 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
_showPassword = NO; _showPassword = NO;
_attachmentsController = [[NSArrayController alloc] init]; _attachmentsController = [[NSArrayController alloc] init];
_customFieldsController = [[NSArrayController alloc] init]; _customFieldsController = [[NSArrayController alloc] init];
_historyController = [[NSArrayController alloc] init];
_attachmentTableDelegate = [[MPAttachmentTableViewDelegate alloc] init]; _attachmentTableDelegate = [[MPAttachmentTableViewDelegate alloc] init];
_customFieldTableDelegate = [[MPCustomFieldTableViewDelegate alloc] init]; _customFieldTableDelegate = [[MPCustomFieldTableViewDelegate alloc] init];
_attachmentDataSource = [[MPAttachmentTableDataSource alloc] init]; _attachmentDataSource = [[MPAttachmentTableDataSource alloc] init];
@@ -121,8 +119,6 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
[_customFieldsTableView bind:NSContentBinding toObject:_customFieldsController withKeyPath:@"arrangedObjects" options:nil]; [_customFieldsTableView bind:NSContentBinding toObject:_customFieldsController withKeyPath:@"arrangedObjects" options:nil];
[_customFieldsTableView setDelegate:_customFieldTableDelegate]; [_customFieldsTableView setDelegate:_customFieldTableDelegate];
[_historyTableView bind:NSContentBinding toObject:_historyController withKeyPath:@"arrangedObjects" options:nil];
[self.passwordTextField bind:@"showPassword" toObject:self withKeyPath:@"showPassword" options:nil]; [self.passwordTextField bind:@"showPassword" toObject:self withKeyPath:@"showPassword" options:nil];
[self.togglePassword bind:NSValueBinding toObject:self withKeyPath:@"showPassword" options:nil]; [self.togglePassword bind:NSValueBinding toObject:self withKeyPath:@"showPassword" options:nil];
} }
@@ -237,7 +233,6 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
[self _bindEntry]; [self _bindEntry];
[self _bindAttachments]; [self _bindAttachments];
[self _bindCustomFields]; [self _bindCustomFields];
[self _bindHistory];
} }
- (void)_bindEntry { - (void)_bindEntry {
@@ -275,16 +270,6 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
[_customFieldsController bind:NSContentArrayBinding toObject:self.entry withKeyPath:@"customAttributes" options:nil]; [_customFieldsController bind:NSContentArrayBinding toObject:self.entry withKeyPath:@"customAttributes" options:nil];
} }
- (void)_bindHistory {
if(self.entry) {
[_historyController bind:NSContentArrayBinding toObject:self.entry withKeyPath:@"history" options:nil];
}
else if([_historyController content] != nil) {
[_historyController unbind:NSContentArrayBinding];
[_historyController setContent:nil];
}
}
- (void)_toggleEditing:(BOOL)edit { - (void)_toggleEditing:(BOOL)edit {
/* TODO: not fully working right now */ /* TODO: not fully working right now */

698
MacPass/SavePanelAccessoryView.xib
View File

@@ -1,630 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<data> <dependencies>
<int key="IBDocument.SystemTarget">1080</int> <deployment defaultVersion="1080" identifier="macosx"/>
<string key="IBDocument.SystemVersion">12E55</string> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> </dependencies>
<string key="IBDocument.AppKitVersion">1187.39</string> <objects>
<string key="IBDocument.HIToolboxVersion">626.00</string> <customObject id="-2" userLabel="File's Owner" customClass="MPSavePanelAccessoryViewController">
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <connections>
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <outlet property="fileTypePopupButton" destination="2" id="107"/>
<string key="NS.object.0">3084</string> <outlet property="infoTextField" destination="51" id="108"/>
</object> <outlet property="view" destination="1" id="106"/>
<array key="IBDocument.IntegratedClassDependencies"> </connections>
<string>IBNSLayoutConstraint</string> </customObject>
<string>NSCustomObject</string> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<string>NSCustomView</string> <customObject id="-3" userLabel="Application"/>
<string>NSMenu</string> <customView id="1">
<string>NSMenuItem</string> <rect key="frame" x="0.0" y="0.0" width="506" height="95"/>
<string>NSPopUpButton</string> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<string>NSPopUpButtonCell</string> <subviews>
<string>NSTextField</string> <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2">
<string>NSTextFieldCell</string> <rect key="frame" x="183" y="53" width="142" height="26"/>
</array> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<array key="IBDocument.PluginDependencies"> <popUpButtonCell key="cell" type="push" title="KeePass 1 (KDB)" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="3">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
</array> <font key="font" metaFont="system"/>
<object class="NSMutableDictionary" key="IBDocument.Metadata"> <menu key="menu" title="OtherViews" id="4">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string> <items>
<integer value="1" key="NS.object.0"/> <menuItem title="KeePass 1 (KDB)" state="on" id="5"/>
</object> <menuItem title="KeePass 2 (KDBX)" id="6"/>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> </items>
<object class="NSCustomObject" id="1001"> </menu>
<string key="NSClassName">MPSavePanelAccessoryViewController</string> </popUpButtonCell>
</object> </popUpButton>
<object class="NSCustomObject" id="1003"> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="11">
<string key="NSClassName">FirstResponder</string> <rect key="frame" x="126" y="58" width="53" height="17"/>
</object> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<object class="NSCustomObject" id="1004"> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Format:" id="12">
<string key="NSClassName">NSApplication</string> <font key="font" metaFont="system"/>
</object> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<object class="NSCustomView" id="1005"> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<reference key="NSNextResponder"/> </textFieldCell>
<int key="NSvFlags">268</int> </textField>
<array class="NSMutableArray" key="NSSubviews"> <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="51">
<object class="NSTextField" id="227871464"> <rect key="frame" x="126" y="20" width="362" height="28"/>
<reference key="NSNextResponder" ref="1005"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<int key="NSvFlags">268</int> <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Not all Information inside your current database can be stored with this format." id="52">
<string key="NSFrame">{{126, 20}, {363, 28}}</string> <font key="font" metaFont="smallSystem"/>
<reference key="NSSuperview" ref="1005"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<reference key="NSWindow"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<string key="NSReuseIdentifierKey">_NS:1535</string> </textFieldCell>
<string key="NSAntiCompressionPriority">{249, 750}</string> </textField>
<bool key="NSEnabled">YES</bool> </subviews>
<object class="NSTextFieldCell" key="NSCell" id="841038612"> <constraints>
<int key="NSCellFlags">67108864</int> <constraint firstAttribute="trailing" secondItem="51" secondAttribute="trailing" constant="20" symbolic="YES" id="78"/>
<int key="NSCellFlags2">272629760</int> <constraint firstItem="11" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="1" secondAttribute="leading" constant="20" symbolic="YES" id="80"/>
<string key="NSContents">Not all Information inside your current database can be stored with this format.</string> <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="2" secondAttribute="trailing" constant="20" symbolic="YES" id="81"/>
<object class="NSFont" key="NSSupport"> <constraint firstItem="11" firstAttribute="top" secondItem="1" secondAttribute="top" constant="20" symbolic="YES" id="86"/>
<string key="NSName">LucidaGrande</string> <constraint firstItem="2" firstAttribute="centerY" secondItem="11" secondAttribute="centerY" id="89"/>
<double key="NSSize">11</double> <constraint firstAttribute="centerX" secondItem="2" secondAttribute="centerX" id="91"/>
<int key="NSfFlags">3100</int> <constraint firstItem="2" firstAttribute="leading" secondItem="11" secondAttribute="trailing" constant="8" symbolic="YES" id="92"/>
</object> <constraint firstItem="51" firstAttribute="leading" secondItem="11" secondAttribute="leading" id="95"/>
<string key="NSCellIdentifier">_NS:1535</string> <constraint firstItem="51" firstAttribute="top" secondItem="2" secondAttribute="bottom" constant="8" symbolic="YES" id="101"/>
<reference key="NSControlView" ref="227871464"/> <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="51" secondAttribute="bottom" constant="20" symbolic="YES" id="103"/>
<object class="NSColor" key="NSBackgroundColor" id="808731424"> </constraints>
<int key="NSColorSpace">6</int> </customView>
<string key="NSCatalogName">System</string> </objects>
<string key="NSColorName">controlColor</string> </document>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="617654541">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="1012867257">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{126, 58}, {53, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="393971086"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="389721311">
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Format:</string>
<object class="NSFont" key="NSSupport" id="167579766">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<string key="NSCellIdentifier">_NS:1535</string>
<reference key="NSControlView" ref="1012867257"/>
<reference key="NSBackgroundColor" ref="808731424"/>
<reference key="NSTextColor" ref="617654541"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSPopUpButton" id="393971086">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{182, 53}, {144, 26}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="227871464"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="976976603">
<int key="NSCellFlags">-2076180416</int>
<int key="NSCellFlags2">2048</int>
<reference key="NSSupport" ref="167579766"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="393971086"/>
<int key="NSButtonFlags">109199360</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
<object class="NSMenuItem" key="NSMenuItem" id="897198694">
<reference key="NSMenu" ref="301298341"/>
<string key="NSTitle">KeePass 1 (KDB)</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
<object class="NSCustomResource" key="NSOnImage" id="852036856">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSMenuCheckmark</string>
</object>
<object class="NSCustomResource" key="NSMixedImage" id="991929968">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSMenuMixedState</string>
</object>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="976976603"/>
</object>
<bool key="NSMenuItemRespectAlignment">YES</bool>
<object class="NSMenu" key="NSMenu" id="301298341">
<string key="NSTitle">OtherViews</string>
<array class="NSMutableArray" key="NSMenuItems">
<reference ref="897198694"/>
<object class="NSMenuItem" id="305900241">
<reference key="NSMenu" ref="301298341"/>
<string key="NSTitle">KeePass 2 (KDBX)</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="852036856"/>
<reference key="NSMixedImage" ref="991929968"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="976976603"/>
</object>
</array>
<reference key="NSMenuFont" ref="167579766"/>
</object>
<int key="NSSelectedIndex">-1</int>
<int key="NSPreferredEdge">1</int>
<bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool>
<int key="NSArrowPosition">2</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{506, 95}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1012867257"/>
<string key="NSClassName">NSView</string>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="1005"/>
</object>
<int key="connectionID">106</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">fileTypePopupButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="393971086"/>
</object>
<int key="connectionID">107</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">infoTextField</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="227871464"/>
</object>
<int key="connectionID">108</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
<int key="objectID">0</int>
<array key="object" id="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="1001"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="1003"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="1004"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">1</int>
<reference key="object" ref="1005"/>
<array class="NSMutableArray" key="children">
<object class="IBNSLayoutConstraint" id="287625583">
<reference key="firstItem" ref="393971086"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1012867257"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">8</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="48960717">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">9</int>
<int key="relation">0</int>
<reference key="secondItem" ref="393971086"/>
<int key="secondAttribute">9</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="710476841">
<reference key="firstItem" ref="393971086"/>
<int key="firstAttribute">10</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1012867257"/>
<int key="secondAttribute">10</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="846575981">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">6</int>
<int key="relation">1</int>
<reference key="secondItem" ref="393971086"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="415778777">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">4</int>
<int key="relation">1</int>
<reference key="secondItem" ref="227871464"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="533808731">
<reference key="firstItem" ref="227871464"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="393971086"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">8</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="567866089">
<reference key="firstItem" ref="227871464"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1012867257"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="209120337">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="227871464"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="543937448">
<reference key="firstItem" ref="1012867257"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1005"/>
<int key="secondAttribute">3</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="45831968">
<reference key="firstItem" ref="1012867257"/>
<int key="firstAttribute">5</int>
<int key="relation">1</int>
<reference key="secondItem" ref="1005"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<reference ref="393971086"/>
<reference ref="1012867257"/>
<reference ref="227871464"/>
</array>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2</int>
<reference key="object" ref="393971086"/>
<array class="NSMutableArray" key="children">
<reference ref="976976603"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3</int>
<reference key="object" ref="976976603"/>
<array class="NSMutableArray" key="children">
<reference ref="301298341"/>
</array>
<reference key="parent" ref="393971086"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4</int>
<reference key="object" ref="301298341"/>
<array class="NSMutableArray" key="children">
<reference ref="897198694"/>
<reference ref="305900241"/>
</array>
<reference key="parent" ref="976976603"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5</int>
<reference key="object" ref="897198694"/>
<reference key="parent" ref="301298341"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="305900241"/>
<reference key="parent" ref="301298341"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">11</int>
<reference key="object" ref="1012867257"/>
<array class="NSMutableArray" key="children">
<reference ref="389721311"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">12</int>
<reference key="object" ref="389721311"/>
<reference key="parent" ref="1012867257"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">51</int>
<reference key="object" ref="227871464"/>
<array class="NSMutableArray" key="children">
<reference ref="841038612"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">52</int>
<reference key="object" ref="841038612"/>
<reference key="parent" ref="227871464"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">80</int>
<reference key="object" ref="45831968"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">81</int>
<reference key="object" ref="846575981"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">86</int>
<reference key="object" ref="543937448"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">91</int>
<reference key="object" ref="48960717"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">78</int>
<reference key="object" ref="209120337"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">101</int>
<reference key="object" ref="533808731"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">89</int>
<reference key="object" ref="710476841"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">103</int>
<reference key="object" ref="415778777"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">92</int>
<reference key="object" ref="287625583"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">95</int>
<reference key="object" ref="567866089"/>
<reference key="parent" ref="1005"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array key="1.IBNSViewMetadataConstraints">
<reference ref="45831968"/>
<reference ref="543937448"/>
<reference ref="209120337"/>
<reference ref="567866089"/>
<reference ref="533808731"/>
<reference ref="415778777"/>
<reference ref="846575981"/>
<reference ref="710476841"/>
<reference ref="48960717"/>
<reference ref="287625583"/>
</array>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="101.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="103.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="11.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="2.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="51.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="51.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="52.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="80.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="86.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="89.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="91.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="95.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">108</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">MPSavePanelAccessoryViewController</string>
<string key="superclassName">MPViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">setFileType:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">setFileType:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">setFileType:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="fileTypePopupButton">NSPopUpButton</string>
<string key="infoTextField">NSTextField</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="fileTypePopupButton">
<string key="name">fileTypePopupButton</string>
<string key="candidateClassName">NSPopUpButton</string>
</object>
<object class="IBToOneOutletInfo" key="infoTextField">
<string key="name">infoTextField</string>
<string key="candidateClassName">NSTextField</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPSavePanelAccessoryViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MPViewController</string>
<string key="superclassName">NSViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSLayoutConstraint</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NSMenuCheckmark">{11, 11}</string>
<string key="NSMenuMixedState">{10, 3}</string>
</dictionary>
<bool key="IBDocument.UseAutolayout">YES</bool>
</data>
</archive>

2
MacPass/UnprotectedWarningView.xib
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<deployment defaultVersion="1080" identifier="macosx"/> <deployment defaultVersion="1080" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>

2
MacPassTests/KPKTestPlaceholder.m
View File

@@ -10,7 +10,7 @@
#import "KPKEntry.h" #import "KPKEntry.h"
#import "KPKAttribute.h" #import "KPKAttribute.h"
#import "NSString+Placeholder.h" #import "NSString+Commands.h"
@implementation KPKTextPlaceholder @implementation KPKTextPlaceholder