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
-
- {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