From 2f176f50fae4ff06d9ab2e92b92acdf81b63e38c Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 13 Jan 2017 12:56:59 -0800
Subject: [PATCH] Another checkpoint

---
 interface/resources/fonts/hifi-glyphs.ttf     | Bin 24580 -> 24772 bytes
 interface/resources/qml/hifi/NameCard.qml     |  13 +++++++++----
 interface/resources/qml/hifi/Pal.qml          |  13 +++++++++++--
 .../qml/styles-uit/HifiConstants.qml          |   3 ++-
 libraries/avatars/src/AvatarData.cpp          |   1 +
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/interface/resources/fonts/hifi-glyphs.ttf b/interface/resources/fonts/hifi-glyphs.ttf
index 09aefffdfef007aa94f3cbdfd02a61612c0ee9e7..c139a196d0f70536b980d7cbbad81c416d237e0b 100644
GIT binary patch
delta 684
zcmX|;O-Phs5Xb-XywCf*>%Q(6$S&oZx@9eHv}!B62_*z(6xCL4;;xpy=;jLh1+Jh(
z>Y;-|hw`~Z*sVi>V9P>>2uv~|=n@!tkdO}2rArZH1jc^Qz|8y(GsFC6?!BS)HJSwh
zuwf1guJ-gqFHcTK2Z7;d0F3k9=X$UN0SwOrXo~c<o{YS{bRD360DU8AGuKI*hXD2n
zVE!?4BDcQ}1sI+KU>QqI-(GC(KMSZ&foL?DFh{Mi9}57s0fdst#H`8NXa}G=0L{sC
ze(Jz(-5NkI0PLo+Bj%l^hur{Q2e6Yir*il}w*Wd-S}0?t6W_wG`heJPfQq^7MBZ}$
z>nbp?4DgR-aRiK-7nX+{r+-0bDB0$dt&K`%TN{gXhO)AYZjwzd(Oz({T%rJFH_9_W
z%}~l@fRm*p4i;2~&Ft9ZI{QhP;!DLr@-6?&{QlySTIiisFo+nf&<boghBko0A&=YR
z*6d6RkR}{VXhI7GL*Y=ki^?GwAk7zcdxU0Zbi)wB<yBRs*2=9dM;IMksUcNWlz>y?
zVy4k%5F@MqxvQY7cFh^-AZZBA>D4M7hyAs@)MEA3Qw?Wa+-<ZQ#H`1+T?Jj(EzU@X
zyclco`LIw?2@W0atE@uD_bLnM<dTnLUf&gTmM+0-z~M%r$|~IWRAm7-_T+>3QK`kR
zDeVZ#SUkYmgK|DTDgVa3l$8ww+l*4hKLhU+yPg;w&!5O8G9%+DK&}ooP)2?ks@MPj
HXlvsiT0xGP

delta 494
zcmX|+Pe>GT6vsbrW_Gp4>>>-+5?hq(sSUw@U<G31WkY2pbSGU0U3Ud%UHk(^)J6zF
zhduP`rg-XDVQfbOr9X(F2T{667<7n`2*N-Rl-XT;@OYog_r3S|v?_Bel0$%VJVB@1
zvU=~%j70V!@e2rccHFU;#}A1$Ak-C$G;}RTdqDbtd&91i-TKzL4cbf4>Ql~C_V^eb
z5-UJuYW%_I)Aqmn;9G#$Qab63obA}G1$Kd^bUK-Hj2p5CQUhE~yVJ9^&udmemVlq*
z6T{BKQ0f90%fNTnna%Q520>c9hcb?v91A~s5B*Uulbx8F{?oob3GpK^J{IK!=6Zj0
zCeF7VU}|`^t*m@$YF7S*+?0&EB?D5W7UVF3Cs6EQF^^n9FH#Ug{GJ$<lombSt5R#)
zzrqK-TGWQIqe0=7?_EqC_Sc2$cvf0~fytLL`!M-kW<RD>D=U6E9HrGeVw}Msz}qtW
z2(VRVKLP%$+x9h8i1$dNs<5w1qiVKi)Ehe_8MSHe7GB@~tgGD6C2`f_&_(mq(#oFz
Dg<Es6

diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index 906e81a08d..250dad7f7f 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -65,6 +65,8 @@ Item {
             anchors.leftMargin: -10
             width: parent.width + 70
             height: 35
+            border.color: hifi.colors.blueHighlight
+            border.width: 0
             TextInput {
                 id: myDisplayNameText
                 // Properties
@@ -86,6 +88,8 @@ Item {
                 // Signals
                 onEditingFinished: {
                     pal.sendToScript({method: 'displayNameUpdate', params: text})
+                    focus = false
+                    myDisplayName.border.width = 0
                 }
             }
             MouseArea {
@@ -93,8 +97,9 @@ Item {
                 acceptedButtons: Qt.LeftButton
                 hoverEnabled: true
                 onClicked: {
+                    myDisplayName.border.width = 3
                     myDisplayNameText.focus ? myDisplayNameText.cursorPosition = myDisplayNameText.positionAt(mouseX, mouseY, TextInput.CursorOnCharacter) : myDisplayNameText.selectAll();
-                    myDisplayNameText.focus = true;
+                    myDisplayNameText.focus = true
                 }
                 onDoubleClicked: {
                     myDisplayNameText.selectAll();
@@ -106,12 +111,12 @@ Item {
             // Edit pencil glyph
             HiFiGlyphs {
                 id: editGlyph
-                text: hifi.glyphs.edit
+                text: hifi.glyphs.editPencil
                 // Size
-                size: thisNameCard.displayTextHeight
+                size: thisNameCard.displayTextHeight*1.5
                 // Anchors
                 anchors.right: parent.right
-                anchors.rightMargin: size/2
+                anchors.rightMargin: 5
                 anchors.verticalCenter: parent.verticalCenter
                 // Style
                 horizontalAlignment: Text.AlignHCenter
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 3438baa217..8fa8fe8514 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -35,6 +35,17 @@ Rectangle {
     // Keep a local list of per-avatar gainSliderValueDBs. Far faster than fetching this data from the server.
     // NOTE: if another script modifies the per-avatar gain, this value won't be accurate!
     property var gainSliderValueDB: ({});
+    
+    // The letterbox used for popup messages
+    LetterboxMessage {
+        id: letterboxMessage
+        z: 999 // Force the popup on top of everything else
+    }
+    function letterbox(message) {
+        letterboxMessage.text = message
+        letterboxMessage.visible = true
+        letterboxMessage.popupRadius = 0
+    }
 
     // This is the container for the PAL
     Rectangle {
@@ -176,8 +187,6 @@ Rectangle {
         TableViewColumn {
             visible: iAmAdmin
             role: "kick"
-            // The hacky spaces used to center text over the button, since I don't know how to apply a margin
-            // to column header text.
             title: "BAN"
             width: actionButtonWidth
             movable: false
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index 7eca1aa725..18bdd89799 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -312,10 +312,11 @@ Item {
         readonly property string error: "="
         readonly property string settings: "@"
         readonly property string trash: "{"
-        readonly property string objectGroup: "&#xe000;"
+        readonly property string objectGroup: "\ue000"
         readonly property string cm: "}"
         readonly property string msvg79: "~"
         readonly property string deg: "\\"
         readonly property string px: "|"
+        readonly property string editPencil: "\ue00d"
     }
 }
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index f8805d3fc4..0381363ef3 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -1094,6 +1094,7 @@ void AvatarData::setSkeletonModelURL(const QUrl& skeletonModelURL) {
 
 void AvatarData::setDisplayName(const QString& displayName) {
     _displayName = displayName;
+    DependencyManager::get<NodeList>()->killNodeWithUUID(getSessionUUID());
 
     qCDebug(avatars) << "Changing display name for avatar to" << displayName;
 }