* 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 992ddf8..6257664 100644 (file)
--- a/qml/LichViet/FullMonth.qml
+++ b/qml/LichViet/FullMonth.qml
@@ -3,7 +3,7 @@ Copyright (C) 2011  by Cuong Le <metacuong@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
+the Free Software Foundation, either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
@@ -24,12 +24,11 @@ import "amlich-aa98.js" as AmLich98
 import "CacNgayLeTrongNam.js" as CNLTN
 
 Item{
-    id: item1
+    id: fullmonth
 
     Rectangle{
         id: fullmonthREC
         anchors.fill: parent; anchors.bottomMargin: 0
-        visible: true
         opacity:0.9
 
             Component {
@@ -50,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"
                                 }
                             }
 
@@ -125,8 +124,7 @@ onCanceled:{
                 id: grid
                 x: -335
                 y: 41
-                width:800
-                height: 480
+
                 anchors.horizontalCenterOffset: 15
                 anchors.bottomMargin: -52
                 anchors.topMargin: 42
@@ -134,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 {
@@ -200,10 +210,6 @@ onCanceled:{
         }
     }
 
-    transitions: [
-        Transition { NumberAnimation { properties: "x,y,opacity"; duration: 500; easing.type: Easing.InOutBack } }
-    ]
-
     states: [
         State {
             name: "xemtheothang"