From 19a518b3bdae16de3f36eabf971b5102ae21b595 Mon Sep 17 00:00:00 2001 From: michael starke Date: Sat, 1 Jun 2013 00:23:14 +0200 Subject: [PATCH] Reduced complexity of inspector view Added simple separator line view App is currently very unstable :( --- MacPass.xcodeproj/project.pbxproj | 6 + MacPass/DocumentWindow.xib | 28 +- MacPass/InspectorTabView.xib | 2721 +++++++++++------------- MacPass/MPInspectorTabViewController.h | 2 - MacPass/MPInspectorTabViewController.m | 6 - MacPass/MPSeparator.h | 16 + MacPass/MPSeparator.m | 24 + MacPass/MacPass-Info.plist | 2 +- MacPass/PasswordCreatorView.xib | 173 +- MacPass/PasswordCreatorWindow.xib | 4 +- 10 files changed, 1361 insertions(+), 1621 deletions(-) create mode 100644 MacPass/MPSeparator.h create mode 100644 MacPass/MPSeparator.m diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index a497e2f7..0662e639 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -20,6 +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 */; }; 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 */; }; @@ -142,6 +143,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 = ""; }; 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 = ""; }; @@ -365,6 +368,8 @@ 4CFC53BE16E94729007396BE /* MPShadowBox.m */, 4CE39AC216ECE4F7000FE29D /* MPPopupImageView.h */, 4CE39AC316ECE4F7000FE29D /* MPPopupImageView.m */, + 4C3D4C0617594CA40038DAAC /* MPSeparator.h */, + 4C3D4C0717594CA40038DAAC /* MPSeparator.m */, ); name = Views; sourceTree = ""; @@ -958,6 +963,7 @@ 4CCF9754173EFBA500460BD2 /* KdbEntry+Undo.m in Sources */, 4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */, 4C3CD2A8175570C9005F911C /* DMSplitView.m in Sources */, + 4C3D4C0817594CA40038DAAC /* MPSeparator.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/MacPass/DocumentWindow.xib b/MacPass/DocumentWindow.xib index a5c393f2..3b04161d 100644 --- a/MacPass/DocumentWindow.xib +++ b/MacPass/DocumentWindow.xib @@ -39,7 +39,7 @@ 15 2 {{196, 240}, {727, 548}} - 544735232 + 1618477056 Window NSWindow @@ -57,7 +57,7 @@ 12 - {200, 526} + {200, 516} @@ -68,7 +68,7 @@ 256 - {{201, 0}, {325, 526}} + {{201, 0}, {325, 516}} @@ -78,14 +78,14 @@ 268 - {{527, 0}, {200, 526}} + {{527, 0}, {200, 516}} _NS:9 NSView - {{0, 22}, {727, 526}} + {{0, 32}, {727, 516}} @@ -110,11 +110,11 @@ - {{0, 0}, {2560, 1418}} + {{0, 0}, {1680, 1028}} {400, 422} {10000000000000, 10000000000000} NO - 22 + 32 YES @@ -200,7 +200,7 @@ - + 4 0 @@ -208,7 +208,7 @@ 4 1 - 22 + 32 1000 @@ -309,8 +309,8 @@ - 682 - + 687 + @@ -328,7 +328,7 @@ - + com.apple.InterfaceBuilder.CocoaPlugin @@ -339,13 +339,13 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 682 + 695 diff --git a/MacPass/InspectorTabView.xib b/MacPass/InspectorTabView.xib index 82b0cd24..4b61f713 100644 --- a/MacPass/InspectorTabView.xib +++ b/MacPass/InspectorTabView.xib @@ -20,10 +20,6 @@ NSImageView NSSecureTextField NSSecureTextFieldCell - NSSegmentedCell - NSSegmentedControl - NSTabView - NSTabViewItem NSTextField NSTextFieldCell NSView @@ -45,60 +41,22 @@ NSApplication - + - 268 + 256 - - + + 268 - {{48, 520}, {144, 20}} - + {{40, 416}, {41, 17}} + - - _NS:9 - {250, 250} - YES - - 67108864 - 32768 - - LucidaGrande - 12 - 16 - - _NS:9 - - - - Details - 0 - - - Advanced - 1 - YES - 0 - - - 1 - 3 - - NO - - - - 268 - {{77, 563}, {41, 17}} - - - + _NS:1535 - {200, 750} YES - - 67108928 - 272631808 + + 68157504 + 272630784 Name LucidaGrande @@ -106,7 +64,7 @@ 1044 _NS:1535 - + 6 System @@ -128,8 +86,232 @@ NO + + + 268 + {{86, 416}, {120, 22}} + + + + _NS:9 + YES + + -1804599231 + 272630784 + + + _NS:9 + + YES + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + textColor + + + + NO + + + + 268 + {{14, 386}, {67, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Username + + _NS:1535 + + + + + NO + + + + 268 + {{86, 291}, {80, 22}} + + + + _NS:9 + YES + + 342884416 + 272630848 + + + _NS:9 + + YES + + + + NSAllRomanInputSourcesLocaleIdentifier + + + NO + + + + 268 + {{86, 384}, {120, 22}} + + + + _NS:9 + YES + + -1804599231 + 272630784 + + + _NS:9 + + YES + + + + NO + + + + 268 + {{86, 352}, {80, 22}} + + + + _NS:9 + YES + + -1804599231 + 272630784 + + + _NS:9 + + YES + + + + NO + + + + 268 + {{52, 354}, {29, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + URL + + _NS:1535 + + + + + NO + + + + 268 + {{174, 352}, {32, 25}} + + + + _NS:22 + YES + + -2080374784 + 134217728 + + + _NS:22 + + -2033958912 + 163 + + NSImage + NSQuickLookTemplate + + + + 400 + 75 + + NO + + + + 268 + {{17, 293}, {64, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Password + + _NS:1535 + + + + + NO + + + + 268 + {{174, 289}, {32, 25}} + + + _NS:22 + YES + + 67108864 + 134217728 + + + _NS:22 + + -1228652544 + 163 + + NSImage + NSRefreshTemplate + + + + 400 + 75 + + NO + - + 268 Apple PDF pasteboard type @@ -139,8 +321,8 @@ NeXT Encapsulated PostScript v1.2 pasteboard type NeXT TIFF v4.0 pasteboard type - {{24, 547}, {48, 48}} - + {{20, 467}, {48, 48}} + _NS:9 @@ -161,349 +343,48 @@ NO YES - - - 12 - {240, 513} - + + + 268 + {{73, 483}, {136, 17}} + - - _NS:9 - - - 1 - - - 256 - - - - 268 - {{40, 471}, {41, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Name - - _NS:1535 - - - - - NO - - - - 268 - {{86, 471}, {134, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - textColor - - - - NO - - - - 268 - {{14, 441}, {67, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Username - - _NS:1535 - - - - - NO - - - - 268 - {{86, 346}, {94, 22}} - - - - _NS:9 - YES - - 342884416 - 272630848 - - - _NS:9 - - YES - - - - NSAllRomanInputSourcesLocaleIdentifier - - - NO - - - - 268 - {{86, 439}, {134, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - NO - - - - 268 - {{86, 407}, {94, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - NO - - - - 268 - {{52, 409}, {29, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - URL - - _NS:1535 - - - - - NO - - - - 268 - {{188, 407}, {32, 25}} - - - - _NS:22 - YES - - -2080374784 - 134217728 - - - _NS:22 - - -2033958912 - 163 - - NSImage - NSQuickLookTemplate - - - - 400 - 75 - - NO - - - - 268 - {{17, 348}, {64, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Password - - _NS:1535 - - - - - NO - - - - 268 - {{188, 344}, {32, 25}} - - - - _NS:22 - YES - - 67108864 - 134217728 - - - _NS:22 - - -1228652544 - 163 - - NSImage - NSRefreshTemplate - - - - 400 - 75 - - NO - - - - 268 - {{86, 314}, {134, 25}} - - - - _NS:22 - YES - - -2080374784 - 134217728 - Generate Password - - _NS:22 - - -2038153216 - 163 - - - 400 - 75 - - NO - - - {240, 513} - - - - _NS:11 - - Details - - - - - 2 - - - 256 - - {240, 513} - - _NS:28 - - Notes - - - - - - - LucidaGrande - 9 - 3614 + + _NS:1535 + {200, 750} + YES + + 67108928 + 272631808 + Name + + _NS:1535 + + + - 268435462 - YES - YES - - - + NO + + + + 268 + {{20, 457}, {186, 2}} + + + + _NS:9 + MPSeparator - {240, 612} + {226, 535} - NSView + _NS:11 - - - view - - - - 10 - itemImageView @@ -522,75 +403,67 @@ - tabView + openURLButton - + - 202 - - - - tabControl - - - - 203 - - - - titleTextField - - - - 361 - - - - usernameTextField - - - - 362 - - - - URLTextField - - - - 363 + 518 passwordTextField - + - 364 + 519 - openURLButton + showPasswordCreator - + - 370 - - - - togglePasswordDisplayButton - - - - 371 + 520 titleOrNameLabel - + - 372 + 521 + + + + titleTextField + + + + 522 + + + + URLTextField + + + + 523 + + + + usernameTextField + + + + 524 + + + + view + + + + 525 @@ -620,157 +493,413 @@ Application - 1 - + 455 + - - - 4 + + + 5 0 - - 4 + + 6 1 - - 0.0 + + 8 1000 - + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + 8 29 3 - - - 5 + + + 3 0 - - 5 + + 3 1 0.0 1000 - + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 222 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + 9 40 3 - - - 6 + + + 5 0 - + 6 1 - - 0.0 + + 8 1000 - - 9 - 40 + + 6 + 24 3 - + 3 0 - + 4 1 8 1000 - + 6 24 3 - - + + 6 - 1 - + 0 + 6 1 20 1000 - - 9 - 40 + + 8 + 29 3 - - + + 5 - 1 - + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + 5 1 20 1000 - + 9 40 3 - - - 9 + + + 11 0 - - 9 + + 11 1 0.0 1000 - + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 9 40 2 - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - + + 5 0 - + 6 1 8 1000 - + 6 24 3 - - + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 9 + 40 + 2 + + + + 3 + 0 + + 4 + 1 + + 10 + + 1000 + + 6 + 24 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + 6 - 1 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 10 + + 1000 + + 6 + 24 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 97 + + 1000 + + 3 + 9 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 6 1 @@ -778,23 +907,7 @@ 20 1000 - - 9 - 40 - 3 - - - - 5 - 0 - - 5 - 1 - - 80 - - 1000 - + 9 40 3 @@ -810,552 +923,393 @@ 0.0 1000 - + 6 24 2 - + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 9 + 40 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 9 + 40 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 9 + 40 + 3 + + 3 0 - + 3 1 - - 17 + + 20 1000 - - 3 - 9 + + 9 + 40 3 - - + + + + + + + + + + + - 53 - + 494 + + + + + 493 + + + + + 492 + + + + + 491 + + + + + 490 + + + + + 489 + + + + + 488 + + + + + 483 + + + + + 482 + + + + + 481 + + + + + 480 + + + + + 479 + + + + + 478 + + + + + 477 + + + + + 476 + + + + + 475 + + + + + 474 + + + + + 473 + + + + + 472 + + + + + 471 + + + + + 470 + + + + + 468 + + + + + 467 + + + + + 466 + - - + - + - 54 - + 465 + - + - + - 55 - + 464 + - + - + - 56 - - - - - - 57 - + 463 + - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 3 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 6 - 1 - - 6 - 1 - - 20 - - 1000 - - 9 - 40 - 3 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 9 - 40 - 2 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 3 - 0 - - 3 - 1 - - 145 - - 1000 - - 3 - 9 - 3 - - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - - 9 - 40 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 9 - 40 - 3 - - - - 11 - 0 - - 11 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 3 - 0 - - 4 - 1 - - 10 - - 1000 - - 6 - 24 - 3 - - - - 11 - 0 - - 11 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 3 - 0 - - 4 - 1 - - 10 - - 1000 - - 6 - 24 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 3 - 0 - - 3 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 11 - 0 - - 11 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 4 - 0 - - 4 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - - - - - - - - - + - + - 62 - + 462 + - - - + + + + + + 461 + + + + + + + + 460 + + + + + + + + 459 + + + + + + + + 458 + + + + + 7 0 0 1 - 48 + 32 1000 - + 3 9 1 + + + + + 457 + + + + + + + + 505 + + + + + 504 + + + + + 503 + + + + + 502 + + + + + 501 + + + + + 500 + + + + + 499 + + + + + 498 + + + + + 497 + + + + + 496 + + + + + 495 + + + + + 62 + + 8 @@ -1372,320 +1326,25 @@ 9 1 - - - - - 63 - - - - - 100 - - - - - - - - 101 - - - - - 102 - - - - - 103 - - - - - 104 - - - - - 131 - - - - - - - - 132 - - - - - 135 - - - - - 151 - - - - - 152 - - - - - 200 - - - - - 201 - - - - - 212 - - - - - - - - 213 - - - - - 216 - - - - - - - - 217 - - - - - 224 - - - - - 227 - - - - - 230 - - - - - 231 - - - - - 238 - - - - - - - - 239 - - - - - 242 - - - - - - - - 243 - - - - - 249 - - - - - - - - 251 - - - - - 252 - - - - - 253 - - - - - 254 - - - - - 255 - - - - - 256 - - - - - 261 - - - - - - - - 262 - - - - - 265 - - - - - 266 - - - - - 267 - - - - - - - - 268 - - - - - 270 - - - - - 271 - - - - - 286 - - - - - + + 7 0 0 1 - 32 + 48 1000 - + 3 9 1 + - - - - 287 - - - - - 304 - - - - - - - - 305 - - - - - 312 - - - - - 314 - - - - - 315 - - - - - 316 - - - - - 329 - - - - - - - - 330 - - - - - 334 - - - - - 110 - - + 109 @@ -1693,97 +1352,126 @@ - 134 - - + 110 + + - 105 - - + 63 + + - 147 - - + 514 + + - 148 - - + 515 + + - 404 - - - - - 409 - - - - - 412 - - - - - 413 - - - - - 414 - - - - - 415 - - - - - 417 - - - - - 421 - + 100 + - + + + + 7 + 1 + + 0 + 1 + + 130 + + 1000 + + 9 + 40 + 1 + - + - 422 - - + 101 + + - 423 - - + 516 + + - 424 - - + 517 + + - 331 - - + 526 + + - 418 - - + 527 + + - 434 - - + 528 + + + + + 529 + + + + + 530 + + + + + 8 + 0 + + 0 + 1 + + 2 + + 1000 + + 9 + 40 + 1 + + + + + + 540 + + + + + 542 + + + + + 544 + + + + + 547 + + @@ -1791,147 +1479,124 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - - - - - - - + + - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - MPShadowBox - com.apple.InterfaceBuilder.CocoaPlugin - MPShadowBox - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - - + + + + + - - + + - com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin MPPopupImageView @@ -1945,7 +1610,7 @@ - 434 + 548 @@ -1970,8 +1635,6 @@ NSButton NSSecureTextField NSButton - NSSegmentedControl - NSTabView NSTextField NSTextField NSTextField @@ -2001,14 +1664,6 @@ showPasswordCreator NSButton - - tabControl - NSSegmentedControl - - - tabView - NSTabView - titleOrNameLabel NSTextField @@ -2036,11 +1691,11 @@ - MPShadowBox + MPSeparator NSView IBProjectSource - ./Classes/MPShadowBox.h + ./Classes/MPSeparator.h diff --git a/MacPass/MPInspectorTabViewController.h b/MacPass/MPInspectorTabViewController.h index 23cdced7..6dd0d4b5 100644 --- a/MacPass/MPInspectorTabViewController.h +++ b/MacPass/MPInspectorTabViewController.h @@ -14,8 +14,6 @@ @property (assign) IBOutlet MPPopupImageView *itemImageView; @property (assign) IBOutlet NSTextField *itemNameTextfield; -@property (assign) IBOutlet NSTabView *tabView; -@property (assign) IBOutlet NSSegmentedControl *tabControl; @property (assign) IBOutlet NSTextField *titleTextField; @property (assign) IBOutlet NSTextField *usernameTextField; diff --git a/MacPass/MPInspectorTabViewController.m b/MacPass/MPInspectorTabViewController.m index fac03c54..492c9b2f 100644 --- a/MacPass/MPInspectorTabViewController.m +++ b/MacPass/MPInspectorTabViewController.m @@ -20,7 +20,6 @@ BOOL _visible; } -@property (assign) NSUInteger selectedTabIndex; @property (assign, nonatomic) KdbEntry *selectedEntry; @property (assign, nonatomic) KdbGroup *selectedGroup; @property (assign) BOOL showsEntry; @@ -63,12 +62,7 @@ - (void)didLoadView { - for( NSTabViewItem *item in [self.tabView tabViewItems]){ - ((MPShadowBox *)[item view]).shadowDisplay = MPShadowTop; - } [[self.itemImageView cell] setBackgroundStyle:NSBackgroundStyleRaised]; - [self.tabControl bind:NSSelectedIndexBinding toObject:self withKeyPath:@"selectedTabIndex" options:nil]; - [self.tabView bind:NSSelectedIndexBinding toObject:self withKeyPath:@"selectedTabIndex" options:nil]; [self.itemImageView setTarget:self]; /* Register for Entry selection */ diff --git a/MacPass/MPSeparator.h b/MacPass/MPSeparator.h new file mode 100644 index 00000000..d83b17fb --- /dev/null +++ b/MacPass/MPSeparator.h @@ -0,0 +1,16 @@ +// +// 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 new file mode 100644 index 00000000..679bb827 --- /dev/null +++ b/MacPass/MPSeparator.m @@ -0,0 +1,24 @@ +// +// 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/MacPass-Info.plist b/MacPass/MacPass-Info.plist index ef5f00f2..15d87888 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -46,7 +46,7 @@ CFBundleSignature ???? CFBundleVersion - 72F + 74B LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright diff --git a/MacPass/PasswordCreatorView.xib b/MacPass/PasswordCreatorView.xib index af683431..561a8b27 100644 --- a/MacPass/PasswordCreatorView.xib +++ b/MacPass/PasswordCreatorView.xib @@ -54,9 +54,10 @@ 268 - {{18, 155}, {322, 22}} + {{18, 19}, {230, 22}} + _NS:9 YES @@ -95,7 +96,7 @@ 268 - {{18, 185}, {37, 19}} + {{18, 49}, {37, 19}} @@ -125,7 +126,7 @@ 268 - {{63, 185}, {35, 19}} + {{63, 49}, {35, 19}} @@ -151,7 +152,7 @@ 268 - {{106, 185}, {36, 19}} + {{106, 49}, {36, 19}} @@ -177,7 +178,7 @@ 268 - {{150, 185}, {31, 19}} + {{150, 49}, {31, 19}} @@ -203,7 +204,7 @@ 268 - {{189, 185}, {59, 19}} + {{189, 49}, {59, 19}} @@ -226,14 +227,14 @@ NO - {{1, 1}, {358, 214}} + {{1, 1}, {266, 78}} _NS:11 - {{17, 16}, {360, 230}} + {{17, 16}, {268, 94}} @@ -263,7 +264,7 @@ 268 - {{340, 251}, {34, 22}} + {{254, 115}, {28, 22}} @@ -285,7 +286,7 @@ 268 - {{17, 254}, {48, 17}} + {{17, 118}, {48, 17}} @@ -319,7 +320,7 @@ 268 - {{84, 252}, {250, 21}} + {{84, 116}, {164, 21}} @@ -345,7 +346,7 @@ 268 - {{334, 274}, {46, 32}} + {{248, 138}, {40, 32}} @@ -358,7 +359,7 @@ _NS:9 - -2033434624 + -2033303552 129 NSImage @@ -374,7 +375,7 @@ 268 - {{86, 281}, {246, 22}} + {{86, 145}, {160, 22}} @@ -397,7 +398,7 @@ 268 - {{17, 284}, {64, 17}} + {{17, 148}, {64, 17}} @@ -416,7 +417,7 @@ NO - {394, 323} + {302, 187} @@ -756,8 +757,8 @@ 1000 - 8 - 29 + 9 + 40 3 @@ -772,8 +773,8 @@ 1000 - 6 - 24 + 9 + 40 3 @@ -913,16 +914,6 @@ - - 158 - - - - - 162 - - - 163 @@ -931,11 +922,6 @@ - - 169 - - - 165 @@ -990,21 +976,11 @@ - - 188 - - - 189 - - 191 - - - 196 @@ -1030,11 +1006,6 @@ - - 201 - - - 283 @@ -1044,6 +1015,22 @@ 332 + + + 6 + 1 + + 6 + 1 + + 16 + + 1000 + + 9 + 40 + 3 + 3 @@ -1072,8 +1059,8 @@ 1000 - 6 - 24 + 9 + 40 3 @@ -1088,8 +1075,8 @@ 1000 - 6 - 24 + 9 + 40 3 @@ -1120,8 +1107,8 @@ 1000 - 6 - 24 + 9 + 40 3 @@ -1152,8 +1139,8 @@ 1000 - 6 - 24 + 9 + 40 3 @@ -1172,6 +1159,22 @@ 29 3 + + + 4 + 1 + + 4 + 1 + + 16 + + 1000 + + 9 + 40 + 3 + 3 @@ -1184,8 +1187,8 @@ 1000 - 3 - 9 + 9 + 40 3 @@ -1232,8 +1235,8 @@ 1000 - 8 - 29 + 9 + 40 3 @@ -1424,6 +1427,46 @@ + + 201 + + + + + 162 + + + + + 188 + + + + + 169 + + + + + 191 + + + + + 158 + + + + + 491 + + + + + 492 + + + @@ -1495,6 +1538,7 @@ + @@ -1503,6 +1547,7 @@ + com.apple.InterfaceBuilder.CocoaPlugin @@ -1541,12 +1586,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 483 + 492 diff --git a/MacPass/PasswordCreatorWindow.xib b/MacPass/PasswordCreatorWindow.xib index 28a2d725..4849406b 100644 --- a/MacPass/PasswordCreatorWindow.xib +++ b/MacPass/PasswordCreatorWindow.xib @@ -35,7 +35,7 @@ 15 2 - {{196, 240}, {300, 350}} + {{196, 240}, {338, 216}} 544735232 Window NSWindow @@ -44,7 +44,7 @@ 256 - {300, 350} + {338, 216}