Added autotype button to toolbar

This commit is contained in:
Michael Starke
2018-03-06 18:15:00 +01:00
parent ee604337f8
commit d58b406c37
7 changed files with 20 additions and 5 deletions

View File

@@ -12,6 +12,7 @@
4C01C2421764D8980016D5D0 /* MPContextMenuHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */; }; 4C01C2421764D8980016D5D0 /* MPContextMenuHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */; };
4C0728BD17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0728BC17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m */; }; 4C0728BD17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0728BC17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m */; };
4C0728BF17B68ED0005A7DD9 /* SavePanelAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C0728BE17B68ED0005A7DD9 /* SavePanelAccessoryView.xib */; }; 4C0728BF17B68ED0005A7DD9 /* SavePanelAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C0728BE17B68ED0005A7DD9 /* SavePanelAccessoryView.xib */; };
4C08ACEA204F01C700863D99 /* keyboardTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C08ACE9204F01C700863D99 /* keyboardTemplate.pdf */; };
4C0949591FD6B89B004F2971 /* NSUserNotification+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0949581FD6B89B004F2971 /* NSUserNotification+MPAdditions.m */; }; 4C0949591FD6B89B004F2971 /* NSUserNotification+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0949581FD6B89B004F2971 /* NSUserNotification+MPAdditions.m */; };
4C09495C1FD6E510004F2971 /* MPAddCustomFieldContextMenuDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C09495B1FD6E510004F2971 /* MPAddCustomFieldContextMenuDelegate.m */; }; 4C09495C1FD6E510004F2971 /* MPAddCustomFieldContextMenuDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C09495B1FD6E510004F2971 /* MPAddCustomFieldContextMenuDelegate.m */; };
4C0AF62F195C1F2B009E658D /* MPEntrySearchContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0AF62E195C1F2B009E658D /* MPEntrySearchContext.m */; }; 4C0AF62F195C1F2B009E658D /* MPEntrySearchContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0AF62E195C1F2B009E658D /* MPEntrySearchContext.m */; };
@@ -328,6 +329,7 @@
4C0728BC17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordEditWindowController.m; sourceTree = "<group>"; }; 4C0728BC17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordEditWindowController.m; sourceTree = "<group>"; };
4C0728BE17B68ED0005A7DD9 /* SavePanelAccessoryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SavePanelAccessoryView.xib; sourceTree = "<group>"; }; 4C0728BE17B68ED0005A7DD9 /* SavePanelAccessoryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SavePanelAccessoryView.xib; sourceTree = "<group>"; };
4C088C401FD9A42800F92502 /* MPPickcharsParser_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPickcharsParser_Private.h; sourceTree = "<group>"; }; 4C088C401FD9A42800F92502 /* MPPickcharsParser_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPickcharsParser_Private.h; sourceTree = "<group>"; };
4C08ACE9204F01C700863D99 /* keyboardTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = keyboardTemplate.pdf; path = Icons/keyboardTemplate.pdf; sourceTree = "<group>"; };
4C0949571FD6B89B004F2971 /* NSUserNotification+MPAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSUserNotification+MPAdditions.h"; sourceTree = "<group>"; }; 4C0949571FD6B89B004F2971 /* NSUserNotification+MPAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSUserNotification+MPAdditions.h"; sourceTree = "<group>"; };
4C0949581FD6B89B004F2971 /* NSUserNotification+MPAdditions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSUserNotification+MPAdditions.m"; sourceTree = "<group>"; }; 4C0949581FD6B89B004F2971 /* NSUserNotification+MPAdditions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSUserNotification+MPAdditions.m"; sourceTree = "<group>"; };
4C09495A1FD6E510004F2971 /* MPAddCustomFieldContextMenuDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAddCustomFieldContextMenuDelegate.h; sourceTree = "<group>"; }; 4C09495A1FD6E510004F2971 /* MPAddCustomFieldContextMenuDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAddCustomFieldContextMenuDelegate.h; sourceTree = "<group>"; };
@@ -1604,6 +1606,7 @@
4C3826791AD04CC6007D7D67 /* downloadTemplate.pdf */, 4C3826791AD04CC6007D7D67 /* downloadTemplate.pdf */,
4C3826751AD04C24007D7D67 /* harddiskTemplate.pdf */, 4C3826751AD04C24007D7D67 /* harddiskTemplate.pdf */,
4C3826731AD04BA5007D7D67 /* infoTemplate.pdf */, 4C3826731AD04BA5007D7D67 /* infoTemplate.pdf */,
4C08ACE9204F01C700863D99 /* keyboardTemplate.pdf */,
); );
name = Icons; name = Icons;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -1781,6 +1784,7 @@
4C3826AB1AD04D8E007D7D67 /* 28_QuickTimeTemplate.pdf in Resources */, 4C3826AB1AD04D8E007D7D67 /* 28_QuickTimeTemplate.pdf in Resources */,
4C3826B31AD04D8E007D7D67 /* 38_SambaUnmountTemplate.pdf in Resources */, 4C3826B31AD04D8E007D7D67 /* 38_SambaUnmountTemplate.pdf in Resources */,
4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */, 4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */,
4C08ACEA204F01C700863D99 /* keyboardTemplate.pdf in Resources */,
4C6AEF031A04400E00CA2420 /* OpenPanelAccessoryView.xib in Resources */, 4C6AEF031A04400E00CA2420 /* OpenPanelAccessoryView.xib in Resources */,
4C6DCC451FA2457900C8AD3F /* ContextBar.xib in Resources */, 4C6DCC451FA2457900C8AD3F /* ContextBar.xib in Resources */,
4C431BCF16E2BAB000700A81 /* OverlayWindow.xib in Resources */, 4C431BCF16E2BAB000700A81 /* OverlayWindow.xib in Resources */,

Binary file not shown.

View File

@@ -414,8 +414,8 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
*/ */
// only lock if we do not have user interaction that cannot be dismissed! // only lock if we do not have user interaction that cannot be dismissed!
if(!self.lockedForFileChange) { if(!self.lockedForFileChange) {
for(NSWindow *sheet in [self windowForSheet].sheets) { for(NSWindow *sheet in self.windowForSheet.sheets) {
[[self windowForSheet] endSheet:sheet]; [self.windowForSheet endSheet:sheet];
} }
if(self.documentEdited) { if(self.documentEdited) {
[self saveDocumentWithDelegate:self didSaveSelector:@selector(_lockDatabaseForDocument:didSave:contextInfo:) contextInfo:NULL]; [self saveDocumentWithDelegate:self didSaveSelector:@selector(_lockDatabaseForDocument:didSave:contextInfo:) contextInfo:NULL];

View File

@@ -109,6 +109,7 @@ typedef NS_ENUM(NSUInteger, MPIconType) {
MPIconContextTriangle, MPIconContextTriangle,
MPIconExpiredEntry, MPIconExpiredEntry,
MPIconExpiredGroup, MPIconExpiredGroup,
MPIconKeyboard
}; };
/** /**

View File

@@ -162,6 +162,7 @@
@(MPIconCreated): @"createdTemplate", @(MPIconCreated): @"createdTemplate",
@(MPIconAddEntry): @"addEntryTemplate", @(MPIconAddEntry): @"addEntryTemplate",
@(MPIconContextTriangle): @"contextTriangleTemplate", @(MPIconContextTriangle): @"contextTriangleTemplate",
@(MPIconKeyboard): @"keyboardTemplate",
@(MPIconExpiredEntry): NSImageNameCaution, @(MPIconExpiredEntry): NSImageNameCaution,
@(MPIconExpiredGroup): NSImageNameCaution @(MPIconExpiredGroup): NSImageNameCaution

View File

@@ -44,6 +44,7 @@ NSString *const MPToolbarItemSearch = @"TOOLBAR_SEARCH";
NSString *const MPToolbarItemCopyUsername = @"TOOLBAR_COPY_USERNAME"; NSString *const MPToolbarItemCopyUsername = @"TOOLBAR_COPY_USERNAME";
NSString *const MPToolbarItemCopyPassword = @"TOOLBAR_COPY_PASSWORD"; NSString *const MPToolbarItemCopyPassword = @"TOOLBAR_COPY_PASSWORD";
NSString *const MPToolbarItemHistory = @"TOOLBAR_HISTORY"; NSString *const MPToolbarItemHistory = @"TOOLBAR_HISTORY";
NSString *const MPToolbarItemAutotype = @"TOOLBAR_AUTOTYPE";
@interface MPToolbarDelegate() { @interface MPToolbarDelegate() {
MPAddEntryContextMenuDelegate *_entryMenuDelegate; MPAddEntryContextMenuDelegate *_entryMenuDelegate;
@@ -77,10 +78,12 @@ NSString *const MPToolbarItemHistory = @"TOOLBAR_HISTORY";
MPToolbarItemSearch, MPToolbarItemSearch,
MPToolbarItemLock, MPToolbarItemLock,
MPToolbarItemInspector, MPToolbarItemInspector,
MPToolbarItemHistory ]; MPToolbarItemHistory,
MPToolbarItemAutotype ];
_defaultToolbarIdentifiers = @[ MPToolbarItemAddEntry, _defaultToolbarIdentifiers = @[ MPToolbarItemAddEntry,
MPToolbarItemDelete, MPToolbarItemDelete,
MPToolbarItemAddGroup, MPToolbarItemAddGroup,
MPToolbarItemAutotype,
MPToolbarItemAction, MPToolbarItemAction,
NSToolbarFlexibleSpaceItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier,
MPToolbarItemSearch, MPToolbarItemSearch,
@@ -214,7 +217,8 @@ NSString *const MPToolbarItemHistory = @"TOOLBAR_HISTORY";
MPToolbarItemDelete: [MPIconHelper icon:MPIconTrash], MPToolbarItemDelete: [MPIconHelper icon:MPIconTrash],
MPToolbarItemAction: [NSImage imageNamed:NSImageNameActionTemplate], MPToolbarItemAction: [NSImage imageNamed:NSImageNameActionTemplate],
MPToolbarItemInspector: [MPIconHelper icon:MPIconInfo], MPToolbarItemInspector: [MPIconHelper icon:MPIconInfo],
MPToolbarItemHistory: [MPIconHelper icon:MPIconHistory] MPToolbarItemHistory: [MPIconHelper icon:MPIconHistory],
MPToolbarItemAutotype : [MPIconHelper icon:MPIconKeyboard]
}; };
return imageDict; return imageDict;
} }
@@ -247,7 +251,8 @@ NSString *const MPToolbarItemHistory = @"TOOLBAR_HISTORY";
MPToolbarItemDelete: NSLocalizedString(@"DELETE", @"Toolbar item delete item"), MPToolbarItemDelete: NSLocalizedString(@"DELETE", @"Toolbar item delete item"),
MPToolbarItemInspector: NSLocalizedString(@"INSPECTOR", @"Toolbar item toggle inspector"), MPToolbarItemInspector: NSLocalizedString(@"INSPECTOR", @"Toolbar item toggle inspector"),
MPToolbarItemSearch: NSLocalizedString(@"SEARCH", @"Search input in Toolbar "), MPToolbarItemSearch: NSLocalizedString(@"SEARCH", @"Search input in Toolbar "),
MPToolbarItemHistory: NSLocalizedString(@"SHOW_HISTORY", @"Toolbar item to toggel history display"), MPToolbarItemHistory: NSLocalizedString(@"SHOW_HISTORY", @"Toolbar item to toggle history display"),
MPToolbarItemAutotype: NSLocalizedString(@"TOOLBAR_PERFORM_AUTOTYPE_FOR_ENTRY", @"Toolbar item to perform autotype")
}; };
}); });
return labelDict[identifier]; return labelDict[identifier];
@@ -265,6 +270,7 @@ NSString *const MPToolbarItemHistory = @"TOOLBAR_HISTORY";
MPToolbarItemCopyUsername: @(MPActionCopyUsername), MPToolbarItemCopyUsername: @(MPActionCopyUsername),
MPToolbarItemInspector: @(MPActionToggleInspector), MPToolbarItemInspector: @(MPActionToggleInspector),
MPToolbarItemHistory: @(MPActionShowEntryHistory), MPToolbarItemHistory: @(MPActionShowEntryHistory),
MPToolbarItemAutotype: @(MPActionPerformAutotypeForSelectedEntry)
}; };
}); });
MPActionType actionType = (MPActionType)[actionDict[identifier] integerValue]; MPActionType actionType = (MPActionType)[actionDict[identifier] integerValue];

View File

@@ -532,6 +532,9 @@
/* preset to expire tomorrow */ /* preset to expire tomorrow */
"TOMORROW" = "Tomorrow"; "TOMORROW" = "Tomorrow";
/* Toolbar item to perform autotype */
"TOOLBAR_PERFORM_AUTOTYPE_FOR_ENTRY" = "Autotype";
/* Move Entry to Trash */ /* Move Entry to Trash */
"TRASH_ENTRY" = "Trash Entry"; "TRASH_ENTRY" = "Trash Entry";