X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=qml%2FLichViet%2FXemNgayTotXauHoangDao.qml;h=cfe9aae404b480afff968b8ff93bcedc756ce3d5;hb=c9c55fd162c91c5adb4e194a556417ac5cfda611;hp=512680b128f1298d528fa77ebfa241d186ca7e49;hpb=47289596a8695540fcbfe8e8fc13e8069a59c98a;p=lichviet
diff --git a/qml/LichViet/XemNgayTotXauHoangDao.qml b/qml/LichViet/XemNgayTotXauHoangDao.qml
index 512680b..cfe9aae 100644
--- a/qml/LichViet/XemNgayTotXauHoangDao.qml
+++ b/qml/LichViet/XemNgayTotXauHoangDao.qml
@@ -34,28 +34,35 @@ Item{
Component {
id: listDelegate
- Item {
- height: lheight+5
- Rectangle {
- width:rectangle1.width-20;
- y:10;
- x:10
- height:lheight
- color: "#ffffff"
- radius: 8
- border.color: "#b57e8f"
+
Column {
- Text { x:5;y:50;text:name;color:"blue"; font.pixelSize: 20
- font.family: "Tahoma" }
- Text { x:5;y:50;text:getHD(idm) ; font.pixelSize: 20
- font.family: "Tahoma"}
- } anchors.bottomMargin: -10
- }
- }
- }
+ Rectangle {
+ width:rectangle1.width;
+ y:30;
+ x:0
+ height:1
+ border.color: "#b57e8f"
+ }
+ width:rectangle1.width
+ Rectangle{
+ width:rectangle1.width;
+ height:10;
+ }
+
+ Text { x:5;y:50;text:getHD(name,idm) ;textFormat: Text.RichText;wrapMode: Text.WordWrap; font.pixelSize: 20
+ font.family: "Tahoma";width:parent.width;}
+
+ Rectangle{
+ width:rectangle1.width;
+ height:10;
+ }
+ }
+
+
+ }
ListModel {
id: listModel
@@ -108,17 +115,21 @@ Item{
}
}
- function getHD(idm){
+ function getHD(name,idm){
+ if (name.length){
+ name=""+name+"
";
+ }
+
NTX.test();
switch(idm){
- case 0 : return AmLich.getTHU(screen.jd)+",ngà y "+screen.curDay+" tháng "+screen.curMonth+" nÄm "+screen.curYear+"
Ngà y "+screen.lunarDay+" tháng "+screen.lunarMonth+" nÄm "+screen.lunarYear+" ("+screen.lunarYearInt+")";break;
- case 1 : return screen.lunarGioHoangDao;break;
- case 2 : return screen.lunarTietKhi();break;
- case 3 : return NTX.sao(screen.curYear,AmLich.getLunarDate(screen.curDay,screen.curMonth,screen.curYear).jd - AmLich.getLunarDate(1,1,screen.curYear).jd);break;
- case 5 : return NTX.luangiai(screen.curDay);break;
- case -1: return NTX.truc(screen.lunarMonth, screen.lunarDayCanChi, screen.lunarMonthCanChi);break;//"Là ngà y: Thiên Lao Hắc Äạo Trá»±c: Äá»nh"
- case 6: return NTX.cacsaotot(screen.lunarMonth, screen.lunarDayCanChi);break;
- case 7: return NTX.cacsaoxau(screen.lunarMonth, screen.lunarDayCanChi);break;
+ case 0 : return name+AmLich.getTHU(screen.jd)+",ngà y "+screen.curDay+" tháng "+screen.curMonth+" nÄm "+screen.curYear+"
Ngà y "+screen.lunarDay+" tháng "+screen.lunarMonth+" nÄm "+screen.lunarYear+" ("+screen.lunarYearInt+")";break;
+ case 1 : return name+screen.lunarGioHoangDao;break;
+ case 2 : return name+screen.lunarTietKhi();break;
+ case 3 : return name+NTX.sao(screen.curYear,AmLich.getLunarDate(screen.curDay,screen.curMonth,screen.curYear).jd - AmLich.getLunarDate(1,1,screen.curYear).jd);break;
+ case 5 : return name+NTX.luangiai(screen.curDay);break;
+ case -1: return name+NTX.truc(screen.lunarMonth, screen.lunarDayCanChi, screen.lunarMonthCanChi);break;//"Là ngà y: Thiên Lao Hắc Äạo Trá»±c: Äá»nh"
+ case 6: return name+NTX.cacsaotot(screen.lunarMonth, screen.lunarDayCanChi);break;
+ case 7: return name+NTX.cacsaoxau(screen.lunarMonth, screen.lunarDayCanChi);break;
}
}