* ready to release new version 1.0.3

diff --git a/qml/LichViet/About.qml b/qml/LichViet/About.qml
index 01a5bdd..58665d6 100644 (file)
--- a/qml/LichViet/About.qml
+++ b/qml/LichViet/About.qml
@@ -64,7 +64,6 @@ Item{
                 id: text3
                 x: 10
                 y: 261
                 id: text3
                 x: 10
                 y: 261

-                width: 80

                 height: 20
                 text: "Chương trình có tham khảo thuật toán tính <br>Âm Lịch của tác giả Hồ Ngọc Đức.<br><a href='http://www.informatik.uni-leipzig.de/~duc/amlich/'>http://www.informatik.uni-leipzig.de/~duc/amlich/</a>"
                 anchors.horizontalCenterOffset: 0
                 height: 20
                 text: "Chương trình có tham khảo thuật toán tính <br>Âm Lịch của tác giả Hồ Ngọc Đức.<br><a href='http://www.informatik.uni-leipzig.de/~duc/amlich/'>http://www.informatik.uni-leipzig.de/~duc/amlich/</a>"
                 anchors.horizontalCenterOffset: 0

@@ -79,7 +78,6 @@ Item{
             id: text1
             x: 11
             y: 171
             id: text1
             x: 11
             y: 171

-            width: 80

             height: 20
             text: "Lịch Âm Việt Nam <br> OS: Maemo 5 (Fremantle)"
             anchors.horizontalCenterOffset: 1
             height: 20
             text: "Lịch Âm Việt Nam <br> OS: Maemo 5 (Fremantle)"
             anchors.horizontalCenterOffset: 1

@@ -94,7 +92,6 @@ Item{
             id: text2
             x: 10
             y: 234
             id: text2
             x: 10
             y: 234

-            width: 80

             height: 20
             text: "Phiên bản : 1.0.2-4 (15/09/2011)<br>\
 Phát triển bởi : <a href='mailto:metacuong@gmail.com'>metacuong@gmail.com</a>"
             height: 20
             text: "Phiên bản : 1.0.2-4 (15/09/2011)<br>\
 Phát triển bởi : <a href='mailto:metacuong@gmail.com'>metacuong@gmail.com</a>"

diff --git a/qml/LichViet/FullMonth.qml b/qml/LichViet/FullMonth.qml
index ef05b52..4c31568 100644 (file)
--- a/qml/LichViet/FullMonth.qml
+++ b/qml/LichViet/FullMonth.qml
@@ -103,7 +103,7 @@ Item{
                 horizontalAlignment: Text.AlignLeft
 
                 text: model ? model.day : ""
                 horizontalAlignment: Text.AlignLeft
 
                 text: model ? model.day : ""

-                color: model ? model.inmonth ? (model.current ? "red" : model.inholiday ? theme_manager.theme.markdate.holidays : "black") : "grey" : "red"
+                color: model ? model.inmonth ? (model.current ? "grey" : model.inholiday ? theme_manager.theme.markdate.holidays : "black") : "grey" : "red"

                 font.pointSize: parent.width > parent.height ? parent.width ? parent.width / 6 : 1 : parent.width / 4
                 font.bold: true
             }
                 font.pointSize: parent.width > parent.height ? parent.width ? parent.width / 6 : 1 : parent.width / 4
                 font.bold: true
             }

@@ -117,7 +117,7 @@ Item{
                 horizontalAlignment: Text.AlignBottom
 
                 text: model ? model.lunar_day : ""
                 horizontalAlignment: Text.AlignBottom
 
                 text: model ? model.lunar_day : ""

-                color: model ? model.inmonth ? (model.current ? "red" : "#700070") : "grey" : "red"
+                color: model ? model.inmonth ? (model.current ? "white" : "#700070") : "grey" : "red"

                 font.pointSize: parent.width > parent.height ? parent.width ? parent.width / 8 : 1 : parent.width / 5
             }
 
                 font.pointSize: parent.width > parent.height ? parent.width ? parent.width / 8 : 1 : parent.width / 5
             }
 

diff --git a/qml/LichViet/main.js b/qml/LichViet/main.js
index 49a2a24..fce97ab 100644 (file)
--- a/qml/LichViet/main.js
+++ b/qml/LichViet/main.js
@@ -114,7 +114,7 @@ function __txtInfo_format(){
 }
 
 function __txtDAYAmLich_format(){
 }
 
 function __txtDAYAmLich_format(){

-    return "Ngày <span style='color:#C0C0C0;'>"+lunarDay+" ("+lunarDayCanChi+")</span><br>Tháng <span style='color:#C0C0C0;'>"+lunarMonth+" ("+lunarMonthCanChi+")</span><br>Năm <span style='color:#C0C0C0;'>"+lunarYearInt+" ("+lunarYear+")</span>";
+    return "Ngày <b>"+lunarDay+" ("+lunarDayCanChi+")</b><br>Tháng <b>"+lunarMonth+" ("+lunarMonthCanChi+")</b><br>Năm <b>"+lunarYearInt+" ("+lunarYear+")</b>";

 }
 
 function recalculate(){
 }
 
 function recalculate(){

diff --git a/qml/LichViet/main.qml b/qml/LichViet/main.qml
index 2ada692..74af3b6 100644 (file)
--- a/qml/LichViet/main.qml
+++ b/qml/LichViet/main.qml
@@ -23,8 +23,8 @@ import "main.js" as Script
 
 Item {
      id: screen
 
 Item {
      id: screen

-     width: 480
-     height: 800
+     width: 800
+     height: 480

 
      state:"mainscreen"
 
 
      state:"mainscreen"
 

@@ -277,7 +277,7 @@ Item {
              x: 151
              y: 330
              height: 20
              x: 151
              y: 330
              height: 20

-             color: "#f0f0f5"
+             color: theme_manager.theme.markdate.lunardate

              text: Script.__txtDAYAmLich_format()
              horizontalAlignment: Text.AlignHCenter
              anchors.horizontalCenter: parent.horizontalCenter
              text: Script.__txtDAYAmLich_format()
              horizontalAlignment: Text.AlignHCenter
              anchors.horizontalCenter: parent.horizontalCenter

@@ -354,6 +354,7 @@ Item {
          },
          State {
              name: "switchX";
          },
          State {
              name: "switchX";

+             PropertyChanges { target: titleBar; y: -50 }

              PropertyChanges { target: toolBar; y: screen.height }
              PropertyChanges { target: toolBar }
              PropertyChanges { target: mouseareaMM;enabled:false }
              PropertyChanges { target: toolBar; y: screen.height }
              PropertyChanges { target: toolBar }
              PropertyChanges { target: mouseareaMM;enabled:false }

diff --git a/qml/themes/default/default.qml b/qml/themes/default/default.qml
index 620e26f..30f4928 100644 (file)
--- a/qml/themes/default/default.qml
+++ b/qml/themes/default/default.qml
@@ -1,45 +1,16 @@
-import QtQuick 1.1
+import QtQuick 1.0

 
 Item {
     id:theme
 
 Item {
     id:theme

-    property alias titlebar: titlebar
-    property alias datepicker: datepicker
-    property alias toolbar: toolbar

     property alias markdate: markdate
 
     property alias markdate: markdate
 

-    property string root_dir : "file:/opt/usr/share/LichViet/themes/default/" 
+    property string root_dir : "file:/opt/usr/share/LichViet/themes/default/"

     property string background_image: root_dir+"background.jpg"
     property string background_image: root_dir+"background.jpg"

-    property real background_opacity: 0.3
+    property real background_opacity: 1.0

 
     property string switch_on: root_dir+"switch_on.png"
     property string switch_off: root_dir+"switch_off.png"
 
 
     property string switch_on: root_dir+"switch_on.png"
     property string switch_off: root_dir+"switch_off.png"
 

-    Item{
-        id:titlebar
-        property string button: root_dir+"quit.png"
-        property string button_pressed: root_dir+"quit_pressed.png"
-        property string button_active: root_dir+"quit.png"
-        property string sci: root_dir+"titlebar.sci"
-
-        property string minimize_button:  root_dir+"minimize.png"
-        property string minimize_button_pressed:  root_dir+"minimize_pressed.png"
-    }
-
-    Item{
-        id:toolbar
-        property string sci: root_dir+"titlebar.sci"
-        property string button_sci: root_dir+"toolbutton.sci"
-        property string button_pressed_sci: root_dir+"toolbutton_pressed.sci"
-        property string button_active_sci: root_dir+"toolbutton.sci"
-    }
-
-    Item{
-        id:datepicker
-        property string button: root_dir+"dp_button.png"
-        property string button_pressed: root_dir+"dp_button_pressed.png"
-        property string button_active: root_dir+"dp_button_active.png"
-    }
-

    Item{
         id:markdate
         property string sunday:"red"
    Item{
         id:markdate
         property string sunday:"red"

@@ -47,6 +18,7 @@ Item {
         property string otherday:"grey"
         property string otherday_selected:"#FFFFFF"
         property string holidays:"yellow"
         property string otherday:"grey"
         property string otherday_selected:"#FFFFFF"
         property string holidays:"yellow"

-       property string not_holidays:"#FFFF99"
+        property string not_holidays:"#FFFF99"
+        property string lunardate:"white"

    }
 }
    }
 }