Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
29d54f7e
Commit
29d54f7e
authored
Jun 09, 2017
by
Wescoeur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/views/App/Calls/Conference): remove useless tooltip that block button animations on pause
parent
62428fa1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
22 deletions
+8
-22
en.ts
linphone-desktop/assets/languages/en.ts
+0
-8
fr.ts
linphone-desktop/assets/languages/fr.ts
+0
-8
Conference.qml
linphone-desktop/ui/views/App/Calls/Conference.qml
+8
-6
No files found.
linphone-desktop/assets/languages/en.ts
View file @
29d54f7e
...
...
@@ -443,14 +443,6 @@ Server url not configured.</translation>
<
source
>
conferenceTitle
<
/source
>
<
translation
>
CONFERENCE
<
/translation
>
<
/message
>
<
message
>
<
source
>
leaveConf
<
/source
>
<
translation
>
Temporarily
leave
the
conference
<
/translation
>
<
/message
>
<
message
>
<
source
>
joinBackConf
<
/source
>
<
translation
>
Join
back
the
conference
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ConferenceControls
<
/name
>
...
...
linphone-desktop/assets/languages/fr.ts
View file @
29d54f7e
...
...
@@ -443,14 +443,6 @@ Url du serveur non configurée.</translation>
<
source
>
conferenceTitle
<
/source
>
<
translation
>
CONF
É
RENCE
<
/translation
>
<
/message
>
<
message
>
<
source
>
leaveConf
<
/source
>
<
translation
>
Quitter
temporairement
la
conf
é
rence
<
/translation
>
<
/message
>
<
message
>
<
source
>
joinBackConf
<
/source
>
<
translation
>
Rejoindre
la
conf
é
rence
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ConferenceControls
<
/name
>
...
...
linphone-desktop/ui/views/App/Calls/Conference.qml
View file @
29d54f7e
...
...
@@ -234,18 +234,20 @@ Rectangle {
rightMargin
:
CallStyle
.
actionArea
.
rightButtonsGroupMargin
verticalCenter
:
parent
.
verticalCenter
}
iconSize
:
CallStyle
.
actionArea
.
iconSize
ActionSwitch
{
icon
:
'
pause
'
enabled
:
conference
.
conferenceModel
.
isInConf
icon
:
'
pause
'
onClicked
:
{
conference
.
conferenceModel
.
isInConf
?
conference
.
conferenceModel
.
leave
()
:
conference
.
conferenceModel
.
join
()
}
TooltipArea
{
text
:
conference
.
conferenceModel
.
isInConf
?
qsTr
(
'
leaveConf
'
)
:
qsTr
(
'
joinBackConf
'
)
var
model
=
conference
.
conferenceModel
if
(
model
.
isInConf
)
{
model
.
leave
()
}
else
{
model
.
join
()
}
}
}
...
...
Write
Preview
Markdown
is supported
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