diff --git a/src/AccRingGeneralVC.mm b/src/AccRingGeneralVC.mm index f1dbdbddd3d9787246455746f99f18e934e73637..11f5a60ebfd2335f488c7f3fa43c66464660a9e4 100644 --- a/src/AccRingGeneralVC.mm +++ b/src/AccRingGeneralVC.mm @@ -454,7 +454,7 @@ typedef NS_ENUM(NSInteger, TagViews) { CGFloat advancedHeight = self.advancedButtonMarginConstraint.constant; self.advancedButtonMarginConstraint.constant = (height== 2) ? 40 : 30; self.bannedContactHeightConstraint.constant = (height== 2) ? 150 : 2; - [[[self.blockedContactsTableView superview] superview] setHidden:![[[self.blockedContactsTableView superview] superview] isHidden]]; + [[[[self.blockedContactsTableView superview] superview] superview] setHidden:![[[[self.blockedContactsTableView superview] superview] superview] isHidden]]; [blockedContactsTableView reloadData]; } diff --git a/src/AccountSettingsVC.mm b/src/AccountSettingsVC.mm index e1d811e4eafdeb9c3f12cdee28edf94237c597d4..3c3c48204b0b2ca88c4e879190b4d36f2bdcb181 100644 --- a/src/AccountSettingsVC.mm +++ b/src/AccountSettingsVC.mm @@ -63,14 +63,6 @@ CGFloat const VIEW_INSET = 20; return self; } -- (void)viewDidLoad { - [super viewDidLoad]; - [self.view setWantsLayer:YES]; - [self.view setLayer:[CALayer layer]]; - [self.view.layer setBackgroundColor:[NSColor ringGreyHighlight].CGColor]; - [self.view.layer setCornerRadius:5.0f]; -} - - (void) initFrame { [self.view setFrame:self.view.superview.bounds]; diff --git a/src/ChatVC.mm b/src/ChatVC.mm index b902e7581d83b539ca560b6fe31381242329635c..066e48f8f023edd49938045c8d07dd6c43c402c0 100644 --- a/src/ChatVC.mm +++ b/src/ChatVC.mm @@ -41,15 +41,6 @@ @synthesize messageField,sendButton; -- (void)awakeFromNib -{ - NSLog(@"Init ChatVC"); - - [self.view setWantsLayer:YES]; - [self.view setLayer:[CALayer layer]]; - [self.view.layer setBackgroundColor:[NSColor controlColor].CGColor]; -} - -(void)setConversationUid:(const std::string)convUid model:(lrc::api::ConversationModel *)model { convUid_ = convUid; diff --git a/src/ConversationVC.mm b/src/ConversationVC.mm index 34715e32172836b0b1cebc1e2e5eb91d88d7e311..7faf32f6a3ba49392fa4764f10be4063ce225c5f 100644 --- a/src/ConversationVC.mm +++ b/src/ConversationVC.mm @@ -182,12 +182,6 @@ - (void)loadView { [super loadView]; - // Do view setup here. - [self.view setWantsLayer:YES]; - [self.view setLayer:[CALayer layer]]; - [self.view.layer setBackgroundColor:[NSColor ringGreyHighlight].CGColor]; - [self.view.layer setCornerRadius:5.0f]; - [messageField setFocusRingType:NSFocusRingTypeNone]; } diff --git a/src/PreferencesWC.mm b/src/PreferencesWC.mm index 1f7dea6f391e889ccdb5caa80ba1815fd4f9e0cb..8556ffe5c8a094b942ae5c15cbeace6dd49302e4 100644 --- a/src/PreferencesWC.mm +++ b/src/PreferencesWC.mm @@ -31,6 +31,7 @@ #import "GeneralPrefsVC.h" #import "AudioPrefsVC.h" #import "VideoPrefsVC.h" +#import "views/NSColor+RingTheme.h" @implementation PreferencesWC { @@ -49,6 +50,11 @@ static auto const kVideoPrefsIdentifer = @"VideoPrefsIdentifer"; { [super windowDidLoad]; [self.window setMovableByWindowBackground:YES]; + NSArray *items = [self.window.toolbar items]; + for(NSToolbarItem *toolbarItem in items) { + NSImage * image = [NSColor image: [toolbarItem image] tintedWithColor: [NSColor secondaryLabelColor]]; + toolbarItem.image = image; + } [self.window.toolbar setSelectedItemIdentifier:kGeneralPrefsIdentifier]; [self displayGeneral:nil]; } diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm index 248a1f4140c86774f90e9bf54e1a288056c177da..260c9335b176dadb1007b915292e79ee02133c43 100644 --- a/src/RingWindowController.mm +++ b/src/RingWindowController.mm @@ -52,7 +52,6 @@ #import "SmartViewVC.h" #import "views/IconButton.h" #import "views/NSColor+RingTheme.h" -#import "views/BackgroundView.h" #import "views/HoverButton.h" #import "utils.h" #import "RingWizardWC.h" @@ -109,7 +108,6 @@ NSString* const kOpenAccountToolBarItemIdentifier = @"OpenAccountToolBarItemI [super windowDidLoad]; [self.window setMovableByWindowBackground:YES]; - [self.window setBackgroundColor:[NSColor colorWithRed:242.0/255 green:242.0/255 blue:242.0/255 alpha:1.0]]; self.window.titleVisibility = NSWindowTitleHidden; currentCallVC = [[CurrentCallVC alloc] initWithNibName:@"CurrentCall" bundle:nil]; @@ -178,6 +176,7 @@ NSString* const kOpenAccountToolBarItemIdentifier = @"OpenAccountToolBarItemI [currentCallVC showWithAnimation:false]; [conversationVC hideWithAnimation:false]; [self accountSettingsShouldOpen: NO]; + [welcomeContainer setHidden: YES]; }); QObject::connect(self.behaviorController, @@ -197,6 +196,7 @@ NSString* const kOpenAccountToolBarItemIdentifier = @"OpenAccountToolBarItemI [currentCallVC showWithAnimation:false]; [conversationVC hideWithAnimation:false]; [self accountSettingsShouldOpen: NO]; + [welcomeContainer setHidden: YES]; }); QObject::connect(self.behaviorController, @@ -209,6 +209,7 @@ NSString* const kOpenAccountToolBarItemIdentifier = @"OpenAccountToolBarItemI [conversationVC showWithAnimation:false]; [currentCallVC hideWithAnimation:false]; [self accountSettingsShouldOpen: NO]; + [welcomeContainer setHidden: YES]; }); } @@ -302,7 +303,7 @@ NSString* const kOpenAccountToolBarItemIdentifier = @"OpenAccountToolBarItemI for(int i = 0; i < width; ++i) { for(int j = 0; j < width; ++j) { if(*data & 1) { - CGContextSetFillColorWithColor(ctx, [NSColor ringDarkGrey].CGColor); + CGContextSetFillColorWithColor(ctx, [NSColor labelColor].CGColor); rectDraw.origin = CGPointMake((j + qr_margin) * zoom,(i + qr_margin) * zoom); CGContextAddRect(ctx, rectDraw); CGContextFillPath(ctx); @@ -444,6 +445,7 @@ NSString* const kOpenAccountToolBarItemIdentifier = @"OpenAccountToolBarItemI -(void)rightPanelClosed { [smartViewVC deselect]; + [welcomeContainer setHidden:NO]; } -(void)currentConversationTrusted @@ -455,6 +457,7 @@ NSString* const kOpenAccountToolBarItemIdentifier = @"OpenAccountToolBarItemI [conversationVC hideWithAnimation:false]; [currentCallVC hideWithAnimation:false]; [self accountSettingsShouldOpen: NO]; + [welcomeContainer setHidden: NO]; } #pragma mark - NSToolbarDelegate @@ -507,6 +510,8 @@ NSString* const kOpenAccountToolBarItemIdentifier = @"OpenAccountToolBarItemI } -(void) accountSettingsShouldOpen: (BOOL) open { + [smartViewVC.view setHidden:open]; + [welcomeContainer setHidden: open]; if (open) { @try { [settingsVC setSelectedAccount: [chooseAccountVC selectedAccount].id]; diff --git a/src/RingWizardWC.mm b/src/RingWizardWC.mm index 6e564263f79579eb022c66459026330b403e348d..8c2b8fc19101dbe16d0e6a1e09e9ae0add8a6cbc 100644 --- a/src/RingWizardWC.mm +++ b/src/RingWizardWC.mm @@ -67,7 +67,6 @@ [chooseActiontWC setDelegate:self]; [linkAccountWC setDelegate:self]; [newAccountWC setDelegate:self]; - [self.window setBackgroundColor:[NSColor ringGreyHighlight]]; [self showChooseWithCancelButton:isCancelable andAdvanced: withAdvanced]; } diff --git a/src/SmartViewVC.mm b/src/SmartViewVC.mm index 895418c9c1a8d0374359fdead382e1dddaf57657..f65b4ccfe7987fa50271fa64c0b7292777cf8375 100755 --- a/src/SmartViewVC.mm +++ b/src/SmartViewVC.mm @@ -106,15 +106,6 @@ NSInteger const REQUEST_SEG = 1; [smartView setShortcutsDelegate:self]; [smartView setDataSource: self]; - - [self.view setWantsLayer:YES]; - [self.view setLayer:[CALayer layer]]; - [self.view.layer setBackgroundColor:[NSColor whiteColor].CGColor]; - - [searchField setWantsLayer:YES]; - [searchField setLayer:[CALayer layer]]; - [searchField.layer setBackgroundColor:[NSColor colorWithCalibratedRed:0.949 green:0.949 blue:0.949 alpha:0.9].CGColor]; - currentFilterType = lrc::api::profile::Type::RING; selectorIsPresent = true; @@ -384,12 +375,8 @@ NSInteger const REQUEST_SEG = 1; NSInteger rows = [smartView numberOfRows]; for (int i = 0; i< rows; i++) { - NSTableRowView* cellRowView = [smartView rowViewAtRow:i makeIfNecessary: NO]; - if (i == row) { - cellRowView.backgroundColor = [NSColor controlColor]; - } else { - cellRowView.backgroundColor = [NSColor whiteColor]; - } + HoverTableRowView* cellRowView = [smartView rowViewAtRow:i makeIfNecessary: NO]; + [cellRowView drawSelection: (i == row)]; } if (row == -1) diff --git a/src/views/AccountMenuItemView.mm b/src/views/AccountMenuItemView.mm index 6825408978402b46e93c2fb6974fa160f9ee114b..5a41c9bb94791542dbd09c9f49bade40a745af81 100644 --- a/src/views/AccountMenuItemView.mm +++ b/src/views/AccountMenuItemView.mm @@ -71,10 +71,11 @@ - (void) drawRect: (NSRect) rect { NSMenuItem *menuItem = ([self enclosingMenuItem]); BOOL isHighlighted = [menuItem isHighlighted]; + NSColor* highlightBackground = @available(macOS 10.14, *) ? [NSColor controlColor] : [NSColor whiteColor]; if (isHighlighted) { - [self.backgroundView setFillColor:[NSColor whiteColor]]; + [self.backgroundView setFillColor: highlightBackground]; } else { - [self.backgroundView setFillColor:[NSColor ringGreyHighlight]]; + [self.backgroundView setFillColor:[NSColor windowBackgroundColor]]; } [super drawRect: rect]; } diff --git a/src/views/HoverTableRowView.h b/src/views/HoverTableRowView.h index e89471bb9e2d55ae73f9935691e1018994cda369..6bd033d317cd39829c6f3e748fd327169738ca61 100644 --- a/src/views/HoverTableRowView.h +++ b/src/views/HoverTableRowView.h @@ -54,8 +54,10 @@ } @property BOOL highlightable; +- (void) drawSelection: (BOOL) isSelected; @end // Used by the HoverTableRowView and the RingTableView void DrawSeparatorInRect(NSRect rect); + diff --git a/src/views/HoverTableRowView.mm b/src/views/HoverTableRowView.mm index f1ea569781522dcb61a0ddbd58d1a85417a39687..8484cba2b4a5a08c54225561daa26d140af78096 100644 --- a/src/views/HoverTableRowView.mm +++ b/src/views/HoverTableRowView.mm @@ -51,6 +51,7 @@ @interface HoverTableRowView () @property BOOL mouseInside; +@property NSVisualEffectView* effect_view; @end @implementation HoverTableRowView @@ -59,7 +60,7 @@ - (instancetype)init { - self.highlightable = YES; + [self configureView]; } - (id)initWithFrame:(CGRect)aRect @@ -67,9 +68,8 @@ self = [super initWithFrame:aRect]; if (self) { - self.highlightable = YES; + [self configureView]; } - return self; } @@ -77,14 +77,18 @@ { self = [super initWithCoder:aDecoder]; if (self) { - self.highlightable = YES; + [self configureView]; } - return self; } -- (void)dealloc { - +- (void)configureView { + self.highlightable = YES; + self.effect_view = [[NSVisualEffectView alloc] initWithFrame: [self bounds]]; + [self.effect_view setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable]; + [self addSubview: self.effect_view positioned: NSWindowBelow relativeTo:nil]; + [self.effect_view setHidden:YES]; + [self.effect_view setMaterial: static_cast<NSVisualEffectMaterial>(6)]; } - (void)setMouseInside:(BOOL)value { @@ -123,18 +127,18 @@ self.mouseInside = NO; } +-(void) drawSelection: (BOOL) isSelected { + [self.effect_view setHidden: !isSelected]; + [self.effect_view setMaterial: isSelected ? static_cast<NSVisualEffectMaterial>(4) : static_cast<NSVisualEffectMaterial>(6)]; +} - (void)drawBackgroundInRect:(NSRect)dirtyRect { - // Custom background drawing. We don't call super at all. - [self.backgroundColor set]; - // Fill with the background color first - NSRectFill(self.bounds); - - // Draw a gradient - if (self.mouseInside && self.highlightable) { - NSRect selectionRect = NSRect(self.bounds); - [[NSColor ringGreyHighlight] setFill]; - NSBezierPath *selectionPath = [NSBezierPath bezierPathWithRoundedRect:selectionRect xRadius:2 yRadius:2]; - [selectionPath fill]; + [self.effect_view setHidden:YES]; + if(!@available(macOS 10.14, *)) { + [super drawBackgroundInRect:dirtyRect]; + } + + if ((self.mouseInside) && self.highlightable) { + [self.effect_view setHidden:NO]; } } @@ -153,14 +157,7 @@ // Only called if the 'selected' property is yes. - (void)drawSelectionInRect:(NSRect)dirtyRect { - // Check the selectionHighlightStyle, in case it was set to None - if (self.selectionHighlightStyle != NSTableViewSelectionHighlightStyleNone) { - // We want a hard-crisp stroke, and stroking 1 pixel will border half on one side and half on another, so we offset by the 0.5 to handle this - NSRect selectionRect = NSRect(self.bounds); - [[NSColor ringGreyHighlight] setFill]; - NSBezierPath *selectionPath = [NSBezierPath bezierPathWithRoundedRect:selectionRect xRadius:2 yRadius:2]; - [selectionPath fill]; - } + [self.effect_view setHidden:NO]; } // interiorBackgroundStyle is normaly "dark" when the selection is drawn (self.selected == YES) and we are in a key window (self.emphasized == YES). However, we always draw a light selection, so we override this method to always return a light color. @@ -182,6 +179,12 @@ } } +- (void)prepareForReuse { + [self.effect_view setHidden:YES]; + self.mouseInside = NO; + [super prepareForReuse]; +} + @end void DrawSeparatorInRect(NSRect rect) { diff --git a/src/views/IMTableCellView.mm b/src/views/IMTableCellView.mm index 06de03ec2673b5795bdf05b7ac7c9b7b7d31c54c..3c604068701f04e83551316b9957ec5691bf4c87 100644 --- a/src/views/IMTableCellView.mm +++ b/src/views/IMTableCellView.mm @@ -46,7 +46,7 @@ NSString* const TIME_BOX_HEIGHT = @"34"; } else { self.msgBackground.pointerDirection = LEFT; - self.msgBackground.bgColor = [NSColor whiteColor]; + self.msgBackground.bgColor = @available(macOS 10.14, *) ? [NSColor controlColor] : [NSColor whiteColor]; } } diff --git a/src/views/IconButton.mm b/src/views/IconButton.mm index 26939936cdb74030185f8afe0e8afe6cac8e5e1f..dda586d6f1993c5cd31ba2f9de1184f7843fef9c 100644 --- a/src/views/IconButton.mm +++ b/src/views/IconButton.mm @@ -128,7 +128,6 @@ [backgroundColor setFill]; [ovalPath fill]; - [NSGraphicsContext saveGraphicsState]; CGPoint top = CGPointMake(frame.size.width * 0.5, 0); CGPoint right = CGPointMake(frame.size.width, frame.size.height * 0.5); diff --git a/src/views/MessageBubbleView.mm b/src/views/MessageBubbleView.mm index 78ce35a6aca050ceb954103f96c652ee5b451112..e8ab4bf82e4072b3994f7860fd7c12a38a6b0a60 100644 --- a/src/views/MessageBubbleView.mm +++ b/src/views/MessageBubbleView.mm @@ -27,7 +27,7 @@ - (void)drawRect:(NSRect)dirtyRect { [super drawRect:dirtyRect]; CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort]; - CGContextSetRGBFillColor(context, 1, 1, 1, 1); + CGContextSetRGBFillColor(context, 1, 1, 1, 0); CGFloat defaultRadius = 16; CGFloat radius = (self.cornerRadius) ? self.cornerRadius : defaultRadius; CGFloat minx = CGRectGetMinX(dirtyRect); diff --git a/src/views/RoundedTextField.mm b/src/views/RoundedTextField.mm index 719d8f2f7cb41fdb7ec52040c8e4d365cc426cdb..132c5e7996da141ee6057648ce8b71f788e18bf7 100644 --- a/src/views/RoundedTextField.mm +++ b/src/views/RoundedTextField.mm @@ -48,16 +48,8 @@ NSColor* borderColor = self.borderColor; CGFloat borderThickness = [self.borderThickness floatValue]; - NSRect group = NSMakeRect(NSMinX(dirtyRect) + floor(NSWidth(dirtyRect) * 0.03333) + 0.5, - NSMinY(dirtyRect) + floor(NSHeight(dirtyRect) * 0.03333) + 0.5, - floor(NSWidth(dirtyRect) * 0.96667) - floor(NSWidth(dirtyRect) * 0.03333), - floor(NSHeight(dirtyRect) * 0.96667) - floor(NSHeight(dirtyRect) * 0.03333)); - - NSBezierPath* ovalPath = [NSBezierPath bezierPathWithRoundedRect: - NSMakeRect(NSMinX(group) + floor(NSWidth(group) * 0.00000 + 0.5), - NSMinY(group) + floor(NSHeight(group) * 0.00000 + 0.5), - floor(NSWidth(group) * 1.00000 + 0.5) - floor(NSWidth(group) * 0.00000 + 0.5), - floor(NSHeight(group) * 1.00000 + 0.5) - floor(NSHeight(group) * 0.00000 + 0.5)) + NSRect group = dirtyRect; + NSBezierPath* ovalPath = [NSBezierPath bezierPathWithRoundedRect: NSMakeRect(dirtyRect.origin.x + borderThickness * 0.5, dirtyRect.origin.y + borderThickness * 0.5, dirtyRect.size.width - borderThickness, dirtyRect.size.height - borderThickness) xRadius:[self.cornerRadius floatValue] yRadius:[self.cornerRadius floatValue]]; [backgroundColor setFill]; [ovalPath fill]; diff --git a/ui/Base.lproj/AccAdvancedRing.xib b/ui/Base.lproj/AccAdvancedRing.xib index 4dc0d726195de27f121aae0a91e90df65bfd1416..0da44d470d3d30f75fdd21e26b35490f735dd17b 100644 --- a/ui/Base.lproj/AccAdvancedRing.xib +++ b/ui/Base.lproj/AccAdvancedRing.xib @@ -2,6 +2,7 @@ <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/> + <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -109,8 +110,8 @@ <constraint firstItem="Qcu-SR-qaS" firstAttribute="leading" secondItem="7AV-dG-fCE" secondAttribute="trailing" constant="10" id="uWm-Da-7Z3"/> </constraints> </view> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <box boxType="custom" borderType="bezel" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Ywo-5x-8kh"> <rect key="frame" x="0.0" y="1064" width="620" height="91"/> @@ -160,8 +161,8 @@ <constraint firstItem="xba-4j-Fkx" firstAttribute="top" secondItem="468-K4-aHN" secondAttribute="top" constant="20" id="uuD-le-hAv"/> </constraints> </view> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <box boxType="custom" borderType="bezel" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="eGX-gk-Zxp"> <rect key="frame" x="0.0" y="924" width="620" height="120"/> @@ -241,8 +242,8 @@ <constraint firstItem="XWv-rk-HwX" firstAttribute="top" secondItem="QnU-yY-uCs" secondAttribute="top" constant="20" id="w58-M0-4yd"/> </constraints> </view> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <box boxType="custom" borderType="bezel" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="vYi-gW-MrY"> <rect key="frame" x="0.0" y="718" width="620" height="186"/> @@ -363,8 +364,8 @@ <constraints> <constraint firstAttribute="bottom" secondItem="PdV-TO-zeb" secondAttribute="bottom" constant="20" id="af1-6H-Qj5"/> </constraints> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <box boxType="custom" borderType="bezel" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="sy5-OH-wyB"> <rect key="frame" x="0.0" y="393" width="620" height="305"/> @@ -569,8 +570,8 @@ <constraints> <constraint firstAttribute="bottom" secondItem="e5r-aX-zQa" secondAttribute="bottom" constant="20" id="ePQ-YR-17s"/> </constraints> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <box boxType="custom" borderType="bezel" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="7eU-EP-4br"> <rect key="frame" x="0.0" y="20" width="300" height="353"/> @@ -586,91 +587,104 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <scrollView autohidesScrollers="YES" horizontalLineScroll="57" horizontalPageScroll="10" verticalLineScroll="57" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oAr-tx-LD3"> + <visualEffectView blendingMode="behindWindow" material="sidebar" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="ees-DM-9ZE"> <rect key="frame" x="20" y="60" width="258" height="234"/> - <clipView key="contentView" id="HbD-3v-3ZU"> - <rect key="frame" x="1" y="1" width="256" height="232"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="55" rowSizeStyle="automatic" viewBased="YES" id="NVP-Sl-oi4"> - <rect key="frame" x="0.0" y="0.0" width="256" height="232"/> + <subviews> + <scrollView autohidesScrollers="YES" horizontalLineScroll="57" horizontalPageScroll="10" verticalLineScroll="57" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oAr-tx-LD3"> + <rect key="frame" x="0.0" y="0.0" width="258" height="234"/> + <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="HbD-3v-3ZU"> + <rect key="frame" x="1" y="1" width="256" height="232"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="55" rowSizeStyle="automatic" viewBased="YES" id="NVP-Sl-oi4"> + <rect key="frame" x="0.0" y="0.0" width="256" height="232"/> + <autoresizingMask key="autoresizingMask"/> + <size key="intercellSpacing" width="3" height="2"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> + <tableColumns> + <tableColumn width="253" minWidth="40" maxWidth="1000" id="fsa-cO-tNU"> + <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> + <font key="font" metaFont="smallSystem"/> + <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> + </tableHeaderCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="EyV-Io-d3f"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> + <prototypeCellViews> + <tableCellView identifier="TableCellAudioCodecItem" id="2hv-9N-qsK"> + <rect key="frame" x="1" y="1" width="253" height="50"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="91p-54-Y2r"> + <rect key="frame" x="8" y="23" width="4" height="17"/> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="mG4-IM-X1E"> + <font key="font" metaFont="system"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="tUm-wW-mj6"> + <rect key="frame" x="8" y="7" width="4" height="16"/> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="v30-Bq-3PB"> + <font key="font" metaFont="systemLight" size="12"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> + <button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="5iw-3V-B83"> + <rect key="frame" x="223" y="5" width="22" height="18"/> + <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="DQY-EO-Gag"> + <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + </button> + </subviews> + <constraints> + <constraint firstItem="tUm-wW-mj6" firstAttribute="leading" secondItem="2hv-9N-qsK" secondAttribute="leading" constant="10" id="Hub-T2-eZO"/> + <constraint firstAttribute="trailing" secondItem="5iw-3V-B83" secondAttribute="trailing" constant="10" id="M76-1j-Tpj"/> + <constraint firstItem="5iw-3V-B83" firstAttribute="bottom" secondItem="tUm-wW-mj6" secondAttribute="bottom" id="j8d-28-9MC"/> + <constraint firstItem="91p-54-Y2r" firstAttribute="leading" secondItem="2hv-9N-qsK" secondAttribute="leading" constant="10" id="kFn-2q-oB0"/> + <constraint firstItem="91p-54-Y2r" firstAttribute="top" secondItem="2hv-9N-qsK" secondAttribute="top" constant="10" id="oNb-tz-klZ"/> + <constraint firstItem="tUm-wW-mj6" firstAttribute="top" secondItem="91p-54-Y2r" secondAttribute="bottom" id="w5c-7g-6JH"/> + </constraints> + </tableCellView> + <customView identifier="HoverRowView" id="dyz-id-8om" customClass="HoverTableRowView"> + <rect key="frame" x="1" y="53" width="253" height="55"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + </customView> + </prototypeCellViews> + </tableColumn> + </tableColumns> + </tableView> + </subviews> + <nil key="backgroundColor"/> + </clipView> + <constraints> + <constraint firstAttribute="height" constant="234" id="5gk-pa-wsS"/> + </constraints> + <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="SHY-vX-ofB"> + <rect key="frame" x="1" y="217" width="236" height="16"/> <autoresizingMask key="autoresizingMask"/> - <size key="intercellSpacing" width="3" height="2"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> - <tableColumns> - <tableColumn width="253" minWidth="40" maxWidth="1000" id="fsa-cO-tNU"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> - </tableHeaderCell> - <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="EyV-Io-d3f"> - <font key="font" metaFont="system"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <prototypeCellViews> - <tableCellView identifier="TableCellAudioCodecItem" id="2hv-9N-qsK"> - <rect key="frame" x="1" y="1" width="253" height="50"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="91p-54-Y2r"> - <rect key="frame" x="8" y="23" width="4" height="17"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="mG4-IM-X1E"> - <font key="font" metaFont="system"/> - <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="tUm-wW-mj6"> - <rect key="frame" x="8" y="7" width="4" height="16"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="v30-Bq-3PB"> - <font key="font" metaFont="systemLight" size="12"/> - <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="5iw-3V-B83"> - <rect key="frame" x="223" y="5" width="22" height="18"/> - <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="DQY-EO-Gag"> - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - </button> - </subviews> - <constraints> - <constraint firstItem="tUm-wW-mj6" firstAttribute="leading" secondItem="2hv-9N-qsK" secondAttribute="leading" constant="10" id="Hub-T2-eZO"/> - <constraint firstAttribute="trailing" secondItem="5iw-3V-B83" secondAttribute="trailing" constant="10" id="M76-1j-Tpj"/> - <constraint firstItem="5iw-3V-B83" firstAttribute="bottom" secondItem="tUm-wW-mj6" secondAttribute="bottom" id="j8d-28-9MC"/> - <constraint firstItem="91p-54-Y2r" firstAttribute="leading" secondItem="2hv-9N-qsK" secondAttribute="leading" constant="10" id="kFn-2q-oB0"/> - <constraint firstItem="91p-54-Y2r" firstAttribute="top" secondItem="2hv-9N-qsK" secondAttribute="top" constant="10" id="oNb-tz-klZ"/> - <constraint firstItem="tUm-wW-mj6" firstAttribute="top" secondItem="91p-54-Y2r" secondAttribute="bottom" id="w5c-7g-6JH"/> - </constraints> - </tableCellView> - <customView identifier="HoverRowView" id="dyz-id-8om" customClass="HoverTableRowView"> - <rect key="frame" x="1" y="53" width="253" height="55"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - </customView> - </prototypeCellViews> - </tableColumn> - </tableColumns> - </tableView> - </subviews> - </clipView> + </scroller> + <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="rhE-Rd-lUD"> + <rect key="frame" x="224" y="17" width="15" height="102"/> + <autoresizingMask key="autoresizingMask"/> + </scroller> + </scrollView> + </subviews> <constraints> - <constraint firstAttribute="height" constant="234" id="5gk-pa-wsS"/> + <constraint firstAttribute="height" constant="234" id="3T2-HX-2Rk"/> + <constraint firstAttribute="trailing" secondItem="oAr-tx-LD3" secondAttribute="trailing" id="O7w-Wa-1yM"/> + <constraint firstAttribute="bottom" secondItem="oAr-tx-LD3" secondAttribute="bottom" id="Ohz-Lx-XZR"/> + <constraint firstItem="oAr-tx-LD3" firstAttribute="top" secondItem="ees-DM-9ZE" secondAttribute="top" id="qla-iV-qAd"/> + <constraint firstItem="oAr-tx-LD3" firstAttribute="leading" secondItem="ees-DM-9ZE" secondAttribute="leading" id="toA-4u-YEx"/> </constraints> - <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="SHY-vX-ofB"> - <rect key="frame" x="1" y="217" width="236" height="16"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="rhE-Rd-lUD"> - <rect key="frame" x="224" y="17" width="15" height="102"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - </scrollView> + </visualEffectView> <button translatesAutoresizingMaskIntoConstraints="NO" id="ADX-3w-bRT"> <rect key="frame" x="20" y="15" width="30" height="30"/> <constraints> @@ -703,21 +717,21 @@ <constraints> <constraint firstItem="asr-5v-PFG" firstAttribute="centerX" secondItem="jXZ-6r-fbG" secondAttribute="centerX" id="7Nq-Y4-Prd"/> <constraint firstItem="Uad-ml-Qc6" firstAttribute="centerY" secondItem="ADX-3w-bRT" secondAttribute="centerY" id="My6-q0-8RF"/> - <constraint firstItem="oAr-tx-LD3" firstAttribute="top" secondItem="asr-5v-PFG" secondAttribute="bottom" constant="20" id="N5J-O5-Zvg"/> - <constraint firstItem="oAr-tx-LD3" firstAttribute="leading" secondItem="jXZ-6r-fbG" secondAttribute="leading" constant="20" id="TTp-9s-eJB"/> + <constraint firstItem="ees-DM-9ZE" firstAttribute="leading" secondItem="jXZ-6r-fbG" secondAttribute="leading" constant="20" id="QdK-wF-aId"/> <constraint firstItem="Uad-ml-Qc6" firstAttribute="leading" secondItem="ADX-3w-bRT" secondAttribute="trailing" constant="20" id="d1v-ui-LDC"/> <constraint firstAttribute="bottom" secondItem="ADX-3w-bRT" secondAttribute="bottom" constant="15" id="eHx-ww-963"/> <constraint firstItem="ADX-3w-bRT" firstAttribute="leading" secondItem="jXZ-6r-fbG" secondAttribute="leading" constant="20" id="gHe-kn-iaN"/> - <constraint firstAttribute="trailing" secondItem="oAr-tx-LD3" secondAttribute="trailing" constant="20" id="hk2-p6-Qhz"/> + <constraint firstItem="ees-DM-9ZE" firstAttribute="top" secondItem="asr-5v-PFG" secondAttribute="bottom" constant="20" id="ig2-BO-0YU"/> <constraint firstItem="asr-5v-PFG" firstAttribute="top" secondItem="jXZ-6r-fbG" secondAttribute="top" constant="20" id="ir8-Bw-lbk"/> - <constraint firstItem="ADX-3w-bRT" firstAttribute="top" secondItem="oAr-tx-LD3" secondAttribute="bottom" constant="15" id="qrf-eI-r5N"/> + <constraint firstItem="ADX-3w-bRT" firstAttribute="top" secondItem="ees-DM-9ZE" secondAttribute="bottom" constant="15" id="lwj-rA-nAu"/> + <constraint firstAttribute="trailing" secondItem="ees-DM-9ZE" secondAttribute="trailing" constant="20" id="xgE-qT-bJG"/> </constraints> </view> <constraints> <constraint firstAttribute="width" constant="300" id="CKH-DF-dFI"/> </constraints> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <box boxType="custom" borderType="bezel" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="K0z-NH-3Cq"> <rect key="frame" x="319" y="20" width="300" height="353"/> @@ -762,81 +776,94 @@ <constraint firstAttribute="height" constant="20" id="oa7-ai-qcB"/> </constraints> </box> - <scrollView autohidesScrollers="YES" horizontalLineScroll="57" horizontalPageScroll="10" verticalLineScroll="57" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UTo-FA-QKH"> + <visualEffectView blendingMode="behindWindow" material="sidebar" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="2II-F3-ZTu"> <rect key="frame" x="20" y="60" width="258" height="234"/> - <clipView key="contentView" copiesOnScroll="NO" id="WSV-03-bGb"> - <rect key="frame" x="1" y="1" width="256" height="232"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="55" rowSizeStyle="automatic" viewBased="YES" id="G70-dr-Lev"> - <rect key="frame" x="0.0" y="0.0" width="256" height="232"/> + <subviews> + <scrollView autohidesScrollers="YES" horizontalLineScroll="57" horizontalPageScroll="10" verticalLineScroll="57" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UTo-FA-QKH"> + <rect key="frame" x="0.0" y="0.0" width="258" height="234"/> + <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="WSV-03-bGb"> + <rect key="frame" x="1" y="1" width="256" height="232"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="55" rowSizeStyle="automatic" viewBased="YES" id="G70-dr-Lev"> + <rect key="frame" x="0.0" y="0.0" width="256" height="232"/> + <autoresizingMask key="autoresizingMask"/> + <size key="intercellSpacing" width="3" height="2"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> + <tableColumns> + <tableColumn identifier="videoColumn" width="253" minWidth="40" maxWidth="1000" id="rgp-QD-eqz"> + <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> + <font key="font" metaFont="smallSystem"/> + <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> + </tableHeaderCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="g8T-u3-MS3"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> + <prototypeCellViews> + <tableCellView identifier="TableCellVideoCodecItem" id="Qpg-Zb-T9n"> + <rect key="frame" x="1" y="1" width="253" height="50"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="om4-gk-lts"> + <rect key="frame" x="8" y="17" width="4" height="17"/> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="Xa9-B3-omn"> + <font key="font" metaFont="system"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> + <button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="Jqg-vt-p8h"> + <rect key="frame" x="223" y="16" width="22" height="18"/> + <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="fc5-w6-QxQ"> + <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + </button> + </subviews> + <constraints> + <constraint firstItem="Jqg-vt-p8h" firstAttribute="centerY" secondItem="om4-gk-lts" secondAttribute="centerY" id="Zky-BA-5D3"/> + <constraint firstItem="om4-gk-lts" firstAttribute="centerY" secondItem="Qpg-Zb-T9n" secondAttribute="centerY" id="jIo-04-kHf"/> + <constraint firstItem="om4-gk-lts" firstAttribute="leading" secondItem="Qpg-Zb-T9n" secondAttribute="leading" constant="10" id="k7j-fe-E1c"/> + <constraint firstAttribute="trailing" secondItem="Jqg-vt-p8h" secondAttribute="trailing" constant="10" id="kR5-Ms-8Yx"/> + </constraints> + </tableCellView> + <customView identifier="HoverRowView" id="7Rk-d9-r6b" customClass="HoverTableRowView"> + <rect key="frame" x="1" y="53" width="253" height="55"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + </customView> + </prototypeCellViews> + </tableColumn> + </tableColumns> + </tableView> + </subviews> + <nil key="backgroundColor"/> + </clipView> + <constraints> + <constraint firstAttribute="height" constant="234" id="nRV-j7-juG"/> + </constraints> + <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="dyi-1h-t85"> + <rect key="frame" x="1" y="217" width="236" height="16"/> <autoresizingMask key="autoresizingMask"/> - <size key="intercellSpacing" width="3" height="2"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> - <tableColumns> - <tableColumn identifier="videoColumn" width="253" minWidth="40" maxWidth="1000" id="rgp-QD-eqz"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> - </tableHeaderCell> - <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="g8T-u3-MS3"> - <font key="font" metaFont="system"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <prototypeCellViews> - <tableCellView identifier="TableCellVideoCodecItem" id="Qpg-Zb-T9n"> - <rect key="frame" x="1" y="1" width="253" height="50"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="om4-gk-lts"> - <rect key="frame" x="8" y="17" width="4" height="17"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="Xa9-B3-omn"> - <font key="font" metaFont="system"/> - <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="Jqg-vt-p8h"> - <rect key="frame" x="223" y="16" width="22" height="18"/> - <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="fc5-w6-QxQ"> - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - </button> - </subviews> - <constraints> - <constraint firstItem="Jqg-vt-p8h" firstAttribute="centerY" secondItem="om4-gk-lts" secondAttribute="centerY" id="Zky-BA-5D3"/> - <constraint firstItem="om4-gk-lts" firstAttribute="centerY" secondItem="Qpg-Zb-T9n" secondAttribute="centerY" id="jIo-04-kHf"/> - <constraint firstItem="om4-gk-lts" firstAttribute="leading" secondItem="Qpg-Zb-T9n" secondAttribute="leading" constant="10" id="k7j-fe-E1c"/> - <constraint firstAttribute="trailing" secondItem="Jqg-vt-p8h" secondAttribute="trailing" constant="10" id="kR5-Ms-8Yx"/> - </constraints> - </tableCellView> - <customView identifier="HoverRowView" id="7Rk-d9-r6b" customClass="HoverTableRowView"> - <rect key="frame" x="1" y="53" width="253" height="55"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - </customView> - </prototypeCellViews> - </tableColumn> - </tableColumns> - </tableView> - </subviews> - </clipView> + </scroller> + <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="zjK-A3-0Gt"> + <rect key="frame" x="224" y="17" width="15" height="102"/> + <autoresizingMask key="autoresizingMask"/> + </scroller> + </scrollView> + </subviews> <constraints> - <constraint firstAttribute="height" constant="234" id="nRV-j7-juG"/> + <constraint firstItem="UTo-FA-QKH" firstAttribute="top" secondItem="2II-F3-ZTu" secondAttribute="top" id="CsL-HN-O38"/> + <constraint firstItem="UTo-FA-QKH" firstAttribute="leading" secondItem="2II-F3-ZTu" secondAttribute="leading" id="HpT-XI-KGr"/> + <constraint firstAttribute="trailing" secondItem="UTo-FA-QKH" secondAttribute="trailing" id="TUF-EN-HRM"/> + <constraint firstAttribute="height" constant="234" id="b7Y-t1-1s8"/> + <constraint firstAttribute="bottom" secondItem="UTo-FA-QKH" secondAttribute="bottom" id="eQD-6M-Z4T"/> </constraints> - <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="dyi-1h-t85"> - <rect key="frame" x="1" y="217" width="236" height="16"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="zjK-A3-0Gt"> - <rect key="frame" x="224" y="17" width="15" height="102"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - </scrollView> + </visualEffectView> <button translatesAutoresizingMaskIntoConstraints="NO" id="Qhu-T5-27z"> <rect key="frame" x="20" y="60" width="258" height="234"/> <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="BQE-js-tpi"> @@ -877,23 +904,23 @@ <constraint firstItem="b3l-2o-HjY" firstAttribute="leading" secondItem="2Mn-Te-9rM" secondAttribute="leading" constant="20" id="2KR-Gu-KjU"/> <constraint firstItem="538-we-FTp" firstAttribute="top" secondItem="2Mn-Te-9rM" secondAttribute="top" constant="20" id="7Jm-gp-DWk"/> <constraint firstItem="BCX-Kv-VDH" firstAttribute="centerY" secondItem="b3l-2o-HjY" secondAttribute="centerY" id="7Sa-nf-9jI"/> + <constraint firstItem="2II-F3-ZTu" firstAttribute="bottom" secondItem="Qhu-T5-27z" secondAttribute="bottom" id="8yZ-gD-HrO"/> <constraint firstItem="538-we-FTp" firstAttribute="centerX" secondItem="2Mn-Te-9rM" secondAttribute="centerX" id="9n3-en-naF"/> - <constraint firstItem="UTo-FA-QKH" firstAttribute="leading" secondItem="2Mn-Te-9rM" secondAttribute="leading" constant="20" id="AJq-r9-P8x"/> - <constraint firstAttribute="trailing" secondItem="UTo-FA-QKH" secondAttribute="trailing" constant="20" id="ASs-6e-wbk"/> - <constraint firstItem="Qhu-T5-27z" firstAttribute="bottom" secondItem="UTo-FA-QKH" secondAttribute="bottom" id="Q73-Mh-LvS"/> - <constraint firstItem="Qhu-T5-27z" firstAttribute="leading" secondItem="UTo-FA-QKH" secondAttribute="leading" id="UMG-yw-zQY"/> + <constraint firstItem="2II-F3-ZTu" firstAttribute="trailing" secondItem="Qhu-T5-27z" secondAttribute="trailing" id="B30-WO-FEq"/> + <constraint firstItem="2II-F3-ZTu" firstAttribute="leading" secondItem="Qhu-T5-27z" secondAttribute="leading" id="EkW-nt-0NP"/> + <constraint firstItem="2II-F3-ZTu" firstAttribute="leading" secondItem="2Mn-Te-9rM" secondAttribute="leading" constant="20" id="FDJ-dF-USw"/> + <constraint firstItem="b3l-2o-HjY" firstAttribute="top" secondItem="2II-F3-ZTu" secondAttribute="bottom" constant="15" id="RlP-K7-02t"/> <constraint firstItem="BCX-Kv-VDH" firstAttribute="leading" secondItem="b3l-2o-HjY" secondAttribute="trailing" constant="20" id="eqG-6S-irw"/> - <constraint firstItem="Qhu-T5-27z" firstAttribute="trailing" secondItem="UTo-FA-QKH" secondAttribute="trailing" id="lMT-iM-KDK"/> + <constraint firstItem="Qhu-T5-27z" firstAttribute="top" secondItem="2II-F3-ZTu" secondAttribute="top" id="eu4-fI-vNP"/> <constraint firstAttribute="bottom" secondItem="b3l-2o-HjY" secondAttribute="bottom" constant="15" id="lmk-P7-gEi"/> - <constraint firstItem="Qhu-T5-27z" firstAttribute="top" secondItem="UTo-FA-QKH" secondAttribute="top" id="pJx-KH-yU4"/> - <constraint firstItem="b3l-2o-HjY" firstAttribute="top" secondItem="UTo-FA-QKH" secondAttribute="bottom" constant="15" id="upf-Z6-BPD"/> + <constraint firstAttribute="trailing" secondItem="2II-F3-ZTu" secondAttribute="trailing" constant="20" id="yhE-td-Hrb"/> </constraints> </view> <constraints> <constraint firstAttribute="width" constant="300" id="aDB-9b-0Yt"/> </constraints> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> </subviews> <constraints> diff --git a/ui/Base.lproj/AccAdvancedSip.xib b/ui/Base.lproj/AccAdvancedSip.xib index 812252cc594335f533a996385952562e44fcd4b0..b18e999f1cc018ebcad1ff1f99421cda0fdfba4e 100644 --- a/ui/Base.lproj/AccAdvancedSip.xib +++ b/ui/Base.lproj/AccAdvancedSip.xib @@ -2,6 +2,7 @@ <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> <dependencies> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/> + <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -119,8 +120,8 @@ <constraint firstItem="aBx-M9-wnx" firstAttribute="top" secondItem="ekW-LY-oqG" secondAttribute="bottom" constant="15" id="sGM-pf-0GL"/> </constraints> </view> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <box boxType="custom" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Zuz-jy-rLn"> <rect key="frame" x="0.0" y="1193" width="620" height="485"/> @@ -420,8 +421,8 @@ <constraints> <constraint firstAttribute="bottom" secondItem="Owe-Lu-zR2" secondAttribute="bottom" constant="20" id="jNF-F2-EkV"/> </constraints> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <box boxType="custom" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="ekM-Cg-DEo"> <rect key="frame" x="0.0" y="804" width="620" height="369"/> @@ -683,8 +684,8 @@ <constraints> <constraint firstAttribute="bottom" secondItem="vnG-dH-RtH" secondAttribute="bottom" constant="20" id="xeK-Nm-M8u"/> </constraints> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <box boxType="custom" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="A31-3Y-z4R"> <rect key="frame" x="0.0" y="632" width="620" height="152"/> @@ -784,8 +785,8 @@ <constraint firstItem="UJW-6B-wXE" firstAttribute="top" secondItem="8Y1-hZ-pq5" secondAttribute="bottom" constant="15" id="yff-Fx-MSk"/> </constraints> </view> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <box boxType="custom" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="cwV-lc-jju"> <rect key="frame" x="0.0" y="259" width="300" height="353"/> @@ -801,91 +802,104 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <scrollView autohidesScrollers="YES" horizontalLineScroll="57" horizontalPageScroll="10" verticalLineScroll="57" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TNe-in-0Y8"> + <visualEffectView blendingMode="behindWindow" material="sidebar" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="Ku2-cD-mLt"> <rect key="frame" x="20" y="60" width="258" height="234"/> - <clipView key="contentView" id="hf6-xl-LUZ"> - <rect key="frame" x="1" y="1" width="256" height="232"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="55" rowSizeStyle="automatic" viewBased="YES" id="2Rz-hA-d6u"> - <rect key="frame" x="0.0" y="0.0" width="256" height="232"/> + <subviews> + <scrollView autohidesScrollers="YES" horizontalLineScroll="57" horizontalPageScroll="10" verticalLineScroll="57" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TNe-in-0Y8"> + <rect key="frame" x="0.0" y="0.0" width="258" height="234"/> + <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="hf6-xl-LUZ"> + <rect key="frame" x="1" y="1" width="256" height="232"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="55" rowSizeStyle="automatic" viewBased="YES" id="2Rz-hA-d6u"> + <rect key="frame" x="0.0" y="0.0" width="256" height="232"/> + <autoresizingMask key="autoresizingMask"/> + <size key="intercellSpacing" width="3" height="2"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> + <tableColumns> + <tableColumn width="253" minWidth="40" maxWidth="1000" id="uKm-dm-acu"> + <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> + <font key="font" metaFont="smallSystem"/> + <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> + </tableHeaderCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="RIj-rT-gSd"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> + <prototypeCellViews> + <tableCellView identifier="TableCellAudioCodecItem" id="ulQ-P6-xcE"> + <rect key="frame" x="1" y="1" width="253" height="50"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="5gU-T9-soP"> + <rect key="frame" x="8" y="23" width="4" height="17"/> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="w28-hI-XpH"> + <font key="font" metaFont="system"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="lCy-rx-Hyp"> + <rect key="frame" x="8" y="7" width="4" height="16"/> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="Cuh-q7-eh4"> + <font key="font" metaFont="systemLight" size="12"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> + <button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="c3n-Ly-MJo"> + <rect key="frame" x="223" y="5" width="22" height="18"/> + <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="ZwY-sj-Dle"> + <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + </button> + </subviews> + <constraints> + <constraint firstItem="lCy-rx-Hyp" firstAttribute="top" secondItem="5gU-T9-soP" secondAttribute="bottom" id="Jmm-4A-bgx"/> + <constraint firstItem="5gU-T9-soP" firstAttribute="top" secondItem="ulQ-P6-xcE" secondAttribute="top" constant="10" id="L8b-Cx-MnC"/> + <constraint firstItem="lCy-rx-Hyp" firstAttribute="leading" secondItem="ulQ-P6-xcE" secondAttribute="leading" constant="10" id="UTb-UD-bL0"/> + <constraint firstItem="5gU-T9-soP" firstAttribute="leading" secondItem="ulQ-P6-xcE" secondAttribute="leading" constant="10" id="fdO-uM-Bb7"/> + <constraint firstAttribute="trailing" secondItem="c3n-Ly-MJo" secondAttribute="trailing" constant="10" id="l0P-pa-1dG"/> + <constraint firstItem="c3n-Ly-MJo" firstAttribute="bottom" secondItem="lCy-rx-Hyp" secondAttribute="bottom" id="mlJ-HI-emi"/> + </constraints> + </tableCellView> + <customView identifier="HoverRowView" id="KlT-ey-0Jg" customClass="HoverTableRowView"> + <rect key="frame" x="1" y="53" width="253" height="55"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + </customView> + </prototypeCellViews> + </tableColumn> + </tableColumns> + </tableView> + </subviews> + <nil key="backgroundColor"/> + </clipView> + <constraints> + <constraint firstAttribute="height" constant="234" id="0p8-WN-wM4"/> + </constraints> + <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Ba0-vO-MMF"> + <rect key="frame" x="1" y="217" width="236" height="16"/> <autoresizingMask key="autoresizingMask"/> - <size key="intercellSpacing" width="3" height="2"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> - <tableColumns> - <tableColumn width="253" minWidth="40" maxWidth="1000" id="uKm-dm-acu"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> - </tableHeaderCell> - <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="RIj-rT-gSd"> - <font key="font" metaFont="system"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <prototypeCellViews> - <tableCellView identifier="TableCellAudioCodecItem" id="ulQ-P6-xcE"> - <rect key="frame" x="1" y="1" width="253" height="50"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="5gU-T9-soP"> - <rect key="frame" x="8" y="23" width="4" height="17"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="w28-hI-XpH"> - <font key="font" metaFont="system"/> - <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="lCy-rx-Hyp"> - <rect key="frame" x="8" y="7" width="4" height="16"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="Cuh-q7-eh4"> - <font key="font" metaFont="systemLight" size="12"/> - <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <button verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="c3n-Ly-MJo"> - <rect key="frame" x="223" y="5" width="22" height="18"/> - <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="ZwY-sj-Dle"> - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - </button> - </subviews> - <constraints> - <constraint firstItem="lCy-rx-Hyp" firstAttribute="top" secondItem="5gU-T9-soP" secondAttribute="bottom" id="Jmm-4A-bgx"/> - <constraint firstItem="5gU-T9-soP" firstAttribute="top" secondItem="ulQ-P6-xcE" secondAttribute="top" constant="10" id="L8b-Cx-MnC"/> - <constraint firstItem="lCy-rx-Hyp" firstAttribute="leading" secondItem="ulQ-P6-xcE" secondAttribute="leading" constant="10" id="UTb-UD-bL0"/> - <constraint firstItem="5gU-T9-soP" firstAttribute="leading" secondItem="ulQ-P6-xcE" secondAttribute="leading" constant="10" id="fdO-uM-Bb7"/> - <constraint firstAttribute="trailing" secondItem="c3n-Ly-MJo" secondAttribute="trailing" constant="10" id="l0P-pa-1dG"/> - <constraint firstItem="c3n-Ly-MJo" firstAttribute="bottom" secondItem="lCy-rx-Hyp" secondAttribute="bottom" id="mlJ-HI-emi"/> - </constraints> - </tableCellView> - <customView identifier="HoverRowView" id="KlT-ey-0Jg" customClass="HoverTableRowView"> - <rect key="frame" x="1" y="53" width="253" height="55"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - </customView> - </prototypeCellViews> - </tableColumn> - </tableColumns> - </tableView> - </subviews> - </clipView> + </scroller> + <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="0ta-9B-BZm"> + <rect key="frame" x="224" y="17" width="15" height="102"/> + <autoresizingMask key="autoresizingMask"/> + </scroller> + </scrollView> + </subviews> <constraints> - <constraint firstAttribute="height" constant="234" id="0p8-WN-wM4"/> + <constraint firstAttribute="bottom" secondItem="TNe-in-0Y8" secondAttribute="bottom" id="8gD-iR-IsF"/> + <constraint firstItem="TNe-in-0Y8" firstAttribute="leading" secondItem="Ku2-cD-mLt" secondAttribute="leading" id="Bmk-Bg-oFC"/> + <constraint firstItem="TNe-in-0Y8" firstAttribute="top" secondItem="Ku2-cD-mLt" secondAttribute="top" id="Q3f-ql-cdk"/> + <constraint firstAttribute="height" constant="234" id="l1B-7o-g40"/> + <constraint firstAttribute="trailing" secondItem="TNe-in-0Y8" secondAttribute="trailing" id="s9Y-hW-qhG"/> </constraints> - <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Ba0-vO-MMF"> - <rect key="frame" x="1" y="217" width="236" height="16"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="0ta-9B-BZm"> - <rect key="frame" x="224" y="17" width="15" height="102"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - </scrollView> + </visualEffectView> <button translatesAutoresizingMaskIntoConstraints="NO" id="MNL-tv-RBX"> <rect key="frame" x="20" y="15" width="30" height="30"/> <constraints> @@ -913,23 +927,23 @@ </button> </subviews> <constraints> - <constraint firstItem="TNe-in-0Y8" firstAttribute="leading" secondItem="IbY-sT-yW4" secondAttribute="leading" constant="20" id="5i0-Do-O8P"/> <constraint firstAttribute="bottom" secondItem="MNL-tv-RBX" secondAttribute="bottom" constant="15" id="7XY-DU-xIh"/> <constraint firstItem="1kN-Si-ACF" firstAttribute="centerY" secondItem="MNL-tv-RBX" secondAttribute="centerY" id="E2o-By-0Xa"/> - <constraint firstItem="TNe-in-0Y8" firstAttribute="top" secondItem="osV-5h-omr" secondAttribute="bottom" constant="20" id="Tz9-O7-CF2"/> + <constraint firstItem="MNL-tv-RBX" firstAttribute="top" secondItem="Ku2-cD-mLt" secondAttribute="bottom" constant="15" id="RfG-mP-GDa"/> <constraint firstItem="MNL-tv-RBX" firstAttribute="leading" secondItem="IbY-sT-yW4" secondAttribute="leading" constant="20" id="VTO-0E-f5J"/> <constraint firstItem="1kN-Si-ACF" firstAttribute="leading" secondItem="MNL-tv-RBX" secondAttribute="trailing" constant="20" id="Y7J-4Z-zv2"/> - <constraint firstItem="MNL-tv-RBX" firstAttribute="top" secondItem="TNe-in-0Y8" secondAttribute="bottom" constant="15" id="Ze1-Ow-5Ng"/> <constraint firstItem="osV-5h-omr" firstAttribute="top" secondItem="IbY-sT-yW4" secondAttribute="top" constant="20" id="kck-Eh-nhf"/> + <constraint firstItem="Ku2-cD-mLt" firstAttribute="top" secondItem="osV-5h-omr" secondAttribute="bottom" constant="20" id="mdH-Fp-9Ml"/> + <constraint firstItem="Ku2-cD-mLt" firstAttribute="leading" secondItem="IbY-sT-yW4" secondAttribute="leading" constant="20" id="oIU-An-Js2"/> <constraint firstItem="osV-5h-omr" firstAttribute="centerX" secondItem="IbY-sT-yW4" secondAttribute="centerX" id="rxE-kK-0Qa"/> - <constraint firstAttribute="trailing" secondItem="TNe-in-0Y8" secondAttribute="trailing" constant="20" id="s1f-iQ-uIZ"/> + <constraint firstAttribute="trailing" secondItem="Ku2-cD-mLt" secondAttribute="trailing" constant="20" id="ymV-Uh-cwD"/> </constraints> </view> <constraints> <constraint firstAttribute="width" constant="300" id="wHU-iX-91g"/> </constraints> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <box boxType="custom" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="MBR-AC-HFq"> <rect key="frame" x="319" y="259" width="300" height="353"/> @@ -974,81 +988,94 @@ <constraint firstAttribute="trailing" secondItem="ogP-69-5zZ" secondAttribute="trailing" id="B8w-Y3-qVq"/> </constraints> </box> - <scrollView autohidesScrollers="YES" horizontalLineScroll="57" horizontalPageScroll="10" verticalLineScroll="57" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TK9-rV-fbS"> + <visualEffectView blendingMode="behindWindow" material="sidebar" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="2g2-8B-iIO"> <rect key="frame" x="20" y="60" width="258" height="234"/> - <clipView key="contentView" copiesOnScroll="NO" id="DEy-oQ-HGz"> - <rect key="frame" x="1" y="1" width="256" height="232"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="55" rowSizeStyle="automatic" viewBased="YES" id="LDg-9Z-yNi"> - <rect key="frame" x="0.0" y="0.0" width="256" height="232"/> + <subviews> + <scrollView autohidesScrollers="YES" horizontalLineScroll="57" horizontalPageScroll="10" verticalLineScroll="57" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TK9-rV-fbS"> + <rect key="frame" x="0.0" y="0.0" width="258" height="234"/> + <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="DEy-oQ-HGz"> + <rect key="frame" x="1" y="1" width="256" height="232"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="55" rowSizeStyle="automatic" viewBased="YES" id="LDg-9Z-yNi"> + <rect key="frame" x="0.0" y="0.0" width="256" height="232"/> + <autoresizingMask key="autoresizingMask"/> + <size key="intercellSpacing" width="3" height="2"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> + <tableColumns> + <tableColumn identifier="videoColumn" width="253" minWidth="40" maxWidth="1000" id="Zfb-Ff-2UD"> + <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> + <font key="font" metaFont="smallSystem"/> + <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> + </tableHeaderCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="jgX-tQ-dIA"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> + <prototypeCellViews> + <tableCellView identifier="TableCellVideoCodecItem" id="AJQ-gQ-CYM"> + <rect key="frame" x="1" y="1" width="253" height="50"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="9u7-iW-u8m"> + <rect key="frame" x="8" y="17" width="4" height="17"/> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="9JT-Mo-i2i"> + <font key="font" metaFont="system"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> + <button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="5FI-uT-Eg9"> + <rect key="frame" x="223" y="16" width="22" height="18"/> + <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="7Ra-Rx-VYM"> + <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + </button> + </subviews> + <constraints> + <constraint firstItem="9u7-iW-u8m" firstAttribute="leading" secondItem="AJQ-gQ-CYM" secondAttribute="leading" constant="10" id="7C2-rc-3MG"/> + <constraint firstItem="5FI-uT-Eg9" firstAttribute="centerY" secondItem="9u7-iW-u8m" secondAttribute="centerY" id="KO9-yG-j10"/> + <constraint firstAttribute="trailing" secondItem="5FI-uT-Eg9" secondAttribute="trailing" constant="10" id="cmr-0I-M9x"/> + <constraint firstItem="9u7-iW-u8m" firstAttribute="centerY" secondItem="AJQ-gQ-CYM" secondAttribute="centerY" id="cuw-7X-p31"/> + </constraints> + </tableCellView> + <customView identifier="HoverRowView" id="HCw-kt-Qvi" customClass="HoverTableRowView"> + <rect key="frame" x="1" y="53" width="253" height="55"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + </customView> + </prototypeCellViews> + </tableColumn> + </tableColumns> + </tableView> + </subviews> + <nil key="backgroundColor"/> + </clipView> + <constraints> + <constraint firstAttribute="height" constant="234" id="Ie1-uA-KFc"/> + </constraints> + <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="6f3-tz-lVA"> + <rect key="frame" x="1" y="217" width="236" height="16"/> <autoresizingMask key="autoresizingMask"/> - <size key="intercellSpacing" width="3" height="2"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> - <tableColumns> - <tableColumn identifier="videoColumn" width="253" minWidth="40" maxWidth="1000" id="Zfb-Ff-2UD"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> - </tableHeaderCell> - <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="jgX-tQ-dIA"> - <font key="font" metaFont="system"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <prototypeCellViews> - <tableCellView identifier="TableCellVideoCodecItem" id="AJQ-gQ-CYM"> - <rect key="frame" x="1" y="1" width="253" height="50"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="9u7-iW-u8m"> - <rect key="frame" x="8" y="17" width="4" height="17"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="9JT-Mo-i2i"> - <font key="font" metaFont="system"/> - <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <button verticalHuggingPriority="750" tag="5" translatesAutoresizingMaskIntoConstraints="NO" id="5FI-uT-Eg9"> - <rect key="frame" x="223" y="16" width="22" height="18"/> - <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="7Ra-Rx-VYM"> - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - </button> - </subviews> - <constraints> - <constraint firstItem="9u7-iW-u8m" firstAttribute="leading" secondItem="AJQ-gQ-CYM" secondAttribute="leading" constant="10" id="7C2-rc-3MG"/> - <constraint firstItem="5FI-uT-Eg9" firstAttribute="centerY" secondItem="9u7-iW-u8m" secondAttribute="centerY" id="KO9-yG-j10"/> - <constraint firstAttribute="trailing" secondItem="5FI-uT-Eg9" secondAttribute="trailing" constant="10" id="cmr-0I-M9x"/> - <constraint firstItem="9u7-iW-u8m" firstAttribute="centerY" secondItem="AJQ-gQ-CYM" secondAttribute="centerY" id="cuw-7X-p31"/> - </constraints> - </tableCellView> - <customView identifier="HoverRowView" id="HCw-kt-Qvi" customClass="HoverTableRowView"> - <rect key="frame" x="1" y="53" width="253" height="55"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - </customView> - </prototypeCellViews> - </tableColumn> - </tableColumns> - </tableView> - </subviews> - </clipView> + </scroller> + <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="oWf-ht-xYu"> + <rect key="frame" x="224" y="17" width="15" height="102"/> + <autoresizingMask key="autoresizingMask"/> + </scroller> + </scrollView> + </subviews> <constraints> - <constraint firstAttribute="height" constant="234" id="Ie1-uA-KFc"/> + <constraint firstAttribute="height" constant="234" id="PEa-g4-cjK"/> + <constraint firstAttribute="trailing" secondItem="TK9-rV-fbS" secondAttribute="trailing" id="Tnu-f8-kf2"/> + <constraint firstItem="TK9-rV-fbS" firstAttribute="top" secondItem="2g2-8B-iIO" secondAttribute="top" id="Vcf-Tg-T0Q"/> + <constraint firstItem="TK9-rV-fbS" firstAttribute="leading" secondItem="2g2-8B-iIO" secondAttribute="leading" id="dAr-fr-JHu"/> + <constraint firstAttribute="bottom" secondItem="TK9-rV-fbS" secondAttribute="bottom" id="x5g-By-X2t"/> </constraints> - <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="6f3-tz-lVA"> - <rect key="frame" x="1" y="217" width="236" height="16"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="oWf-ht-xYu"> - <rect key="frame" x="224" y="17" width="15" height="102"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - </scrollView> + </visualEffectView> <button translatesAutoresizingMaskIntoConstraints="NO" id="3yP-KT-ImU"> <rect key="frame" x="20" y="60" width="258" height="234"/> <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="Vuy-o9-KYJ"> @@ -1087,25 +1114,25 @@ </subviews> <constraints> <constraint firstItem="zfP-ST-2Sy" firstAttribute="leading" secondItem="QYm-Mt-xrr" secondAttribute="trailing" constant="20" id="2FZ-hk-CBE"/> + <constraint firstItem="2g2-8B-iIO" firstAttribute="bottom" secondItem="3yP-KT-ImU" secondAttribute="bottom" id="73h-72-Bxz"/> <constraint firstItem="l86-cH-pp8" firstAttribute="centerX" secondItem="GCQ-FX-4t9" secondAttribute="centerX" id="AJ0-vq-pyB"/> - <constraint firstAttribute="trailing" secondItem="TK9-rV-fbS" secondAttribute="trailing" constant="20" id="DSn-rM-EsD"/> - <constraint firstItem="3yP-KT-ImU" firstAttribute="top" secondItem="TK9-rV-fbS" secondAttribute="top" id="KOJ-tQ-QaL"/> <constraint firstItem="zfP-ST-2Sy" firstAttribute="centerY" secondItem="QYm-Mt-xrr" secondAttribute="centerY" id="MPS-yz-Qe7"/> + <constraint firstItem="2g2-8B-iIO" firstAttribute="leading" secondItem="GCQ-FX-4t9" secondAttribute="leading" constant="20" id="McW-WR-hQ4"/> <constraint firstItem="l86-cH-pp8" firstAttribute="top" secondItem="GCQ-FX-4t9" secondAttribute="top" constant="20" id="Rie-BP-PiE"/> - <constraint firstItem="QYm-Mt-xrr" firstAttribute="top" secondItem="TK9-rV-fbS" secondAttribute="bottom" constant="15" id="VlZ-hE-aNv"/> - <constraint firstItem="3yP-KT-ImU" firstAttribute="leading" secondItem="TK9-rV-fbS" secondAttribute="leading" id="g2x-UC-H16"/> + <constraint firstAttribute="trailing" secondItem="2g2-8B-iIO" secondAttribute="trailing" constant="20" id="VH8-Za-mDm"/> + <constraint firstItem="2g2-8B-iIO" firstAttribute="leading" secondItem="3yP-KT-ImU" secondAttribute="leading" id="VZp-3N-JvQ"/> <constraint firstItem="QYm-Mt-xrr" firstAttribute="leading" secondItem="GCQ-FX-4t9" secondAttribute="leading" constant="20" id="gH0-u7-39U"/> - <constraint firstItem="3yP-KT-ImU" firstAttribute="bottom" secondItem="TK9-rV-fbS" secondAttribute="bottom" id="mWD-8B-XOp"/> + <constraint firstItem="2g2-8B-iIO" firstAttribute="trailing" secondItem="3yP-KT-ImU" secondAttribute="trailing" id="qU9-hc-vk1"/> <constraint firstAttribute="bottom" secondItem="QYm-Mt-xrr" secondAttribute="bottom" constant="15" id="svs-Gg-VMI"/> - <constraint firstItem="TK9-rV-fbS" firstAttribute="leading" secondItem="GCQ-FX-4t9" secondAttribute="leading" constant="20" id="tc2-4w-qOU"/> - <constraint firstItem="3yP-KT-ImU" firstAttribute="trailing" secondItem="TK9-rV-fbS" secondAttribute="trailing" id="uAf-DH-och"/> + <constraint firstItem="QYm-Mt-xrr" firstAttribute="top" secondItem="2g2-8B-iIO" secondAttribute="bottom" constant="15" id="vzV-cr-NMF"/> + <constraint firstItem="2g2-8B-iIO" firstAttribute="top" secondItem="3yP-KT-ImU" secondAttribute="top" id="zqS-Ol-t3b"/> </constraints> </view> <constraints> <constraint firstAttribute="width" constant="300" id="dxj-bU-vaM"/> </constraints> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <box boxType="custom" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="wyZ-Hb-BNf"> <rect key="frame" x="0.0" y="20" width="620" height="219"/> @@ -1310,8 +1337,8 @@ <constraint firstItem="fgZ-CW-Fvh" firstAttribute="leading" secondItem="z9P-Rk-RQN" secondAttribute="trailing" constant="10" id="vMb-el-uDN"/> </constraints> </view> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> </subviews> <constraints> diff --git a/ui/Base.lproj/AccRingGeneral.xib b/ui/Base.lproj/AccRingGeneral.xib index 1f0f4feb6a157560e028a37218bdb1f8a75c779b..6c35795d92442669cd78a2c9e68e3c575c7554f7 100644 --- a/ui/Base.lproj/AccRingGeneral.xib +++ b/ui/Base.lproj/AccRingGeneral.xib @@ -2,14 +2,15 @@ <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/> + <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="AccRingGeneralVC"> <connections> <outlet property="addProfilePhotoImage" destination="Lsc-U9-fTH" id="G9k-ly-ijQ"/> - <outlet property="advancedButtonMarginConstraint" destination="d6X-pJ-G6r" id="Nwf-LQ-nhc"/> - <outlet property="bannedContactHeightConstraint" destination="TeK-1Q-aAk" id="FyO-eM-cLc"/> + <outlet property="advancedButtonMarginConstraint" destination="9ET-E5-F0k" id="zEw-dH-YpR"/> + <outlet property="bannedContactHeightConstraint" destination="Oyx-FU-ni1" id="Kye-yG-CHK"/> <outlet property="blockedContactsTableView" destination="aau-IO-oSs" id="Vek-r1-CDK"/> <outlet property="devicesTableView" destination="Zw2-AJ-V23" id="fdL-VK-1ao"/> <outlet property="displayNameField" destination="n2O-cF-oZh" id="EaH-qO-DhI"/> @@ -35,8 +36,8 @@ <rect key="frame" x="1" y="1" width="618" height="465"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> </view> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oMU-r6-ptk"> <rect key="frame" x="266" y="479" width="63" height="18"/> @@ -154,7 +155,7 @@ <real value="3.4028234663852886e+38"/> </customSpacing> </stackView> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hsy-0z-bp6"> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hsy-0z-bp6"> <rect key="frame" x="18" y="290" width="98" height="17"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Linked devices" id="oga-WC-4gb"> <font key="font" metaFont="systemSemibold" size="13"/> @@ -162,111 +163,123 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <scrollView autohidesScrollers="YES" horizontalLineScroll="52" horizontalPageScroll="10" verticalLineScroll="52" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1uj-O6-qH5"> + <visualEffectView blendingMode="behindWindow" material="sidebar" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="pzl-nx-92N"> <rect key="frame" x="20" y="125" width="580" height="150"/> - <clipView key="contentView" drawsBackground="NO" id="wA7-kx-iIb"> - <rect key="frame" x="1" y="1" width="578" height="148"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="50" rowSizeStyle="automatic" viewBased="YES" id="Zw2-AJ-V23"> - <rect key="frame" x="0.0" y="0.0" width="578" height="148"/> - <autoresizingMask key="autoresizingMask"/> - <size key="intercellSpacing" width="3" height="2"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> - <tableColumns> - <tableColumn width="575" minWidth="40" maxWidth="1000" id="Smk-YT-73t"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> - </tableHeaderCell> - <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="yYf-Ei-lMG"> - <font key="font" metaFont="system"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <prototypeCellViews> - <tableCellView identifier="TableCellDeviceItem" id="Zdu-FI-UVL"> - <rect key="frame" x="1" y="1" width="575" height="50"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="9mA-na-5lo"> - <rect key="frame" x="8" y="24" width="4" height="16"/> - <constraints> - <constraint firstAttribute="height" constant="16" id="DlG-hp-nhb"/> - </constraints> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="AWj-hh-tfI"> - <font key="font" metaFont="system"/> - <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="300" translatesAutoresizingMaskIntoConstraints="NO" id="fVS-Vh-6Lp"> - <rect key="frame" x="8" y="10" width="4" height="14"/> + <subviews> + <scrollView autohidesScrollers="YES" horizontalLineScroll="52" horizontalPageScroll="10" verticalLineScroll="52" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1uj-O6-qH5"> + <rect key="frame" x="0.0" y="0.0" width="580" height="150"/> + <clipView key="contentView" drawsBackground="NO" id="wA7-kx-iIb"> + <rect key="frame" x="1" y="1" width="578" height="148"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="50" rowSizeStyle="automatic" viewBased="YES" id="Zw2-AJ-V23"> + <rect key="frame" x="0.0" y="0.0" width="578" height="148"/> + <autoresizingMask key="autoresizingMask"/> + <size key="intercellSpacing" width="3" height="2"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> + <tableColumns> + <tableColumn width="575" minWidth="40" maxWidth="1000" id="Smk-YT-73t"> + <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> + <font key="font" metaFont="smallSystem"/> + <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> + </tableHeaderCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="yYf-Ei-lMG"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> + <prototypeCellViews> + <tableCellView identifier="TableCellDeviceItem" id="Zdu-FI-UVL"> + <rect key="frame" x="1" y="1" width="575" height="50"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="9mA-na-5lo"> + <rect key="frame" x="8" y="24" width="4" height="16"/> + <constraints> + <constraint firstAttribute="height" constant="16" id="DlG-hp-nhb"/> + </constraints> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="AWj-hh-tfI"> + <font key="font" metaFont="system"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="300" translatesAutoresizingMaskIntoConstraints="NO" id="fVS-Vh-6Lp"> + <rect key="frame" x="8" y="10" width="4" height="14"/> + <constraints> + <constraint firstAttribute="height" constant="14" id="b5Z-j9-aoY"/> + </constraints> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="7kJ-4c-Kzw"> + <font key="font" metaFont="systemLight" size="12"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> + <button toolTip="Edit name" verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="WEo-a0-wVL"> + <rect key="frame" x="544" y="10" width="21" height="30"/> + <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSTouchBarComposeTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="9s6-G8-rME"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + </button> + <button toolTip="Revoke" verticalHuggingPriority="750" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="lrB-j5-Mvy"> + <rect key="frame" x="550" y="10" width="15" height="30"/> + <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSTouchBarDeleteTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="RWW-Og-9Ua"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + <connections> + <action selector="revokeDevice:" target="-2" id="0k3-TF-SMG"/> + </connections> + </button> + </subviews> <constraints> - <constraint firstAttribute="height" constant="14" id="b5Z-j9-aoY"/> + <constraint firstAttribute="trailing" secondItem="lrB-j5-Mvy" secondAttribute="trailing" constant="10" id="0f4-4L-vPe"/> + <constraint firstItem="fVS-Vh-6Lp" firstAttribute="leading" secondItem="Zdu-FI-UVL" secondAttribute="leading" constant="10" id="8Gc-s8-84g"/> + <constraint firstItem="WEo-a0-wVL" firstAttribute="bottom" secondItem="fVS-Vh-6Lp" secondAttribute="bottom" id="E29-TO-Sgm"/> + <constraint firstItem="lrB-j5-Mvy" firstAttribute="bottom" secondItem="fVS-Vh-6Lp" secondAttribute="bottom" id="HfC-0N-vdA"/> + <constraint firstAttribute="bottom" secondItem="fVS-Vh-6Lp" secondAttribute="bottom" constant="10" id="OIT-Im-NYp"/> + <constraint firstAttribute="trailing" secondItem="WEo-a0-wVL" secondAttribute="trailing" constant="10" id="P8g-lG-Rm0"/> + <constraint firstItem="fVS-Vh-6Lp" firstAttribute="top" secondItem="9mA-na-5lo" secondAttribute="bottom" id="RCk-FF-m2I"/> + <constraint firstItem="9mA-na-5lo" firstAttribute="top" secondItem="Zdu-FI-UVL" secondAttribute="top" constant="10" id="SGM-YE-MPb"/> + <constraint firstItem="9mA-na-5lo" firstAttribute="leading" secondItem="Zdu-FI-UVL" secondAttribute="leading" constant="10" id="SfI-vb-cXg"/> </constraints> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="7kJ-4c-Kzw"> - <font key="font" metaFont="systemLight" size="12"/> - <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <button toolTip="Edit name" verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="WEo-a0-wVL"> - <rect key="frame" x="544" y="10" width="21" height="30"/> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSTouchBarComposeTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="9s6-G8-rME"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - </button> - <button toolTip="Revoke" verticalHuggingPriority="750" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="lrB-j5-Mvy"> - <rect key="frame" x="550" y="10" width="15" height="30"/> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSTouchBarDeleteTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="RWW-Og-9Ua"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - <connections> - <action selector="revokeDevice:" target="-2" id="0k3-TF-SMG"/> - </connections> - </button> - </subviews> - <constraints> - <constraint firstAttribute="trailing" secondItem="lrB-j5-Mvy" secondAttribute="trailing" constant="10" id="0f4-4L-vPe"/> - <constraint firstItem="fVS-Vh-6Lp" firstAttribute="leading" secondItem="Zdu-FI-UVL" secondAttribute="leading" constant="10" id="8Gc-s8-84g"/> - <constraint firstItem="WEo-a0-wVL" firstAttribute="bottom" secondItem="fVS-Vh-6Lp" secondAttribute="bottom" id="E29-TO-Sgm"/> - <constraint firstItem="lrB-j5-Mvy" firstAttribute="bottom" secondItem="fVS-Vh-6Lp" secondAttribute="bottom" id="HfC-0N-vdA"/> - <constraint firstAttribute="bottom" secondItem="fVS-Vh-6Lp" secondAttribute="bottom" constant="10" id="OIT-Im-NYp"/> - <constraint firstAttribute="trailing" secondItem="WEo-a0-wVL" secondAttribute="trailing" constant="10" id="P8g-lG-Rm0"/> - <constraint firstItem="fVS-Vh-6Lp" firstAttribute="top" secondItem="9mA-na-5lo" secondAttribute="bottom" id="RCk-FF-m2I"/> - <constraint firstItem="9mA-na-5lo" firstAttribute="top" secondItem="Zdu-FI-UVL" secondAttribute="top" constant="10" id="SGM-YE-MPb"/> - <constraint firstItem="9mA-na-5lo" firstAttribute="leading" secondItem="Zdu-FI-UVL" secondAttribute="leading" constant="10" id="SfI-vb-cXg"/> - </constraints> - </tableCellView> - <customView identifier="HoverRowView" id="CPL-go-ebR" customClass="HoverTableRowView"> - <rect key="frame" x="1" y="53" width="575" height="50"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - </customView> - </prototypeCellViews> - </tableColumn> - </tableColumns> - </tableView> - </subviews> - <nil key="backgroundColor"/> - </clipView> + </tableCellView> + <customView identifier="HoverRowView" id="CPL-go-ebR" customClass="HoverTableRowView"> + <rect key="frame" x="1" y="53" width="575" height="50"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + </customView> + </prototypeCellViews> + </tableColumn> + </tableColumns> + </tableView> + </subviews> + <nil key="backgroundColor"/> + </clipView> + <constraints> + <constraint firstAttribute="height" constant="150" id="Sca-Sh-Zm3"/> + </constraints> + <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="QUF-D7-MhJ"> + <rect key="frame" x="1" y="133" width="578" height="16"/> + <autoresizingMask key="autoresizingMask"/> + </scroller> + <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="RnI-3s-sSx"> + <rect key="frame" x="224" y="17" width="15" height="102"/> + <autoresizingMask key="autoresizingMask"/> + </scroller> + </scrollView> + </subviews> <constraints> - <constraint firstAttribute="height" constant="150" id="Sca-Sh-Zm3"/> + <constraint firstItem="1uj-O6-qH5" firstAttribute="top" secondItem="pzl-nx-92N" secondAttribute="top" id="3d5-0j-3kl"/> + <constraint firstAttribute="bottom" secondItem="1uj-O6-qH5" secondAttribute="bottom" id="clO-7L-KAO"/> + <constraint firstAttribute="trailing" secondItem="1uj-O6-qH5" secondAttribute="trailing" id="hAh-ad-l9w"/> + <constraint firstAttribute="height" constant="150" id="unJ-Hh-cMb"/> + <constraint firstItem="1uj-O6-qH5" firstAttribute="leading" secondItem="pzl-nx-92N" secondAttribute="leading" id="zm5-fQ-k8B"/> </constraints> - <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="QUF-D7-MhJ"> - <rect key="frame" x="1" y="133" width="578" height="16"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="RnI-3s-sSx"> - <rect key="frame" x="224" y="17" width="15" height="102"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - </scrollView> + </visualEffectView> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2IE-yO-TDJ"> <rect key="frame" x="190" y="479" width="70" height="17"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Account" id="uLQ-MS-pZ7"> @@ -371,98 +384,108 @@ <action selector="showBanned:" target="-2" id="NGm-xz-gry"/> </connections> </button> - <scrollView hidden="YES" autohidesScrollers="YES" horizontalLineScroll="1" horizontalPageScroll="10" verticalLineScroll="1" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="Y8L-GO-1Qy"> + <visualEffectView hidden="YES" blendingMode="behindWindow" material="sidebar" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="V7F-5u-Bko"> <rect key="frame" x="20" y="71" width="580" height="2"/> - <clipView key="contentView" copiesOnScroll="NO" id="VXO-tS-9it"> - <rect key="frame" x="1" y="1" width="578" height="0.0"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="1" viewBased="YES" id="aau-IO-oSs"> - <rect key="frame" x="0.0" y="0.0" width="578" height="104"/> - <autoresizingMask key="autoresizingMask"/> - <size key="intercellSpacing" width="3" height="0.0"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> - <tableColumns> - <tableColumn width="575" maxWidth="1000" id="Ow9-IO-1MA"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> - </tableHeaderCell> - <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="aQL-hX-CfA"> - <font key="font" metaFont="system"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <prototypeCellViews> - <tableCellView identifier="TableCellBannedContactItem" id="wsF-ON-kL6"> - <rect key="frame" x="1" y="0.0" width="575" height="52"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="600" translatesAutoresizingMaskIntoConstraints="NO" id="p7k-Ue-2dM"> - <rect key="frame" x="8" y="24" width="4" height="18"/> - <constraints> - <constraint firstAttribute="height" constant="18" id="9no-65-Pmw"/> - </constraints> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="XpV-WE-tFg"> - <font key="font" metaFont="system"/> - <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="700" translatesAutoresizingMaskIntoConstraints="NO" id="g9g-T3-gcp"> - <rect key="frame" x="8" y="10" width="4" height="14"/> + <subviews> + <scrollView autohidesScrollers="YES" horizontalLineScroll="1" horizontalPageScroll="10" verticalLineScroll="1" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="Y8L-GO-1Qy"> + <rect key="frame" x="0.0" y="0.0" width="580" height="2"/> + <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="VXO-tS-9it"> + <rect key="frame" x="1" y="1" width="578" height="0.0"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="1" viewBased="YES" id="aau-IO-oSs"> + <rect key="frame" x="0.0" y="0.0" width="578" height="52"/> + <autoresizingMask key="autoresizingMask"/> + <size key="intercellSpacing" width="3" height="0.0"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> + <tableColumns> + <tableColumn width="575" maxWidth="1000" id="Ow9-IO-1MA"> + <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> + <font key="font" metaFont="smallSystem"/> + <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> + </tableHeaderCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="aQL-hX-CfA"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> + <prototypeCellViews> + <tableCellView identifier="TableCellBannedContactItem" misplaced="YES" id="wsF-ON-kL6"> + <rect key="frame" x="1" y="0.0" width="575" height="0.0"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="600" translatesAutoresizingMaskIntoConstraints="NO" id="p7k-Ue-2dM"> + <rect key="frame" x="8" y="24" width="4" height="18"/> + <constraints> + <constraint firstAttribute="height" constant="18" id="9no-65-Pmw"/> + </constraints> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="XpV-WE-tFg"> + <font key="font" metaFont="system"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="700" translatesAutoresizingMaskIntoConstraints="NO" id="g9g-T3-gcp"> + <rect key="frame" x="8" y="10" width="4" height="14"/> + <constraints> + <constraint firstAttribute="height" constant="14" id="zTg-bt-LgH"/> + </constraints> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="LJ5-qN-oNl"> + <font key="font" metaFont="systemLight" size="12"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> + <button toolTip="Unblock" verticalHuggingPriority="750" tag="800" translatesAutoresizingMaskIntoConstraints="NO" id="bOY-mY-1Yo"> + <rect key="frame" x="544" y="10" width="21" height="30"/> + <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSTouchBarUserAddTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="TJO-D2-KbL"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + </button> + </subviews> <constraints> - <constraint firstAttribute="height" constant="14" id="zTg-bt-LgH"/> + <constraint firstItem="p7k-Ue-2dM" firstAttribute="leading" secondItem="wsF-ON-kL6" secondAttribute="leading" constant="10" id="0jp-G7-BfX"/> + <constraint firstItem="p7k-Ue-2dM" firstAttribute="top" secondItem="wsF-ON-kL6" secondAttribute="top" constant="10" id="Cci-Mn-PyA"/> + <constraint firstItem="bOY-mY-1Yo" firstAttribute="bottom" secondItem="g9g-T3-gcp" secondAttribute="bottom" id="YVq-GI-VwT"/> + <constraint firstItem="g9g-T3-gcp" firstAttribute="top" secondItem="p7k-Ue-2dM" secondAttribute="bottom" id="Zx7-zi-rrK"/> + <constraint firstItem="g9g-T3-gcp" firstAttribute="leading" secondItem="wsF-ON-kL6" secondAttribute="leading" constant="10" id="hMY-79-7tp"/> + <constraint firstAttribute="bottom" secondItem="g9g-T3-gcp" secondAttribute="bottom" constant="10" id="qnX-uM-iG4"/> + <constraint firstAttribute="trailing" secondItem="bOY-mY-1Yo" secondAttribute="trailing" constant="10" id="wJY-6Z-LE4"/> </constraints> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="LJ5-qN-oNl"> - <font key="font" metaFont="systemLight" size="12"/> - <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <button toolTip="Unblock" verticalHuggingPriority="750" tag="800" translatesAutoresizingMaskIntoConstraints="NO" id="bOY-mY-1Yo"> - <rect key="frame" x="544" y="10" width="21" height="30"/> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSTouchBarUserAddTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="TJO-D2-KbL"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - </button> - </subviews> - <constraints> - <constraint firstItem="p7k-Ue-2dM" firstAttribute="leading" secondItem="wsF-ON-kL6" secondAttribute="leading" constant="10" id="0jp-G7-BfX"/> - <constraint firstItem="p7k-Ue-2dM" firstAttribute="top" secondItem="wsF-ON-kL6" secondAttribute="top" constant="10" id="Cci-Mn-PyA"/> - <constraint firstItem="bOY-mY-1Yo" firstAttribute="bottom" secondItem="g9g-T3-gcp" secondAttribute="bottom" id="YVq-GI-VwT"/> - <constraint firstItem="g9g-T3-gcp" firstAttribute="top" secondItem="p7k-Ue-2dM" secondAttribute="bottom" id="Zx7-zi-rrK"/> - <constraint firstItem="g9g-T3-gcp" firstAttribute="leading" secondItem="wsF-ON-kL6" secondAttribute="leading" constant="10" id="hMY-79-7tp"/> - <constraint firstAttribute="bottom" secondItem="g9g-T3-gcp" secondAttribute="bottom" constant="10" id="qnX-uM-iG4"/> - <constraint firstAttribute="trailing" secondItem="bOY-mY-1Yo" secondAttribute="trailing" constant="10" id="wJY-6Z-LE4"/> - </constraints> - </tableCellView> - <customView identifier="HoverRowView" id="UPU-qX-wdn" customClass="HoverTableRowView"> - <rect key="frame" x="1" y="52" width="575" height="52"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - </customView> - </prototypeCellViews> - </tableColumn> - </tableColumns> - </tableView> - </subviews> - </clipView> + </tableCellView> + <customView identifier="HoverRowView" id="UPU-qX-wdn" customClass="HoverTableRowView"> + <rect key="frame" x="1" y="0.0" width="575" height="52"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + </customView> + </prototypeCellViews> + </tableColumn> + </tableColumns> + </tableView> + </subviews> + <nil key="backgroundColor"/> + </clipView> + <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="0.02" horizontal="YES" id="TaD-4q-JiG"> + <rect key="frame" x="-100" y="-100" width="578" height="15"/> + <autoresizingMask key="autoresizingMask"/> + </scroller> + <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="cGM-Ld-1hV"> + <rect key="frame" x="563" y="1" width="16" height="0.0"/> + <autoresizingMask key="autoresizingMask"/> + </scroller> + </scrollView> + </subviews> <constraints> - <constraint firstAttribute="height" constant="2" id="TeK-1Q-aAk"/> + <constraint firstAttribute="trailing" secondItem="Y8L-GO-1Qy" secondAttribute="trailing" id="BPo-3M-8ze"/> + <constraint firstItem="Y8L-GO-1Qy" firstAttribute="top" secondItem="V7F-5u-Bko" secondAttribute="top" id="GWG-FS-85M"/> + <constraint firstAttribute="bottom" secondItem="Y8L-GO-1Qy" secondAttribute="bottom" id="Gpz-Zo-y0L"/> + <constraint firstAttribute="height" constant="2" id="Oyx-FU-ni1"/> + <constraint firstItem="Y8L-GO-1Qy" firstAttribute="leading" secondItem="V7F-5u-Bko" secondAttribute="leading" id="fvY-me-TNF"/> </constraints> - <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="0.02" horizontal="YES" id="TaD-4q-JiG"> - <rect key="frame" x="-100" y="-100" width="578" height="15"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="cGM-Ld-1hV"> - <rect key="frame" x="573" y="1" width="16" height="0.0"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - </scrollView> + </visualEffectView> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ODP-YD-5vy"> <rect key="frame" x="260" y="13" width="100" height="32"/> <constraints> @@ -481,53 +504,53 @@ <constraint firstItem="3QT-MY-qpW" firstAttribute="leading" secondItem="dOT-gX-qDn" secondAttribute="trailing" constant="5" id="1WT-2Q-md4"/> <constraint firstItem="G9D-BP-wC2" firstAttribute="trailing" secondItem="3g2-en-JS8" secondAttribute="trailing" id="2Qc-dh-dEw"/> <constraint firstItem="gTn-6p-Gtk" firstAttribute="top" secondItem="h5N-dv-68N" secondAttribute="top" id="2u7-do-p4V"/> - <constraint firstItem="1uj-O6-qH5" firstAttribute="leading" secondItem="hsy-0z-bp6" secondAttribute="leading" id="3Y3-DV-Oq6"/> <constraint firstItem="G9D-BP-wC2" firstAttribute="top" secondItem="3g2-en-JS8" secondAttribute="bottom" constant="15" id="63I-71-ev1"/> + <constraint firstItem="ODP-YD-5vy" firstAttribute="top" secondItem="Y8L-GO-1Qy" secondAttribute="bottom" constant="30" id="9ET-E5-F0k"/> <constraint firstItem="esP-z9-gYy" firstAttribute="leading" secondItem="oMU-r6-ptk" secondAttribute="leading" id="9v2-PX-0xk"/> <constraint firstItem="hsy-0z-bp6" firstAttribute="top" secondItem="oVO-wj-fwQ" secondAttribute="bottom" constant="20" id="E8o-2g-dVT"/> - <constraint firstItem="Y8L-GO-1Qy" firstAttribute="top" secondItem="dOT-gX-qDn" secondAttribute="bottom" constant="15" id="FJ0-lS-dZE"/> + <constraint firstItem="V7F-5u-Bko" firstAttribute="top" secondItem="dOT-gX-qDn" secondAttribute="bottom" constant="15" id="FDM-Kq-0Yh"/> <constraint firstItem="jn6-I2-q72" firstAttribute="leading" secondItem="wRD-yN-Fq8" secondAttribute="leading" id="GVa-1d-hta"/> <constraint firstItem="3g2-en-JS8" firstAttribute="top" secondItem="2IE-yO-TDJ" secondAttribute="bottom" constant="15" id="Gj0-gx-u1J"/> <constraint firstItem="h3Q-Fn-uye" firstAttribute="top" secondItem="G9D-BP-wC2" secondAttribute="bottom" constant="50" id="Goa-GK-7Tf"/> + <constraint firstItem="dOT-gX-qDn" firstAttribute="leading" secondItem="V7F-5u-Bko" secondAttribute="leading" id="I6f-g6-bzb"/> <constraint firstItem="3QT-MY-qpW" firstAttribute="centerY" secondItem="dOT-gX-qDn" secondAttribute="centerY" id="Iso-9h-RHf"/> <constraint firstItem="jn6-I2-q72" firstAttribute="centerY" secondItem="jfs-pl-8Bb" secondAttribute="centerY" id="JxH-JT-H7z"/> - <constraint firstAttribute="trailing" secondItem="1uj-O6-qH5" secondAttribute="trailing" constant="20" id="Kyy-A5-S8V"/> <constraint firstItem="xuK-C2-qCq" firstAttribute="centerY" secondItem="hsy-0z-bp6" secondAttribute="centerY" id="Niw-h4-qw1"/> <constraint firstItem="3g2-en-JS8" firstAttribute="leading" secondItem="2IE-yO-TDJ" secondAttribute="leading" id="PzM-jL-PIf"/> <constraint firstItem="esP-z9-gYy" firstAttribute="bottom" secondItem="3g2-en-JS8" secondAttribute="bottom" id="QKm-6m-ZTg"/> <constraint firstItem="jfs-pl-8Bb" firstAttribute="top" secondItem="G9D-BP-wC2" secondAttribute="bottom" constant="15" id="Qw3-zi-AJf"/> - <constraint firstItem="Y8L-GO-1Qy" firstAttribute="leading" secondItem="h5N-dv-68N" secondAttribute="leading" constant="20" id="Wgo-JG-hSY"/> + <constraint firstItem="Y8L-GO-1Qy" firstAttribute="top" secondItem="dOT-gX-qDn" secondAttribute="bottom" constant="15" id="Qyx-Mb-U5a"/> + <constraint firstItem="pzl-nx-92N" firstAttribute="top" secondItem="hsy-0z-bp6" secondAttribute="bottom" constant="15" id="Sff-Zn-zbU"/> + <constraint firstItem="dOT-gX-qDn" firstAttribute="top" secondItem="pzl-nx-92N" secondAttribute="bottom" constant="20" id="T2X-WC-rFy"/> <constraint firstItem="h3Q-Fn-uye" firstAttribute="leading" secondItem="oVO-wj-fwQ" secondAttribute="trailing" constant="32" id="ZRY-Rq-HKF"/> - <constraint firstItem="dOT-gX-qDn" firstAttribute="top" secondItem="1uj-O6-qH5" secondAttribute="bottom" constant="20" id="aOi-aK-Mqf"/> + <constraint firstItem="pzl-nx-92N" firstAttribute="leading" secondItem="h5N-dv-68N" secondAttribute="leading" constant="20" id="ZdS-4M-DNc"/> <constraint firstItem="ODP-YD-5vy" firstAttribute="centerX" secondItem="h5N-dv-68N" secondAttribute="centerX" id="aP4-Wz-IvA"/> <constraint firstItem="gTn-6p-Gtk" firstAttribute="leading" secondItem="h5N-dv-68N" secondAttribute="leading" id="cFJ-xn-e2j"/> <constraint firstAttribute="trailing" secondItem="h3Q-Fn-uye" secondAttribute="trailing" constant="20" id="cl8-sP-FVa"/> - <constraint firstItem="ODP-YD-5vy" firstAttribute="top" secondItem="Y8L-GO-1Qy" secondAttribute="bottom" constant="30" id="d6X-pJ-G6r"/> - <constraint firstItem="1uj-O6-qH5" firstAttribute="top" secondItem="hsy-0z-bp6" secondAttribute="bottom" constant="15" id="dK6-vn-2td"/> <constraint firstItem="esP-z9-gYy" firstAttribute="leading" secondItem="3g2-en-JS8" secondAttribute="trailing" constant="10" id="dND-HY-Ky3"/> <constraint firstItem="jfs-pl-8Bb" firstAttribute="leading" secondItem="G9D-BP-wC2" secondAttribute="leading" id="eb5-zu-GXQ"/> <constraint firstItem="oMU-r6-ptk" firstAttribute="centerY" secondItem="2IE-yO-TDJ" secondAttribute="centerY" id="erv-oN-bGm"/> <constraint firstItem="wRD-yN-Fq8" firstAttribute="bottom" secondItem="G9D-BP-wC2" secondAttribute="bottom" id="gBl-Lu-E0F"/> + <constraint firstItem="V7F-5u-Bko" firstAttribute="leading" secondItem="h5N-dv-68N" secondAttribute="leading" constant="20" id="gCn-Pp-exU"/> <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="esP-z9-gYy" secondAttribute="trailing" constant="20" id="h54-Zp-giq"/> - <constraint firstItem="Y8L-GO-1Qy" firstAttribute="trailing" secondItem="1uj-O6-qH5" secondAttribute="trailing" id="hvN-3D-qv3"/> <constraint firstItem="2IE-yO-TDJ" firstAttribute="leading" secondItem="oVO-wj-fwQ" secondAttribute="trailing" constant="32" id="i8J-rD-ycJ"/> <constraint firstItem="WON-75-xph" firstAttribute="leading" secondItem="esP-z9-gYy" secondAttribute="leading" id="kbn-8q-uxq"/> <constraint firstItem="G9D-BP-wC2" firstAttribute="leading" secondItem="2IE-yO-TDJ" secondAttribute="leading" id="lUN-DN-V92"/> <constraint firstAttribute="trailing" secondItem="gTn-6p-Gtk" secondAttribute="trailing" id="lWR-TJ-wsX"/> - <constraint firstItem="1uj-O6-qH5" firstAttribute="leading" secondItem="h5N-dv-68N" secondAttribute="leading" constant="20" id="nF0-Jg-WLW"/> <constraint firstItem="oVO-wj-fwQ" firstAttribute="leading" secondItem="h5N-dv-68N" secondAttribute="leading" constant="32" id="nKb-sT-BeH"/> - <constraint firstItem="dOT-gX-qDn" firstAttribute="leading" secondItem="1uj-O6-qH5" secondAttribute="leading" id="o2J-8w-LOH"/> <constraint firstItem="wRD-yN-Fq8" firstAttribute="leading" secondItem="esP-z9-gYy" secondAttribute="leading" id="ogc-av-Kmu"/> <constraint firstItem="oVO-wj-fwQ" firstAttribute="top" secondItem="h5N-dv-68N" secondAttribute="top" constant="32" id="pgz-cN-WoT"/> + <constraint firstAttribute="trailing" secondItem="V7F-5u-Bko" secondAttribute="trailing" constant="20" id="pjB-0v-HiR"/> <constraint firstItem="xuK-C2-qCq" firstAttribute="trailing" secondItem="h3Q-Fn-uye" secondAttribute="trailing" id="qLN-Xo-1H9"/> <constraint firstItem="WON-75-xph" firstAttribute="bottom" secondItem="G9D-BP-wC2" secondAttribute="bottom" id="qPn-RU-dwn"/> - <constraint firstAttribute="trailing" secondItem="Y8L-GO-1Qy" secondAttribute="trailing" constant="20" id="tyW-K4-dV4"/> + <constraint firstItem="pzl-nx-92N" firstAttribute="trailing" secondItem="V7F-5u-Bko" secondAttribute="trailing" id="t0b-pM-fdt"/> + <constraint firstItem="pzl-nx-92N" firstAttribute="leading" secondItem="V7F-5u-Bko" secondAttribute="leading" id="t4R-e7-Uqd"/> <constraint firstItem="jfs-pl-8Bb" firstAttribute="trailing" secondItem="G9D-BP-wC2" secondAttribute="trailing" id="uvq-vy-vNh"/> <constraint firstItem="ODP-YD-5vy" firstAttribute="top" secondItem="gTn-6p-Gtk" secondAttribute="bottom" constant="20" id="vdx-Gc-txw"/> + <constraint firstAttribute="trailing" secondItem="pzl-nx-92N" secondAttribute="trailing" constant="20" id="w8k-cg-TzT"/> <constraint firstItem="3g2-en-JS8" firstAttribute="trailing" secondItem="2IE-yO-TDJ" secondAttribute="trailing" id="wfC-LP-4PG"/> <constraint firstItem="2IE-yO-TDJ" firstAttribute="top" secondItem="h5N-dv-68N" secondAttribute="top" constant="32" id="xOZ-wH-Sht"/> <constraint firstItem="h3Q-Fn-uye" firstAttribute="bottom" secondItem="oVO-wj-fwQ" secondAttribute="bottom" id="xPA-ly-3SR"/> - <constraint firstItem="Y8L-GO-1Qy" firstAttribute="leading" secondItem="dOT-gX-qDn" secondAttribute="leading" id="ywi-UG-cco"/> </constraints> <point key="canvasLocation" x="470" y="918"/> </customView> diff --git a/ui/Base.lproj/AccSipGeneral.xib b/ui/Base.lproj/AccSipGeneral.xib index 1126adb4d4d1f331cb2396d9509b29a7dc73385a..bfb6ec6d2f855b3bc51073d8b3cfbc5f964b852d 100644 --- a/ui/Base.lproj/AccSipGeneral.xib +++ b/ui/Base.lproj/AccSipGeneral.xib @@ -2,6 +2,7 @@ <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> <dependencies> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/> + <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -32,8 +33,8 @@ <rect key="frame" x="1" y="1" width="618" height="450"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> </view> - <color key="borderColor" red="0.88235294117647056" green="0.88235294117647056" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <color key="fillColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <color key="borderColor" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </box> <view translatesAutoresizingMaskIntoConstraints="NO" id="pL7-7S-saC"> <rect key="frame" x="110" y="0.0" width="400" height="513"/> diff --git a/ui/Base.lproj/AccountSettings.xib b/ui/Base.lproj/AccountSettings.xib index d27f84cf383244ced9e7fa176e8628734076d217..719437a52ce1196397ef3eb7b6ef5681e5e7b4a0 100644 --- a/ui/Base.lproj/AccountSettings.xib +++ b/ui/Base.lproj/AccountSettings.xib @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/> + <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -13,13 +14,13 @@ </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> <customObject id="-3" userLabel="Application" customClass="NSObject"/> - <customView id="Hz6-mo-xeY"> + <customView wantsLayer="YES" id="Hz6-mo-xeY"> <rect key="frame" x="0.0" y="0.0" width="820" height="828"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <subviews> - <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="FE5-WQ-UWb"> + <scrollView wantsLayer="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" findBarPosition="aboveHorizontalRuler" translatesAutoresizingMaskIntoConstraints="NO" id="FE5-WQ-UWb"> <rect key="frame" x="0.0" y="0.0" width="820" height="828"/> - <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="AS0-K7-DN3" customClass="CenteredClipView"> + <clipView key="contentView" copiesOnScroll="NO" id="AS0-K7-DN3" customClass="CenteredClipView"> <rect key="frame" x="0.0" y="0.0" width="820" height="828"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> @@ -28,14 +29,14 @@ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> </view> </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> + <color key="backgroundColor" name="alternatingContentBackgroundColor" catalog="System" colorSpace="catalog"/> </clipView> <edgeInsets key="contentInsets" left="0.0" right="0.0" top="20" bottom="0.0"/> - <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="raF-h3-PC0"> + <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="raF-h3-PC0"> <rect key="frame" x="-100" y="-100" width="670" height="16"/> <autoresizingMask key="autoresizingMask"/> </scroller> - <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="Pt7-JA-8ml"> + <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="Pt7-JA-8ml"> <rect key="frame" x="-100" y="-100" width="16" height="768"/> <autoresizingMask key="autoresizingMask"/> </scroller> diff --git a/ui/Base.lproj/Conversation.xib b/ui/Base.lproj/Conversation.xib index 66e29604112573aced6df6088d8ccb3045402c76..ec53caf70f384a55970b04e7884f9ca02e0bc00f 100644 --- a/ui/Base.lproj/Conversation.xib +++ b/ui/Base.lproj/Conversation.xib @@ -1,10 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/> - <capability name="box content view" minToolsVersion="7.0"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> - <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="ConversationVC"> @@ -44,7 +42,7 @@ <color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/> <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> <tableColumns> - <tableColumn identifier="" width="697" minWidth="40" maxWidth="1000" id="hwp-Th-i2d"> + <tableColumn width="697" minWidth="40" maxWidth="1000" id="hwp-Th-i2d"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> @@ -278,11 +276,11 @@ <constraint firstAttribute="width" constant="700" id="hVv-sa-XIA"/> </constraints> <edgeInsets key="contentInsets" left="0.0" right="0.0" top="0.0" bottom="15"/> - <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="6oQ-AB-A54"> + <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="6oQ-AB-A54"> <rect key="frame" x="-100" y="-100" width="739" height="15"/> <autoresizingMask key="autoresizingMask"/> </scroller> - <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="pfa-gR-gKp"> + <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="pfa-gR-gKp"> <rect key="frame" x="-100" y="-100" width="15" height="402"/> <autoresizingMask key="autoresizingMask"/> </scroller> @@ -329,7 +327,7 @@ <rect key="frame" x="53" y="22" width="602" height="17"/> <textFieldCell key="cell" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" placeholderString="Send a message" id="Ilz-7v-2fr"> <font key="font" metaFont="system"/> - <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> <connections> diff --git a/ui/Base.lproj/CurrentCall.xib b/ui/Base.lproj/CurrentCall.xib index 8889543f83f3373218dc11bedab950065d2abfc6..c635568b67b3eb3dd8b7e449ab4964a06e53921c 100644 --- a/ui/Base.lproj/CurrentCall.xib +++ b/ui/Base.lproj/CurrentCall.xib @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/> - <capability name="box content view" minToolsVersion="7.0"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> - <capability name="stacking Non-gravity area distributions on NSStackView" minToolsVersion="7.0" minSystemVersion="10.11"/> - <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="CurrentCallVC"> @@ -60,10 +57,10 @@ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <subviews> <customView translatesAutoresizingMaskIntoConstraints="NO" id="d0X-cW-Xgz"> - <rect key="frame" x="0.0" y="410" width="745" height="71"/> + <rect key="frame" x="0.0" y="409" width="745" height="72"/> <subviews> <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cIU-M7-xpN"> - <rect key="frame" x="623" y="23" width="104" height="24"/> + <rect key="frame" x="623" y="24" width="104" height="24"/> <constraints> <constraint firstAttribute="width" constant="100" id="9vz-kb-6L6"/> </constraints> @@ -88,7 +85,7 @@ </textFieldCell> </textField> <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="X5k-sy-WtA"> - <rect key="frame" x="20" y="10" width="50" height="50"/> + <rect key="frame" x="20" y="11" width="50" height="50"/> <constraints> <constraint firstAttribute="width" constant="50" id="2tx-rb-idH"/> <constraint firstAttribute="height" constant="50" id="B5W-X8-r0z"/> @@ -578,7 +575,7 @@ <rect key="frame" x="135" y="120" width="404" height="291"/> <subviews> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9Cd-Vs-wtu"> - <rect key="frame" x="234" y="18" width="43" height="17"/> + <rect key="frame" x="233" y="18" width="43" height="17"/> <constraints> <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="39" id="6I1-DY-t1P"/> </constraints> @@ -589,7 +586,7 @@ </textFieldCell> </textField> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="neP-Vf-7Tp"> - <rect key="frame" x="126" y="18" width="49" height="17"/> + <rect key="frame" x="125" y="18" width="49" height="17"/> <constraints> <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="45" id="NB4-kw-0Lb"/> </constraints> @@ -600,7 +597,7 @@ </textFieldCell> </textField> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qnn-D2-O1C"> - <rect key="frame" x="139" y="121" width="127" height="17"/> + <rect key="frame" x="138" y="121" width="127" height="17"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="wants to talk to you!" id="X0W-vv-xua"> <font key="font" metaFont="system"/> <color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/> @@ -619,7 +616,7 @@ <rect key="frame" x="127" y="146" width="150" height="17"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" placeholderString="Incoming Display Name" id="EA3-Q5-Dyj"> <font key="font" metaFont="system"/> - <color key="textColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="textColor" red="0.92143100499999997" green="0.92145264149999995" blue="0.92144101860000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> @@ -725,7 +722,7 @@ <color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/> <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> <tableColumns> - <tableColumn identifier="" width="329" minWidth="40" maxWidth="1000" id="nFu-qN-GHK"> + <tableColumn width="329" minWidth="40" maxWidth="1000" id="nFu-qN-GHK"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> @@ -923,11 +920,11 @@ </subviews> </clipView> <edgeInsets key="contentInsets" left="0.0" right="0.0" top="0.0" bottom="17"/> - <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="zPy-Iz-oF9"> + <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="zPy-Iz-oF9"> <rect key="frame" x="-100" y="-100" width="739" height="15"/> <autoresizingMask key="autoresizingMask"/> </scroller> - <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="u8k-Pu-yAS"> + <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="u8k-Pu-yAS"> <rect key="frame" x="-100" y="-100" width="15" height="402"/> <autoresizingMask key="autoresizingMask"/> </scroller> @@ -950,7 +947,7 @@ <rect key="frame" x="20" y="20" width="286" height="22"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" state="on" borderStyle="bezel" bezelStyle="round" id="QW9-Ty-ZEe"> <font key="font" metaFont="system"/> - <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> <connections> @@ -1063,7 +1060,7 @@ </objects> <resources> <image name="NSGoRightTemplate" width="9" height="12"/> - <image name="NSUser" width="32" height="32"/> + <image name="NSUser" width="128" height="128"/> <image name="ic_action_accept" width="72" height="72"/> <image name="ic_action_add_participant" width="72" height="72"/> <image name="ic_action_audio" width="36" height="36"/> diff --git a/ui/Base.lproj/MessageCells.xib b/ui/Base.lproj/MessageCells.xib index 717a3843e37867f365b2b17f6e439f84b56c543a..3de119d376de611c0c591d6f10089c94b5ae5da8 100644 --- a/ui/Base.lproj/MessageCells.xib +++ b/ui/Base.lproj/MessageCells.xib @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/> - <capability name="box content view" minToolsVersion="7.0"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -60,7 +59,7 @@ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" imageScaling="proportionallyDown" image="ic_attachment" id="Jpz-4x-jYM"/> </imageView> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZA5-7h-yNn"> - <rect key="frame" x="55" y="46" width="180" height="19"/> + <rect key="frame" x="55" y="47" width="180" height="18"/> <buttonCell key="cell" type="roundRect" title="Round Rect" bezelStyle="roundedRect" alignment="center" imageScaling="proportionallyDown" inset="2" id="DmW-13-1QZ"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system" size="14"/> @@ -87,7 +86,7 @@ </buttonCell> </button> <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="yhT-5T-phc"> - <rect key="frame" x="15" y="28" width="220" height="5"/> + <rect key="frame" x="15" y="29" width="220" height="5"/> </box> </subviews> <constraints> @@ -222,7 +221,7 @@ </buttonCell> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="color" keyPath="cornerColor"> - <color key="value" red="0.94117647058823528" green="0.94117647058823528" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/> + <color key="value" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="hoverColor"> <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/> @@ -313,7 +312,7 @@ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" imageScaling="proportionallyDown" image="ic_attachment" id="q2e-Jw-ifg"/> </imageView> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tUr-hG-Ef4"> - <rect key="frame" x="55" y="46" width="180" height="19"/> + <rect key="frame" x="55" y="47" width="180" height="18"/> <buttonCell key="cell" type="roundRect" title="Round Rect" bezelStyle="roundedRect" alignment="center" imageScaling="proportionallyDown" inset="2" id="Oo1-gq-aPY"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system" size="14"/> @@ -336,7 +335,7 @@ </constraints> </progressIndicator> <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="9ze-gS-MRW"> - <rect key="frame" x="15" y="28" width="220" height="5"/> + <rect key="frame" x="15" y="29" width="220" height="5"/> </box> </subviews> <constraints> @@ -419,7 +418,7 @@ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ic_attachment" id="1qg-9v-1DA"/> </imageView> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WnO-2x-32a"> - <rect key="frame" x="55" y="104" width="180" height="19"/> + <rect key="frame" x="55" y="105" width="180" height="18"/> <buttonCell key="cell" type="roundRect" title="Round Rect" bezelStyle="roundedRect" alignment="center" imageScaling="proportionallyDown" inset="2" id="fu2-X7-GW8"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system" size="14"/> @@ -527,7 +526,7 @@ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ic_attachment" id="yAd-of-sXU"/> </imageView> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jRP-c4-heJ"> - <rect key="frame" x="55" y="-28" width="180" height="19"/> + <rect key="frame" x="55" y="-27" width="180" height="18"/> <buttonCell key="cell" type="roundRect" title="Round Rect" bezelStyle="roundedRect" alignment="center" imageScaling="proportionallyDown" inset="2" id="3i8-bi-EQN"> <behavior key="behavior" lightByContents="YES"/> <font key="font" metaFont="system" size="14"/> @@ -571,7 +570,7 @@ </buttonCell> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="color" keyPath="cornerColor"> - <color key="value" red="0.94117647058823528" green="0.94117647058823528" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/> + <color key="value" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/> </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="hoverColor"> <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/> diff --git a/ui/Base.lproj/RingWindow.xib b/ui/Base.lproj/RingWindow.xib index 4478e9ec214078dcbad5ac9f957aa549d8c56bf7..f6e1f503f533650cc267db846745650769160f59 100644 --- a/ui/Base.lproj/RingWindow.xib +++ b/ui/Base.lproj/RingWindow.xib @@ -37,393 +37,401 @@ <customView wantsLayer="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YgH-CN-tkB" userLabel="Left Panel"> <rect key="frame" x="0.0" y="0.0" width="324" height="658"/> <subviews> - <tabView focusRingType="none" drawsBackground="NO" type="noTabsNoBorder" initialItem="0MO-4e-8mo" translatesAutoresizingMaskIntoConstraints="NO" id="xXW-iq-GcP"> - <rect key="frame" x="0.0" y="0.0" width="324" height="586"/> - <font key="font" metaFont="system"/> - <tabViewItems> - <tabViewItem label="SmartView" identifier="" id="0MO-4e-8mo"> - <view key="view" id="D5P-tm-YgO"> - <rect key="frame" x="0.0" y="0.0" width="324" height="586"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="omo-Be-zok"> - <rect key="frame" x="0.0" y="0.0" width="324" height="583"/> - <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="vUu-vJ-ryG"> - <rect key="frame" x="0.0" y="0.0" width="324" height="583"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" rowHeight="60" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="3NN-k0-vDM" id="tcL-dy-Q3h" customClass="RingTableView"> + <visualEffectView blendingMode="behindWindow" material="sidebar" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="0xt-Yr-Jqx"> + <rect key="frame" x="0.0" y="0.0" width="324" height="658"/> + <subviews> + <searchField wantsLayer="YES" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PoQ-x4-ES3"> + <rect key="frame" x="20" y="620" width="284" height="22"/> + <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Search for new or existing contact" usesSingleLineMode="YES" bezelStyle="round" id="vvE-nM-kSl"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> + </searchFieldCell> + <connections> + <outlet property="delegate" destination="jrf-42-1l2" id="UtW-SL-Loa"/> + </connections> + </searchField> + <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3Nq-Rz-Etg"> + <rect key="frame" x="19" y="593" width="286" height="20"/> + <constraints> + <constraint firstAttribute="height" constant="18" id="6LE-6n-vaC"/> + </constraints> + <segmentedCell key="cell" borderStyle="border" alignment="left" style="roundRect" trackingMode="selectOne" id="6T7-ip-Pun"> + <font key="font" metaFont="cellTitle"/> + <segments> + <segment label="Conversations" width="140" selected="YES"/> + <segment label="Requests" width="140" tag="1"/> + </segments> + </segmentedCell> + <connections> + <action selector="listTypeChanged:" target="jrf-42-1l2" id="iha-7Z-YDQ"/> + </connections> + </segmentedControl> + <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="600" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="14" translatesAutoresizingMaskIntoConstraints="NO" id="VsX-mX-hf3" userLabel="Total Unread Message Count" customClass="RoundedTextField"> + <rect key="frame" x="135" y="602" width="10" height="14"/> + <constraints> + <constraint firstAttribute="height" constant="14" id="5Jq-bx-b4E"/> + <constraint firstAttribute="width" constant="10" id="9Qo-ai-YOX"/> + </constraints> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" drawsBackground="YES" id="0nG-cC-02J"> + <font key="font" metaFont="system" size="7"/> + <color key="textColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" red="0.98431372549999996" green="0.28627450980000002" blue="0.28235294119999998" alpha="0.90000000000000002" colorSpace="calibratedRGB"/> + </textFieldCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> + <color key="value" red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius"> + <integer key="value" value="6"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> + </textField> + <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="700" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="14" translatesAutoresizingMaskIntoConstraints="NO" id="tBR-mv-w66" userLabel="Unhandled Invite Count" customClass="RoundedTextField"> + <rect key="frame" x="277" y="602" width="10" height="14"/> + <constraints> + <constraint firstAttribute="width" constant="10" id="7JN-4z-cSI"/> + <constraint firstAttribute="height" constant="14" id="jHX-tM-8MD"/> + </constraints> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" drawsBackground="YES" id="8PT-wu-Uso"> + <font key="font" metaFont="system" size="7"/> + <color key="textColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" red="0.98431372549999996" green="0.28627450980000002" blue="0.28235294119999998" alpha="0.90000000000000002" colorSpace="calibratedRGB"/> + </textFieldCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> + <color key="value" red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius"> + <integer key="value" value="6"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> + </textField> + <tabView focusRingType="none" drawsBackground="NO" type="noTabsNoBorder" initialItem="0MO-4e-8mo" translatesAutoresizingMaskIntoConstraints="NO" id="xXW-iq-GcP"> + <rect key="frame" x="0.0" y="0.0" width="324" height="586"/> + <font key="font" metaFont="system"/> + <tabViewItems> + <tabViewItem label="SmartView" identifier="" id="0MO-4e-8mo"> + <view key="view" id="D5P-tm-YgO"> + <rect key="frame" x="0.0" y="0.0" width="324" height="586"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="omo-Be-zok"> + <rect key="frame" x="0.0" y="0.0" width="324" height="583"/> + <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="vUu-vJ-ryG"> <rect key="frame" x="0.0" y="0.0" width="324" height="583"/> - <autoresizingMask key="autoresizingMask"/> - <size key="intercellSpacing" width="3" height="2"/> - <color key="backgroundColor" white="0.66666666669999997" alpha="0.0" colorSpace="deviceWhite"/> - <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> - <tableColumns> - <tableColumn identifier="MainColumn" width="321" minWidth="40" maxWidth="1000" id="3NN-k0-vDM"> - <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> - </tableHeaderCell> - <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="Ap7-26-S6b"> - <font key="font" metaFont="system"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> - <prototypeCellViews> - <tableCellView identifier="MainCell" id="Z6G-mQ-L3J" userLabel="MainCell" customClass="ContextualTableCellView"> - <rect key="frame" x="1" y="1" width="321" height="60"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" tag="200" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="epa-Ih-aKF" userLabel="name"> - <rect key="frame" x="70" y="30" width="4" height="23"/> - <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" id="uSw-g5-kte"> - <font key="font" size="16" name="HelveticaNeue-Light"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="sHH-wj-oHs"> - <rect key="frame" x="6" y="6" width="54" height="48"/> - <constraints> - <constraint firstAttribute="width" constant="54" id="C2Y-L7-ryb"/> - <constraint firstAttribute="height" constant="48" id="Q3H-Dy-81c"/> - </constraints> - <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="right" imageScaling="proportionallyDown" image="NSUser" id="bqQ-Jp-DPH"/> - </imageView> - <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="300" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="14" translatesAutoresizingMaskIntoConstraints="NO" id="MYe-rn-qOP" userLabel="UnreadMsgCount" customClass="RoundedTextField"> - <rect key="frame" x="50" y="40" width="10" height="14"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="60" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="3NN-k0-vDM" id="tcL-dy-Q3h" customClass="RingTableView"> + <rect key="frame" x="0.0" y="0.0" width="324" height="583"/> + <autoresizingMask key="autoresizingMask"/> + <size key="intercellSpacing" width="3" height="2"/> + <color key="backgroundColor" white="0.66666666669999997" alpha="0.0" colorSpace="deviceWhite"/> + <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> + <tableColumns> + <tableColumn identifier="MainColumn" width="321" minWidth="40" maxWidth="1000" id="3NN-k0-vDM"> + <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left"> + <font key="font" metaFont="smallSystem"/> + <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> + </tableHeaderCell> + <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="Ap7-26-S6b"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> + <prototypeCellViews> + <tableCellView identifier="MainCell" id="Z6G-mQ-L3J" userLabel="MainCell" customClass="ContextualTableCellView"> + <rect key="frame" x="1" y="1" width="321" height="60"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="nGn-jy-Iaf" userLabel="name"> + <rect key="frame" x="72" y="30" width="4" height="23"/> + <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" drawsBackground="YES" id="1N9-Ii-83s"> + <font key="font" size="16" name="HelveticaNeue-Light"/> + <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + </textFieldCell> + </textField> + <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="sHH-wj-oHs"> + <rect key="frame" x="6" y="6" width="54" height="48"/> + <constraints> + <constraint firstAttribute="width" constant="54" id="C2Y-L7-ryb"/> + <constraint firstAttribute="height" constant="48" id="Q3H-Dy-81c"/> + </constraints> + <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="right" imageScaling="proportionallyDown" image="NSUser" id="bqQ-Jp-DPH"/> + </imageView> + <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="300" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="14" translatesAutoresizingMaskIntoConstraints="NO" id="MYe-rn-qOP" userLabel="UnreadMsgCount" customClass="RoundedTextField"> + <rect key="frame" x="50" y="40" width="10" height="14"/> + <constraints> + <constraint firstAttribute="width" constant="10" id="NvA-xu-fEB"/> + <constraint firstAttribute="height" constant="14" id="UmR-aF-Y7V"/> + </constraints> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" drawsBackground="YES" id="sGB-x7-gig"> + <font key="font" metaFont="system" size="7"/> + <color key="textColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" red="0.98431372549019602" green="0.28627450980392155" blue="0.28235294117647058" alpha="0.90000000000000002" colorSpace="calibratedRGB"/> + </textFieldCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> + <color key="value" red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius"> + <integer key="value" value="6"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> + </textField> + <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="bZ6-1S-zx2" userLabel="ringId"> + <rect key="frame" x="72" y="11" width="4" height="20"/> + <constraints> + <constraint firstAttribute="height" constant="20" id="8W8-hd-brz"/> + </constraints> + <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" drawsBackground="YES" id="zp2-mv-NHW"> + <font key="font" size="13" name="HelveticaNeue-Light"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + </textFieldCell> + </textField> + <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="YkV-D4-ddd" userLabel="PresenceIndicator" customClass="RoundedTextField"> + <rect key="frame" x="48" y="6" width="14" height="14"/> + <constraints> + <constraint firstAttribute="width" constant="9.5" id="IdR-WT-Pvg"/> + <constraint firstAttribute="height" constant="13.5" id="dO4-wg-jEC"/> + </constraints> + <textFieldCell key="cell" enabled="NO" sendsActionOnEndEditing="YES" alignment="center" id="1DZ-7a-3Qp"> + <font key="font" metaFont="system"/> + <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> + <color key="value" red="0.29803921568627451" green="0.85098039215686272" blue="0.39215686274509803" alpha="1" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="color" keyPath="borderColor"> + <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="number" keyPath="borderThickness"> + <real key="value" value="1.5"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> + </textField> + <textField hidden="YES" verticalHuggingPriority="750" tag="800" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="epi-ZP-as5" userLabel="Last Interaction Date"> + <rect key="frame" x="275" y="32" width="40" height="20"/> + <constraints> + <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="40" id="asz-gD-lug"/> + </constraints> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" drawsBackground="YES" id="BfK-c5-B1l"> + <font key="font" size="13" name="HelveticaNeue-Light"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + </textFieldCell> + </textField> + <textField hidden="YES" horizontalHuggingPriority="999" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="900" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mic-52-RIa" userLabel="Last Interaction Snippet"> + <rect key="frame" x="175" y="11" width="140" height="20"/> + <constraints> + <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="140" id="W0d-p1-O4L"/> + </constraints> + <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" drawsBackground="YES" id="VBS-Iu-q1M"> + <font key="font" size="13" name="HelveticaNeue-Light"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + </textFieldCell> + </textField> + <button toolTip="Accept Invitation" verticalHuggingPriority="750" tag="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Fc5-KS-cim" userLabel="Add Contact Button" customClass="HoverButton"> + <rect key="frame" x="209" y="6" width="30" height="30"/> + <constraints> + <constraint firstAttribute="width" constant="30" id="FjC-O1-DDc"/> + <constraint firstAttribute="height" constant="30" id="zM2-c1-5Es"/> + </constraints> + <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_person_add" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="tQv-pI-ot0"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="color" keyPath="imageColor"> + <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="color" keyPath="hoverColor"> + <color key="value" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> + <integer key="value" value="4"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> + </button> + <button toolTip="Ignore invitation" verticalHuggingPriority="750" tag="1100" translatesAutoresizingMaskIntoConstraints="NO" id="ejM-H2-aJX" userLabel="Refuse Invitation Button" customClass="HoverButton"> + <rect key="frame" x="244" y="6" width="30" height="30"/> + <constraints> + <constraint firstAttribute="height" constant="30" id="MjJ-10-Auf"/> + <constraint firstAttribute="width" constant="30" id="iaV-AH-wjl"/> + </constraints> + <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_cancel" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="8ej-tV-bU4"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="color" keyPath="imageColor"> + <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="color" keyPath="hoverColor"> + <color key="value" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> + <integer key="value" value="4"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> + </button> + <button toolTip="Block contact" verticalHuggingPriority="750" tag="1200" translatesAutoresizingMaskIntoConstraints="NO" id="xP1-ZW-WZ8" userLabel="Block Contact Button" customClass="HoverButton"> + <rect key="frame" x="279" y="6" width="30" height="30"/> + <constraints> + <constraint firstAttribute="height" constant="30" id="gac-rJ-t64"/> + <constraint firstAttribute="width" constant="30" id="gpN-gl-xBY"/> + </constraints> + <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_block" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="qze-fl-ch1"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="color" keyPath="imageColor"> + <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="color" keyPath="hoverColor"> + <color key="value" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> + <integer key="value" value="4"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> + </button> + </subviews> <constraints> - <constraint firstAttribute="width" constant="10" id="NvA-xu-fEB"/> - <constraint firstAttribute="height" constant="14" id="UmR-aF-Y7V"/> + <constraint firstItem="Fc5-KS-cim" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="nGn-jy-Iaf" secondAttribute="trailing" constant="20" id="1o4-o6-O5A"/> + <constraint firstItem="sHH-wj-oHs" firstAttribute="leading" secondItem="Z6G-mQ-L3J" secondAttribute="leading" constant="6" id="CGt-hN-ulS"/> + <constraint firstItem="ejM-H2-aJX" firstAttribute="leading" secondItem="Fc5-KS-cim" secondAttribute="trailing" constant="5" id="CqZ-iW-bob"/> + <constraint firstItem="YkV-D4-ddd" firstAttribute="trailing" secondItem="sHH-wj-oHs" secondAttribute="trailing" constant="-0.5" id="HSa-sm-3vp"/> + <constraint firstAttribute="bottom" secondItem="xP1-ZW-WZ8" secondAttribute="bottom" constant="6" id="Jy0-tu-Huy"/> + <constraint firstItem="sHH-wj-oHs" firstAttribute="top" secondItem="Z6G-mQ-L3J" secondAttribute="top" constant="6" id="KMX-Ru-AEa"/> + <constraint firstItem="MYe-rn-qOP" firstAttribute="top" secondItem="sHH-wj-oHs" secondAttribute="top" id="Kub-qp-hhR"/> + <constraint firstItem="MYe-rn-qOP" firstAttribute="trailing" secondItem="sHH-wj-oHs" secondAttribute="trailing" id="Mv6-W1-pJW"/> + <constraint firstItem="ejM-H2-aJX" firstAttribute="centerY" secondItem="Fc5-KS-cim" secondAttribute="centerY" id="QvI-kL-sx8"/> + <constraint firstItem="bZ6-1S-zx2" firstAttribute="leading" secondItem="nGn-jy-Iaf" secondAttribute="leading" id="REo-ld-Jxd"/> + <constraint firstItem="bZ6-1S-zx2" firstAttribute="top" secondItem="nGn-jy-Iaf" secondAttribute="bottom" constant="-1" id="SBD-P8-Hcf"/> + <constraint firstAttribute="bottom" secondItem="sHH-wj-oHs" secondAttribute="bottom" constant="6" id="SJ6-9t-r0l"/> + <constraint firstItem="YkV-D4-ddd" firstAttribute="bottom" secondItem="sHH-wj-oHs" secondAttribute="bottom" id="TGB-Iw-hdK"/> + <constraint firstItem="nGn-jy-Iaf" firstAttribute="leading" secondItem="sHH-wj-oHs" secondAttribute="trailing" constant="12" id="VlW-Wk-aeC"/> + <constraint firstAttribute="trailing" secondItem="epi-ZP-as5" secondAttribute="trailing" constant="6" id="XEf-2m-loK"/> + <constraint firstItem="epi-ZP-as5" firstAttribute="centerY" secondItem="nGn-jy-Iaf" secondAttribute="centerY" id="XRL-TC-teM"/> + <constraint firstItem="nGn-jy-Iaf" firstAttribute="top" secondItem="Z6G-mQ-L3J" secondAttribute="top" constant="7" id="b6T-Jb-wdK"/> + <constraint firstItem="xP1-ZW-WZ8" firstAttribute="leading" secondItem="ejM-H2-aJX" secondAttribute="trailing" constant="5" id="d5E-z8-brF"/> + <constraint firstAttribute="bottom" secondItem="bZ6-1S-zx2" secondAttribute="bottom" constant="11" id="heC-Eb-J2U"/> + <constraint firstAttribute="trailing" secondItem="xP1-ZW-WZ8" secondAttribute="trailing" constant="12" id="jjq-30-NU1"/> + <constraint firstItem="mic-52-RIa" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="bZ6-1S-zx2" secondAttribute="trailing" constant="10" id="kHp-c8-vEc"/> + <constraint firstAttribute="trailing" secondItem="mic-52-RIa" secondAttribute="trailing" constant="6" id="l5e-5o-lAk"/> + <constraint firstItem="Fc5-KS-cim" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="bZ6-1S-zx2" secondAttribute="trailing" constant="10" id="n2W-6I-lDK"/> + <constraint firstItem="xP1-ZW-WZ8" firstAttribute="centerY" secondItem="Fc5-KS-cim" secondAttribute="centerY" id="pPs-eg-ffp"/> + <constraint firstItem="mic-52-RIa" firstAttribute="centerY" secondItem="bZ6-1S-zx2" secondAttribute="centerY" id="qaE-JA-5OM"/> </constraints> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" drawsBackground="YES" id="sGB-x7-gig"> - <font key="font" metaFont="system" size="7"/> - <color key="textColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" red="0.98431372549019602" green="0.28627450980392155" blue="0.28235294117647058" alpha="0.90000000000000002" colorSpace="calibratedRGB"/> - </textFieldCell> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> - <color key="value" red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - </userDefinedRuntimeAttributes> - </textField> - <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="bZ6-1S-zx2" userLabel="ringId"> - <rect key="frame" x="70" y="11" width="4" height="20"/> + </tableCellView> + <tableCellView identifier="CallCell" id="nvG-hU-lKg" userLabel="CallCell" customClass="ContextualTableCellView"> + <rect key="frame" x="1" y="63" width="321" height="50"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="200" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sfz-V3-QhK"> + <rect key="frame" x="6" y="24" width="73" height="23"/> + <constraints> + <constraint firstAttribute="height" constant="23" id="Knk-h9-HbW"/> + </constraints> + <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Call name" id="j0J-Xd-uth"> + <font key="font" size="16" name="HelveticaNeue-Light"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + </textFieldCell> + </textField> + <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="300" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Sm2-al-NU0"> + <rect key="frame" x="6" y="3" width="40" height="20"/> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="details" id="mK5-kV-YOO"> + <font key="font" size="13" name="HelveticaNeue-Light"/> + <color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> + </textFieldCell> + </textField> + </subviews> <constraints> - <constraint firstAttribute="height" constant="20" id="8W8-hd-brz"/> + <constraint firstItem="Sm2-al-NU0" firstAttribute="top" secondItem="sfz-V3-QhK" secondAttribute="bottom" constant="1" id="4ta-Gr-B5A"/> + <constraint firstItem="sfz-V3-QhK" firstAttribute="top" secondItem="nvG-hU-lKg" secondAttribute="top" constant="3" id="M4L-Af-Pfa"/> + <constraint firstItem="sfz-V3-QhK" firstAttribute="leading" secondItem="nvG-hU-lKg" secondAttribute="leading" constant="8" id="O23-cp-x3m"/> + <constraint firstItem="Sm2-al-NU0" firstAttribute="leading" secondItem="nvG-hU-lKg" secondAttribute="leading" constant="8" id="WJh-9X-RGV"/> </constraints> - <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" id="zp2-mv-NHW"> - <font key="font" size="13" name="HelveticaNeue-Light"/> - <color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="YkV-D4-ddd" userLabel="PresenceIndicator" customClass="RoundedTextField"> - <rect key="frame" x="48" y="6" width="14" height="14"/> - <constraints> - <constraint firstAttribute="width" constant="9.5" id="IdR-WT-Pvg"/> - <constraint firstAttribute="height" constant="13.5" id="dO4-wg-jEC"/> - </constraints> - <textFieldCell key="cell" enabled="NO" sendsActionOnEndEditing="YES" alignment="center" id="1DZ-7a-3Qp"> - <font key="font" metaFont="system"/> - <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> - <color key="value" red="0.29803921568627451" green="0.85098039215686272" blue="0.39215686274509803" alpha="1" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="borderColor"> - <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="borderThickness"> - <real key="value" value="1.5"/> - </userDefinedRuntimeAttribute> - </userDefinedRuntimeAttributes> - </textField> - <textField hidden="YES" verticalHuggingPriority="750" tag="800" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="epi-ZP-as5" userLabel="Last Interaction Date"> - <rect key="frame" x="273" y="32" width="44" height="20"/> - <constraints> - <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="40" id="asz-gD-lug"/> - </constraints> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" id="BfK-c5-B1l"> - <font key="font" size="13" name="HelveticaNeue-Light"/> - <color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField hidden="YES" horizontalHuggingPriority="999" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="900" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mic-52-RIa" userLabel="Last Interaction Snippet"> - <rect key="frame" x="173" y="11" width="144" height="20"/> - <constraints> - <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="140" id="W0d-p1-O4L"/> - </constraints> - <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" id="VBS-Iu-q1M"> - <font key="font" size="13" name="HelveticaNeue-Light"/> - <color key="textColor" red="0.50196078431372548" green="0.50196078431372548" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <button toolTip="Accept Invitation" verticalHuggingPriority="750" tag="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Fc5-KS-cim" userLabel="Add Contact Button" customClass="HoverButton"> - <rect key="frame" x="209" y="6" width="30" height="30"/> - <constraints> - <constraint firstAttribute="width" constant="30" id="FjC-O1-DDc"/> - <constraint firstAttribute="height" constant="30" id="zM2-c1-5Es"/> - </constraints> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_person_add" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="tQv-pI-ot0"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="imageColor"> - <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="hoverColor"> - <color key="value" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="4"/> - </userDefinedRuntimeAttribute> - </userDefinedRuntimeAttributes> - </button> - <button toolTip="Ignore invitation" verticalHuggingPriority="750" tag="1100" translatesAutoresizingMaskIntoConstraints="NO" id="ejM-H2-aJX" userLabel="Refuse Invitation Button" customClass="HoverButton"> - <rect key="frame" x="244" y="6" width="30" height="30"/> - <constraints> - <constraint firstAttribute="height" constant="30" id="MjJ-10-Auf"/> - <constraint firstAttribute="width" constant="30" id="iaV-AH-wjl"/> - </constraints> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_cancel" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="8ej-tV-bU4"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="imageColor"> - <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="hoverColor"> - <color key="value" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="4"/> - </userDefinedRuntimeAttribute> - </userDefinedRuntimeAttributes> - </button> - <button toolTip="Block contact" verticalHuggingPriority="750" tag="1200" translatesAutoresizingMaskIntoConstraints="NO" id="xP1-ZW-WZ8" userLabel="Block Contact Button" customClass="HoverButton"> - <rect key="frame" x="279" y="6" width="30" height="30"/> - <constraints> - <constraint firstAttribute="height" constant="30" id="gac-rJ-t64"/> - <constraint firstAttribute="width" constant="30" id="gpN-gl-xBY"/> - </constraints> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_block" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="qze-fl-ch1"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="imageColor"> - <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="color" keyPath="hoverColor"> - <color key="value" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="4"/> - </userDefinedRuntimeAttribute> - </userDefinedRuntimeAttributes> - </button> - </subviews> - <constraints> - <constraint firstItem="epa-Ih-aKF" firstAttribute="top" secondItem="Z6G-mQ-L3J" secondAttribute="top" constant="7" id="34y-lV-vl2"/> - <constraint firstItem="sHH-wj-oHs" firstAttribute="leading" secondItem="Z6G-mQ-L3J" secondAttribute="leading" constant="6" id="CGt-hN-ulS"/> - <constraint firstItem="ejM-H2-aJX" firstAttribute="leading" secondItem="Fc5-KS-cim" secondAttribute="trailing" constant="5" id="CqZ-iW-bob"/> - <constraint firstItem="bZ6-1S-zx2" firstAttribute="leading" secondItem="epa-Ih-aKF" secondAttribute="leading" id="Ffs-rJ-b8V"/> - <constraint firstItem="YkV-D4-ddd" firstAttribute="trailing" secondItem="sHH-wj-oHs" secondAttribute="trailing" constant="-0.5" id="HSa-sm-3vp"/> - <constraint firstAttribute="bottom" secondItem="xP1-ZW-WZ8" secondAttribute="bottom" constant="6" id="Jy0-tu-Huy"/> - <constraint firstItem="sHH-wj-oHs" firstAttribute="top" secondItem="Z6G-mQ-L3J" secondAttribute="top" constant="6" id="KMX-Ru-AEa"/> - <constraint firstItem="MYe-rn-qOP" firstAttribute="top" secondItem="sHH-wj-oHs" secondAttribute="top" id="Kub-qp-hhR"/> - <constraint firstItem="epi-ZP-as5" firstAttribute="centerY" secondItem="epa-Ih-aKF" secondAttribute="centerY" id="L49-TZ-Pju"/> - <constraint firstItem="MYe-rn-qOP" firstAttribute="trailing" secondItem="sHH-wj-oHs" secondAttribute="trailing" id="Mv6-W1-pJW"/> - <constraint firstItem="bZ6-1S-zx2" firstAttribute="top" secondItem="epa-Ih-aKF" secondAttribute="bottom" constant="-1" id="NnZ-fX-wbG"/> - <constraint firstItem="ejM-H2-aJX" firstAttribute="centerY" secondItem="Fc5-KS-cim" secondAttribute="centerY" id="QvI-kL-sx8"/> - <constraint firstAttribute="bottom" secondItem="sHH-wj-oHs" secondAttribute="bottom" constant="6" id="SJ6-9t-r0l"/> - <constraint firstItem="YkV-D4-ddd" firstAttribute="bottom" secondItem="sHH-wj-oHs" secondAttribute="bottom" id="TGB-Iw-hdK"/> - <constraint firstAttribute="trailing" secondItem="epi-ZP-as5" secondAttribute="trailing" constant="6" id="XEf-2m-loK"/> - <constraint firstItem="xP1-ZW-WZ8" firstAttribute="leading" secondItem="ejM-H2-aJX" secondAttribute="trailing" constant="5" id="d5E-z8-brF"/> - <constraint firstAttribute="bottom" secondItem="bZ6-1S-zx2" secondAttribute="bottom" constant="11" id="heC-Eb-J2U"/> - <constraint firstAttribute="trailing" secondItem="xP1-ZW-WZ8" secondAttribute="trailing" constant="12" id="jjq-30-NU1"/> - <constraint firstItem="mic-52-RIa" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="bZ6-1S-zx2" secondAttribute="trailing" constant="10" id="kHp-c8-vEc"/> - <constraint firstAttribute="trailing" secondItem="mic-52-RIa" secondAttribute="trailing" constant="6" id="l5e-5o-lAk"/> - <constraint firstItem="Fc5-KS-cim" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="bZ6-1S-zx2" secondAttribute="trailing" constant="10" id="n2W-6I-lDK"/> - <constraint firstItem="Fc5-KS-cim" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="epa-Ih-aKF" secondAttribute="trailing" constant="10" id="nGf-8l-f5h"/> - <constraint firstItem="xP1-ZW-WZ8" firstAttribute="centerY" secondItem="Fc5-KS-cim" secondAttribute="centerY" id="pPs-eg-ffp"/> - <constraint firstItem="mic-52-RIa" firstAttribute="centerY" secondItem="bZ6-1S-zx2" secondAttribute="centerY" id="qaE-JA-5OM"/> - <constraint firstItem="epa-Ih-aKF" firstAttribute="leading" secondItem="sHH-wj-oHs" secondAttribute="trailing" constant="12" id="sdS-XG-xRu"/> - </constraints> - <connections> - <outlet property="textField" destination="epa-Ih-aKF" id="ISN-G3-Hxj"/> - </connections> - </tableCellView> - <tableCellView identifier="CallCell" id="nvG-hU-lKg" userLabel="CallCell" customClass="ContextualTableCellView"> - <rect key="frame" x="1" y="63" width="321" height="50"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="200" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sfz-V3-QhK"> - <rect key="frame" x="6" y="24" width="73" height="23"/> - <constraints> - <constraint firstAttribute="height" constant="23" id="Knk-h9-HbW"/> - </constraints> - <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Call name" id="j0J-Xd-uth"> - <font key="font" size="16" name="HelveticaNeue-Light"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="300" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Sm2-al-NU0"> - <rect key="frame" x="6" y="3" width="40" height="20"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="details" id="mK5-kV-YOO"> - <font key="font" size="13" name="HelveticaNeue-Light"/> - <color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - </subviews> - <constraints> - <constraint firstItem="Sm2-al-NU0" firstAttribute="top" secondItem="sfz-V3-QhK" secondAttribute="bottom" constant="1" id="4ta-Gr-B5A"/> - <constraint firstItem="sfz-V3-QhK" firstAttribute="top" secondItem="nvG-hU-lKg" secondAttribute="top" constant="3" id="M4L-Af-Pfa"/> - <constraint firstItem="sfz-V3-QhK" firstAttribute="leading" secondItem="nvG-hU-lKg" secondAttribute="leading" constant="8" id="O23-cp-x3m"/> - <constraint firstItem="Sm2-al-NU0" firstAttribute="leading" secondItem="nvG-hU-lKg" secondAttribute="leading" constant="8" id="WJh-9X-RGV"/> - </constraints> - <connections> - <outlet property="textField" destination="sfz-V3-QhK" id="0Ka-vn-gAW"/> - </connections> - </tableCellView> - <customView identifier="HoverRowView" id="f78-Ki-IyO" customClass="HoverTableRowView"> - <rect key="frame" x="1" y="115" width="321" height="55"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - </customView> - </prototypeCellViews> - </tableColumn> - </tableColumns> - <connections> - <outlet property="delegate" destination="jrf-42-1l2" id="8h1-gK-pbG"/> - </connections> - </outlineView> - </subviews> - </clipView> - <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="OkJ-yp-L3b"> - <rect key="frame" x="1" y="119" width="224" height="15"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="obv-Hw-mDJ"> - <rect key="frame" x="225" y="17" width="15" height="102"/> - <autoresizingMask key="autoresizingMask"/> - </scroller> - </scrollView> - </subviews> - <constraints> - <constraint firstAttribute="bottom" secondItem="omo-Be-zok" secondAttribute="bottom" id="5ys-Wa-9mw"/> - <constraint firstItem="omo-Be-zok" firstAttribute="leading" secondItem="D5P-tm-YgO" secondAttribute="leading" id="9f9-gC-qUk"/> - <constraint firstAttribute="trailing" secondItem="omo-Be-zok" secondAttribute="trailing" id="kjE-nb-hyc"/> - <constraint firstItem="omo-Be-zok" firstAttribute="top" secondItem="D5P-tm-YgO" secondAttribute="top" constant="3" id="u5o-YR-A05"/> - </constraints> - </view> - </tabViewItem> - </tabViewItems> - </tabView> - <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3Nq-Rz-Etg"> - <rect key="frame" x="19" y="593" width="286" height="20"/> - <constraints> - <constraint firstAttribute="height" constant="18" id="6LE-6n-vaC"/> - </constraints> - <segmentedCell key="cell" borderStyle="border" alignment="left" style="roundRect" trackingMode="selectOne" id="6T7-ip-Pun"> - <font key="font" metaFont="cellTitle"/> - <segments> - <segment label="Conversations" width="140" selected="YES"/> - <segment label="Requests" width="140" tag="1"/> - </segments> - </segmentedCell> - <connections> - <action selector="listTypeChanged:" target="jrf-42-1l2" id="iha-7Z-YDQ"/> - </connections> - </segmentedControl> - <searchField wantsLayer="YES" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PoQ-x4-ES3"> - <rect key="frame" x="20" y="620" width="284" height="22"/> - <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Search for new or existing contact" usesSingleLineMode="YES" bezelStyle="round" id="vvE-nM-kSl"> - <font key="font" metaFont="system"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> - </searchFieldCell> - <connections> - <outlet property="delegate" destination="jrf-42-1l2" id="UtW-SL-Loa"/> - </connections> - </searchField> - <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="600" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="14" translatesAutoresizingMaskIntoConstraints="NO" id="VsX-mX-hf3" userLabel="Total Unread Message Count" customClass="RoundedTextField"> - <rect key="frame" x="135" y="602" width="10" height="14"/> - <constraints> - <constraint firstAttribute="height" constant="14" id="5Jq-bx-b4E"/> - <constraint firstAttribute="width" constant="10" id="9Qo-ai-YOX"/> - </constraints> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" drawsBackground="YES" id="0nG-cC-02J"> - <font key="font" metaFont="system" size="7"/> - <color key="textColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" red="0.98431372549999996" green="0.28627450980000002" blue="0.28235294119999998" alpha="0.90000000000000002" colorSpace="calibratedRGB"/> - </textFieldCell> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> - <color key="value" red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - </userDefinedRuntimeAttributes> - </textField> - <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="700" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="14" translatesAutoresizingMaskIntoConstraints="NO" id="tBR-mv-w66" userLabel="Unhandled Invite Count" customClass="RoundedTextField"> - <rect key="frame" x="277" y="602" width="10" height="14"/> + <connections> + <outlet property="textField" destination="sfz-V3-QhK" id="0Ka-vn-gAW"/> + </connections> + </tableCellView> + <customView identifier="HoverRowView" id="f78-Ki-IyO" customClass="HoverTableRowView"> + <rect key="frame" x="1" y="115" width="321" height="55"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + </customView> + </prototypeCellViews> + </tableColumn> + </tableColumns> + <connections> + <outlet property="delegate" destination="jrf-42-1l2" id="8h1-gK-pbG"/> + </connections> + </outlineView> + </subviews> + </clipView> + <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="OkJ-yp-L3b"> + <rect key="frame" x="1" y="119" width="224" height="15"/> + <autoresizingMask key="autoresizingMask"/> + </scroller> + <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="obv-Hw-mDJ"> + <rect key="frame" x="225" y="17" width="15" height="102"/> + <autoresizingMask key="autoresizingMask"/> + </scroller> + </scrollView> + </subviews> + <constraints> + <constraint firstAttribute="bottom" secondItem="omo-Be-zok" secondAttribute="bottom" id="5ys-Wa-9mw"/> + <constraint firstItem="omo-Be-zok" firstAttribute="leading" secondItem="D5P-tm-YgO" secondAttribute="leading" id="9f9-gC-qUk"/> + <constraint firstAttribute="trailing" secondItem="omo-Be-zok" secondAttribute="trailing" id="kjE-nb-hyc"/> + <constraint firstItem="omo-Be-zok" firstAttribute="top" secondItem="D5P-tm-YgO" secondAttribute="top" constant="3" id="u5o-YR-A05"/> + </constraints> + </view> + </tabViewItem> + </tabViewItems> + </tabView> + </subviews> <constraints> - <constraint firstAttribute="width" constant="10" id="7JN-4z-cSI"/> - <constraint firstAttribute="height" constant="14" id="jHX-tM-8MD"/> + <constraint firstAttribute="bottom" secondItem="xXW-iq-GcP" secondAttribute="bottom" id="6Go-Jc-uHI"/> + <constraint firstItem="VsX-mX-hf3" firstAttribute="leading" secondItem="3Nq-Rz-Etg" secondAttribute="leading" constant="115" id="H15-xN-keV"/> + <constraint firstAttribute="trailing" secondItem="xXW-iq-GcP" secondAttribute="trailing" id="IMT-fC-kq3"/> + <constraint firstItem="xXW-iq-GcP" firstAttribute="top" secondItem="PoQ-x4-ES3" secondAttribute="bottom" priority="900" constant="8" id="MMH-93-sOz"/> + <constraint firstAttribute="trailing" secondItem="3Nq-Rz-Etg" secondAttribute="trailing" constant="20" id="TVW-7Y-L79"/> + <constraint firstAttribute="trailing" secondItem="PoQ-x4-ES3" secondAttribute="trailing" constant="20" id="VXm-NA-edt"/> + <constraint firstItem="PoQ-x4-ES3" firstAttribute="leading" secondItem="0xt-Yr-Jqx" secondAttribute="leading" constant="20" id="XzG-Pl-DF1"/> + <constraint firstItem="tBR-mv-w66" firstAttribute="leading" secondItem="3Nq-Rz-Etg" secondAttribute="leading" constant="257" id="aNt-lE-9XG"/> + <constraint firstItem="xXW-iq-GcP" firstAttribute="top" secondItem="3Nq-Rz-Etg" secondAttribute="bottom" constant="8" id="dFh-ij-z52"/> + <constraint firstItem="xXW-iq-GcP" firstAttribute="leading" secondItem="0xt-Yr-Jqx" secondAttribute="leading" id="gEe-iR-Ygm"/> + <constraint firstItem="tBR-mv-w66" firstAttribute="top" secondItem="3Nq-Rz-Etg" secondAttribute="top" constant="-4" id="lxv-3f-EsK"/> + <constraint firstItem="VsX-mX-hf3" firstAttribute="top" secondItem="3Nq-Rz-Etg" secondAttribute="top" constant="-4" id="pzo-8u-NhI"/> + <constraint firstItem="3Nq-Rz-Etg" firstAttribute="top" secondItem="PoQ-x4-ES3" secondAttribute="bottom" constant="8" id="yTT-LC-bwG"/> + <constraint firstItem="3Nq-Rz-Etg" firstAttribute="leading" secondItem="0xt-Yr-Jqx" secondAttribute="leading" constant="20" id="zGC-PO-FoT"/> + <constraint firstItem="PoQ-x4-ES3" firstAttribute="top" secondItem="0xt-Yr-Jqx" secondAttribute="top" constant="16" id="zU3-0g-z9M"/> </constraints> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" drawsBackground="YES" id="8PT-wu-Uso"> - <font key="font" metaFont="system" size="7"/> - <color key="textColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" red="0.98431372549999996" green="0.28627450980000002" blue="0.28235294119999998" alpha="0.90000000000000002" colorSpace="calibratedRGB"/> - </textFieldCell> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> - <color key="value" red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius"> - <integer key="value" value="6"/> - </userDefinedRuntimeAttribute> - </userDefinedRuntimeAttributes> - </textField> + </visualEffectView> </subviews> <constraints> - <constraint firstAttribute="trailing" secondItem="PoQ-x4-ES3" secondAttribute="trailing" constant="20" id="4sB-9A-dhz"/> - <constraint firstItem="3Nq-Rz-Etg" firstAttribute="top" secondItem="PoQ-x4-ES3" secondAttribute="bottom" constant="8" id="9Xh-o4-Yqb"/> - <constraint firstItem="PoQ-x4-ES3" firstAttribute="leading" secondItem="YgH-CN-tkB" secondAttribute="leading" constant="20" id="9e0-oX-skE"/> - <constraint firstItem="xXW-iq-GcP" firstAttribute="top" secondItem="PoQ-x4-ES3" secondAttribute="bottom" priority="900" constant="8" id="ESF-pw-bYW"/> - <constraint firstItem="VsX-mX-hf3" firstAttribute="leading" secondItem="3Nq-Rz-Etg" secondAttribute="leading" constant="115" id="Htk-Dx-tQI"/> - <constraint firstAttribute="bottom" secondItem="xXW-iq-GcP" secondAttribute="bottom" id="MYN-Zf-Bvk"/> - <constraint firstAttribute="trailing" secondItem="xXW-iq-GcP" secondAttribute="trailing" id="TXC-lN-yL8"/> + <constraint firstAttribute="trailing" secondItem="0xt-Yr-Jqx" secondAttribute="trailing" id="B44-e8-a8l"/> + <constraint firstItem="0xt-Yr-Jqx" firstAttribute="leading" secondItem="YgH-CN-tkB" secondAttribute="leading" id="T7G-bW-rGZ"/> <constraint firstAttribute="width" constant="324" id="Yjy-go-Dgc"/> - <constraint firstItem="xXW-iq-GcP" firstAttribute="leading" secondItem="YgH-CN-tkB" secondAttribute="leading" id="aSr-vt-QvR"/> - <constraint firstItem="tBR-mv-w66" firstAttribute="top" secondItem="3Nq-Rz-Etg" secondAttribute="top" constant="-4" id="bVy-Ou-iav"/> - <constraint firstItem="VsX-mX-hf3" firstAttribute="top" secondItem="3Nq-Rz-Etg" secondAttribute="top" constant="-4" id="eHb-1t-b48"/> - <constraint firstItem="tBR-mv-w66" firstAttribute="leading" secondItem="3Nq-Rz-Etg" secondAttribute="leading" constant="257" id="goI-fi-SN2"/> - <constraint firstItem="xXW-iq-GcP" firstAttribute="top" secondItem="3Nq-Rz-Etg" secondAttribute="bottom" constant="8" id="ka6-To-x0Z"/> - <constraint firstItem="3Nq-Rz-Etg" firstAttribute="leading" secondItem="YgH-CN-tkB" secondAttribute="leading" constant="20" id="oMZ-7J-lNx"/> - <constraint firstItem="PoQ-x4-ES3" firstAttribute="top" secondItem="YgH-CN-tkB" secondAttribute="top" constant="16" id="pNA-2g-7AA"/> - <constraint firstAttribute="trailing" secondItem="3Nq-Rz-Etg" secondAttribute="trailing" constant="20" id="wzE-rl-hbe"/> + <constraint firstItem="0xt-Yr-Jqx" firstAttribute="top" secondItem="YgH-CN-tkB" secondAttribute="top" id="nb9-tL-VMS"/> + <constraint firstAttribute="bottom" secondItem="0xt-Yr-Jqx" secondAttribute="bottom" id="xiW-Y7-Rjx"/> </constraints> </customView> <customView translatesAutoresizingMaskIntoConstraints="NO" id="Fzg-MB-mlx" userLabel="HomeView"> <rect key="frame" x="325" y="0.0" width="728" height="658"/> <subviews> - <customView translatesAutoresizingMaskIntoConstraints="NO" id="6bh-ow-nJO" customClass="BackgroundView"> + <customView translatesAutoresizingMaskIntoConstraints="NO" id="6bh-ow-nJO"> <rect key="frame" x="0.0" y="0.0" width="728" height="172"/> <constraints> <constraint firstAttribute="height" constant="172" id="hCN-uz-Nmc"/> @@ -618,10 +626,6 @@ </connections> </viewController> <userDefaultsController representsSharedInstance="YES" id="nz5-E9-8bl"/> - <visualEffectView appearanceType="vibrantDark" blendingMode="behindWindow" material="appearanceBased" state="followsWindowActiveState" id="COh-Af-P4a"> - <rect key="frame" x="0.0" y="0.0" width="128" height="128"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - </visualEffectView> </objects> <resources> <image name="NSShareTemplate" width="11" height="16"/> diff --git a/ui/Base.lproj/RingWizard.xib b/ui/Base.lproj/RingWizard.xib index 0221d246814491729a7b78c50bb44f053f2aa9ee..bea93053e4eaf48715ab80bb226df311d57cc917 100644 --- a/ui/Base.lproj/RingWizard.xib +++ b/ui/Base.lproj/RingWizard.xib @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -24,7 +24,7 @@ <rect key="frame" x="0.0" y="0.0" width="450" height="318"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <visualEffectView appearanceType="vibrantLight" blendingMode="behindWindow" material="appearanceBased" state="active" translatesAutoresizingMaskIntoConstraints="NO" id="iI2-Gb-gPl"> + <visualEffectView blendingMode="behindWindow" material="appearanceBased" state="active" translatesAutoresizingMaskIntoConstraints="NO" id="iI2-Gb-gPl"> <rect key="frame" x="0.0" y="0.0" width="450" height="318"/> </visualEffectView> <customView translatesAutoresizingMaskIntoConstraints="NO" id="9ok-Ga-Q8u" userLabel="header">