Skip to content

GitLab

Commit bdaa274b authored by Kateryna Kostiuk's avatar Kateryna Kostiuk Committed by Andreas Traczyk
Browse files
Options

UI/UX: standardize windows views 

- standardize view for backup account, register username and change
password windows

Change-Id: I442a32cfa04ac9fe4af7fed2318cac6c4e264693
Reviewed-by: Andreas Traczyk's avatarAndreas Traczyk <andreas.traczyk@savoirfairelinux.com>
parent 4a7bffe5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 132 deletions
src/PasswordChangeWC.mm
View file @ bdaa274b
......@@ -25,8 +25,10 @@
@implementation PasswordChangeWC
{
__unsafe_unretained IBOutlet NSSecureTextField *oldPassword;
__unsafe_unretained IBOutlet NSTextField *oldPasswordTitle;
__unsafe_unretained IBOutlet NSSecureTextField *newPassword;
__unsafe_unretained IBOutlet NSSecureTextField *repeatedPassword;
__unsafe_unretained IBOutlet NSLayoutConstraint *newPasswordTopConstraint;
__unsafe_unretained IBOutlet NSImageView *repeatPasswordValid;
......@@ -51,9 +53,9 @@
[super windowDidLoad];
lrc::api::account::ConfProperties_t accountProperties = self.accountModel->getAccountConfig(self.selectedAccountID);
BOOL hasPassword = accountProperties.archiveHasPassword;
[oldPassword setEnabled:hasPassword];
[oldPassword setPlaceholderString:(hasPassword)?@"":NSLocalizedString(@"Account has no password", @"No password on this account text field placeholder")];
[oldPassword setHidden: !hasPassword];
[oldPasswordTitle setHidden: !hasPassword];
newPasswordTopConstraint.constant = hasPassword ? 15.0 : -oldPasswordTitle.frame.size.height;
}
-(IBAction)accept:(id)sender
......@@ -67,6 +69,7 @@
[self close];
} else {
[oldPassword setStringValue:@""];
[oldPassword setPlaceholderString:@"Enter your old password"];
[wrongPasswordPopover showRelativeToRect:oldPassword.visibleRect ofView:oldPassword preferredEdge:NSMinYEdge];
}
}
......
src/RegisterNameWC.h
View file @ bdaa274b
......@@ -39,12 +39,12 @@
/**
* KVO with the registeredNameField
*/
@property (nonatomic, weak)NSString* registeredName;
//@property (nonatomic, weak)NSString* registeredName;
/**
* KVO with the passwordField
*/
@property (nonatomic, weak)NSString* password;
//@property (nonatomic, weak)NSString* password;
/**
* KVO validators for the UI
......
src/RegisterNameWC.mm
View file @ bdaa274b
......@@ -63,15 +63,17 @@ NSInteger const BLOCKCHAIN_NAME_TAG = 2;
[registeredNameField setTag:BLOCKCHAIN_NAME_TAG];
[ivLookupResult setHidden:YES];
[indicatorLookupResult setHidden:YES];
self.password = @"";
self.registeredName = @"";
// self.password = @"";
//self.registeredName = @"";
// [registeredNameField setPlaceholderString:@"Username..."];
// [passwordField setPlaceholderString:@"Password..."];
}
#pragma mark - Username validation delegate methods
- (BOOL)userNameAvailable
{
return (self.registeredName.length > 0 && self.isUserNameAvailable);
return (registeredNameField.stringValue.length > 0 && self.isUserNameAvailable);
}
- (void)showLookUpAvailable:(BOOL)available andText:(NSString *)message
......@@ -193,7 +195,7 @@ NSInteger const BLOCKCHAIN_NAME_TAG = 2;
[self showLoading];
[self setCallback];
self.isUserNameAvailable = self.accountModel->registerName(self.selectedAccountID, [self.password UTF8String], [self.registeredName UTF8String]);
self.isUserNameAvailable = self.accountModel->registerName(self.selectedAccountID, [passwordField.stringValue UTF8String], [registeredNameField.stringValue UTF8String]);
if (!self.isUserNameAvailable) {
NSLog(@"Could not initialize registerName operation");
QObject::disconnect(registrationEnded);
......@@ -212,7 +214,7 @@ NSInteger const BLOCKCHAIN_NAME_TAG = 2;
switch(status)
{
case lrc::api::account::RegisterNameStatus::SUCCESS: {
[self.delegate didRegisterName: self.registeredName withSuccess: YES];
[self.delegate didRegisterName: registeredNameField.stringValue withSuccess: YES];
break;
}
case lrc::api::account::RegisterNameStatus::INVALID_NAME:
......
src/RingWizardLinkAccountVC.mm
View file @ bdaa274b
......@@ -72,6 +72,8 @@
- (void)viewDidLoad {
[super viewDidLoad];
[self.view setAutoresizingMask: NSViewHeightSizable];
fileButtonTitleBackup = NSLocalizedString(@"Select archive",
@"export account button title");
}
- (void)show
......
src/RingWizardWC.mm
View file @ bdaa274b
......@@ -69,7 +69,6 @@
[newAccountWC setDelegate:self];
[self.window setBackgroundColor:[NSColor ringGreyHighlight]];
[self showChooseWithCancelButton:isCancelable andAdvanced: withAdvanced];
self.window.appearance = [NSAppearance appearanceNamed:NSAppearanceNameVibrantLight];
}
- (void)removeSubviews
......
ui/Base.lproj/BackupAccountWindow.xib
View file @ bdaa274b
......@@ -3,6 +3,7 @@
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
<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="BackupAccountWC">
......@@ -24,17 +25,17 @@
<rect key="contentRect" x="196" y="240" width="380" height="168"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
<view key="contentView" id="EiT-Mj-1SZ">
<rect key="frame" x="0.0" y="0.0" width="380" height="168"/>
<rect key="frame" x="0.0" y="0.0" width="380" height="158"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="XMQ-jJ-yqG">
<rect key="frame" x="0.0" y="0.0" width="380" height="168"/>
<rect key="frame" x="0.0" y="0.0" width="380" height="158"/>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="3Jv-gr-8Hf">
<rect key="frame" x="0.0" y="0.0" width="380" height="168"/>
<rect key="frame" x="0.0" y="0.0" width="380" height="158"/>
<subviews>
<customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ovf-4O-7LZ" customClass="ITProgressIndicator">
<rect key="frame" x="155" y="49" width="70" height="70"/>
<rect key="frame" x="155" y="44" width="70" height="70"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="aK6-EW-mJE"/>
<constraint firstAttribute="height" constant="70" id="xfx-Hb-kNz"/>
......@@ -47,10 +48,10 @@
</constraints>
</customView>
<customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ty1-sj-tT6">
<rect key="frame" x="0.0" y="0.0" width="380" height="168"/>
<rect key="frame" x="0.0" y="0.0" width="380" height="158"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="G1N-th-ZtP">
<rect key="frame" x="33" y="76" width="314" height="17"/>
<rect key="frame" x="33" y="71" width="314" height="17"/>
<textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="An error occured during the backup" placeholderString="" id="e7n-Ev-bK7">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
......@@ -81,10 +82,10 @@ DQ
</constraints>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="xUT-yB-g8Q">
<rect key="frame" x="0.0" y="0.0" width="380" height="168"/>
<rect key="frame" x="0.0" y="0.0" width="380" height="158"/>
<subviews>
<pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ww6-ha-GhI">
<rect key="frame" x="47" y="74" width="286" height="26"/>
<rect key="frame" x="47" y="62" width="286" height="26"/>
<pathCell key="cell" selectable="YES" editable="YES" alignment="left" pathStyle="popUp" id="S8N-6a-Pll">
<font key="font" metaFont="system"/>
<url key="url" string="file:///Downloads"/>
......@@ -96,16 +97,27 @@ DQ
</connections>
</pathControl>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="CR7-hP-0ow">
<rect key="frame" x="18" y="128" width="344" height="20"/>
<rect key="frame" x="33" y="101" width="329" height="16"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="Nxf-vc-UNz"/>
<constraint firstAttribute="height" constant="16" id="0Si-aD-Fbw"/>
</constraints>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Choose where to backup your account. " placeholderString="" id="KYZ-TW-44Y">
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Choose where to backup your account. " placeholderString="" id="KYZ-TW-44Y">
<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" translatesAutoresizingMaskIntoConstraints="NO" id="YtM-Br-yAx">
<rect key="frame" x="33" y="122" width="329" height="16"/>
<constraints>
<constraint firstAttribute="height" constant="16" id="rGH-FQ-PqM"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Export Account" id="MYh-XG-Mdn">
<font key="font" metaFont="systemSemibold" size="13"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oXB-Be-LaB">
<rect key="frame" x="307" y="13" width="59" height="32"/>
<buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="rW5-Il-5YD">
......@@ -120,7 +132,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Yf1-T3-fOf">
<rect key="frame" x="217" y="13" width="82" height="32"/>
<rect key="frame" x="225" y="13" width="82" height="32"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cSU-aD-OwX">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
......@@ -134,15 +146,19 @@ Gw
</button>
</subviews>
<constraints>
<constraint firstItem="CR7-hP-0ow" firstAttribute="top" secondItem="YtM-Br-yAx" secondAttribute="bottom" constant="5" id="6VO-0G-1nw"/>
<constraint firstItem="CR7-hP-0ow" firstAttribute="leading" secondItem="YtM-Br-yAx" secondAttribute="leading" id="7me-Cp-onx"/>
<constraint firstItem="ww6-ha-GhI" firstAttribute="leading" secondItem="xUT-yB-g8Q" secondAttribute="leading" constant="50" id="94f-3j-Ecs"/>
<constraint firstItem="CR7-hP-0ow" firstAttribute="top" secondItem="xUT-yB-g8Q" secondAttribute="top" constant="20" id="Gar-kL-wdU"/>
<constraint firstItem="oXB-Be-LaB" firstAttribute="leading" secondItem="Yf1-T3-fOf" secondAttribute="trailing" constant="20" id="Tsc-ay-3Q9"/>
<constraint firstAttribute="trailing" secondItem="YtM-Br-yAx" secondAttribute="trailing" constant="20" id="Bch-2U-PFS"/>
<constraint firstItem="YtM-Br-yAx" firstAttribute="leading" secondItem="xUT-yB-g8Q" secondAttribute="leading" constant="35" id="Qm2-ht-q92"/>
<constraint firstItem="oXB-Be-LaB" firstAttribute="leading" secondItem="Yf1-T3-fOf" secondAttribute="trailing" constant="12" id="Tsc-ay-3Q9"/>
<constraint firstItem="YtM-Br-yAx" firstAttribute="top" secondItem="xUT-yB-g8Q" secondAttribute="top" constant="20" id="Wmj-Hw-Qf9"/>
<constraint firstAttribute="trailing" secondItem="oXB-Be-LaB" secondAttribute="trailing" constant="20" id="aTI-SX-1jI"/>
<constraint firstItem="CR7-hP-0ow" firstAttribute="leading" secondItem="xUT-yB-g8Q" secondAttribute="leading" constant="20" id="at8-jS-cPG"/>
<constraint firstItem="oXB-Be-LaB" firstAttribute="top" secondItem="ww6-ha-GhI" secondAttribute="bottom" constant="25" id="gqC-9x-QYa"/>
<constraint firstAttribute="trailing" secondItem="ww6-ha-GhI" secondAttribute="trailing" constant="50" id="jfu-vK-fXY"/>
<constraint firstAttribute="trailing" secondItem="CR7-hP-0ow" secondAttribute="trailing" constant="20" id="lu3-Jz-6TR"/>
<constraint firstAttribute="bottom" secondItem="Yf1-T3-fOf" secondAttribute="bottom" constant="20" id="oCq-S8-TrF"/>
<constraint firstItem="ww6-ha-GhI" firstAttribute="top" secondItem="CR7-hP-0ow" secondAttribute="bottom" constant="30" id="tca-nk-lN4"/>
<constraint firstItem="ww6-ha-GhI" firstAttribute="top" secondItem="CR7-hP-0ow" secondAttribute="bottom" constant="15" id="tca-nk-lN4"/>
<constraint firstAttribute="bottom" secondItem="oXB-Be-LaB" secondAttribute="bottom" constant="20" id="ueM-rT-B60"/>
</constraints>
</customView>
......
ui/Base.lproj/Localizable.strings
View file @ bdaa274b
......@@ -169,3 +169,6 @@
/* Remove account alert message */
"By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost." = "By clicking \"OK\" you will remove this account on this device! This action can not be undone. Also, your registered name can be lost.";
/* export account button title */
"Select archive" = "Select archive";
ui/Base.lproj/PasswordChange.strings
View file @ bdaa274b
......@@ -11,8 +11,8 @@
/* Class = "NSTextFieldCell"; title = "Password is incorrect"; ObjectID = "WyU-Dx-U1u"; */
"WyU-Dx-U1u.title" = "Password is incorrect";
/* Class = "NSTextFieldCell"; title = "Enter your old password"; ObjectID = "gPw-Jf-0M7"; */
"gPw-Jf-0M7.title" = "Enter your old password";
/* Class = "NSTextFieldCell"; title = "Old password"; ObjectID = "gPw-Jf-0M7"; */
"gPw-Jf-0M7.title" = "Old password";
/* Class = "NSTextFieldCell"; title = "Chose a new password"; ObjectID = "pZe-DO-jWp"; */
"pZe-DO-jWp.title" = "Chose a new password";
/* Class = "NSTextFieldCell"; title = "New password"; ObjectID = "pZe-DO-jWp"; */
"pZe-DO-jWp.title" = "New password";
ui/Base.lproj/PasswordChange.xib
View file @ bdaa274b
......@@ -3,13 +3,16 @@
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
<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="PasswordChangeWC">
<connections>
<outlet property="acceptButton" destination="seS-xB-tV5" id="4kc-f1-OeT"/>
<outlet property="newPassword" destination="PqU-pv-omA" id="jSb-2F-QX4"/>
<outlet property="newPasswordTopConstraint" destination="fOe-Qy-hta" id="Fgl-8Z-v4O"/>
<outlet property="oldPassword" destination="9cq-HX-es7" id="EhQ-3P-6tD"/>
<outlet property="oldPasswordTitle" destination="WzW-UV-89z" id="9fp-dF-fpg"/>
<outlet property="repeatPasswordValid" destination="MDW-YB-UdP" id="eKc-Tz-wbe"/>
<outlet property="repeatedPassword" destination="rsK-Ce-Yjg" id="ULJ-P0-CFc"/>
<outlet property="window" destination="QvC-M9-y7g" id="t2o-0F-5GV"/>
......@@ -20,26 +23,34 @@
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
<rect key="contentRect" x="196" y="240" width="360" height="270"/>
<rect key="contentRect" x="196" y="240" width="440" height="205"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
<rect key="frame" x="0.0" y="0.0" width="360" height="270"/>
<rect key="frame" x="0.0" y="0.0" width="440" height="202"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="q9z-7q-Rk8">
<rect key="frame" x="33" y="165" width="389" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Change Password" id="4Uf-yO-9X8">
<font key="font" metaFont="systemSemibold" size="13"/>
<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" translatesAutoresizingMaskIntoConstraints="NO" id="WzW-UV-89z">
<rect key="frame" x="105" y="233" width="151" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Enter your old password" id="gPw-Jf-0M7">
<rect key="frame" x="65" y="133" width="93" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Old password" id="gPw-Jf-0M7">
<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>
<secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9cq-HX-es7">
<rect key="frame" x="80" y="203" width="200" height="22"/>
<rect key="frame" x="163" y="131" width="200" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="8Hg-Hs-5ut"/>
</constraints>
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="Kwp-mD-Y94">
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Enter your old password" usesSingleLineMode="YES" bezelStyle="round" id="Kwp-mD-Y94">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
......@@ -52,19 +63,19 @@
</connections>
</secureTextField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3Im-C5-CMq">
<rect key="frame" x="108" y="178" width="144" height="17"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Chose a new password" id="pZe-DO-jWp">
<rect key="frame" x="65" y="101" width="93" height="17"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="New password" id="pZe-DO-jWp">
<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>
<secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PqU-pv-omA">
<rect key="frame" x="80" y="148" width="200" height="22"/>
<rect key="frame" x="163" y="98" width="200" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="IXh-m8-u8G"/>
</constraints>
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="4aD-Xd-zHS">
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Enter a new password" usesSingleLineMode="YES" bezelStyle="round" id="4aD-Xd-zHS">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
......@@ -78,19 +89,19 @@
</connections>
</secureTextField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5ia-te-vKr">
<rect key="frame" x="157" y="123" width="47" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Repeat" id="8KO-IO-ykP">
<rect key="frame" x="65" y="69" width="93" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Repeat" id="8KO-IO-ykP">
<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>
<secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rsK-Ce-Yjg">
<rect key="frame" x="80" y="93" width="200" height="22"/>
<rect key="frame" x="163" y="66" width="200" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="OW4-Ma-jVD"/>
</constraints>
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="1Bs-Te-34p">
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Repeat a new password" usesSingleLineMode="YES" bezelStyle="round" id="1Bs-Te-34p">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
......@@ -104,7 +115,7 @@
</connections>
</secureTextField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="seS-xB-tV5">
<rect key="frame" x="263" y="13" width="83" height="32"/>
<rect key="frame" x="343" y="13" width="83" height="32"/>
<buttonCell key="cell" type="push" title="Accept" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ggu-EQ-cqC">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
......@@ -117,7 +128,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JhZ-ld-LcB" userLabel="Cancel Button">
<rect key="frame" x="14" y="13" width="82" height="32"/>
<rect key="frame" x="261" y="13" width="82" height="32"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="MZw-ep-8aW">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
......@@ -130,7 +141,7 @@ Gw
</connections>
</button>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="MDW-YB-UdP" userLabel="Repeat Password Valid">
<rect key="frame" x="290" y="94" width="20" height="20"/>
<rect key="frame" x="373" y="67" width="20" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="hgH-sU-wSP"/>
<constraint firstAttribute="width" constant="20" id="zM6-JX-AC4"/>
......@@ -139,25 +150,32 @@ Gw
</imageView>
</subviews>
<constraints>
<constraint firstItem="WzW-UV-89z" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="03C-xA-OdE"/>
<constraint firstItem="WzW-UV-89z" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="20" symbolic="YES" id="3vF-t1-zk8"/>
<constraint firstItem="PqU-pv-omA" firstAttribute="centerY" secondItem="3Im-C5-CMq" secondAttribute="centerY" id="1e1-GR-Rgx"/>
<constraint firstItem="rsK-Ce-Yjg" firstAttribute="trailing" secondItem="9cq-HX-es7" secondAttribute="trailing" id="2xk-Nn-c4g"/>
<constraint firstItem="5ia-te-vKr" firstAttribute="leading" secondItem="WzW-UV-89z" secondAttribute="leading" id="3Pt-dI-P10"/>
<constraint firstItem="MDW-YB-UdP" firstAttribute="leading" secondItem="rsK-Ce-Yjg" secondAttribute="trailing" constant="10" id="4VK-G7-FAk"/>
<constraint firstItem="JhZ-ld-LcB" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="20" symbolic="YES" id="5af-Ju-GWp"/>
<constraint firstAttribute="bottom" secondItem="JhZ-ld-LcB" secondAttribute="bottom" constant="20" symbolic="YES" id="D0g-5h-y7K"/>
<constraint firstItem="rsK-Ce-Yjg" firstAttribute="centerY" secondItem="5ia-te-vKr" secondAttribute="centerY" id="8Gp-wK-LqB"/>
<constraint firstItem="WzW-UV-89z" firstAttribute="leading" secondItem="q9z-7q-Rk8" secondAttribute="leading" constant="32" id="AGc-Gu-pBN"/>
<constraint firstItem="WzW-UV-89z" firstAttribute="top" secondItem="q9z-7q-Rk8" secondAttribute="bottom" constant="15" id="D8M-ri-rIW"/>
<constraint firstAttribute="trailing" secondItem="q9z-7q-Rk8" secondAttribute="trailing" constant="20" id="Eha-Tg-VjO"/>
<constraint firstItem="q9z-7q-Rk8" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="20" id="EnK-YI-4kr"/>
<constraint firstItem="MDW-YB-UdP" firstAttribute="centerY" secondItem="rsK-Ce-Yjg" secondAttribute="centerY" id="EuF-uO-iSK"/>
<constraint firstItem="rsK-Ce-Yjg" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="FFe-hI-kjr"/>
<constraint firstItem="9cq-HX-es7" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="J5J-bS-nzy"/>
<constraint firstItem="PqU-pv-omA" firstAttribute="top" secondItem="3Im-C5-CMq" secondAttribute="bottom" constant="8" symbolic="YES" id="LYL-rT-XNB"/>
<constraint firstAttribute="trailing" secondItem="seS-xB-tV5" secondAttribute="trailing" constant="20" symbolic="YES" id="Xpb-aW-EKc"/>
<constraint firstAttribute="bottom" secondItem="seS-xB-tV5" secondAttribute="bottom" constant="20" symbolic="YES" id="bZM-wc-8f8"/>
<constraint firstItem="5ia-te-vKr" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="ceT-Yt-7Mh"/>
<constraint firstItem="9cq-HX-es7" firstAttribute="top" secondItem="WzW-UV-89z" secondAttribute="bottom" constant="8" symbolic="YES" id="dyC-hJ-zVI"/>
<constraint firstItem="3Im-C5-CMq" firstAttribute="top" secondItem="9cq-HX-es7" secondAttribute="bottom" constant="8" symbolic="YES" id="nOP-xn-dkD"/>
<constraint firstItem="seS-xB-tV5" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="JhZ-ld-LcB" secondAttribute="trailing" constant="10" id="rL7-Qc-5sG"/>
<constraint firstItem="5ia-te-vKr" firstAttribute="top" secondItem="PqU-pv-omA" secondAttribute="bottom" constant="8" symbolic="YES" id="sX1-Ud-AtO"/>
<constraint firstItem="rsK-Ce-Yjg" firstAttribute="top" secondItem="5ia-te-vKr" secondAttribute="bottom" constant="8" symbolic="YES" id="u4a-Ck-I3E"/>
<constraint firstItem="3Im-C5-CMq" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="vYP-fY-5gW"/>
<constraint firstItem="PqU-pv-omA" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="zg9-xz-cwh"/>
<constraint firstItem="q9z-7q-Rk8" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="35" id="FfB-qu-N0d"/>
<constraint firstItem="5ia-te-vKr" firstAttribute="trailing" secondItem="WzW-UV-89z" secondAttribute="trailing" id="Rhd-Ac-P6U"/>
<constraint firstItem="9cq-HX-es7" firstAttribute="centerY" secondItem="WzW-UV-89z" secondAttribute="centerY" id="XlS-Ow-cqb"/>
<constraint firstAttribute="trailing" secondItem="seS-xB-tV5" secondAttribute="trailing" constant="20" id="Xpb-aW-EKc"/>
<constraint firstAttribute="bottom" secondItem="seS-xB-tV5" secondAttribute="bottom" constant="20" id="bZM-wc-8f8"/>
<constraint firstItem="3Im-C5-CMq" firstAttribute="top" secondItem="WzW-UV-89z" secondAttribute="bottom" constant="15" id="fOe-Qy-hta"/>
<constraint firstItem="seS-xB-tV5" firstAttribute="top" secondItem="rsK-Ce-Yjg" secondAttribute="bottom" constant="25" id="gGN-k5-Si9"/>
<constraint firstItem="PqU-pv-omA" firstAttribute="trailing" secondItem="9cq-HX-es7" secondAttribute="trailing" id="h1f-FV-VUV"/>
<constraint firstItem="3Im-C5-CMq" firstAttribute="trailing" secondItem="WzW-UV-89z" secondAttribute="trailing" id="kTh-IF-pp0"/>
<constraint firstItem="9cq-HX-es7" firstAttribute="leading" secondItem="WzW-UV-89z" secondAttribute="trailing" constant="7" id="poJ-RN-LUS"/>
<constraint firstItem="seS-xB-tV5" firstAttribute="leading" secondItem="JhZ-ld-LcB" secondAttribute="trailing" constant="12" id="rL7-Qc-5sG"/>
<constraint firstItem="PqU-pv-omA" firstAttribute="leading" secondItem="9cq-HX-es7" secondAttribute="leading" id="wDz-vu-OaO"/>
<constraint firstItem="rsK-Ce-Yjg" firstAttribute="leading" secondItem="9cq-HX-es7" secondAttribute="leading" id="xZZ-B2-lxc"/>
<constraint firstItem="seS-xB-tV5" firstAttribute="centerY" secondItem="JhZ-ld-LcB" secondAttribute="centerY" id="yM3-nq-Q2h"/>
<constraint firstItem="3Im-C5-CMq" firstAttribute="leading" secondItem="WzW-UV-89z" secondAttribute="leading" id="ynv-fz-Ztg"/>
<constraint firstItem="5ia-te-vKr" firstAttribute="top" secondItem="3Im-C5-CMq" secondAttribute="bottom" constant="15" id="z6N-ZI-rih"/>
</constraints>
</view>
<connections>
......
ui/Base.lproj/RegisterNameWindow.xib
View file @ bdaa274b
This diff is collapsed.
ui/Base.lproj/RingWizardLinkAccount.xib
View file @ bdaa274b
......@@ -65,13 +65,14 @@ DQ
<point key="canvasLocation" x="-12" y="401"/>
</view>
<view id="jR6-WY-o19" userLabel="Second step">
<rect key="frame" x="0.0" y="0.0" width="453" height="341"/>
<rect key="frame" x="0.0" y="0.0" width="453" height="357"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BFR-6z-UlF">
<rect key="frame" x="20" y="119" width="175" height="22"/>
<rect key="frame" x="20" y="135" width="175" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="175" id="DaY-ui-oUD"/>
<constraint firstAttribute="height" constant="22" id="tvw-MZ-CPe"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" placeholderString="" bezelStyle="round" id="5pW-QD-iHi">
<font key="font" metaFont="system"/>
......@@ -88,8 +89,9 @@ DQ
</connections>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VeW-tY-k3K" customClass="NSSecureTextField">
<rect key="frame" x="127" y="50" width="200" height="22"/>
<rect key="frame" x="127" y="66" width="200" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="CbP-8C-NGV"/>
<constraint firstAttribute="width" constant="200" id="Ro2-GV-HNp"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" placeholderString="" bezelStyle="round" id="9k8-c8-GFI" customClass="NSSecureTextFieldCell">
......@@ -107,7 +109,7 @@ DQ
</connections>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Nms-13-N3F">
<rect key="frame" x="18" y="151" width="95" height="17"/>
<rect key="frame" x="18" y="167" width="95" height="17"/>
<textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" title="Enter your PIN" id="3ik-rY-Gig">
<font key="font" metaFont="systemSemibold" size="13"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
......@@ -115,7 +117,7 @@ DQ
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ODM-Sx-sdp">
<rect key="frame" x="22" y="188" width="410" height="153"/>
<rect key="frame" x="22" y="204" width="410" height="153"/>
<constraints>
<constraint firstAttribute="width" constant="406" id="FO7-qh-6vk"/>
</constraints>
......@@ -129,7 +131,7 @@ DQ
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AGs-mP-zJd">
<rect key="frame" x="125" y="82" width="220" height="17"/>
<rect key="frame" x="125" y="98" width="220" height="17"/>
<textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" title="Enter your Ring account password" id="U2K-fu-INc">
<font key="font" metaFont="systemSemibold" size="13"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
......@@ -137,7 +139,7 @@ DQ
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tMy-fd-gBJ">
<rect key="frame" x="213" y="119" width="27" height="17"/>
<rect key="frame" x="213" y="135" width="27" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="OR" id="1NY-Yu-wH1">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
......@@ -145,11 +147,8 @@ DQ
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gR3-2L-BlK" userLabel="File button">
<rect key="frame" x="252" y="112" width="187" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="175" id="kGT-O6-tWw"/>
</constraints>
<buttonCell key="cell" type="push" title="Select Account" bezelStyle="rounded" alignment="left" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XJE-cy-nfQ">
<rect key="frame" x="252" y="128" width="187" height="33"/>
<buttonCell key="cell" type="push" title="Select archive" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XJE-cy-nfQ">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
......@@ -158,7 +157,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oxG-mq-q2J">
<rect key="frame" x="267" y="13" width="82" height="32"/>
<rect key="frame" x="275" y="13" width="82" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="SHb-rx-LSl"/>
</constraints>
......@@ -174,7 +173,7 @@ Gw
</connections>
</button>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XJh-69-hJQ">
<rect key="frame" x="256" y="151" width="98" height="17"/>
<rect key="frame" x="256" y="167" width="98" height="17"/>
<textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" title="Import Archive" id="kXa-FL-Enf">
<font key="font" metaFont="systemSemibold" size="13"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
......@@ -207,19 +206,22 @@ DQ
</button>
</subviews>
<constraints>
<constraint firstItem="gR3-2L-BlK" firstAttribute="bottom" secondItem="BFR-6z-UlF" secondAttribute="bottom" id="2sI-hp-gKD"/>
<constraint firstItem="gR3-2L-BlK" firstAttribute="leading" secondItem="XJh-69-hJQ" secondAttribute="leading" id="3Sb-xe-LzJ"/>
<constraint firstItem="oxG-mq-q2J" firstAttribute="top" secondItem="VeW-tY-k3K" secondAttribute="bottom" constant="25" id="Dmh-y9-SA3"/>
<constraint firstItem="XJh-69-hJQ" firstAttribute="bottom" secondItem="Nms-13-N3F" secondAttribute="bottom" id="Ea3-e7-Axb"/>
<constraint firstItem="Nms-13-N3F" firstAttribute="top" secondItem="ODM-Sx-sdp" secondAttribute="bottom" constant="20" id="FQZ-zG-nLF"/>
<constraint firstItem="gR3-2L-BlK" firstAttribute="width" secondItem="BFR-6z-UlF" secondAttribute="width" id="GyZ-Y9-jZQ"/>
<constraint firstItem="ODM-Sx-sdp" firstAttribute="centerX" secondItem="jR6-WY-o19" secondAttribute="centerX" id="IEF-Dw-yyn"/>
<constraint firstItem="VeW-tY-k3K" firstAttribute="top" secondItem="AGs-mP-zJd" secondAttribute="bottom" constant="10" id="KLm-ry-Wv8"/>
<constraint firstAttribute="bottom" secondItem="xmI-fH-GpH" secondAttribute="bottom" constant="20" id="RGd-y5-GmA"/>
<constraint firstItem="VeW-tY-k3K" firstAttribute="centerX" secondItem="jR6-WY-o19" secondAttribute="centerX" id="S61-lS-dGB"/>
<constraint firstItem="gR3-2L-BlK" firstAttribute="bottom" secondItem="BFR-6z-UlF" secondAttribute="bottom" id="UvD-Qw-h3C"/>
<constraint firstItem="BFR-6z-UlF" firstAttribute="leading" secondItem="Nms-13-N3F" secondAttribute="leading" id="VNR-FF-Ym8"/>
<constraint firstAttribute="trailing" secondItem="gR3-2L-BlK" secondAttribute="trailing" constant="20" id="ZEt-dR-0c6"/>
<constraint firstItem="gR3-2L-BlK" firstAttribute="height" secondItem="BFR-6z-UlF" secondAttribute="height" id="bHw-n5-uLo"/>
<constraint firstItem="BFR-6z-UlF" firstAttribute="leading" secondItem="jR6-WY-o19" secondAttribute="leading" constant="20" id="bJx-Di-hd1"/>
<constraint firstItem="gR3-2L-BlK" firstAttribute="leading" secondItem="tMy-fd-gBJ" secondAttribute="trailing" constant="20" id="bph-Lh-VGW"/>
<constraint firstItem="xmI-fH-GpH" firstAttribute="leading" secondItem="oxG-mq-q2J" secondAttribute="trailing" constant="20" id="dHF-fR-9e9"/>
<constraint firstItem="xmI-fH-GpH" firstAttribute="leading" secondItem="oxG-mq-q2J" secondAttribute="trailing" constant="12" id="dHF-fR-9e9"/>
<constraint firstItem="tMy-fd-gBJ" firstAttribute="leading" secondItem="BFR-6z-UlF" secondAttribute="trailing" constant="20" id="dOi-ky-Ahw"/>
<constraint firstItem="ODM-Sx-sdp" firstAttribute="top" secondItem="jR6-WY-o19" secondAttribute="top" id="enl-hy-pbK"/>
<constraint firstItem="AGs-mP-zJd" firstAttribute="top" secondItem="BFR-6z-UlF" secondAttribute="bottom" constant="20" id="iDb-fC-FSV"/>
......@@ -229,7 +231,7 @@ DQ
<constraint firstAttribute="trailing" secondItem="xmI-fH-GpH" secondAttribute="trailing" constant="20" id="zcJ-ZX-QDZ"/>
<constraint firstAttribute="bottom" secondItem="oxG-mq-q2J" secondAttribute="bottom" constant="20" id="zcc-T5-hHj"/>
</constraints>
<point key="canvasLocation" x="629" y="438.5"/>
<point key="canvasLocation" x="628.5" y="449.5"/>
</view>
<customView id="1O6-eM-Cg5">
<rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment