initial commit

qml/main.qml

@@ -158,7 +158,7 @@ Item {
 					Slider {
 						id: zoomSlider
 						from: 0.5
-						to: 1.6
+						to: 2.4
 					}
 
 					ScalingLabel {

qml/widgets/Contact.qml

@@ -8,6 +8,7 @@ import CustomQmlTypes 1.0
 RowLayout { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
 	anchors.left: parent.left
 	anchors.right: parent.right
+	visible: nick != ""
 
 	property alias nick: cn.text
 	property alias image: imgProfile.source

qml/widgets/Message.qml

@@ -27,7 +27,7 @@ RowLayout {
 
 		onAcknowledged: function(mid) {
 			if (mid == messageID) {
-				ack.text = awesome.icons.fa_check
+				ack.source = "qrc:/qml/images/fontawesome/regular/check-circle.svg"
 			}
 		}
 	}
@@ -103,13 +103,21 @@ RowLayout {
 					leftPadding: 10
 				}
 
-				Label { // MESSAGE ACKNOWLEDGMENT
-					id: ack
+				Label { // DISPLAY NAME FOR GROUPS
 					color: "#FFFFFF"
 					font.pixelSize: 10
 					anchors.right: parent.right
-					font.family: "FontAwesome"
-					text: from == "me" ? (awesome.loaded ? awesome.icons.fa_ellipsis_h : "") : displayname
+					text: displayname
+					visible: from != "me"
+				}
+
+				Image { // ACKNOWLEDGEMENT ICON
+					id: ack
+					anchors.right: parent.right
+					source: displayname == "" ? "qrc:/qml/images/fontawesome/regular/hourglass.svg" : "qrc:/qml/images/fontawesome/regular/check-circle.svg"
+					height: 10
+					sourceSize.height: 10
+					visible: from == "me"
 				}
 			}
 		}

qml/widgets/MessageList.qml

@@ -12,7 +12,7 @@ ColumnLayout {
 
 
 	StackToolbar {
-		text: "Sarah Jamie Lewis"
+		text: "open privacy exec"
 
 		aux.onClicked: theStack.pane = theStack.userProfilePane
 	}
@@ -87,9 +87,9 @@ ColumnLayout {
 	RowLayout { // THE BOTTOM DRAWER
 		Rectangle { // MESSAGE ENTRY TEXTFIELD
 			id: rectMessage
-			Layout.fillWidth: 40 * zoomSlider.value
+			Layout.fillWidth: true
 			Layout.minimumHeight: 40 * zoomSlider.value
-			//height: 40 * zoomSlider.value
+			Layout.maximumHeight: 40 * zoomSlider.value
 			color: "#EDEDED"
 			border.color: "#AAAAAA"
 			radius: 10
@@ -203,8 +203,10 @@ ColumnLayout {
 				id: btnSend
 				icon: "regular/paper-plane"
 				text: "send"
-				Layout.minimumWidth: btnEmoji.width + btnAttach.width + 1
-				Layout.maximumWidth: btnEmoji.width + btnAttach.width + 1
+				Layout.minimumWidth: btnEmoji.width + btnAttach.width + 2
+				Layout.maximumWidth: btnEmoji.width + btnAttach.width + 2
+				anchors.right: parent.right
+				anchors.rightMargin: 2
 
 				property int nextMessageID: 1
 
@@ -230,6 +232,8 @@ ColumnLayout {
 				SimpleButton { // EMOJI DRAWER BUTTON
 					id: btnEmoji
 					icon: "regular/smile"
+					anchors.right: btnAttach.left
+					anchors.rightMargin: 2
 
 					onClicked: gcd.popup("emoji not yet implemented, sorry")
 				}
@@ -237,6 +241,8 @@ ColumnLayout {
 				SimpleButton {
 					id: btnAttach
 					icon: "solid/paperclip"
+					anchors.right: parent.right
+					anchors.rightMargin: 2
 
 					onClicked: {
 						gcd.popup("attachments not yet implemented, sorry")

qml/widgets/StackToolbar.qml

@@ -12,7 +12,7 @@ Rectangle { // OVERHEAD BAR ON STACK PANE
 	anchors.left: parent.left
 	anchors.right: parent.right
 	anchors.top: parent.top
-	height: 20 * zoomSlider.value//btnAux.height + 4
+	height: 20 * zoomSlider.value + 4
 	Layout.minimumHeight: height
 	Layout.maximumHeight: height
 	color: "#EDEDED"
@@ -35,7 +35,7 @@ Rectangle { // OVERHEAD BAR ON STACK PANE
 
 	ScalingLabel { // TEXT
 		id: lbl
-		text: "Sarah Jamie Lewis"
+		text: "open privacy exec"
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.verticalCenter: parent.verticalCenter
 	}