unload post capture and settings views when we are in camera view

[harmattan/cameraplus] / qml / ImageSceneButton.qml

diff --git a/qml/ImageSceneButton.qml b/qml/ImageSceneButton.qml
index dcd4bfe..54ca4fb 100644 (file)
--- a/qml/ImageSceneButton.qml
+++ b/qml/ImageSceneButton.qml
@@ -26,7 +26,7 @@ import QtCamera 1.0
 CameraToolIcon {
     id: button
 
-    iconId: cameraTheme.imageSceneModeIcon(settings.imageSceneMode)
+    iconSource: cameraTheme.imageSceneModeIcon(settings.imageSceneMode)
     property list<ToolsModelItem> toolsModel: [
         ToolsModelItem {icon: cameraTheme.imageSceneModeAutoIconId; value: Scene.Auto},
         ToolsModelItem {icon: cameraTheme.imageSceneModeCloseupIconId; value: Scene.Closeup},
@@ -47,9 +47,10 @@ CameraToolIcon {
             model: parent != null && parent.visible ? toolsModel : undefined
 
             delegate: CheckButton {
-                iconId: icon
+                iconSource: icon
                 onClicked: settings.imageSceneMode = value
                 checked: settings.imageSceneMode == value
+                visible: !(value == Scene.Night && overlay.cam.quirks.hasQuirk(Quirks.NoNightSceneMode))
             }
         }
     }