From b92d8cdc80f6d673215fbdaa8b8708c06a36644e Mon Sep 17 00:00:00 2001 From: michael starke Date: Thu, 6 Jun 2013 23:33:54 +0200 Subject: [PATCH] Moved separator view to HNHUi --- HNHUi | 2 +- MacPass.xcodeproj/project.pbxproj | 18 ++++++------------ MacPass/InspectorView.xib | 28 ++-------------------------- MacPass/MPGradientView.h | 5 ++++- MacPass/MPGradientView.m | 2 +- MacPass/MPSeparator.h | 16 ---------------- MacPass/MPSeparator.m | 23 ----------------------- MacPass/MPTextField.h | 14 -------------- MacPass/MPTextField.m | 25 ------------------------- MacPass/MacPass-Info.plist | 4 +++- 10 files changed, 17 insertions(+), 120 deletions(-) delete mode 100644 MacPass/MPSeparator.h delete mode 100644 MacPass/MPSeparator.m delete mode 100644 MacPass/MPTextField.h delete mode 100644 MacPass/MPTextField.m diff --git a/HNHUi b/HNHUi index 7708aac7..1dd80a57 160000 --- a/HNHUi +++ b/HNHUi @@ -1 +1 @@ -Subproject commit 7708aac7e8a5e3b26d7a20f52a83d7815dceb5c5 +Subproject commit 1dd80a57df9f2d122634a6ca1c193dd6581b6922 diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 7bfc1c0c..18cdb53b 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -20,7 +20,7 @@ 4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */; }; 4C3BD51516D276F800389F1F /* MPToolbarDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */; }; 4C3CD2A8175570C9005F911C /* DMSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3CD2A7175570C9005F911C /* DMSplitView.m */; }; - 4C3D4C0817594CA40038DAAC /* MPSeparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3D4C0717594CA40038DAAC /* MPSeparator.m */; }; + 4C3D4C0817594CA40038DAAC /* HNHSeparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3D4C0717594CA40038DAAC /* HNHSeparator.m */; }; 4C3FFD9E16DAF60600DF9186 /* FilterBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */; }; 4C40AC5C170782730073D1C3 /* MPAbstractSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C40AC5B170782730073D1C3 /* MPAbstractSettingsViewController.m */; }; 4C431BCD16E2A82800700A81 /* MPPasteBoardController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C431BCC16E2A82700700A81 /* MPPasteBoardController.m */; }; @@ -101,7 +101,6 @@ 4CAD747F15B887FD00104512 /* DDXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD746115B887FD00104512 /* DDXMLNode.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; 4CAD748C15B889B700104512 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748B15B889B700104512 /* Security.framework */; }; 4CAD748E15B88AC100104512 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748D15B88AC100104512 /* libz.dylib */; }; - 4CB25D57175A208300D1369D /* MPTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CB25D56175A208300D1369D /* MPTextField.m */; }; 4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4CB9339716D3A0DD00A13B5D /* Credits.rtf */; }; 4CBA2ABA17074C07006D8139 /* MPSettingsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBA2AB917074C07006D8139 /* MPSettingsHelper.m */; }; 4CBFA240172B385D006090DF /* PasswordEditView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CBFA23F172B385D006090DF /* PasswordEditView.xib */; }; @@ -149,8 +148,8 @@ 4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPToolbarDelegate.m; sourceTree = ""; }; 4C3CD2A6175570C9005F911C /* DMSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DMSplitView.h; sourceTree = ""; }; 4C3CD2A7175570C9005F911C /* DMSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DMSplitView.m; sourceTree = ""; }; - 4C3D4C0617594CA40038DAAC /* MPSeparator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSeparator.h; sourceTree = ""; }; - 4C3D4C0717594CA40038DAAC /* MPSeparator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSeparator.m; sourceTree = ""; }; + 4C3D4C0617594CA40038DAAC /* HNHSeparator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHSeparator.h; sourceTree = ""; }; + 4C3D4C0717594CA40038DAAC /* HNHSeparator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHSeparator.m; sourceTree = ""; }; 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterBar.xib; sourceTree = ""; }; 4C40AC581707819A0073D1C3 /* MPAbstractSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAbstractSettingsViewController.h; sourceTree = ""; }; 4C40AC5B170782730073D1C3 /* MPAbstractSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAbstractSettingsViewController.m; sourceTree = ""; }; @@ -304,8 +303,6 @@ 4CAD746315B887FD00104512 /* DDXMLPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLPrivate.h; sourceTree = ""; }; 4CAD748B15B889B700104512 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 4CAD748D15B88AC100104512 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; - 4CB25D55175A208300D1369D /* MPTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPTextField.h; sourceTree = ""; }; - 4CB25D56175A208300D1369D /* MPTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPTextField.m; sourceTree = ""; }; 4CB9339816D3A0DD00A13B5D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = ""; }; 4CBA2AB617074B59006D8139 /* MPSettingsHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSettingsHelper.h; sourceTree = ""; }; 4CBA2AB917074C07006D8139 /* MPSettingsHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSettingsHelper.m; sourceTree = ""; }; @@ -383,10 +380,6 @@ 4CFC53BE16E94729007396BE /* MPShadowBox.m */, 4CE39AC216ECE4F7000FE29D /* MPPopupImageView.h */, 4CE39AC316ECE4F7000FE29D /* MPPopupImageView.m */, - 4C3D4C0617594CA40038DAAC /* MPSeparator.h */, - 4C3D4C0717594CA40038DAAC /* MPSeparator.m */, - 4CB25D55175A208300D1369D /* MPTextField.h */, - 4CB25D56175A208300D1369D /* MPTextField.m */, ); name = Views; sourceTree = ""; @@ -757,6 +750,8 @@ 4CC3AAB7175F4983003EF01B /* .gitignore */, 4CC3AAB8175F4983003EF01B /* HNHRoundedTextFieldCell.h */, 4CC3AAB9175F4983003EF01B /* HNHRoundedTextFieldCell.m */, + 4C3D4C0617594CA40038DAAC /* HNHSeparator.h */, + 4C3D4C0717594CA40038DAAC /* HNHSeparator.m */, 4CC3AABA175F4983003EF01B /* LICENSE.MIT */, 4CC3AABB175F4983003EF01B /* README.md */, ); @@ -998,8 +993,7 @@ 4CCF9754173EFBA500460BD2 /* KdbEntry+Undo.m in Sources */, 4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */, 4C3CD2A8175570C9005F911C /* DMSplitView.m in Sources */, - 4C3D4C0817594CA40038DAAC /* MPSeparator.m in Sources */, - 4CB25D57175A208300D1369D /* MPTextField.m in Sources */, + 4C3D4C0817594CA40038DAAC /* HNHSeparator.m in Sources */, 4C5BF67B175C01F300D53DF7 /* MPUppercaseStringValueTransformer.m in Sources */, 4CC3AABD175F4983003EF01B /* HNHRoundedTextFieldCell.m in Sources */, ); diff --git a/MacPass/InspectorView.xib b/MacPass/InspectorView.xib index 1460fd50..2d5cf7b8 100644 --- a/MacPass/InspectorView.xib +++ b/MacPass/InspectorView.xib @@ -42,7 +42,7 @@ NSApplication - + 256 @@ -50,7 +50,6 @@ 268 {{40, 420}, {35, 14}} - _NS:1535 YES @@ -91,7 +90,6 @@ 268 {{80, 416}, {151, 22}} - _NS:9 YES @@ -133,7 +131,6 @@ 268 {{17, 388}, {58, 14}} - _NS:1535 YES @@ -154,7 +151,6 @@ 268 {{80, 291}, {111, 22}} - _NS:9 YES @@ -179,7 +175,6 @@ 268 {{80, 384}, {151, 22}} - _NS:9 YES @@ -201,7 +196,6 @@ 268 {{80, 352}, {111, 22}} - _NS:9 YES @@ -223,7 +217,6 @@ 268 {{50, 356}, {25, 14}} - _NS:1535 YES @@ -244,7 +237,6 @@ 268 {{199, 352}, {32, 25}} - _NS:22 YES @@ -273,7 +265,6 @@ 268 {{20, 295}, {55, 14}} - _NS:1535 YES @@ -294,8 +285,6 @@ 268 {{199, 289}, {32, 25}} - - _NS:22 YES @@ -331,7 +320,6 @@ {{20, 467}, {48, 48}} - _NS:9 YES @@ -356,7 +344,6 @@ 268 {{73, 483}, {136, 17}} - _NS:1535 {200, 750} @@ -383,15 +370,12 @@ 268 {{20, 457}, {211, 2}} - _NS:9 - MPSeparator + HNHSeparator {251, 535} - - _NS:11 @@ -1690,14 +1674,6 @@ ./Classes/MPPopupImageView.h - - MPSeparator - NSView - - IBProjectSource - ./Classes/MPSeparator.h - - MPTextField NSTextField diff --git a/MacPass/MPGradientView.h b/MacPass/MPGradientView.h index 849d5f6c..98568c94 100644 --- a/MacPass/MPGradientView.h +++ b/MacPass/MPGradientView.h @@ -2,12 +2,15 @@ // MPGradientView.h // MacPass // -// Created by michael starke on 20.02.13. +// Created by Michael Starke on 20.02.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // #import +/* + A view just displaying a gradient + */ @interface MPGradientView : NSView - (id)initWithFrame:(NSRect)frame activeGradient:(NSGradient *)activeGradient inactiveGradient:(NSGradient *)inactiveGradient; diff --git a/MacPass/MPGradientView.m b/MacPass/MPGradientView.m index 03a35098..2e903a47 100644 --- a/MacPass/MPGradientView.m +++ b/MacPass/MPGradientView.m @@ -2,7 +2,7 @@ // MPGradientView.m // MacPass // -// Created by michael starke on 20.02.13. +// Created by Michael Starke on 20.02.13. // Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. // diff --git a/MacPass/MPSeparator.h b/MacPass/MPSeparator.h deleted file mode 100644 index d83b17fb..00000000 --- a/MacPass/MPSeparator.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// MPSeparator.h -// MacPass -// -// Created by Michael Starke on 31.05.13. -// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. -// - -#import - -/* - Simple Separator Line with highlighting - */ -@interface MPSeparator : NSView - -@end diff --git a/MacPass/MPSeparator.m b/MacPass/MPSeparator.m deleted file mode 100644 index 32657653..00000000 --- a/MacPass/MPSeparator.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// MPSeparator.m -// MacPass -// -// Created by Michael Starke on 31.05.13. -// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. -// - -#import "MPSeparator.h" - -@implementation MPSeparator - -- (void)drawRect:(NSRect)dirtyRect { - NSRect bounds = [self bounds]; - [[NSColor lightGrayColor] set]; - NSRectFill(NSMakeRect(0, 1, NSWidth(bounds), 1)); - - [[NSColor whiteColor] set]; - NSRectFill(NSMakeRect(0, 0, NSWidth(bounds), 1)); - -} - -@end diff --git a/MacPass/MPTextField.h b/MacPass/MPTextField.h deleted file mode 100644 index e46d81bf..00000000 --- a/MacPass/MPTextField.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// MPTextField.h -// MacPass -// -// Created by Michael Starke on 01.06.13. -// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. -// - -#import - -@interface MPTextField : NSTextField - - -@end diff --git a/MacPass/MPTextField.m b/MacPass/MPTextField.m deleted file mode 100644 index 6225ee93..00000000 --- a/MacPass/MPTextField.m +++ /dev/null @@ -1,25 +0,0 @@ -// -// MPTextField.m -// MacPass -// -// Created by Michael Starke on 01.06.13. -// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. -// - -#import "MPTextField.h" -#import "HNHRoundedTextFieldCell.h" - -@implementation MPTextField - -+ (Class)cellClass { - return [HNHRoundedTextFieldCell class]; -} - -- (void)awakeFromNib { - [[self class] setCellClass:[HNHRoundedTextFieldCell class]]; - if([[super class] instanceMethodForSelector:@selector(awakeFromNib)]) { - [super awakeFromNib]; - } -} - -@end diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index 4223bd2c..3219840e 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -27,6 +27,8 @@ KeePass Database CFBundleTypeRole Editor + NSDocumentClass + MPDocument CFBundleExecutable @@ -46,7 +48,7 @@ CFBundleSignature ???? CFBundleVersion - 863 + 867 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright