|
|
@@ -8,7 +8,6 @@
|
|
|
#import "KMProfileInfoWindowController.h"
|
|
|
//#import "NSWindowController_SKExtensions.h"
|
|
|
//#import "KMProfileCellView.h"
|
|
|
-//#import "KMProfileTitleCellView.h"
|
|
|
//#import "NSButton+TitleColor.h"
|
|
|
#import <PDF_Master-Swift.h>
|
|
|
|
|
|
@@ -403,75 +402,75 @@ static NSString *NormalCellIdentifier = @"Normal";
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-//- (void)configuTextField:(KMProfileCellView *)cellView {
|
|
|
-// NSTextField * textField = cellView.detailtextField;
|
|
|
-// NSInteger tag = textField.tag;
|
|
|
-// NSString *placeHoldString = @"";
|
|
|
-// NSString *nameString = @"";
|
|
|
-//
|
|
|
-// if (tag == 1) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Full Name", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].fullName;
|
|
|
-// } else if (tag == 2) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add First Name", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].firstName;
|
|
|
-// } else if (tag == 3) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Middle Name", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].middleName;
|
|
|
-// } else if (tag == 4) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Last Name", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].lastName;
|
|
|
-// } else if (tag == 6) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Street 1", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].street1;
|
|
|
-// } else if (tag == 7) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Street 2", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].street2;
|
|
|
-// } else if (tag == 8) {
|
|
|
-//
|
|
|
-// placeHoldString = NSLocalizedString(@"Add City", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].city;
|
|
|
-// } else if (tag == 9) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add State", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].state;
|
|
|
-// } else if (tag == 10) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Zip", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].zip;
|
|
|
-// } else if (tag == 11) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Country", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].country;
|
|
|
-// } else if (tag == 13) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Email", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].email;
|
|
|
-// } else if (tag == 14) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Tel", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].tel;
|
|
|
-// } else if (tag == 16) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Date", nil);
|
|
|
-// NSDate *date = [NSDate date];
|
|
|
-// NSDateFormatter *formatter = [[[NSDateFormatter alloc] init] autorelease];
|
|
|
-// [formatter setDateFormat:@"YYYY/MM/dd"];
|
|
|
-// nameString = [formatter stringFromDate:date];
|
|
|
-// } else if (tag == 17) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Birth Date", nil);
|
|
|
-// nameString = [KMProfileInfo sharedInstance].birthDate;
|
|
|
-// }
|
|
|
-// textField.stringValue = nameString;
|
|
|
-// if (nameString.length > 0) {
|
|
|
-// textField.hidden = NO;
|
|
|
-// cellView.addButton.hidden = YES;
|
|
|
-// } else {
|
|
|
-// cellView.addButton.title = placeHoldString;
|
|
|
-// textField.placeholderString = placeHoldString;
|
|
|
-// textField.hidden = YES;
|
|
|
-// cellView.addButton.tag = tag;
|
|
|
-// cellView.addButton.target = self;
|
|
|
-// [cellView.addButton setAction:@selector(addFileName_Add:)];
|
|
|
-// [cellView.addButton setTitleColor:[NSColor systemBlueColor]];
|
|
|
-// cellView.addButton.hidden = NO;
|
|
|
-//
|
|
|
-// }
|
|
|
-//}
|
|
|
+- (void)configuTextField:(KMProfileCellView *)cellView {
|
|
|
+ NSTextField * textField = cellView.detailtextField;
|
|
|
+ NSInteger tag = textField.tag;
|
|
|
+ NSString *placeHoldString = @"";
|
|
|
+ NSString *nameString = @"";
|
|
|
+
|
|
|
+ if (tag == 1) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Full Name", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].fullName;
|
|
|
+ } else if (tag == 2) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add First Name", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].firstName;
|
|
|
+ } else if (tag == 3) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Middle Name", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].middleName;
|
|
|
+ } else if (tag == 4) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Last Name", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].lastName;
|
|
|
+ } else if (tag == 6) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Street 1", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].street1;
|
|
|
+ } else if (tag == 7) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Street 2", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].street2;
|
|
|
+ } else if (tag == 8) {
|
|
|
+
|
|
|
+ placeHoldString = NSLocalizedString(@"Add City", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].city;
|
|
|
+ } else if (tag == 9) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add State", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].state;
|
|
|
+ } else if (tag == 10) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Zip", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].zip;
|
|
|
+ } else if (tag == 11) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Country", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].country;
|
|
|
+ } else if (tag == 13) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Email", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].email;
|
|
|
+ } else if (tag == 14) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Tel", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].tel;
|
|
|
+ } else if (tag == 16) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Date", nil);
|
|
|
+ NSDate *date = [NSDate date];
|
|
|
+ NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
|
|
|
+ [formatter setDateFormat:@"YYYY/MM/dd"];
|
|
|
+ nameString = [formatter stringFromDate:date];
|
|
|
+ } else if (tag == 17) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Birth Date", nil);
|
|
|
+ nameString = [KMProfileInfo sharedInstance].birthDate;
|
|
|
+ }
|
|
|
+ textField.stringValue = nameString;
|
|
|
+ if (nameString.length > 0) {
|
|
|
+ textField.hidden = NO;
|
|
|
+ cellView.addButton.hidden = YES;
|
|
|
+ } else {
|
|
|
+ cellView.addButton.title = placeHoldString;
|
|
|
+ textField.placeholderString = placeHoldString;
|
|
|
+ textField.hidden = YES;
|
|
|
+ cellView.addButton.tag = tag;
|
|
|
+ cellView.addButton.target = self;
|
|
|
+ [cellView.addButton setAction:@selector(addFileName_Add:)];
|
|
|
+ [cellView.addButton setTitleColor:[NSColor systemBlueColor]];
|
|
|
+ cellView.addButton.hidden = NO;
|
|
|
+
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
#pragma mark - NSTableViewDelegate / NSTableViewDataSources
|
|
|
|
|
|
@@ -505,54 +504,54 @@ static NSString *NormalCellIdentifier = @"Normal";
|
|
|
[addingString isEqualToString:NSLocalizedString(@"Custom", nil)])
|
|
|
&& row <= customIndex) {
|
|
|
tableCellView = [tableView makeViewWithIdentifier:TitleCellIdentifier owner:tableColumn];
|
|
|
-// KMProfileTitleCellView *cellView = (KMProfileTitleCellView *)tableCellView;
|
|
|
-// cellView.textField.stringValue = addingString;
|
|
|
-// cellView.textField.editable = NO;
|
|
|
-// cellView.wantsLayer = YES;
|
|
|
-// if (@available(macOS 10.14, *)) {
|
|
|
-// if ([KMAppearance isDarkMode]) {
|
|
|
-// cellView.layer.backgroundColor = [NSColor colorWithRed:73/255.0 green:75/255.0 blue:77/255.0 alpha:1.0].CGColor;
|
|
|
-// } else {
|
|
|
-// cellView.layer.backgroundColor = [NSColor colorWithRed:219/255.0 green:219/255.0 blue:219/255.0 alpha:1.0].CGColor;
|
|
|
-// }
|
|
|
-// } else {
|
|
|
-// cellView.layer.backgroundColor = [NSColor colorWithRed:235.0/255.0 green:235.0/255.0 blue:235.0/255.0 alpha:1.0].CGColor;
|
|
|
-// }
|
|
|
+ KMProfileTitleCellView *cellView = (KMProfileTitleCellView *)tableCellView;
|
|
|
+ cellView.textField.stringValue = addingString;
|
|
|
+ cellView.textField.editable = NO;
|
|
|
+ cellView.wantsLayer = YES;
|
|
|
+ if ([KMAppearance isSupportNewColor]) {
|
|
|
+ if ([KMAppearance isDarkMode]) {
|
|
|
+ cellView.layer.backgroundColor = [NSColor colorWithRed:73/255.0 green:75/255.0 blue:77/255.0 alpha:1.0].CGColor;
|
|
|
+ } else {
|
|
|
+ cellView.layer.backgroundColor = [NSColor colorWithRed:219/255.0 green:219/255.0 blue:219/255.0 alpha:1.0].CGColor;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ cellView.layer.backgroundColor = [NSColor colorWithRed:235.0/255.0 green:235.0/255.0 blue:235.0/255.0 alpha:1.0].CGColor;
|
|
|
+ }
|
|
|
|
|
|
} else {
|
|
|
tableCellView = [tableView makeViewWithIdentifier:NormalCellIdentifier owner:tableColumn];
|
|
|
-// KMProfileCellView *cellView = (KMProfileCellView *)tableCellView;
|
|
|
-// cellView.textField.stringValue = addingString;
|
|
|
-// if([cellView isKindOfClass:[KMProfileCellView class]]){
|
|
|
-// cellView.detailtextField.hidden = NO;
|
|
|
-// }
|
|
|
-// cellView.textField.textColor = [KMAppearance KMColor_Layout_H0];
|
|
|
-// if (customIndex > row) {
|
|
|
-// cellView.detailtextField.tag = row;
|
|
|
-// [self configuTextField:cellView];
|
|
|
-// cellView.textField.editable = NO;
|
|
|
-// cellView.textField.selectable = NO;
|
|
|
-// if ([addingString isEqualToString:NSLocalizedString(@"Date", nil)]) {
|
|
|
-// cellView.detailtextField.editable = NO;
|
|
|
-// cellView.detailtextField.selectable = NO;
|
|
|
-// }
|
|
|
-//
|
|
|
-// cellView.detailtextField.delegate = self;
|
|
|
-// } else {
|
|
|
-// NSInteger index = row - customIndex - 1;
|
|
|
-// NSDictionary *dict = [[KMProfileInfo sharedInstance].customInfoArray objectAtIndex:index];
|
|
|
-// cellView.addButton.hidden = YES;
|
|
|
-// cellView.detailtextField.stringValue = dict.allValues.firstObject;
|
|
|
-// cellView.detailtextField.placeholderString = NSLocalizedString(@"Type Value Here", nil);
|
|
|
-// cellView.textField.placeholderString = NSLocalizedString(@"Type Label Here", nil);
|
|
|
-// cellView.textField.editable = YES;
|
|
|
-// cellView.textField.selectable = YES;
|
|
|
-// cellView.detailtextField.editable = YES;
|
|
|
-// cellView.detailtextField.selectable = YES;
|
|
|
-// cellView.textField.delegate = self;
|
|
|
-// cellView.detailtextField.delegate = self;
|
|
|
-//
|
|
|
-// }
|
|
|
+ KMProfileCellView *cellView = (KMProfileCellView *)tableCellView;
|
|
|
+ cellView.textField.stringValue = addingString;
|
|
|
+ if([cellView isKindOfClass:[KMProfileCellView class]]){
|
|
|
+ cellView.detailtextField.hidden = NO;
|
|
|
+ }
|
|
|
+ cellView.textField.textColor = [KMAppearance KMColor_Layout_H0];
|
|
|
+ if (customIndex > row) {
|
|
|
+ cellView.detailtextField.tag = row;
|
|
|
+ [self configuTextField:cellView];
|
|
|
+ cellView.textField.editable = NO;
|
|
|
+ cellView.textField.selectable = NO;
|
|
|
+ if ([addingString isEqualToString:NSLocalizedString(@"Date", nil)]) {
|
|
|
+ cellView.detailtextField.editable = NO;
|
|
|
+ cellView.detailtextField.selectable = NO;
|
|
|
+ }
|
|
|
+
|
|
|
+ cellView.detailtextField.delegate = self;
|
|
|
+ } else {
|
|
|
+ NSInteger index = row - customIndex - 1;
|
|
|
+ NSDictionary *dict = [[KMProfileInfo sharedInstance].customInfoArray objectAtIndex:index];
|
|
|
+ cellView.addButton.hidden = YES;
|
|
|
+ cellView.detailtextField.stringValue = dict.allValues.firstObject;
|
|
|
+ cellView.detailtextField.placeholderString = NSLocalizedString(@"Type Value Here", nil);
|
|
|
+ cellView.textField.placeholderString = NSLocalizedString(@"Type Label Here", nil);
|
|
|
+ cellView.textField.editable = YES;
|
|
|
+ cellView.textField.selectable = YES;
|
|
|
+ cellView.detailtextField.editable = YES;
|
|
|
+ cellView.detailtextField.selectable = YES;
|
|
|
+ cellView.textField.delegate = self;
|
|
|
+ cellView.detailtextField.delegate = self;
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
return tableCellView;
|
|
|
}
|
|
|
@@ -582,7 +581,7 @@ static NSString *NormalCellIdentifier = @"Normal";
|
|
|
return;
|
|
|
}
|
|
|
NSTextField *textField = (NSTextField *)obj.object;
|
|
|
-// KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:currentRow makeIfNecessary:NO];
|
|
|
+ KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:currentRow makeIfNecessary:NO];
|
|
|
if (currentRow == 1) {
|
|
|
[KMProfileInfo sharedInstance].fullName = textField.stringValue;
|
|
|
} else if (currentRow == 2) {
|
|
|
@@ -613,25 +612,25 @@ static NSString *NormalCellIdentifier = @"Normal";
|
|
|
[KMProfileInfo sharedInstance].birthDate = textField.stringValue;
|
|
|
} else if (currentRow >= 19 ) {
|
|
|
NSInteger customIndex = currentRow - 19;
|
|
|
-// if (cellView) {
|
|
|
-// NSDictionary *dict = [[KMProfileInfo sharedInstance].customInfoArray objectAtIndex:customIndex];
|
|
|
-// NSString *originalKey = dict.allKeys.firstObject;
|
|
|
-// NSString *originalValue = dict.allValues.firstObject;
|
|
|
-// if ([textField isEqual:cellView.textField]) {
|
|
|
-// NSDictionary *newDict = @{textField.stringValue : originalValue};
|
|
|
-// [[KMProfileInfo sharedInstance] replaceObjectInCustomInfoArrayAtIndex:customIndex withObject:newDict];
|
|
|
-// } else if ([textField isEqual:cellView.detailtextField]){
|
|
|
-// NSDictionary *newDict = @{originalKey:textField.stringValue};
|
|
|
-// [[KMProfileInfo sharedInstance] replaceObjectInCustomInfoArrayAtIndex:customIndex withObject:newDict];
|
|
|
-// }
|
|
|
-// }
|
|
|
+ if (cellView) {
|
|
|
+ NSDictionary *dict = [[KMProfileInfo sharedInstance].customInfoArray objectAtIndex:customIndex];
|
|
|
+ NSString *originalKey = dict.allKeys.firstObject;
|
|
|
+ NSString *originalValue = dict.allValues.firstObject;
|
|
|
+ if ([textField isEqual:cellView.textField]) {
|
|
|
+ NSDictionary *newDict = @{textField.stringValue : originalValue};
|
|
|
+ [[KMProfileInfo sharedInstance] replaceObjectInCustomInfoArrayAtIndex:customIndex withObject:newDict];
|
|
|
+ } else if ([textField isEqual:cellView.detailtextField]){
|
|
|
+ NSDictionary *newDict = @{originalKey:textField.stringValue};
|
|
|
+ [[KMProfileInfo sharedInstance] replaceObjectInCustomInfoArrayAtIndex:customIndex withObject:newDict];
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
-// if (cellView.detailtextField.stringValue.length > 0 ) {
|
|
|
-// self.addButton.enabled = YES;
|
|
|
-// } else {
|
|
|
-// self.addButton.enabled = NO;
|
|
|
-// }
|
|
|
+ if (cellView.detailtextField.stringValue.length > 0 ) {
|
|
|
+ self.addButton.enabled = YES;
|
|
|
+ } else {
|
|
|
+ self.addButton.enabled = NO;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- (void)controlTextDidBeginEditing:(NSNotification *)obj {
|
|
|
@@ -650,56 +649,56 @@ static NSString *NormalCellIdentifier = @"Normal";
|
|
|
{
|
|
|
NSTextField *textField = obj.object;
|
|
|
NSInteger tag = textField.tag;
|
|
|
-// KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:textField.tag makeIfNecessary:NO];
|
|
|
+ KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:textField.tag makeIfNecessary:NO];
|
|
|
+
|
|
|
+ if ([cellView isKindOfClass:[KMProfileCellView class]] && tag > 0) {
|
|
|
+ NSString *placeHoldString = @"";
|
|
|
+
|
|
|
+ if (tag == 1) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Full Name", nil);
|
|
|
+ } else if (tag == 2) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add First Name", nil);
|
|
|
+ } else if (tag == 3) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Middle Name", nil);
|
|
|
+ } else if (tag == 4) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Last Name", nil);
|
|
|
+ } else if (tag == 6) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Street 1", nil);
|
|
|
+ } else if (tag == 7) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Street 2", nil);
|
|
|
+ } else if (tag == 8) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add City", nil);
|
|
|
+ } else if (tag == 9) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add State", nil);
|
|
|
+ } else if (tag == 10) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Zip", nil);
|
|
|
+ } else if (tag == 11) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Country", nil);
|
|
|
+ } else if (tag == 13) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Email", nil);
|
|
|
+ } else if (tag == 14) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Tel", nil);
|
|
|
+ } else if (tag == 16) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Date", nil);
|
|
|
+ } else if (tag == 17) {
|
|
|
+ placeHoldString = NSLocalizedString(@"Add Birth Date", nil);
|
|
|
+ }
|
|
|
|
|
|
-// if ([cellView isKindOfClass:[KMProfileCellView class]] && tag > 0) {
|
|
|
-// NSString *placeHoldString = @"";
|
|
|
-//
|
|
|
-// if (tag == 1) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Full Name", nil);
|
|
|
-// } else if (tag == 2) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add First Name", nil);
|
|
|
-// } else if (tag == 3) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Middle Name", nil);
|
|
|
-// } else if (tag == 4) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Last Name", nil);
|
|
|
-// } else if (tag == 6) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Street 1", nil);
|
|
|
-// } else if (tag == 7) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Street 2", nil);
|
|
|
-// } else if (tag == 8) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add City", nil);
|
|
|
-// } else if (tag == 9) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add State", nil);
|
|
|
-// } else if (tag == 10) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Zip", nil);
|
|
|
-// } else if (tag == 11) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Country", nil);
|
|
|
-// } else if (tag == 13) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Email", nil);
|
|
|
-// } else if (tag == 14) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Tel", nil);
|
|
|
-// } else if (tag == 16) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Date", nil);
|
|
|
-// } else if (tag == 17) {
|
|
|
-// placeHoldString = NSLocalizedString(@"Add Birth Date", nil);
|
|
|
-// }
|
|
|
-//
|
|
|
-// if (textField.stringValue.length > 0) {
|
|
|
-// textField.textColor = [NSColor secondaryLabelColor];
|
|
|
-// textField.hidden = NO;
|
|
|
-// cellView.addButton.hidden = YES;
|
|
|
-// } else {
|
|
|
-//// textField.hidden = YES; //自定义新增，输入Label后，value为空时推出编辑，就无法填写了
|
|
|
-// textField.placeholderString = @"";
|
|
|
-// cellView.addButton.hidden = NO;
|
|
|
-// cellView.addButton.tag = tag;
|
|
|
-// cellView.addButton.target = self;
|
|
|
-// [cellView.addButton setAction:@selector(addFileName_Add:)];
|
|
|
-// cellView.addButton.title = placeHoldString;
|
|
|
-// [cellView.addButton setTitleColor:[NSColor systemBlueColor]];
|
|
|
-// }
|
|
|
-// }
|
|
|
+ if (textField.stringValue.length > 0) {
|
|
|
+ textField.textColor = [NSColor secondaryLabelColor];
|
|
|
+ textField.hidden = NO;
|
|
|
+ cellView.addButton.hidden = YES;
|
|
|
+ } else {
|
|
|
+// textField.hidden = YES; //自定义新增，输入Label后，value为空时推出编辑，就无法填写了
|
|
|
+ textField.placeholderString = @"";
|
|
|
+ cellView.addButton.hidden = NO;
|
|
|
+ cellView.addButton.tag = tag;
|
|
|
+ cellView.addButton.target = self;
|
|
|
+ [cellView.addButton setAction:@selector(addFileName_Add:)];
|
|
|
+ cellView.addButton.title = placeHoldString;
|
|
|
+ [cellView.addButton setTitleColor:[NSColor systemBlueColor]];
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -707,22 +706,22 @@ static NSString *NormalCellIdentifier = @"Normal";
|
|
|
if (self.tableView.selectedRow == NSNotFound || self.tableView.selectedRow == -1) {
|
|
|
return;
|
|
|
}
|
|
|
-// KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:self.tableView.selectedRow makeIfNecessary:NO];
|
|
|
-// self.addButton.enabled = cellView.detailtextField.stringValue.length > 0;
|
|
|
-//
|
|
|
-// for (NSInteger i = 0; i < self.tableView.numberOfRows; i++) {
|
|
|
-// NSTableCellView *cellView = [self.tableView viewAtColumn:0 row:i makeIfNecessary:NO];
|
|
|
-// if ([cellView isKindOfClass:[KMProfileCellView class]]) {
|
|
|
-// KMProfileCellView *cellView1 = (KMProfileCellView *)cellView;
|
|
|
-// if (i == self.tableView.selectedRow) {
|
|
|
-// cellView1.detailtextField.textColor = [NSColor whiteColor];
|
|
|
-// [cellView1.addButton setTitleColor:[NSColor whiteColor]];
|
|
|
-// } else {
|
|
|
-// cellView1.detailtextField.textColor = [NSColor secondaryLabelColor];
|
|
|
-// [cellView1.addButton setTitleColor:[NSColor systemBlueColor]];
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
+ KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:self.tableView.selectedRow makeIfNecessary:NO];
|
|
|
+ self.addButton.enabled = cellView.detailtextField.stringValue.length > 0;
|
|
|
+
|
|
|
+ for (NSInteger i = 0; i < self.tableView.numberOfRows; i++) {
|
|
|
+ NSTableCellView *cellView = [self.tableView viewAtColumn:0 row:i makeIfNecessary:NO];
|
|
|
+ if ([cellView isKindOfClass:[KMProfileCellView class]]) {
|
|
|
+ KMProfileCellView *cellView1 = (KMProfileCellView *)cellView;
|
|
|
+ if (i == self.tableView.selectedRow) {
|
|
|
+ cellView1.detailtextField.textColor = [NSColor whiteColor];
|
|
|
+ [cellView1.addButton setTitleColor:[NSColor whiteColor]];
|
|
|
+ } else {
|
|
|
+ cellView1.detailtextField.textColor = [NSColor secondaryLabelColor];
|
|
|
+ [cellView1.addButton setTitleColor:[NSColor systemBlueColor]];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
NSInteger customIndex = [self.tableContents indexOfObject:NSLocalizedString(@"Custom", nil)];
|
|
|
if (self.tableView.selectedRow > customIndex) {
|
|
|
self.removeNewInfoButton.enabled = YES;
|
|
|
@@ -741,8 +740,8 @@ static NSString *NormalCellIdentifier = @"Normal";
|
|
|
NSInteger selectRow =self.tableView.selectedRow;
|
|
|
if (selectRow >= 0) {
|
|
|
if (self.callBack) {
|
|
|
-// KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:self.tableView.selectedRow makeIfNecessary:NO];
|
|
|
-// self.callBack(cellView.detailtextField.stringValue);
|
|
|
+ KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:self.tableView.selectedRow makeIfNecessary:NO];
|
|
|
+ self.callBack(cellView.detailtextField.stringValue);
|
|
|
// [self dismissSheet:sender];
|
|
|
}
|
|
|
}
|
|
|
@@ -757,9 +756,9 @@ static NSString *NormalCellIdentifier = @"Normal";
|
|
|
[self.tableView scrollRowToVisible:self.tableView.numberOfRows - 1];
|
|
|
NSIndexSet *set = [NSIndexSet indexSetWithIndex:self.tableView.numberOfRows - 1];
|
|
|
[self.tableView selectRowIndexes:set byExtendingSelection:NO];
|
|
|
-// KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:self.tableView.selectedRow makeIfNecessary:NO];
|
|
|
-// cellView.addButton.hidden = YES;
|
|
|
-// [cellView.textField becomeFirstResponder];
|
|
|
+ KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:self.tableView.selectedRow makeIfNecessary:NO];
|
|
|
+ cellView.addButton.hidden = YES;
|
|
|
+ [cellView.textField becomeFirstResponder];
|
|
|
};
|
|
|
}
|
|
|
|
|
|
@@ -779,37 +778,37 @@ static NSString *NormalCellIdentifier = @"Normal";
|
|
|
{
|
|
|
[self.window makeFirstResponder:nil];
|
|
|
NSInteger tag = sender.tag;
|
|
|
-// KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:tag makeIfNecessary:NO];
|
|
|
-// if ([cellView isKindOfClass:[KMProfileCellView class]]) {
|
|
|
-// cellView.addButton.hidden = YES;
|
|
|
-// cellView.detailtextField.hidden = NO;
|
|
|
-// [cellView.detailtextField becomeFirstResponder];
|
|
|
-// }
|
|
|
+ KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:tag makeIfNecessary:NO];
|
|
|
+ if ([cellView isKindOfClass:[KMProfileCellView class]]) {
|
|
|
+ cellView.addButton.hidden = YES;
|
|
|
+ cellView.detailtextField.hidden = NO;
|
|
|
+ [cellView.detailtextField becomeFirstResponder];
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
#pragma mark - NSMenu Action
|
|
|
|
|
|
- (IBAction)menuItemClicked_Edit:(id)sender {
|
|
|
-// KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:self.tableView.clickedRow makeIfNecessary:NO];
|
|
|
-// NSIndexSet *set = [NSIndexSet indexSetWithIndex:self.tableView.clickedRow];
|
|
|
-// [self.tableView selectRowIndexes:set byExtendingSelection:NO];
|
|
|
-// if (cellView.textField.editable) {
|
|
|
-// if (cellView.textField.stringValue.length == 0) {
|
|
|
-// [cellView.textField becomeFirstResponder];
|
|
|
-// }else {
|
|
|
-// [cellView.detailtextField becomeFirstResponder];
|
|
|
-// }
|
|
|
-// } else {
|
|
|
-// [cellView.detailtextField becomeFirstResponder];
|
|
|
-// }
|
|
|
+ KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:self.tableView.clickedRow makeIfNecessary:NO];
|
|
|
+ NSIndexSet *set = [NSIndexSet indexSetWithIndex:self.tableView.clickedRow];
|
|
|
+ [self.tableView selectRowIndexes:set byExtendingSelection:NO];
|
|
|
+ if (cellView.textField.editable) {
|
|
|
+ if (cellView.textField.stringValue.length == 0) {
|
|
|
+ [cellView.textField becomeFirstResponder];
|
|
|
+ }else {
|
|
|
+ [cellView.detailtextField becomeFirstResponder];
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ [cellView.detailtextField becomeFirstResponder];
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- (IBAction)menuItemClicked_Add:(id)sender {
|
|
|
-// KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:self.tableView.clickedRow makeIfNecessary:NO];
|
|
|
-// if (self.callBack) {
|
|
|
-// self.callBack(cellView.detailtextField.stringValue);
|
|
|
+ KMProfileCellView *cellView = [self.tableView viewAtColumn:0 row:self.tableView.clickedRow makeIfNecessary:NO];
|
|
|
+ if (self.callBack) {
|
|
|
+ self.callBack(cellView.detailtextField.stringValue);
|
|
|
// [self dismissSheet:sender];
|
|
|
-// }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- (IBAction)menuItemClicked_Delete:(id)sender {
|
|
|
@@ -873,36 +872,35 @@ static NSString *NormalCellIdentifier = @"Normal";
|
|
|
|
|
|
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
|
|
|
|
|
|
-// NSTableCellView *cellView = [self.tableView viewAtColumn:0 row:self.tableView.clickedRow makeIfNecessary:NO];
|
|
|
-// if (menuItem.action == @selector(menuItemClicked_Edit:)) {
|
|
|
-// if ([cellView isKindOfClass:[KMProfileTitleCellView class]]) {
|
|
|
-// return NO;
|
|
|
-// } else {
|
|
|
-// KMProfileCellView *cellView1 = (KMProfileCellView *)cellView;
|
|
|
-// if ([cellView1.textField.stringValue isEqualToString:NSLocalizedString(@"Date", nil)]) {
|
|
|
-// return NO;
|
|
|
-// }
|
|
|
-// return YES;
|
|
|
-// }
|
|
|
-//
|
|
|
-// } else if (menuItem.action == @selector(menuItemClicked_Add:)) {
|
|
|
-// if ([cellView isKindOfClass:[KMProfileTitleCellView class]]) {
|
|
|
-// return NO;
|
|
|
-// } else {
|
|
|
-// KMProfileCellView *cell = (KMProfileCellView *)cellView;
|
|
|
-// return cell.detailtextField.stringValue.length > 0;
|
|
|
-// }
|
|
|
-// } else if (menuItem.action == @selector(menuItemClicked_Delete:)) {
|
|
|
-// if ([cellView isKindOfClass:[KMProfileTitleCellView class]]) {
|
|
|
-// return NO;
|
|
|
-// } else {
|
|
|
-// KMProfileCellView *cellView1 = (KMProfileCellView *)cellView;
|
|
|
-// if ([cellView1.textField.stringValue isEqualToString:NSLocalizedString(@"Date", nil)]) {
|
|
|
-// return NO;
|
|
|
-// }
|
|
|
-// return YES;
|
|
|
-// }
|
|
|
-// }
|
|
|
+ NSTableCellView *cellView = [self.tableView viewAtColumn:0 row:self.tableView.clickedRow makeIfNecessary:NO];
|
|
|
+ if (menuItem.action == @selector(menuItemClicked_Edit:)) {
|
|
|
+ if ([cellView isKindOfClass:[KMProfileTitleCellView class]]) {
|
|
|
+ return NO;
|
|
|
+ } else {
|
|
|
+ KMProfileCellView *cellView1 = (KMProfileCellView *)cellView;
|
|
|
+ if ([cellView1.textField.stringValue isEqualToString:NSLocalizedString(@"Date", nil)]) {
|
|
|
+ return NO;
|
|
|
+ }
|
|
|
+ return YES;
|
|
|
+ }
|
|
|
+ } else if (menuItem.action == @selector(menuItemClicked_Add:)) {
|
|
|
+ if ([cellView isKindOfClass:[KMProfileTitleCellView class]]) {
|
|
|
+ return NO;
|
|
|
+ } else {
|
|
|
+ KMProfileCellView *cell = (KMProfileCellView *)cellView;
|
|
|
+ return cell.detailtextField.stringValue.length > 0;
|
|
|
+ }
|
|
|
+ } else if (menuItem.action == @selector(menuItemClicked_Delete:)) {
|
|
|
+ if ([cellView isKindOfClass:[KMProfileTitleCellView class]]) {
|
|
|
+ return NO;
|
|
|
+ } else {
|
|
|
+ KMProfileCellView *cellView1 = (KMProfileCellView *)cellView;
|
|
|
+ if ([cellView1.textField.stringValue isEqualToString:NSLocalizedString(@"Date", nil)]) {
|
|
|
+ return NO;
|
|
|
+ }
|
|
|
+ return YES;
|
|
|
+ }
|
|
|
+ }
|
|
|
return NO;
|
|
|
}
|
|
|
|
