* changed options/fullmonth page to new UI
authorCuong Le <metacuong@gmail.com>
Thu, 8 Sep 2011 07:38:40 +0000 (14:38 +0700)
committerCuong Le <cuonglb@ideapad.(none)>
Thu, 8 Sep 2011 07:41:59 +0000 (14:41 +0700)
* added a scrollbar
* re-chmod/chown debian/*
* code cleanup
* git set author/email

Makefile
qml/LichViet/FullMonth.qml
qml/LichViet/OptionsScreen.qml
qml/LichViet/ScrollBar.qml
qml/LichViet/XemNgayTotXauHoangDao.qml
qtc_packaging/debian_fremantle/README [changed mode: 0644->0755]
qtc_packaging/debian_fremantle/changelog [changed mode: 0644->0755]
qtc_packaging/debian_fremantle/compat [changed mode: 0644->0755]
qtc_packaging/debian_fremantle/control [changed mode: 0644->0755]
qtc_packaging/debian_fremantle/copyright [changed mode: 0644->0755]

index e71dc73..3683fb4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: LichViet
-# Generated by qmake (2.01a) (Qt 4.7.3) on: Sun Aug 28 12:42:23 2011
+# Generated by qmake (2.01a) (Qt 4.7.3) on: Tue Sep 6 21:29:40 2011
 # Project:  LichViet.pro
 # Template: app
-# Command: /opt/QtSDK/Desktop/Qt/473/gcc/bin/qmake -spec /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/linux-g++-64 -o Makefile LichViet.pro
+# Command: /opt/QtSDK/Desktop/Qt/473/gcc/bin/qmake -spec /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/linux-g++-64 QMLJSDEBUGGER_PATH=/opt/qtcreator-2.1.0/share/qtcreator/qml/qmljsdebugger -o Makefile LichViet.pro
 #############################################################################
 
 ####### Compiler, tools and options
@@ -136,7 +136,7 @@ Makefile: LichViet.pro  /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/linux-g++-64/qmake
                /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/yacc.prf \
                /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/lex.prf \
                /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/include_source_dir.prf
-       $(QMAKE) -spec /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/linux-g++-64 -o Makefile LichViet.pro
+       $(QMAKE) -spec /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/linux-g++-64 QMLJSDEBUGGER_PATH=/opt/qtcreator-2.1.0/share/qtcreator/qml/qmljsdebugger -o Makefile LichViet.pro
 /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/common/g++.conf:
 /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/common/unix.conf:
 /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/common/linux.conf:
@@ -161,7 +161,7 @@ qmlapplicationviewer/qmlapplicationviewer.pri:
 /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/lex.prf:
 /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/include_source_dir.prf:
 qmake:  FORCE
-       @$(QMAKE) -spec /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/linux-g++-64 -o Makefile LichViet.pro
+       @$(QMAKE) -spec /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/linux-g++-64 QMLJSDEBUGGER_PATH=/opt/qtcreator-2.1.0/share/qtcreator/qml/qmljsdebugger -o Makefile LichViet.pro
 
 dist: 
        @$(CHK_DIR_EXISTS) .tmp/LichViet1.0.2 || $(MKDIR) .tmp/LichViet1.0.2 
@@ -183,7 +183,7 @@ distclean: clean
 first: $(first) copydeploymentfolders
 
 copydeploymentfolders:
-       @echo Copying application data... && $(MKDIR) "/home/cuongle/Garage/lichviet//" && $(COPY_DIR) "/home/cuongle/Garage/lichviet/qml/themes" "/home/cuongle/Garage/lichviet//"
+       @echo Copying application data... && $(MKDIR) "/home/cle/Garage/lichviet//" && $(COPY_DIR) "/home/cle/Garage/lichviet/qml/themes" "/home/cle/Garage/lichviet//"
 
 check: first
 
@@ -295,7 +295,7 @@ qrc_lichviet.o: qrc_lichviet.cpp
 
 install_itemthemes_qml: first FORCE
        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/LichViet// || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/LichViet// 
-       -$(INSTALL_DIR) /home/cuongle/Garage/lichviet/qml/themes $(INSTALL_ROOT)/usr/local/share/LichViet//
+       -$(INSTALL_DIR) /home/cle/Garage/lichviet/qml/themes $(INSTALL_ROOT)/usr/local/share/LichViet//
 
 
 uninstall_itemthemes_qml:  FORCE
@@ -305,7 +305,7 @@ uninstall_itemthemes_qml:  FORCE
 
 install_desktopfile: first FORCE
        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/applications/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/applications/ 
-       -$(INSTALL_FILE) /home/cuongle/Garage/lichviet/LichViet.desktop $(INSTALL_ROOT)/usr/share/applications/
+       -$(INSTALL_FILE) /home/cle/Garage/lichviet/LichViet.desktop $(INSTALL_ROOT)/usr/share/applications/
 
 
 uninstall_desktopfile:  FORCE
@@ -315,7 +315,7 @@ uninstall_desktopfile:  FORCE
 
 install_icon: first FORCE
        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/ 
-       -$(INSTALL_FILE) /home/cuongle/Garage/lichviet/LichViet.png $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/
+       -$(INSTALL_FILE) /home/cle/Garage/lichviet/LichViet.png $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/
 
 
 uninstall_icon:  FORCE
index 331b3f7..6257664 100644 (file)
@@ -24,7 +24,7 @@ import "amlich-aa98.js" as AmLich98
 import "CacNgayLeTrongNam.js" as CNLTN
 
 Item{
-    id: item1
+    id: fullmonth
 
     Rectangle{
         id: fullmonthREC
@@ -49,7 +49,7 @@ Item{
                                     if (CNLTN.is_holiday(day, month, stemp[0], stemp[1]))
                                         return theme_manager.theme.markdate.holidays;
                                     else
-                                        return "#007070"
+                                        return "#000000"//"#007070"
                                 }
                             }
 
@@ -124,8 +124,7 @@ onCanceled:{
                 id: grid
                 x: -335
                 y: 41
-                width:800
-                height: 480
+
                 anchors.horizontalCenterOffset: 15
                 anchors.bottomMargin: -52
                 anchors.topMargin: 42
@@ -133,10 +132,22 @@ onCanceled:{
                 anchors.bottom: parent.bottom
                 anchors.top: parent.top
                 cellWidth: 110; cellHeight: 50
-                //Dung : 64 | Nam :110
+
+                boundsBehavior:Flickable.DragAndOvershootBounds
+                flickableDirection:Flickable.VerticalFlick
+
                 model:lmodel
                 delegate: contactDelegate
-                focus: false
+                focus: true
+
+                onMovementStarted:{
+                   /* var newMonth = screen.curMonth+1;
+                    LC.reset(screen.curDay,newMonth,screen.curYear)
+                    screen.calculateLunar(screen.curDay,newMonth,screen.curYear)
+                    screen.refresh()
+                    reset()*/
+                }
+
             }
 
             ListModel {
index fdf9bda..69c34f0 100644 (file)
@@ -77,10 +77,12 @@ Item{
               model: listModel
               delegate: listDelegate
               focus: true
+              ScrollBar{}
         }
 
     }
 
