From 6c8f0dcfa01d23288e29565a744df742ceb4926d Mon Sep 17 00:00:00 2001 From: michael starke Date: Fri, 28 Jun 2013 10:57:45 +0200 Subject: [PATCH] Used new HNHScrollView --- HNHUi | 2 +- MacPass.xcodeproj/project.pbxproj | 12 +-- MacPass/Base.lproj/InspectorView.xib | 117 ++++++++++++++------------- MacPass/MacPass-Info.plist | 2 +- 4 files changed, 70 insertions(+), 63 deletions(-) diff --git a/HNHUi b/HNHUi index fc7bbd20..87d76f44 160000 --- a/HNHUi +++ b/HNHUi @@ -1 +1 @@ -Subproject commit fc7bbd20cc28ce383bffe7e918ca75f06be242ff +Subproject commit 87d76f4481e971e7f75f7e7072c77f06461d9c48 diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 487587bf..b2424e0b 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -10,7 +10,6 @@ 4C01C23F1764D2980016D5D0 /* KdbEntry+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C23E1764D2980016D5D0 /* KdbEntry+Undo.m */; }; 4C01C2421764D8980016D5D0 /* MPContextMenuHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */; }; 4C01C245176500C40016D5D0 /* HNHLevelIndicatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C244176500C40016D5D0 /* HNHLevelIndicatorCell.m */; }; - 4C099933176D4EA600C885CB /* HNHScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C099932176D4EA600C885CB /* HNHScrollView.m */; }; 4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */; }; 4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C22040C1746ED160054C916 /* KdbGroup+Undo.m */; }; 4C245B76176E1E3D0086100E /* DDData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A6A176E1E3C0086100E /* DDData.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; @@ -67,6 +66,7 @@ 4C4A101217629DA900BBF2CA /* KdbGroup+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A101117629DA900BBF2CA /* KdbGroup+KVOAdditions.m */; }; 4C4FCE15177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4FCE14177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m */; }; 4C4FCE18177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4FCE17177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.m */; }; + 4C52A244177D7B9F0000D88F /* HNHScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C52A243177D7B9F0000D88F /* HNHScrollView.m */; }; 4C569D9E17652B0600595B62 /* MPConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569D9D17652B0600595B62 /* MPConstants.m */; }; 4C569DA117652BFE00595B62 /* MPEntryTableDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569DA017652BFE00595B62 /* MPEntryTableDataSource.m */; }; 4C569DA417653F3500595B62 /* KdbEntry+MPTreeTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569DA317653F3500595B62 /* KdbEntry+MPTreeTools.m */; }; @@ -192,8 +192,6 @@ 4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPContextMenuHelper.m; sourceTree = ""; }; 4C01C243176500C40016D5D0 /* HNHLevelIndicatorCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHLevelIndicatorCell.h; sourceTree = ""; }; 4C01C244176500C40016D5D0 /* HNHLevelIndicatorCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHLevelIndicatorCell.m; sourceTree = ""; }; - 4C099931176D4EA600C885CB /* HNHScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHScrollView.h; sourceTree = ""; }; - 4C099932176D4EA600C885CB /* HNHScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHScrollView.m; sourceTree = ""; }; 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordCreatorWindow.xib; sourceTree = ""; }; 4C22040B1746ED160054C916 /* KdbGroup+Undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+Undo.h"; sourceTree = ""; }; 4C22040C1746ED160054C916 /* KdbGroup+Undo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbGroup+Undo.m"; sourceTree = ""; }; @@ -301,6 +299,8 @@ 4C4FCE14177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPCustomFieldTableCellView.m; sourceTree = ""; }; 4C4FCE16177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Kdb4Entry+KVOAdditions.h"; sourceTree = ""; }; 4C4FCE17177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Kdb4Entry+KVOAdditions.m"; sourceTree = ""; }; + 4C52A242177D7B9F0000D88F /* HNHScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHScrollView.h; sourceTree = ""; }; + 4C52A243177D7B9F0000D88F /* HNHScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHScrollView.m; sourceTree = ""; }; 4C569D9C17652AC800595B62 /* MPConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPConstants.h; sourceTree = ""; }; 4C569D9D17652B0600595B62 /* MPConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPConstants.m; sourceTree = ""; }; 4C569D9F17652BFE00595B62 /* MPEntryTableDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEntryTableDataSource.h; sourceTree = ""; }; @@ -1132,12 +1132,12 @@ 4C01C244176500C40016D5D0 /* HNHLevelIndicatorCell.m */, 4C37A6711769393300AD0A40 /* HNHTableHeaderCell.h */, 4C37A6721769393300AD0A40 /* HNHTableHeaderCell.m */, - 4C099931176D4EA600C885CB /* HNHScrollView.h */, - 4C099932176D4EA600C885CB /* HNHScrollView.m */, 4C80BB6D176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.h */, 4C80BB6E176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m */, 4CF78058176E6D5F0032EE71 /* HNHTableRowView.h */, 4CF78059176E6D5F0032EE71 /* HNHTableRowView.m */, + 4C52A242177D7B9F0000D88F /* HNHScrollView.h */, + 4C52A243177D7B9F0000D88F /* HNHScrollView.m */, ); path = HNHUi; sourceTree = ""; @@ -1410,7 +1410,6 @@ 4C79DF2A176685870083708F /* HNHRoundedTextField.m in Sources */, 4C46E09E17673A0A00DA62E8 /* HNHShadowBox.m in Sources */, 4C37A6731769393300AD0A40 /* HNHTableHeaderCell.m in Sources */, - 4C099933176D4EA600C885CB /* HNHScrollView.m in Sources */, 4CA2335A176DBFE100F0B6AC /* MPLockDaemon.m in Sources */, 4C80BB6F176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m in Sources */, 4C245B76176E1E3D0086100E /* DDData.m in Sources */, @@ -1462,6 +1461,7 @@ 4C36E5B4177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m in Sources */, 4C4FCE15177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m in Sources */, 4C4FCE18177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.m in Sources */, + 4C52A244177D7B9F0000D88F /* HNHScrollView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib index 6d96bf9b..1aab6564 100644 --- a/MacPass/Base.lproj/InspectorView.xib +++ b/MacPass/Base.lproj/InspectorView.xib @@ -137,7 +137,6 @@ {293, 30} - _NS:9 HNHGradientView @@ -542,7 +541,7 @@ 2322 {251, 332} - + _NS:13 @@ -659,7 +658,7 @@ {{20, 20}, {253, 334}} - + _NS:9 133138 @@ -708,7 +707,6 @@ 268 {{211, 19}, {62, 19}} - _NS:9 YES @@ -984,7 +982,7 @@ 256 - {261, 335} + {259, 333} @@ -1001,7 +999,7 @@ - 258 + 256 40 1000 @@ -1047,7 +1045,7 @@ 1 - {261, 335} + {{1, 1}, {259, 333}} @@ -1089,7 +1087,7 @@ _NS:9 - 133680 + 133681 @@ -1375,7 +1373,7 @@ 268 - {{3, 10}, {210, 22}} + {{3, 10}, {212, 22}} _NS:9 @@ -1397,7 +1395,7 @@ 268 - {{0, 40}, {256, 14}} + {{0, 40}, {258, 14}} _NS:9 @@ -1418,7 +1416,7 @@ 268 - {{221, 11}, {32, 19}} + {{223, 11}, {32, 19}} _NS:9 @@ -1444,7 +1442,7 @@ NO - {{1, 1}, {258, 54}} + {{1, 1}, {256, 54}} @@ -1546,38 +1544,6 @@ 29 3 - - - 9 - 0 - - 9 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - 3 @@ -1642,6 +1608,38 @@ 29 3 + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + 6 @@ -3829,7 +3827,7 @@ 2024 - + 6 0 @@ -3837,7 +3835,7 @@ 6 1 - 3 + 1 1000 @@ -4182,8 +4180,8 @@ - 2166 - + 2175 + @@ -4454,6 +4452,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + HNHScrollView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4479,10 +4478,10 @@ - + com.apple.InterfaceBuilder.CocoaPlugin - + @@ -4523,19 +4522,19 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin + + + - - @@ -4570,7 +4569,7 @@ - 2173 + 2175 @@ -4614,6 +4613,14 @@ ./Classes/HNHRoundedTextFieldCell.h + + HNHScrollView + NSScrollView + + IBProjectSource + ./Classes/HNHScrollView.h + + MPCustomFieldTableCellView NSTableCellView diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index b2f4e4c1..0dcfd243 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -48,7 +48,7 @@ CFBundleSignature ???? CFBundleVersion - 1422 + 1508 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright