From 9fda7f8b0e9a317b0ab90463f1d0a163abc7e319 Mon Sep 17 00:00:00 2001 From: Mohammed Sameer Date: Wed, 31 Jul 2013 21:32:54 +0300 Subject: [PATCH] Convert most iconSource usage to iconId --- qml/CameraToolBar.qml | 2 +- qml/CaptureButton.qml | 4 ++-- qml/FlashButton.qml | 2 +- qml/ImageColorFilterButton.qml | 2 +- qml/ImageEvCompButton.qml | 2 +- qml/ImageIsoButton.qml | 2 +- qml/ImageOverlay.qml | 2 +- qml/ImageSceneButton.qml | 2 +- qml/ImageWhiteBalanceButton.qml | 2 +- qml/ModeButton.qml | 4 +--- qml/PostCaptureItem.qml | 2 +- qml/VideoColorFilterButton.qml | 2 +- qml/VideoEvCompButton.qml | 2 +- qml/VideoMuteButton.qml | 4 ++-- qml/VideoOverlay.qml | 2 +- qml/VideoSceneButton.qml | 2 +- qml/VideoTorchButton.qml | 3 +-- qml/VideoWhiteBalanceButton.qml | 2 +- 18 files changed, 20 insertions(+), 23 deletions(-) diff --git a/qml/CameraToolBar.qml b/qml/CameraToolBar.qml index a31de13..143bc98 100644 --- a/qml/CameraToolBar.qml +++ b/qml/CameraToolBar.qml @@ -48,7 +48,7 @@ Rectangle { visible: !parent.hideBack id: menu anchors.verticalCenter: parent.verticalCenter - iconSource: "image://theme/icon-m-toolbar-back-white" + iconId: "icon-m-toolbar-back-white" onClicked: { if (tools.manualBack) { tools.clicked() diff --git a/qml/CaptureButton.qml b/qml/CaptureButton.qml index 71e7c89..d314cc9 100644 --- a/qml/CaptureButton.qml +++ b/qml/CaptureButton.qml @@ -25,7 +25,7 @@ import QtQuick 2.0 Item { id: button - property url iconSource + property string iconId property CameraButtonStyle platformStyle: CameraButtonStyle {} property alias pressed: mouse.pressed @@ -57,7 +57,7 @@ Item { anchors.centerIn: parent anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: -1 - source: button.iconSource + source: "image://theme/" + button.iconId visible: source != "" } } diff --git a/qml/FlashButton.qml b/qml/FlashButton.qml index ba62c21..76bc0fb 100644 --- a/qml/FlashButton.qml +++ b/qml/FlashButton.qml @@ -27,7 +27,7 @@ import "data.js" as Data CameraToolIcon { id: button - iconSource: "image://theme/" + Data.flashIcon(settings.imageFlashMode) + iconId: Data.flashIcon(settings.imageFlashMode) property list items: [ CameraLabel { diff --git a/qml/ImageColorFilterButton.qml b/qml/ImageColorFilterButton.qml index 7d35ad7..d01f167 100644 --- a/qml/ImageColorFilterButton.qml +++ b/qml/ImageColorFilterButton.qml @@ -26,7 +26,7 @@ import "data.js" as Data CameraToolIcon { id: button - iconSource: "image://theme/" + Data.cfIcon(settings.imageColorFilter) + iconId: Data.cfIcon(settings.imageColorFilter) property list items: [ CameraLabel { diff --git a/qml/ImageEvCompButton.qml b/qml/ImageEvCompButton.qml index 3761a70..2dbaf33 100644 --- a/qml/ImageEvCompButton.qml +++ b/qml/ImageEvCompButton.qml @@ -26,7 +26,7 @@ import QtCamera 1.0 CameraToolIcon { id: button - iconSource: settings.imageEvComp == 0 ? "image://theme/icon-m-camera-manual-exposure" : "" + iconId: settings.imageEvComp == 0 ? "icon-m-camera-manual-exposure" : "" CameraLabel { anchors.fill: parent diff --git a/qml/ImageIsoButton.qml b/qml/ImageIsoButton.qml index 099f9d6..3c34a62 100644 --- a/qml/ImageIsoButton.qml +++ b/qml/ImageIsoButton.qml @@ -27,7 +27,7 @@ import "data.js" as Data CameraToolIcon { id: button - iconSource: "image://theme/" + Data.isoIcon(settings.imageIso) + iconId: Data.isoIcon(settings.imageIso) property list items: [ CameraLabel { diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml index b744fdb..c016cc4 100644 --- a/qml/ImageOverlay.qml +++ b/qml/ImageOverlay.qml @@ -73,7 +73,7 @@ Item { anchors.right: parent.right anchors.rightMargin: 20 anchors.verticalCenter: parent.verticalCenter - iconSource: "image://theme/icon-m-camera-shutter" + iconId: "icon-m-camera-shutter" width: 75 height: 75 opacity: 0.5 diff --git a/qml/ImageSceneButton.qml b/qml/ImageSceneButton.qml index 2393e6e..eb2f7f0 100644 --- a/qml/ImageSceneButton.qml +++ b/qml/ImageSceneButton.qml @@ -27,7 +27,7 @@ import "data.js" as Data CameraToolIcon { id: button - iconSource: "image://theme/" + Data.ismIcon(settings.imageSceneMode) + iconId: Data.ismIcon(settings.imageSceneMode) property list items: [ CameraLabel { diff --git a/qml/ImageWhiteBalanceButton.qml b/qml/ImageWhiteBalanceButton.qml index 808b854..63ffb9a 100644 --- a/qml/ImageWhiteBalanceButton.qml +++ b/qml/ImageWhiteBalanceButton.qml @@ -27,7 +27,7 @@ import "data.js" as Data CameraToolIcon { id: button - iconSource: "image://theme/" + Data.wbIcon(settings.imageWhiteBalance) + iconId: Data.wbIcon(settings.imageWhiteBalance) property list items: [ CameraLabel { diff --git a/qml/ModeButton.qml b/qml/ModeButton.qml index ea959bd..f25664c 100644 --- a/qml/ModeButton.qml +++ b/qml/ModeButton.qml @@ -29,9 +29,7 @@ CaptureButton { height: 55 opacity: 0.5 - iconSource: settings.mode == Camera.VideoMode ? - "image://theme/icon-m-viewfinder-camera" : - "image://theme/icon-m-camera-video" + iconId: settings.mode == Camera.VideoMode ? "icon-m-viewfinder-camera" : "icon-m-camera-video" onClicked: { if (settings.mode == Camera.VideoMode) { diff --git a/qml/PostCaptureItem.qml b/qml/PostCaptureItem.qml index 4cc51d1..cc0e2f9 100644 --- a/qml/PostCaptureItem.qml +++ b/qml/PostCaptureItem.qml @@ -92,7 +92,7 @@ Item { CameraToolIcon { id: playIcon anchors.horizontalCenter: parent.horizontalCenter - iconSource: "image://theme/icon-s-music-video-play" + iconId: "icon-m-toolbar-mediacontrol-play-white" visible: isVideo onClicked: startPlayback() } diff --git a/qml/VideoColorFilterButton.qml b/qml/VideoColorFilterButton.qml index 60f702a..2bb014d 100644 --- a/qml/VideoColorFilterButton.qml +++ b/qml/VideoColorFilterButton.qml @@ -27,7 +27,7 @@ import "data.js" as Data CameraToolIcon { id: button - iconSource: "image://theme/" + Data.cfIcon(settings.videoColorFilter) + iconId: Data.cfIcon(settings.videoColorFilter) property list items: [ CameraLabel { diff --git a/qml/VideoEvCompButton.qml b/qml/VideoEvCompButton.qml index 5306a3b..a799f67 100644 --- a/qml/VideoEvCompButton.qml +++ b/qml/VideoEvCompButton.qml @@ -26,7 +26,7 @@ import QtCamera 1.0 CameraToolIcon { id: button - iconSource: settings.videoEvComp == 0 ? "image://theme/icon-m-camera-manual-exposure" : "" + iconId: settings.videoEvComp == 0 ? "icon-m-camera-manual-exposure" : "" CameraLabel { anchors.fill: parent diff --git a/qml/VideoMuteButton.qml b/qml/VideoMuteButton.qml index f698dcb..dafe895 100644 --- a/qml/VideoMuteButton.qml +++ b/qml/VideoMuteButton.qml @@ -23,7 +23,7 @@ import QtQuick 2.0 CameraToolIcon { - iconSource: settings.videoMuted ? "image://theme/icon-m-toolbar-volume-off-white-selected" : - "image://theme/icon-m-toolbar-volume-white-selected" + iconId: settings.videoMuted ? "icon-m-toolbar-volume-off-white-selected" + : "icon-m-toolbar-volume-white-selected" onClicked: settings.videoMuted = !settings.videoMuted } diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml index d5d2ab0..9e9add1 100644 --- a/qml/VideoOverlay.qml +++ b/qml/VideoOverlay.qml @@ -80,7 +80,7 @@ Item { anchors.right: parent.right anchors.rightMargin: 20 anchors.verticalCenter: parent.verticalCenter - iconSource: overlay.recording ? "image://theme/icon-m-camera-video-record" : "image://theme/icon-m-camera-video-record" + iconId: overlay.recording ? "icon-m-camera-video-record" : "icon-m-camera-video-record" width: 75 height: 75 opacity: 0.5 diff --git a/qml/VideoSceneButton.qml b/qml/VideoSceneButton.qml index 2ab0bc8..2f1a931 100644 --- a/qml/VideoSceneButton.qml +++ b/qml/VideoSceneButton.qml @@ -27,7 +27,7 @@ import "data.js" as Data CameraToolIcon { id: button - iconSource: "image://theme/" + Data.vsmIcon(settings.videoSceneMode) + iconId: Data.vsmIcon(settings.videoSceneMode) property list items: [ CameraLabel { diff --git a/qml/VideoTorchButton.qml b/qml/VideoTorchButton.qml index dda5a2b..1f91966 100644 --- a/qml/VideoTorchButton.qml +++ b/qml/VideoTorchButton.qml @@ -27,8 +27,7 @@ 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 ? "icon-m-camera-torch-on" : "icon-m-camera-torch-off" onClicked: settings.videoTorchOn = !settings.videoTorchOn Binding { diff --git a/qml/VideoWhiteBalanceButton.qml b/qml/VideoWhiteBalanceButton.qml index 7e8eca0..e2f694d 100644 --- a/qml/VideoWhiteBalanceButton.qml +++ b/qml/VideoWhiteBalanceButton.qml @@ -27,7 +27,7 @@ import "data.js" as Data CameraToolIcon { id: button - iconSource: "image://theme/" + Data.wbIcon(settings.videoWhiteBalance) + iconId: Data.wbIcon(settings.videoWhiteBalance) property list items: [ CameraLabel { -- 2.25.1