Merge branch 'master' into develop

diff --git a/LichViet.pro b/LichViet.pro
index 406941b..5e1e4da 100644 (file)
--- a/LichViet.pro
+++ b/LichViet.pro
@@ -1,20 +1,21 @@
-VERSION = 1.0.1
+VERSION = 1.0.2
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 # Add more folders to ship with the application, here
 #folder_01.source = qml/LichViet
 #folder_01.target = qml
 #DEPLOYMENTFOLDERS = folder_01
-themes.source = themes
-themes.target = /
-DEPLOYMENTFOLDERS = themes
+themes_qml.source = qml/themes
+themes_qml.target = /
+DEPLOYMENTFOLDERS = themes_qml
+
 
 # Additional import path used to resolve QML modules in Creator's code model
-QML_IMPORT_PATH =
+#QML_IMPORT_PATH =
 
-symbian:TARGET.UID3 = 0xE3016781
+#symbian:TARGET.UID3 = 0xE3016781
 
 # Allow network access on Symbian
-symbian:TARGET.CAPABILITY += NetworkServices
+#symbian:TARGET.CAPABILITY += NetworkServices
 
 # Define QMLJSDEBUGGER to allow debugging of QML in debug builds
 # (This might significantly increase build time)

diff --git a/Makefile b/Makefile
index d533cd3..d2eaf80 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,25 @@
 #############################################################################
 # Makefile for building: LichViet
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Mon Aug 8 14:03:43 2011
+# Generated by qmake (2.01a) (Qt 4.7.3) on: Wed Aug 24 08:25:07 2011
 # Project:  LichViet.pro
 # Template: app
-# Command: /usr/bin/qmake -unix -o Makefile LichViet.pro
+# Command: /opt/QtSDK/Desktop/Qt/473/gcc/bin/qmake -spec /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/linux-g++-64 -o Makefile LichViet.pro
 #############################################################################
 
 ####### Compiler, tools and options
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DAPP_VERSION=\"1.0.1\" -DQT_NO_DEBUG -DQT_DECLARATIVE_LIB -DQT_GUI_LIB -DQT_CORE_LIB
-CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtDeclarative -I/usr/include/qt4 -Iqmlapplicationviewer -I.
+DEFINES       = -DAPP_VERSION=\"1.0.2\" -DQT_NO_DEBUG -DQT_DECLARATIVE_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS        = -m64 -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
+CXXFLAGS      = -m64 -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
+INCPATH       = -I/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/linux-g++-64 -I. -I/opt/QtSDK/Desktop/Qt/473/gcc/include/QtCore -I/opt/QtSDK/Desktop/Qt/473/gcc/include/QtGui -I/opt/QtSDK/Desktop/Qt/473/gcc/include/QtDeclarative -I/opt/QtSDK/Desktop/Qt/473/gcc/include -Iqmlapplicationviewer -I.
 LINK          = g++
-LFLAGS        = -Wl,-O1
-LIBS          = $(SUBLIBS)  -L/usr/lib -lQtDeclarative -lQtGui -lQtCore -lpthread 
+LFLAGS        = -m64 -Wl,-O1 -Wl,-rpath,/opt/QtSDK/Desktop/Qt/473/gcc/lib
+LIBS          = $(SUBLIBS)  -L/opt/QtSDK/Desktop/Qt/473/gcc/lib -lQtDeclarative -lQtGui -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
-QMAKE         = /usr/bin/qmake
+QMAKE         = /opt/QtSDK/Desktop/Qt/473/gcc/bin/qmake
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 COPY          = cp -f
@@ -54,26 +54,27 @@ OBJECTS       = main.o \
                moc_qmlapplicationviewer.o \
                moc_lunarcalendar.o \
                qrc_lichviet.o
-DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
-               /usr/share/qt4/mkspecs/common/unix.conf \
-               /usr/share/qt4/mkspecs/common/linux.conf \
-               /usr/share/qt4/mkspecs/qconfig.pri \
-               /usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /usr/share/qt4/mkspecs/features/qt_config.prf \
-               /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /usr/share/qt4/mkspecs/features/default_pre.prf \
+DIST          = /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 \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/qconfig.pri \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/modules/qt_webkit_version.pri \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/qt_functions.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/qt_config.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/exclusive_builds.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/default_pre.prf \
                qmlapplicationviewer/qmlapplicationviewer.pri \
