* changed options/fullmonth page to new UI

[lichviet] / qml / LichViet / FullMonth.qml

diff --git a/qml/LichViet/FullMonth.qml b/qml/LichViet/FullMonth.qml
index 331b3f7..6257664 100644 (file)
--- a/qml/LichViet/FullMonth.qml
+++ b/qml/LichViet/FullMonth.qml
@@ -24,7 +24,7 @@ import "amlich-aa98.js" as AmLich98
 import "CacNgayLeTrongNam.js" as CNLTN
 
 Item{
-    id: item1
+    id: fullmonth
 
     Rectangle{
         id: fullmonthREC
@@ -49,7 +49,7 @@ Item{
                                     if (CNLTN.is_holiday(day, month, stemp[0], stemp[1]))
                                         return theme_manager.theme.markdate.holidays;
                                     else
-                                        return "#007070"
+                                        return "#000000"//"#007070"
                                 }
                             }
 
@@ -124,8 +124,7 @@ onCanceled:{
                 id: grid
                 x: -335
                 y: 41
-                width:800
-                height: 480
+
                 anchors.horizontalCenterOffset: 15
                 anchors.bottomMargin: -52
                 anchors.topMargin: 42
@@ -133,10 +132,22 @@ onCanceled:{
                 anchors.bottom: parent.bottom
                 anchors.top: parent.top
                 cellWidth: 110; cellHeight: 50
-                //Dung : 64 | Nam :110
+
+                boundsBehavior:Flickable.DragAndOvershootBounds
+                flickableDirection:Flickable.VerticalFlick
+
                 model:lmodel
                 delegate: contactDelegate
-                focus: false
+                focus: true
+
+                onMovementStarted:{
+                   /* var newMonth = screen.curMonth+1;
+                    LC.reset(screen.curDay,newMonth,screen.curYear)
+                    screen.calculateLunar(screen.curDay,newMonth,screen.curYear)
+                    screen.refresh()
+                    reset()*/
+                }
+
             }
 
             ListModel {