commit 45bf7c021b975d92219ee2030f5428a0c175f308
author Nicolas Jager <nicolas.jager@savoirfairelinux.com> Wed Jan 20 09:53:02 2016 -0500
committer Nicolas Jager <nicolas.jager@savoirfairelinux.com> Wed Jan 20 09:53:02 2016 -0500
tree b16fea39116a570148912172063a05a9034c3d62
parent 00593d1dfbed8be396937f6d261355b707c06c51

ui: fix outbound call page.

- outbound call page created, moving widget from callinvite page to
outbound page.

- some useless style code removed.

Change-Id: I00e355cff9ffbb6f27817865d7266a09fe45cea4
Tuleap: #148

callwidget.cpp

diff --git a/callwidget.cpp b/callwidget.cpp
index 5a4c7b4..ecf5d03 100644
--- a/callwidget.cpp
+++ b/callwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -65,28 +65,6 @@
     welcomePageAnim_ = new QPropertyAnimation(ui->welcomePage, "pos", this);
     messagingPageAnim_ = new QPropertyAnimation(ui->messagingPage, "pos", this);
 
-    // TODO : add this in style sheet forms
-    QPalette palette;
-    palette.setColor(QPalette::WindowText, QColor(255,255,255));
-    ui->callerIdLabel->setPalette(palette);
-
-    QPalette palette2;
-    palette2.setColor(QPalette::WindowText, QColor(141,141,141));
-
-    ui->wantToTalkLabel->setPalette(palette2);
-    ui->outboundCallLabel->setPalette(palette2);
-    ui->cancelCallLabel->setPalette(palette2);
-    ui->acceptLabel->setPalette(palette2);
-    ui->refuseLabel->setPalette(palette2);
-
-    QFont font = ui->callerIdLabel->font();
-    font.setPointSize(20);
-
-    ui->callerIdLabel->setFont(font);
-    // end of TODO : add this in style sheet forms
-
-    ui->callInvite->setVisible(false);
-
     setActualCall(nullptr);
     videoRenderer_ = nullptr;
 
@@ -339,8 +317,6 @@
 void
 CallWidget::callIncoming(Call* call)
 {
-    ui->outboundCall->hide();
-
     if (!QApplication::focusWidget()) {
         GlobalSystemTray::instance()
                 .showMessage("Ring",
@@ -352,8 +328,6 @@
         ui->callerIdLabel->setText(QString(tr("%1", "%1 is the name of the caller"))
                                    .arg(call->formattedName()));
         ui->stackedWidget->setCurrentWidget(ui->callInvitePage);
-        ui->callInvite->setVisible(true);
-        ui->callInvite->raise();
     }
     setActualCall(call);
 }
@@ -363,7 +337,6 @@
 {
     if (actualCall_ != nullptr)
         actualCall_->performAction(Call::Action::ACCEPT);
-    ui->callInvite->setVisible(false);
     ui->stackedWidget->setCurrentWidget(ui->videoPage);
 }
 
@@ -374,7 +347,6 @@
         return;
     actualCall_->performAction(Call::Action::REFUSE);
     setActualCall(nullptr);
-    ui->callInvite->setVisible(false);
     ui->stackedWidget->setCurrentWidget(ui->welcomePage);
 }
 
@@ -384,7 +356,7 @@
     Q_UNUSED(parent);
     if (call->direction() == Call::Direction::OUTGOING) {
         setActualCall(call);
-        ui->stackedWidget->setCurrentWidget(ui->callInvitePage);
+        ui->stackedWidget->setCurrentWidget(ui->outboundCallPage);
     }
 }