From 837e753bf9c7068d2a4739f08eeabf2d013b5d98 Mon Sep 17 00:00:00 2001 From: erinn Date: Wed, 2 Dec 2020 15:54:33 -0800 Subject: [PATCH 1/3] add chatOverlayWarningTextColor --- EmojiDrawer.qml | 22 ++++++++++++---------- theme/CwtchDark.qml | 2 ++ theme/CwtchLight.qml | 2 ++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/EmojiDrawer.qml b/EmojiDrawer.qml index 41f860c..58e09b4 100644 --- a/EmojiDrawer.qml +++ b/EmojiDrawer.qml @@ -19,6 +19,7 @@ Item { property string morph: "clw" property string color: "v1" property bool narrowMode: width < (txtSearch.width + root.size * 14 + btnX.width) + property string catimgpath: gcd.assetPath + "emojidrawer/" + (true ? "lightmode_" : "darkmode_") signal picked(string shortcode) signal slideopen() @@ -76,15 +77,16 @@ Item { visible: !root.narrowMode //: Expressions tooltip: qsTr("emojicat-expressions") - source: gcd.assetPath + "mutstd/smile.webp" + source: catimgpath + "big_smile.webp" size: root.size onClicked: emojiModel.model = folder_expressions } + ImageButton { visible: !root.narrowMode //: Activities tooltip: qsTr("emojicat-activities") - source: gcd.assetPath + "mutstd/artist_r1.webp" + source: catimgpath + "volleyball.webp" size: root.size onClicked: emojiModel.model = folder_activities_clothing } @@ -92,7 +94,7 @@ Item { visible: !root.narrowMode //: Food, drink & herbs tooltip: qsTr("emojicat-food") - source: gcd.assetPath + "mutstd/red_apple.webp" + source: catimgpath + "red_apple.webp" size: root.size onClicked: emojiModel.model = folder_food_drink_herbs } @@ -101,14 +103,14 @@ Item { //: Gender, relationships & sexuality tooltip: qsTr("emojicat-gender") size: root.size - source: gcd.assetPath + "mutstd/pride_100.webp" + source: catimgpath + "transgender_symbol.webp" onClicked: emojiModel.model = folder_gsr } ImageButton { visible: !root.narrowMode //: Nature and effects tooltip: qsTr("emojicat-nature") - source: gcd.assetPath + "mutstd/sun_behind_small_cloud.webp" + source: catimgpath + "crescent.webp" size: root.size onClicked: emojiModel.model = folder_nature } @@ -116,7 +118,7 @@ Item { visible: !root.narrowMode //: Objects tooltip: qsTr("emojicat-objects") - source: gcd.assetPath + "mutstd/crystal_ball.webp" + source: catimgpath + "ligh_bulb.webp" size: root.size onClicked: emojiModel.model = folder_objects } @@ -124,7 +126,7 @@ Item { visible: !root.narrowMode //: People and animals tooltip: qsTr("emojicat-people") - source: gcd.assetPath + "mutstd/crow.webp" + source: catimgpath + "bear.webp" size: root.size onClicked: emojiModel.model = folder_people } @@ -132,7 +134,7 @@ Item { visible: !root.narrowMode //: Symbols tooltip: qsTr("emojicat-symbols") - source: gcd.assetPath + "mutstd/purple_heart.webp" + source: catimgpath + "pentacle.webp" size: root.size onClicked: emojiModel.model = folder_symbols } @@ -140,7 +142,7 @@ Item { visible: !root.narrowMode //: Travel & places tooltip: qsTr("emojicat-travel") - source: gcd.assetPath + "mutstd/airplane.webp" + source: catimgpath + "airplane.webp" size: root.size onClicked: emojiModel.model = folder_travel_places } @@ -148,7 +150,7 @@ Item { visible: !root.narrowMode //: Miscellaneous tooltip: qsTr("emojicat-misc") - source: gcd.assetPath + "mutstd/hash_char.webp" + source: catimgpath + "hash.webp" size: root.size onClicked: emojiModel.model = folder_utils } diff --git a/theme/CwtchDark.qml b/theme/CwtchDark.qml index 870ef8d..5587f4e 100644 --- a/theme/CwtchDark.qml +++ b/theme/CwtchDark.qml @@ -85,6 +85,8 @@ ThemeType { statusbarOnlineColor: mauvePurple statusbarOnlineFontColor: whitePurple + chatOverlayWarningTextColor: purple + messageFromMeBackgroundColor: mauvePurple messageFromMeTextColor: whitePurple messageFromOtherBackgroundColor: deepPurple diff --git a/theme/CwtchLight.qml b/theme/CwtchLight.qml index 2d2fddd..4324840 100644 --- a/theme/CwtchLight.qml +++ b/theme/CwtchLight.qml @@ -86,6 +86,8 @@ ThemeType { statusbarOnlineColor: darkPurple statusbarOnlineFontColor: whitePurple + chatOverlayWarningTextColor: purple + messageFromMeBackgroundColor: darkPurple messageFromMeTextColor: whitePurple messageFromOtherBackgroundColor: purple From feec7398b043344f71e7b6a50c378f5bba4cf098 Mon Sep 17 00:00:00 2001 From: erinn Date: Wed, 2 Dec 2020 16:02:00 -0800 Subject: [PATCH 2/3] add chatOverlayWarningTextColor to Theme --- theme/Theme.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/theme/Theme.qml b/theme/Theme.qml index 4422fcf..fc5a132 100644 --- a/theme/Theme.qml +++ b/theme/Theme.qml @@ -79,6 +79,7 @@ Item { readonly property color statusbarOnlineColor: theme.statusbarOnlineColor readonly property color statusbarOnlineFontColor: theme.statusbarOnlineFontColor + readonly property color chatOverlayWarningTextColor: theme.chatOverlayWarningTextColor readonly property color messageFromMeBackgroundColor: theme.messageFromMeBackgroundColor readonly property color messageFromMeTextColor: theme.messageFromMeTextColor readonly property color messageFromOtherBackgroundColor: theme.messageFromOtherBackgroundColor From 07a9fecf52f3fd1dc0e3a152f0c6541e5431fc23 Mon Sep 17 00:00:00 2001 From: erinn Date: Wed, 2 Dec 2020 16:03:52 -0800 Subject: [PATCH 3/3] add chatOverlayWarningTextColor to ThemeType --- theme/ThemeType.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/theme/ThemeType.qml b/theme/ThemeType.qml index 47d3c52..382081a 100644 --- a/theme/ThemeType.qml +++ b/theme/ThemeType.qml @@ -79,6 +79,7 @@ QtObject { property color statusbarOnlineColor: "red" property color statusbarOnlineFontColor: "red" + property color chatOverlayWarningTextColor: "red" property color messageFromMeBackgroundColor: "red" property color messageFromMeTextColor: "red" property color messageFromOtherBackgroundColor: "red"