X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=qml%2FLichViet%2Fmain.qml;h=b0dc8c28f4aed41797dc54bb302806ffb1c4fc2d;hb=3ddd466743c0ac6156183f2903ba1d58fe7bd5a4;hp=c1afc70294039327f52ba8b625c8a7baecf1ed4b;hpb=c37371da2f046d1a0ada7a7ab8e3f72ba0c2341f;p=lichviet
diff --git a/qml/LichViet/main.qml b/qml/LichViet/main.qml
index c1afc70..b0dc8c2 100644
--- a/qml/LichViet/main.qml
+++ b/qml/LichViet/main.qml
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see
*/
-import QtQuick 1.1
+import QtQuick 1.0
import "Themes.js" as Themes
import "Settings.js" as Settings
@@ -23,8 +23,8 @@ import "main.js" as Script
Item {
id: screen
- width: 480
- height: 800
+ width: 800
+ height: 480
state:"mainscreen"
@@ -67,6 +67,7 @@ Item {
Script.fullmonth.m_month=Script.curMonth;
Script.fullmonth.m_year=Script.curYear;
Script.fullmonth.reset();
+ maindatemodel.reset();
}
Rectangle {
@@ -230,18 +231,16 @@ Item {
Text {
id: txtDMY
- x: 140
+ x: 151
y: 77
- width: 80
height: 20
color: "#29d999"
- textFormat: Text.RichText
text: "Tháng "+screen.curMonth+" NÄm "+screen.curYear+""
+ horizontalAlignment: Text.AlignHCenter
anchors.horizontalCenter: parent.horizontalCenter
font.bold: false
font.family: "Tahoma"
smooth: true
- horizontalAlignment: Text.AlignHCenter
font.pixelSize: 28
}
@@ -249,7 +248,6 @@ Item {
id: txtTHU
x: 151
y: 210
- width: 80
height: 20
color: "#f0f0f5"
text: Script.__txtTHU_format()
@@ -264,7 +262,6 @@ Item {
id: txtInfo
x: 151
y: (screen.is_holiday ? 270 : 250)
- width: 80
height: 20
color: (Script.is_holiday ? theme_manager.theme.markdate.holidays : theme_manager.theme.markdate.not_holidays)
text: Script.__txtInfo_format()
@@ -280,9 +277,8 @@ Item {
id: txtDAYAmLich
x: 151
y: 330
- width: 80
height: 20
- color: "#f0f0f5"
+ color: theme_manager.theme.markdate.lunardate
text: Script.__txtDAYAmLich_format()
horizontalAlignment: Text.AlignHCenter
anchors.horizontalCenter: parent.horizontalCenter
@@ -359,6 +355,7 @@ Item {
},
State {
name: "switchX";
+ PropertyChanges { target: titleBar; y: -50 }
PropertyChanges { target: toolBar; y: screen.height }
PropertyChanges { target: toolBar }
PropertyChanges { target: mouseareaMM;enabled:false }