Switched to development branch in KeePassLib

This commit is contained in:
michael starke
2013-06-25 01:24:05 +02:00
parent 661e76a3c5
commit 8e655a1bd9
5 changed files with 47 additions and 27 deletions

View File

@@ -12,39 +12,39 @@
- (void)insertObject:(KdbEntry *)entry inEntriesAtIndex:(NSUInteger)index {
entry.parent = self;
[entries insertObject:entry atIndex:index];
[_entries insertObject:entry atIndex:index];
}
- (void)removeObjectFromEntriesAtIndex:(NSUInteger)index {
KdbEntry *entry = [entries objectAtIndex:index];
[entries removeObjectAtIndex:index];
KdbEntry *entry = [_entries objectAtIndex:index];
[_entries removeObjectAtIndex:index];
entry.parent = nil;
}
- (NSUInteger)countOfEntries {
return [entries count];
return [self.entries count];
}
- (KdbEntry *)objectInEntriesAtIndex:(NSUInteger)index {
return entries[index];
return self.entries[index];
}
- (KdbGroup *)objectInGroupsAtIndex:(NSUInteger)index {
return groups[index];
return self.groups[index];
}
- (NSUInteger)countOfGroups {
return [groups count];
return [self.groups count];
}
- (void)insertObject:(KdbGroup *)group inGroupsAtIndex:(NSUInteger)index {
group.parent = self;
[groups insertObject:group atIndex:index];
[_groups insertObject:group atIndex:index];
}
- (void)removeObjectFromGroupsAtIndex:(NSUInteger)index {
KdbGroup *group = [groups objectAtIndex:index];
[groups removeObjectAtIndex:index];
KdbGroup *group = [self.groups objectAtIndex:index];
[_groups removeObjectAtIndex:index];
group.parent = nil;
}

View File

@@ -30,17 +30,17 @@ NSString *const MPGroupNameUndoableKey = @"nameUndoable";
- (void)addEntryUndoable:(KdbEntry *)entry {
[[self undoManager] registerUndoWithTarget:self selector:@selector(removeEntryUndoable:) object:entry];
[[self undoManager] setActionName:NSLocalizedString(@"UNDO_ADD_ENTRY", "Undo adding of entry")];
[self insertObject:entry inEntriesAtIndex:[entries count]];
[self insertObject:entry inEntriesAtIndex:[_entries count]];
}
- (void)addGroupUndoable:(KdbGroup *)group {
[[self undoManager] registerUndoWithTarget:self selector:@selector(removeGroupUndoable:) object:group];
[[self undoManager] setActionName:NSLocalizedString(@"UNDO_ADD_GROUP", @"Create Group Undo")];
[self insertObject:group inGroupsAtIndex:[groups count]];
[self insertObject:group inGroupsAtIndex:[_groups count]];
}
- (void)removeEntryUndoable:(KdbEntry *)entry {
NSInteger index = [entries indexOfObject:entry];
NSInteger index = [_entries indexOfObject:entry];
if(NSNotFound == index) {
return; // No object found;
}

View File

@@ -48,7 +48,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1008</string>
<string>1049</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>