Merge branch 'develop'

[lichviet] / qml / LichViet / ToolBar.qml

diff --git a/qml/LichViet/ToolBar.qml b/qml/LichViet/ToolBar.qml
index cfa4f61..d592c49 100644 (file)
--- a/qml/LichViet/ToolBar.qml
+++ b/qml/LichViet/ToolBar.qml
@@ -1,64 +1,57 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/*
+Copyright (C) 2011  by Cuong Le <metacuong@gmail.com>
 
-import QtQuick 1.0
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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.1
 
 Item {
     id: toolbar
 
     property alias button1Label: button1.text
     property alias button2Label: button2.text
+
     signal button1Clicked
     signal button2Clicked
-    focus:true
-    BorderImage { source:  theme_manager.theme.titlebar.sci; width: parent.width; height: parent.height + 14; y: -7 }
+
+    Rectangle {
+        color:"#7373b1"
+        width: parent.width
+        height: parent.height + 14
+
+        radius: 4
+    }
+
     Button {
-        id: button1
-        anchors.left: parent.left; anchors.leftMargin: 5; y: 3; width: 140; height: 40
-        onClicked: toolbar.button1Clicked()
-        focus:true
+        id:button1
+        anchors.left: parent.left
+        anchors.leftMargin: 5
+        y: 5
+        width: 140
+        height: 42
+        onClicked: toolbar.button1Clicked();
     }
+
     Button {
-        id: button2
-        anchors.right: parent.right; anchors.rightMargin: 5; y: 3; width: 140; height: 40
-        onClicked: toolbar.button2Clicked()
+        id:button2
+        anchors.right: parent.right
+        anchors.rightMargin: 5
+        y: 5
+        width: 140
+        height: 42
+        onClicked: toolbar.button2Clicked();
     }
+
 }