load `TaskHistoryForm.ui.qml` on `TaskDetailForm`

3 files changed, 54 insertions, 9 deletions

diff --git a/features/TaskBriefForm.ui.qml b/features/TaskBriefForm.ui.qml
index e9e2587..b845f5d 100644
--- a/features/TaskBriefForm.ui.qml
+++ b/features/TaskBriefForm.ui.qml
@@ -4,7 +4,8 @@ import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.12
 
 Page {
-    id: page
+    id: taskBriefComponents
+    height: ticketSubjectLayout.height + ticketMetaLayout.height
     RowLayout {
         id: ticketSubjectLayout
         height: ticketSubject.height + 32
@@ -70,10 +71,3 @@ Page {
         }
     }
 }
-
-/*##^##
-Designer {
-    D{i:0;autoSize:true;height:480;width:640}
-}
-##^##*/
-
diff --git a/features/TaskDetailForm.ui.qml b/features/TaskDetailForm.ui.qml
index 8b742ee..9e3c2a1 100644
--- a/features/TaskDetailForm.ui.qml
+++ b/features/TaskDetailForm.ui.qml
@@ -35,6 +35,7 @@ Page {
             }
         }
     }
+
     StackView {
         id: contentView
         anchors.fill: parent
@@ -48,12 +49,22 @@ Page {
             anchors.left: parent.left
             anchors.leftMargin: 0
         }
+
+        TaskHistoryForm {
+            id: taskHistoryForm
+            anchors.right: parent.right
+            anchors.rightMargin: 0
+            anchors.left: parent.left
+            anchors.leftMargin: 0
+            anchors.top: taskBriefForm.bottom
+            anchors.topMargin: 0
+        }
     }
 }
 
 /*##^##
 Designer {
-    D{i:0;autoSize:true;height:480;width:640}D{i:8;anchors_x:43;anchors_y:73}
+    D{i:0;autoSize:true;height:480;width:640}D{i:9;anchors_x:0;anchors_y:183}
 }
 ##^##*/
 
diff --git a/features/TaskHistoryForm.ui.qml b/features/TaskHistoryForm.ui.qml
new file mode 100644
index 0000000..00b0d82
--- /dev/null
+++ b/features/TaskHistoryForm.ui.qml
@@ -0,0 +1,40 @@
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Material 2.12
+import QtQuick.Layouts 1.12
+
+Page {
+    id: page
+    height: ticketHistoryText.height + 16
+    background: Rectangle {
+        color: "#eeeeee"
+    }
+    RowLayout {
+        anchors.fill: parent
+        spacing: 8
+        Text {
+            id: historyCreator
+            text: qsTr("Username")
+            font.weight: Font.Medium
+            font.pixelSize: 14
+            font.family: "Work Sans"
+            Layout.leftMargin: 16
+            width: historyCreator.width
+        }
+        Text {
+            id: ticketHistoryText
+            text: qsTr("Edit or Commented")
+            font.pixelSize: 14
+            font.family: "Work Sans"
+            width: ticketHistoryText.width
+        }
+        Text {
+            id: historyTimestamp
+            text: qsTr("2017-07-25 15:05:30")
+            Layout.rightMargin: 16
+            font.pixelSize: 14
+            font.family: "Work Sans"
+            width: historyTimestamp.width
+        }
+    }
+}