From 47838d0158554931e62e4a1af71354be05c2544b Mon Sep 17 00:00:00 2001 From: michael starke Date: Tue, 18 Jun 2013 00:52:23 +0200 Subject: [PATCH] Experiments on how to display notes and attachments --- MacPass/Base.lproj/InspectorView.xib | 1167 ++++++-------------------- MacPass/MacPass-Info.plist | 2 +- 2 files changed, 246 insertions(+), 923 deletions(-) diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib index 60e946fe..029bc1ae 100644 --- a/MacPass/Base.lproj/InspectorView.xib +++ b/MacPass/Base.lproj/InspectorView.xib @@ -20,9 +20,8 @@ NSImageView NSScrollView NSScroller - NSTableCellView - NSTableColumn - NSTableView + NSSegmentedCell + NSSegmentedControl NSTextField NSTextFieldCell NSView @@ -59,7 +58,7 @@ NeXT Encapsulated PostScript v1.2 pasteboard type NeXT TIFF v4.0 pasteboard type - {{20, 328}, {48, 48}} + {{20, 264}, {48, 48}} @@ -84,7 +83,7 @@ 268 - {{73, 344}, {179, 17}} + {{73, 280}, {155, 17}} @@ -106,12 +105,12 @@ 6 System controlColor - + 3 MC42NjY2NjY2NjY3AA - + 6 System controlTextColor @@ -126,7 +125,7 @@ 268 - {{0, 318}, {269, 2}} + {{0, 254}, {245, 2}} @@ -137,7 +136,7 @@ 268 - {269, 30} + {245, 30} @@ -156,157 +155,10 @@ 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}} + {{17, 186}, {35, 14}} @@ -316,7 +168,11 @@ 68157504 272761856 Name - + + LucidaGrande + 11 + 3100 + _NS:1535 @@ -335,7 +191,7 @@ 268 - {{80, 246}, {169, 22}} + {{80, 182}, {145, 22}} @@ -370,7 +226,7 @@ 268 - {{17, 218}, {58, 14}} + {{17, 154}, {58, 14}} @@ -391,7 +247,7 @@ 268 - {{80, 214}, {169, 22}} + {{80, 150}, {145, 22}} @@ -413,7 +269,7 @@ 268 - {{80, 182}, {169, 22}} + {{80, 118}, {145, 22}} @@ -435,7 +291,7 @@ 268 - {{17, 186}, {25, 14}} + {{17, 122}, {25, 14}} @@ -456,7 +312,7 @@ 268 - {{17, 132}, {58, 14}} + {{17, 68}, {58, 14}} @@ -477,7 +333,7 @@ 268 - {{80, 128}, {169, 22}} + {{80, 64}, {145, 22}} @@ -499,10 +355,10 @@ 268 - {{80, 101}, {169, 19}} + {{80, 37}, {145, 19}} - + _NS:9 {250, 750} YES @@ -510,7 +366,7 @@ -2080374784 134217728 Generate - + LucidaGrande 12 16 @@ -526,61 +382,55 @@ NO - + 268 - {{17, 72}, {72, 17}} + {{80, 6}, {85, 25}} - - _NS:1535 - YES - - 68157504 - 272630784 - Attachments - - _NS:1535 - - - - - NO - - - - 268 - {{187, 70}, {62, 19}} - - - _NS:9 YES - - -2080374784 - 134217728 - Add File - + + 67108864 + 0 + _NS:9 - - -2038153216 - 164 - - - 400 - 75 + + + + 39 + + NSImage + 07_NotepadTemplate + + YES + 0 + + + 39 + + NSImage + 04_KlipperTemplate + + 1 + YES + 0 + + + 1 + 2 NO - {269, 288} + {245, 224} _NS:13 - {269, 288} + {245, 224} @@ -592,7 +442,7 @@ 256 - {{253, 0}, {16, 288}} + {{229, 0}, {16, 224}} @@ -606,7 +456,7 @@ 256 - {{0, 272}, {269, 16}} + {{0, 208}, {245, 16}} @@ -618,7 +468,7 @@ 0.50602412223815918 - {{0, 30}, {269, 288}} + {{0, 30}, {245, 224}} @@ -632,7 +482,7 @@ 1 - {269, 396} + {245, 332} @@ -673,14 +523,6 @@ 711 - - - attachmentTableView - - - - 893 - titleOrNameLabel @@ -745,83 +587,6 @@ 993 - - - imageView - - - 274 - - - - 268 - - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - {{3, 0}, {17, 17}} - - - _NS:11 - YES - - 134217728 - 33554432 - - NSImage - NSFollowLinkFreestandingTemplate - - _NS:11 - 0 - 0 - 0 - NO - - NO - YES - - - - 266 - {{25, 0}, {197, 17}} - - - _NS:20 - {250, 750} - YES - - 67108928 - 272631808 - Table View Cell - - _NS:20 - - - - - NO - - - {{1, 1}, {222, 17}} - - _NS:9 - - - - 838 - - - - textField - - - - 839 - @@ -1289,59 +1054,27 @@ 898 - - - 6 + + + 9 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 3 + + 9 1 0.0 1000 - 6 - 24 + 5 + 22 2 - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - + + 3 0 - + 4 1 @@ -1349,56 +1082,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 + 6 + 24 3 @@ -1417,22 +1102,6 @@ 29 3 - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - 3 @@ -1445,8 +1114,56 @@ 1000 + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + 6 24 + 2 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 3 + 1 + + 138 + + 1000 + + 3 + 9 3 @@ -1465,38 +1182,6 @@ 29 3 - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - 10 @@ -1513,22 +1198,6 @@ 24 2 - - - 3 - 0 - - 3 - 1 - - 138 - - 1000 - - 3 - 9 - 3 - 5 @@ -1545,6 +1214,22 @@ 29 3 + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + 6 @@ -1593,23 +1278,7 @@ 24 2 - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - + 5 0 @@ -1625,7 +1294,23 @@ 24 2 - + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + 5 0 @@ -1641,20 +1326,20 @@ 24 2 - - - 5 + + + 6 0 - + 6 1 - 8 + 20 1000 - 6 - 24 + 8 + 29 3 @@ -1785,18 +1470,16 @@ 29 3 - - - + @@ -1815,246 +1498,6 @@ - - 806 - - - - - - - - 8 - 0 - - 0 - 1 - - 38 - - 1000 - - 9 - 40 - 1 - - - - - - 810 - - - - - 808 - - - - - 807 - - - - - - - - 811 - - - - - - - - - 833 - - - - - 5 - 0 - - 5 - 1 - - 3 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 3 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 6 - 0 - - 6 - 1 - - 3 - - 1000 - - 8 - 29 - 3 - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 5 - 22 - 2 - - - - - - - - 814 - - - - - 846 - - - - - 841 - - - - - 844 - - - - - 845 - - - - - 895 - - - - - 835 - - - - - - - - 834 - - - - - 7 - 0 - - 0 - 1 - - 17 - - 1000 - - 3 - 9 - 1 - - - - 8 - 0 - - 0 - 1 - - 17 - - 1000 - - 3 - 9 - 1 - - - - - - - 840 - - - - - 894 - - - - - 837 - - - - - 836 - - - 466 @@ -2172,48 +1615,6 @@ - - 860 - - - - - 8 - 0 - - 0 - 1 - - 17 - - 1000 - - 3 - 9 - 1 - - - - - - - 861 - - - - - 889 - - - - - - - - 890 - - - 941 @@ -2239,11 +1640,6 @@ - - 954 - - - 963 @@ -2284,96 +1680,21 @@ - - 977 - - - - - 978 - - - - - 980 - - - - - 981 - - - - - 983 - - - - - 984 - - - - - 986 - - - - - 988 - - - - - 990 - - - - - 1011 - - - - - 1015 - - - 109 - - 1021 - - - - - 864 - - - 1005 - - 1013 - - - 1003 - - 1016 - - - 1002 @@ -2399,6 +1720,64 @@ + + 1108 + + + + + 1156 + + + + + + + + 1157 + + + + + 1159 + + + + + 1168 + + + + + 1169 + + + + + 1171 + + + + + 1172 + + + + + 1174 + + + + + 1175 + + + + + 1179 + + + @@ -2413,14 +1792,22 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -2504,57 +1891,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - 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 @@ -2568,29 +1905,24 @@ - - - + + + + - - - - + + + - - - - - - - + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2601,7 +1933,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 @@ -2610,21 +1941,12 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - 1054 + 1179 @@ -2792,8 +2114,9 @@ YES 3 + {128, 128} + {128, 128} {128, 128} - {10, 10} YES diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index c1f34798..844cce40 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -48,7 +48,7 @@ CFBundleSignature ???? CFBundleVersion - 579 + 592 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright