Merge branch 'qml_app_ui_improvements' into GSoC2017-evaluation-II

retroshare-qml-app/src/ContactDetails.qml

@@ -40,7 +40,7 @@ Item
 		anchors.horizontalCenter: parent.horizontalCenter
 
 		buttonTextPixelSize: 14
-		iconUrl: "/icons/attach-image.svg"
+		iconUrl: (isOwn)? "/icons/attach-image.svg": "/icons/chat-bubble.svg"
 		borderRadius: 0
 
 

retroshare-qml-app/src/icons/chat-bubble.svg

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   xml:space="preserve"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="chat-bubble.svg"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath16"><path
+         d="M 0,64 64,64 64,0 0,0 0,64 Z"
+         id="path18"
+         inkscape:connector-curvature="0" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath28"><path
+         d="M 12,50 52,50 52,8 12,8 12,50 Z"
+         id="path30"
+         inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="5.9"
+     inkscape:cx="-34.290603"
+     inkscape:cy="29.334046"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10" /><g
+     id="g10"
+     inkscape:groupmode="layer"
+     inkscape:label="Elegant_circle-icons"
+     transform="matrix(1.25,0,0,-1.25,0,80)"><g
+       id="g26" /><path
+       inkscape:connector-curvature="0"
+       id="path22"
+       style="fill:#039bd5;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="M 64,32 C 64,14.327 49.673,0 32,0 14.327,0 0,14.327 0,32 0,49.673 14.327,64 32,64 49.673,64 64,49.673 64,32" /><g
+       id="use4160"
+       transform="translate(0,-1.9728814)"
+       style="fill:#000000;fill-opacity:0.15686275"><g
+         id="g4164"
+         transform="translate(49,35.2)"
+         style="fill:#000000;fill-opacity:0.15686275"><path
+           style="fill:#000000;fill-opacity:0.15686275;fill-rule:nonzero;stroke:none"
+           d="M 40 17.466797 C 26.1925 17.466797 15 27.540547 15 39.966797 C 15 51.933049 25.379902 61.713849 38.478516 62.421875 C 39.323921 66.895192 40 69.966797 40 69.966797 C 40 69.966797 46.28026 66.159283 52.013672 59.699219 C 59.752513 55.874654 65 48.473572 65 39.966797 C 65 27.540547 53.8075 17.466797 40 17.466797 z "
+           transform="matrix(0.8,0,0,-0.8,-49,30.772881)"
+           id="path4166" /></g><g
+         id="g4168"
+         transform="translate(52,34)"
+         style="fill:#000000;fill-opacity:0.15686275" /></g><g
+       id="g4154"><g
+         transform="translate(49,35.2)"
+         id="g40"><path
+           inkscape:connector-curvature="0"
+           id="path42"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c 0,-14.963 -17,-25.2 -17,-25.2 0,0 -9.389,42 0,42 C -7.611,16.8 0,9.278 0,0" /></g><g
+         transform="translate(52,34)"
+         id="g44"><path
+           inkscape:connector-curvature="0"
+           id="path46"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 0,0 c 0,-9.941 -8.954,-18 -20,-18 -11.046,0 -20,8.059 -20,18 0,9.941 8.954,18 20,18 C -8.954,18 0,9.941 0,0" /></g></g><g
+       id="g48"
+       transform="translate(34,34)"
+       style="fill:#036ea7;fill-opacity:1"><path
+         d="m 0,0 c 0,1.105 -0.895,2 -2,2 -1.105,0 -2,-0.895 -2,-2 0,-1.105 0.895,-2 2,-2 1.105,0 2,0.895 2,2"
+         style="fill:#036ea7;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path50"
+         inkscape:connector-curvature="0" /></g><g
+       id="g52"
+       transform="translate(42,34)"
+       style="fill:#036ea7;fill-opacity:1"><path
+         d="m 0,0 c 0,1.105 -0.895,2 -2,2 -1.105,0 -2,-0.895 -2,-2 0,-1.105 0.895,-2 2,-2 1.105,0 2,0.895 2,2"
+         style="fill:#036ea7;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path54"
+         inkscape:connector-curvature="0" /></g><g
+       id="g56"
+       transform="translate(26,34)"
+       style="fill:#036ea7;fill-opacity:1"><path
+         d="m 0,0 c 0,1.105 -0.895,2 -2,2 -1.105,0 -2,-0.895 -2,-2 0,-1.105 0.895,-2 2,-2 1.105,0 2,0.895 2,2"
+         style="fill:#036ea7;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path58"
+         inkscape:connector-curvature="0" /></g></g></svg>

retroshare-qml-app/src/qml.qrc

@@ -62,5 +62,6 @@
         <file>icons/leave.svg</file>
         <file>icons/paste.svg</file>
         <file>icons/share.svg</file>
+        <file>icons/chat-bubble.svg</file>
     </qresource>
 </RCC>