Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-windows
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-windows
Commits
124c2a97
Commit
124c2a97
authored
Jan 7, 2020
by
Ming Rui Zhang
Committed by
Sébastien Blin
Jan 10, 2020
Browse files
Options
Downloads
Patches
Plain Diff
callwidget: add sip display name label
Change-Id: I5056932b3bca62a16628a2221c7420d0d31a79b7
parent
d6f52523
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/callwidget.cpp
+7
-0
7 additions, 0 deletions
src/callwidget.cpp
src/callwidget.ui
+52
-4
52 additions, 4 deletions
src/callwidget.ui
with
59 additions
and
4 deletions
src/callwidget.cpp
+
7
−
0
View file @
124c2a97
...
@@ -243,6 +243,7 @@ CallWidget::CallWidget(QWidget* parent) :
...
@@ -243,6 +243,7 @@ CallWidget::CallWidget(QWidget* parent) :
setCallPanelVisibility
(
false
);
setCallPanelVisibility
(
false
);
ui
->
containerWidget
->
setVisible
(
false
);
ui
->
containerWidget
->
setVisible
(
false
);
ui
->
sipCallerBestIdLabel
->
setVisible
(
false
);
}
}
CallWidget
::~
CallWidget
()
CallWidget
::~
CallWidget
()
...
@@ -734,6 +735,12 @@ CallWidget::slotShowIncomingCallView(const std::string& accountId,
...
@@ -734,6 +735,12 @@ CallWidget::slotShowIncomingCallView(const std::string& accountId,
elidedLabel
=
sencondaryCallLabelFontMetrics
.
elidedText
(
finalBestId
,
Qt
::
ElideRight
,
ui
->
callingBestIdLabel
->
width
());
elidedLabel
=
sencondaryCallLabelFontMetrics
.
elidedText
(
finalBestId
,
Qt
::
ElideRight
,
ui
->
callingBestIdLabel
->
width
());
ui
->
callingBestIdLabel
->
setText
(
elidedLabel
);
ui
->
callingBestIdLabel
->
setText
(
elidedLabel
);
ui
->
sipCallerBestIdLabel
->
setText
(
elidedLabel
);
if
(
finalBestId
.
isEmpty
())
ui
->
sipCallerBestIdLabel
->
setVisible
(
false
);
else
ui
->
sipCallerBestIdLabel
->
setVisible
(
true
);
ui
->
smartList
->
update
();
ui
->
smartList
->
update
();
}
}
...
...
This diff is collapsed.
Click to expand it.
src/callwidget.ui
+
52
−
4
View file @
124c2a97
...
@@ -445,12 +445,12 @@
...
@@ -445,12 +445,12 @@
<attribute
name=
"headerVisible"
>
<attribute
name=
"headerVisible"
>
<bool>
false
</bool>
<bool>
false
</bool>
</attribute>
</attribute>
<attribute
name=
"headerDefaultSectionSize"
>
<number>
42
</number>
</attribute>
<attribute
name=
"headerMinimumSectionSize"
>
<attribute
name=
"headerMinimumSectionSize"
>
<number>
0
</number>
<number>
0
</number>
</attribute>
</attribute>
<attribute
name=
"headerDefaultSectionSize"
>
<number>
42
</number>
</attribute>
</widget>
</widget>
</item>
</item>
</layout>
</layout>
...
@@ -1494,7 +1494,7 @@ Copy and share it with your friends!
...
@@ -1494,7 +1494,7 @@ Copy and share it with your friends!
<height>
420
</height>
<height>
420
</height>
</size>
</size>
</property>
</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"
>
<property
name=
"spacing"
>
<number>
0
</number>
<number>
0
</number>
</property>
</property>
...
@@ -1564,6 +1564,54 @@ Copy and share it with your friends!
...
@@ -1564,6 +1564,54 @@ Copy and share it with your friends!
</property>
</property>
</widget>
</widget>
</item>
</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>
<item>
<widget
class=
"QLabel"
name=
"wantToTalkLabel"
>
<widget
class=
"QLabel"
name=
"wantToTalkLabel"
>
<property
name=
"styleSheet"
>
<property
name=
"styleSheet"
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment