diff --git a/retroshare-qml-app/src/ChatBubbleDelegate.qml b/retroshare-qml-app/src/ChatBubbleDelegate.qml index c189242a5..49e2cf8b2 100644 --- a/retroshare-qml-app/src/ChatBubbleDelegate.qml +++ b/retroshare-qml-app/src/ChatBubbleDelegate.qml @@ -11,14 +11,7 @@ Item { height: bubble.height width: parent.width -// property int lMarginBubble: 10 -// property int rMarginBubble: 10 -// property int tMarginBubble: 5 -// property int bMarginBubble: 10 -// property int aditionalBubbleHeight: tMarginBubble * 2 -// property int aditionalBubbleWidth: 30 - - property var styles: StyleChatBubble + property var styles: StyleChat.bubble Rectangle { diff --git a/retroshare-qml-app/src/icons/send-message.svg b/retroshare-qml-app/src/icons/send-message.svg new file mode 100644 index 000000000..ebf98d78d --- /dev/null +++ b/retroshare-qml-app/src/icons/send-message.svg @@ -0,0 +1,67 @@ + +image/svg+xml \ No newline at end of file diff --git a/retroshare-qml-app/src/qmldir b/retroshare-qml-app/src/qmldir index 0b33cab43..7a42d0162 100644 --- a/retroshare-qml-app/src/qmldir +++ b/retroshare-qml-app/src/qmldir @@ -1,5 +1,5 @@ singleton TokensManager 1.0 TokensManager.qml singleton ClipboardWrapper 1.0 ClipboardWrapper.qml singleton ChatCache ChatCache.qml -singleton StyleChatBubble styles/ChatBubblesStyle.qml +singleton StyleChat styles/ChatBubblesStyle.qml diff --git a/retroshare-qml-app/src/styles/ChatBubblesStyle.qml b/retroshare-qml-app/src/styles/ChatBubblesStyle.qml index 8540bd2a9..1c07bfcf0 100644 --- a/retroshare-qml-app/src/styles/ChatBubblesStyle.qml +++ b/retroshare-qml-app/src/styles/ChatBubblesStyle.qml @@ -3,24 +3,27 @@ pragma Singleton QtObject { -// Bubble measures - readonly property int lMarginBubble: 10 - readonly property int rMarginBubble: 10 - readonly property int tMarginBubble: 5 - readonly property int bMarginBubble: 10 - readonly property int aditionalBubbleHeight: tMarginBubble * 2 - readonly property int aditionalBubbleWidth: 30 - readonly property real bubbleMaxWidth: 0.5 // % from parent + property QtObject bubble: QtObject{ + // Bubble measures + readonly property int lMarginBubble: 10 + readonly property int rMarginBubble: 10 + readonly property int tMarginBubble: 5 + readonly property int bMarginBubble: 10 + readonly property int aditionalBubbleHeight: tMarginBubble * 2 + readonly property int aditionalBubbleWidth: 30 + readonly property real bubbleMaxWidth: 0.5 // % from parent -// BubbleProps - readonly property int radius: 5 + // BubbleProps + readonly property int radius: 5 -// Colors - readonly property string colorIncoming: "lightGreen" - readonly property string colorOutgoing: "aliceblue" - readonly property string colorSenderName: "cornflowerblue" - readonly property string colorMessageTime: "grey" + // Colors + readonly property string colorIncoming: "lightGreen" + readonly property string colorOutgoing: "aliceblue" + readonly property string colorSenderName: "cornflowerblue" + readonly property string colorMessageTime: "grey" + + } }