From 6c318897c85e719b057723f11a8f99fa3beeb714 Mon Sep 17 00:00:00 2001
From: Olivier SOLDANO <olivier.soldano@savoirfairelinux.com>
Date: Tue, 22 Aug 2017 14:35:38 -0400
Subject: [PATCH] fix sip messaging display layout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
when sip account had no messages received nor sent, the layout of the
display was broken.
Also removes debug outputs that were left in the code.
Change-Id: Ic49144de5810d99cebfff13b3a0427534d0071ca
Reviewed-by: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
---
callwidget.cpp | 2 --
callwidget.ui | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/callwidget.cpp b/callwidget.cpp
index db996b2..e376806 100644
--- a/callwidget.cpp
+++ b/callwidget.cpp
@@ -791,12 +791,10 @@ CallWidget::showIMOutOfCall(const QModelIndex& nodeIdx)
QString number = nodeIdx.data(static_cast<int>(Ring::Role::Number)).toString();
if (getSelectedAccount()->isIp2ip()){
- qDebug() << "SIP account messaging";
ui->imMessageEdit->setPlaceholderText("No messaging possible out of call (SIP) ");
ui->imMessageEdit->setEnabled(false);
ui->sendIMButton->hide();
} else {
- qDebug() << "Ring account messaging";
ui->imMessageEdit->setPlaceholderText("Type your message here");
ui->imMessageEdit->setEnabled(true);
ui->sendIMButton->show();
diff --git a/callwidget.ui b/callwidget.ui
index bc828c4..6869cc2 100644
--- a/callwidget.ui
+++ b/callwidget.ui
@@ -1021,7 +1021,7 @@ Copy and share it with your friends!</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_12">
+ <layout class="QVBoxLayout" name="verticalLayout_12" stretch="1,25,25,1">
<property name="leftMargin">
<number>5</number>
</property>
--
GitLab