Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-08 06:32:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'qml_app_ui_improvements' into GSoC2017-evaluation-II

Browse source
This commit is contained in:
Angela Mazzurco 2017-08-03 16:48:47 +02:00
commit c790a5bff4
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-qml-app/src/ChatView.qml
View file

@ -257,6 +257,7 @@ Item
} }
function reset () function reset ()
{ {
msgField.text = ""
Qt.inputMethod.reset() Qt.inputMethod.reset()
} }
} }
@ -362,13 +363,13 @@ Item
{ {
if (emojiPicker.state == "EMOJI_SHOWN") emojiPicker.state = "EMOJI_HIDDEN" if (emojiPicker.state == "EMOJI_SHOWN") emojiPicker.state = "EMOJI_HIDDEN"
var msgText = getCompleteMessageText() msgField.text = getCompleteMessageText () + " " // Needed to prevent pre edit text problems
var msgText = msgField.text
var jsonData = {"chat_id":chatView.chatId, "msg":msgText} var jsonData = {"chat_id":chatView.chatId, "msg":msgText}
rsApi.request( "/chat/send_message", JSON.stringify(jsonData), rsApi.request( "/chat/send_message", JSON.stringify(jsonData),
function(par) function(par)
{ {
msgField.text = ""
msgField.reset(); msgField.reset();
}) })
} }

3
retroshare-qml-app/src/Locations.qml
View file

@ -145,7 +145,7 @@ Item
{ {
id: delegate id: delegate
width: parent.width width: parent.width
height: locationButton.height + 5 height: 60
Rectangle Rectangle
{ {
id: backgroundRectangle id: backgroundRectangle
@ -171,6 +171,7 @@ Item
{ {
id: locationButton id: locationButton
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
text: model.name text: model.name
borderRadius:0 borderRadius:0
iconUrl: "/icons/edit-image-face-detect.svg" iconUrl: "/icons/edit-image-face-detect.svg"

1
retroshare-qml-app/src/components/AvatarOrColorHash.qml
View file

@ -136,6 +136,7 @@ Item
id: contactAvatar id: contactAvatar
anchors.fill: parent anchors.fill: parent
visible: compRoot.has_avatar visible: compRoot.has_avatar
fillMode: Image.PreserveAspectFit
} }
Faces Faces