From bbcf0e4d2f9e4b15fca493d7d4a8808dad821313 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Wed, 9 Dec 2020 10:51:33 -0500
Subject: [PATCH] darkmode: UI theme make up
1. SimpleMessageDialog (Password changing)
2. SidePanelTabBar (Inivitation & Conversation tabs)
3. Contact search status rect
Change-Id: I3cf6aecde5a3ab840c351cfd6e18d7ce9fbfa3cc
---
src/commoncomponents/SimpleMessageDialog.qml | 3 +++
src/mainview/components/SidePanel.qml | 6 +++---
src/mainview/components/SidePanelTabBar.qml | 12 ++++++------
.../components/KeyBoardShortcutTable.qml | 6 ++----
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/commoncomponents/SimpleMessageDialog.qml b/src/commoncomponents/SimpleMessageDialog.qml
index c542796de..ca3857d30 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 4a1b396a0..7ccf9f0fb 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 329ff0aa8..dca27459e 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 c83b89d5e..1f38c8cc0 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)
--
GitLab