Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
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
Container 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
Nheko Reborn
nheko
Commits
87d2074c
Commit
87d2074c
authored
4 years ago
by
trilene
Committed by
Nicolas Werner
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add devices dialog to CallInviteBar
parent
055c6f72
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
resources/qml/voip/CallDevices.qml
+91
-0
91 additions, 0 deletions
resources/qml/voip/CallDevices.qml
resources/qml/voip/CallInviteBar.qml
+26
-1
26 additions, 1 deletion
resources/qml/voip/CallInviteBar.qml
resources/res.qrc
+1
-0
1 addition, 0 deletions
resources/res.qrc
with
118 additions
and
1 deletion
resources/qml/voip/CallDevices.qml
0 → 100644
+
91
−
0
View file @
87d2074c
import
QtQuick
2.3
import
QtQuick
.
Controls
2.3
import
QtQuick
.
Dialogs
1.3
import
QtQuick
.
Layouts
1.2
import
im
.
nheko
1.0
import
"
../
"
ApplicationWindow
{
flags
:
Qt
.
Dialog
modality
:
Qt
.
ApplicationModal
palette
:
colors
width
:
columnLayout
.
implicitWidth
height
:
columnLayout
.
implicitHeight
ColumnLayout
{
id
:
columnLayout
spacing
:
16
ColumnLayout
{
spacing
:
8
RowLayout
{
Layout.topMargin
:
8
Layout.leftMargin
:
8
Layout.rightMargin
:
8
Image
{
Layout.preferredWidth
:
22
Layout.preferredHeight
:
22
source
:
"
qrc:/icons/icons/ui/microphone-unmute.png
"
}
ComboBox
{
id
:
micCombo
Layout.fillWidth
:
true
model
:
CallManager
.
mics
}
}
RowLayout
{
visible
:
CallManager
.
cameras
.
length
>
0
Layout.leftMargin
:
8
Layout.rightMargin
:
8
Image
{
Layout.preferredWidth
:
22
Layout.preferredHeight
:
22
source
:
"
qrc:/icons/icons/ui/video-call.png
"
}
ComboBox
{
id
:
cameraCombo
Layout.fillWidth
:
true
model
:
CallManager
.
cameras
}
}
}
RowLayout
{
Layout.rightMargin
:
8
Layout.bottomMargin
:
8
Item
{
implicitWidth
:
128
}
Button
{
text
:
qsTr
(
"
Ok
"
)
onClicked
:
{
Settings
.
microphone
=
micCombo
.
currentText
if
(
cameraCombo
.
visible
)
{
Settings
.
camera
=
cameraCombo
.
currentText
}
close
();
}
}
Button
{
text
:
qsTr
(
"
Cancel
"
)
onClicked
:
{
close
();
}
}
}
}
}
This diff is collapsed.
Click to expand it.
resources/qml/voip/CallInviteBar.qml
+
26
−
1
View file @
87d2074c
...
...
@@ -16,6 +16,13 @@ Rectangle {
icon
:
StandardIcon
.
Warning
}
Component
{
id
:
devicesDialog
CallDevices
{
}
}
RowLayout
{
id
:
rowLayout
...
...
@@ -53,6 +60,24 @@ Rectangle {
Layout.fillWidth
:
true
}
ImageButton
{
width
:
24
height
:
24
buttonTextColor
:
"
#000000
"
image
:
"
:/icons/icons/ui/settings.png
"
hoverEnabled
:
true
ToolTip.visible
:
hovered
ToolTip.text
:
"
Devices
"
onClicked
:
{
var
dialog
=
devicesDialog
.
createObject
(
timelineRoot
);
dialog
.
show
();
}
}
Item
{
implicitWidth
:
8
}
Button
{
icon.source
:
CallManager
.
isVideo
?
"
qrc:/icons/icons/ui/video-call.png
"
:
"
qrc:/icons/icons/ui/place-call.png
"
palette
:
colors
...
...
@@ -78,7 +103,7 @@ Rectangle {
}
Item
{
implicitWidth
:
8
implicitWidth
:
4
}
Button
{
...
...
This diff is collapsed.
Click to expand it.
resources/res.qrc
+
1
−
0
View file @
87d2074c
...
...
@@ -158,6 +158,7 @@
<file>qml/device-verification/Failed.qml</file>
<file>qml/device-verification/Success.qml</file>
<file>qml/voip/ActiveCallBar.qml</file>
<file>qml/voip/CallDevices.qml</file>
<file>qml/voip/CallInviteBar.qml</file>
<file>qml/voip/PlaceCall.qml</file>
<file>qml/voip/VideoCall.qml</file>
...
...
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