Skip to content
Snippets Groups Projects
Commit 2bd8a386 authored by trilene's avatar trilene Committed by Nicolas Werner
Browse files

Color and icon button spacing fixes

parent 9bbade37
No related branches found
No related tags found
No related merge requests found
Pipeline #298 failed
Stage: build
Hide whitespace changes
Inline Side-by-side
resources/qml/voip/CallDevices.qml
+ 3
− 16
View file @ 2bd8a386
......@@ -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 {
......
resources/qml/voip/CallInviteBar.qml
+ 7
− 9
View file @ 2bd8a386
......@@ -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();
......
resources/qml/voip/DeviceError.qml
+ 2
− 2
View file @ 2bd8a386
......@@ -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 {
......
resources/qml/voip/PlaceCall.qml
+ 6
− 20
View file @ 2bd8a386
......@@ -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 {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment