Added aspectRatioCount to ImageSettings and VideoSettings

diff --git a/declarative/imagesettings.cpp b/declarative/imagesettings.cpp
index a5f9c06..60661be 100644 (file)
--- a/declarative/imagesettings.cpp
+++ b/declarative/imagesettings.cpp
@@ -79,6 +79,7 @@ void ImageSettings::deviceChanged() {
   delete m_resolutions;
   m_resolutions = 0;
 
+  emit aspectRatioCountChanged();
   emit resolutionsChanged();
 }
 
@@ -114,3 +115,7 @@ bool ImageSettings::setResolution(const QString& aspectRatio, const QString& res
 
   return false;
 }
+
+int ImageSettings::aspectRatioCount() const {
+  return aspectRatios().count();
+}

diff --git a/declarative/imagesettings.h b/declarative/imagesettings.h
index 9cba217..ecebb16 100644 (file)
--- a/declarative/imagesettings.h
+++ b/declarative/imagesettings.h
@@ -36,6 +36,7 @@ class ImageSettings : public QObject {
   Q_PROPERTY(Camera* camera READ camera WRITE setCamera NOTIFY cameraChanged);
   Q_PROPERTY(QString suffix READ suffix NOTIFY settingsChanged);
   Q_PROPERTY(QStringList aspectRatios READ aspectRatios NOTIFY settingsChanged);
+  Q_PROPERTY(int aspectRatioCount READ aspectRatioCount NOTIFY aspectRatioCountChanged);
   Q_PROPERTY(ImageResolutionModel *resolutions READ resolutions NOTIFY resolutionsChanged);
   Q_PROPERTY(bool ready READ isReady NOTIFY readyChanged);
 
@@ -55,11 +56,14 @@ public:
 
   Q_INVOKABLE bool setResolution(const QString& aspectRatio, const QString& resolution);
 
+  int aspectRatioCount() const;
+
 signals:
   void settingsChanged();
   void cameraChanged();
   void resolutionsChanged();
   void readyChanged();
+  void aspectRatioCountChanged();
 
 private slots:
   void deviceChanged();

diff --git a/declarative/videosettings.cpp b/declarative/videosettings.cpp
index 2fa6957..b2b6e8f 100644 (file)
--- a/declarative/videosettings.cpp
+++ b/declarative/videosettings.cpp
@@ -79,6 +79,7 @@ void VideoSettings::deviceChanged() {
   delete m_resolutions;
   m_resolutions = 0;
 
+  emit aspectRatioCountChanged();
   emit resolutionsChanged();
 }
 
@@ -114,3 +115,7 @@ bool VideoSettings::setResolution(const QString& aspectRatio, const QString& res
 
   return false;
 }
+
+int VideoSettings::aspectRatioCount() const {
+  return aspectRatios().count();
+}

diff --git a/declarative/videosettings.h b/declarative/videosettings.h
index c838234..aa7b6f4 100644 (file)
--- a/declarative/videosettings.h
+++ b/declarative/videosettings.h
@@ -36,6 +36,7 @@ class VideoSettings : public QObject {
   Q_PROPERTY(Camera* camera READ camera WRITE setCamera NOTIFY cameraChanged);
   Q_PROPERTY(QString suffix READ suffix NOTIFY settingsChanged);
   Q_PROPERTY(QStringList aspectRatios READ aspectRatios NOTIFY settingsChanged);
+  Q_PROPERTY(int aspectRatioCount READ aspectRatioCount NOTIFY aspectRatioCountChanged);
   Q_PROPERTY(VideoResolutionModel *resolutions READ resolutions NOTIFY resolutionsChanged);
   Q_PROPERTY(bool ready READ isReady NOTIFY readyChanged);
 
@@ -55,11 +56,14 @@ public:
 
   Q_INVOKABLE bool setResolution(const QString& aspectRatio, const QString& resolution);
 
+  int aspectRatioCount() const;
+
 signals:
   void settingsChanged();
   void cameraChanged();
   void resolutionsChanged();
   void readyChanged();
+  void aspectRatioCountChanged();
 
 private slots:
   void deviceChanged();