projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hide video torch setting when front camera is active
[harmattan/cameraplus]
/
qml
/
CaptureButton.qml
diff --git
a/qml/CaptureButton.qml
b/qml/CaptureButton.qml
index
9f0dde5
..
2c6d4fc
100644
(file)
--- a/
qml/CaptureButton.qml
+++ b/
qml/CaptureButton.qml
@@
-20,12
+20,12
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
Item {
id: button
Item {
id: button
- property
url iconS
ource
+ property
alias iconSource: icon.s
ource
property CameraButtonStyle platformStyle: CameraButtonStyle {}
property alias pressed: mouse.pressed
property CameraButtonStyle platformStyle: CameraButtonStyle {}
property alias pressed: mouse.pressed
@@
-49,7
+49,7
@@
Item {
border.top: button.platformStyle.backgroundMarginTop
border.right: button.platformStyle.backgroundMarginRight
border.bottom: button.platformStyle.backgroundMarginBottom
border.top: button.platformStyle.backgroundMarginTop
border.right: button.platformStyle.backgroundMarginRight
border.bottom: button.platformStyle.backgroundMarginBottom
- source:
pressed ? button.platformStyle.pressedBackground : button.platformStyle.background
+ source: pressed ? button.platformStyle.pressedBackground : button.platformStyle.background
}
Image {
}
Image {
@@
-57,7
+57,6
@@
Item {
anchors.centerIn: parent
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: -1
anchors.centerIn: parent
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: -1
- source: button.iconSource
visible: source != ""
}
}
visible: source != ""
}
}