commit bdaa274bfa42b16a94c9780e73eefa4d2a0fd31e
author Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Tue Sep 04 15:49:30 2018 -0400
committer Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Wed Sep 05 16:45:10 2018 -0400
tree 9bf4ef8f8afd1888bc9b532936dc13c21976b3e2
parent 4a7bffe5da6609e17daa3eff0b565476cf868171

UI/UX: standardize windows views

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

Change-Id: I442a32cfa04ac9fe4af7fed2318cac6c4e264693
Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>

src/PasswordChangeWC.mm

diff --git a/src/PasswordChangeWC.mm b/src/PasswordChangeWC.mm
index dbed71a..cc509fa 100644
--- a/src/PasswordChangeWC.mm
+++ b/src/PasswordChangeWC.mm
@@ -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];
     }
 }