nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2026-01-30 21:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Group inspector now correctly edits expires flag and search and auto type inheritance

Browse Source
This commit is contained in:
michael starke
2013-09-03 01:26:03 +02:00
parent de13be4db8
commit e7cdf352f8
6 changed files with 124 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
MacPass/EntryInspectorView.xib
View File

@@ -102,7 +102,6 @@
<string key="NSFrameSize">{293, 503}</string> <string key="NSFrameSize">{293, 503}</string>
<reference key="NSSuperview" ref="171621726"/> <reference key="NSSuperview" ref="171621726"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="15582376"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<array class="NSMutableArray" key="NSTabViewItems"> <array class="NSMutableArray" key="NSTabViewItems">
<object class="NSTabViewItem" id="695903737"> <object class="NSTabViewItem" id="695903737">
@@ -114,7 +113,6 @@
<string key="NSFrameSize">{293, 503}</string> <string key="NSFrameSize">{293, 503}</string>
<reference key="NSSuperview" ref="239090452"/> <reference key="NSSuperview" ref="239090452"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:11</string> <string key="NSReuseIdentifierKey">_NS:11</string>
</object> </object>
<string key="NSLabel">General</string> <string key="NSLabel">General</string>
@@ -589,7 +587,6 @@
<string key="NSFrame">{{20, 20}, {212, 77}}</string> <string key="NSFrame">{{20, 20}, {212, 77}}</string>
<reference key="NSSuperview" ref="413602841"/> <reference key="NSSuperview" ref="413602841"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="222663528"> <object class="NSTokenFieldCell" key="NSCell" id="222663528">
@@ -724,7 +721,7 @@
<string key="NSFrameSize">{210, 258}</string> <string key="NSFrameSize">{210, 258}</string>
<reference key="NSSuperview" ref="964754936"/> <reference key="NSSuperview" ref="964754936"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="932823276"/> <reference key="NSNextKeyView" ref="601656903"/>
<string key="NSReuseIdentifierKey">_NS:13</string> <string key="NSReuseIdentifierKey">_NS:13</string>
<object class="NSTextContainer" key="NSTextContainer" id="877434204"> <object class="NSTextContainer" key="NSTextContainer" id="877434204">
<object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSLayoutManager" key="NSLayoutManager">
@@ -844,7 +841,7 @@
<string key="NSFrame">{{20, 151}, {212, 260}}</string> <string key="NSFrame">{{20, 151}, {212, 260}}</string>
<reference key="NSSuperview" ref="413602841"/> <reference key="NSSuperview" ref="413602841"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="601656903"/> <reference key="NSNextKeyView" ref="964754936"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133138</int> <int key="NSsFlags">133138</int>
<reference key="NSVScroller" ref="932823276"/> <reference key="NSVScroller" ref="932823276"/>
@@ -1231,6 +1228,22 @@
</object> </object>
<int key="connectionID">282</int> <int key="connectionID">282</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">expiresCheckButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="265475979"/>
</object>
<int key="connectionID">286</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">tagsTokenField</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="412273164"/>
</object>
<int key="connectionID">287</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">imageView</string> <string key="label">imageView</string>
@@ -5066,7 +5079,7 @@
<nil key="activeLocalization"/> <nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/> <dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">285</int> <int key="maxID">287</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions"> <array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5151,11 +5164,41 @@
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">MPEntryInspectorViewController</string> <string key="className">MPEntryInspectorViewController</string>
<string key="superclassName">MPViewController</string> <string key="superclassName">MPViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="_popUpPasswordGenerator:">id</string>
<string key="addAttachment:">id</string>
<string key="addCustomField:">id</string>
<string key="removeAttachment:">id</string>
<string key="removeCustomField:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="_popUpPasswordGenerator:">
<string key="name">_popUpPasswordGenerator:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="addAttachment:">
<string key="name">addAttachment:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="addCustomField:">
<string key="name">addCustomField:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="removeAttachment:">
<string key="name">removeAttachment:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="removeCustomField:">
<string key="name">removeCustomField:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets"> <dictionary class="NSMutableDictionary" key="outlets">
<string key="URLTextField">NSTextField</string> <string key="URLTextField">NSTextField</string>
<string key="attachmentTableView">NSTableView</string> <string key="attachmentTableView">NSTableView</string>
<string key="createdTextField">NSTextField</string> <string key="createdTextField">NSTextField</string>
<string key="customFieldsTableView">NSTableView</string> <string key="customFieldsTableView">NSTableView</string>
<string key="expiresCheckButton">NSButton</string>
<string key="generalView">NSView</string> <string key="generalView">NSView</string>
<string key="generatePasswordButton">NSButton</string> <string key="generatePasswordButton">NSButton</string>
<string key="infoTabControl">NSSegmentedControl</string> <string key="infoTabControl">NSSegmentedControl</string>
@@ -5184,6 +5227,10 @@
<string key="name">customFieldsTableView</string> <string key="name">customFieldsTableView</string>
<string key="candidateClassName">NSTableView</string> <string key="candidateClassName">NSTableView</string>
</object> </object>
<object class="IBToOneOutletInfo" key="expiresCheckButton">
<string key="name">expiresCheckButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="generalView"> <object class="IBToOneOutletInfo" key="generalView">
<string key="name">generalView</string> <string key="name">generalView</string>
<string key="candidateClassName">NSView</string> <string key="candidateClassName">NSView</string>

55
MacPass/GroupInspectorView.xib
View File

@@ -116,6 +116,7 @@
<string key="NSFrame">{{18, 61}, {222, 26}}</string> <string key="NSFrame">{{18, 61}, {222, 26}}</string>
<reference key="NSSuperview" ref="154788810"/> <reference key="NSSuperview" ref="154788810"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{249, 750}</string> <string key="NSAntiCompressionPriority">{249, 750}</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
@@ -151,6 +152,7 @@
<string key="NSResourceName">NSMenuMixedState</string> <string key="NSResourceName">NSMenuMixedState</string>
</object> </object>
<string key="NSAction">_popUpItemAction:</string> <string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">-1</int>
<reference key="NSTarget" ref="84492558"/> <reference key="NSTarget" ref="84492558"/>
</object> </object>
<bool key="NSMenuItemRespectAlignment">YES</bool> <bool key="NSMenuItemRespectAlignment">YES</bool>
@@ -178,6 +180,7 @@
<reference key="NSOnImage" ref="125551098"/> <reference key="NSOnImage" ref="125551098"/>
<reference key="NSMixedImage" ref="1068191052"/> <reference key="NSMixedImage" ref="1068191052"/>
<string key="NSAction">_popUpItemAction:</string> <string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">1</int>
<reference key="NSTarget" ref="84492558"/> <reference key="NSTarget" ref="84492558"/>
</object> </object>
</array> </array>
@@ -222,6 +225,7 @@
<reference key="NSOnImage" ref="125551098"/> <reference key="NSOnImage" ref="125551098"/>
<reference key="NSMixedImage" ref="1068191052"/> <reference key="NSMixedImage" ref="1068191052"/>
<string key="NSAction">_popUpItemAction:</string> <string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">-1</int>
<reference key="NSTarget" ref="115077500"/> <reference key="NSTarget" ref="115077500"/>
</object> </object>
<bool key="NSMenuItemRespectAlignment">YES</bool> <bool key="NSMenuItemRespectAlignment">YES</bool>
@@ -249,6 +253,7 @@
<reference key="NSOnImage" ref="125551098"/> <reference key="NSOnImage" ref="125551098"/>
<reference key="NSMixedImage" ref="1068191052"/> <reference key="NSMixedImage" ref="1068191052"/>
<string key="NSAction">_popUpItemAction:</string> <string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">1</int>
<reference key="NSTarget" ref="115077500"/> <reference key="NSTarget" ref="115077500"/>
</object> </object>
</array> </array>
@@ -377,7 +382,7 @@
<string key="NSFrameSize">{215, 257}</string> <string key="NSFrameSize">{215, 257}</string>
<reference key="NSSuperview" ref="600246267"/> <reference key="NSSuperview" ref="600246267"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="707535614"/> <reference key="NSNextKeyView" ref="747041324"/>
<string key="NSReuseIdentifierKey">_NS:13</string> <string key="NSReuseIdentifierKey">_NS:13</string>
<object class="NSTextContainer" key="NSTextContainer" id="192398905"> <object class="NSTextContainer" key="NSTextContainer" id="192398905">
<object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSLayoutManager" key="NSLayoutManager">
@@ -503,7 +508,7 @@
<string key="NSFrame">{{20, 190}, {217, 259}}</string> <string key="NSFrame">{{20, 190}, {217, 259}}</string>
<reference key="NSSuperview" ref="154788810"/> <reference key="NSSuperview" ref="154788810"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="600246267"/> <reference key="NSNextKeyView" ref="707535614"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{750, 750}</string> <string key="NSAntiCompressionPriority">{750, 750}</string>
<int key="NSsFlags">133138</int> <int key="NSsFlags">133138</int>
@@ -591,7 +596,7 @@
<string key="NSFrameSize">{255, 421}</string> <string key="NSFrameSize">{255, 421}</string>
<reference key="NSSuperview" ref="83897318"/> <reference key="NSSuperview" ref="83897318"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="296338600"/> <reference key="NSNextKeyView" ref="227728764"/>
<string key="NSReuseIdentifierKey">_NS:13</string> <string key="NSReuseIdentifierKey">_NS:13</string>
</object> </object>
</array> </array>
@@ -624,6 +629,7 @@
<string key="NSFrame">{{0, 405}, {255, 16}}</string> <string key="NSFrame">{{0, 405}, {255, 16}}</string>
<reference key="NSSuperview" ref="279099458"/> <reference key="NSSuperview" ref="279099458"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:26</string> <string key="NSReuseIdentifierKey">_NS:26</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int> <int key="NSsFlags">1</int>
@@ -635,7 +641,7 @@
<string key="NSFrameSize">{255, 421}</string> <string key="NSFrameSize">{255, 421}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="83897318"/> <reference key="NSNextKeyView" ref="296338600"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133152</int> <int key="NSsFlags">133152</int>
<reference key="NSVScroller" ref="296338600"/> <reference key="NSVScroller" ref="296338600"/>
@@ -680,6 +686,30 @@
</object> </object>
<int key="connectionID">46</int> <int key="connectionID">46</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">expiresCheckButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="921420190"/>
</object>
<int key="connectionID">283</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">searchPopupButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="959847502"/>
</object>
<int key="connectionID">284</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">autotypePopupButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="854687919"/>
</object>
<int key="connectionID">285</int>
</object>
</array> </array>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects"> <array key="orderedObjects">
@@ -1612,7 +1642,7 @@
<nil key="activeLocalization"/> <nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/> <dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">282</int> <int key="maxID">285</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions"> <array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1644,19 +1674,34 @@
<string key="className">MPGroupInspectorViewController</string> <string key="className">MPGroupInspectorViewController</string>
<string key="superclassName">MPViewController</string> <string key="superclassName">MPViewController</string>
<dictionary class="NSMutableDictionary" key="outlets"> <dictionary class="NSMutableDictionary" key="outlets">
<string key="autotypePopupButton">NSPopUpButton</string>
<string key="contentView">NSView</string> <string key="contentView">NSView</string>
<string key="expiresCheckButton">NSButton</string>
<string key="notesTextView">NSTextView</string> <string key="notesTextView">NSTextView</string>
<string key="searchPopupButton">NSPopUpButton</string>
<string key="titleTextField">HNHRoundedTextField</string> <string key="titleTextField">HNHRoundedTextField</string>
</dictionary> </dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="autotypePopupButton">
<string key="name">autotypePopupButton</string>
<string key="candidateClassName">NSPopUpButton</string>
</object>
<object class="IBToOneOutletInfo" key="contentView"> <object class="IBToOneOutletInfo" key="contentView">
<string key="name">contentView</string> <string key="name">contentView</string>
<string key="candidateClassName">NSView</string> <string key="candidateClassName">NSView</string>
</object> </object>
<object class="IBToOneOutletInfo" key="expiresCheckButton">
<string key="name">expiresCheckButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="notesTextView"> <object class="IBToOneOutletInfo" key="notesTextView">
<string key="name">notesTextView</string> <string key="name">notesTextView</string>
<string key="candidateClassName">NSTextView</string> <string key="candidateClassName">NSTextView</string>
</object> </object>
<object class="IBToOneOutletInfo" key="searchPopupButton">
<string key="name">searchPopupButton</string>
<string key="candidateClassName">NSPopUpButton</string>
</object>
<object class="IBToOneOutletInfo" key="titleTextField"> <object class="IBToOneOutletInfo" key="titleTextField">
<string key="name">titleTextField</string> <string key="name">titleTextField</string>
<string key="candidateClassName">HNHRoundedTextField</string> <string key="candidateClassName">HNHRoundedTextField</string>

