Get rid of ImageSettingsDialog.js

diff --git a/qml/ImageResolutionSettings.qml b/qml/ImageResolutionSettings.qml
index 344aa33..671dea3 100644 (file)
--- a/qml/ImageResolutionSettings.qml
+++ b/qml/ImageResolutionSettings.qml
@@ -22,7 +22,6 @@
 
 import QtQuick 1.1
 import com.nokia.meego 1.1
-import "ImageSettingsDialog.js" as Util
 
 Column {
         spacing: 10
@@ -34,21 +33,15 @@ Column {
         ButtonRow {
                 id: aspectRatioRow
                 width: parent.width
-
+                enabled: cam.idle
                 exclusive: false
-                onCheckedButtonChanged: {
-                        // This is needed to initially setup the
-                        // resolutions buttons
-                        Util.resetAspectRatio(aspectRatioRow);
-                }
 
                 Repeater {
                         model: imageSettings.aspectRatios
                         delegate: Button {
-                                property string aspect: modelData;
                                 text: qsTr(modelData);
                                 checked: settings.imageAspectRatio == modelData;
-                                onClicked: Util.setAspectRatio(modelData);
+                                onClicked: settings.imageAspectRatio = modelData;
                         }
                 }
         }
@@ -60,20 +53,24 @@ Column {
         ButtonRow {
                 id: resolutionsRow
                 width: parent.width
-
+                enabled: cam.idle
                 exclusive: false
 
+                Binding {
+                        target: imageSettings.resolutions
+                        property: "aspectRatio"
+                        value: settings.imageAspectRatio
+                }
+
                 Repeater {
                         id: resolutions
                         model: imageSettings.resolutions
 
                         delegate: Button {
-                                property string resolution: resolutionName
-                                property string aspectRatio: resolutionAspectRatio
                                 font.capitalization: Font.Capitalize
                                 text: qsTr("%1 %2 Mpx").arg(resolutionName).arg(megaPixels);
                                 checked: settings.imageResolution == resolutionName
-                                onClicked: Util.setResolution(resolutionName);
+                                onClicked: settings.imageResolution = resolutionName;
                         }
                 }
         }

diff --git a/qml/ImageSettingsDialog.js b/qml/ImageSettingsDialog.js
deleted file mode 100644 (file)
index 14f85d7..0000000
--- a/qml/ImageSettingsDialog.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- js -*-
-
-/*!
- * This file is part of CameraPlus.
- *
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-function resetAspectRatio(row) {
-    imageSettings.resolutions.aspectRatio = row.checkedButton.aspect;
-    settings.imageAspectRatio = imageSettings.resolutions.aspectRatio;
-}
-
-function setAspectRatio(data) {
-    if (!cam.idle) {
-        showError(qsTr("Camera is busy saving."));
-        return;
-    }
-
-    settings.imageAspectRatio = data;
-    imageSettings.resolutions.aspectRatio = data;
-}
-
-function setResolution(resolution) {
-    if (!cam.idle) {
-        showError(qsTr("Camera is busy saving."));
-        return;
-    }
-
-    settings.imageResolution = resolution;
-}

diff --git a/qml/qml.qrc b/qml/qml.qrc
index 74017fb..9f56db1 100644 (file)
--- a/qml/qml.qrc
+++ b/qml/qml.qrc
@@ -38,7 +38,6 @@
        <file>SectionHeader.qml</file>
        <file>TextSwitch.qml</file>
        <file>ImageSettingsDialog.qml</file>
-       <file>ImageSettingsDialog.js</file>
        <file>ImageResolutionSettings.qml</file>
        <file>VideoSettingsDialog.qml</file>
        <file>VideoResolutionSettings.qml</file>