From 871b3a5c457976cf8efd4895ec9086cef60e5361 Mon Sep 17 00:00:00 2001 From: michael starke Date: Sat, 30 Nov 2013 19:09:27 +0100 Subject: [PATCH] Added licenses --- KeePassKit | 2 +- MacPass.xcodeproj/project.pbxproj | 6 ++ MacPass/MPAddEntryContextMenuDelegate.h | 14 +++++ MacPass/MPAddEntryContextMenuDelegate.m | 14 +++++ MacPass/MPAppDelegate.h | 14 +++++ MacPass/MPAppDelegate.m | 14 +++++ MacPass/MPAttachmentTableDataSource.h | 14 +++++ MacPass/MPAttachmentTableDataSource.m | 14 +++++ MacPass/MPAttachmentTableViewDelegate.h | 14 +++++ MacPass/MPAttachmentTableViewDelegate.m | 14 +++++ MacPass/MPAutotypeCommand.h | 6 ++ MacPass/MPAutotypeCommand.m | 74 ++++++++++++++++++++++++ MacPass/MPAutotypeContext.h | 32 ++++++++++ MacPass/MPAutotypeContext.m | 58 +++++++++++++++++++ MacPass/MPAutotypeDaemon.m | 2 +- MacPass/MPAutotypeParser.m | 16 ++--- MacPass/MPContextToolbarButton.h | 16 ++++- MacPass/MPContextToolbarButton.m | 16 ++++- MacPass/MPCustomFieldTableViewDelegate.h | 14 +++++ MacPass/MPCustomFieldTableViewDelegate.m | 14 +++++ MacPass/MPDatabaseVersion.h | 14 +++++ MacPass/MPDocument+Attachments.m | 14 +++++ MacPass/MPDocument+Autotype.h | 23 +++++--- MacPass/MPDocument+Autotype.m | 31 ++++++++-- MacPass/MPDocument.h | 14 +++++ MacPass/MPDocument.m | 14 +++++ MacPass/MPDocumentWindowDelegate.h | 14 +++++ MacPass/MPDocumentWindowDelegate.m | 14 +++++ MacPass/MPEntryContextMenuDelegate.h | 16 ++++- MacPass/MPEntryContextMenuDelegate.m | 16 ++++- MacPass/MPEntryTableDataSource.h | 14 +++++ MacPass/MPEntryTableDataSource.m | 14 +++++ MacPass/MPKeyfilePathControlDelegate.h | 14 +++++ MacPass/MPKeyfilePathControlDelegate.m | 14 +++++ MacPass/MPOutlineContextMenuDelegate.h | 14 +++++ MacPass/MPOutlineContextMenuDelegate.m | 14 +++++ MacPass/MPOutlineDataSource.h | 14 +++++ MacPass/MPOutlineDataSource.m | 14 +++++ MacPass/MPSegmentedContextCell.h | 14 +++++ MacPass/MPSegmentedContextCell.m | 14 +++++ MacPass/MPToolbarButton.h | 16 ++++- MacPass/MPToolbarButton.m | 16 ++++- MacPass/MPToolbarDelegate.h | 14 +++++ MacPass/MPToolbarDelegate.m | 14 +++++ MacPass/MPToolbarItem.h | 14 +++++ MacPass/MPToolbarItem.m | 14 +++++ 46 files changed, 735 insertions(+), 31 deletions(-) create mode 100644 MacPass/MPAutotypeContext.h create mode 100644 MacPass/MPAutotypeContext.m diff --git a/KeePassKit b/KeePassKit index 2b5a795a..1b9226ec 160000 --- a/KeePassKit +++ b/KeePassKit @@ -1 +1 @@ -Subproject commit 2b5a795a4345a95b9ce727b00941ec43a84ecaa9 +Subproject commit 1b9226eca278fd6106bfda8d42163c1854c7fefe diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 532dbc96..9e8a9006 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -225,6 +225,7 @@ 4CCEDE2A179F203B008402BE /* MPOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCEDE29179F203B008402BE /* MPOutlineView.m */; }; 4CCEDE2E179F213B008402BE /* MPNotifications.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCEDE2D179F213B008402BE /* MPNotifications.m */; }; 4CCEDE32179F5B6C008402BE /* KPKDataStreamReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCEDE31179F5B6C008402BE /* KPKDataStreamReader.m */; }; + 4CD2B9061849424B0051B395 /* MPAutotypeContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD2B9051849424B0051B395 /* MPAutotypeContext.m */; }; 4CD3ABBA178F71B50073F5C5 /* KPKTree.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD3ABB4178F71B50073F5C5 /* KPKTree.m */; }; 4CD3ABBF178F72610073F5C5 /* KPKEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD3ABBE178F72610073F5C5 /* KPKEntry.m */; }; 4CD3ABC2178F72720073F5C5 /* KPKGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD3ABC1178F72720073F5C5 /* KPKGroup.m */; }; @@ -685,6 +686,8 @@ 4CCEDE2F179F550D008402BE /* KPKTreeReading.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKTreeReading.h; sourceTree = ""; }; 4CCEDE30179F5B6C008402BE /* KPKDataStreamReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKDataStreamReader.h; sourceTree = ""; }; 4CCEDE31179F5B6C008402BE /* KPKDataStreamReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKDataStreamReader.m; sourceTree = ""; }; + 4CD2B9041849424B0051B395 /* MPAutotypeContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAutotypeContext.h; sourceTree = ""; }; + 4CD2B9051849424B0051B395 /* MPAutotypeContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAutotypeContext.m; sourceTree = ""; }; 4CD3ABB2178F71B50073F5C5 /* KPKVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = KPKVersion.h; path = Format/KPKVersion.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 4CD3ABB3178F71B50073F5C5 /* KPKTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKTree.h; sourceTree = ""; }; 4CD3ABB4178F71B50073F5C5 /* KPKTree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKTree.m; sourceTree = ""; }; @@ -1322,6 +1325,8 @@ 4CE296181842A166005F01CE /* MPAutotypePaste.m */, 4CC87EA11847FDDA005AA18D /* MPAutotypeParser.h */, 4CC87EA21847FDDA005AA18D /* MPAutotypeParser.m */, + 4CD2B9041849424B0051B395 /* MPAutotypeContext.h */, + 4CD2B9051849424B0051B395 /* MPAutotypeContext.m */, ); name = Autotype; sourceTree = ""; @@ -2012,6 +2017,7 @@ 4C1842C3179B69E700E2F5BC /* NSData+HashedData.m in Sources */, 4C1842C6179BF52100E2F5BC /* KPKLegacyHeaderReader.m in Sources */, 4C1842D0179C64DD00E2F5BC /* KPKLegacyTreeCryptor.m in Sources */, + 4CD2B9061849424B0051B395 /* MPAutotypeContext.m in Sources */, 4C1842D3179C64F000E2F5BC /* KPKXmlTreeCryptor.m in Sources */, 4CFC873B179DEDF3000DFC03 /* KPKMetaData.m in Sources */, 4CFC873E179DF200000DFC03 /* KPKTimeInfo.m in Sources */, diff --git a/MacPass/MPAddEntryContextMenuDelegate.h b/MacPass/MPAddEntryContextMenuDelegate.h index ce665832..834cb44a 100644 --- a/MacPass/MPAddEntryContextMenuDelegate.h +++ b/MacPass/MPAddEntryContextMenuDelegate.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 30.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPAddEntryContextMenuDelegate.m b/MacPass/MPAddEntryContextMenuDelegate.m index de63420b..3e1aa4ba 100644 --- a/MacPass/MPAddEntryContextMenuDelegate.m +++ b/MacPass/MPAddEntryContextMenuDelegate.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 30.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPAddEntryContextMenuDelegate.h" #import "MPDocument.h" diff --git a/MacPass/MPAppDelegate.h b/MacPass/MPAppDelegate.h index b4d10e76..f5af5858 100644 --- a/MacPass/MPAppDelegate.h +++ b/MacPass/MPAppDelegate.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 19.07.12. // Copyright (c) 2012 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m index 2aeca038..e9b190f1 100644 --- a/MacPass/MPAppDelegate.m +++ b/MacPass/MPAppDelegate.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 19.07.12. // Copyright (c) 2012 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPAppDelegate.h" diff --git a/MacPass/MPAttachmentTableDataSource.h b/MacPass/MPAttachmentTableDataSource.h index acd87865..25dd4109 100644 --- a/MacPass/MPAttachmentTableDataSource.h +++ b/MacPass/MPAttachmentTableDataSource.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 01.08.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPAttachmentTableDataSource.m b/MacPass/MPAttachmentTableDataSource.m index 6e17db77..5673b390 100644 --- a/MacPass/MPAttachmentTableDataSource.m +++ b/MacPass/MPAttachmentTableDataSource.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 01.08.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPAttachmentTableDataSource.h" #import "MPDocument.h" diff --git a/MacPass/MPAttachmentTableViewDelegate.h b/MacPass/MPAttachmentTableViewDelegate.h index 0a01296e..0cb546e7 100644 --- a/MacPass/MPAttachmentTableViewDelegate.h +++ b/MacPass/MPAttachmentTableViewDelegate.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 17.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPAttachmentTableViewDelegate.m b/MacPass/MPAttachmentTableViewDelegate.m index 52c8974f..23c98b8d 100644 --- a/MacPass/MPAttachmentTableViewDelegate.m +++ b/MacPass/MPAttachmentTableViewDelegate.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 17.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPAttachmentTableViewDelegate.h" diff --git a/MacPass/MPAutotypeCommand.h b/MacPass/MPAutotypeCommand.h index 3d202af5..b7835768 100644 --- a/MacPass/MPAutotypeCommand.h +++ b/MacPass/MPAutotypeCommand.h @@ -8,6 +8,12 @@ #import +extern NSString *const kMPAutotypeSymbolShift; +extern NSString *const kMPAutotypeSymbolControl; +extern NSString *const kMPAutotypeSymbolAlt; +extern NSString *const kMPAutotypeSymbolEnter; +extern NSString *const kMPAutptypeCommandEnter; + @class KPKEntry; /** diff --git a/MacPass/MPAutotypeCommand.m b/MacPass/MPAutotypeCommand.m index d2b6d708..2739c0ce 100644 --- a/MacPass/MPAutotypeCommand.m +++ b/MacPass/MPAutotypeCommand.m @@ -11,6 +11,80 @@ #import +NSString *const kMPAutotypeSymbolShift = @"+"; +NSString *const kMPAutotypeSymbolControl = @"^"; +NSString *const kMPAutotypeSymbolAlt = @"%"; +NSString *const kMPAutotypeSymbolEnter = @"~"; +NSString *const kMPAutptypeCommandEnter = @"{ENTER}"; +NSString *const kMPAutotypeCommandTab = @"{TAB}"; +NSString *const kMPAutotypeCommandUp = @"{UP}"; +NSString *const kMPAutotypeCommandDown = @"{DOWN}"; +NSString *const kMPAutotypeCommandLeft = @"{LEFT}"; +NSString *const kMPAutotypeCommandRight = @"{RIGHT}"; +NSString *const kMPAutotypeCommandDelete = @"{DELETE}"; +NSString *const kMPAutotypeCommandHome = @"{HOME}"; +NSString *const kMPAutotypeCommandEnd = @"{END}"; +NSString *const kMPAutotypeCommandPageUp = @"{PGUP}"; +NSString *const kMPAutotypeCommandPageDown = @"{PGDOWN}"; +NSString *const kMPAutotypeCommandBackspace = @"{BACKSPACE}"; +NSString *const kMPAutotypeCommandBackspaceShort = @"{BS}"; +NSString *const kMPAutotypeCommandBackspaceMedium = @"{BKSP}"; +NSString *const kMPAutotypeCommandBreak = @"{BREAK}"; +NSString *const kMPAutotypeCommandCapsLock = @"{CAPSLOCK}"; +NSString *const kMPAutotypeCommandEscape = @"{ESC}"; +NSString *const kMPAutotypeCommandWindows = @"{WIN}"; +NSString *const kMPAutotypeCommandLeftWindows = @"{LWIN}"; +NSString *const kMPAutotypeCommandRightWindows = @"{RWIN}"; +NSString *const kMPAutotypeCommandApps = @"{APPS}"; +NSString *const kMPAutotypeCommandHelp = @"{HELP}"; +NSString *const kMPAutotypeCommandNumlock = @"{NUMLOCK}"; +NSString *const kMPAutotypeCommandPrintScreen = @"{PRTSC}"; +NSString *const kMPAutotypeCommandScrollLock = @"{SCROLLLOCK}"; +NSString *const kMPAutotypeCommandF1 = @"{F1}"; +/* + Tab {TAB} +Enter {ENTER} or ~ +Arrow Up {UP} +Arrow Down {DOWN} +Arrow Left {LEFT} +Arrow Right {RIGHT} +Insert {INSERT} or {INS} +Delete {DELETE} or {DEL} + + Home {HOME} +End {END} +Page Up {PGUP} +Page Down {PGDN} +Backspace {BACKSPACE}, {BS} or {BKSP} +Break {BREAK} +Caps-Lock {CAPSLOCK} +Escape {ESC} +Windows Key {WIN} (equ. to {LWIN}) +Windows Key: left, right {LWIN}, {RWIN} +Apps / Menu {APPS} +Help {HELP} +Numlock {NUMLOCK} +Print Screen {PRTSC} +Scroll Lock {SCROLLLOCK} +F1 - F16 {F1} - {F16} +Numeric Keypad + {ADD} +Numeric Keypad - {SUBTRACT} +Numeric Keypad * {MULTIPLY} +Numeric Keypad / {DIVIDE} +Numeric Keypad 0 to 9 {NUMPAD0} to {NUMPAD9} +Shift + +Ctrl ^ +Alt % ++ {+} +^ {^} +% {%} +~ {~} +(, ) {(}, {)} + [, ] {[}, {]} + {, } {{}, {}} + */ + + @implementation MPAutotypeCommand - (void)sendPressKey:(CGKeyCode)keyCode modifierFlags:(CGEventFlags)flags { diff --git a/MacPass/MPAutotypeContext.h b/MacPass/MPAutotypeContext.h new file mode 100644 index 00000000..e6f72d4b --- /dev/null +++ b/MacPass/MPAutotypeContext.h @@ -0,0 +1,32 @@ +// +// MPAutotypeSequence.h +// MacPass +// +// Created by Michael Starke on 29/11/13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import + +@class KPKEntry; +@class KPKWindowAssociation; + +@interface MPAutotypeContext : NSObject + +@property (nonatomic, strong) KPKEntry *entry; +@property (nonatomic, copy) NSString *commandsSequence; +@property (nonatomic, assign) NSUInteger value; + +/** + * Designated initializer + * + * @param entry Entry to use + * @param sequence Keystroke Sequence to use + * + * @return AutotypeSequnce with the entry and keystroke in places + */ +- (instancetype)initWithEntry:(KPKEntry *)entry andSequence:(NSString *)sequence; +- (instancetype)initWithDefaultSequenceForEntry:(KPKEntry *)entry; +- (instancetype)initWithWindowAssociation:(KPKWindowAssociation *)association; + +@end diff --git a/MacPass/MPAutotypeContext.m b/MacPass/MPAutotypeContext.m new file mode 100644 index 00000000..af12b58d --- /dev/null +++ b/MacPass/MPAutotypeContext.m @@ -0,0 +1,58 @@ +// +// MPAutotypeSequence.m +// MacPass +// +// Created by Michael Starke on 29/11/13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import "MPAutotypeContext.h" + +#import "KPKAutotype.h" +#import "KPKEntry.h" +#import "KPKWindowAssociation.h" + +@implementation MPAutotypeContext + +- (instancetype)initWithWindowAssociation:(KPKWindowAssociation *)association { + self = [self initWithEntry:association.autotype.entry andSequence:association.keystrokeSequence]; + return self; +} + +- (instancetype)initWithDefaultSequenceForEntry:(KPKEntry *)entry { + self = [self initWithEntry:entry andSequence:entry.autotype.defaultSequence]; + return self; +} + +- (instancetype)initWithEntry:(KPKEntry *)entry andSequence:(NSString *)sequence { + self = [super init]; + /* + Parse the sequence to determine a possible Value? + DELAY + TAB + VKEY + */ + if(self) { + if(entry == nil || sequence == nil) { + self = nil; + } + else { + self.entry = entry; + self.commandsSequence = sequence; + NSRegularExpression *regexp = [[NSRegularExpression alloc] initWithPattern:@"{[a-z]+([0-9]*)}" options:NSRegularExpressionIgnoreMetacharacters error:0]; + if(regexp) { + NSArray *matches = [regexp matchesInString:self.commandsSequence options:0 range:NSMakeRange(0, [self.commandsSequence length])]; + if(matches) { + } + } + } + } + return self; +} + +- (id)copyWithZone:(NSZone *)zone { + MPAutotypeContext *copy = [[MPAutotypeContext alloc] initWithEntry:self.entry andSequence:self.commandsSequence]; + return copy; +} + +@end diff --git a/MacPass/MPAutotypeDaemon.m b/MacPass/MPAutotypeDaemon.m index 77a25b7e..c390384a 100644 --- a/MacPass/MPAutotypeDaemon.m +++ b/MacPass/MPAutotypeDaemon.m @@ -58,7 +58,7 @@ NSString *const kMPApplciationNameKey = @"applicationName"; Query the document to generate a autotype command list for the window title We do not care where this came form, just get the autotype commands */ - NSArray *autotypeCandidates = [[currentDocument findEntriesForWindowTitle:windowTitle] lastObject]; + NSArray *autotypeCandidates = [[currentDocument buildContextsForWindowTitle:windowTitle] lastObject]; NSUInteger candiates = [autotypeCandidates count]; if(candiates == 0) { return; // No Entries found. diff --git a/MacPass/MPAutotypeParser.m b/MacPass/MPAutotypeParser.m index 24fae40c..091c4f8a 100644 --- a/MacPass/MPAutotypeParser.m +++ b/MacPass/MPAutotypeParser.m @@ -8,13 +8,9 @@ #import "MPAutotypeParser.h" -#import "NSString+Placeholder.h" +#import "MPAutotypeCommand.h" -NSString *const kMPAutotypeKeyShift = @"+"; -NSString *const kMPAutotypeKeyControl = @"^"; -NSString *const kMPAutotypeKeyAlt = @"%"; -NSString *const kMPAutotypeKeyEnter = @"~"; -NSString *const kMPAutptypeCommandEnter = @"{ENTER}"; +#import "NSString+Placeholder.h" @implementation MPAutotypeParser @@ -79,13 +75,13 @@ NSString *const kMPAutptypeCommandEnter = @"{ENTER}"; NSRange modifierRange = [currentCommands rangeOfCharacterFromSet:modifierKeySet options:NSCaseInsensitiveSearch range:NSMakeRange(0, 1)]; if(modifierRange.length != 0 && modifierRange.location == 0) { /* starts with a special key */ - if([currentCommands hasPrefix:kMPAutotypeKeyShift]) { + if([currentCommands hasPrefix:kMPAutotypeSymbolShift]) { modiferKeys |= kCGEventFlagMaskAlphaShift; } - if([currentCommands hasPrefix:kMPAutotypeKeyControl]) { + if([currentCommands hasPrefix:kMPAutotypeSymbolControl]) { modiferKeys |= kCGEventFlagMaskControl; } - if([currentCommands hasPrefix:kMPAutotypeKeyAlt]) { + if([currentCommands hasPrefix:kMPAutotypeSymbolAlt]) { modiferKeys = kCGEventFlagMaskAlternate; } /* move the index and continue */ @@ -154,7 +150,7 @@ NSString *const kMPAutptypeCommandEnter = @"{ENTER}"; + (NSString *)_normalizeCommands:(NSString *)commandString { /* Cache normalized Commands? */ NSMutableString *mutableCommand = [commandString mutableCopy]; - [mutableCommand replaceOccurrencesOfString:kMPAutotypeKeyEnter withString:kMPAutptypeCommandEnter options:NSCaseInsensitiveSearch range:NSMakeRange(0, [mutableCommand length])]; + [mutableCommand replaceOccurrencesOfString:kMPAutotypeSymbolEnter withString:kMPAutptypeCommandEnter options:NSCaseInsensitiveSearch range:NSMakeRange(0, [mutableCommand length])]; [mutableCommand replaceOccurrencesOfString:@"{{}" withString:@"{LCURL}" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [mutableCommand length])]; [mutableCommand replaceOccurrencesOfString:@"{}}" withString:@"{RCURL}" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [mutableCommand length])]; return nil; diff --git a/MacPass/MPContextToolbarButton.h b/MacPass/MPContextToolbarButton.h index 9c788156..9d497e01 100644 --- a/MacPass/MPContextToolbarButton.h +++ b/MacPass/MPContextToolbarButton.h @@ -1,10 +1,24 @@ // -// MPSegmentedToolbarButton.h +// MPContextToolbarButton.h // MacPass // // Created by Michael Starke on 26.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPContextToolbarButton.m b/MacPass/MPContextToolbarButton.m index 1ce3ed55..2bc151f4 100644 --- a/MacPass/MPContextToolbarButton.m +++ b/MacPass/MPContextToolbarButton.m @@ -1,10 +1,24 @@ // -// MPSegmentedToolbarButton.m +// MPContextToolbarButton.m // MacPass // // Created by Michael Starke on 26.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPContextToolbarButton.h" #import "MPSegmentedContextCell.h" diff --git a/MacPass/MPCustomFieldTableViewDelegate.h b/MacPass/MPCustomFieldTableViewDelegate.h index f1cec8b6..ad37762a 100644 --- a/MacPass/MPCustomFieldTableViewDelegate.h +++ b/MacPass/MPCustomFieldTableViewDelegate.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 17.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPCustomFieldTableViewDelegate.m b/MacPass/MPCustomFieldTableViewDelegate.m index 2ceca77d..8d0f234e 100644 --- a/MacPass/MPCustomFieldTableViewDelegate.m +++ b/MacPass/MPCustomFieldTableViewDelegate.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 17.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPCustomFieldTableViewDelegate.h" #import "MPDocument.h" diff --git a/MacPass/MPDatabaseVersion.h b/MacPass/MPDatabaseVersion.h index 5301d12a..ba33cc4d 100644 --- a/MacPass/MPDatabaseVersion.h +++ b/MacPass/MPDatabaseVersion.h @@ -5,6 +5,20 @@ // Created by Nathaniel Madura on 18/04/13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #ifndef MacPass_MPDatabaseVersion_h #define MacPass_MPDatabaseVersion_h diff --git a/MacPass/MPDocument+Attachments.m b/MacPass/MPDocument+Attachments.m index 0d539e4e..8b77b966 100644 --- a/MacPass/MPDocument+Attachments.m +++ b/MacPass/MPDocument+Attachments.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 05.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPDocument.h" diff --git a/MacPass/MPDocument+Autotype.h b/MacPass/MPDocument+Autotype.h index e6ff72a0..eaef60a4 100644 --- a/MacPass/MPDocument+Autotype.h +++ b/MacPass/MPDocument+Autotype.h @@ -5,18 +5,25 @@ // Created by Michael Starke on 01/11/13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPDocument.h" @interface MPDocument (Autotype) -/* - Problem: - - If matching isn't safe, we need to determine what to do: - Possible selections for the user are Window associations or entries - Hence we need to deliver both - or do something completely different? - */ -- (NSArray *)findEntriesForWindowTitle:(NSString *)windowTitle; +- (NSArray *)buildContextsForWindowTitle:(NSString *)windowTitle; @end diff --git a/MacPass/MPDocument+Autotype.m b/MacPass/MPDocument+Autotype.m index cbe0fa04..d71f2e24 100644 --- a/MacPass/MPDocument+Autotype.m +++ b/MacPass/MPDocument+Autotype.m @@ -5,29 +5,50 @@ // Created by Michael Starke on 01/11/13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPDocument+Autotype.h" +#import "MPAutotypeContext.h" #import "KPKGroup.h" #import "KPKEntry.h" #import "KPKAutotype.h" +#import "KPKWindowAssociation.h" @implementation MPDocument (Autotype) -- (NSArray *)findEntriesForWindowTitle:(NSString *)windowTitle { +- (NSArray *)buildContextsForWindowTitle:(NSString *)windowTitle { NSArray *autotypeEntries = [self.root autotypeableChildEntries]; - NSMutableArray *matchingEntries = [[NSMutableArray alloc] initWithCapacity:ceil([autotypeEntries count] / 4.0)]; + NSMutableArray *contexts = [[NSMutableArray alloc] initWithCapacity:ceil([autotypeEntries count] / 4.0)]; for(KPKEntry *entry in autotypeEntries) { /* Test for title */ NSRange titleRange = [entry.title rangeOfString:windowTitle options:NSCaseInsensitiveSearch]; - if(titleRange.location != NSNotFound) { - [matchingEntries addObject:entry]; + if(titleRange.location != NSNotFound && titleRange.length != 0) { + MPAutotypeContext *context = [[MPAutotypeContext alloc] initWithEntry:entry andSequence:entry.autotype.defaultSequence]; + [contexts addObject:context]; + } /* search in Autotype entries for match */ else { + KPKWindowAssociation *association = [entry.autotype windowAssociationMatchingWindowTitle:windowTitle]; + MPAutotypeContext *context = [[MPAutotypeContext alloc] initWithWindowAssociation:association]; + [contexts addObject:context]; } } - return nil; + return contexts; } @end diff --git a/MacPass/MPDocument.h b/MacPass/MPDocument.h index d4714c85..457eb5ee 100644 --- a/MacPass/MPDocument.h +++ b/MacPass/MPDocument.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 08.05.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import #import "KPKVersion.h" diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m index 592d5614..2837c193 100644 --- a/MacPass/MPDocument.m +++ b/MacPass/MPDocument.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 08.05.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPDocument.h" #import "MPDocumentWindowController.h" diff --git a/MacPass/MPDocumentWindowDelegate.h b/MacPass/MPDocumentWindowDelegate.h index 0a488d17..aabc8818 100644 --- a/MacPass/MPDocumentWindowDelegate.h +++ b/MacPass/MPDocumentWindowDelegate.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 25.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPDocumentWindowDelegate.m b/MacPass/MPDocumentWindowDelegate.m index 53bf2a26..e2fba53a 100644 --- a/MacPass/MPDocumentWindowDelegate.m +++ b/MacPass/MPDocumentWindowDelegate.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 25.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPDocumentWindowDelegate.h" #import "MPDocument.h" diff --git a/MacPass/MPEntryContextMenuDelegate.h b/MacPass/MPEntryContextMenuDelegate.h index a05434a3..62b7b1dc 100644 --- a/MacPass/MPEntryContextMenuDelegate.h +++ b/MacPass/MPEntryContextMenuDelegate.h @@ -1,10 +1,24 @@ // -// MPEntryMenuDelegate.h +// MPEntryContextMenuDelegate.h // MacPass // // Created by Michael Starke on 17.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPEntryContextMenuDelegate.m b/MacPass/MPEntryContextMenuDelegate.m index 42d224b6..2f54517f 100644 --- a/MacPass/MPEntryContextMenuDelegate.m +++ b/MacPass/MPEntryContextMenuDelegate.m @@ -1,10 +1,24 @@ // -// MPEntryMenuDelegate.m +// MPEntryContextMenuDelegate.m // MacPass // // Created by Michael Starke on 17.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPEntryContextMenuDelegate.h" #import "MPEntryViewController.h" diff --git a/MacPass/MPEntryTableDataSource.h b/MacPass/MPEntryTableDataSource.h index 6855c4cd..dde59d12 100644 --- a/MacPass/MPEntryTableDataSource.h +++ b/MacPass/MPEntryTableDataSource.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 09.06.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPEntryTableDataSource.m b/MacPass/MPEntryTableDataSource.m index 3eb3b8c9..a53f904e 100644 --- a/MacPass/MPEntryTableDataSource.m +++ b/MacPass/MPEntryTableDataSource.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 09.06.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPEntryTableDataSource.h" #import "MPEntryViewController.h" diff --git a/MacPass/MPKeyfilePathControlDelegate.h b/MacPass/MPKeyfilePathControlDelegate.h index 633a72ff..466a06ce 100644 --- a/MacPass/MPKeyfilePathControlDelegate.h +++ b/MacPass/MPKeyfilePathControlDelegate.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 10.03.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPKeyfilePathControlDelegate.m b/MacPass/MPKeyfilePathControlDelegate.m index a60ea68f..69396d68 100644 --- a/MacPass/MPKeyfilePathControlDelegate.m +++ b/MacPass/MPKeyfilePathControlDelegate.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 10.03.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPKeyfilePathControlDelegate.h" diff --git a/MacPass/MPOutlineContextMenuDelegate.h b/MacPass/MPOutlineContextMenuDelegate.h index ea1764d6..869e47d1 100644 --- a/MacPass/MPOutlineContextMenuDelegate.h +++ b/MacPass/MPOutlineContextMenuDelegate.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 29.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPOutlineContextMenuDelegate.m b/MacPass/MPOutlineContextMenuDelegate.m index 8b82fae2..fd780f5d 100644 --- a/MacPass/MPOutlineContextMenuDelegate.m +++ b/MacPass/MPOutlineContextMenuDelegate.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 29.07.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPOutlineContextMenuDelegate.h" #import "MPOutlineViewController.h" diff --git a/MacPass/MPOutlineDataSource.h b/MacPass/MPOutlineDataSource.h index efcb3082..11433d12 100644 --- a/MacPass/MPOutlineDataSource.h +++ b/MacPass/MPOutlineDataSource.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 19.07.12. // Copyright (c) 2012 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPOutlineDataSource.m b/MacPass/MPOutlineDataSource.m index 0d75c8a3..bcfb85a3 100644 --- a/MacPass/MPOutlineDataSource.m +++ b/MacPass/MPOutlineDataSource.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 19.07.12. // Copyright (c) 2012 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPOutlineDataSource.h" #import "MPDocument.h" diff --git a/MacPass/MPSegmentedContextCell.h b/MacPass/MPSegmentedContextCell.h index acabcd9e..1c6bef2a 100644 --- a/MacPass/MPSegmentedContextCell.h +++ b/MacPass/MPSegmentedContextCell.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 13.08.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPSegmentedContextCell.m b/MacPass/MPSegmentedContextCell.m index 82df5a2b..a2376058 100644 --- a/MacPass/MPSegmentedContextCell.m +++ b/MacPass/MPSegmentedContextCell.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 13.08.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPSegmentedContextCell.h" diff --git a/MacPass/MPToolbarButton.h b/MacPass/MPToolbarButton.h index b34fb7a5..a79d9181 100644 --- a/MacPass/MPToolbarButton.h +++ b/MacPass/MPToolbarButton.h @@ -1,10 +1,24 @@ // -// MPButton.h +// MPToolbarButton.h // MacPass // // Created by michael starke on 26.02.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPToolbarButton.m b/MacPass/MPToolbarButton.m index 47e8eeb3..07065f32 100644 --- a/MacPass/MPToolbarButton.m +++ b/MacPass/MPToolbarButton.m @@ -1,10 +1,24 @@ // -// MPButton.m +// MPToolbarButton.m // MacPass // // Created by michael starke on 26.02.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPToolbarButton.h" diff --git a/MacPass/MPToolbarDelegate.h b/MacPass/MPToolbarDelegate.h index ed05b0dc..dd106ff7 100644 --- a/MacPass/MPToolbarDelegate.h +++ b/MacPass/MPToolbarDelegate.h @@ -5,6 +5,20 @@ // Created by michael starke on 18.02.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPToolbarDelegate.m b/MacPass/MPToolbarDelegate.m index 1ef132a1..e6e1a94b 100644 --- a/MacPass/MPToolbarDelegate.m +++ b/MacPass/MPToolbarDelegate.m @@ -5,6 +5,20 @@ // Created by michael starke on 18.02.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPToolbarDelegate.h" #import "MPIconHelper.h" diff --git a/MacPass/MPToolbarItem.h b/MacPass/MPToolbarItem.h index 42adb800..75949f3c 100644 --- a/MacPass/MPToolbarItem.h +++ b/MacPass/MPToolbarItem.h @@ -5,6 +5,20 @@ // Created by Michael Starke on 09.03.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import diff --git a/MacPass/MPToolbarItem.m b/MacPass/MPToolbarItem.m index c59728a8..9962cfa6 100644 --- a/MacPass/MPToolbarItem.m +++ b/MacPass/MPToolbarItem.m @@ -5,6 +5,20 @@ // Created by Michael Starke on 09.03.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// #import "MPToolbarItem.h" #import "MPActionHelper.h"