* changed options/fullmonth page to new UI

[lichviet] / qml / LichViet / OptionsScreen.qml

diff --git a/qml/LichViet/OptionsScreen.qml b/qml/LichViet/OptionsScreen.qml
index f8a571a..69c34f0 100644 (file)
--- a/qml/LichViet/OptionsScreen.qml
+++ b/qml/LichViet/OptionsScreen.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
 
 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,
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,

@@ -22,7 +22,7 @@ Item{
 
     Rectangle {
         id: rectangle1
 
     Rectangle {
         id: rectangle1

-        anchors.fill: parent; anchors.bottomMargin: 0
+        anchors.fill: parent; anchors.bottomMargin: 16

         visible: true
         opacity:0.9
 
         visible: true
         opacity:0.9
 

@@ -30,6 +30,15 @@ Item{
                 id: listDelegate
                  Rectangle {
                      height:60
                 id: listDelegate
                  Rectangle {
                      height:60

+
+                     Rectangle {
+                                         width:rectangle1.width;
+                                         y:0;
+                                         x:0
+                                         height:1
+                                         border.color: "#b57e8f"
+                     }
+

                      Text {
                          id: text1
                          text:name
                      Text {
                          id: text1
                          text:name

@@ -45,13 +54,12 @@ Item{
                             onSwitched:{
                                 listModel.setProperty(index, "selected", switchedOn);
                             }
                             onSwitched:{
                                 listModel.setProperty(index, "selected", switchedOn);
                             }

-                            switchedOn: {
-                               selected
-                            }
-
+                            switchedOn: selected

                             anchors.verticalCenter: parent.verticalCenter
                         }
                             anchors.verticalCenter: parent.verticalCenter
                         }

+

                  }
                  }

+

             }
 
         ListModel {
             }
 
         ListModel {

@@ -69,10 +77,12 @@ Item{
               model: listModel
               delegate: listDelegate
               focus: true
               model: listModel
               delegate: listDelegate
               focus: true

+              ScrollBar{}

         }
 
     }
 
         }
 
     }
 

+

     ToolBar { id: toolBar; height: 50;
         y: screen.height-78
         width: parent.width;
     ToolBar { id: toolBar; height: 50;
         y: screen.height-78
         width: parent.width;

@@ -92,7 +102,4 @@ Item{
         }
     }
 
         }
     }
 

-    transitions: [
-        Transition { NumberAnimation { properties: "x,y,opacity"; duration: 500; easing.type: Easing.InOutBack } }
-    ]

 }
 }