Handle logout button state in better way

getappbox · Jan 2, 2017 · 2652b23 · 2652b23
1 parent fd978e3
commit 2652b23
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/AppBox/AppDelegate.h b/AppBox/AppDelegate.h
@@ -19,6 +19,7 @@
 +(AppDelegate *)appDelegate;
 -(void)addSessionLog:(NSString *)sessionLog;
 
+@property (nonatomic) BOOL processing;
 @property (nonatomic, weak) IBOutlet NSMenuItem *gmailLogoutButton;
 @property (nonatomic, weak) IBOutlet NSMenuItem *dropboxLogoutButton;
 

diff --git a/AppBox/AppDelegate.m b/AppBox/AppDelegate.m
@@ -53,6 +53,7 @@ - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender{
     return YES;
 }
 
+
 #pragma mark - AppDelegate Helper
 
 +(AppDelegate *)appDelegate{

diff --git a/AppBox/ViewController/HomeViewController/HomeViewController.m b/AppBox/ViewController/HomeViewController/HomeViewController.m
@@ -160,6 +160,7 @@ - (IBAction)textFieldDevMessageValueChanged:(NSTextField *)sender {
 //Build Button Action
 - (IBAction)actionButtonTapped:(NSButton *)sender {
     if (![sender.title.lowercaseString isEqualToString:@"stop"]){
+        [[textFieldEmail window] makeFirstResponder:self.view];
         if (project.fullPath){
             [project setIsBuildOnly:NO];
             [self runBuildScript];
@@ -644,6 +645,8 @@ -(void)createManifestShortSharableUrl{
 #pragma mark - Controller Helpers -
 
 -(void)viewStateForProgressFinish:(BOOL)finish{
+    [[AppDelegate appDelegate] setProcessing:!finish];
+
     //reset project
     if (finish){
         project = [[XCProject alloc] init];
@@ -703,6 +706,9 @@ -(void)viewStateForProgressFinish:(BOOL)finish{
 
     //action button
     [self updateViewState];
+
+    //logout buttons
+    [self updateMenuButtons];
 }
 
 -(void)resetBuildOptions{
@@ -748,8 +754,9 @@ -(void)updateViewState{
 
 -(void)updateMenuButtons{
     //Menu Buttons
-    [[[AppDelegate appDelegate] gmailLogoutButton] setEnabled:([UserData isGmailLoggedIn] && [[DBSession sharedSession] isLinked])];
-    [[[AppDelegate appDelegate] dropboxLogoutButton] setEnabled:[[DBSession sharedSession] isLinked]];
+    BOOL enable = ([[DBSession sharedSession] isLinked] && pathProject.enabled && pathIPAFile.enabled);
+    [[[AppDelegate appDelegate] gmailLogoutButton] setEnabled:([UserData isGmailLoggedIn] && enable)];
+    [[[AppDelegate appDelegate] dropboxLogoutButton] setEnabled:enable];
 }
 
 #pragma mark - MailDelegate -
-Original file line number
+Diff line change
@@ Expand Up @@
         return YES;
     }
     #pragma mark - AppDelegate Helper
     +(AppDelegate *)appDelegate{
@@ Expand Down @@