-               /usr/share/qt4/mkspecs/features/release.prf \
-               /usr/share/qt4/mkspecs/features/default_post.prf \
-               /usr/share/qt4/mkspecs/features/warn_on.prf \
-               /usr/share/qt4/mkspecs/features/qt.prf \
-               /usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /usr/share/qt4/mkspecs/features/moc.prf \
-               /usr/share/qt4/mkspecs/features/resources.prf \
-               /usr/share/qt4/mkspecs/features/uic.prf \
-               /usr/share/qt4/mkspecs/features/yacc.prf \
-               /usr/share/qt4/mkspecs/features/lex.prf \
-               /usr/share/qt4/mkspecs/features/include_source_dir.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/release.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/default_post.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/warn_on.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/qt.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/unix/thread.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/moc.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/resources.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/uic.prf \
+               /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 \
                LichViet.pro
 QMAKE_TARGET  = LichViet
 DESTDIR       = 
@@ -106,53 +107,55 @@ all: Makefile $(TARGET)
 $(TARGET):  $(OBJECTS)  
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: LichViet.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
-               /usr/share/qt4/mkspecs/common/unix.conf \
-               /usr/share/qt4/mkspecs/common/linux.conf \
-               /usr/share/qt4/mkspecs/qconfig.pri \
-               /usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /usr/share/qt4/mkspecs/features/qt_config.prf \
-               /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /usr/share/qt4/mkspecs/features/default_pre.prf \
+Makefile: LichViet.pro  /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/linux-g++-64/qmake.conf /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 \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/qconfig.pri \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/modules/qt_webkit_version.pri \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/qt_functions.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/qt_config.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/exclusive_builds.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/default_pre.prf \
                qmlapplicationviewer/qmlapplicationviewer.pri \
-               /usr/share/qt4/mkspecs/features/release.prf \
-               /usr/share/qt4/mkspecs/features/default_post.prf \
-               /usr/share/qt4/mkspecs/features/warn_on.prf \
-               /usr/share/qt4/mkspecs/features/qt.prf \
-               /usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /usr/share/qt4/mkspecs/features/moc.prf \
-               /usr/share/qt4/mkspecs/features/resources.prf \
-               /usr/share/qt4/mkspecs/features/uic.prf \
-               /usr/share/qt4/mkspecs/features/yacc.prf \
-               /usr/share/qt4/mkspecs/features/lex.prf \
-               /usr/share/qt4/mkspecs/features/include_source_dir.prf
-       $(QMAKE) -unix -o Makefile LichViet.pro
-/usr/share/qt4/mkspecs/common/g++.conf:
-/usr/share/qt4/mkspecs/common/unix.conf:
-/usr/share/qt4/mkspecs/common/linux.conf:
-/usr/share/qt4/mkspecs/qconfig.pri:
-/usr/share/qt4/mkspecs/features/qt_functions.prf:
-/usr/share/qt4/mkspecs/features/qt_config.prf:
-/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
-/usr/share/qt4/mkspecs/features/default_pre.prf:
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/release.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/default_post.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/warn_on.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/qt.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/unix/thread.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/moc.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/resources.prf \
+               /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/uic.prf \
+               /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
+/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:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/qconfig.pri:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/modules/qt_webkit_version.pri:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/qt_functions.prf:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/qt_config.prf:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/exclusive_builds.prf:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/default_pre.prf:
 qmlapplicationviewer/qmlapplicationviewer.pri:
-/usr/share/qt4/mkspecs/features/release.prf:
-/usr/share/qt4/mkspecs/features/default_post.prf:
-/usr/share/qt4/mkspecs/features/warn_on.prf:
-/usr/share/qt4/mkspecs/features/qt.prf:
-/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/usr/share/qt4/mkspecs/features/moc.prf:
-/usr/share/qt4/mkspecs/features/resources.prf:
-/usr/share/qt4/mkspecs/features/uic.prf:
-/usr/share/qt4/mkspecs/features/yacc.prf:
-/usr/share/qt4/mkspecs/features/lex.prf:
-/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/release.prf:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/default_post.prf:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/warn_on.prf:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/qt.prf:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/unix/thread.prf:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/moc.prf:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/resources.prf:
+/opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/features/uic.prf:
+/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:  FORCE
-       @$(QMAKE) -unix -o Makefile LichViet.pro
+       @$(QMAKE) -spec /opt/QtSDK/Desktop/Qt/473/gcc/mkspecs/linux-g++-64 -o Makefile LichViet.pro
 
 dist: 
