Modify icon opacity instead of using different icons for enabled/disabled states

diff --git a/qml/PostCaptureView.qml b/qml/PostCaptureView.qml
index b0bf1d6..8bbd1d4 100644 (file)
--- a/qml/PostCaptureView.qml
+++ b/qml/PostCaptureView.qml
@@ -25,6 +25,7 @@ import CameraPlus 1.0
 import QtCamera 1.0
 
 // TODO: qrc:/qml/PostCaptureView.qml:104:5: QML CameraToolBar: Binding loop detected for property "height"
+// TODO: try to reload the preview thumbnail when the picture becomes available
 Item {
     id: postCaptureView
 
@@ -133,7 +134,8 @@ Item {
 
         tools: CameraToolBarTools {
             CameraToolIcon {
-                iconId: !available ? cameraTheme.favoriteDisabledIconId : view.currentItem.itemData.favorite ? cameraTheme.favoriteMarkIconId : cameraTheme.favoriteUnmarkIconId
+                iconId: available && view.currentItem.itemData.favorite ? cameraTheme.favoriteMarkIconId : cameraTheme.favoriteUnmarkIconId
+                opacity: available ? 1.0 : 0.4
                 onClicked: {
                     addOrRemoveFavorite()
                     restartTimer()
@@ -141,7 +143,8 @@ Item {
             }
 
             CameraToolIcon {
-                iconId: available ? cameraTheme.shareEnabledIconId : cameraTheme.shareDisabledIconId
+                iconId: cameraTheme.shareIconId
+                opacity: available ? 1.0 : 0.4
                 onClicked: {
                     shareCurrentItem()
                     restartTimer()
@@ -149,7 +152,8 @@ Item {
             }
 
             CameraToolIcon {
-                iconId: available ? cameraTheme.deleteEnabledIconId : cameraTheme.deleteDisabledIconId
+                iconId: cameraTheme.deleteIconId
+                opacity: available ? 1.0 : 0.4
                 onClicked: {
                     deleteCurrentItem()
                     restartTimer()

diff --git a/qml/harmattan/CameraTheme.qml b/qml/harmattan/CameraTheme.qml
index 3511142..fe2904b 100644 (file)
--- a/qml/harmattan/CameraTheme.qml
+++ b/qml/harmattan/CameraTheme.qml
@@ -44,11 +44,8 @@ QtObject {
     property string captureButtonVideoIconId: "icon-m-camera-video-record"
     property string captureButtonRecordingIconId: "icon-m-camera-video-record"
     property string cameraToolBarMenuIcon: "icon-m-toolbar-back-white"
-    property string deleteEnabledIconId: "icon-m-toolbar-delete-white"
-    property string deleteDisabledIconId: "icon-m-toolbar-delete-dimmed-white"
-    property string shareEnabledIconId: "icon-m-toolbar-share-white"
-    property string shareDisabledIconId: "icon-m-toolbar-share-dimmed-white"
-    property string favoriteDisabledIconId: "icon-m-toolbar-favorite-mark-dimmed-white"
+    property string deleteIconId: "icon-m-toolbar-delete-white"
+    property string shareIconId: "icon-m-toolbar-share-white"
     property string favoriteMarkIconId: "icon-m-toolbar-favorite-mark-white"
     property string favoriteUnmarkIconId: "icon-m-toolbar-favorite-unmark-white"
     property string menuIconId: "icon-m-toolbar-view-menu-white"