QML Camera element redesign.

Grouped camera properties in a similar way to C++ QCamera API. Added support for video recording. Change-Id: I8667dc90878b3e20eda5523ba562f5687bd0932b Reviewed-on: http://codereview.qt-project.org/3552 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
2011-08-25 14:05:10 +10:00
parent 47a5dd4371
commit 1913f164dc
16 changed files with 2321 additions and 961 deletions
--- a/src/imports/multimedia/qdeclarativecamerafocus_p.h
+++ b/src/imports/multimedia/qdeclarativecamerafocus_p.h
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVECAMERAFOCUS_H
+#define QDECLARATIVECAMERAFOCUS_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qabstractitemmodel.h>
+#include <qcamera.h>
+#include <qcamerafocus.h>
+#include "qdeclarativecamera_p.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class FocusZonesModel;
+class QDeclarativeCamera;
+
+class QDeclarativeCameraFocus : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDeclarativeCamera::FocusModes focusMode READ focusMode WRITE setFocusMode NOTIFY focusModeChanged)
+    Q_PROPERTY(QDeclarativeCamera::FocusPointMode focusPointMode READ focusPointMode WRITE setFocusPointMode NOTIFY focusPointModeChanged)
+    Q_PROPERTY(QPointF customFocusPoint READ customFocusPoint WRITE setCustomFocusPoint NOTIFY customFocusPointChanged)
+    Q_PROPERTY(QObject *focusZones READ focusZones CONSTANT)
+public:
+    ~QDeclarativeCameraFocus();
+
+    QDeclarativeCamera::FocusModes focusMode() const;
+    QDeclarativeCamera::FocusPointMode focusPointMode() const;
+    QPointF customFocusPoint() const;
+
+    QAbstractListModel *focusZones() const;
+
+    Q_INVOKABLE bool isFocusModeSupported(QDeclarativeCamera::FocusModes mode) const;
+    Q_INVOKABLE bool isFocusPointModeSupported(QDeclarativeCamera::FocusPointMode) const;
+
+public Q_SLOTS:
+    void setFocusMode(QDeclarativeCamera::FocusModes);
+    void setFocusPointMode(QDeclarativeCamera::FocusPointMode mode);
+    void setCustomFocusPoint(const QPointF &point);
+
+Q_SIGNALS:
+    void focusModeChanged(QDeclarativeCamera::FocusModes);
+    void focusPointModeChanged(QDeclarativeCamera::FocusPointMode);
+    void customFocusPointChanged(const QPointF &);
+
+private Q_SLOTS:
+    void updateFocusZones();
+
+private:
+    friend class QDeclarativeCamera;
+    QDeclarativeCameraFocus(QCamera *camera, QObject *parent = 0);
+
+    QCameraFocus *m_focus;
+    FocusZonesModel *m_focusZones;
+};
+
+class FocusZonesModel : public QAbstractListModel
+{
+Q_OBJECT
+public:
+    enum FocusZoneRoles {
+        StatusRole = Qt::UserRole + 1,
+        AreaRole
+    };
+
+    FocusZonesModel(QObject *parent = 0);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+public slots:
+    void setFocusZones(const QCameraFocusZoneList &zones);
+
+private:
+    QCameraFocusZoneList m_focusZones;
+};
+
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraFocus))
+
+QT_END_HEADER
+
+#endif