-       @$(CHK_DIR_EXISTS) .tmp/LichViet1.0.1 || $(MKDIR) .tmp/LichViet1.0.1 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/LichViet1.0.1/ && $(COPY_FILE) --parents qmlapplicationviewer/qmlapplicationviewer.h lunarcalendar.h .tmp/LichViet1.0.1/ && $(COPY_FILE) --parents lichviet.qrc .tmp/LichViet1.0.1/ && $(COPY_FILE) --parents main.cpp lunarcalendar.cpp qmlapplicationviewer/qmlapplicationviewer.cpp .tmp/LichViet1.0.1/ && (cd `dirname .tmp/LichViet1.0.1` && $(TAR) LichViet1.0.1.tar LichViet1.0.1 && $(COMPRESS) LichViet1.0.1.tar) && $(MOVE) `dirname .tmp/LichViet1.0.1`/LichViet1.0.1.tar.gz . && $(DEL_FILE) -r .tmp/LichViet1.0.1
+       @$(CHK_DIR_EXISTS) .tmp/LichViet1.0.2 || $(MKDIR) .tmp/LichViet1.0.2 
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/LichViet1.0.2/ && $(COPY_FILE) --parents qmlapplicationviewer/qmlapplicationviewer.h lunarcalendar.h .tmp/LichViet1.0.2/ && $(COPY_FILE) --parents lichviet.qrc .tmp/LichViet1.0.2/ && $(COPY_FILE) --parents main.cpp lunarcalendar.cpp qmlapplicationviewer/qmlapplicationviewer.cpp .tmp/LichViet1.0.2/ && (cd `dirname .tmp/LichViet1.0.2` && $(TAR) LichViet1.0.2.tar LichViet1.0.2 && $(COMPRESS) LichViet1.0.2.tar) && $(MOVE) `dirname .tmp/LichViet1.0.2`/LichViet1.0.2.tar.gz . && $(DEL_FILE) -r .tmp/LichViet1.0.2
 
 
 clean:compiler_clean 
@@ -170,7 +173,9 @@ distclean: clean
 first: $(first) copydeploymentfolders
 
 copydeploymentfolders:
-       @echo Copying application data... && $(MKDIR) "/home/cle/Nokia/LichViet//" && $(COPY_DIR) "/home/cle/Nokia/LichViet/themes" "/home/cle/Nokia/LichViet//"
+       @echo Copying application data... && $(MKDIR) "/home/cuongle/Garage/lichviet//" && $(COPY_DIR) "/home/cuongle/Garage/lichviet/qml/themes" "/home/cuongle/Garage/lichviet//"
+
+check: first
 
 mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
@@ -180,16 +185,40 @@ compiler_moc_header_make_all: moc_qmlapplicationviewer.cpp moc_lunarcalendar.cpp
 compiler_moc_header_clean:
        -$(DEL_FILE) moc_qmlapplicationviewer.cpp moc_lunarcalendar.cpp
 moc_qmlapplicationviewer.cpp: qmlapplicationviewer/qmlapplicationviewer.h
-       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) qmlapplicationviewer/qmlapplicationviewer.h -o moc_qmlapplicationviewer.cpp
+       /opt/QtSDK/Desktop/Qt/473/gcc/bin/moc $(DEFINES) $(INCPATH) qmlapplicationviewer/qmlapplicationviewer.h -o moc_qmlapplicationviewer.cpp
 
 moc_lunarcalendar.cpp: lunarcalendar.h
-       /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) lunarcalendar.h -o moc_lunarcalendar.cpp
+       /opt/QtSDK/Desktop/Qt/473/gcc/bin/moc $(DEFINES) $(INCPATH) lunarcalendar.h -o moc_lunarcalendar.cpp
 
 compiler_rcc_make_all: qrc_lichviet.cpp
 compiler_rcc_clean:
        -$(DEL_FILE) qrc_lichviet.cpp
