Camera App ubports#53 : added vibrate on picture shot

- Changed the OptionButton and OptionValueButton logic to suport  icon
source path as well as icon name.

Author: EranUzan

OptionButton.qml

@@ -26,7 +26,10 @@ CircleButton {
     iconName: (!model.get(model.selectedIndex) || !model.get(model.selectedIndex).icon) ?
                                                     (model.icon ? model.icon : "") :
                                                     model.get(model.selectedIndex).icon
-    iconSource: (model && model.iconSource) ? model.iconSource : ""
+    iconSource: (!model.get(model.selectedIndex) || !model.get(model.selectedIndex).iconSource) ?
+                    ((model && model.iconSource) ? model.iconSource : "") :
+                    model.get(model.selectedIndex).iconSource
+
     on: model.isToggle ? model.get(model.selectedIndex).value : true
     enabled: model.visible && model.available
     label: model.label

OptionValueButton.qml

@@ -24,6 +24,7 @@ AbstractButton {
 
     property alias label: label.text
     property alias iconName: icon.name
+    property alias iconSource: icon.source
     property bool selected
     property bool isLast
     property int columnWidth
@@ -32,14 +33,14 @@ AbstractButton {
     width: marginSize + iconLabelGroup.width + marginSize
 
     Item {
+        property bool showIcon:  iconName !== "" || (iconName == ""  && iconSource.toString().match(/^file:\/\//))
         id: iconLabelGroup
-        width: childrenRect.width
+        width: (icon.width * showIcon) + label.width
         height: icon.height
 
         anchors {
-            left: (iconName) ? undefined : parent.left
-            leftMargin: (iconName) ? undefined : marginSize
-            horizontalCenter: (iconName) ? parent.horizontalCenter : undefined
+            left:  parent.left
+            leftMargin: marginSize
             verticalCenter: parent.verticalCenter
             topMargin: marginSize
             bottomMargin: marginSize
@@ -54,14 +55,14 @@ AbstractButton {
             width: optionValueButton.height - optionValueButton.marginSize * 2
             color: "white"
             opacity: optionValueButton.selected ? 1.0 : 0.5
-            visible: name !== ""
+            visible: iconLabelGroup.showIcon
             asynchronous: true
         }
 
         Label {
             id: label
             anchors {
-                left: icon.name != "" ? icon.right : parent.left
+                left: iconLabelGroup.showIcon ? icon.right : parent.left
                 verticalCenter: parent.verticalCenter
             }
 

OptionsOverlay.qml

@@ -143,8 +143,14 @@ Item {
             columnWidth: optionValueSelector.width
 
             label: (model && model.label) ? i18n.tr(model.label) : ""
+
             iconName: (model && model.icon) ? model.icon : ""
             selected: optionValueSelector.model.selectedIndex == index
+            Component.onCompleted: {
+                if (model && model.iconSource) {
+                    iconSource = model.iconSource
+                }
+            }
 
             isLast: index === optionValueSelector.count - 1
             onClicked: {
@@ -155,6 +161,7 @@ Item {
                 }
             }
         }
+
         footerPositioning: ListView.OverlayFooter
         footer: Icon {
             anchors.horizontalCenter: parent.horizontalCenter

ViewFinderOverlay.qml

@@ -54,6 +54,7 @@ Item {
         property bool preferRemovableStorage: false
         property string videoResolution: "1920x1080"
         property bool playShutterSound: true
+        property bool shutterVibration: true
         property var photoResolutions
         property bool dateStampImages: false
         property string dateStampFormat: Qt.locale().dateFormat(Locale.ShortFormat)
@@ -118,6 +119,11 @@ Item {
             //   value
             camera.viewfinder.resolution = camera.advanced.resolution;
         }
+        onImageCaptured: {
+           if(settings.shutterVibration) {
+               Haptics.play({intensity:0.25,duration:UbuntuAnimation.SnapDuration/3});
+           }
+        }
     }
 
     Connections {
@@ -564,24 +570,34 @@ Item {
                 ListModel {
                     id: shutterSoundOptionsModel
 
+                    function setSettingProperty(value) {
+                        settings.shutterVibration = value & 0x1;
+                        settings.playShutterSound = value & 0x2;
+                    }
+
                     property string settingsProperty: "playShutterSound"
                     property string icon: ""
                     property string label: ""
                     property bool isToggle: true
-                    property int selectedIndex: bottomEdge.indexForValue(shutterSoundOptionsModel, settings.playShutterSound)
+                    property int selectedIndex: bottomEdge.indexForValue(shutterSoundOptionsModel, 2 * settings.playShutterSound  + settings.shutterVibration)
                     property bool available: true
                     property bool visible: camera.captureMode === Camera.CaptureStillImage
                     property bool showInIndicators: false
 
                     ListElement {
                         icon: "audio-volume-high"
                         label: QT_TR_NOOP("On")
-                        value: true
+                        value: 2
+                    }
+                    ListElement {
+                        iconSource: "assets/vibrate.png"
+                        label: QT_TR_NOOP("Vibrate")
+                        value: 1
                     }
                     ListElement {
                         icon: "audio-volume-muted"
                         label: QT_TR_NOOP("Off")
-                        value: false
+                        value: 0
                     }
                 },
                 ListModel {