From 0994cd97dc5767c9f1a3cf8abe3abacb47cfe6ab Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 7 Jul 2015 15:14:15 -0700
Subject: [PATCH] Rework header and add logo

Use HiFi logo as placeholder for now until Interface SVG is available.
---
 interface/resources/qml/UpdateDialog.qml | 44 ++++++++++++++----------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/interface/resources/qml/UpdateDialog.qml b/interface/resources/qml/UpdateDialog.qml
index 3f5036c6cc..2c5d1e74a9 100644
--- a/interface/resources/qml/UpdateDialog.qml
+++ b/interface/resources/qml/UpdateDialog.qml
@@ -26,14 +26,15 @@ DialogContainer {
         implicitWidth: backgroundRectangle.width
         implicitHeight: backgroundRectangle.height
         
-        readonly property int inputWidth: 500
-        readonly property int inputHeight: 60
+        readonly property int contentWidth: 500
+        readonly property int logoSize: 60
         readonly property int borderWidth: 30
         readonly property int closeMargin: 16
         readonly property int inputSpacing: 16
         readonly property int buttonWidth: 150
         readonly property int buttonHeight: 50
         readonly property int buttonRadius: 15
+        readonly property int noticeHeight: 15 * inputSpacing
 
         signal triggerBuildDownload
         signal closeUpdateDialog
@@ -42,8 +43,8 @@ DialogContainer {
             id: backgroundRectangle
             color: "#ffffff"
 
-            width: updateDialog.inputWidth + updateDialog.borderWidth * 2
-            height: updateDialog.inputHeight * 6 + updateDialog.closeMargin * 2
+            width: updateDialog.contentWidth + updateDialog.borderWidth * 2
+            height: mainContent.height + updateDialog.borderWidth * 2
 
             MouseArea {
                 width: parent.width
@@ -62,9 +63,20 @@ DialogContainer {
             }
         }
 
+        Image {
+            id: logo
+            source: "../images/hifi-logo.svg"
+            width: updateDialog.logoSize
+            height: updateDialog.logoSize
+            anchors {
+                top: mainContent.top
+                right: mainContent.right
+            }
+        }
+
         Column {
             id: mainContent
-            width: updateDialog.inputWidth
+            width: updateDialog.contentWidth
             spacing: updateDialog.inputSpacing
             anchors {
                 horizontalCenter: parent.horizontalCenter
@@ -72,36 +84,30 @@ DialogContainer {
             }
             
             Rectangle {
-                id: dialogTitle
-                width: updateDialog.inputWidth
-                height: updateDialog.inputHeight
+                id: header
+                width: parent.width - updateDialog.logoSize - updateDialog.inputSpacing
+                height: updateAvailable.height + versionDetails.height
 
                 Text {
-                    id: updateAvailableText
+                    id: updateAvailable
                     text: "Update Available"
-                    anchors {
-                        verticalCenter: parent.verticalCenter
-                        left: parent.left
-                        leftMargin: updateDialog.inputSpacing
-                    }
                 }
 
                 Text {
+                    id: versionDetails
                     text: updateDialog.updateAvailableDetails
                     font.pixelSize: 14
                     color: hifi.colors.text
                     anchors {
-                        verticalCenter: parent.verticalCenter
-                        left: updateAvailableText.right
-                        leftMargin: 13
+                        top: updateAvailable.bottom
                     }
                 }
             }
 
             ScrollView {
                 id: scrollArea
-                width: updateDialog.inputWidth
-                height: backgroundRectangle.height - (dialogTitle.height * 2.5) - updateDialog.closeMargin
+                width: parent.width
+                height: updateDialog.noticeHeight
                 horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
                 verticalScrollBarPolicy: Qt.ScrollBarAsNeeded