1 files changed, 38 insertions, 32 deletions
diff --git a/resources/qml/voip/PlaceCall.qml b/resources/qml/voip/PlaceCall.qml
index 7a839e8d..c047e625 100644
--- a/resources/qml/voip/PlaceCall.qml
+++ b/resources/qml/voip/PlaceCall.qml
@@ -43,11 +43,10 @@ ApplicationWindow {
Layout.leftMargin: 8
Layout.rightMargin: 8
- spacing: 16
function validateMic() {
if (CallManager.mics.length == 0) {
- warningDialog.text = "No microphone found.";
+ warningDialog.text = qsTr("No microphone found.");
warningDialog.open();
return false;
}
@@ -61,6 +60,10 @@ ApplicationWindow {
displayName: TimelineManager.timeline.roomName
}
+ Item {
+ implicitWidth: cameraCombo.visible ? 16 : 64
+ }
+
Button {
text: qsTr("Voice")
icon.source: "qrc:/icons/icons/ui/place-call.png"
@@ -88,7 +91,6 @@ ApplicationWindow {
}
Button {
- palette: colors
text: qsTr("Cancel")
onClicked: {
close();
@@ -96,42 +98,46 @@ ApplicationWindow {
}
}
- RowLayout {
+ ColumnLayout {
+ spacing: 8
- Layout.leftMargin: 8
- Layout.rightMargin: 8
- Layout.bottomMargin: cameraCombo.visible ? 0 : 16
+ RowLayout {
- Image {
- Layout.preferredWidth: 22
- Layout.preferredHeight: 22
- source: "qrc:/icons/icons/ui/microphone-unmute.png"
- }
+ Layout.leftMargin: 8
+ Layout.rightMargin: 8
+ Layout.bottomMargin: cameraCombo.visible ? 0 : 16
- ComboBox {
- id: micCombo
- Layout.fillWidth: true
- model: CallManager.mics
- }
- }
+ Image {
+ Layout.preferredWidth: 22
+ Layout.preferredHeight: 22
+ source: "qrc:/icons/icons/ui/microphone-unmute.png"
+ }
- RowLayout {
+ ComboBox {
+ id: micCombo
+ Layout.fillWidth: true
+ model: CallManager.mics
+ }
+ }
- visible: CallManager.cameras.length > 0
- Layout.leftMargin: 8
- Layout.rightMargin: 8
- Layout.bottomMargin: 16
+ RowLayout {
- Image {
- Layout.preferredWidth: 22
- Layout.preferredHeight: 22
- source: "qrc:/icons/icons/ui/video-call.png"
- }
+ visible: CallManager.cameras.length > 0
+ Layout.leftMargin: 8
+ Layout.rightMargin: 8
+ Layout.bottomMargin: 16
+
+ Image {
+ Layout.preferredWidth: 22
+ Layout.preferredHeight: 22
+ source: "qrc:/icons/icons/ui/video-call.png"
+ }
- ComboBox {
- id: cameraCombo
- Layout.fillWidth: true
- model: CallManager.cameras
+ ComboBox {
+ id: cameraCombo
+ Layout.fillWidth: true
+ model: CallManager.cameras
+ }
}
}
}
|