-qrc_lichviet.cpp: lichviet.qrc
-       /usr/bin/rcc -name lichviet lichviet.qrc -o qrc_lichviet.cpp
+qrc_lichviet.cpp: lichviet.qrc \
+               LichViet.png \
+               qml/LichViet/DateTimeDialog.qml \
+               qml/LichViet/About.qml \
+               qml/LichViet/OptionsScreen.qml \
+               qml/LichViet/Settings.js \
+               qml/LichViet/amlich-hnd.js \
+               qml/LichViet/NoFeatureDialog.qml \
+               qml/LichViet/FullMonth.qml \
+               qml/LichViet/ToolBarSingle.qml \
+               qml/LichViet/Switch.qml \
+               qml/LichViet/amlich-aa98.js \
+               qml/LichViet/XemNgayTotXauHoangDao.qml \
+               qml/LichViet/Themes.js \
+               qml/LichViet/AmDateTimeDialog.qml \
+               qml/LichViet/ToolBar.qml \
+               qml/LichViet/MultiTitleBar.qml \
+               qml/LichViet/main.qml \
+               qml/LichViet/MenuScreen.qml \
+               qml/LichViet/Button.qml \
+               qml/LichViet/xemngaytotxau.js \
+               qml/LichViet/TitleBar.qml \
+               qml/DatePicker/component/Reel.qml \
+               qml/DatePicker/component/Button.qml \
+               qml/DatePicker/component/DateReel.qml
+       /opt/QtSDK/Desktop/Qt/473/gcc/bin/rcc -name lichviet lichviet.qrc -o qrc_lichviet.cpp
 
 compiler_image_collection_make_all: qmake_image_collection.cpp
 compiler_image_collection_clean:
@@ -228,19 +257,19 @@ qrc_lichviet.o: qrc_lichviet.cpp
 
 ####### Install
 
-install_itemthemes: first FORCE
+install_itemthemes_qml: first FORCE
        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/LichViet// || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/LichViet// 
-       -$(INSTALL_DIR) /home/cle/Nokia/LichViet/themes $(INSTALL_ROOT)/usr/local/share/LichViet//
+       -$(INSTALL_DIR) /home/cuongle/Garage/lichviet/qml/themes $(INSTALL_ROOT)/usr/local/share/LichViet//
 
 
-uninstall_itemthemes:  FORCE
+uninstall_itemthemes_qml:  FORCE
        -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/LichViet//themes
        -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/LichViet// 
 
 
 install_desktopfile: first FORCE
        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/applications/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/applications/ 
-       -$(INSTALL_FILE) /home/cle/Nokia/LichViet/LichViet.desktop $(INSTALL_ROOT)/usr/share/applications/
+       -$(INSTALL_FILE) /home/cuongle/Garage/lichviet/LichViet.desktop $(INSTALL_ROOT)/usr/share/applications/
 
 
 uninstall_desktopfile:  FORCE
@@ -250,7 +279,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/cle/Nokia/LichViet/LichViet.png $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/
+       -$(INSTALL_FILE) /home/cuongle/Garage/lichviet/LichViet.png $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/
 
 
 uninstall_icon:  FORCE
@@ -268,9 +297,9 @@ uninstall_target:  FORCE
        -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/ 
 
 
-install:  install_itemthemes install_desktopfile install_icon install_target  FORCE
+install:  install_itemthemes_qml install_desktopfile install_icon install_target  FORCE
 
-uninstall: uninstall_itemthemes uninstall_desktopfile uninstall_icon uninstall_target   FORCE
+uninstall: uninstall_itemthemes_qml uninstall_desktopfile uninstall_icon uninstall_target   FORCE
 
 FORCE:
 

diff --git a/lunarcalendar.cpp b/lunarcalendar.cpp
index 39c4cfd..f2c0b48 100644 (file)
--- a/lunarcalendar.cpp
+++ b/lunarcalendar.cpp
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include "lunarcalendar.h"
 
 LunarCalendar::LunarCalendar(QObject *parent) :

