From 1011d4a4f9a1f9f5295a4049e97001a1e6cb6a91 Mon Sep 17 00:00:00 2001
From: erinn <erinn.atwater@uwaterloo.ca>
Date: Mon, 29 Oct 2018 11:00:21 -0700
Subject: [PATCH] initial commit

---
 chatchannellistener.go         |   6 +-
 gcd.go                         |  24 ++++--
 main.go                        |  57 +++++++++-----
 qml/main.qml                   | 132 ++++++++++++++++++++++++++++++---
 qml/widgets/Contact.qml        |   5 +-
 qml/widgets/Contact.qmlc       | Bin 12296 -> 0 bytes
 qml/widgets/ContactList.qmlc   | Bin 7512 -> 0 bytes
 qml/widgets/ContactPicture.qml |   1 -
 qml/widgets/Message.qml        |  35 +++++++--
 qml/widgets/Message.qmlc       | Bin 8972 -> 0 bytes
 qml/widgets/MessageList.qml    |  32 +++++---
 qml/widgets/MessageList.qmlc   | Bin 18888 -> 0 bytes
 qml/widgets/MyProfile.qml      |  63 ++++++++++++----
 qml/widgets/MyProfile.qmlc     | Bin 18920 -> 21392 bytes
 qml/widgets/StackToolbar.qml   |  49 ++++++++++++
 15 files changed, 331 insertions(+), 73 deletions(-)
 delete mode 100644 qml/widgets/Contact.qmlc
 delete mode 100644 qml/widgets/ContactList.qmlc
 delete mode 100644 qml/widgets/Message.qmlc
 delete mode 100644 qml/widgets/MessageList.qmlc
 create mode 100644 qml/widgets/StackToolbar.qml

diff --git a/chatchannellistener.go b/chatchannellistener.go
index 50eb77c..dcaa873 100644
--- a/chatchannellistener.go
+++ b/chatchannellistener.go
@@ -32,7 +32,11 @@ func (this *ChatChannelListener) OpenInbound() {
 }
 
 func (this *ChatChannelListener) ChatMessage(messageID uint32, when time.Time, message string) bool {
-	DeliverMessageToUI(this.rai.RemoteHostname, message, uint(messageID), false, when)
+	DeliverMessageToUI(this.rai.RemoteHostname, this.rai.RemoteHostname, "", message, uint(messageID), false, when)
+	go func() {
+		time.Sleep(time.Second)
+		peer.Save()
+	}()
 	return true
 }
 
