commit 266fca0e34b85d5a992db5f13e07f97ea767b2b8
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Sep 28 14:47:05 2015 -0400
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Wed Sep 30 10:04:14 2015 -0400
tree b56c69ba1e7a09d6c0755d77637bb0f8de27ede5
parent 6da08a80b7548fdc5fefc0f605dcb268de35f03a

ui: update in-call actions

- use new button theme for call controls buttons.
- add an icon for recording
- gide buttons when available instead of disabling them

Issue: #79400
Change-Id: I712467b8f7b7fe16317f4283ae9d4f91bc8b9203

src/CurrentCallVC.mm

diff --git a/src/CurrentCallVC.mm b/src/CurrentCallVC.mm
index 5b157ba..586b3f0 100644
--- a/src/CurrentCallVC.mm
+++ b/src/CurrentCallVC.mm
@@ -61,6 +61,7 @@
 @property (unsafe_unretained) IBOutlet NSButton *muteVideoButton;
 @property (unsafe_unretained) IBOutlet NSButton *addContactButton;
 @property (unsafe_unretained) IBOutlet NSView *headerContainer;
+@property (unsafe_unretained) IBOutlet NSButton *qualityButton;
 
 @property (unsafe_unretained) IBOutlet ITProgressIndicator *loadingIndicator;
 
@@ -109,18 +110,9 @@
     const QModelIndex& idx = CallModel::instance()->userActionModel()->index(row,0);
     UserActionModel::Action action = qvariant_cast<UserActionModel::Action>(idx.data(UserActionModel::Role::ACTION));
     NSButton* a = actionHash[(int) action];
-    if (a != nil) {
-        [a setEnabled:(idx.flags() & Qt::ItemIsEnabled)];
+    if (a) {
+        [a setHidden:!(idx.flags() & Qt::ItemIsEnabled)];
         [a setState:(idx.data(Qt::CheckStateRole) == Qt::Checked) ? NSOnState : NSOffState];
-
-        if(action == UserActionModel::Action::HOLD) {
-            NSString* imgName = (a.state == NSOnState ? @"ic_action_holdoff" : @"ic_action_hold");
-            [a setImage:[NSImage imageNamed:imgName]];
-
-        }
-        if(action == UserActionModel::Action::RECORD) {
-            [a setTitle:(a.state == NSOnState ? @"Record off" : @"Record")];
-        }
     }
 }
 
@@ -138,7 +130,14 @@
     [self.addContactButton setHidden:!shouldShow];
 
     Call::State state = callIdx.data((int)Call::Role::State).value<Call::State>();
+
+    // Default values for this views
     [loadingIndicator setHidden:YES];
+    [self.qualityButton setHidden:YES];
+    [self.chatButton setHidden:YES];
+    [videoView setShouldAcceptInteractions:NO];
+
+
     [stateLabel setStringValue:callIdx.data((int)Call::Role::HumanStateName).toString().toNSString()];
     switch (state) {
         case Call::State::DIALING:
@@ -147,33 +146,27 @@
         case Call::State::NEW:
             break;
         case Call::State::INITIALIZATION:
-            [videoView setShouldAcceptInteractions:NO];
             [loadingIndicator setHidden:NO];
             break;
         case Call::State::CONNECTED:
-            [videoView setShouldAcceptInteractions:NO];
             [loadingIndicator setHidden:NO];
             break;
         case Call::State::RINGING:
-            [videoView setShouldAcceptInteractions:NO];
             break;
         case Call::State::CURRENT:
             [videoView setShouldAcceptInteractions:YES];
+            [self.chatButton setHidden:NO];
+            [self.qualityButton setHidden:NO];
             break;
         case Call::State::HOLD:
-            [videoView setShouldAcceptInteractions:NO];
             break;
         case Call::State::BUSY:
-            [videoView setShouldAcceptInteractions:NO];
             break;
         case Call::State::OVER:
-            [videoView setShouldAcceptInteractions:NO];
+        case Call::State::FAILURE:
             if(self.splitView.isInFullScreenMode)
                 [self.splitView exitFullScreenModeWithOptions:nil];
             break;
-        case Call::State::FAILURE:
-            [videoView setShouldAcceptInteractions:NO];
-            break;
     }
 
 }
@@ -224,6 +217,7 @@
     [loadingIndicator setLengthOfLine:2];
     [loadingIndicator setInnerMargin:30];
 
+    [self.qualityPopOver setDelegate:self];
     [self.videoView setCallDelegate:self];
 
     [self connect];
@@ -541,6 +535,8 @@
     if (self.addToContactPopover != nullptr) {
         [self.addToContactPopover performClose:self];
         self.addToContactPopover = NULL;
+        [self.addContactButton setState:NSOffState];
+
     } else if (!contactmethod->contact() || contactmethod->contact()->isPlaceHolder()) {
         auto* editorVC = [[PersonLinkerVC alloc] initWithNibName:@"PersonLinker" bundle:nil];
         [editorVC setMethodToLink:contactmethod];
@@ -596,11 +592,18 @@
     uam << UserActionModel::Action::MUTE_VIDEO;
 }
 - (IBAction)displayQualityPopUp:(id)sender {
+
     [self.qualityPopOver showRelativeToRect:[sender bounds] ofView:sender preferredEdge:NSMaxXEdge];
 }
 
 #pragma mark - NSPopOverDelegate
 
+- (void)popoverWillClose:(NSNotification *)notification
+{
+    [self.qualityButton setState:NSOffState];
+    [self.addContactButton setState:NSOffState];
+}
+
 - (void)popoverDidClose:(NSNotification *)notification
 {
     if (self.addToContactPopover != nullptr) {