Skip to content
Snippets Groups Projects
Commit bbcf0e4d authored by Ming Rui Zhang's avatar Ming Rui Zhang Committed by Ming Rui Zhang
Browse files

darkmode: UI theme make up

1. SimpleMessageDialog (Password changing)
2. SidePanelTabBar (Inivitation & Conversation tabs)
3. Contact search status rect

Change-Id: I3cf6aecde5a3ab840c351cfd6e18d7ce9fbfa3cc
parent 4715571d
No related branches found
No related tags found
No related merge requests found
...@@ -53,6 +53,8 @@ BaseDialog { ...@@ -53,6 +53,8 @@ BaseDialog {
+ JamiTheme.preferredMarginSize)) + JamiTheme.preferredMarginSize))
implicitHeight: JamiTheme.preferredDialogHeight / 2 - JamiTheme.preferredMarginSize implicitHeight: JamiTheme.preferredDialogHeight / 2 - JamiTheme.preferredMarginSize
color: JamiTheme.secondaryBackgroundColor
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
...@@ -67,6 +69,7 @@ BaseDialog { ...@@ -67,6 +69,7 @@ BaseDialog {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
color: JamiTheme.textColor
} }
Item { Item {
......
...@@ -166,15 +166,15 @@ Rectangle { ...@@ -166,15 +166,15 @@ Rectangle {
hoverEnabled: true hoverEnabled: true
onReleased: { onReleased: {
searchStatusRect.color = JamiTheme.normalButtonColor searchStatusRect.color = Qt.binding(function(){return JamiTheme.normalButtonColor})
} }
onEntered: { onEntered: {
searchStatusRect.color = JamiTheme.hoverColor searchStatusRect.color = Qt.binding(function(){return JamiTheme.hoverColor})
} }
onExited: { onExited: {
searchStatusRect.color = JamiTheme.backgroundColor searchStatusRect.color = Qt.binding(function(){return JamiTheme.backgroundColor})
} }
} }
} }
......
...@@ -154,13 +154,13 @@ TabBar { ...@@ -154,13 +154,13 @@ TabBar {
selectTab(SidePanelTabBar.Conversations) selectTab(SidePanelTabBar.Conversations)
} }
onReleased: { onReleased: {
buttonRectOne.color = JamiTheme.backgroundColor buttonRectOne.color = Qt.binding(function(){return JamiTheme.backgroundColor})
} }
onEntered: { onEntered: {
buttonRectOne.color = JamiTheme.hoverColor buttonRectOne.color = Qt.binding(function(){return JamiTheme.hoverColor})
} }
onExited: { onExited: {
buttonRectOne.color = JamiTheme.backgroundColor buttonRectOne.color = Qt.binding(function(){return JamiTheme.backgroundColor})
} }
} }
...@@ -267,13 +267,13 @@ TabBar { ...@@ -267,13 +267,13 @@ TabBar {
selectTab(SidePanelTabBar.Requests) selectTab(SidePanelTabBar.Requests)
} }
onReleased: { onReleased: {
buttonRectTwo.color = JamiTheme.backgroundColor buttonRectTwo.color = Qt.binding(function(){return JamiTheme.backgroundColor})
} }
onEntered: { onEntered: {
buttonRectTwo.color = JamiTheme.hoverColor buttonRectTwo.color = Qt.binding(function(){return JamiTheme.hoverColor})
} }
onExited: { onExited: {
buttonRectTwo.color = JamiTheme.backgroundColor buttonRectTwo.color = Qt.binding(function(){return JamiTheme.backgroundColor})
} }
} }
......
...@@ -189,12 +189,11 @@ BaseDialog { ...@@ -189,12 +189,11 @@ BaseDialog {
'anchors.verticalCenterOffset: -2;' + 'anchors.verticalCenterOffset: -2;' +
'anchors.left: containerRectWithThreeKeys.left;' + 'anchors.left: containerRectWithThreeKeys.left;' +
'anchors.leftMargin: 30;' + 'anchors.leftMargin: 30;' +
'color: "' + JamiTheme.textColor + '";' +
'font.bold: true;' + 'font.bold: true;' +
'font.pointSize : 12;' + 'font.pointSize : 12;' +
'text: "+"}', 'text: "+"}',
containerRectWithThreeKeys) containerRectWithThreeKeys)
componentPlusSign.color = Qt.binding(function() { return JamiTheme.textColor })
var componentKeyTwo = Qt.createComponent("KeyBoardShortcutKey.qml") var componentKeyTwo = Qt.createComponent("KeyBoardShortcutKey.qml")
if (componentKeyTwo.status === Component.Ready) { if (componentKeyTwo.status === Component.Ready) {
var objectKeyTwo = componentKeyTwo.createObject(containerRectWithThreeKeys) var objectKeyTwo = componentKeyTwo.createObject(containerRectWithThreeKeys)
...@@ -211,12 +210,11 @@ BaseDialog { ...@@ -211,12 +210,11 @@ BaseDialog {
'anchors.verticalCenterOffset: -2;' + 'anchors.verticalCenterOffset: -2;' +
'anchors.left: containerRectWithThreeKeys.left;' + 'anchors.left: containerRectWithThreeKeys.left;' +
'anchors.leftMargin: 97;' + 'anchors.leftMargin: 97;' +
'color: "' + JamiTheme.textColor + '";' +
'font.bold: true;' + 'font.bold: true;' +
'font.pointSize : 12;' + 'font.pointSize : 12;' +
'text: "+"}', 'text: "+"}',
containerRectWithThreeKeys) containerRectWithThreeKeys)
componentPlusSignTwo.color = Qt.binding(function() { return JamiTheme.textColor })
var componentKeyThree = Qt.createComponent("KeyBoardShortcutKey.qml") var componentKeyThree = Qt.createComponent("KeyBoardShortcutKey.qml")
if (componentKeyThree.status === Component.Ready) { if (componentKeyThree.status === Component.Ready) {
var objectKeyThree = componentKeyThree.createObject(containerRectWithThreeKeys) var objectKeyThree = componentKeyThree.createObject(containerRectWithThreeKeys)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment