From bc03d8ef32187b6cd62503be316746c15e5690f5 Mon Sep 17 00:00:00 2001 From: michael starke Date: Mon, 8 Dec 2014 19:05:58 +0100 Subject: [PATCH] Fixed #282 Search now gets stored correclty and is respected while performing a search --- MacPass/Base.lproj/GroupInspectorView.xib | 12 ++----- MacPass/MPDocument+Search.m | 8 ++--- MacPass/MPGroupInspectorViewController.m | 30 ++++++++++++------ MacPass/de.lproj/GroupInspectorView.strings | 9 ------ MacPass/de.lproj/Localizable.strings | Bin 12326 -> 12650 bytes MacPass/en.lproj/GroupInspectorView.strings | 9 ------ MacPass/en.lproj/Localizable.strings | Bin 11420 -> 11752 bytes MacPass/fr.lproj/GroupInspectorView.strings | 9 ------ MacPass/fr.lproj/Localizable.strings | Bin 12134 -> 12466 bytes MacPass/nl.lproj/GroupInspectorView.strings | 9 ------ MacPass/nl.lproj/Localizable.strings | Bin 12042 -> 12376 bytes .../zh-Hans.lproj/GroupInspectorView.strings | 9 ------ MacPass/zh-Hans.lproj/Localizable.strings | Bin 9638 -> 9890 bytes 13 files changed, 27 insertions(+), 68 deletions(-) diff --git a/MacPass/Base.lproj/GroupInspectorView.xib b/MacPass/Base.lproj/GroupInspectorView.xib index fcdd133c..418c6b90 100644 --- a/MacPass/Base.lproj/GroupInspectorView.xib +++ b/MacPass/Base.lproj/GroupInspectorView.xib @@ -76,18 +76,10 @@ - + - - - - - - - - - + diff --git a/MacPass/MPDocument+Search.m b/MacPass/MPDocument+Search.m index 1db04a95..15326746 100644 --- a/MacPass/MPDocument+Search.m +++ b/MacPass/MPDocument+Search.m @@ -116,7 +116,7 @@ NSString *const kMPDocumentSearchResultsKey = @"kMPDocumentSearchResul if(MPIsFlagSetInOptions(MPEntrySearchDoublePasswords, self.searchContext.searchFlags)) { __block NSMutableDictionary *passwordToEntryMap = [[NSMutableDictionary alloc] initWithCapacity:100]; /* Build up a usage map */ - [[self.root childEntries] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { + [[self.root searchableChildEntries] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { KPKEntry *entry = obj; /* skip entries without passwords */ if([entry.password length] > 0) { @@ -144,16 +144,16 @@ NSString *const kMPDocumentSearchResultsKey = @"kMPDocumentSearchResul KPKNode *node = evaluatedObject; return node.timeInfo.isExpired; }]; - return [[self.root childEntries] filteredArrayUsingPredicate:expiredPredicate]; + return [[self.root searchableChildEntries] filteredArrayUsingPredicate:expiredPredicate]; } /* Filter using predicates */ NSArray *predicates = [self _filterPredicatesWithString:self.searchContext.searchString]; if(predicates) { NSPredicate *fullFilter = [NSCompoundPredicate orPredicateWithSubpredicates:predicates]; - return [[self.root childEntries] filteredArrayUsingPredicate:fullFilter]; + return [[self.root searchableChildEntries] filteredArrayUsingPredicate:fullFilter]; } /* No filter, just return everything */ - return [self.root childEntries]; + return [self.root searchableChildEntries]; } - (NSArray *)_filterPredicatesWithString:(NSString *)string{ diff --git a/MacPass/MPGroupInspectorViewController.m b/MacPass/MPGroupInspectorViewController.m index 7e63361c..4550fdef 100644 --- a/MacPass/MPGroupInspectorViewController.m +++ b/MacPass/MPGroupInspectorViewController.m @@ -58,17 +58,29 @@ [[self view] layoutSubtreeIfNeeded]; NSMenu *autotypeMenu = self.autotypePopupButton.menu; - NSMenuItem *inheritItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_INHERIT", "") action:NULL keyEquivalent:@""]; - inheritItem.tag = KPKInherit; - NSMenuItem *yesItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_YES", "") action:NULL keyEquivalent:@""]; - yesItem.tag = KPKInheritYES; - NSMenuItem *noItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_NO", "") action:NULL keyEquivalent:@""]; - noItem.tag = KPKInheritNO; + NSMenuItem *inheritAutotype = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_INHERIT", "") action:NULL keyEquivalent:@""]; + inheritAutotype.tag = KPKInherit; + NSMenuItem *enableAutotype = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_YES", "") action:NULL keyEquivalent:@""]; + enableAutotype.tag = KPKInheritYES; + NSMenuItem *disableAutotype = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_NO", "") action:NULL keyEquivalent:@""]; + disableAutotype.tag = KPKInheritNO; - [autotypeMenu addItem:inheritItem]; - [autotypeMenu addItem:yesItem]; - [autotypeMenu addItem:noItem]; + [autotypeMenu addItem:inheritAutotype]; + [autotypeMenu addItem:enableAutotype]; + [autotypeMenu addItem:disableAutotype]; + NSMenu *searchMenu = self.searchPopupButton.menu; + NSMenuItem *inheritSearch = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"SEARCH_INHERIT", "") action:NULL keyEquivalent:@""]; + inheritSearch.tag = KPKInherit; + NSMenuItem *includeInSearch = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"SEARCH_YES", "") action:NULL keyEquivalent:@""]; + includeInSearch.tag = KPKInheritYES; + NSMenuItem *excludeFromSearch = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"SEARCH_NO", "") action:NULL keyEquivalent:@""]; + excludeFromSearch.tag = KPKInheritNO; + + [searchMenu addItem:inheritSearch]; + [searchMenu addItem:includeInSearch]; + [searchMenu addItem:excludeFromSearch]; + /* void(^copyBlock)(NSTextField *textField) = ^void(NSTextField *textField) { [[MPPasteBoardController defaultController] copyObjects:@[ textField.stringValue ]]; diff --git a/MacPass/de.lproj/GroupInspectorView.strings b/MacPass/de.lproj/GroupInspectorView.strings index 2c6068f5..eb3898e5 100644 --- a/MacPass/de.lproj/GroupInspectorView.strings +++ b/MacPass/de.lproj/GroupInspectorView.strings @@ -8,15 +8,6 @@ /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "231"; */ "231.title" = "OtherViews"; -/* Class = "NSMenuItem"; title = "Inherit Search Settings"; ObjectID = "232"; */ -"232.title" = "Inherit Search Settings"; - -/* Class = "NSMenuItem"; title = "Include in Search"; ObjectID = "233"; */ -"233.title" = "Include in Search"; - -/* Class = "NSMenuItem"; title = "Exclude from Search"; ObjectID = "234"; */ -"234.title" = "Exclude from Search"; - /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */ "243.title" = "OtherViews"; diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings index 7be89fbf22e2b0b1b3f7ca122ff6c41f73236018..09ceb16fb6b76b40ded1eb4caeb6f789238e36bf 100644 GIT binary patch delta 237 zcmZ3M@G5D;KM7`i2Cc~t^@Rl$7@QgM8FCqtfFuZ4Om<`u-pnD%!>Fpj5X_LukjPNP zkj#+5fT0j5qQ#&;*^y6p@+L_M-C%}Nu)0*Bo=k>3hGK>iAS(w5OM$#}pz1OpzX*(z zCZFY%R*z(G1=^qll(7Y3B?cFuN{C&>P_vRiwoksuD{kn=;E$xz4`>6(O(j5mDcE&w JW|xu|0{~88F(Ci| delta 21 dcmaErv@Bu6KZ(g+EL@u{BzYJ&M@S2a0RU#@2V(#L diff --git a/MacPass/en.lproj/GroupInspectorView.strings b/MacPass/en.lproj/GroupInspectorView.strings index 2c6068f5..eb3898e5 100644 --- a/MacPass/en.lproj/GroupInspectorView.strings +++ b/MacPass/en.lproj/GroupInspectorView.strings @@ -8,15 +8,6 @@ /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "231"; */ "231.title" = "OtherViews"; -/* Class = "NSMenuItem"; title = "Inherit Search Settings"; ObjectID = "232"; */ -"232.title" = "Inherit Search Settings"; - -/* Class = "NSMenuItem"; title = "Include in Search"; ObjectID = "233"; */ -"233.title" = "Include in Search"; - -/* Class = "NSMenuItem"; title = "Exclude from Search"; ObjectID = "234"; */ -"234.title" = "Exclude from Search"; - /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */ "243.title" = "OtherViews"; diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings index 3342611bc0ee62eb92dd6e2491fea3306c414a3a..785e3f1ee3be1a3220c993f0bc7d0e895076a573 100644 GIT binary patch delta 265 zcmbOe`67CQl{m9LgVyAY;=+Oo49*Ps47m(RKoW#2HXDjFGny(e1T&;EBr+5+Br{|% zU?>8LXffzBa4{$W)wwb_G6VsQ@tAyDTssm~ABa~1gqaL^4CxHTK=sz>x)|aaB7tTE z1LYJLY=Kyb!4s%DnIVUvlpzJEUjeLJVe)!GQAZ@(fcpFx{E>9IGE|`GN&~tcf!WEmvC7Bsb6&Qkn zl8FpO49N@`n2LZRS`7LOTntJ;b*?}|gMh|(Og<>7&5fjQ@^4AW$r5}5hLJ!u!9cYN z47Nb5#Nf%02Q)Va=#&(&6EcB(6dNZC@`)S!G590tab>7L(US&r8_3}(`Zn`QMT!Cd DFgq66#;N*hKpxB|^n z0_w5_VkHJou(}+EQlJ`;>O7z*NVNh3)FhBDV?PFeBt4;EwZ%Ylk#&^;-H4=b^HoVx FQ2=^#Fzx^V delta 20 ccmcbS&=t4gnZ)EM7Ou$(lHWF)NUMkf0AH#H#{d8T diff --git a/MacPass/zh-Hans.lproj/GroupInspectorView.strings b/MacPass/zh-Hans.lproj/GroupInspectorView.strings index 767ee822..05a26e3e 100644 --- a/MacPass/zh-Hans.lproj/GroupInspectorView.strings +++ b/MacPass/zh-Hans.lproj/GroupInspectorView.strings @@ -8,15 +8,6 @@ /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "231"; */ "231.title" = "OtherViews"; -/* Class = "NSMenuItem"; title = "Inherit Search Settings"; ObjectID = "232"; */ -"232.title" = "继承搜索设置"; - -/* Class = "NSMenuItem"; title = "Include in Search"; ObjectID = "233"; */ -"233.title" = "包含在搜索中"; - -/* Class = "NSMenuItem"; title = "Exclude from Search"; ObjectID = "234"; */ -"234.title" = "不包含在搜索中"; - /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */ "243.title" = "OtherViews"; diff --git a/MacPass/zh-Hans.lproj/Localizable.strings b/MacPass/zh-Hans.lproj/Localizable.strings index db1753921d386902f8e6cc580d7c6dc3c62409da..387354313572d755c0ab0b2335317fb4ffce6d08 100644 GIT binary patch delta 209 zcmZ4Hy~uY%maw`$gBF7VgCj#JLkUAZ5LYr3Fr)%SoPoSth9n>f!WEMfh4-2&Fa!hT z5*dmZk{L2E)c{4b81xyq7?gnOT!Cf=0Zs9k{9IUGS|&xQc3*d1y%K{phWtihVLR4f m?GTM{kSbk2ENU3y8T=Uhf#xbO*aEQ<1Fs*lj?F?MQv?C87%4pf delta 16 YcmZ4FyUcq-mhj|R!do^=iFODA06ifFeE