pop toolbar if we start recording and its depth is greater than 1

[harmattan/cameraplus] / qml / VideoTorchButton.qml

diff --git a/qml/VideoTorchButton.qml b/qml/VideoTorchButton.qml
index 34f42d2..1392bad 100644 (file)
--- a/qml/VideoTorchButton.qml
+++ b/qml/VideoTorchButton.qml
@@ -20,16 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.1
+import QtQuick 2.0
 import QtCamera 1.0
 
-ToolIcon {
+CameraToolIcon {
     id: button
     property Camera camera: null
 
-    iconSource: settings.videoTorchOn ? "image://theme/icon-m-camera-torch-on"
-        : "image://theme/icon-m-camera-torch-off"
+    iconId: settings.videoTorchOn ? cameraTheme.cameraTorchOnIconId : cameraTheme.cameraTorchOffIconId
     onClicked: settings.videoTorchOn = !settings.videoTorchOn
 
     Binding {