diff --git a/HNHUi b/HNHUi index e5ab00f0..9546c408 160000 --- a/HNHUi +++ b/HNHUi @@ -1 +1 @@ -Subproject commit e5ab00f08ebf9141005f2d888301f90f1572aebe +Subproject commit 9546c4088cb6d86996987e5fae3329111874836f diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib index 1623270a..38d91374 100644 --- a/MacPass/Base.lproj/InspectorView.xib +++ b/MacPass/Base.lproj/InspectorView.xib @@ -32,8 +32,6 @@ NSTextField NSTextFieldCell NSTextView - NSTokenField - NSTokenFieldCell NSView @@ -71,7 +69,7 @@ 268 - {{64, 496}, {165, 25}} + {{85, 496}, {124, 25}} @@ -101,24 +99,16 @@ 40 NSImage - 07_NotepadTemplate + 04_KlipperTemplate 1 0 40 - + NSImage - 04_KlipperTemplate - - 0 - - - 40 - - NSImage - NSSmartBadgeTemplate + NSActionTemplate 0 @@ -133,35 +123,34 @@ {{0, 31}, {293, 466}} - + _NS:9 1 - + 256 - + 268 - {{17, 432}, {35, 14}} + {{17, 28}, {259, 14}} - - + _NS:1535 YES - + 68157504 - 272761856 - Name + 272892928 + Created LucidaGrande 11 3100 _NS:1535 - + 6 System @@ -183,212 +172,11 @@ NO - - - 268 - {{20, 402}, {253, 22}} - - - - _NS:9 - YES - - -1805647807 - 272632064 - - - _NS:9 - - YES - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - textColor - - 3 - MAA - - - - NO - - - - 268 - {{17, 380}, {58, 14}} - - - - _NS:1535 - YES - - 68157504 - 272761856 - Username - - _NS:1535 - - - - - NO - - - - 268 - {{20, 350}, {253, 22}} - - - - _NS:9 - YES - - -1805647807 - 272632064 - - - _NS:9 - - YES - - - - NO - - - - 268 - {{20, 298}, {253, 22}} - - - - _NS:9 - YES - - -1804599231 - 272631040 - - - _NS:9 - - YES - - - - NO - - - - 268 - {{17, 328}, {25, 14}} - - - - _NS:1535 - YES - - 68157504 - 272761856 - URL - - _NS:1535 - - - - - NO - - - - 268 - {{17, 276}, {58, 14}} - - - - _NS:1535 - YES - - 68157504 - 272761856 - Password - - _NS:1535 - - - - - NO - - - - 268 - {{20, 219}, {253, 19}} - - - - _NS:9 - {250, 750} - YES - - -2080374784 - 134217728 - Generate - - LucidaGrande - 12 - 16 - - _NS:9 - - -2038153216 - 164 - - - 400 - 75 - - NO - - - - 268 - {{17, 53}, {259, 11}} - - - - _NS:1535 - YES - - 68157504 - 272892928 - Created - - LucidaGrande - 9 - 3614 - - _NS:1535 - - - - - NO - 268 - {{17, 34}, {259, 11}} + {{17, 9}, {259, 11}} - _NS:1535 YES @@ -396,7 +184,7 @@ 68157504 272892928 Modified - + _NS:1535 @@ -404,299 +192,15 @@ NO - - - 268 - {{20, 246}, {214, 22}} - - - - _NS:9 - YES - - 342884416 - 272630848 - - - _NS:9 - - YES - - - - NSAllRomanInputSourcesLocaleIdentifier - - - NO - - - - 268 - {{242, 244}, {31, 25}} - - - - _NS:22 - YES - - 67108864 - 134217728 - - - _NS:22 - - -926662656 - 163 - - NSImage - NSQuickLookTemplate - - - - 400 - 75 - - NO - - - - 268 - - NSStringPboardType - - {{17, 140}, {259, 50}} - - - - _NS:9 - YES - - 337641472 - 32768 - - _NS:9 - - - - 6 - System - controlTextColor - - - - 0.0 - 0 - - NO - 2 - - - - 268 - {{17, 198}, {38, 14}} - - - - _NS:1535 - YES - - 68157504 - 272761856 - Tags - - _NS:1535 - - - - - NO - {293, 466} - - - + _NS:11 General - - 2 - - - 256 - - - - 256 - - - - 2304 - - - - 2322 - {251, 384} - - - _NS:13 - - - - - - - - - - - - 166 - - - - 251 - 1 - - - 67121027 - 0 - - - - - 6 - System - selectedTextBackgroundColor - - - - 6 - System - selectedTextColor - - - - - - - 1 - MCAwIDEAA - - - {8, -8} - 13 - - - - - - 1 - - 6 - {463, 10000000} - - - - {{1, 1}, {251, 384}} - - - _NS:11 - - - - {4, 5} - - 79691776 - - - - - - file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff - - - - - 3 - MCAwAA - - - - 4 - - - - 256 - {{236, 1}, {16, 384}} - - - _NS:83 - NO - - _doScroller: - 1 - 0.85256409645080566 - - - - -2147483392 - {{-100, -100}, {87, 18}} - - - _NS:33 - NO - 1 - - _doScroller: - 1 - 0.94565218687057495 - - - {{20, 20}, {253, 386}} - - - _NS:9 - 133138 - - - - 0.25 - 4 - 1 - - - - 268 - {{17, 432}, {35, 14}} - - - _NS:1535 - YES - - 68157504 - 272630784 - Notes - - _NS:1535 - - - - - NO - - - {293, 466} - - _NS:28 - - Notes - - - @@ -714,7 +218,11 @@ -2080374784 134250496 - + + LucidaGrande + 12 + 16 + _NS:9 -2033434624 @@ -794,7 +302,10 @@ 6 System headerTextColor - + + 3 + MAA + @@ -809,7 +320,12 @@ controlBackgroundColor - + + 6 + System + controlTextColor + + 3 YES @@ -823,7 +339,10 @@ 6 System alternateSelectedControlTextColor - + + 3 + MQA + 6 @@ -871,6 +390,7 @@ -2147483392 {{1, 147}, {52, 16}} + _NS:60 NO 1 @@ -902,7 +422,7 @@ - + 256 @@ -910,6 +430,7 @@ 268 {{241, 429}, {32, 19}} + _NS:9 YES @@ -935,6 +456,7 @@ 268 {{17, 432}, {80, 14}} + _NS:1535 YES @@ -964,6 +486,7 @@ {259, 400} + _NS:13 YES @@ -1026,6 +549,7 @@ {{1, 1}, {259, 400}} + _NS:11 @@ -1037,6 +561,7 @@ -2147483392 {{224, 17}, {15, 102}} + _NS:58 NO @@ -1049,6 +574,7 @@ -2147483392 {{1, 119}, {223, 15}} + _NS:60 NO @@ -1060,6 +586,7 @@ {{16, 20}, {261, 402}} + _NS:9 133681 @@ -1073,6 +600,8 @@ {293, 466} + + Fields @@ -1080,13 +609,12 @@ - + 6 YES - YES - + @@ -1096,6 +624,442 @@ _NS:11 + + + 268 + + + + 268 + {{17, 288}, {35, 14}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Notes + + _NS:1535 + + + + + NO + + + + 256 + + + + 2304 + + + + 2322 + + Apple HTML pasteboard type + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + Apple URL pasteboard type + CorePasteboardFlavorType 0x6D6F6F76 + NSColor pasteboard type + NSFilenamesPboardType + NSStringPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT RTFD pasteboard type + NeXT Rich Text Format v1.0 pasteboard type + NeXT TIFF v4.0 pasteboard type + NeXT font pasteboard type + NeXT ruler pasteboard type + WebURLsWithTitlesPboardType + public.url + + {210, 258} + + + + _NS:13 + + + + + + + + + + + + 166 + + + + 210 + 1 + + + 67121027 + 0 + + + + + 6 + System + selectedTextBackgroundColor + + + + 6 + System + selectedTextColor + + + + + + + 1 + MCAwIDEAA + + + {8, -8} + 13 + + + + + + 1 + + 6 + {463, 10000000} + + + + {{1, 1}, {210, 258}} + + + + _NS:11 + + + + {4, 5} + + 79691776 + + + + + + file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff + + + + + 3 + MCAwAA + + + + 4 + + + + 256 + {{195, 1}, {16, 258}} + + + + _NS:83 + NO + + _doScroller: + 0.9916666666666667 + + + + -2147483392 + {{-100, -100}, {87, 18}} + + + + _NS:33 + NO + 1 + + _doScroller: + 1 + 0.94565218687057495 + + + {{20, 20}, {212, 260}} + + + + _NS:9 + 133138 + + + + 0.25 + 4 + 1 + + + + 268 + {{201, 334}, {31, 25}} + + + + _NS:22 + YES + + 67108864 + 134217728 + + + _NS:22 + + -926662656 + 163 + + NSImage + NSQuickLookTemplate + + + + 400 + 75 + + NO + + + + 268 + {{20, 336}, {173, 22}} + + + + _NS:9 + YES + + 342884416 + 272630848 + + + _NS:9 + + YES + + 6 + System + textBackgroundColor + + + + 6 + System + textColor + + + + NSAllRomanInputSourcesLocaleIdentifier + + + NO + + + + 268 + {{20, 309}, {212, 19}} + + + + _NS:9 + {250, 750} + YES + + -2080374784 + 134217728 + Generate + + _NS:9 + + -2038153216 + 164 + + + 400 + 75 + + NO + + + + 268 + {{17, 366}, {58, 14}} + + + + _NS:1535 + YES + + 68157504 + 272761856 + Password + + _NS:1535 + + + + + NO + + + + 268 + {{17, 418}, {25, 14}} + + + + _NS:1535 + YES + + 68157504 + 272761856 + URL + + _NS:1535 + + + + + NO + + + + 268 + {{20, 388}, {212, 22}} + + + + _NS:9 + YES + + -1804599231 + 272631040 + + + _NS:9 + + YES + + + + NO + + + + 268 + {{20, 440}, {212, 22}} + + + + _NS:9 + YES + + -1805647807 + 272632064 + + + _NS:9 + + YES + + + + NO + + + + 268 + {{17, 470}, {58, 14}} + + + + _NS:1535 + YES + + 68157504 + 272761856 + Username + + _NS:1535 + + + + + NO + + + + 268 + {{20, 492}, {212, 22}} + + + + _NS:9 + YES + + -1805647807 + 272632064 + + + _NS:9 + + YES + + + + NO + + + + 268 + {{17, 522}, {35, 14}} + + + + _NS:1535 + YES + + 68157504 + 272761856 + Name + + _NS:1535 + + + + + NO + + + {252, 553} + + + + _NS:9 + HNHScrollDocumentViewAdapter + @@ -1115,54 +1079,6 @@ 711 - - - titleOrNameLabel - - - - 1317 - - - - titleTextField - - - - 1318 - - - - usernameTextField - - - - 1288 - - - - URLTextField - - - - 1287 - - - - _popUpPasswordGenerator: - - - - 1276 - - - - generatePasswordButton - - - - 1282 - infoTabControl @@ -1171,14 +1087,6 @@ 1553 - - - notesTextView - - - - 1555 - tabView @@ -1243,6 +1151,54 @@ 2244 + + + titleOrNameLabel + + + + 1317 + + + + titleTextField + + + + 1318 + + + + usernameTextField + + + + 1288 + + + + URLTextField + + + + 1287 + + + + _popUpPasswordGenerator: + + + + 1276 + + + + generatePasswordButton + + + + 1282 + passwordTextField @@ -1259,6 +1215,22 @@ 2280 + + + notesTextView + + + + 1555 + + + + generalView + + + + 2561 + imageView @@ -1285,10 +1257,7 @@ 134217728 33554432 - - NSImage - NSActionTemplate - + _NS:11 0 0 @@ -1464,7 +1433,7 @@ 134217728 33554432 - + _NS:11 0 0 @@ -1726,6 +1695,22 @@ 29 3 + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 9 + 40 + 2 + 3 @@ -1742,22 +1727,6 @@ 9 3 - - - 9 - 0 - - 9 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - 10 @@ -1889,7 +1858,6 @@ - @@ -1903,124 +1871,27 @@ - - 1395 - - - - - - - - 1396 - - - - - 3 - 0 - - 3 - 1 - - 60 - - 1000 - - 3 - 9 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 4 - 0 - - 4 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 3 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - - - 1397 - + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + 4 0 @@ -2028,7 +1899,7 @@ 4 1 - 34 + 9 1000 @@ -2068,38 +1939,6 @@ 29 3 - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 9 - 40 - 3 - - - - 3 - 1 - - 4 - 1 - - 8 - - 1000 - - 9 - 40 - 3 - 6 @@ -2132,772 +1971,11 @@ 29 3 - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 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 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 9 - 40 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 9 - 40 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 9 - 40 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 9 - 40 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 9 - 40 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 9 - 40 - 3 - - - - 6 - 0 - - 6 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 9 - 40 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 3 - 1 - - 20 - - 1000 - - 9 - 40 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - - - - - - - - - - - + - - 1239 - - - - - - - - 1266 - - - - - 1235 - - - - - - - - 1270 - - - - - 1238 - - - - - - - - 1267 - - - - - 1234 - - - - - - - - 1271 - - - - - 1233 - - - - - - - - 1272 - - - - - 1237 - - - - - - - - 1268 - - - - - 1236 - - - - - - - - 1269 - - - - - 1231 - - - - - - - - 1274 - - - - - 1440 - - - - - 1446 - - - - - 1448 - - - - - 1471 - - - - - 1492 - - - - - - - - 8 - 1 - - 0 - 1 - - 150 - - 1000 - - 9 - 40 - 1 - - - - - - 1493 - - - - - 1494 - - - - - 1495 - - - - - 1526 - - - - - - - - 1529 - - - - - 1546 - - - - - 1557 - - - - - 1665 - - - - - 1697 - - - - - 1720 - - - - - 1721 - - - - - 1723 - - - - - 1737 - - - - - 1852 - - - - - 1853 - - - - - 1855 - - - - - 1879 - - - - - 1777 - - - - - 1898 - - - - - 1900 - - - 1884 @@ -2921,6 +1999,22 @@ + + + 8 + 0 + + 0 + 1 + + 11 + + 1000 + + 3 + 9 + 1 + @@ -2929,11 +2023,6 @@ - - 1937 - - - 1938 @@ -3724,7 +2813,7 @@ 0 1 - 80 + 50 1000 @@ -3735,7 +2824,7 @@ 8 - 1 + 0 0 1 @@ -3785,41 +2874,6 @@ - - 2022 - - - - - 2074 - - - - - 2078 - - - - - 2080 - - - - - 2083 - - - - - 2086 - - - - - 2087 - - - 2098 @@ -4285,62 +3339,6 @@ - - 2263 - - - - - - - - 2264 - - - - - 2266 - - - - - 2267 - - - - - 2268 - - - - - 2273 - - - - - - - - 2274 - - - - - 2275 - - - - - 2276 - - - - - 2278 - - - 2345 @@ -4458,7 +3456,7 @@ 0 1 - 80 + 50 1000 @@ -4469,7 +3467,7 @@ 8 - 1 + 0 0 1 @@ -4586,114 +3584,6 @@ - - 2371 - - - - - - 8 - 0 - - 0 - 1 - - 50 - - 1000 - - 3 - 9 - 1 - - - - - - 2372 - - - - - 2380 - - - - - 2384 - - - - - - 7 - 0 - - 0 - 1 - - 32 - - 1000 - - 3 - 9 - 1 - - - - - - 2385 - - - - - 2388 - - - - - 2389 - - - - - 2391 - - - - - 2397 - - - - - 2398 - - - - - 2400 - - - - - 2401 - - - - - 2409 - - - - - 1851 - - - 1985 @@ -4718,11 +3608,6 @@ - - 1988 - - - 2021 @@ -4758,16 +3643,6 @@ - - 1978 - - - - - 1849 - - - 1580 @@ -4797,11 +3672,6 @@ - - 2090 - - - 2193 @@ -4823,20 +3693,935 @@ - 2456 - + 1988 + + + + + 2022 + + + + + 2087 + + + + + 2090 + + + + + 2477 + + + + + 2478 + + + + + + + + + + + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 9 + 40 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 17 + + 1000 + + 9 + 40 + 3 + + + + + + + + 1239 + + + + + + + + 1266 + + + + + 1235 + + + + + + + + 1270 + + + + + 1238 + + + + + + + + 1267 + + + + + 1234 + + + + + + + + 1271 + + + + + 1233 + + + + + + + + 1272 + + + + + 1237 + + + + + + + + 1268 + + + + + 1236 + + + + + + + + 1269 + + + + + 1231 + + + + + + + + 1274 + + + + + 2263 + + + + + + + + 2264 + + + + + 2273 + + + + + + + + 2274 + + + + + 2481 + + + + + 2482 + + + + + 2483 + + + + + 2484 + + + + + 2485 + + + + + 2487 + + + + + 2489 + + + + + 2491 + + + + + 2493 + + + + + 2495 + + + + + 2496 + + + + + 2497 + + + + + 2498 + + + + + 2499 + + + + + 2500 + + + + + 2501 + + + + + 2503 + + + + + 2504 + + + + + 2505 + + + + + 2506 + + + + + 2507 + + + + + 2508 + + + + + 2509 + + + + + 2510 + + + + + 2511 + + + + + 2512 + + + + + 2526 + - 2457 - - + 2527 + + + + + 2528 + + + + + 1492 + + + + + 8 + 1 + + 0 + 1 + + 150 + + 1000 + + 9 + 40 + 1 + + + + + + + + + 1557 + + + + + 1495 + + + + + 1494 + + + + + 1493 + + + + + 1526 + + + + + + + + 1529 + + + + + 2551 + + + + + 2552 + + + + + 2553 + + + + + 2555 + + + + + 2557 + + + + + 2559 + + 2459 + + 2409 + + + @@ -4874,69 +4659,23 @@ 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 HNHScrollView com.apple.InterfaceBuilder.CocoaPlugin @@ -4969,7 +4708,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4998,29 +4736,16 @@ 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 @@ -5049,7 +4774,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin @@ -5109,11 +4833,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 @@ -5198,15 +4917,9 @@ 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 MPCustomFieldTableCellView @@ -5218,7 +4931,7 @@ com.apple.InterfaceBuilder.CocoaPlugin NormalCell - + @@ -5243,39 +4956,90 @@ 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 - + @@ -5296,7 +5060,7 @@ - 2471 + 2565 @@ -5343,6 +5107,14 @@ ./Classes/HNHRoundedTextFieldCell.h + + HNHScrollDocumentViewAdapter + NSView + + IBProjectSource + ./Classes/HNHScrollDocumentViewAdapter.h + + HNHScrollView NSScrollView @@ -5427,6 +5199,7 @@ NSTextField NSTableView NSTextField + NSView NSButton NSSegmentedControl MPPopupImageView @@ -5465,6 +5238,10 @@ customFieldsTextField NSTextField + + generalView + NSView + generatePasswordButton NSButton @@ -5574,13 +5351,11 @@ {128, 128} {128, 128} - {128, 128} {128, 128} {15, 15} {8, 8} {21, 16} {8, 8} - {15, 15} YES diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m index ee03f866..9c322fe1 100644 --- a/MacPass/MPInspectorViewController.m +++ b/MacPass/MPInspectorViewController.m @@ -36,12 +36,12 @@ #import "NSMutableData+Base64.h" #import "HNHGradientView.h" +#import "HNHScrollView.h" #import "HNHTableRowView.h" #import "HNHRoundedSecureTextField.h" enum { MPGeneralTab, - MPNotesTab, MPAttachmentsTab, MPCustomFieldsTab }; @@ -67,6 +67,7 @@ enum { @property (nonatomic, assign) NSUInteger activeTab; @property (weak) IBOutlet NSTabView *tabView; +@property (strong) IBOutlet NSView *generalView; - (IBAction)addCustomField:(id)sender; - (IBAction)removeCustomField:(id)sender; @@ -106,6 +107,38 @@ enum { } - (void)didLoadView { + + HNHScrollView *scrollView = [[HNHScrollView alloc] init]; + scrollView.actAsFlipped = NO; + [scrollView setHasVerticalScroller:YES]; + [scrollView setDrawsBackground:NO]; + [scrollView setTranslatesAutoresizingMaskIntoConstraints:NO]; + NSView *clipView = [scrollView contentView]; + + NSView *tabView = [[self.tabView tabViewItemAtIndex:MPGeneralTab] view]; + /* + DO NEVER SET setTranslatesAutoresizingMaskIntoConstraints on NSTabViewItem's view + [tabView setTranslatesAutoresizingMaskIntoConstraints:NO]; + */ + [scrollView setDocumentView:self.generalView]; + [tabView addSubview:scrollView]; + + NSDictionary *views = NSDictionaryOfVariableBindings(_generalView, scrollView); + [[scrollView superview] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[scrollView]|" + options:0 + metrics:nil + views:views ]]; + [[scrollView superview] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-3-[scrollView]-50-|" + options:0 + metrics:nil + views:views]]; + [clipView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_generalView]|" + options:0 + metrics:nil + views:views]]; + [[self view] layoutSubtreeIfNeeded]; + + //[self.scrollContentView setAutoresizingMask:NSViewWidthSizable]; [[self.itemImageView cell] setBackgroundStyle:NSBackgroundStyleRaised]; [self.itemImageView setTarget:self]; @@ -291,7 +324,6 @@ enum { [self.URLTextField setEnabled:enabled]; [self.generatePasswordButton setEnabled:enabled]; - [self.infoTabControl setEnabled:enabled forSegment:MPNotesTab]; [self.infoTabControl setEnabled:enabled forSegment:MPAttachmentsTab]; enabled &= [self.selectedEntry isKindOfClass:[Kdb4Entry class]]; diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index 6c06ec7c..26d9dc8a 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -44,11 +44,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.3.7 + 0.3.8 CFBundleSignature ???? CFBundleVersion - 2522 + 2524 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright