From b0db48e5d081e9d1c3200af6da853bd9482ce7bc Mon Sep 17 00:00:00 2001 From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Date: Thu, 10 Jan 2019 16:03:55 -0500 Subject: [PATCH] UI: remove account flow When all account removed show create account screen Change-Id: I9fcc83f00275b67cd66a2abe5be819b73f9aeb73 --- src/AppDelegate.mm | 1 + src/RingWindowController.mm | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/AppDelegate.mm b/src/AppDelegate.mm index 6590e9f4..fb015a5a 100644 --- a/src/AppDelegate.mm +++ b/src/AppDelegate.mm @@ -338,6 +338,7 @@ static void ReachabilityCallback(SCNetworkReachabilityRef __unused target, SCNet self.ringWindowController = [[RingWindowController alloc] initWithWindowNibName:@"RingWindow" bundle: nil accountModel:&lrc->getAccountModel() dataTransferModel:&lrc->getDataTransferModel() behaviourController:&lrc->getBehaviorController() avModel: &lrc->getAVModel()]; } [[NSApplication sharedApplication] removeWindowsItem:self.wizard.window]; + self.wizard = nil; [self.ringWindowController.window makeKeyAndOrderFront:self]; } diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm index 1a2a3e07..3fde23cb 100644 --- a/src/RingWindowController.mm +++ b/src/RingWindowController.mm @@ -498,6 +498,12 @@ typedef NS_ENUM(NSInteger, ViewState) { [smartViewVC clearConversationModel]; [self changeViewTo:SHOW_WELCOME_SCREEN]; [self updateRingID]; + qrcodeView.animator.alphaValue = 0.0; + [centerYQRCodeConstraint.animator setConstant: 0]; + [centerYWelcomeContainerConstraint.animator setConstant: 0]; + [self close]; + AppDelegate* delegate = (AppDelegate*)[[NSApplication sharedApplication] delegate]; + [delegate showWizard]; } -(void)rightPanelClosed -- GitLab