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

Autotype for selected entry is working rudimentarily

Browse Source
This commit is contained in:
michael starke
2014-12-17 11:20:30 +01:00
parent 3eb98a516c
commit 692ade2110
12 changed files with 80 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MacPass/MPDocument+Autotype.m
View File

@@ -50,8 +50,10 @@
if(!windowTitle) {
return nil;
}
NSArray *autotypeEntries = entry ? [[NSArray alloc] initWithObjects:entry, nil] : [self.root autotypeableChildEntries];
BOOL usePreferredEntry = (nil != entry);
NSArray *autotypeEntries = usePreferredEntry ? [[NSArray alloc] initWithObjects:entry, nil] : [self.root autotypeableChildEntries];
NSMutableArray *contexts = [[NSMutableArray alloc] initWithCapacity:MAX(1,ceil([autotypeEntries count] / 4.0))];
MPAutotypeContext *context;
for(KPKEntry *entry in autotypeEntries) {
/* TODO:
@@ -68,7 +70,6 @@
if (titleRange.location == NSNotFound || titleRange.length == 0) {
titleRange = [entry.title rangeOfString:windowTitle options:NSCaseInsensitiveSearch];
}
MPAutotypeContext *context;
if(titleRange.location != NSNotFound && titleRange.length != 0) {
context = [[MPAutotypeContext alloc] initWithEntry:entry andSequence:entry.autotype.defaultKeystrokeSequence];
}
@@ -77,7 +78,14 @@
KPKWindowAssociation *association = [entry.autotype windowAssociationMatchingWindowTitle:windowTitle];
context = [[MPAutotypeContext alloc] initWithWindowAssociation:association];
}
if([context isValid]) {
if(context.isValid) {
[contexts addObject:context];
}
}
/* Fall back to preferred Entry if no match was found */
if(contexts.count == 0 && usePreferredEntry) {
context = [[MPAutotypeContext alloc] initWithEntry:entry andSequence:entry.autotype.defaultKeystrokeSequence];
if(context.isValid) {
[contexts addObject:context];
}
}