Merge branch 'develop'
authorCuong Le <metacuong@gmail.com>
Sat, 27 Aug 2011 08:54:44 +0000 (15:54 +0700)
committerCuong Le <metacuong@gmail.com>
Sat, 27 Aug 2011 08:54:44 +0000 (15:54 +0700)
qml/LichViet/About.qml
qml/LichViet/DateTimeDialog.qml
qml/LichViet/main.qml
qtc_packaging/debian_fremantle/changelog
www/index.html [new file with mode: 0644]

index adb96ee..4d4751a 100644 (file)
@@ -71,7 +71,7 @@ Item{
         y: 234
         width: 80
         height: 20
-        text: "Phiên bản : 1.0.2-1-beta (25/08/2011)<br>\
+        text: "Phiên bản : 1.0.2-3 (25/08/2011)<br>\
 Phát triển bởi : <a href='mailto:metacuong@gmail.com'>metacuong@gmail.com</a>"
 anchors.horizontalCenterOffset: 0
 wrapMode: Text.NoWrap
index e6eb564..2095953 100644 (file)
@@ -57,13 +57,11 @@ Item{
             text: "OK"
             visible: true
             onClicked: {
-
                 LC.reset(datePicker.mDay,datePicker.mMonth,datePicker.mYear)
                 screen.calculateLunar(datePicker.mDay,datePicker.mMonth,datePicker.mYear)
                 screen.state="mainscreen"
                 screen.refresh()
                 maindatemodel.reset()
-                txtDATEpv.currentIndex = datePicker.mDay-1;
                 }
         }
 
index 565b3ad..1c7eb47 100644 (file)
@@ -113,8 +113,8 @@ Item {
 
                   Rectangle {
                       id:reelx
-                      width: 300
-                      height: 100
+                      width: 260
+                      height: 90
                       y: 116
                       anchors.horizontalCenter: parent.horizontalCenter
                       property int index: 0
@@ -158,15 +158,30 @@ Item {
                           delegate: delegate
                           pathItemCount: 3
                           clip: true
+                          highlightMoveDuration:500
+                          Keys.onDownPressed: if (!moving && interactive) incrementCurrentIndex()
+                          Keys.onUpPressed: if (!moving && interactive) decrementCurrentIndex()
                           preferredHighlightBegin: 0.5
                           preferredHighlightEnd: 0.5
                           highlightRangeMode: PathView.StrictlyEnforceRange
                           focus: true
+                          interactive: true
+                          highlight: Rectangle{
+                              anchors.topMargin: 10;
+                              width:110;
+                              height:80;
+                              radius: 8;
+                              color:"#000000"
+                              opacity: 0.3
+                          }
                           path: Path {
                               startX: 0
                               startY: 50
                               PathLine {x: reelx.width; y: 50}
                           }
+                          onFlickEnded : {
+                          }
+
                           onMovementEnded: {
                               calculateLunar(txtDATEpv.currentIndex+1, LC.curMonth(), LC.curYear())
                           }
@@ -176,19 +191,43 @@ Item {
                       id:maindatemodel
 
                       function reset(){
+                          var days_of_this_month = LC.calDays(screen.curMonth,screen.curYear);
+                          var days_of_changes = days_of_this_month - maindatemodel.count;
+
+                          var ifs;
+
+                          if (days_of_changes<0){
+                              ifs=Math.abs(days_of_changes);
+                              while(ifs>0){
+                                  maindatemodel.remove(maindatemodel.count-1);
+                                  ifs-=1;
+                              }
+                          }else if(days_of_changes>0){
+                              ifs=maindatemodel.count;
+                              for (var i=1;i<=days_of_changes;i++)
+                                  append({name:i+ifs})
+                          }
+
+                         reelx.index = -1; // I dont now why must be added -1 before screen.curDay-1
+                         reelx.index = screen.curDay-1;
+
+                      }
+
+                      function init(){
                           while(maindatemodel.count>0){
                               try{maindatemodel.remove(maindatemodel.count-1)}catch(e){}
                           }
 
                           for(var i=1;i<=LC.calDays(screen.curMonth,screen.curYear);i++)
                               append({name:i})
+
                           reelx.index = screen.curDay -1
                       }
                   }
 
          //-------------------------------------------------
                   Component.onCompleted: {
-                     maindatemodel.reset()
+                     maindatemodel.init()
                   }
 
          Text {
@@ -330,6 +369,13 @@ Item {
 
      states: [
          State {
+             name:"mainscreen"
+             StateChangeScript {
+                 script:{
+                 }
+                }
+         },
+         State {
              name: "menuscreen";
              PropertyChanges { target: menuScreen; x: 0; focus:true}
              PropertyChanges { target: toolBar; y: screen.height }
@@ -457,6 +503,7 @@ Item {
      }
 
      function refresh(){
+
      }
 
      Component.onCompleted: {
index 45e9f84..9ccfe2a 100644 (file)
@@ -1,5 +1,5 @@
-lichviet (1.0.2-1) unstable-develop; urgency=low
+lichviet (1.0.2-3) unstable-develop; urgency=low
 
-  * Release 1.0.2-1-beta
+  * Fixes for pathview date component (slowly in date switching)
 
- -- Cuong Le <metacuong@gmail.com>  Thu, 25 Aug 2011 13:30:37 +0700
+ -- Cuong Le <metacuong@gmail.com>  Thu, 27 Aug 2011 14:40:37 +0700
diff --git a/www/index.html b/www/index.html
new file mode 100644 (file)
index 0000000..2506d9d
--- /dev/null
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
+<head> 
+       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 
+       <title>Lich Viet (VietNamese Lunar Calendar) for Maemo 5/MeeGo</title> 
+</head> 
+<style> 
+       html,body{
+               font-family: Tahoma, Arial;
+               font-size: 0.9em;
+               font-weight: normal;
+               color: #404040;
+       }
+</style> 
+<body> 
+<h3>Thông tin cơ bản</h3>
+* <strong>Lịch Việt (VietNamese Lunar Calendar) dành cho Maemo 5 (PR1.3) và MeeGo.</strong><br>
+* Ngôn ngữ : <strong>Tiếng Việt</strong><br>
+* Phát triển bởi : <strong>Cuong Le (<a href="mailto:metacuong@gmail.com">metacuong@gmail.com</a>)</strong><br>
+* Phiên bản mới nhất : <strong><a href="http://maemo.org/packages/package_instance/view/fremantle_extras-devel_free_armel/lichviet/1.0.2-3/">1.0.2-3</a></strong> <strong>unstable-develop</strong><br>
+* Đang ở kho : <strong><a href="http://maemo.org/packages/view/lichviet/">extras-devel</a></strong><br>
+* Sử dụng giấy phép nguồn mở : <strong><a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU/GPLv2</a></strong><br>
+* Thư viện nền : <a href="http://doc.qt.nokia.com/4.7-snapshot/qtbinding.html">QML Bindings in C++</a>, <a href="http://qt.nokia.com/qtquick/">QtQuick</a>, và <a href="http://labs.qt.nokia.com/2011/03/01/qt-4-7-2-has-been-released/">Qt libs 4.7.2</a>
+<br><br>
+* Mã nguồn được host tại garage.maemo.org : <a href="https://garage.maemo.org/plugins/ggit/browse.php/?p=lichviet">https://garage.maemo.org/plugins/ggit/browse.php/?p=lichviet</a><br>
+* Báo cáo lỗi : <a href="https://garage.maemo.org/tracker/?group_id=2235">https://garage.maemo.org/tracker/?group_id=2235</a>
+<h3>Cài đặt</h3>
+* Dùng <strong>dpkg -i</strong> trong terminal (lưu ý phải có quyền root), tải về phiên bản mới nhất <a href="http://repository.maemo.org/extras-devel/pool/fremantle/free/l/lichviet/lichviet_1.0.2-3_armel.deb"><strong>tại đây</strong></a> (deb package).
+<br>* Dùng <strong>App. Manager</strong> để tải về và cài đặt (dùng từ khóa : 'Lich' để tìm) từ kho e<strong>xtras-devel</strong>.  
+<h3>Sự cố và cách khắc phục sau khi cài đặt và chạy</h3>
+* Bị đen màn hình -> tiến hành cài đặt 2 gói <strong><a href="http://maemo.org/packages/package_instance/view/fremantle_extras-devel_free_armel/mcsp/1.0-6/">mcsp</a></strong> và <strong><a href="http://maemo.org/packages/package_instance/view/fremantle_extras-devel_free_armel/qtquickcompat/0.1.0/">qtquickcompat</a></strong>.
+<h3>Một số hình ảnh tham khảo</h3>
+<img src="https://lh3.googleusercontent.com/-7aWHTA1eS9g/TlYfTAi0KfI/AAAAAAAAAII/1e8Tq-FbYKo/a.jpg" alt="" />
+<img src="https://lh5.googleusercontent.com/-8LnB0CVnPLs/TlYfUjV0B6I/AAAAAAAAAIM/jyp_qVoU764/b.jpg" alt="" />
+<img src="https://lh4.googleusercontent.com/-_z5C8N3_fwQ/TlYfV0qydNI/AAAAAAAAAIQ/bhuOgvxeKpA/c.jpg" alt="" />
+<img src="https://lh6.googleusercontent.com/-q1aFjjSK56I/TlYfXMz7BzI/AAAAAAAAAIU/cVBX1YDB_-Y/d.jpg" alt="" />
+<img src="https://lh3.googleusercontent.com/-iXCVgrFOhEc/TlYfYzp1gFI/AAAAAAAAAIY/jVt6-KgTtMQ/e.jpg" alt="" />
+<img src="https://lh5.googleusercontent.com/-hJLnYEurJbw/TlYfaVwZVeI/AAAAAAAAAIc/7J-csOEnjMY/fe.jpg" alt="" />
+<br>
+<br>
+This page was last modified 13:23, 27 August 2011.
+</body> 
+</html> 
\ No newline at end of file