3 files changed, 112 insertions, 137 deletions
diff --git a/resources/qml/ActiveCallBar.qml b/resources/qml/ActiveCallBar.qml
new file mode 100644
index 00000000..8a63725e
--- /dev/null
+++ b/resources/qml/ActiveCallBar.qml
@@ -0,0 +1,110 @@
+import QtQuick 2.9
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.2
+
+import im.nheko 1.0
+
+Rectangle {
+ id: activeCallBar
+ visible: timelineManager.callState != WebRTCState.DISCONNECTED
+ color: "#2ECC71"
+ implicitHeight: rowLayout.height + 8
+
+ RowLayout {
+ id: rowLayout
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.leftMargin: 8
+
+ Avatar {
+ width: avatarSize
+ height: avatarSize
+
+ url: timelineManager.callPartyAvatarUrl.replace("mxc://", "image://MxcImage/")
+ displayName: timelineManager.callPartyName
+ }
+
+ Label {
+ font.pointSize: fontMetrics.font.pointSize * 1.1
+ text: " " + timelineManager.callPartyName + " "
+ }
+
+ Image {
+ Layout.preferredWidth: 24
+ Layout.preferredHeight: 24
+ source: "qrc:/icons/icons/ui/place-call.png"
+ }
+
+ Label {
+ id: callStateLabel
+ font.pointSize: fontMetrics.font.pointSize * 1.1
+ }
+
+ Connections {
+ target: timelineManager
+ function onCallStateChanged(state) {
+ switch (state) {
+ case WebRTCState.INITIATING:
+ callStateLabel.text = qsTr("Initiating...")
+ break;
+ case WebRTCState.OFFERSENT:
+ callStateLabel.text = qsTr("Calling...")
+ break;
+ case WebRTCState.CONNECTING:
+ callStateLabel.text = qsTr("Connecting...")
+ break;
+ case WebRTCState.CONNECTED:
+ callStateLabel.text = "00:00"
+ var d = new Date()
+ callTimer.startTime = Math.floor(d.getTime() / 1000)
+ break;
+ case WebRTCState.DISCONNECTED:
+ callStateLabel.text = ""
+ }
+ }
+ }
+
+ Timer {
+ id: callTimer
+ property int startTime
+ interval: 1000
+ running: timelineManager.callState == WebRTCState.CONNECTED
+ repeat: true
+ onTriggered: {
+ var d = new Date()
+ let seconds = Math.floor(d.getTime() / 1000 - startTime)
+ let s = Math.floor(seconds % 60)
+ let m = Math.floor(seconds / 60) % 60
+ let h = Math.floor(seconds / 3600)
+ callStateLabel.text = (h ? (pad(h) + ":") : "") + pad(m) + ":" + pad(s)
+ }
+
+ function pad(n) {
+ return (n < 10) ? ("0" + n) : n
+ }
+ }
+
+ Item {
+ Layout.fillWidth: true
+ }
+
+ ImageButton {
+ width: 24
+ height: 24
+ src: timelineManager.isMicMuted ?
+ "qrc:/icons/icons/ui/microphone-unmute.png" :
+ "qrc:/icons/icons/ui/microphone-mute.png"
+
+ hoverEnabled: true
+ ToolTip.visible: hovered
+ ToolTip.text: timelineManager.isMicMuted ? qsTr("Unmute Mic") : qsTr("Mute Mic")
+
+ onClicked: timelineManager.toggleMicMute()
+ }
+
+ Item {
+ implicitWidth: 16
+ }
+ }
+}
diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml
index a3943806..c030c843 100644
--- a/resources/qml/Avatar.qml
+++ b/resources/qml/Avatar.qml
@@ -14,7 +14,7 @@ Rectangle {
Label {
anchors.fill: parent
- text: timelineManager.escapeEmoji(String.fromCodePoint(displayName.codePointAt(0)))
+ text: timelineManager.escapeEmoji(displayName ? String.fromCodePoint(displayName.codePointAt(0)) : "")
textFormat: Text.RichText
font.pixelSize: avatar.height/2
verticalAlignment: Text.AlignVCenter
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 4ea15f7b..07c5e1a4 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -498,144 +498,9 @@ Page {
}
}
- Rectangle {
- id: activeCallBar
- visible: timelineManager.callState != WebRTCState.DISCONNECTED
-
+ ActiveCallBar {
Layout.fillWidth: true
- implicitHeight: topLayout.height + 16
- color: "#2ECC71"
z: 3
-
- GridLayout {
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.margins: 8
- anchors.verticalCenter: parent.verticalCenter
-
- Avatar {
- Layout.column: 1
- Layout.row: 0
- Layout.rowSpan: 2
- Layout.alignment: Qt.AlignVCenter
-
- width: avatarSize
- height: avatarSize
-
- url: chat.model ? chat.model.roomAvatarUrl.replace("mxc://", "image://MxcImage/") : ""
- displayName: chat.model ? chat.model.roomName : qsTr("No room selected")
- }
-
- Label {
- Layout.column: 2
- Layout.row: 0
- Layout.rowSpan: 2
- Layout.alignment: Qt.AlignVCenter
-
- font.pointSize: fontMetrics.font.pointSize * 1.1
- text: chat.model ? " " + chat.model.roomName + " " : ""
- }
-
- Image {
- Layout.column: 3
- Layout.row: 0
- Layout.rowSpan: 2
- Layout.alignment: Qt.AlignVCenter
- Layout.preferredWidth: 23
- Layout.preferredHeight: 23
- source: "qrc:/icons/icons/ui/place-call.png"
- }
-
- Connections {
- target: timelineManager
- function onCallStateChanged(state) {
- switch (state) {
- case WebRTCState.INITIATING:
- callStateLabel.text = "Initiating call..."
- break;
- case WebRTCState.INITIATED:
- callStateLabel.text = "Call initiated..."
- break;
- case WebRTCState.OFFERSENT:
- callStateLabel.text = "Calling..."
- break;
- case WebRTCState.CONNECTING:
- callStateLabel.text = "Connecting..."
- break;
- case WebRTCState.CONNECTED:
- callStateLabel.text = "00:00"
- var d = new Date()
- callTimer.startTime = Math.floor(d.getTime() / 1000)
- break;
- }
- }
- }
-
- Label {
- id: callStateLabel
- Layout.column: 4
- Layout.row: 0
- Layout.rowSpan: 2
- Layout.alignment: Qt.AlignVCenter
- font.pointSize: fontMetrics.font.pointSize * 1.1
- }
-
- Timer {
- id: callTimer
- property int startTime
- interval: 1000
- running: timelineManager.callState == WebRTCState.CONNECTED
- repeat: true
- onTriggered: {
- var d = new Date()
- let seconds = Math.floor(d.getTime() / 1000 - startTime)
- let s = Math.floor(seconds % 60)
- let m = Math.floor(seconds / 60) % 60
- let h = Math.floor(seconds / 3600)
- callStateLabel.text = (h ? (pad(h) + ":") : "") + pad(m) + ":" + pad(s)
- }
-
- function pad(n) {
- return (n < 10) ? ("0" + n) : n
- }
- }
-
- Item {
- Layout.column: 5
- Layout.fillWidth: true
- }
-
- ImageButton {
- Layout.column: 6
- Layout.row: 0
- Layout.rowSpan: 2
- Layout.alignment: Qt.AlignVCenter
-
- width: 22
- height: 22
- src: "qrc:/icons/icons/ui/microphone-mute.png"
-
- hoverEnabled: true
- ToolTip.visible: hovered
- ToolTip.text: qsTr("Mute Mic")
-
- onClicked: {
- if (timelineManager.toggleMuteAudioSource()) {
- src = "qrc:/icons/icons/ui/microphone-unmute.png"
- ToolTip.text = qsTr("Unmute Mic")
- }
- else {
- src = "qrc:/icons/icons/ui/microphone-mute.png"
- ToolTip.text = qsTr("Mute Mic")
- }
- }
- }
-
- Item {
- Layout.column: 7
- implicitWidth: 16
- }
- }
}
}
}
|
