commit 97a21b4d2be31e9c31bb759bfc4158a1219cf5a5
author Nicolas Jager <nicolas.jager@savoirfairelinux.com> Thu Dec 03 16:55:45 2015 -0500
committer Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> Mon Dec 07 11:23:41 2015 -0500
tree 7a47f538c47ca6cc545fb83712b267f25bfaf878
parent e36688f48f58794a053c1a6087aeb3bf80ecec01

Refurbishing of the MS Windows client UI

Tuleap: #148
Change-Id: Iadcad55172a857941eca0e8160f35dff2eabff5a

videooverlay.cpp

diff --git a/videooverlay.cpp b/videooverlay.cpp
index 0028307..99f6957 100644
--- a/videooverlay.cpp
+++ b/videooverlay.cpp
@@ -33,33 +33,20 @@
     actionModel_ = CallModel::instance().userActionModel();
     setAttribute(Qt::WA_NoSystemBackground);
 
-    menu_ = new QMenu(this);
-    auto muteAudio = new QAction(tr("Mute Audio"), this);
-    muteAudio->setCheckable(true);
-    connect(muteAudio, &QAction::triggered, [=](bool) {
-       actionModel_->execute(UserActionModel::Action::MUTE_AUDIO);
-    });
-    menu_->addAction(muteAudio);
-
-    auto muteVideo = new QAction(tr("Mute Video"), this);
-    muteVideo->setCheckable(true);
-    connect(muteVideo, &QAction::triggered, [=](bool) {
-        actionModel_->execute(UserActionModel::Action::MUTE_VIDEO);
-    });
-    menu_->addAction(muteVideo);
+    ui->noMicButton->setCheckable(true);
 
     connect(actionModel_,&UserActionModel::dataChanged, [=](const QModelIndex& tl, const QModelIndex& br) {
         const int first(tl.row()),last(br.row());
         for(int i = first; i <= last;i++) {
             const QModelIndex& idx = actionModel_->index(i,0);
             switch (idx.data(UserActionModel::Role::ACTION).value<UserActionModel::Action>()) {
-               case UserActionModel::Action::MUTE_AUDIO:
-                muteAudio->setChecked(idx.data(Qt::CheckStateRole).value<bool>());
-                muteAudio->setEnabled(idx.flags() & Qt::ItemIsEnabled);
+            case UserActionModel::Action::MUTE_AUDIO:
+                ui->noMicButton->setChecked(idx.data(Qt::CheckStateRole).value<bool>());
+                ui->noMicButton->setEnabled(idx.flags() & Qt::ItemIsEnabled);
                 break;
             case UserActionModel::Action::MUTE_VIDEO:
-                muteVideo->setChecked(idx.data(Qt::CheckStateRole).value<bool>());
-                muteVideo->setEnabled(idx.flags() & Qt::ItemIsEnabled);
+                ui->noVideoButton->setChecked(idx.data(Qt::CheckStateRole).value<bool>());
+                ui->noVideoButton->setEnabled(idx.flags() & Qt::ItemIsEnabled);
                 break;
             case UserActionModel::Action::HOLD:
                 ui->holdButton->setChecked(idx.data(Qt::CheckStateRole).value<bool>());
@@ -71,15 +58,12 @@
         }
     });
 
-    ui->moreButton->setMenu(menu_);
-
     connect(CallModel::instance().selectionModel(), &QItemSelectionModel::currentChanged, [=](const QModelIndex &current, const QModelIndex &previous) {
         Q_UNUSED(previous)
         Call* c = current.data(static_cast<int>(Call::Role::Object)).value<Call*>();
         if (c) {
             if (c->hasParentCall()) {
                 ui->holdButton->hide();
-                ui->moreButton->hide();
                 ui->transferButton->hide();
                 ui->addPersonButton->hide();
                 ui->chatButton->hide();
@@ -87,7 +71,6 @@
                 ui->joinButton->show();
             } else {
                 ui->holdButton->show();
-                ui->moreButton->show();
                 ui->transferButton->show();
                 ui->addPersonButton->show();
                 ui->chatButton->show();
@@ -101,7 +84,6 @@
 VideoOverlay::~VideoOverlay()
 {
     delete ui;
-    delete menu_;
     delete transferDialog_;
 }
 
@@ -160,6 +142,19 @@
     actionModel_->execute(UserActionModel::Action::HOLD);
 }
 
+void
+VideoOverlay::on_noMicButton_clicked()
+{
+    actionModel_->execute(UserActionModel::Action::MUTE_AUDIO);
+}
+
+void
+VideoOverlay::on_noVideoButton_clicked()
+{
+    actionModel_->execute(UserActionModel::Action::MUTE_VIDEO);
+}
+
+
 void VideoOverlay::on_joinButton_clicked()
 {
     CallModel::instance().selectedCall()->joinToParent();