Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-windows
Commits
124c2a97
Commit
124c2a97
authored
Jan 07, 2020
by
Ming Rui Zhang
Committed by
Sébastien Blin
Jan 10, 2020
Browse files
callwidget: add sip display name label
Change-Id: I5056932b3bca62a16628a2221c7420d0d31a79b7
parent
d6f52523
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/callwidget.cpp
View file @
124c2a97
...
...
@@ -243,6 +243,7 @@ CallWidget::CallWidget(QWidget* parent) :
setCallPanelVisibility
(
false
);
ui
->
containerWidget
->
setVisible
(
false
);
ui
->
sipCallerBestIdLabel
->
setVisible
(
false
);
}
CallWidget
::~
CallWidget
()
...
...
@@ -734,6 +735,12 @@ CallWidget::slotShowIncomingCallView(const std::string& accountId,
elidedLabel
=
sencondaryCallLabelFontMetrics
.
elidedText
(
finalBestId
,
Qt
::
ElideRight
,
ui
->
callingBestIdLabel
->
width
());
ui
->
callingBestIdLabel
->
setText
(
elidedLabel
);
ui
->
sipCallerBestIdLabel
->
setText
(
elidedLabel
);
if
(
finalBestId
.
isEmpty
())
ui
->
sipCallerBestIdLabel
->
setVisible
(
false
);
else
ui
->
sipCallerBestIdLabel
->
setVisible
(
true
);
ui
->
smartList
->
update
();
}
...
...
src/callwidget.ui
View file @
124c2a97
...
...
@@ -445,12 +445,12 @@
<attribute
name=
"headerVisible"
>
<bool>
false
</bool>
</attribute>
<attribute
name=
"headerDefaultSectionSize"
>
<number>
42
</number>
</attribute>
<attribute
name=
"headerMinimumSectionSize"
>
<number>
0
</number>
</attribute>
<attribute
name=
"headerDefaultSectionSize"
>
<number>
42
</number>
</attribute>
</widget>
</item>
</layout>
...
...
@@ -1494,7 +1494,7 @@ Copy and share it with your friends!
<height>
420
</height>
</size>
</property>
<layout
class=
"QVBoxLayout"
name=
"callInviteLayout"
stretch=
"0,2,1,2,1,9"
>
<layout
class=
"QVBoxLayout"
name=
"callInviteLayout"
stretch=
"0,2,1,
0,0,0,
2,1,9"
>
<property
name=
"spacing"
>
<number>
0
</number>
</property>
...
...
@@ -1564,6 +1564,54 @@ Copy and share it with your friends!
</property>
</widget>
</item>
<item>
<spacer
name=
"verticalSpacer_13"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
5
</height>
</size>
</property>
</spacer>
</item>
<item>
<widget
class=
"QLabel"
name=
"sipCallerBestIdLabel"
>
<property
name=
"font"
>
<font>
<family>
Segoe UI Emoji
</family>
<pointsize>
9
</pointsize>
</font>
</property>
<property
name=
"styleSheet"
>
<string
notr=
"true"
>
color: rgb(128, 128, 128);
</string>
</property>
<property
name=
"text"
>
<string>
best id
</string>
</property>
<property
name=
"alignment"
>
<set>
Qt::AlignCenter
</set>
</property>
</widget>
</item>
<item>
<spacer
name=
"verticalSpacer_12"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"sizeType"
>
<enum>
QSizePolicy::Expanding
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
5
</height>
</size>
</property>
</spacer>
</item>
<item>
<widget
class=
"QLabel"
name=
"wantToTalkLabel"
>
<property
name=
"styleSheet"
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment