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

Show custom attribute key when copied into clipboard

Browse Source
This commit is contained in:
michael starke
2017-11-14 18:52:31 +01:00
parent adcd80b2ab
commit 4d4d611dd4
5 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cartfile
View File

@@ -1,3 +1,3 @@
github "sparkle-project/Sparkle" ~> 1.18.1 github "sparkle-project/Sparkle" ~> 1.18.1
github "MacPass/KeePassKit" ~> 1.7 github "MacPass/KeePassKit" ~> 1.7.1
github "mstarke/HNHUi" ~> 1.4.1 github "mstarke/HNHUi" ~> 1.4.1

2
Cartfile.resolved
View File

@@ -1,3 +1,3 @@
github "MacPass/KeePassKit" "1.7" github "MacPass/KeePassKit" "1.7.1"
github "mstarke/HNHUi" "1.4.1" github "mstarke/HNHUi" "1.4.1"
github "sparkle-project/Sparkle" "1.18.1" github "sparkle-project/Sparkle" "1.18.1"

9
MacPass/MPCustomFieldTableViewDelegate.h
View File

@@ -24,6 +24,15 @@
@class MPInspectorViewController; @class MPInspectorViewController;
/**
Determines the index of the custom Attribute from the a tag value
@param tag Tag value (e.g. from the input filed inside the table view row)
@return the row number of the custom attribute, if tag is no row then -1 is returned
*/
NSInteger MPCustomFieldIndexFromTag(NSInteger tag);
@interface MPCustomFieldTableViewDelegate : NSObject <NSTableViewDelegate> @interface MPCustomFieldTableViewDelegate : NSObject <NSTableViewDelegate>
@property (weak, nonatomic) id viewController; @property (weak, nonatomic) id viewController;

10
MacPass/MPCustomFieldTableViewDelegate.m
View File

@@ -26,6 +26,12 @@
#import "HNHUi/HNHUi.h" #import "HNHUi/HNHUi.h"
#import "KeePassKit/KeePassKit.h" #import "KeePassKit/KeePassKit.h"
NSInteger MPCustomFieldTagOffset = 50000;
NSInteger MPCustomFieldIndexFromTag(NSInteger tag) {
return MAX(-1, tag - MPCustomFieldTagOffset);
}
@implementation MPCustomFieldTableViewDelegate @implementation MPCustomFieldTableViewDelegate
@@ -73,12 +79,16 @@
options:@{NSConditionallySetsEditableBindingOption: @NO }]; options:@{NSConditionallySetsEditableBindingOption: @NO }];
} }
view.valueTextField.tag = (MPCustomFieldTagOffset + row);
view.valueTextField.delegate = self.viewController;
view.removeButton.target = self.viewController; view.removeButton.target = self.viewController;
view.removeButton.action = @selector(removeCustomField:); view.removeButton.action = @selector(removeCustomField:);
view.removeButton.tag = row; view.removeButton.tag = row;
view.observer = tableView.window.windowController.document; view.observer = tableView.window.windowController.document;
return view; return view;
} }

6
MacPass/MPEntryInspectorViewController.m
View File

@@ -577,6 +577,12 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
else if(textField == self.titleTextField) { else if(textField == self.titleTextField) {
name = NSLocalizedString(@"TITLE", "Displayed name when title field was copied"); name = NSLocalizedString(@"TITLE", "Displayed name when title field was copied");
} }
else {
NSInteger index = MPCustomFieldIndexFromTag(textField.tag);
if(index > -1) {
name = [_customFieldsController.arrangedObjects[index] key];
}
}
[[MPPasteBoardController defaultController] copyObjects:@[value] overlayInfo:info name:name atView:self.view]; [[MPPasteBoardController defaultController] copyObjects:@[value] overlayInfo:info name:name atView:self.view];
return NO; return NO;
} }