Kill CameraButtonRow and use the QtQuick Row component

diff --git a/qml/CameraSettings.qml b/qml/CameraSettings.qml
index ee113a5..34d4bab 100644 (file)
--- a/qml/CameraSettings.qml
+++ b/qml/CameraSettings.qml
@@ -40,7 +40,7 @@ Column {
         text: qsTr("Camera")
     }
 
-    CameraButtonRow {
+    Row {
         anchors.horizontalCenter: parent.horizontalCenter
         enabled: camera != null && camera.running && camera.idle
 

diff --git a/qml/ImageResolutionSettings.qml b/qml/ImageResolutionSettings.qml
index 6cb05b1..6e79a6e 100644 (file)
--- a/qml/ImageResolutionSettings.qml
+++ b/qml/ImageResolutionSettings.qml
@@ -33,11 +33,10 @@ Column {
         visible: aspectRatioRow.visible
     }
 
-    CameraButtonRow {
+    Row {
         id: aspectRatioRow
         width: parent.width
         enabled: camera ? camera.idle : false
-        exclusive: false
         visible: imageSettings.aspectRatioCount > 1
 
         Repeater {
@@ -57,11 +56,10 @@ Column {
         visible: resolutionsRow.visible
     }
 
-    CameraButtonRow {
+    Row {
         id: resolutionsRow
         width: parent.width
         enabled: camera ? camera.idle : false
-        exclusive: false
         visible: imageSettings.resolutions.count > 1
 
         Binding {

diff --git a/qml/VideoResolutionSettings.qml b/qml/VideoResolutionSettings.qml
index 432bd61..3a23d5c 100644 (file)
--- a/qml/VideoResolutionSettings.qml
+++ b/qml/VideoResolutionSettings.qml
@@ -34,11 +34,10 @@ Column {
         text: qsTr("Resolution")
     }
 
-    CameraButtonRow {
+    Row {
         id: resoultionsRow
         width: parent.width
         enabled: camera ? camera.idle : false
-        exclusive: false
 
         Repeater {
             id: resolutions

diff --git a/qml/harmattan/CameraButtonRow.qml b/qml/harmattan/CameraButtonRow.qml
deleted file mode 100644 (file)
index dd48ca6..0000000
--- a/qml/harmattan/CameraButtonRow.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- qml -*-
-
-/*!
- * This file is part of CameraPlus.
- *
- * Copyright (C) 2012-2013 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
- */
-
-import QtQuick 1.1
-import com.nokia.meego 1.1
-
-ButtonRow {
-
-}

diff --git a/qml/harmattan/harmattan.qrc b/qml/harmattan/harmattan.qrc
index 1a77f0f..3e52c36 100644 (file)
--- a/qml/harmattan/harmattan.qrc
+++ b/qml/harmattan/harmattan.qrc
@@ -7,7 +7,6 @@
        <file>CameraButton.qml</file>
        <file>CameraSlider.qml</file>
        <file>CameraSwitch.qml</file>
-       <file>CameraButtonRow.qml</file>
        <file>CameraQueryDialog.qml</file>
        <file>CameraWindow.qml</file>
        <file>CameraButtonStyle.qml</file>