commit 89edc6ad21d53f10c6825cbb8e3f1a233c093cbe
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Nov 09 11:30:47 2015 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Nov 16 12:54:54 2015 -0400
tree 04d114e2fc91b4a3d270dc22511e3fc5e170baa2
parent 01e6a1fb041b41700c6168373a07bf7ff20adc91

conference: first implementation

This commit adds conferences management

- create conference by joining two ongoing calls/conferences
- create conference by calling a new peer and joining him to the ongoing
call/conference
- hanging up conferences

This commit relies on CallModel and RecenModel selection models
interactions to update call view and Smartlist row selected.

Change-Id: Ib9f6b9b870e66c8ccfb5115ad6fdb592c625eb58
Tuleap: #114

src/SmartViewVC.mm

diff --git a/src/SmartViewVC.mm b/src/SmartViewVC.mm
index 06b80e9..b08feb7 100644
--- a/src/SmartViewVC.mm
+++ b/src/SmartViewVC.mm
@@ -79,6 +79,7 @@
     [smartView bind:@"sortDescriptors" toObject:treeController withKeyPath:@"sortDescriptors" options:nil];
     [smartView bind:@"selectionIndexPaths" toObject:treeController withKeyPath:@"selectionIndexPaths" options:nil];
     [smartView setTarget:self];
+    [smartView setAction:@selector(selectRow:)];
     [smartView setDoubleAction:@selector(placeCall:)];
 
     [smartView setContextMenuDelegate:self];
@@ -94,6 +95,24 @@
                          }
                      });
 
+    QObject::connect(RecentModel::instance().selectionModel(),
+                     &QItemSelectionModel::currentChanged,
+                     [=](const QModelIndex &current, const QModelIndex &previous) {
+                         if(!current.isValid())
+                             return;
+
+                         auto proxyIdx = RecentModel::instance().peopleProxy()->mapFromSource(current);
+                         if (proxyIdx.isValid()) {
+                             [treeController setSelectionQModelIndex:proxyIdx];
+
+                             [showContactsButton setState:NO];
+                             isShowingContacts = NO;
+                             [showHistoryButton setState:NO];
+                             [tabbar selectTabViewItemAtIndex:0];
+                             [smartView scrollRowToVisible:proxyIdx.row()];
+                         }
+                     });
+
     [self.view setWantsLayer:YES];
     [self.view setLayer:[CALayer layer]];
     [self.view.layer setBackgroundColor:[NSColor whiteColor].CGColor];
@@ -103,6 +122,13 @@
     [searchField.layer setBackgroundColor:[NSColor colorWithCalibratedRed:0.949 green:0.949 blue:0.949 alpha:0.9].CGColor];
 }
 
+-(void) selectRow:(id)sender
+{
+    auto qIdx = [treeController toQIdx:[treeController selectedNodes][0]];
+    auto proxyIdx = RecentModel::instance().peopleProxy()->mapToSource(qIdx);
+    RecentModel::instance().selectionModel()->setCurrentIndex(proxyIdx, QItemSelectionModel::ClearAndSelect);
+}
+
 - (void)placeCall:(id)sender
 {
     QModelIndex qIdx = [treeController toQIdx:[treeController selectedNodes][0]];
@@ -131,12 +157,10 @@
     // Before calling check if we properly extracted a contact method and that
     // there is NOT already an ongoing call for this index (e.g: no children for this node)
     if(m && !RecentModel::instance().peopleProxy()->index(0, 0, qIdx).isValid()){
-        Call* c = CallModel::instance().dialingCall();
+        auto c = CallModel::instance().dialingCall();
         c->setPeerContactMethod(m);
         c << Call::Action::ACCEPT;
-
-        [smartView deselectAll:nil];
-        [smartView selectRowIndexes:[[NSIndexSet alloc] initWithIndex:0] byExtendingSelection:NO];
+        CallModel::instance().selectCall(c);
     }
 }
 
@@ -184,27 +208,15 @@
     return NO;
 }
 
-
 // -------------------------------------------------------------------------------
 //	outlineViewSelectionDidChange:notification
 // -------------------------------------------------------------------------------
 - (void)outlineViewSelectionDidChange:(NSNotification *)notification
 {
     if ([treeController selectedNodes].count <= 0) {
-        CallModel::instance().selectionModel()->clearCurrentIndex();
+        RecentModel::instance().selectionModel()->clearCurrentIndex();
         return;
     }
-
-    QModelIndex qIdx = [treeController toQIdx:[treeController selectedNodes][0]];
-
-    // ask the tree controller for the current selection
-    if (auto selected = RecentModel::instance().getActiveCall(RecentModel::instance().peopleProxy()->mapToSource(qIdx))) {
-        CallModel::instance().selectCall(selected);
-    } else if (auto selected = RecentModel::instance().getActiveCall(RecentModel::instance().peopleProxy()->mapToSource(qIdx.parent()))){
-        CallModel::instance().selectCall(selected);
-    } else {
-        CallModel::instance().selectionModel()->clearCurrentIndex();
-    }
 }
 
 /* View Based OutlineView: See the delegate method -tableView:viewForTableColumn:row: in NSTableView.