commit d8528fa24e0d220a9b5eb2dd58a1a969e46000ca
author Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> Tue Jul 07 14:13:51 2015 -0400
committer Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> Tue Jul 07 14:13:51 2015 -0400
tree 881812ae6ec8a901c73b1c02cbb80493a099b700
parent 4f63084e896805cd54cb307f7cfef1f8a16a549c

call: add cancel button for dialing call

Refs #76414

Change-Id: I5d9c160f64c93205be275ad09a3e08b055de0380

callwidget.cpp

diff --git a/callwidget.cpp b/callwidget.cpp
index 398433b..fdf245d 100644
--- a/callwidget.cpp
+++ b/callwidget.cpp
@@ -49,7 +49,7 @@
     connect(ui->videoWidget, SIGNAL(setChatVisibility(bool)),
             ui->instantMessagingWidget, SLOT(setVisible(bool)));
 
-    ui->spinnerLabel->hide();
+    ui->spinnerWidget->hide();
     spinner_ = new QMovie(":/images/spinner.gif");
     if (spinner_->isValid()) {
         ui->spinnerLabel->setMovie(spinner_);
@@ -262,7 +262,7 @@
         ui->videoWidget->hide();
         displaySpinner(false);
         auto onHoldCall = callModel_->getActiveCalls().first();
-        if (onHoldCall != nullptr) {
+        if (onHoldCall != nullptr && onHoldCall->state() == Call::State::HOLD) {
             setActualCall(onHoldCall);
             onHoldCall->performAction(Call::Action::HOLD);
         }
@@ -349,7 +349,13 @@
 void
 CallWidget::displaySpinner(bool display)
 {
-    display ? ui->spinnerLabel->show() : ui->spinnerLabel->hide();
+    display ? ui->spinnerWidget->show() : ui->spinnerWidget->hide();
     if (ui->spinnerLabel->movie())
         display ? ui->spinnerLabel->movie()->start() : ui->spinnerLabel->movie()->stop();
 }
+
+void CallWidget::on_cancelButton_clicked()
+{
+    if (actualCall_)
+        actualCall_->performAction(Call::Action::REFUSE);
+}