Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
7e025a2e
Commit
7e025a2e
authored
2 years ago
by
Aline Gondim Santos
Browse files
Options
Downloads
Patches
Plain Diff
callbuttons: move fullscreen to layout settings
GitLab:
#729
Change-Id: I0c179ee25fcc0a89e629c48017287a7de89c0ac2
parent
48154156
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/constant/JamiStrings.qml
+1
-0
1 addition, 0 deletions
src/app/constant/JamiStrings.qml
src/app/mainview/components/CallActionBar.qml
+40
-12
40 additions, 12 deletions
src/app/mainview/components/CallActionBar.qml
with
41 additions
and
12 deletions
src/app/constant/JamiStrings.qml
+
1
−
0
View file @
7e025a2e
...
...
@@ -289,6 +289,7 @@ Item {
property
string
notAvailable
:
qsTr
(
"
N/A
"
)
property
string
lowerHand
:
qsTr
(
"
Lower hand
"
)
property
string
raiseHand
:
qsTr
(
"
Raise hand
"
)
property
string
layoutSettings
:
qsTr
(
"
Layout settings
"
)
// Chatview header
property
string
hideChatView
:
qsTr
(
"
Hide chat view
"
)
...
...
This diff is collapsed.
Click to expand it.
src/app/mainview/components/CallActionBar.qml
+
40
−
12
View file @
7e025a2e
...
...
@@ -146,6 +146,35 @@ Control {
}
}
},
Action
{
id
:
layoutMenuAction
text
:
JamiStrings
.
layoutSettings
property
int
popupMode
:
CallActionBar
.
ActionPopupMode
.
ListElement
property
var
listModel
:
ListModel
{
id
:
layoutModel
Component.onCompleted
:
{
layoutModel
.
append
({
"
Name
"
:
layoutManager
.
isCallFullscreen
?
JamiStrings
.
exitFullScreen
:
JamiStrings
.
viewFullScreen
,
"
IconSource
"
:
layoutManager
.
isCallFullscreen
?
JamiResources
.
close_fullscreen_24dp_svg
:
JamiResources
.
open_in_full_24dp_svg
})
}
}
function
accept
(
index
)
{
switch
(
layoutModel
.
get
(
index
).
Name
)
{
case
JamiStrings.exitFullScreen
:
layoutModel
.
get
(
index
).
Name
=
JamiStrings
.
viewFullScreen
root
.
fullScreenClicked
()
break
case
JamiStrings.viewFullScreen
:
layoutModel
.
get
(
index
).
Name
=
JamiStrings
.
exitFullScreen
root
.
fullScreenClicked
()
break
}
}
},
Action
{
id
:
videoInputMenuAction
enabled
:
VideoDevices
.
listSize
!==
0
...
...
@@ -229,17 +258,6 @@ Control {
icon.color
:
"
white
"
text
:
JamiStrings
.
chat
},
Action
{
id
:
fullScreenAction
icon.source
:
layoutManager
.
isCallFullscreen
?
JamiResources
.
close_fullscreen_24dp_svg
:
JamiResources
.
open_in_full_24dp_svg
icon.color
:
"
white
"
onTriggered
:
root
.
fullScreenClicked
()
text
:
layoutManager
.
isCallFullscreen
?
JamiStrings
.
exitFullScreen
:
JamiStrings
.
viewFullScreen
},
Action
{
id
:
resumePauseCallAction
onTriggered
:
root
.
resumePauseCallClicked
()
...
...
@@ -293,6 +311,16 @@ Control {
JamiStrings
.
raiseHand
property
real
size
:
34
},
Action
{
id
:
layoutAction
property
bool
openPopupWhenClicked
:
true
checkable
:
!
openPopupWhenClicked
icon.source
:
JamiResources
.
mosaic_black_24dp_svg
icon.color
:
"
white
"
text
:
JamiStrings
.
layoutSettings
property
real
size
:
34
property
var
menuAction
:
layoutMenuAction
},
Action
{
id
:
recordAction
onTriggered
:
root
.
recordCallClicked
()
...
...
@@ -363,9 +391,9 @@ Control {
CallOverlayModel
.
addSecondaryControl
(
chatAction
)
if
(
CurrentAccount
.
videoEnabled_Video
&&
!
isSIP
)
CallOverlayModel
.
addSecondaryControl
(
shareAction
)
CallOverlayModel
.
addSecondaryControl
(
layoutAction
)
CallOverlayModel
.
addSecondaryControl
(
recordAction
)
CallOverlayModel
.
addSecondaryControl
(
pluginsAction
)
CallOverlayModel
.
addSecondaryControl
(
fullScreenAction
)
overflowItemCount
=
CallOverlayModel
.
secondaryModel
().
rowCount
()
muteAudioAction
.
checked
=
isAudioMuted
...
...
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
register
or
sign in
to comment