From 93e61210f4dc279f1c1681b7155795fc8cc00e6a Mon Sep 17 00:00:00 2001 From: michael starke Date: Thu, 7 Mar 2013 03:49:43 +0100 Subject: [PATCH] Sketched new Inspector view --- MacPass/InspectorTabView.xib | 1671 ++++++++++++++++++++++-- MacPass/MPInspectorTabViewController.m | 11 +- MacPass/MacPass-Info.plist | 2 +- 3 files changed, 1563 insertions(+), 121 deletions(-) diff --git a/MacPass/InspectorTabView.xib b/MacPass/InspectorTabView.xib index ad98bfda..2d28b2a3 100644 --- a/MacPass/InspectorTabView.xib +++ b/MacPass/InspectorTabView.xib @@ -12,10 +12,16 @@ IBNSLayoutConstraint + NSButton + NSButtonCell NSCustomObject NSCustomView NSImageCell NSImageView + NSSecureTextField + NSSecureTextFieldCell + NSSegmentedCell + NSSegmentedControl NSTabView NSTabViewItem NSTextField @@ -43,13 +49,50 @@ 268 - + 268 - {{77, 491}, {41, 17}} + {{68, 487}, {144, 20}} + _NS:9 + {250, 250} + YES + + 67108864 + 0 + + LucidaGrande + 12 + 4883 + + _NS:9 + + + + Details + 0 + + + Advanced + 1 + YES + 0 + + + 1 + 3 + + NO + + + + 268 + {{77, 530}, {41, 17}} + + + _NS:1535 {200, 750} YES @@ -57,7 +100,7 @@ 67108928 272631808 Name - + LucidaGrande 13 1044 @@ -73,11 +116,11 @@ MC42NjY2NjY2NjY3AA - + 6 System controlTextColor - + 3 MAA @@ -96,7 +139,7 @@ NeXT Encapsulated PostScript v1.2 pasteboard type NeXT TIFF v4.0 pasteboard type - {{24, 475}, {48, 48}} + {{24, 514}, {48, 48}} @@ -121,7 +164,7 @@ 12 - {{20, 10}, {253, 463}} + {{0, -2}, {280, 482}} @@ -132,10 +175,300 @@ 256 - {{10, 25}, {233, 425}} + + + + 268 + {{49, 440}, {32, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Title + + _NS:1535 + + + + + NO + + + + 268 + {{86, 440}, {174, 22}} + + + + _NS:9 + YES + + -1804599231 + 272630784 + + + _NS:9 + + YES + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + textColor + + + + NO + + + + 268 + {{14, 410}, {67, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Username + + _NS:1535 + + + + + NO + + + + 268 + {{86, 315}, {135, 22}} + + + + _NS:9 + YES + + 342884416 + 272630848 + + + _NS:9 + + YES + + + + NSAllRomanInputSourcesLocaleIdentifier + + + NO + + + + 268 + {{86, 408}, {174, 22}} + + + + _NS:9 + YES + + -1804599231 + 272630784 + + + _NS:9 + + YES + + + + NO + + + + 268 + {{86, 376}, {135, 22}} + + + + _NS:9 + YES + + -1804599231 + 272630784 + + + _NS:9 + + YES + + + + NO + + + + 268 + {{52, 378}, {29, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + URL + + _NS:1535 + + + + + NO + + + + 268 + {{229, 374}, {31, 25}} + + + + _NS:22 + YES + + -2080374784 + 134217728 + + + _NS:22 + + -2033958912 + 163 + + NSImage + NSQuickLookTemplate + + + + 400 + 75 + + NO + + + + 268 + {{17, 317}, {64, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Password + + _NS:1535 + + + + + NO + + + + 268 + {{86, 285}, {135, 22}} + + + + _NS:9 + YES + + 342884416 + 272630848 + + + _NS:9 + + YES + + + + NSAllRomanInputSourcesLocaleIdentifier + + + NO + + + + 268 + {{34, 287}, {47, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Repeat + + _NS:1535 + + + + + NO + + + + 268 + {{229, 313}, {31, 25}} + + + _NS:22 + YES + + 67108864 + 134217728 + + + _NS:22 + + -1228652544 + 163 + + + + 400 + 75 + + NO + + + {280, 482} - + _NS:11 Details @@ -147,8 +480,30 @@ 256 - {{10, 25}, {233, 425}} - + + + + 268 + {{122, 233}, {66, 17}} + + + _NS:1535 + YES + + 68157504 + 272630784 + Advanced + + _NS:1535 + + + + + NO + + + {280, 482} + _NS:28 Notes @@ -159,10 +514,10 @@ LucidaGrande - 11 - 3100 + 9 + 3614 - 134217728 + 268435462 YES YES @@ -170,7 +525,7 @@ - {286, 540} + {280, 579} @@ -203,6 +558,22 @@ 112 + + + tabView + + + + 202 + + + + tabControl + + + + 203 + @@ -234,6 +605,134 @@ 1 + + + 6 + 1 + + 6 + 1 + + 20 + + 1000 + + 9 + 40 + 3 + + + + 5 + 1 + + 5 + 1 + + 20 + + 1000 + + 9 + 40 + 3 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 9 + 40 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + -2 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + 5 @@ -298,70 +797,6 @@ 24 2 - - - 5 - 0 - - 5 - 1 - - 27 - - 1000 - - 3 - 9 - 3 - - - - 3 - 0 - - 3 - 1 - - 70 - - 1000 - - 3 - 9 - 3 - - - - 4 - 0 - - 4 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - 3 @@ -380,6 +815,7 @@ + @@ -412,11 +848,524 @@ 56 + + + + + 5 + 0 + + 5 + 1 + + 125 + + 1000 + + 3 + 9 + 3 + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + + 57 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 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 + + + + 3 + 0 + + 3 + 1 + + 175 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 145 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 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 + + + + + + + + + + + + + + @@ -464,16 +1413,6 @@ - - 81 - - - - - 82 - - - 100 @@ -507,21 +1446,6 @@ - - 106 - - - - - 107 - - - - - 108 - - - 109 @@ -532,22 +1456,408 @@ + + 131 + + + + + + + + 132 + + + + + 134 + + + + + 135 + + + + + 147 + + + + + 148 + + + + + 149 + + + + + 151 + + + + + 152 + + + + + 200 + + + + + 201 + + + + + 208 + + + + + + + + 209 + + + + + 211 + + + + + 212 + + + + + + + + 213 + + + + + 216 + + + + + + + + 217 + + + + + 224 + + + + + 227 + + + + + 230 + + + + + 231 + + + + + 237 + + + + + 238 + + + + + + + + 239 + + + + + 242 + + + + + + + + 243 + + + + + 249 + + + + + + + + 251 + + + + + 252 + + + + + 253 + + + + + 254 + + + + + 255 + + + + + 256 + + + + + 261 + + + + + + + + 262 + + + + + 265 + + + + + 266 + + + + + 267 + + + + + + + + 268 + + + + + 270 + + + + + 271 + + + + + 286 + + + + + + + + 287 + + + + + 296 + + + + + 298 + + + + + 301 + + + + + 304 + + + + + + + + 305 + + + + + 312 + + + + + 314 + + + + + 315 + + + + + 316 + + + + + 318 + + + + + + + + 319 + + + + + + + + 320 + + + + + 321 + + + + + 325 + + + + + 326 + + + + + 327 + + + + + 328 + + + + + 329 + + + + + + + + 330 + + + + + 331 + + + + + 332 + + + + + 333 + + + + + 334 + + + + + 335 + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - + - - - - + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin @@ -557,16 +1867,131 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin @@ -575,14 +2000,12 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - 112 + 335 @@ -592,6 +2015,8 @@ NSImageView NSTextField + NSSegmentedControl + NSTabView @@ -602,6 +2027,14 @@ itemNameTextfield NSTextField + + tabControl + NSSegmentedControl + + + tabView + NSTabView + IBProjectSource @@ -630,10 +2063,10 @@ IBCocoaFramework YES 3 - - NSApplicationIcon - {128, 128} - + + {128, 128} + {21, 16} + YES diff --git a/MacPass/MPInspectorTabViewController.m b/MacPass/MPInspectorTabViewController.m index f4a61fc8..190ac558 100644 --- a/MacPass/MPInspectorTabViewController.m +++ b/MacPass/MPInspectorTabViewController.m @@ -12,6 +12,9 @@ @property (assign) IBOutlet NSImageView *itemImageView; @property (assign) IBOutlet NSTextField *itemNameTextfield; +@property (assign) IBOutlet NSTabView *tabView; +@property (assign) IBOutlet NSSegmentedControl *tabControl; +@property (assign) NSUInteger selectedIndex; @end @@ -24,9 +27,15 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; if (self) { - + // init } return self; } +- (void)didLoadView { + //[self.tabView bind:NSSelectedIndexBinding toObject:self.tabControl withKeyPath:@"selectedIndex" options:nil]; + [self.tabControl bind:NSSelectedIndexBinding toObject:self withKeyPath:NSSelectedIndexBinding options:nil]; + [self.tabView bind:NSSelectedIndexBinding toObject:self withKeyPath:NSSelectedIndexBinding options:nil]; +} + @end diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index 94f35a26..7c28fe0b 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 421 + 42E LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright