openprivacy
/
opaque
3
0
Fork 0
Code Issues 3 Pull Requests 1 Releases Wiki Activity

add chatOverlayWarningTextColor

This commit is contained in:
erinn 2020-12-02 15:54:33 -08:00
parent e9f0bd2a5a
commit 837e753bf9
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
EmojiDrawer.qml
View File

@ -19,6 +19,7 @@ Item {
property string morph: "clw" property string morph: "clw"
property string color: "v1" property string color: "v1"
property bool narrowMode: width < (txtSearch.width + root.size * 14 + btnX.width) 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 picked(string shortcode)
signal slideopen() signal slideopen()
@ -76,15 +77,16 @@ Item {
visible: !root.narrowMode visible: !root.narrowMode
//: Expressions //: Expressions
tooltip: qsTr("emojicat-expressions") tooltip: qsTr("emojicat-expressions")
source: gcd.assetPath + "mutstd/smile.webp" source: catimgpath + "big_smile.webp"
size: root.size size: root.size
onClicked: emojiModel.model = folder_expressions onClicked: emojiModel.model = folder_expressions
} }
ImageButton { ImageButton {
visible: !root.narrowMode visible: !root.narrowMode
//: Activities //: Activities
tooltip: qsTr("emojicat-activities") tooltip: qsTr("emojicat-activities")
source: gcd.assetPath + "mutstd/artist_r1.webp" source: catimgpath + "volleyball.webp"
size: root.size size: root.size
onClicked: emojiModel.model = folder_activities_clothing onClicked: emojiModel.model = folder_activities_clothing
} }
@ -92,7 +94,7 @@ Item {
visible: !root.narrowMode visible: !root.narrowMode
//: Food, drink & herbs //: Food, drink & herbs
tooltip: qsTr("emojicat-food") tooltip: qsTr("emojicat-food")
source: gcd.assetPath + "mutstd/red_apple.webp" source: catimgpath + "red_apple.webp"
size: root.size size: root.size
onClicked: emojiModel.model = folder_food_drink_herbs onClicked: emojiModel.model = folder_food_drink_herbs
} }
@ -101,14 +103,14 @@ Item {
//: Gender, relationships & sexuality //: Gender, relationships & sexuality
tooltip: qsTr("emojicat-gender") tooltip: qsTr("emojicat-gender")
size: root.size size: root.size
source: gcd.assetPath + "mutstd/pride_100.webp" source: catimgpath + "transgender_symbol.webp"
onClicked: emojiModel.model = folder_gsr onClicked: emojiModel.model = folder_gsr
} }
ImageButton { ImageButton {
visible: !root.narrowMode visible: !root.narrowMode
//: Nature and effects //: Nature and effects
tooltip: qsTr("emojicat-nature") tooltip: qsTr("emojicat-nature")
source: gcd.assetPath + "mutstd/sun_behind_small_cloud.webp" source: catimgpath + "crescent.webp"
size: root.size size: root.size
onClicked: emojiModel.model = folder_nature onClicked: emojiModel.model = folder_nature
} }
@ -116,7 +118,7 @@ Item {
visible: !root.narrowMode visible: !root.narrowMode
//: Objects //: Objects
tooltip: qsTr("emojicat-objects") tooltip: qsTr("emojicat-objects")
source: gcd.assetPath + "mutstd/crystal_ball.webp" source: catimgpath + "ligh_bulb.webp"
size: root.size size: root.size
onClicked: emojiModel.model = folder_objects onClicked: emojiModel.model = folder_objects
} }
@ -124,7 +126,7 @@ Item {
visible: !root.narrowMode visible: !root.narrowMode
//: People and animals //: People and animals
tooltip: qsTr("emojicat-people") tooltip: qsTr("emojicat-people")
source: gcd.assetPath + "mutstd/crow.webp" source: catimgpath + "bear.webp"
size: root.size size: root.size
onClicked: emojiModel.model = folder_people onClicked: emojiModel.model = folder_people
} }
@ -132,7 +134,7 @@ Item {
visible: !root.narrowMode visible: !root.narrowMode
//: Symbols //: Symbols
tooltip: qsTr("emojicat-symbols") tooltip: qsTr("emojicat-symbols")
source: gcd.assetPath + "mutstd/purple_heart.webp" source: catimgpath + "pentacle.webp"
size: root.size size: root.size
onClicked: emojiModel.model = folder_symbols onClicked: emojiModel.model = folder_symbols
} }
@ -140,7 +142,7 @@ Item {
visible: !root.narrowMode visible: !root.narrowMode
//: Travel & places //: Travel & places
tooltip: qsTr("emojicat-travel") tooltip: qsTr("emojicat-travel")
source: gcd.assetPath + "mutstd/airplane.webp" source: catimgpath + "airplane.webp"
size: root.size size: root.size
onClicked: emojiModel.model = folder_travel_places onClicked: emojiModel.model = folder_travel_places
} }
@ -148,7 +150,7 @@ Item {
visible: !root.narrowMode visible: !root.narrowMode
//: Miscellaneous //: Miscellaneous
tooltip: qsTr("emojicat-misc") tooltip: qsTr("emojicat-misc")
source: gcd.assetPath + "mutstd/hash_char.webp" source: catimgpath + "hash.webp"
size: root.size size: root.size
onClicked: emojiModel.model = folder_utils onClicked: emojiModel.model = folder_utils
} }

2
theme/CwtchDark.qml
View File

@ -85,6 +85,8 @@ ThemeType {
statusbarOnlineColor: mauvePurple statusbarOnlineColor: mauvePurple
statusbarOnlineFontColor: whitePurple statusbarOnlineFontColor: whitePurple
chatOverlayWarningTextColor: purple
messageFromMeBackgroundColor: mauvePurple messageFromMeBackgroundColor: mauvePurple
messageFromMeTextColor: whitePurple messageFromMeTextColor: whitePurple
messageFromOtherBackgroundColor: deepPurple messageFromOtherBackgroundColor: deepPurple

2
theme/CwtchLight.qml
View File

@ -86,6 +86,8 @@ ThemeType {
statusbarOnlineColor: darkPurple statusbarOnlineColor: darkPurple
statusbarOnlineFontColor: whitePurple statusbarOnlineFontColor: whitePurple
chatOverlayWarningTextColor: purple
messageFromMeBackgroundColor: darkPurple messageFromMeBackgroundColor: darkPurple
messageFromMeTextColor: whitePurple messageFromMeTextColor: whitePurple
messageFromOtherBackgroundColor: purple messageFromOtherBackgroundColor: purple