+
     ToolBar { id: toolBar; height: 50;
         y: screen.height-78
         width: parent.width;
index 63dd0bd..d152e86 100644 (file)
@@ -1,74 +1,14 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
 import QtQuick 1.0
 
-Item {
-    id: scrollBar
-
-    // The properties that define the scrollbar's state.
-    // position and pageSize are in the range 0.0 - 1.0.  They are relative to the
-    // height of the page, i.e. a pageSize of 0.5 means that you can see 50%
-    // of the height of the view.
-    // orientation can be either Qt.Vertical or Qt.Horizontal
-    property real position
-    property real pageSize
-    property variant orientation : Qt.Vertical
+Rectangle {
+    id: scrollbar
 
-    // A light, semi-transparent background
-    Rectangle {
-        id: background
-        anchors.fill: parent
-        radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
-        color: "white"
-        opacity: 0.3
-    }
+    anchors.right: parent.right
+    y: parent.visibleArea.yPosition * parent.height
+    width: 8
+    height: parent.visibleArea.heightRatio * parent.height
+    color: "#000000"
+    opacity: parent.movingVertically ? 0.5 : 0
 
-    // Size the bar to the required size, depending upon the orientation.
-    Rectangle {
-        x: orientation == Qt.Vertical ? 1 : (scrollBar.position * (scrollBar.width-2) + 1)
-        y: orientation == Qt.Vertical ? (scrollBar.position * (scrollBar.height-2) + 1) : 1
-        width: orientation == Qt.Vertical ? (parent.width-2) : (scrollBar.pageSize * (scrollBar.width-2))
-        height: orientation == Qt.Vertical ? (scrollBar.pageSize * (scrollBar.height-2)) : (parent.height-2)
-        radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
-        color: "black"
-        opacity: 0.7
-    }
+    Behavior on opacity { PropertyAnimation { properties: "opacity"; duration: 500 } }
 }
index c305e12..718efcf 100644 (file)
@@ -121,6 +121,8 @@ Item{
               model: listModel
               delegate: listDelegate
               focus: true
+
+              ScrollBar{}
         }
 
     }
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)