Fixed VideoPlayerPage.qml failure to set cameraConfig

[harmattan/cameraplus] / qml / VideoResolutionSettings.qml

diff --git a/qml/VideoResolutionSettings.qml b/qml/VideoResolutionSettings.qml
index e80be20..26d4eac 100644 (file)
--- a/qml/VideoResolutionSettings.qml
+++ b/qml/VideoResolutionSettings.qml
@@ -20,19 +20,21 @@
  * 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("Resolution")
     }
 
-    ButtonRow {
+    CameraButtonRow {
         width: parent.width
-        enabled: cam.idle
+        enabled: camera ? camera.idle : false
         exclusive: false
 
         Repeater {
@@ -40,7 +42,7 @@ Column {
 
             model: videoSettings.resolutions
 
-            delegate: Button {
+            delegate: CameraButton {
                 font.capitalization: Font.Capitalize
                 text: qsTr("%1 %2").arg(resolutionName).arg(resolution)
                 checked: settings.videoResolution == resolutionName