3
MacPass/MPEntryInspectorViewController.h
View File

@@ -31,6 +31,9 @@
@property (weak) IBOutlet NSTabView *tabView; @property (weak) IBOutlet NSTabView *tabView;
@property (strong) IBOutlet NSView *generalView; @property (strong) IBOutlet NSView *generalView;
@property (weak) IBOutlet NSButton *expiresCheckButton;
@property (weak) IBOutlet NSTokenField *tagsTokenField;
- (void)setupBindings:(MPDocument *)document; - (void)setupBindings:(MPDocument *)document;
@end @end

6
MacPass/MPEntryViewController.m
View File

@@ -209,6 +209,12 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
#pragma mark NSTableViewDelgate #pragma mark NSTableViewDelgate
- (void)tableView:(NSTableView *)tableView didAddRowView:(NSTableRowView *)rowView forRow:(NSInteger)row {
/*
bind bakground color to entry color
*/
}
- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
KPKEntry *entry = [self.entryArrayController arrangedObjects][row]; KPKEntry *entry = [self.entryArrayController arrangedObjects][row];
BOOL isTitleColumn = [[tableColumn identifier] isEqualToString:MPEntryTableTitleColumnIdentifier]; BOOL isTitleColumn = [[tableColumn identifier] isEqualToString:MPEntryTableTitleColumnIdentifier];

