diff --git a/src/commoncomponents/SimpleMessageDialog.qml b/src/commoncomponents/SimpleMessageDialog.qml index c542796de9fe9f7b8de99eb941e950431e5e17f9..ca3857d30f16aa2f0c4696802567c897dc4f1bce 100644 --- a/src/commoncomponents/SimpleMessageDialog.qml +++ b/src/commoncomponents/SimpleMessageDialog.qml @@ -53,6 +53,8 @@ BaseDialog { + JamiTheme.preferredMarginSize)) implicitHeight: JamiTheme.preferredDialogHeight / 2 - JamiTheme.preferredMarginSize + color: JamiTheme.secondaryBackgroundColor + ColumnLayout { anchors.fill: parent @@ -67,6 +69,7 @@ BaseDialog { wrapMode: Text.WordWrap horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter + color: JamiTheme.textColor } Item { diff --git a/src/mainview/components/SidePanel.qml b/src/mainview/components/SidePanel.qml index 4a1b396a03896dcffda9dc4b0d3405b1f41316a5..7ccf9f0fba79b502a31bdd0ca1eb244b4a66fe55 100644 --- a/src/mainview/components/SidePanel.qml +++ b/src/mainview/components/SidePanel.qml @@ -166,15 +166,15 @@ Rectangle { hoverEnabled: true onReleased: { - searchStatusRect.color = JamiTheme.normalButtonColor + searchStatusRect.color = Qt.binding(function(){return JamiTheme.normalButtonColor}) } onEntered: { - searchStatusRect.color = JamiTheme.hoverColor + searchStatusRect.color = Qt.binding(function(){return JamiTheme.hoverColor}) } onExited: { - searchStatusRect.color = JamiTheme.backgroundColor + searchStatusRect.color = Qt.binding(function(){return JamiTheme.backgroundColor}) } } } diff --git a/src/mainview/components/SidePanelTabBar.qml b/src/mainview/components/SidePanelTabBar.qml index 329ff0aa83506acc4885cefcfa228b82f8f8a766..dca27459ecec117f132716057795aa20bef90e7c 100644 --- a/src/mainview/components/SidePanelTabBar.qml +++ b/src/mainview/components/SidePanelTabBar.qml @@ -154,13 +154,13 @@ TabBar { selectTab(SidePanelTabBar.Conversations) } onReleased: { - buttonRectOne.color = JamiTheme.backgroundColor + buttonRectOne.color = Qt.binding(function(){return JamiTheme.backgroundColor}) } onEntered: { - buttonRectOne.color = JamiTheme.hoverColor + buttonRectOne.color = Qt.binding(function(){return JamiTheme.hoverColor}) } onExited: { - buttonRectOne.color = JamiTheme.backgroundColor + buttonRectOne.color = Qt.binding(function(){return JamiTheme.backgroundColor}) } } @@ -267,13 +267,13 @@ TabBar { selectTab(SidePanelTabBar.Requests) } onReleased: { - buttonRectTwo.color = JamiTheme.backgroundColor + buttonRectTwo.color = Qt.binding(function(){return JamiTheme.backgroundColor}) } onEntered: { - buttonRectTwo.color = JamiTheme.hoverColor + buttonRectTwo.color = Qt.binding(function(){return JamiTheme.hoverColor}) } onExited: { - buttonRectTwo.color = JamiTheme.backgroundColor + buttonRectTwo.color = Qt.binding(function(){return JamiTheme.backgroundColor}) } } diff --git a/src/settingsview/components/KeyBoardShortcutTable.qml b/src/settingsview/components/KeyBoardShortcutTable.qml index c83b89d5e1fde20c614a0f62526f2c7db9e2c7f4..1f38c8cc0c344d6b9bf0654f15f9d02584b9bb5e 100644 --- a/src/settingsview/components/KeyBoardShortcutTable.qml +++ b/src/settingsview/components/KeyBoardShortcutTable.qml @@ -189,12 +189,11 @@ BaseDialog { 'anchors.verticalCenterOffset: -2;' + 'anchors.left: containerRectWithThreeKeys.left;' + 'anchors.leftMargin: 30;' + - 'color: "' + JamiTheme.textColor + '";' + 'font.bold: true;' + 'font.pointSize : 12;' + 'text: "+"}', containerRectWithThreeKeys) - + componentPlusSign.color = Qt.binding(function() { return JamiTheme.textColor }) var componentKeyTwo = Qt.createComponent("KeyBoardShortcutKey.qml") if (componentKeyTwo.status === Component.Ready) { var objectKeyTwo = componentKeyTwo.createObject(containerRectWithThreeKeys) @@ -211,12 +210,11 @@ BaseDialog { 'anchors.verticalCenterOffset: -2;' + 'anchors.left: containerRectWithThreeKeys.left;' + 'anchors.leftMargin: 97;' + - 'color: "' + JamiTheme.textColor + '";' + 'font.bold: true;' + 'font.pointSize : 12;' + 'text: "+"}', containerRectWithThreeKeys) - + componentPlusSignTwo.color = Qt.binding(function() { return JamiTheme.textColor }) var componentKeyThree = Qt.createComponent("KeyBoardShortcutKey.qml") if (componentKeyThree.status === Component.Ready) { var objectKeyThree = componentKeyThree.createObject(containerRectWithThreeKeys)