nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-13 14:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes to context toolbar button

Browse Source 
Added more database icons
This commit is contained in:
michael starke
2013-08-14 01:15:10 +02:00
parent e0f2351c80
commit 3a4d72767b
15 changed files with 885 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1228
Assets/Keepass Icons.ai
View File

File diff suppressed because one or more lines are too long

24
MacPass.xcodeproj/project.pbxproj
View File

@@ -200,6 +200,12 @@
4C79E80317A9187400AC6CD2 /* KPKXmlHeaderWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C79E80217A9187400AC6CD2 /* KPKXmlHeaderWriter.m */; };
4C79E80617A9400500AC6CD2 /* KPKTestNSCoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C79E80517A9400500AC6CD2 /* KPKTestNSCoding.m */; };
4C79E80917A9485600AC6CD2 /* KPKTestNSCopying.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C79E80817A9485600AC6CD2 /* KPKTestNSCopying.m */; };
4C7ABA4817BAEC6700FF5799 /* 15_ScannerTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7ABA4317BAEC6700FF5799 /* 15_ScannerTemplate.pdf */; };
4C7ABA4917BAEC6700FF5799 /* 16_BrowserTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7ABA4417BAEC6700FF5799 /* 16_BrowserTemplate.pdf */; };
4C7ABA4A17BAEC6700FF5799 /* 17_CDRomTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7ABA4517BAEC6700FF5799 /* 17_CDRomTemplate.pdf */; };
4C7ABA4B17BAEC6700FF5799 /* 19_EmailTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7ABA4617BAEC6700FF5799 /* 19_EmailTemplate.pdf */; };
4C7ABA4C17BAEC6700FF5799 /* 20_MiscTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7ABA4717BAEC6700FF5799 /* 20_MiscTemplate.pdf */; };
4C7ABA4E17BAEC7000FF5799 /* addEntryTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7ABA4D17BAEC7000FF5799 /* addEntryTemplate.pdf */; };
4C7F35681779DFFB00C57890 /* Errors.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C7F356A1779DFFB00C57890 /* Errors.strings */; };
4C801AFC179310E2002821E3 /* NSString+Hexdata.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C801AFB179310E2002821E3 /* NSString+Hexdata.m */; };
4C80BB6F176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C80BB6E176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m */; };
@@ -658,6 +664,12 @@
4C79E80517A9400500AC6CD2 /* KPKTestNSCoding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKTestNSCoding.m; sourceTree = "<group>"; };
4C79E80717A9485600AC6CD2 /* KPKTestNSCopying.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKTestNSCopying.h; sourceTree = "<group>"; };
4C79E80817A9485600AC6CD2 /* KPKTestNSCopying.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKTestNSCopying.m; sourceTree = "<group>"; };
4C7ABA4317BAEC6700FF5799 /* 15_ScannerTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 15_ScannerTemplate.pdf; sourceTree = "<group>"; };
4C7ABA4417BAEC6700FF5799 /* 16_BrowserTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 16_BrowserTemplate.pdf; sourceTree = "<group>"; };
4C7ABA4517BAEC6700FF5799 /* 17_CDRomTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 17_CDRomTemplate.pdf; sourceTree = "<group>"; };
4C7ABA4617BAEC6700FF5799 /* 19_EmailTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 19_EmailTemplate.pdf; sourceTree = "<group>"; };
4C7ABA4717BAEC6700FF5799 /* 20_MiscTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 20_MiscTemplate.pdf; sourceTree = "<group>"; };
4C7ABA4D17BAEC7000FF5799 /* addEntryTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = addEntryTemplate.pdf; path = Icons/addEntryTemplate.pdf; sourceTree = "<group>"; };
4C7F35691779DFFB00C57890 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Errors.strings; sourceTree = "<group>"; };
4C7F356B1779DFFF00C57890 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Errors.strings; sourceTree = "<group>"; };
4C801AFA179310E2002821E3 /* NSString+Hexdata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Hexdata.h"; sourceTree = "<group>"; };
@@ -1294,7 +1306,12 @@
4CD78ABB16D155FF00768A1D /* 11_CameraTemplate.pdf */,
4C701CBB178618A000581B88 /* 12_RemoteTemplate.pdf */,
4C52A88C1788628B00868229 /* 13_KeysTemplate.pdf */,
4C7ABA4317BAEC6700FF5799 /* 15_ScannerTemplate.pdf */,
4C7ABA4417BAEC6700FF5799 /* 16_BrowserTemplate.pdf */,
4C7ABA4517BAEC6700FF5799 /* 17_CDRomTemplate.pdf */,
4C52A88D1788628B00868229 /* 18_DisplayTemplate.pdf */,
4C7ABA4617BAEC6700FF5799 /* 19_EmailTemplate.pdf */,
4C7ABA4717BAEC6700FF5799 /* 20_MiscTemplate.pdf */,
4CF29BF317879D0000851B60 /* 26_FileSaveTemplate.pdf */,
4C7714A9176C998F00549F2A /* 43_TrashTemplate.pdf */,
4C6D1D24178579570014C5A5 /* 48_FolderTemplate.pdf */,
@@ -1770,6 +1787,7 @@
4CE88B9317BA64DB0042E078 /* Icons */ = {
isa = PBXGroup;
children = (
4C7ABA4D17BAEC7000FF5799 /* addEntryTemplate.pdf */,
4CE88B9617BA651C0042E078 /* contextTriangleTemplate.pdf */,
4C6D1D26178586CA0014C5A5 /* 99_AddFolderTemplate.pdf */,
4C96D15317A12E4F00D931FA /* 99_CreatedTemplate.pdf */,
@@ -1947,6 +1965,12 @@
4C0728BA17B5B7A4005A7DD9 /* PasswordEditWindow.xib in Resources */,
4C0728BF17B68ED0005A7DD9 /* SavePanelAccessoryView.xib in Resources */,
4CE88B9717BA651C0042E078 /* contextTriangleTemplate.pdf in Resources */,
4C7ABA4817BAEC6700FF5799 /* 15_ScannerTemplate.pdf in Resources */,
4C7ABA4917BAEC6700FF5799 /* 16_BrowserTemplate.pdf in Resources */,
4C7ABA4A17BAEC6700FF5799 /* 17_CDRomTemplate.pdf in Resources */,
4C7ABA4B17BAEC6700FF5799 /* 19_EmailTemplate.pdf in Resources */,
4C7ABA4C17BAEC6700FF5799 /* 20_MiscTemplate.pdf in Resources */,
4C7ABA4E17BAEC7000FF5799 /* addEntryTemplate.pdf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

12
MacPass/GroupInspectorView.xib
View File

@@ -116,7 +116,6 @@
<string key="NSFrame">{{18, 61}, {222, 26}}</string>
<reference key="NSSuperview" ref="154788810"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{249, 750}</string>
<bool key="NSEnabled">YES</bool>
@@ -378,7 +377,7 @@
<string key="NSFrameSize">{215, 257}</string>
<reference key="NSSuperview" ref="600246267"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="747041324"/>
<reference key="NSNextKeyView" ref="707535614"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
<object class="NSTextContainer" key="NSTextContainer" id="192398905">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -504,7 +503,7 @@
<string key="NSFrame">{{20, 190}, {217, 259}}</string>
<reference key="NSSuperview" ref="154788810"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="707535614"/>
<reference key="NSNextKeyView" ref="600246267"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{750, 750}</string>
<int key="NSsFlags">133138</int>
@@ -526,7 +525,7 @@
<string key="NSAntiCompressionPriority">{249, 750}</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1004379867">
<int key="NSCellFlags">-2076180416</int>
<int key="NSCellFlags">-1805647807</int>
<int key="NSCellFlags2">272632128</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="851874085"/>
@@ -592,7 +591,7 @@
<string key="NSFrameSize">{255, 421}</string>
<reference key="NSSuperview" ref="83897318"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="227728764"/>
<reference key="NSNextKeyView" ref="296338600"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
</object>
</array>
@@ -625,7 +624,6 @@
<string key="NSFrame">{{0, 405}, {255, 16}}</string>
<reference key="NSSuperview" ref="279099458"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:26</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
@@ -637,7 +635,7 @@
<string key="NSFrameSize">{255, 421}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="296338600"/>
<reference key="NSNextKeyView" ref="83897318"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133152</int>
<reference key="NSVScroller" ref="296338600"/>

BIN
MacPass/Icons/00_PasswordTemplate.pdf
View File

Binary file not shown.

BIN
MacPass/Icons/15_ScannerTemplate.pdf Normal file
View File

Binary file not shown.

BIN
MacPass/Icons/16_BrowserTemplate.pdf Normal file
View File

Binary file not shown.

BIN
MacPass/Icons/17_CDRomTemplate.pdf Normal file
View File

Binary file not shown.

BIN
MacPass/Icons/19_EmailTemplate.pdf Normal file
View File

Binary file not shown.

BIN
MacPass/Icons/20_MiscTemplate.pdf Normal file
View File

Binary file not shown.

BIN
MacPass/Icons/addEntryTemplate.pdf Normal file
View File

Binary file not shown.

1
MacPass/MPContextToolbarButton.h
View File

@@ -11,5 +11,6 @@
@interface MPContextToolbarButton : NSSegmentedControl
- (void)setImage:(NSImage *)image;
- (void)setContextMenu:(NSMenu *)menu;
@end

16
MacPass/MPContextToolbarButton.m
View File

@@ -9,6 +9,13 @@
#import "MPContextToolbarButton.h"
#import "MPSegmentedContextCell.h"
@interface MPContextToolbarButton () {
@private
NSMenu *_contextMenu;
}
@end
@implementation MPContextToolbarButton
- (id)initWithFrame:(NSRect)frame {
@@ -35,6 +42,12 @@
return self;
}
- (void)setContextMenu:(NSMenu *)menu {
if(_contextMenu != menu) {
_contextMenu = menu;
}
}
/*
Block the segment setter to prevent accidential settings
*/
@@ -55,11 +68,10 @@
}
- (void)showContextMenu:(id)sender {
NSMenu *menu = [self menuForSegment:0];
NSPoint point = [self frame].origin;
point.x = [[self cell] widthForSegment:0];
point.y = NSHeight([self frame]) + 3;
[menu popUpMenuPositioningItem:nil atLocation:point inView:self];
[_contextMenu popUpMenuPositioningItem:nil atLocation:point inView:self];
}
@end

9
MacPass/MPIconHelper.h
View File

@@ -27,7 +27,12 @@ typedef NS_ENUM(NSUInteger, MPIconType) {
MPIconCamera,
MPIconRemote,
MPIconKeys,
MPIconDisplay = 18,
MPIconScanner = 15,
MPIconBrowser,
MPIconCDRom,
MPIconDisplay,
MPIconEmail,
MPIconMisc,
MPIconFileSave = 26,
MPIconTrash = 43,
MPIconFolder = 48,
@@ -38,6 +43,8 @@ typedef NS_ENUM(NSUInteger, MPIconType) {
MPIconAddFolder,
MPIconHardDisk,
MPIconCreated,
MPIconAddEntry,
MPIconContextTriangle,
};
/**

11
MacPass/MPIconHelper.m
View File

@@ -52,8 +52,13 @@ static NSDictionary *icons;
@(MPIconCamera): @"11_CameraTemplate",
@(MPIconRemote): @"12_RemoteTemplate",
@(MPIconKeys): @"13_KeysTemplate",
@(MPIconScanner): @"15_ScannerTemplate",
@(MPIconBrowser): @"16_BrowserTemplate",
@(MPIconCDRom): @"17_CDRomTemplate",
@(MPIconDisplay): @"18_DisplayTemplate",
@(MPIconEmail): @"19_EmailTemplate",
@(MPIconMisc): @"20_MiscTemplate",
@(MPIconFileSave): @"26_FileSaveTemplate",
@@ -66,7 +71,9 @@ static NSDictionary *icons;
@(MPIconInfo): @"99_InfoTemplate",
@(MPIconAddFolder): @"99_AddFolderTemplate",
@(MPIconHardDisk): @"99_HarddiskTemplate",
@(MPIconCreated): @"99_CreatedTemplate"
@(MPIconCreated): @"99_CreatedTemplate",
@(MPIconAddEntry): @"addEntryTemplate",
@(MPIconContextTriangle): @"contextTriangleTemplate"
};
return imageNames;
}

2
MacPass/MPToolbarDelegate.m
View File

@@ -97,7 +97,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
NSMenu *menu = [NSMenu allocWithZone:[NSMenu menuZone]];
[menu addItemWithTitle:@"Dummy" action:NULL keyEquivalent:@""];
[menu setDelegate:_entryMenuDelegate];
[[button cell] setMenu:menu forSegment:0];
[button setContextMenu:menu];
NSRect fittingRect = [button frame];