5
MacPass/MPGroupInspectorViewController.h
View File

@@ -16,6 +16,11 @@
@property (weak) IBOutlet HNHRoundedTextField *titleTextField; @property (weak) IBOutlet HNHRoundedTextField *titleTextField;
@property (unsafe_unretained) IBOutlet NSTextView *notesTextView; @property (unsafe_unretained) IBOutlet NSTextView *notesTextView;
@property (weak) IBOutlet NSButton *expiresCheckButton;
@property (weak) IBOutlet NSPopUpButton *searchPopupButton;
@property (weak) IBOutlet NSPopUpButton *autotypePopupButton;
- (void)setupBindings:(MPDocument *)document; - (void)setupBindings:(MPDocument *)document;
@end @end

7
MacPass/MPGroupInspectorViewController.m
View File

@@ -75,10 +75,17 @@
if(self.group) { if(self.group) {
[self.titleTextField bind:NSValueBinding toObject:self.group withKeyPath:@"name" options:nil]; [self.titleTextField bind:NSValueBinding toObject:self.group withKeyPath:@"name" options:nil];
[self.notesTextView bind:NSValueBinding toObject:self.group withKeyPath:@"notes" options:nil]; [self.notesTextView bind:NSValueBinding toObject:self.group withKeyPath:@"notes" options:nil];
[self.expiresCheckButton bind:NSValueBinding toObject:self.group.timeInfo withKeyPath:@"expires" options:nil];
[self.autotypePopupButton bind:NSSelectedTagBinding toObject:self.group withKeyPath:@"isAutoTypeEnabled" options:nil];
[self.searchPopupButton bind:NSSelectedTagBinding toObject:self.group withKeyPath:@"isSearchEnabled" options:nil];
} }
else { else {
[self.titleTextField unbind:NSValueBinding]; [self.titleTextField unbind:NSValueBinding];
[self.notesTextView unbind:NSValueBinding]; [self.notesTextView unbind:NSValueBinding];
[self.expiresCheckButton unbind:NSValueBinding];
[self.autotypePopupButton unbind:NSSelectedTagBinding];
[self.searchPopupButton unbind:NSSelectedTagBinding];
} }
} }