Make a new component CameraPositionSource to get rid of QtMobility dependency

[harmattan/cameraplus] / qml / ImageResolutionSettings.qml

diff --git a/qml/ImageResolutionSettings.qml b/qml/ImageResolutionSettings.qml
index bfd1309..e287394 100644 (file)
--- a/qml/ImageResolutionSettings.qml
+++ b/qml/ImageResolutionSettings.qml
@@ -20,25 +20,27 @@
  * 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
 
 Column {
+    property Camera camera: null
+
     spacing: 10
 
     SectionHeader {
         text: qsTr("Aspect ratio")
     }
 
-    ButtonRow {
+    CameraButtonRow {
         id: aspectRatioRow
         width: parent.width
-        enabled: cam.idle
+        enabled: camera ? camera.idle : false
         exclusive: false
 
         Repeater {
             model: imageSettings.aspectRatios
-            delegate: Button {
+            delegate: CameraButton {
                 text: qsTr(modelData)
                 checked: settings.imageAspectRatio == modelData
                 onClicked: settings.imageAspectRatio = modelData
@@ -50,10 +52,10 @@ Column {
         text: qsTr("Resolution")
     }
 
-    ButtonRow {
+    CameraButtonRow {
         id: resolutionsRow
         width: parent.width
-        enabled: cam.idle
+        enabled: camera ? camera.idle : false
         exclusive: false
 
         Binding {
@@ -67,7 +69,7 @@ Column {
             model: imageSettings.resolutions.aspectRatio == settings.imageAspectRatio ?
                 imageSettings.resolutions : undefined
 
-            delegate: Button {
+            delegate: CameraButton {
                 font.capitalization: Font.Capitalize
                 text: qsTr("%1 %2 Mpx").arg(resolutionName).arg(megaPixels)
                 checked: settings.imageResolution == resolutionName