Merge branch 'master' into develop

[lichviet-widget] / qml / lichvietwidget / main.qml

diff --git a/qml/lichvietwidget/main.qml b/qml/lichvietwidget/main.qml
index 6d7fd41..437ccea 100644 (file)
--- a/qml/lichvietwidget/main.qml
+++ b/qml/lichvietwidget/main.qml
@@ -21,8 +21,8 @@ import "main.js" as Main
 Item {
     id: lichvietwidget
 
-    width: 344
-    height: 200
+    width: 370
+    height: 140
 
     Rectangle {
         id: lvwidgetrec
@@ -30,39 +30,19 @@ Item {
         radius: 8
         opacity: 0.7
         anchors.fill: parent
-
-        Text {
-            id: txt_title
-            x: 133
-            y: 169
-            color: "#ffffff"
-            text: "Lịch Việt"
-            style: Text.Raised
-            font.bold: true
-            wrapMode: Text.WrapAnywhere
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            font.pixelSize: 18
-            font.family: "Tahoma"
-        }
     }
 
     Rectangle {
         id: rectangle1
         x: 5
         y: 5
-        width: 336
-        height: 157
+        width: 362
+        height: 156
         anchors.fill: parent
         radius: 8
         gradient: Gradient {
             GradientStop {
                 position: 0
-                color: "#000000"
-            }
-
-            GradientStop {
-                position: 0.03
                 color: "#f0eef7"
             }
         }
@@ -70,110 +50,137 @@ Item {
         smooth: true
         z: 0
         anchors.rightMargin: 5
-        anchors.bottomMargin: 40
+        anchors.bottomMargin: 6
         anchors.leftMargin: 5
         anchors.topMargin: 5
         border.color: "#6382c6"
         border.width: 1
-        opacity: 0.9
+        opacity: 0.7
 
         Image {
             id: day_left_img
-            x: -5
-            y: -1
-            width: 100
-            height: 100
+            x: 132
+            y: -2
+            width: 60
+            height: 75
             source: "imgs/1.png"
-            visible:false
+            visible:true
         }
 
         Image {
             id: day_right_img
-            x: 74
-            y: -1
-            width: 100
-            height: 100
-            visible: false
-            source: "imgs/4.png"
+            x: 179
+            y: -2
+            width: 60
+            height: 75
+            visible: true
+            source: "imgs/0.png"
         }
 
         Image {
             id: day_center_img
-            x: 33
-            y: -1
-            width: 100
-            height: 100
+            x: 157
+            y: -2
+            width: 60
+            height: 75
             source: "imgs/4.png"
-            visible: false
+            visible: true
         }
 
         Image {
             id: month_right_img
-            x: 245
-            y: 5
-            width: 50
-            height: 47
+            x: 294
+            y: 2
+            width: 33
+            height: 35
+            visible: true
         }
 
         Image {
             id: month_left_img
-            x: 206
-            y: 5
-            width: 50
-            height: 47
+            x: 265
+            y: 2
+            width: 34
+            height: 35
+            visible: true
         }
 
         Image {
             id: year_1_img
-            x: 167
-            y: 45
-            width: 50
-            height: 47
+            x: 235
+            y: 32
+            width: 35
+            height: 35
         }
 
         Image {
             id: year_2_img
-            x: 206
-            y: 45
-            width: 50
-            height: 47
+            x: 264
+            y: 32
+            width: 35
+            height: 35
         }
 
         Image {
             id: year_3_img
-            x: 245
-            y: 45
-            width: 50
-            height: 47
+            x: 293
+            y: 32
+            width: 35
+            height: 35
         }
 
         Image {
             id: year_4_img
-            x: 284
-            y: 45
-            width: 50
-            height: 47
+            x: 322
+            y: 32
+            width: 35
+            height: 35
         }
 
         Text {
             id: txt_detail
-            x: 62
-            y: 99
-            width: 205
-            color: "#1a1d20"
+            x: 174
+            y: 68
+            color: "#0c0a4d"
             text: ""
-            verticalAlignment: Text.AlignVCenter
-            wrapMode: Text.NoWrap
-            style: Text.Normal
-            font.family: "Tahoma"
+            anchors.horizontalCenterOffset: 0
+            font.family: "Nokia Sans"
+            verticalAlignment: Text.AlignTop
             horizontalAlignment: Text.AlignHCenter
-            font.pixelSize: 20
+            font.pointSize: 16
+            textFormat: Text.RichText
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+
+        Rectangle {
+            id: rectangle2
+            x: 4
+            y: 7
+            width: 131
+            height: 56
+            color: "#ffffff"
+            radius: 8
+            border.color: "#000000"
+
+            Text {
+                id: txt_thu
+                x: 5
+                y: 11
+                width: 121
+                text: ""
+                verticalAlignment: Text.AlignTop
+                style: Text.Normal
+                horizontalAlignment: Text.AlignHCenter
+                font.bold: true
+                font.pixelSize: 23
+                font.family: "Nokia Sans"
+            }
         }
     }
 
     Timer {
         interval: 1000; running: true; repeat: true
-        onTriggered: Main.refresh(day_center_img, day_left_img, day_right_img, month_left_img, month_right_img, year_1_img, year_2_img,year_3_img,year_4_img, txt_detail)
+        onTriggered: Main.refresh(day_center_img, day_left_img, day_right_img, month_left_img, month_right_img, year_1_img, year_2_img,year_3_img,year_4_img, txt_detail, txt_thu)
     }
 
 }