diff --git a/lunarcalendar.h b/lunarcalendar.h
index 957ad05..72867c5 100644 (file)
--- a/lunarcalendar.h
+++ b/lunarcalendar.h
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 #ifndef LUNARCALENDAR_H
 #define LUNARCALENDAR_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class LunarCalendar : public QObject
 {

diff --git a/qml/LichViet/About.qml b/qml/LichViet/About.qml
index efd3e6d..7947508 100644 (file)
--- a/qml/LichViet/About.qml
+++ b/qml/LichViet/About.qml
@@ -71,7 +71,7 @@ Item{
         y: 234
         width: 80
         height: 20
-        text: "Phiên bản : 1.0.1 (build 401.23.08.2011)<br>\
+        text: "Phiên bản : 1.0.2 (build 35.23.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

diff --git a/qml/themes/default/background.jpg b/qml/themes/default/background.jpg
new file mode 100644 (file)
index 0000000..c61f523
Binary files /dev/null and b/qml/themes/default/background.jpg differ

diff --git a/qml/themes/default/default.qml b/qml/themes/default/default.qml
new file mode 100644 (file)
index 0000000..c38a499
--- /dev/null
+++ b/qml/themes/default/default.qml
@@ -0,0 +1,37 @@
+import QtQuick 1.0
+
+Item {
+    id:theme
+    property alias titlebar: titlebar
+    property alias datepicker: datepicker
+    property alias toolbar: toolbar
+
+    property string root_dir : "file:/opt/usr/share/LichViet/themes/default/" 
+    property string background_image: root_dir+"background.jpg"
+
+    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"
+    }
+
+    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"
+    }
+}

diff --git a/qml/themes/default/dp_button.png b/qml/themes/default/dp_button.png
new file mode 100644 (file)
index 0000000..fcdc4ff
Binary files /dev/null and b/qml/themes/default/dp_button.png differ

diff --git a/qml/themes/default/dp_button_active.png b/qml/themes/default/dp_button_active.png
new file mode 100644 (file)
index 0000000..604d829
Binary files /dev/null and b/qml/themes/default/dp_button_active.png differ

diff --git a/qml/themes/default/dp_button_pressed.png b/qml/themes/default/dp_button_pressed.png
new file mode 100644 (file)
index 0000000..162b194
Binary files /dev/null and b/qml/themes/default/dp_button_pressed.png differ

diff --git a/qml/themes/default/gloss.png b/qml/themes/default/gloss.png
new file mode 100644 (file)
index 0000000..5d370cd
Binary files /dev/null and b/qml/themes/default/gloss.png differ

diff --git a/qml/themes/default/lineedit.png b/qml/themes/default/lineedit.png
new file mode 100644 (file)
index 0000000..2cc38dc
Binary files /dev/null and b/qml/themes/default/lineedit.png differ

diff --git a/qml/themes/default/lineedit.sci b/qml/themes/default/lineedit.sci
new file mode 100644 (file)
index 0000000..054bff7
--- /dev/null
+++ b/qml/themes/default/lineedit.sci
@@ -0,0 +1,5 @@
+border.left: 10
+border.top: 10
+border.bottom: 10
+border.right: 10
+source: lineedit.png

diff --git a/qml/themes/default/quit.png b/qml/themes/default/quit.png
new file mode 100644 (file)
index 0000000..69dc1b8
Binary files /dev/null and b/qml/themes/default/quit.png differ

diff --git a/qml/themes/default/quit_pressed.png b/qml/themes/default/quit_pressed.png
new file mode 100644 (file)
index 0000000..972ece5
Binary files /dev/null and b/qml/themes/default/quit_pressed.png differ

diff --git a/qml/themes/default/stripes.png b/qml/themes/default/stripes.png
new file mode 100644 (file)
index 0000000..9f36727
Binary files /dev/null and b/qml/themes/default/stripes.png differ

diff --git a/qml/themes/default/switch_off.png b/qml/themes/default/switch_off.png
new file mode 100644 (file)
index 0000000..3a9098c
Binary files /dev/null and b/qml/themes/default/switch_off.png differ

diff --git a/qml/themes/default/switch_on.png b/qml/themes/default/switch_on.png
new file mode 100644 (file)
index 0000000..666d052
Binary files /dev/null and b/qml/themes/default/switch_on.png differ

diff --git a/qml/themes/default/titlebar.png b/qml/themes/default/titlebar.png
new file mode 100644 (file)
index 0000000..51c9008
Binary files /dev/null and b/qml/themes/default/titlebar.png differ

diff --git a/qml/themes/default/titlebar.sci b/qml/themes/default/titlebar.sci
new file mode 100644 (file)
index 0000000..0418d94
--- /dev/null
+++ b/qml/themes/default/titlebar.sci
@@ -0,0 +1,5 @@
+border.left: 10
+border.top: 12
+border.bottom: 12
+border.right: 10
+source: titlebar.png

diff --git a/qml/themes/default/toolbutton-back.png b/qml/themes/default/toolbutton-back.png
new file mode 100644 (file)
index 0000000..1131001
Binary files /dev/null and b/qml/themes/default/toolbutton-back.png differ

diff --git a/qml/themes/default/toolbutton.png b/qml/themes/default/toolbutton.png
new file mode 100644 (file)
index 0000000..9ecc83b
Binary files /dev/null and b/qml/themes/default/toolbutton.png differ

diff --git a/qml/themes/default/toolbutton.sci b/qml/themes/default/toolbutton.sci
new file mode 100644 (file)
index 0000000..9e4f965
--- /dev/null
+++ b/qml/themes/default/toolbutton.sci
@@ -0,0 +1,5 @@
+border.left: 15
+border.top: 4
+border.bottom: 4
+border.right: 15
+source: toolbutton.png

diff --git a/qml/themes/default/toolbutton_pressed.png b/qml/themes/default/toolbutton_pressed.png
new file mode 100644 (file)
index 0000000..4d2969f
Binary files /dev/null and b/qml/themes/default/toolbutton_pressed.png differ

diff --git a/qml/themes/default/toolbutton_pressed.sci b/qml/themes/default/toolbutton_pressed.sci
new file mode 100644 (file)
index 0000000..95a4502
--- /dev/null
+++ b/qml/themes/default/toolbutton_pressed.sci
@@ -0,0 +1,5 @@
+border.left: 15
+border.top: 4
+border.bottom: 4
+border.right: 15
+source: toolbutton_pressed.png

diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index 5e8c52a..4d3984d 100644 (file)
--- a/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@ -1,4 +1,4 @@
-lichviet (1.0.1) unstable-develop; urgency=low
+lichviet (1.0.2) unstable-develop; urgency=low
 
   * Initial Release.
 

diff --git a/qtc_packaging/debian_fremantle/compat b/qtc_packaging/debian_fremantle/compat
index 7f8f011..7ed6ff8 100644 (file)
--- a/qtc_packaging/debian_fremantle/compat
+++ b/qtc_packaging/debian_fremantle/compat
@@ -1 +1 @@
-7
+5

diff --git a/qtc_packaging/debian_fremantle/control b/qtc_packaging/debian_fremantle/control
index 211c7ae..6d99718 100644 (file)
--- a/qtc_packaging/debian_fremantle/control
+++ b/qtc_packaging/debian_fremantle/control
@@ -9,8 +9,9 @@ Homepage: http://lichviet.garage.maemo.org
 Package: lichviet
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mcsp, qtquickcompat
-Description: Lịch Âm cho cộng đồng Maemo/Meego Diễn Đàn Tinh Tế.
+Description: VietNamese Lunar Calendar
 XSBC-Maemo-Display-Name: Lich Viet
+XSBC-Bugtracker: https://garage.maemo.org/tracker/?group_id=2235
 XB-Maemo-Icon-26:
  iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c
  6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0

diff --git a/qtc_packaging/debian_fremantle/rules b/qtc_packaging/debian_fremantle/rules
old mode 100644 (file)
new mode 100755 (executable)
index f81db3f..d81fee2
--- a/qtc_packaging/debian_fremantle/rules
+++ b/qtc_packaging/debian_fremantle/rules
@@ -60,9 +60,9 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
-#      dh_installchangelogs 
-#      dh_installdocs
-#      dh_installexamples
+       dh_installchangelogs 
+       dh_installdocs
+       dh_installexamples
 #      dh_install
 #      dh_installmenu
 #      dh_installdebconf       
@@ -82,7 +82,7 @@ binary-arch: build install
 #      dh_perl
 #      dh_makeshlibs
        dh_installdeb
-       # dh_shlibdeps                      # Uncomment this line for publishing!
+       #dh_shlibdeps                      # Uncomment this line for publishing!
        dh_gencontrol
        dh_md5sums
        dh_builddeb

diff --git a/themes/default/background.jpg b/themes/default/background.jpg
deleted file mode 100644 (file)
index c61f523..0000000
Binary files a/themes/default/background.jpg and /dev/null differ

diff --git a/themes/default/default.qml b/themes/default/default.qml
deleted file mode 100644 (file)
index c38a499..0000000
--- a/themes/default/default.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import QtQuick 1.0
-
-Item {
-    id:theme
-    property alias titlebar: titlebar
-    property alias datepicker: datepicker
-    property alias toolbar: toolbar
-
-    property string root_dir : "file:/opt/usr/share/LichViet/themes/default/" 
-    property string background_image: root_dir+"background.jpg"
-
-    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"
-    }
-
-    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"
-    }
-}

