From a39dc7ea68be2020db4f9d6bbc0b63f70bb8df3a Mon Sep 17 00:00:00 2001 From: michael starke Date: Sun, 16 Jun 2013 14:13:19 +0200 Subject: [PATCH] Added scrollview to inspector to accommodate bigger conntent --- MacPass.xcodeproj/project.pbxproj | 16 +- MacPass/Base.lproj/GeneralSettings.xib | 735 +++-- MacPass/Base.lproj/InspectorView.xib | 3097 ++++++++++++---------- MacPass/MPGeneralSettingsController.m | 5 - MacPass/MPInspectorViewController.h | 1 + MacPass/MPInspectorViewController.m | 1 + MacPass/MPLockDaemon.h | 17 + MacPass/MPLockDaemon.m | 44 + MacPass/MacPass-Info.plist | 2 +- MacPass/SettingsWindow.xib | 4 +- MacPass/en.lproj/GeneralSettings.strings | 26 +- 11 files changed, 2286 insertions(+), 1662 deletions(-) create mode 100644 MacPass/MPLockDaemon.h create mode 100644 MacPass/MPLockDaemon.m diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 3a03bc97..bc4a7dba 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -100,6 +100,7 @@ 4C77E37D15B84A240093A587 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E37B15B84A240093A587 /* MainMenu.xib */; }; 4C79DF2A176685870083708F /* HNHRoundedTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C79DF29176685870083708F /* HNHRoundedTextField.m */; }; 4C7E832A172DE2F2002493D8 /* MPPasswordEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7E8329172DE2F2002493D8 /* MPPasswordEditViewController.m */; }; + 4C80BB6F176DE06F00E5E248 /* HNHFlippedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C80BB6E176DE06F00E5E248 /* HNHFlippedView.m */; }; 4C811C8316ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C811C8216ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m */; }; 4C83814215BF4677001AE468 /* MPDocumentWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C83814115BF4677001AE468 /* MPDocumentWindowController.m */; }; 4C888C9016EB6C91003D34A1 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C888C8E16EB6C91003D34A1 /* Localizable.strings */; }; @@ -111,6 +112,7 @@ 4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */; }; 4CA0B2F915BCAF6700654E32 /* MPGeneralSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2F815BCAF6700654E32 /* MPGeneralSettingsController.m */; }; 4CA0B2FC15BCAF8600654E32 /* MPSettingsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2FB15BCAF8600654E32 /* MPSettingsWindowController.m */; }; + 4CA2335A176DBFE100F0B6AC /* MPLockDaemon.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */; }; 4CAD747B15B887FD00104512 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; 4CAD747C15B887FD00104512 /* NSString+DDXML.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745A15B887FD00104512 /* NSString+DDXML.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; 4CAD747D15B887FD00104512 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745D15B887FD00104512 /* DDXMLDocument.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; @@ -292,7 +294,6 @@ 4C69A73916D589DF00EC1B1A /* HNHGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHGradientView.m; sourceTree = ""; }; 4C76155F1764C0590015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/GeneralSettings.xib; sourceTree = ""; }; 4C7615601764C05A0015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; - 4C7615621764C0770015A1A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/GeneralSettings.strings; sourceTree = ""; }; 4C7615661764C08F0015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PasswordEditView.xib; sourceTree = ""; }; 4C7615671764C09E0015A1A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PasswordEditView.strings; sourceTree = ""; }; 4C76156B1764C0C80015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PasswordInputView.xib; sourceTree = ""; }; @@ -328,6 +329,8 @@ 4C79DF2F1766941D0083708F /* MPResponderQuery.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPResponderQuery.h; sourceTree = ""; }; 4C7E8328172DE2F2002493D8 /* MPPasswordEditViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordEditViewController.h; sourceTree = ""; }; 4C7E8329172DE2F2002493D8 /* MPPasswordEditViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordEditViewController.m; sourceTree = ""; }; + 4C80BB6D176DE06F00E5E248 /* HNHFlippedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHFlippedView.h; sourceTree = ""; }; + 4C80BB6E176DE06F00E5E248 /* HNHFlippedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHFlippedView.m; sourceTree = ""; }; 4C811C8116ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPKeyfilePathControlDelegate.h; sourceTree = ""; }; 4C811C8216ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPKeyfilePathControlDelegate.m; sourceTree = ""; }; 4C83814015BF4677001AE468 /* MPDocumentWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDocumentWindowController.h; sourceTree = ""; }; @@ -348,6 +351,9 @@ 4CA0B2FA15BCAF8600654E32 /* MPSettingsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSettingsWindowController.h; sourceTree = ""; }; 4CA0B2FB15BCAF8600654E32 /* MPSettingsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSettingsWindowController.m; sourceTree = ""; }; 4CA0B30D15BCB6FD00654E32 /* MPSettingsTab.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPSettingsTab.h; sourceTree = ""; }; + 4CA23357176DB8F000F0B6AC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/GeneralSettings.strings; sourceTree = ""; }; + 4CA23358176DBFE100F0B6AC /* MPLockDaemon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLockDaemon.h; sourceTree = ""; }; + 4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLockDaemon.m; sourceTree = ""; }; 4CAD745615B887FD00104512 /* DDXMLElementAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLElementAdditions.h; sourceTree = ""; }; 4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDXMLElementAdditions.m; sourceTree = ""; }; 4CAD745915B887FD00104512 /* NSString+DDXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+DDXML.h"; sourceTree = ""; }; @@ -473,6 +479,8 @@ 4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */, 4C569D9C17652AC800595B62 /* MPConstants.h */, 4C569D9D17652B0600595B62 /* MPConstants.m */, + 4CA23358176DBFE100F0B6AC /* MPLockDaemon.h */, + 4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */, ); name = Helper; sourceTree = ""; @@ -837,6 +845,8 @@ 4C37A6721769393300AD0A40 /* HNHTableHeaderCell.m */, 4C099931176D4EA600C885CB /* HNHScrollView.h */, 4C099932176D4EA600C885CB /* HNHScrollView.m */, + 4C80BB6D176DE06F00E5E248 /* HNHFlippedView.h */, + 4C80BB6E176DE06F00E5E248 /* HNHFlippedView.m */, ); path = HNHUi; sourceTree = ""; @@ -1094,6 +1104,8 @@ 4C37A6731769393300AD0A40 /* HNHTableHeaderCell.m in Sources */, 4C099930176D4C5C00C885CB /* MPTableCellView.m in Sources */, 4C099933176D4EA600C885CB /* HNHScrollView.m in Sources */, + 4CA2335A176DBFE100F0B6AC /* MPLockDaemon.m in Sources */, + 4C80BB6F176DE06F00E5E248 /* HNHFlippedView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1104,8 +1116,8 @@ isa = PBXVariantGroup; children = ( 4C76155F1764C0590015A1A6 /* Base */, - 4C7615621764C0770015A1A6 /* en */, 4C7615721764C4A40015A1A6 /* de */, + 4CA23357176DB8F000F0B6AC /* en */, ); name = GeneralSettings.xib; sourceTree = ""; diff --git a/MacPass/Base.lproj/GeneralSettings.xib b/MacPass/Base.lproj/GeneralSettings.xib index b0fa1bbc..8fc4ebde 100644 --- a/MacPass/Base.lproj/GeneralSettings.xib +++ b/MacPass/Base.lproj/GeneralSettings.xib @@ -48,7 +48,7 @@ 268 - {{18, 120}, {233, 18}} + {{18, 174}, {233, 18}} @@ -85,7 +85,7 @@ 268 - {{18, 140}, {226, 18}} + {{18, 194}, {226, 18}} @@ -121,7 +121,7 @@ 268 - {{15, 42}, {124, 17}} + {{15, 96}, {170, 17}} @@ -158,7 +158,7 @@ 268 - {{191, 36}, {112, 26}} + {{237, 92}, {112, 23}} @@ -176,28 +176,28 @@ 400 75 - - - Never - - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - + YES - OtherViews + ClipboardClearInterval - + + + Never + + 2147483647 + 1 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + _popUpItemAction: + + 10 Seconds @@ -248,9 +248,10 @@ 268 - {{16, 12}, {172, 18}} + {{16, 70}, {172, 18}} + _NS:9 {250, 251} YES @@ -272,25 +273,151 @@ NO + + + 268 + {{237, 32}, {112, 26}} + + + + _NS:9 + YES + + -1539309504 + 2048 + + _NS:9 + + 109199360 + 129 + + + 400 + 75 + + YES + + LockTimes + + + + 1 Minute + + 1048576 + 2147483647 + + + _popUpItemAction: + 60 + + + + + 5 Minutes + + 1048576 + 2147483647 + + + _popUpItemAction: + 300 + + + + + 15 Minutes + + 2147483647 + + + _popUpItemAction: + 900 + + + + + + -1 + 1 + YES + YES + 2 + + NO + + + + 268 + {{16, 36}, {138, 18}} + + + + _NS:9 + YES + + -1543503872 + 268435456 + Lock while idle for + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + + 268 + {{16, 12}, {122, 18}} + + + _NS:9 + YES + + -1543503872 + 268435456 + Lock after sleep + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + - {{1, 1}, {318, 70}} + {{1, 1}, {364, 124}} _NS:11 - {{17, 16}, {320, 86}} + {{17, 16}, {366, 140}} _NS:9 {250, 251} + {750, 750} {0, 0} 67108864 0 - Clipboard + Security LucidaGrande 11 @@ -317,7 +444,7 @@ NO - {354, 176} + {400, 230} @@ -381,6 +508,22 @@ 1 + + + 4 + 1 + + 4 + 1 + + 20 + + 1000 + + 9 + 40 + 3 + 3 @@ -413,38 +556,6 @@ 40 3 - - - 4 - 0 - - 4 - 1 - - 20 - - 1000 - - 9 - 40 - 3 - - - - 4 - 1 - - 4 - 1 - - 20 - - 1000 - - 9 - 40 - 3 - 5 @@ -535,6 +646,70 @@ 465 + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + 5 @@ -567,43 +742,11 @@ 40 3 - - - 3 - 0 - - 3 - 1 - - 25 - - 1000 - - 8 - 29 - 3 - - - - 6 - 1 - - 6 - 1 - - 10 - - 1000 - - 9 - 40 - 3 - - + 4 - 0 - + 1 + 4 1 @@ -615,7 +758,87 @@ 40 3 + + + 3 + 0 + + 4 + 1 + + 10 + + 1000 + + 9 + 40 + 3 + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 20 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 10 + + 1000 + + 9 + 40 + 3 + + 5 0 @@ -631,23 +854,7 @@ 29 3 - - - 3 - 0 - - 4 - 1 - - 14 - - 1000 - - 9 - 40 - 3 - - + 3 0 @@ -659,10 +866,26 @@ 1000 - 9 - 40 + 3 + 9 3 + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + 5 @@ -679,9 +902,12 @@ 40 3 - + + + + @@ -707,6 +933,7 @@ 419 + 7 @@ -723,15 +950,9 @@ 9 1 - - - 458 - - - 420 @@ -776,6 +997,22 @@ + + + 8 + 0 + + 0 + 1 + + 14 + + 1000 + + 9 + 40 + 1 + @@ -784,61 +1021,21 @@ - - 487 - - - - - 489 - - - - - 494 - - - 499 - - 501 - - - - - 508 - - - 506 - - 505 - - - 509 - - 523 - - - - - 525 - - - 526 @@ -885,16 +1082,163 @@ + + 584 + + + + + + + + 585 + + + + + + + + 586 + + + + + + + + + + 588 + + + + + 589 + + + + + 603 + + + + + 605 + + + + + + + + 606 + + + + + 627 + + + + + 660 + + + + + 664 + + + 537 - 559 - + 630 + + + + + + 631 + + + + + 706 + + + + + 708 + + + + + 718 + + + + + 721 + + + + + 759 + + + + + 765 + + + + + 769 + + + + + 771 + + + + + 773 + + + + + 788 + + + + + 784 + + + + + 789 + + + + + 792 + + + + + 525 + + + @@ -907,10 +1251,9 @@ - - + @@ -929,34 +1272,36 @@ 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 @@ -969,13 +1314,41 @@ 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 - 559 + 797 diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib index 249851e7..987f9661 100644 --- a/MacPass/Base.lproj/InspectorView.xib +++ b/MacPass/Base.lproj/InspectorView.xib @@ -48,196 +48,6 @@ 256 - - - 268 - {{48, 334}, {35, 14}} - - - - _NS:1535 - YES - - 68157504 - 272761856 - Name - - LucidaGrande - 11 - 3100 - - _NS:1535 - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - disabledControlTextColor - - 3 - MC4zMzMzMzMzMzMzAA - - - - NO - - - - 268 - {{88, 330}, {164, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - LucidaGrande - 13 - 1044 - - _NS:9 - - YES - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - textColor - - 3 - MAA - - - - NO - - - - 268 - {{17, 302}, {66, 14}} - - - - _NS:1535 - YES - - 68157504 - 272761856 - Username - - _NS:1535 - - - - - NO - - - - 268 - {{88, 298}, {164, 22}} - - - - _NS:9 - YES - - -1804599231 - 272631040 - - - _NS:9 - - YES - - - - NO - - - - 268 - {{88, 266}, {164, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - NO - - - - 268 - {{58, 270}, {25, 14}} - - - - _NS:1535 - YES - - 68157504 - 272761856 - URL - - _NS:1535 - - - - - NO - - - - 268 - {{28, 216}, {55, 14}} - - - - _NS:1535 - YES - - 68157504 - 272761856 - Password - - _NS:1535 - - - - - NO - 268 @@ -249,7 +59,7 @@ NeXT Encapsulated PostScript v1.2 pasteboard type NeXT TIFF v4.0 pasteboard type - {{20, 381}, {48, 48}} + {{20, 328}, {48, 48}} @@ -274,7 +84,7 @@ 268 - {{73, 397}, {182, 17}} + {{73, 344}, {179, 17}} @@ -285,15 +95,30 @@ 67108928 272631808 Name - + + LucidaGrande + 13 + 1044 + _NS:1535 - + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + 6 System controlTextColor - + + 3 + MAA + NO @@ -301,267 +126,513 @@ 268 - {{20, 371}, {232, 2}} + {{0, 318}, {269, 2}} - + _NS:9 HNHSeparator - - - 268 - {{88, 212}, {164, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - NO - 268 - {272, 30} + {269, 30} _NS:9 HNHGradientView - - - 268 - {{88, 185}, {164, 19}} - - - - _NS:9 - {250, 750} - YES - - -2080374784 - 134217728 - Generate - - LucidaGrande - 12 - 16 - - _NS:9 - - -2038153216 - 164 - - - 400 - 75 - - NO - - + 268 - - + + 2304 - - - 256 - - {232, 100} - - - - _NS:13 - YES - NO - YES - - - -2147483392 - {{224, 0}, {16, 17}} - - _NS:19 - - - - 229 - 40 - 1000 - - 75497536 - 2048 - - - - 3 - MC4zMzMzMzI5ODU2AA + + + 274 + + + + 268 + + + + 2304 + + + + 256 + + {225, 38} + + + + _NS:13 + YES + NO + YES + + + -2147483392 + {{224, 0}, {16, 17}} + + _NS:19 + + + + 222 + 40 + 1000 + + 75497536 + 2048 + + + LucidaGrande + 11 + 3100 + + + 3 + MC4zMzMzMzI5ODU2AA + + + 6 + System + headerTextColor + + + + + 337641536 + 2048 + Text Cell + + + + 6 + System + controlBackgroundColor + + + + + 3 + YES + YES + + + + 3 + 2 + + + 6 + System + gridColor + + 3 + MC41AA + + + 17 + 373293056 + + + 4 + 15 + 0 + YES + 1 + 1 + + + {225, 38} + + + + _NS:11 + + + 2 - + + + -2147483392 + {{224, 17}, {15, 102}} + + + + _NS:58 + NO + + _doScroller: + 0.9925373134328358 + + + + -2147483392 + {{0, 124}, {0, 16}} + + + + _NS:60 + NO + 1 + + _doScroller: + 0.069767441860465115 + + + {{24, 26}, {225, 38}} + + + + _NS:9 + 133680 + + + + QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 + + + + 268 + {{17, 250}, {35, 14}} + + + + _NS:1535 + YES + + 68157504 + 272761856 + Name + + _NS:1535 + + + 6 System - headerTextColor + disabledControlTextColor + + 3 + MC4zMzMzMzMzMzMzAA + + + + NO + + + + 268 + {{80, 246}, {169, 22}} + + + + _NS:9 + YES + + -1804599231 + 272630784 + + + _NS:9 + + YES + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + textColor - - 337641536 - 2048 - Text Cell - - - - 6 - System - controlBackgroundColor - - - + NO + + + + 268 + {{17, 218}, {58, 14}} + + + + _NS:1535 + YES + + 68157504 + 272761856 + Username + + _NS:1535 + + + - 3 - YES - YES - + NO + + + + 268 + {{80, 214}, {169, 22}} + + + + _NS:9 + YES + + -1804599231 + 272631040 + + + _NS:9 + + YES + + + + NO + + + + 268 + {{80, 182}, {169, 22}} + + + + _NS:9 + YES + + -1804599231 + 272630784 + + + _NS:9 + + YES + + + + NO + + + + 268 + {{17, 186}, {25, 14}} + + + + _NS:1535 + YES + + 68157504 + 272761856 + URL + + _NS:1535 + + + + + NO + + + + 268 + {{17, 132}, {58, 14}} + + + + _NS:1535 + YES + + 68157504 + 272761856 + Password + + _NS:1535 + + + + + NO + + + + 268 + {{80, 128}, {169, 22}} + + + + _NS:9 + YES + + -1804599231 + 272630784 + + + _NS:9 + + YES + + + + NO + + + + 268 + {{80, 101}, {169, 19}} + + + + _NS:9 + {250, 750} + YES + + -2080374784 + 134217728 + Generate + + LucidaGrande + 12 + 16 + + _NS:9 + + -2038153216 + 164 + + + 400 + 75 + + NO + + + + 268 + {{17, 72}, {72, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Attachments + + _NS:1535 + + + + + NO + + + + 268 + {{187, 70}, {62, 19}} + + + + _NS:9 + YES + + -2080374784 + 134217728 + Add File + + _NS:9 + + -2038153216 + 164 + + + 400 + 75 + + NO - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 373293056 - - - 4 - 15 - 0 - YES - 1 - 1 + {269, 288} + + + + _NS:13 - {232, 100} - + {269, 288} + - + _NS:11 - - - 2 + + + 4 - - - -2147483392 - {{224, 17}, {15, 102}} - - - - _NS:58 - NO - - _doScroller: - 0.9925373134328358 - - - - -2147483392 - {{1, 119}, {223, 15}} - + + + 256 + {{253, 0}, {16, 288}} + - _NS:60 + _NS:15 + NO + + _doScroller: + 1 + 0.99290780141843971 + + + + 256 + {{0, 272}, {269, 16}} + + + + _NS:26 NO 1 - + _doScroller: - 0.99581589958159 + 0.50602412223815918 - {{20, 48}, {232, 100}} + {{0, 30}, {269, 288}} - + _NS:9 - 133680 - - - - QSAAAEEgAABBmAAAQZgAAA + 133168 + + + 0.25 4 1 - - - 268 - {{17, 156}, {72, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Attachments - - _NS:1535 - - - - - NO - - - - 268 - {{190, 155}, {62, 19}} - - - - _NS:9 - YES - - -2080374784 - 134217728 - Add File - - _NS:9 - - -2038153216 - 164 - - - 400 - 75 - - NO - - {272, 449} + {269, 396} @@ -586,6 +657,30 @@ 112 + + + view + + + + 525 + + + + bottomBar + + + + 711 + + + + attachmentTableView + + + + 893 + titleOrNameLabel @@ -602,14 +697,6 @@ 522 - - - URLTextField - - - - 523 - usernameTextField @@ -620,11 +707,11 @@ - view + URLTextField - + - 525 + 523 @@ -642,14 +729,6 @@ 710 - - - bottomBar - - - - 711 - generatePasswordButton @@ -660,11 +739,11 @@ - attachmentTableView + scrollContentView - + - 893 + 993 @@ -708,7 +787,7 @@ 266 - {{25, 0}, {204, 17}} + {{25, 0}, {197, 17}} _NS:20 @@ -727,7 +806,7 @@ NO - {{1, 1}, {229, 17}} + {{1, 1}, {222, 17}} _NS:9 @@ -774,22 +853,6 @@ 455 - - - 3 - 1 - - 4 - 1 - - 8 - - 1000 - - 9 - 40 - 3 - 6 @@ -838,502 +901,6 @@ 29 3 - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 3 - 0 - - 3 - 1 - - 301 - - 1000 - - 3 - 9 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 4 - 1 - - 4 - 1 - - 48 - - 1000 - - 9 - 40 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 9 - 40 - 3 - - - - 3 - 0 - - 3 - 1 - - 215 - - 1000 - - 3 - 9 - 3 - - - - 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 - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 5 - 0 - - 5 - 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 - - - - 3 - 0 - - 4 - 1 - - 10 - - 1000 - - 9 - 40 - 3 - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 6 - 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 - - 9 - 40 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 3 - 0 - - 3 - 1 - - 97 - - 1000 - - 9 - 40 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - 6 @@ -1382,6 +949,70 @@ 40 3 + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 9 + 40 + 3 + + + + 4 + 0 + + 4 + 1 + + 30 + + 1000 + + 9 + 40 + 3 + 6 @@ -1389,8 +1020,8 @@ 6 1 - - 20 + + 0.0 1000 @@ -1405,8 +1036,8 @@ 5 1 - - 20 + + 0.0 1000 @@ -1458,26 +1089,15 @@ 1000 - 8 - 29 + 9 + 40 3 - - - - - - - - - - - - + @@ -1536,11 +1156,6 @@ - - 109 - - - 530 @@ -1584,206 +1199,6 @@ - - 461 - - - - - - - - 500 - - - - - 463 - - - - - - 7 - 0 - - 0 - 1 - - 60 - - 1000 - - 3 - 9 - 1 - - - - - - 498 - - - - - 466 - - - - - - - - 495 - - - - - 465 - - - - - - - - 556 - - - - - 526 - - - - - 471 - - - - - 558 - - - - - 496 - - - - - 464 - - - - - - - - 475 - - - - - 474 - - - - - 473 - - - - - 472 - - - - - 557 - - - - - 497 - - - - - 462 - - - - - - - - 652 - - - - - 631 - - - - - 479 - - - - - 477 - - - - - 559 - - - - - 499 - - - - - 635 - - - - - - - - 646 - - - - - 636 - - - - - 459 - - - - - - - - 640 - - - - - 502 - - - 100 @@ -1856,61 +1271,558 @@ - 703 - + 874 + + + + + 897 + - + + + - 704 - - + 898 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 24 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 3 + 1 + + 199 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 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 + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 138 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 10 + + 1000 + + 6 + 24 + 3 + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 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 + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 10 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + + + + + + + + + + + + - 705 - - + 899 + + - 706 - - + 900 + + - 707 - - - - - 725 - - - - - 726 - - - - - 732 - - - - - 565 - + 906 + 806 - - - + + + 8 0 @@ -1918,7 +1830,7 @@ 0 1 - 100 + 38 1000 @@ -1927,7 +1839,17 @@ 1 - + + + + 810 + + + + + 808 + + 807 @@ -1937,58 +1859,25 @@ - - 808 - - - - - 810 - - - 811 - + - - 814 - - - 833 - - - - - 10 + + + 5 0 - 10 - 1 - - 0.0 - - 1000 - - 5 - 22 - 2 - - - - 6 - 0 - - 6 + 5 1 3 @@ -1999,22 +1888,6 @@ 29 3 - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - 3 @@ -2031,12 +1904,28 @@ 24 2 - - + + 5 0 - - 5 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 1 3 @@ -2047,72 +1936,37 @@ 29 3 + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + + + - 834 - - - - - - 8 - 0 - - 0 - 1 - - 17 - - 1000 - - 3 - 9 - 1 - - - - 7 - 0 - - 0 - 1 - - 17 - - 1000 - - 3 - 9 - 1 - - + 814 + + + + + 846 + - - 835 - - - - - - - - 836 - - - - - 837 - - - - - 840 - - - 841 @@ -2129,35 +1983,199 @@ - 846 - + 895 + - 848 - - + 835 + + + + + - 849 - - + 834 + + + + + 7 + 0 + + 0 + 1 + + 17 + + 1000 + + 3 + 9 + 1 + + + + 8 + 0 + + 0 + 1 + + 17 + + 1000 + + 3 + 9 + 1 + + + + - 851 - - + 840 + + - 639 - - + 894 + + + + + 837 + + + + + 836 + + + + + 466 + + + + + + + + 495 + + + + + 465 + + + + + + + + 496 + + + + + 463 + + + + + + + + 498 + + + + + 464 + + + + + + + + 497 + + + + + 462 + + + + + + + + 499 + + + + + 461 + + + + + + + + 500 + + + + + 459 + + + + + + + + 502 + + + + + 635 + + + + + + + + 636 + + + + + 703 + + + + + + + + 704 + + 860 - 8 @@ -2174,56 +2192,22 @@ 9 1 + - + 861 - - 864 - - - - - 868 - - - - - 874 - - - - - 875 - - - - - 873 - - - - - 886 - - - - - 850 - - - 889 - + 890 @@ -2231,24 +2215,189 @@ - 891 - + 941 + + + + + 942 + + + + + 943 + + + + + 946 + + + + + 952 + + + + + 954 + + + + + 963 + + + + + 964 + + + + + 965 + + + + + 970 + - 892 + 971 + + + + + 973 + + + + + 974 + + + + + 975 + + + + + 977 + + + + + 978 + + + + + 980 + + + + + 981 + + + + + 983 + + + + + 984 + + + + + 986 + + + + + 988 + + + + + 990 + + + + 1011 + + + + + 1015 + + + + + 109 + + + + + 1021 + + + + + 864 + + + + + 1005 + + + + + 1013 + + + + + 1003 + + + + + 1016 + + + + + 1002 + + + + + 1010 + + + + + 1008 + + + + + 1050 + - 894 - - - - - 895 - - + 1051 + + @@ -2258,52 +2407,36 @@ 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 - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2314,9 +2447,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin HNHRoundedTextField @@ -2326,13 +2456,6 @@ 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 HNHRoundedTextFieldCell com.apple.InterfaceBuilder.CocoaPlugin @@ -2345,7 +2468,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin @@ -2355,11 +2477,6 @@ 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 @@ -2368,18 +2485,13 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin HNHRoundedSecureTextFieldCell 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 @@ -2392,15 +2504,8 @@ 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 - HNHScrollView - + com.apple.InterfaceBuilder.CocoaPlugin @@ -2438,10 +2543,6 @@ 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 @@ -2449,27 +2550,92 @@ 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 + HNHFlippedView + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 - 895 + 1054 + + HNHFlippedView + NSView + + IBProjectSource + ./Classes/HNHFlippedView.h + + HNHGradientView NSView @@ -2502,14 +2668,6 @@ ./Classes/HNHRoundedTextFieldCell.h - - HNHScrollView - NSScrollView - - IBProjectSource - ./Classes/HNHScrollView.h - - HNHSeparator NSView @@ -2531,6 +2689,7 @@ NSTextField NSTextField NSTextField + NSView NSTextField NSTextField NSTextField @@ -2572,6 +2731,10 @@ passwordTextField NSTextField + + scrollContentView + NSView + titleOrNameLabel NSTextField diff --git a/MacPass/MPGeneralSettingsController.m b/MacPass/MPGeneralSettingsController.m index 88fbb072..86b2a11a 100644 --- a/MacPass/MPGeneralSettingsController.m +++ b/MacPass/MPGeneralSettingsController.m @@ -21,11 +21,6 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab"; return [self initWithNibName:@"GeneralSettings" bundle:[NSBundle mainBundle]]; } -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; - return self; -} - - (NSImage *)image { return [NSImage imageNamed:NSImageNamePreferencesGeneral]; } diff --git a/MacPass/MPInspectorViewController.h b/MacPass/MPInspectorViewController.h index aa875d9e..eac266e4 100644 --- a/MacPass/MPInspectorViewController.h +++ b/MacPass/MPInspectorViewController.h @@ -28,6 +28,7 @@ @property (assign) IBOutlet HNHGradientView *bottomBar; @property (assign) IBOutlet NSTextField *infoTextField; @property (assign) IBOutlet NSTableView *attachmentTableView; +@property (assign) IBOutlet NSView *scrollContentView; - (void)closeActivePopup:(id)sender; /* Seperate call to ensure alle registered objects are in place */ diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m index 752d696a..179e9e35 100644 --- a/MacPass/MPInspectorViewController.m +++ b/MacPass/MPInspectorViewController.m @@ -64,6 +64,7 @@ } - (void)didLoadView { + [self.scrollContentView setAutoresizingMask:NSViewWidthSizable]; [[self.itemImageView cell] setBackgroundStyle:NSBackgroundStyleRaised]; [self.itemImageView setTarget:self]; [_bottomBar setBorderType:HNHBorderTop]; diff --git a/MacPass/MPLockDaemon.h b/MacPass/MPLockDaemon.h new file mode 100644 index 00000000..73278058 --- /dev/null +++ b/MacPass/MPLockDaemon.h @@ -0,0 +1,17 @@ +// +// MPLockDaemon.h +// MacPass +// +// Created by Michael Starke on 16.06.13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import + +APPKIT_EXTERN NSString *const MPShouldLockDatabaseNotification; + +@interface MPLockDaemon : NSObject + ++ (MPLockDaemon *)sharedInstance; + +@end diff --git a/MacPass/MPLockDaemon.m b/MacPass/MPLockDaemon.m new file mode 100644 index 00000000..f8d3cb71 --- /dev/null +++ b/MacPass/MPLockDaemon.m @@ -0,0 +1,44 @@ +// +// MPLockDaemon.m +// MacPass +// +// Created by Michael Starke on 16.06.13. +// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved. +// + +#import "MPLockDaemon.h" + +NSString *const MPShouldLockDatabaseNotification = @"com.hicknhack.macpass.MPShouldLockDatabaseNotification"; + +@implementation MPLockDaemon + ++ (MPLockDaemon *)sharedInstance { + static id sharedInstance; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + sharedInstance = [[MPLockDaemon alloc] init]; + }); + return sharedInstance; +} + +- (id)init { + self = [super init]; + if (self) { + NSNotificationCenter *notificationCenter = [[NSWorkspace sharedWorkspace] notificationCenter]; + [notificationCenter addObserver:self selector:@selector(_willSleepNotification:) name:NSWorkspaceWillSleepNotification object:nil]; + } + return self; +} + +- (void)dealloc +{ + [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self]; + [super dealloc]; +} + + +- (void)_willSleepNotification:(NSNotification *)notification { + [[NSNotificationCenter defaultCenter] postNotificationName:MPShouldLockDatabaseNotification object:self]; +} + +@end diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index 66b17264..3af6422c 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -48,7 +48,7 @@ CFBundleSignature ???? CFBundleVersion - 339 + 368 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright diff --git a/MacPass/SettingsWindow.xib b/MacPass/SettingsWindow.xib index 1f971867..b2439256 100644 --- a/MacPass/SettingsWindow.xib +++ b/MacPass/SettingsWindow.xib @@ -35,7 +35,7 @@ 7 2 - {{196, 240}, {371, 164}} + {{196, 240}, {400, 200}} 544735232 Window NSWindow @@ -45,7 +45,7 @@ 256 - {371, 164} + {400, 200} diff --git a/MacPass/en.lproj/GeneralSettings.strings b/MacPass/en.lproj/GeneralSettings.strings index 6bb2c3d7..81a48946 100644 --- a/MacPass/en.lproj/GeneralSettings.strings +++ b/MacPass/en.lproj/GeneralSettings.strings @@ -1,6 +1,6 @@ -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "421"; */ -"421.title" = "OtherViews"; +/* Class = "NSMenu"; title = "ClipboardClearInterval"; ObjectID = "421"; */ +"421.title" = "ClipboardClearInterval"; /* Class = "NSMenuItem"; title = "10 Seconds"; ObjectID = "422"; */ "422.title" = "10 Seconds"; @@ -20,11 +20,29 @@ /* Class = "NSButtonCell"; title = "Clear Clipboard on Quit"; ObjectID = "448"; */ "448.title" = "Clear Clipboard on Quit"; -/* Class = "NSBox"; title = "Clipboard"; ObjectID = "465"; */ -"465.title" = "Clipboard"; +/* Class = "NSBox"; title = "Security"; ObjectID = "465"; */ +"465.title" = "Security"; /* Class = "NSButtonCell"; title = "Open empty database on launch"; ObjectID = "527"; */ "527.title" = "Open empty database on launch"; /* Class = "NSButtonCell"; title = "Open empty database on activate"; ObjectID = "531"; */ "531.title" = "Open empty database on activate"; + +/* Class = "NSMenu"; title = "LockTimes"; ObjectID = "586"; */ +"586.title" = "LockTimes"; + +/* Class = "NSMenuItem"; title = "1 Minute"; ObjectID = "588"; */ +"588.title" = "1 Minute"; + +/* Class = "NSMenuItem"; title = "5 Minutes"; ObjectID = "589"; */ +"589.title" = "5 Minutes"; + +/* Class = "NSMenuItem"; title = "15 Minutes"; ObjectID = "603"; */ +"603.title" = "15 Minutes"; + +/* Class = "NSButtonCell"; title = "Lock while idle for"; ObjectID = "606"; */ +"606.title" = "Lock while idle for"; + +/* Class = "NSButtonCell"; title = "Lock after sleep"; ObjectID = "631"; */ +"631.title" = "Lock after sleep";