Merge branch 'develop'

[lichviet] / qml / LichViet / MultiTitleBar.qml

diff --git a/qml/LichViet/MultiTitleBar.qml b/qml/LichViet/MultiTitleBar.qml
index b571804..f29a5a1 100644 (file)
--- a/qml/LichViet/MultiTitleBar.qml
+++ b/qml/LichViet/MultiTitleBar.qml
@@ -15,21 +15,13 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
-import QtQuick 1.0
+import QtQuick 1.1
 
 Item {
-    TitleBar { id: titleBar; width: parent.width; height: 60;
-        y: -80
-        untaggedString: ""
-        taggedString: ""
+    TitleBar { id: titleBar; width: parent.width;
+        onMinimize:  ROOT.minimize();
+        onClose: Qt.quit();
+
+        caption: "Lịch Việt"
     }
-    states: [
-        State {
-            name: "search"; when: screen.state!="search"
-            PropertyChanges { target: titleBar; y: 0 }
-        }
-    ]
-    transitions: [
-        Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad } }
-    ]
 }