rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Color and icon button spacing fixes

Browse Source
This commit is contained in:
trilene 2021-01-06 17:15:43 -05:00 committed by Nicolas Werner
parent 9bbade37de
commit 2bd8a386e2
4 changed files with 18 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
resources/qml/voip/CallDevices.qml
View File

@ -12,20 +12,7 @@ Popup {
border.color: colors.windowText border.color: colors.windowText
} }
// palette: colors 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 { ColumnLayout {
@ -43,7 +30,7 @@ Popup {
Image { Image {
Layout.preferredWidth: 22 Layout.preferredWidth: 22
Layout.preferredHeight: 22 Layout.preferredHeight: 22
source: "qrc:/icons/icons/ui/microphone-unmute.png" source: "image://colorimage/:/icons/icons/ui/microphone-unmute.png?" + colors.windowText
} }
ComboBox { ComboBox {
@ -60,7 +47,7 @@ Popup {
Image { Image {
Layout.preferredWidth: 22 Layout.preferredWidth: 22
Layout.preferredHeight: 22 Layout.preferredHeight: 22
source: "qrc:/icons/icons/ui/video-call.png" source: "image://colorimage/:/icons/icons/ui/video-call.png?" + colors.windowText
} }
ComboBox { ComboBox {

16
resources/qml/voip/CallInviteBar.qml
View File

@ -79,15 +79,14 @@ Rectangle {
Button { Button {
Layout.rightMargin: 4 Layout.rightMargin: 4
icon.source: CallManager.isVideo ? "qrc:/icons/icons/ui/video-call.png" : "qrc:/icons/icons/ui/place-call.png" icon.source: CallManager.isVideo ? "qrc:/icons/icons/ui/video-call.png" : "qrc:/icons/icons/ui/place-call.png"
text: qsTr("Accept") text: qsTr(" Accept ")
palette.button: colors.button palette: colors
palette.buttonText: colors.buttonText
onClicked: { onClicked: {
if (CallManager.mics.length == 0) { if (CallManager.mics.length == 0) {
var dialog = deviceError.createObject(timelineRoot, { var dialog = deviceError.createObject(timelineRoot, {
"errorString": qsTr("No microphone found."), "errorString": qsTr("No microphone found."),
"iconSource": "qrc:/icons/icons/ui/place-call.png" "image": ":/icons/icons/ui/place-call.png"
}); });
dialog.open(); dialog.open();
return; return;
@ -95,7 +94,7 @@ Rectangle {
else if (!CallManager.mics.includes(Settings.microphone)) { else if (!CallManager.mics.includes(Settings.microphone)) {
var dialog = deviceError.createObject(timelineRoot, { var dialog = deviceError.createObject(timelineRoot, {
"errorString": qsTr("Unknown microphone: ") + Settings.microphone, "errorString": qsTr("Unknown microphone: ") + Settings.microphone,
"iconSource": "qrc:/icons/icons/ui/place-call.png" "image": ":/icons/icons/ui/place-call.png"
}); });
dialog.open(); dialog.open();
return; return;
@ -103,7 +102,7 @@ Rectangle {
if (CallManager.isVideo && CallManager.cameras.length > 0 && !CallManager.cameras.includes(Settings.camera)) { if (CallManager.isVideo && CallManager.cameras.length > 0 && !CallManager.cameras.includes(Settings.camera)) {
var dialog = deviceError.createObject(timelineRoot, { var dialog = deviceError.createObject(timelineRoot, {
"errorString": qsTr("Unknown camera: ") + Settings.camera, "errorString": qsTr("Unknown camera: ") + Settings.camera,
"iconSource": "qrc:/icons/icons/ui/video-call.png" "image": ":/icons/icons/ui/video-call.png"
}); });
dialog.open(); dialog.open();
return; return;
@ -115,9 +114,8 @@ Rectangle {
Button { Button {
Layout.rightMargin: 16 Layout.rightMargin: 16
icon.source: "qrc:/icons/icons/ui/end-call.png" icon.source: "qrc:/icons/icons/ui/end-call.png"
text: qsTr("Decline") text: qsTr(" Decline ")
palette.button: colors.button palette: colors
palette.buttonText: colors.buttonText
onClicked: { onClicked: {
CallManager.hangUp(); CallManager.hangUp();

4
resources/qml/voip/DeviceError.qml
View File

@ -6,7 +6,7 @@ import im.nheko 1.0
Popup { Popup {
property string errorString property string errorString
property var iconSource property var image
modal: true modal: true
anchors.centerIn: parent anchors.centerIn: parent
@ -20,7 +20,7 @@ Popup {
Image { Image {
Layout.preferredWidth: 16 Layout.preferredWidth: 16
Layout.preferredHeight: 16 Layout.preferredHeight: 16
source: iconSource source: "image://colorimage/" + image + "?" + colors.windowText
} }
Label { Label {

26
resources/qml/voip/PlaceCall.qml
View File

@ -8,6 +8,7 @@ Popup {
modal: true modal: true
anchors.centerIn: parent anchors.centerIn: parent
palette: colors
background: Rectangle { background: Rectangle {
color: colors.window color: colors.window
border.color: colors.windowText 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 { ColumnLayout {
id: columnLayout id: columnLayout
@ -64,7 +50,7 @@ Popup {
if (CallManager.mics.length == 0) { if (CallManager.mics.length == 0) {
var dialog = deviceError.createObject(timelineRoot, { var dialog = deviceError.createObject(timelineRoot, {
"errorString": qsTr("No microphone found."), "errorString": qsTr("No microphone found."),
"iconSource": "qrc:/icons/icons/ui/place-call.png" "image": ":/icons/icons/ui/place-call.png"
}); });
dialog.open(); dialog.open();
return false; return false;
@ -81,7 +67,7 @@ Popup {
} }
Button { Button {
text: qsTr("Voice") text: qsTr(" Voice ")
icon.source: "qrc:/icons/icons/ui/place-call.png" icon.source: "qrc:/icons/icons/ui/place-call.png"
onClicked: { onClicked: {
if (buttonLayout.validateMic()) { if (buttonLayout.validateMic()) {
@ -94,7 +80,7 @@ Popup {
Button { Button {
visible: CallManager.cameras.length > 0 visible: CallManager.cameras.length > 0
text: qsTr("Video") text: qsTr(" Video ")
icon.source: "qrc:/icons/icons/ui/video-call.png" icon.source: "qrc:/icons/icons/ui/video-call.png"
onClicked: { onClicked: {
if (buttonLayout.validateMic()) { if (buttonLayout.validateMic()) {
@ -126,7 +112,7 @@ Popup {
Image { Image {
Layout.preferredWidth: 22 Layout.preferredWidth: 22
Layout.preferredHeight: 22 Layout.preferredHeight: 22
source: "qrc:/icons/icons/ui/microphone-unmute.png" source: "image://colorimage/:/icons/icons/ui/microphone-unmute.png?" + colors.windowText
} }
ComboBox { ComboBox {
@ -146,7 +132,7 @@ Popup {
Image { Image {
Layout.preferredWidth: 22 Layout.preferredWidth: 22
Layout.preferredHeight: 22 Layout.preferredHeight: 22
source: "qrc:/icons/icons/ui/video-call.png" source: "image://colorimage/:/icons/icons/ui/video-call.png?" + colors.windowText
} }
ComboBox { ComboBox {