mirror of
https://github.com/MacPass/MacPass.git
synced 2025-12-14 09:22:33 +00:00
Changed Inspectorview to 3 tabs. Notes are now at the first tab.
This commit is contained in:
2
HNHUi
2
HNHUi
Submodule HNHUi updated: e5ab00f08e...9546c4088c
File diff suppressed because it is too large
Load Diff
@@ -36,12 +36,12 @@
|
|||||||
#import "NSMutableData+Base64.h"
|
#import "NSMutableData+Base64.h"
|
||||||
|
|
||||||
#import "HNHGradientView.h"
|
#import "HNHGradientView.h"
|
||||||
|
#import "HNHScrollView.h"
|
||||||
#import "HNHTableRowView.h"
|
#import "HNHTableRowView.h"
|
||||||
#import "HNHRoundedSecureTextField.h"
|
#import "HNHRoundedSecureTextField.h"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
MPGeneralTab,
|
MPGeneralTab,
|
||||||
MPNotesTab,
|
|
||||||
MPAttachmentsTab,
|
MPAttachmentsTab,
|
||||||
MPCustomFieldsTab
|
MPCustomFieldsTab
|
||||||
};
|
};
|
||||||
@@ -67,6 +67,7 @@ enum {
|
|||||||
|
|
||||||
@property (nonatomic, assign) NSUInteger activeTab;
|
@property (nonatomic, assign) NSUInteger activeTab;
|
||||||
@property (weak) IBOutlet NSTabView *tabView;
|
@property (weak) IBOutlet NSTabView *tabView;
|
||||||
|
@property (strong) IBOutlet NSView *generalView;
|
||||||
|
|
||||||
- (IBAction)addCustomField:(id)sender;
|
- (IBAction)addCustomField:(id)sender;
|
||||||
- (IBAction)removeCustomField:(id)sender;
|
- (IBAction)removeCustomField:(id)sender;
|
||||||
@@ -106,6 +107,38 @@ enum {
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (void)didLoadView {
|
- (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.scrollContentView setAutoresizingMask:NSViewWidthSizable];
|
||||||
[[self.itemImageView cell] setBackgroundStyle:NSBackgroundStyleRaised];
|
[[self.itemImageView cell] setBackgroundStyle:NSBackgroundStyleRaised];
|
||||||
[self.itemImageView setTarget:self];
|
[self.itemImageView setTarget:self];
|
||||||
@@ -291,7 +324,6 @@ enum {
|
|||||||
[self.URLTextField setEnabled:enabled];
|
[self.URLTextField setEnabled:enabled];
|
||||||
[self.generatePasswordButton setEnabled:enabled];
|
[self.generatePasswordButton setEnabled:enabled];
|
||||||
|
|
||||||
[self.infoTabControl setEnabled:enabled forSegment:MPNotesTab];
|
|
||||||
[self.infoTabControl setEnabled:enabled forSegment:MPAttachmentsTab];
|
[self.infoTabControl setEnabled:enabled forSegment:MPAttachmentsTab];
|
||||||
|
|
||||||
enabled &= [self.selectedEntry isKindOfClass:[Kdb4Entry class]];
|
enabled &= [self.selectedEntry isKindOfClass:[Kdb4Entry class]];
|
||||||
|
|||||||
@@ -44,11 +44,11 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>0.3.7</string>
|
<string>0.3.8</string>
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>????</string>
|
<string>????</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>2522</string>
|
<string>2524</string>
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
|
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
|
||||||
<key>NSHumanReadableCopyright</key>
|
<key>NSHumanReadableCopyright</key>
|
||||||
|
|||||||
Reference in New Issue
Block a user