diff --git a/gcd.go b/gcd.go
index 3bd7c7c..f61dfe6 100644
--- a/gcd.go
+++ b/gcd.go
@@ -18,7 +18,7 @@ type GrandCentralDispatcher struct {
 	currentOpenConversation string
 
 	// messages pane stuff
-	_ func(from, message string, mID uint, ts string) `signal:"AppendMessage"`
+	_ func(from, message, displayname string, mID uint, ts, source string) `signal:"AppendMessage"`
 	_ func()                                          `signal:"ClearMessages"`
 	_ func()                                          `signal:"ResetMessagePane"`
 	_ func(uint)                                      `signal:"Acknowledged"`
@@ -78,7 +78,7 @@ func (this *GrandCentralDispatcher) sendMessage(message string, mID uint) {
 	default:
 	}
 
-	DeliverMessageToUI(gcd.currentOpenConversation, message, mID, true, time.Now())
+	DeliverMessageToUI(gcd.currentOpenConversation, gcd.currentOpenConversation, "", message,  mID, true, time.Now())
 }
 
 func (this *GrandCentralDispatcher) loadMessagesPane(onion string) {
@@ -86,15 +86,27 @@ func (this *GrandCentralDispatcher) loadMessagesPane(onion string) {
 	gcd.currentOpenConversation = onion
 	gcd.SetUnread(onion, 0)
 
-	if len(onion) == 32 { // eg 48e7dcfc353e6d77da2c31d63654fd19
+	if len(onion) == 32 { // LOAD GROUP
 		log.Printf("LOADING GROUP %s", onion)
 		tl := peer.GetGroup(onion).GetTimeline()
 		log.Printf("messages: %d", len(tl))
 		for i := range tl {
-			gcd.AppendMessage(tl[i].PeerID, tl[i].Message, 0, tl[i].Timestamp.Format(TIME_FORMAT))
+			var handle string
+			if tl[i].PeerID == peer.GetProfile().Onion {
+				handle = "me"
+			} else {
+				handle = tl[i].PeerID
+			}
+			var name string
+			var exists bool
+			name, exists = peer.GetProfile().GetCustomAttribute(tl[i].PeerID + "_name")
+			if !exists || name == "" {
+				name = tl[i].PeerID[:16] + "..."
+			}
+			gcd.AppendMessage(handle, tl[i].Message, name, 0, tl[i].Timestamp.Format(TIME_FORMAT), randomProfileImage(tl[i].PeerID))
 		}
 		return
-	}
+	} // ELSE LOAD CONTACT
 
 	_, exists := contactMgr[onion]
 	if exists { // (if not, they haven't been accepted as a contact yet)
@@ -106,7 +118,7 @@ func (this *GrandCentralDispatcher) loadMessagesPane(onion string) {
 			if messages[i].FromMe {
 				from = "me"
 			}
-			gcd.AppendMessage(from, messages[i].Message, messages[i].MessageID, messages[i].Timestamp.Format(TIME_FORMAT))
+			gcd.AppendMessage(from, messages[i].Message, "", messages[i].MessageID, messages[i].Timestamp.Format(TIME_FORMAT), randomProfileImage(onion))
 		}
 	}
 }
diff --git a/main.go b/main.go
index 26b0e54..aaa27ba 100644
--- a/main.go
+++ b/main.go
@@ -52,21 +52,21 @@ type Message struct {
 	Timestamp     time.Time
 }
 
-func DeliverMessageToUI(from, message string, mID uint, fromMe bool, ts time.Time) {
-	_, found := contactMgr[from]
+func DeliverMessageToUI(handle, from, displayname, message string, mID uint, fromMe bool, ts time.Time) {
+	_, found := contactMgr[handle]
 	if !found {
-		contactMgr[from] = &Contact{[]Message{}, 0, 0}
+		contactMgr[handle] = &Contact{[]Message{}, 0, 0}
 	}
 
-	contactMgr[from].AddMessage(Message{from, message, fromMe, mID, ts})
-	if gcd.currentOpenConversation == from {
+	contactMgr[handle].AddMessage(Message{from, message, fromMe, mID, ts})
+	if gcd.currentOpenConversation == handle {
 		if fromMe {
 			from = "me"
 		}
-		gcd.AppendMessage(from, message, mID, ts.Format(TIME_FORMAT))
+		gcd.AppendMessage(from, message, displayname, mID, ts.Format(TIME_FORMAT), randomProfileImage(from))
 	} else {
-		contactMgr[from].Unread++
-		gcd.SetUnread(from, contactMgr[from].Unread)
+		contactMgr[handle].Unread++
+		gcd.SetUnread(handle, contactMgr[handle].Unread)
 	}
 }
 
@@ -83,7 +83,9 @@ func main() {
 	quickcontrols2.QQuickStyle_SetStyle("Universe")
 	view := quick.NewQQuickView(nil)
 	view.SetResizeMode(quick.QQuickView__SizeRootObjectToView)
-	view.SetTitle("bounce")
+	view.SetMinimumHeight(280)
+	view.SetMinimumWidth(300)
+	view.SetTitle("cwtch")
 	gcd = NewGrandCentralDispatcher(nil)
 	view.RootContext().SetContextProperty("gcd", gcd)
 
@@ -113,11 +115,12 @@ func groupPoller() {
 		groups := peer.GetGroups()
 		for i := range groups {
 			group := peer.GetGroup(groups[i])
-			log.Printf("setting group %s to status %d", groups[i], int(servers[group.GroupServer]))
+			//log.Printf("setting group %s to status %d", groups[i], int(servers[group.GroupServer]))
 			gcd.SetConnectionStatus(groups[i], int(servers[group.GroupServer]))
 		}
 	}
 }
+
 func presencePoller() { // TODO: make this subscribe-able in ricochet
 	time.Sleep(time.Second * 4)
 	for {
@@ -181,8 +184,22 @@ func torStatusPoller() {
 func cwtchListener(groupID string, channel chan model.Message) {
 	for {
 		m := <-channel
-		log.Printf("GROUPMSG %s", m.Message)
-		DeliverMessageToUI(groupID, m.Message, 0, m.PeerID == peer.GetProfile().Onion, m.Timestamp)
+		log.Printf("GROUPMSG %s %s", m.Message, m.PeerID)
+		name := m.PeerID
+		if name == peer.GetProfile().Onion {
+			name = "me"
+		} else {
+			var exists bool // lol this is a golang antifeature
+			name, exists = peer.GetProfile().GetCustomAttribute(m.PeerID + "_name")
+			if !exists  {
+				name = ""
+			}
+		}
+		if name == "" {
+			name = m.PeerID[:16] + "..."
+		}
+		DeliverMessageToUI(groupID, m.PeerID, name, m.Message, 0, m.PeerID == peer.GetProfile().Onion, m.Timestamp)
+		peer.Save()
 	}
 }
 
@@ -225,19 +242,20 @@ func andHisBlackAndWhiteCat(incomingMessages chan Message) {
 }
 
 func initialize(view *quick.QQuickView) {
+	log.Printf(os.Args[0])
 	//TODO: this section is ported over and has a lot of printf errors, need to show them in the ui
 	var dirname, filename string
-	if os.Getenv("SENDAFRIEND_FOLDER") != "" {
-		dirname = os.Getenv("SENDAFRIEND_FOLDER")
-		filename = path.Join(dirname, "identity.private")
+	if os.Getenv("CWTCH_FOLDER") != "" {
+		dirname = os.Getenv("CWTCH_FOLDER")
+		filename = path.Join(dirname, "keep-this-file-private")
 	} else {
 		usr, err := user.Current()
 		if err != nil {
 			fmt.Printf("\nerror: could not load current user: %v\n", err)
 			os.Exit(1)
 		}
-		dirname = path.Join(usr.HomeDir, ".sendafriend")
-		filename = path.Join(dirname, "identity.private")
+		dirname = path.Join(usr.HomeDir, ".cwtch")
+		filename = path.Join(dirname, "keep-this-file-private")
 	}
 
 	os.MkdirAll(dirname, 0700)
@@ -293,6 +311,11 @@ func initialize(view *quick.QQuickView) {
 
 // temporary until we do real picture selection
 func randomProfileImage(onion string) string {
+	//TODO: this is a hack, fix ever passing this in
+	if onion == "me" {
+		onion = peer.GetProfile().Onion
+	}
+
 	choices := []string{"001-centaur", "002-kraken", "003-dinosaur", "004-tree-1", "005-hand", "006-echidna", "007-robot", "008-mushroom", "009-harpy", "010-phoenix", "011-dragon-1", "012-devil", "013-troll", "014-alien", "015-minotaur", "016-madre-monte", "017-satyr", "018-karakasakozou", "019-pirate", "020-werewolf", "021-scarecrow", "022-valkyrie", "023-curupira", "024-loch-ness-monster", "025-tree", "026-cerberus", "027-gryphon", "028-mermaid", "029-vampire", "030-goblin", "031-yeti", "032-leprechaun", "033-medusa", "034-chimera", "035-elf", "036-hydra", "037-cyclops", "038-pegasus", "039-narwhal", "040-woodcutter", "041-zombie", "042-dragon", "043-frankenstein", "044-witch", "045-fairy", "046-genie", "047-pinocchio", "048-ghost", "049-wizard", "050-unicorn"}
 	barr, err := base32.StdEncoding.DecodeString(strings.ToUpper(onion))
 	if err != nil || len(barr) != 35 {
diff --git a/qml/main.qml b/qml/main.qml
index 1c05f56..3925599 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -8,17 +8,18 @@ import "fonts/Twemoji.js" as T
 import "widgets"
 
 Item {
+	id: windowItem
 	width: 525
 	height: 500
-	id: root
 
+	readonly property real ratio: height / width
 
-	FontAwesome {
+	FontAwesome { // PRETTY BUTTON ICONS
 		id: awesome
 		resource: "qrc:/qml/fonts/fontawesome.ttf"
 	}
 
-	function parse(text, size) {
+	function parse(text, size) { // REPLACE EMOJI WITH <IMG> TAGS
 		T.twemoji.base = "qrc:/qml/fonts/twemoji/"
 		T.twemoji.ext = ".png"
 		T.twemoji.size = "72x72"
@@ -26,7 +27,7 @@ Item {
 		return T.twemoji.parse(text)
 	}
 
-	function restoreEmoji(text) {
+	function restoreEmoji(text) { // REPLACE <IMG> TAGS WITH EMOJI
 		var re = /<img src="qrc:\/qml\/fonts\/twemoji\/72x72\/([^"]*?)\.png" width="10" height="10" \/>/g
 		var arr
 		var newtext = text
@@ -42,7 +43,57 @@ Item {
 	}
 
 
-	RowLayout {
+	/* Rectangle { // THE TOOLBAR
+		id: toolbar
+		anchors.top: parent.top
+		anchors.left: parent.left
+		width: ratio >= 0.92 ? parent.width : 70
+		height: ratio >= 0.92 ? 70 : parent.height
+		color: "#4B3557"
+
+		GridLayout {
+			width: parent.width
+			height: parent.height
+			columns: ratio >= 0.92 ? children.length : 1
+
+
+			ContactPicture {
+				Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+				source: "qrc:/qml/images/profiles/001-centaur.png"
+				status: -2
+			}
+
+			ContactPicture {
+				Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+				source: "qrc:/qml/images/profiles/002-kraken.png"
+				status: -2
+			}
+
+			ContactPicture {
+				Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+				source: "qrc:/qml/images/profiles/003-dinosaur.png"
+				status: -2
+			}
+
+			ContactPicture {
+				Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+				source: "qrc:/qml/images/profiles/004-tree-1.png"
+				status: -2
+			}
+
+			ContactPicture {
+				Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+				source: "qrc:/qml/images/profiles/005-hand.png"
+				status: -2
+			}
+		}
+	}*/
+
+	RowLayout { // CONTAINS EVERYTHING EXCEPT THE TOOLBAR
+		/* anchors.left: ratio >= 0.92 ? parent.left : toolbar.right
+		anchors.top: ratio >= 0.92 ? toolbar.bottom : parent.top
+		anchors.right: parent.right
+		anchors.bottom: parent.bottom */
 		anchors.fill: parent
 		spacing: 0
 
@@ -50,8 +101,9 @@ Item {
 		Rectangle { // THE LEFT PANE WITH TOOLS AND CONTACTS
 			color: "#D2C0DD"
 			Layout.fillHeight: true
-			Layout.minimumWidth: 200
-			Layout.maximumWidth: 200
+			Layout.minimumWidth: Layout.maximumWidth
+			Layout.maximumWidth: theStack.pane == theStack.emptyPane ? parent.width : 200
+			visible: (ratio <= 1.08 && windowItem.width >= 500) || theStack.pane == theStack.emptyPane
 
 
 			ContactList{
@@ -59,21 +111,79 @@ Item {
 			}
 		}
 
-		Rectangle { // THE RIGHT PANE WHERE THE MESSAGES GO
+		Rectangle { // THE RIGHT PANE WHERE THE MESSAGES AND STuFF GO
 			color: "#EEEEFF"
 			Layout.fillWidth: true
 			Layout.fillHeight: true
 
 
-			MessageList{
+			StackLayout {
+				id: theStack
 				anchors.fill: parent
+				currentIndex: 0
+
+				property alias pane: theStack.currentIndex
+				readonly property int emptyPane: 0
+				readonly property int messagePane: 1
+				readonly property int settingsPane: 2
+				readonly property int userProfilePane: 3
+				readonly property int groupProfilePane: 4
+
+
+				Item {} // empty
+
+				MessageList { // messagePane
+					anchors.fill: parent
+				}
+
+				ColumnLayout { // settingsPane
+					anchors.fill: parent
+
+
+					StackToolbar {
+						text: "Cwtch Settings"
+						aux.visible: false
+					}
+
+					Label { text: "welcome to the global app settings page!" }
+				}
+
+				ColumnLayout { // userProfilePane
+					anchors.fill: parent
+
+
+					StackToolbar {
+						text: "Settings for Sarah"
+						aux.visible: false
+
+						back.onClicked: theStack.pane = theStack.messagePane
+					}
+
+					Label { text: "per-user things like contact name and picture will be edited here" }
+				}
+
+				Label { // groupProfilePane
+					font.pixelSize: 12
+					text: "invite new people or change the group name here"
+
+
+					StackToolbar { text: "Group settings" }
+				}
+
+				Label { // addGroupPane
+					font.pixelSize: 12
+					text: "add a new group"
+
+
+					StackToolbar { text: "Create group" }
+				}
 			}
 		}
 	}
 
 	PropertyAnimation { id: anmPopup; easing.type: Easing.InQuart; duration: 7000; target: popup; property: "opacity"; to: 0; }
 
-	Rectangle {
+	Rectangle { // THE ERROR MESSAGE POPUP
 		id: popup
 		anchors.top: parent.top
 		anchors.horizontalCenter: parent.horizontalCenter
@@ -96,7 +206,7 @@ Item {
 	}
 
 
-	Connections {
+	Connections { // POPUPS ARE INVOKED BY GO FUNCS
 		target: gcd
 
 		onInvokePopup: function(str) {
diff --git a/qml/widgets/Contact.qml b/qml/widgets/Contact.qml
index 4bebd3e..f94f5a4 100644
--- a/qml/widgets/Contact.qml
+++ b/qml/widgets/Contact.qml
@@ -57,7 +57,7 @@ RowLayout { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
 				id: rectUnread
 				anchors.right: parent.right
 				height: 16
-				width: childrenRect.width + 10
+				width: lblUnread.width + 10
 				radius: 8
 				color: "#4B3557"
 				visible: badge != "0"
@@ -65,6 +65,7 @@ RowLayout { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
 
 
 				Label {
+					id: lblUnread
 					anchors.verticalCenter: parent.verticalCenter
 					anchors.horizontalCenter: parent.horizontalCenter
 					color: "#FFFFFF"
@@ -82,6 +83,7 @@ RowLayout { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
 		onClicked: {
 			gcd.broadcast("ResetMessagePane")
 			isActive = true
+			theStack.pane = theStack.messagePane
 			gcd.loadMessagesPane(onion)
 		}
 
@@ -108,7 +110,6 @@ RowLayout { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
 		}
 
 		onSetConnectionStatus: function(foronion, x) {
-			if (foronion.length == 32) console.log(onion+" setting status "+x+" for contact "+foronion)
 			if (onion == foronion) {
 				status = x
 			}
diff --git a/qml/widgets/Contact.qmlc b/qml/widgets/Contact.qmlc
deleted file mode 100644
index a383a2648fc3556c1362fd72bccf97500cd7a2d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12296
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
F{{!tN{7(P?

diff --git a/qml/widgets/ContactList.qmlc b/qml/widgets/ContactList.qmlc
deleted file mode 100644
index 827f82249e3c665f411c6b97b1cdadd95d0439c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7512
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
M-;v7qO})naADK-he*gdg

diff --git a/qml/widgets/ContactPicture.qml b/qml/widgets/ContactPicture.qml
index eb37934..f158872 100644
--- a/qml/widgets/ContactPicture.qml
+++ b/qml/widgets/ContactPicture.qml
@@ -9,7 +9,6 @@ Item {
 	id: imgProfile
 	implicitWidth: 48
 	implicitHeight: 48
-	anchors.left: parent.left
 	anchors.margins: 5
 
 	property alias source: img.source
diff --git a/qml/widgets/Message.qml b/qml/widgets/Message.qml
index 2836270..d954c18 100644
--- a/qml/widgets/Message.qml
+++ b/qml/widgets/Message.qml
@@ -8,12 +8,18 @@ import "controls" as Awesome
 
 RowLayout {
 	id: root
-	Layout.alignment: from == "me" ? Qt.AlignRight : Qt.AlignLeft
+	//Layout.alignment: from == "me" ? Qt.AlignRight : Qt.AlignLeft
+	anchors.left: from == "me" ? undefined : parent.left
+	anchors.right: from == "me" ? parent.right : undefined
+	height: Math.max(imgProfile.height, rectMessageBubble.height)
 
 	property alias message: lbl.text
 	property string from
+	property string displayname
 	property int messageID
 	property alias timestamp: ts.text
+	property alias source: imgProfile.source
+	property alias status: imgProfile.status
 
 
 	Connections {
@@ -27,15 +33,22 @@ RowLayout {
 	}
 
 
+	ContactPicture {
+		id: imgProfile
+		anchors.left: parent.left
+		visible: from != "me"
+	}
+
 	Rectangle { // THIS IS JUST A PRETTY MESSAGE-HOLDING RECTANGLE
-		height: childrenRect.height + 3
-		width: childrenRect.width + 6
+		id: rectMessageBubble
+		height: lbl.height + ts.height + 4
+		width: colMessageBubble.width + 6
 		color: from == "me" ? "#B09CBC" : "#4B3557"
 		radius: 5
 
 		// the console will complain constantly about me setting these anchors, but qt only allows margins if they've been set to something
 		// a kludge to fix this would be to have spacers before/after and set the widths according to the side they're on ^ea
-		anchors.left: from == "me" ? undefined : parent.left
+		anchors.left: from == "me" ? undefined : imgProfile.right //parent.left
 		anchors.right: from == "me" ? parent.right : undefined
 		anchors.leftMargin: 5
 		anchors.rightMargin: 9
@@ -43,6 +56,9 @@ RowLayout {
 
 
 		ColumnLayout {
+			id: colMessageBubble
+
+
 			Column { // combine these into one element or else childrenRect won't play nicely
 				TextEdit { // this is used as a helper to calculate the message box width
 					id: dummy
@@ -63,18 +79,19 @@ RowLayout {
 					font.pixelSize: 12
 					selectByMouse: true
 					readOnly: true
-					width: dummy.width > root.parent.width - 70 ? root.parent.width - 70 : dummy.width
+					width: Math.min(dummy.width, root.parent.width - (imgProfile.visible ? imgProfile.width : 0) - 40)
 					wrapMode: TextEdit.Wrap
 					textFormat: Text.RichText
 				}
 			}
 
 			RowLayout {
+				id: rowBottom
 				anchors.left: parent.left
 				anchors.right: parent.right
 
 
-				Label {
+				Label { // TIMESTAMP
 					id: ts
 					color: "#FFFFFF"
 					font.pixelSize: 10
@@ -82,13 +99,15 @@ RowLayout {
 					leftPadding: 10
 				}
 
-				Label {
+				Label { text: dummy.width+", "+root.width }
+
+				Label { // MESSAGE ACKNOWLEDGMENT
 					id: ack
 					color: "#FFFFFF"
 					font.pixelSize: 10
 					anchors.right: parent.right
 					font.family: "FontAwesome"
-					text: from == "me" ? awesome.icons.fa_ellipsis_h : ""
+					text: from == "me" ? awesome.icons.fa_ellipsis_h : displayname
 				}
 			}
 		}
diff --git a/qml/widgets/Message.qmlc b/qml/widgets/Message.qmlc
deleted file mode 100644
index a38dd1a341198471bedc7d7da3b3031c45572556..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8972
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
R9?qNYpq-1W%P<Ur{s(eCiO&E4

diff --git a/qml/widgets/MessageList.qml b/qml/widgets/MessageList.qml
index f2f703a..0925827 100644
--- a/qml/widgets/MessageList.qml
+++ b/qml/widgets/MessageList.qml
@@ -11,7 +11,13 @@ ColumnLayout {
 	Layout.fillWidth: true
 
 
-	Flickable {
+	StackToolbar {
+		text: "Sarah Jamie Lewis"
+
+		aux.onClicked: theStack.pane = theStack.userProfilePane
+	}
+
+	Flickable { // THE MESSAGE LIST ITSELF
 		id: sv
 		clip: true
 		Layout.alignment: Qt.AlignLeft | Qt.AlignTop
@@ -32,12 +38,14 @@ ColumnLayout {
 				messagesModel.clear()
 			}
 
-			onAppendMessage: function(from, message, mid, ts) {
+			onAppendMessage: function(from, message, displayname, mid, ts, source) {
 				messagesModel.append({
 					"f": from,
 					"m": parse(message, 12),
+					"d": displayname,
 					"i": mid,
-					"t": ts
+					"t": ts,
+					"src": source
 				})
 
 				if (sv.contentY + sv.height >= sv.contentHeight - colMessages.height && sv.contentHeight > sv.height) {
@@ -67,8 +75,10 @@ ColumnLayout {
 				delegate: Message {
 					from: f
 					message: m
+					displayname: d
 					messageID: i
 					timestamp: t
+					source: src
 				}
 			}
 		}
@@ -98,9 +108,7 @@ ColumnLayout {
 				maximumFlickVelocity: 300
 
 
-				ScrollBar.vertical: ScrollBar{
-					policy: ScrollBar.AlwaysOn
-				}
+				ScrollBar.vertical: ScrollBar{}
 
 				TextEdit {
 					id: txtMessage
@@ -116,7 +124,7 @@ ColumnLayout {
 
 					Keys.onReturnPressed: { // CTRL+ENTER = LINEBREAK
 						if (event.modifiers & Qt.ControlModifier) {
-							txtMessage.insert(txtMessage.cursorPosition, "\n")
+							txtMessage.insert(txtMessage.cursorPosition, "<br>")
 						} else if (event.modifiers == Qt.NoModifier) {
 							btnSend.clicked()
 						}
@@ -126,7 +134,7 @@ ColumnLayout {
 					// while also stripping any other tag, including other images.
 					// TODO: this probably breaks if people actually do want to paste html
 					onTextChanged: {
-						console.log("onTextChanged()")
+						//console.log("onTextChanged()")
 
 						// we're taking advantage of TextEdit.getText()'s parsing capability, which means occasionally
 						// passing text into it to be filtered. this prevents recursive calls putting us into an
@@ -137,7 +145,7 @@ ColumnLayout {
 							return
 						}
 
-						console.log("1: " + txtMessage.getText(0, txtMessage.text.length))
+						//console.log("1: " + txtMessage.getText(0, txtMessage.text.length))
 
 						// convert <img> tags back to their emoji form
 						var nt = restoreEmoji(txtMessage.text)
@@ -146,15 +154,15 @@ ColumnLayout {
 							txtMessage.text = nt
 						}
 
-						console.log("2: " + txtMessage.getText(0, txtMessage.text.length))
+						//console.log("2: " + txtMessage.getText(0, txtMessage.text.length))
 
 						// strip all HTML tags
 						var theText = txtMessage.getText(0, txtMessage.text.length)
-						console.log("3: " + theText)
+						//console.log("3: " + theText)
 
 						// convert emoji back to <img> tags
 						nt = parse(theText, 10)
-						console.log("4: " + nt)
+						//console.log("4: " + nt)
 
 						// if there were changes...
 						if (nt != txtMessage.getText(0, txtMessage.text.length)) {
diff --git a/qml/widgets/MessageList.qmlc b/qml/widgets/MessageList.qmlc
deleted file mode 100644
index deb16e43cbe9e9e8617a51e209f6fc37e696b2fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18888
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

diff --git a/qml/widgets/MyProfile.qml b/qml/widgets/MyProfile.qml
index e832e36..2e74c04 100644
--- a/qml/widgets/MyProfile.qml
+++ b/qml/widgets/MyProfile.qml
@@ -2,6 +2,7 @@ import QtGraphicalEffects 1.0
 import QtQuick 2.7
 import QtQuick.Controls 2.4
 import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 
 ColumnLayout {
@@ -10,8 +11,8 @@ ColumnLayout {
 	width: parent.width
 
 	property alias image: imgProfileImg.source
-	property alias nick: lblNick.text
-	property alias onion: lblOnion.text
+	property string nick
+	property string onion
 
 
 	Item{ height: 6 }
@@ -93,23 +94,56 @@ ColumnLayout {
 		}
 	}
 
-	InplaceEditText { // USER NICKNAME
-		id: lblNick
-		anchors.horizontalCenter: parent.horizontalCenter
-		width: parent.width
+	//InplaceEditText { // USER NICKNAME
+	//	id: lblNick
+	//	anchors.horizontalCenter: parent.horizontalCenter
+	//	width: parent.width
+	//
+	//	onUpdated: {
+	//		gcd.updateNick(lblNick.text)
+	//	}
+	//}
 
-		onUpdated: {
-			gcd.updateNick(lblNick.text)
+	Text {
+		id: txtNick
+		fontSizeMode: Text.HorizontalFit
+		minimumPixelSize: 10
+		font.pixelSize: 20
+		width: 195
+		anchors.horizontalCenter: parent.horizontalCenter
+		text: cbNick.editText
+
+		MouseArea {
+			anchors.fill: parent
+			onClicked: {
+				parent.visible = false
+				cbNick.visible = true
+			}
+		}
+	}
+
+	ComboBox { // USER NICKNAME
+		id: cbNick
+		anchors.horizontalCenter: parent.horizontalCenter
+		popup.font.pixelSize: 12
+		width: 200
+		font.pixelSize: 20
+		model: ["erinn", "erinn (open privacy)", "supergirl", "add new profile..."]
+		visible: false
+
+		onCurrentTextChanged: {
+			visible = false
+			txtNick.visible = true
 		}
 	}
 
-	// TODO: this doesnt quite fit everything :{
 	Label { // ONION ADDRESS
 		id: lblOnion
 		font.pixelSize: 6
 		Layout.fillWidth: true
 		padding: 3
 		horizontalAlignment: Text.AlignHCenter
+		text: "This is your address. You can give it out to people!\n" + onion
 	}
 
 	RowLayout { // TOOLS FOR EDITING PROFILE
@@ -121,7 +155,7 @@ ColumnLayout {
 			visible: false
 		}
 
-		IconButton {
+		IconButton { // COPY ONION ADDRESS BUTTON
 			icon: awesome.icons.fa_clipboard
 			label: "copy"
 
@@ -133,20 +167,19 @@ ColumnLayout {
 			}
 		}
 
-		IconButton {
+		IconButton { // SETTINGS BUTTON
 			icon: awesome.icons.fa_cog
 			//label: "settings"
 
-			onClicked: gcd.popup("not yet implemented, sorry :(")
+			onClicked: theStack.pane = theStack.settingsPane
 		}
 
-		IconButton {
+		IconButton { // SIGN OUT BUTTON
 			icon: awesome.icons.fa_sign_out
 			//label: "sign out"
 
 			onClicked: {
 				gcd.popup("not yet implemented, sorry :(")
-				console.log(parse("💜", 20))
 			}
 		}
 	}
@@ -199,7 +232,7 @@ ColumnLayout {
 
 		onUpdateMyProfile: function(_nick, _onion, _image) {
 			nick = _nick
-			onion = "This is your address. You should give it out to people!\n" + _onion
+			onion = _onion
 			image = _image
 		}
 
diff --git a/qml/widgets/MyProfile.qmlc b/qml/widgets/MyProfile.qmlc
index acefdcfe4b213b6b1aec9a71a5caa52f6c32dba6..da21d08616f7c8427c465541bf5798bb26ea748d 100644
GIT binary patch
literal 21392
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

literal 18920
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

diff --git a/qml/widgets/StackToolbar.qml b/qml/widgets/StackToolbar.qml
new file mode 100644
index 0000000..4ae957d
--- /dev/null
+++ b/qml/widgets/StackToolbar.qml
@@ -0,0 +1,49 @@
+import QtGraphicalEffects 1.0
+import QtQuick 2.7
+import QtQuick.Controls 2.4
+import QtQuick.Controls.Material 2.0
+import QtQuick.Layouts 1.3
+
+import "controls" as Awesome
+import "../fonts/Twemoji.js" as T
+
+Rectangle { // OVERHEAD BAR ON STACK PANE
+	id: toolbar
+	anchors.left: parent.left
+	anchors.right: parent.right
+	anchors.top: parent.top
+	height: 28
+	color: "#EDEDED"
+
+	property alias text: lbl.text
+	property alias aux: btnAux
+	property alias back: btnBack
+
+
+	IconButton {// BACK BUTTON
+		id: btnBack
+		icon: awesome.icons.fa_arrow_circle_o_left
+		anchors.left: parent.left
+		anchors.verticalCenter: parent.verticalCenter
+		anchors.leftMargin: 6
+		visible: ratio >= 1.08 || windowItem.width < 500
+
+		onClicked: theStack.pane = theStack.emptyPane
+	}
+
+	Label { // TEXT
+		id: lbl
+		font.pixelSize: 16
+		text: "Sarah Jamie Lewis"
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.verticalCenter: parent.verticalCenter
+	}
+
+	IconButton { // COG BUTTON
+		id: btnAux
+		anchors.verticalCenter: parent.verticalCenter
+		anchors.right: parent.right
+		anchors.rightMargin: 6
+		icon: awesome.icons.fa_cog
+	}
+}
\ No newline at end of file