diff --git a/themes/default/dp_button.png b/themes/default/dp_button.png
deleted file mode 100644 (file)
index fcdc4ff..0000000
Binary files a/themes/default/dp_button.png and /dev/null differ

diff --git a/themes/default/dp_button_active.png b/themes/default/dp_button_active.png
deleted file mode 100644 (file)
index 604d829..0000000
Binary files a/themes/default/dp_button_active.png and /dev/null differ

diff --git a/themes/default/dp_button_pressed.png b/themes/default/dp_button_pressed.png
deleted file mode 100644 (file)
index 162b194..0000000
Binary files a/themes/default/dp_button_pressed.png and /dev/null differ

diff --git a/themes/default/gloss.png b/themes/default/gloss.png
deleted file mode 100644 (file)
index 5d370cd..0000000
Binary files a/themes/default/gloss.png and /dev/null differ

diff --git a/themes/default/lineedit.png b/themes/default/lineedit.png
deleted file mode 100644 (file)
index 2cc38dc..0000000
Binary files a/themes/default/lineedit.png and /dev/null differ

diff --git a/themes/default/lineedit.sci b/themes/default/lineedit.sci
deleted file mode 100644 (file)
index 054bff7..0000000
--- a/themes/default/lineedit.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 10
-border.top: 10
-border.bottom: 10
-border.right: 10
-source: lineedit.png

diff --git a/themes/default/quit.png b/themes/default/quit.png
deleted file mode 100644 (file)
index 69dc1b8..0000000
Binary files a/themes/default/quit.png and /dev/null differ

diff --git a/themes/default/quit_pressed.png b/themes/default/quit_pressed.png
deleted file mode 100644 (file)
index 972ece5..0000000
Binary files a/themes/default/quit_pressed.png and /dev/null differ

diff --git a/themes/default/stripes.png b/themes/default/stripes.png
deleted file mode 100644 (file)
index 9f36727..0000000
Binary files a/themes/default/stripes.png and /dev/null differ

diff --git a/themes/default/switch_off.png b/themes/default/switch_off.png
deleted file mode 100644 (file)
index 3a9098c..0000000
Binary files a/themes/default/switch_off.png and /dev/null differ

diff --git a/themes/default/switch_on.png b/themes/default/switch_on.png
deleted file mode 100644 (file)
index 666d052..0000000
Binary files a/themes/default/switch_on.png and /dev/null differ

diff --git a/themes/default/titlebar.png b/themes/default/titlebar.png
deleted file mode 100644 (file)
index 51c9008..0000000
Binary files a/themes/default/titlebar.png and /dev/null differ

diff --git a/themes/default/titlebar.sci b/themes/default/titlebar.sci
deleted file mode 100644 (file)
index 0418d94..0000000
--- a/themes/default/titlebar.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 10
-border.top: 12
-border.bottom: 12
-border.right: 10
-source: titlebar.png

diff --git a/themes/default/toolbutton-back.png b/themes/default/toolbutton-back.png
deleted file mode 100644 (file)
index 1131001..0000000
Binary files a/themes/default/toolbutton-back.png and /dev/null differ

diff --git a/themes/default/toolbutton.png b/themes/default/toolbutton.png
deleted file mode 100644 (file)
index 9ecc83b..0000000
Binary files a/themes/default/toolbutton.png and /dev/null differ

diff --git a/themes/default/toolbutton.sci b/themes/default/toolbutton.sci
deleted file mode 100644 (file)
index 9e4f965..0000000
--- a/themes/default/toolbutton.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 15
-border.top: 4
-border.bottom: 4
-border.right: 15
-source: toolbutton.png

diff --git a/themes/default/toolbutton_pressed.png b/themes/default/toolbutton_pressed.png
deleted file mode 100644 (file)
index 4d2969f..0000000
Binary files a/themes/default/toolbutton_pressed.png and /dev/null differ

diff --git a/themes/default/toolbutton_pressed.sci b/themes/default/toolbutton_pressed.sci
deleted file mode 100644 (file)
index 95a4502..0000000
--- a/themes/default/toolbutton_pressed.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 15
-border.top: 4
-border.bottom: 4
-border.right: 15
-source: toolbutton_pressed.png