From 2bd8a386e29e5abdf65164d6dd2fc3213de1f878 Mon Sep 17 00:00:00 2001 From: trilene Date: Wed, 6 Jan 2021 17:15:43 -0500 Subject: Color and icon button spacing fixes --- resources/qml/voip/CallDevices.qml | 19 +++---------------- resources/qml/voip/CallInviteBar.qml | 16 +++++++--------- resources/qml/voip/DeviceError.qml | 4 ++-- resources/qml/voip/PlaceCall.qml | 26 ++++++-------------------- 4 files changed, 18 insertions(+), 47 deletions(-) diff --git a/resources/qml/voip/CallDevices.qml b/resources/qml/voip/CallDevices.qml index b07412c7..f0847b14 100644 --- a/resources/qml/voip/CallDevices.qml +++ b/resources/qml/voip/CallDevices.qml @@ -12,20 +12,7 @@ Popup { border.color: colors.windowText } - // palette: colors - // colorize controls correctly - palette.base: colors.base - palette.brightText: colors.brightText - palette.button: colors.button - palette.buttonText: colors.buttonText - palette.dark: colors.dark - palette.highlight: colors.highlight - palette.highlightedText: colors.highlightedText - palette.light: colors.light - palette.mid: colors.mid - palette.text: colors.text - palette.window: colors.window - palette.windowText: colors.windowText + palette: colors ColumnLayout { @@ -43,7 +30,7 @@ Popup { Image { Layout.preferredWidth: 22 Layout.preferredHeight: 22 - source: "qrc:/icons/icons/ui/microphone-unmute.png" + source: "image://colorimage/:/icons/icons/ui/microphone-unmute.png?" + colors.windowText } ComboBox { @@ -60,7 +47,7 @@ Popup { Image { Layout.preferredWidth: 22 Layout.preferredHeight: 22 - source: "qrc:/icons/icons/ui/video-call.png" + source: "image://colorimage/:/icons/icons/ui/video-call.png?" + colors.windowText } ComboBox { diff --git a/resources/qml/voip/CallInviteBar.qml b/resources/qml/voip/CallInviteBar.qml index 8c3a8f6a..58b89ed3 100644 --- a/resources/qml/voip/CallInviteBar.qml +++ b/resources/qml/voip/CallInviteBar.qml @@ -79,15 +79,14 @@ Rectangle { Button { Layout.rightMargin: 4 icon.source: CallManager.isVideo ? "qrc:/icons/icons/ui/video-call.png" : "qrc:/icons/icons/ui/place-call.png" - text: qsTr("Accept") - palette.button: colors.button - palette.buttonText: colors.buttonText + text: qsTr(" Accept ") + palette: colors onClicked: { if (CallManager.mics.length == 0) { var dialog = deviceError.createObject(timelineRoot, { "errorString": qsTr("No microphone found."), - "iconSource": "qrc:/icons/icons/ui/place-call.png" + "image": ":/icons/icons/ui/place-call.png" }); dialog.open(); return; @@ -95,7 +94,7 @@ Rectangle { else if (!CallManager.mics.includes(Settings.microphone)) { var dialog = deviceError.createObject(timelineRoot, { "errorString": qsTr("Unknown microphone: ") + Settings.microphone, - "iconSource": "qrc:/icons/icons/ui/place-call.png" + "image": ":/icons/icons/ui/place-call.png" }); dialog.open(); return; @@ -103,7 +102,7 @@ Rectangle { if (CallManager.isVideo && CallManager.cameras.length > 0 && !CallManager.cameras.includes(Settings.camera)) { var dialog = deviceError.createObject(timelineRoot, { "errorString": qsTr("Unknown camera: ") + Settings.camera, - "iconSource": "qrc:/icons/icons/ui/video-call.png" + "image": ":/icons/icons/ui/video-call.png" }); dialog.open(); return; @@ -115,9 +114,8 @@ Rectangle { Button { Layout.rightMargin: 16 icon.source: "qrc:/icons/icons/ui/end-call.png" - text: qsTr("Decline") - palette.button: colors.button - palette.buttonText: colors.buttonText + text: qsTr(" Decline ") + palette: colors onClicked: { CallManager.hangUp(); diff --git a/resources/qml/voip/DeviceError.qml b/resources/qml/voip/DeviceError.qml index c88c7faa..a6411b95 100644 --- a/resources/qml/voip/DeviceError.qml +++ b/resources/qml/voip/DeviceError.qml @@ -6,7 +6,7 @@ import im.nheko 1.0 Popup { property string errorString - property var iconSource + property var image modal: true anchors.centerIn: parent @@ -20,7 +20,7 @@ Popup { Image { Layout.preferredWidth: 16 Layout.preferredHeight: 16 - source: iconSource + source: "image://colorimage/" + image + "?" + colors.windowText } Label { diff --git a/resources/qml/voip/PlaceCall.qml b/resources/qml/voip/PlaceCall.qml index 8dc7d781..95383d95 100644 --- a/resources/qml/voip/PlaceCall.qml +++ b/resources/qml/voip/PlaceCall.qml @@ -8,6 +8,7 @@ Popup { modal: true anchors.centerIn: parent + palette: colors background: Rectangle { color: colors.window border.color: colors.windowText @@ -19,21 +20,6 @@ Popup { } } - // palette: colors - // colorize controls correctly - palette.base: colors.base - palette.brightText: colors.brightText - palette.button: colors.button - palette.buttonText: colors.buttonText - palette.dark: colors.dark - palette.highlight: colors.highlight - palette.highlightedText: colors.highlightedText - palette.light: colors.light - palette.mid: colors.mid - palette.text: colors.text - palette.window: colors.window - palette.windowText: colors.windowText - ColumnLayout { id: columnLayout @@ -64,7 +50,7 @@ Popup { if (CallManager.mics.length == 0) { var dialog = deviceError.createObject(timelineRoot, { "errorString": qsTr("No microphone found."), - "iconSource": "qrc:/icons/icons/ui/place-call.png" + "image": ":/icons/icons/ui/place-call.png" }); dialog.open(); return false; @@ -81,7 +67,7 @@ Popup { } Button { - text: qsTr("Voice") + text: qsTr(" Voice ") icon.source: "qrc:/icons/icons/ui/place-call.png" onClicked: { if (buttonLayout.validateMic()) { @@ -94,7 +80,7 @@ Popup { Button { visible: CallManager.cameras.length > 0 - text: qsTr("Video") + text: qsTr(" Video ") icon.source: "qrc:/icons/icons/ui/video-call.png" onClicked: { if (buttonLayout.validateMic()) { @@ -126,7 +112,7 @@ Popup { Image { Layout.preferredWidth: 22 Layout.preferredHeight: 22 - source: "qrc:/icons/icons/ui/microphone-unmute.png" + source: "image://colorimage/:/icons/icons/ui/microphone-unmute.png?" + colors.windowText } ComboBox { @@ -146,7 +132,7 @@ Popup { Image { Layout.preferredWidth: 22 Layout.preferredHeight: 22 - source: "qrc:/icons/icons/ui/video-call.png" + source: "image://colorimage/:/icons/icons/ui/video-call.png?" + colors.windowText } ComboBox { -- cgit 1.4.1