X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=blobdiff_plain;f=qml%2Fdata.js;h=b3481ef6fcbd053c552a02b3ccacbe0767614426;hp=125341da884911fbe55049e5bc4d66c045c68e84;hb=6d882ccfda5ef536140c82884feecf0ce4a905f5;hpb=046b6743620b3703ca065b5707dcb6be06be582a

diff --git a/qml/data.js b/qml/data.js
index 125341d..b3481ef 100644
--- a/qml/data.js
+++ b/qml/data.js
@@ -3,7 +3,7 @@
 /*!
  * This file is part of CameraPlus.
  *
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ * 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
@@ -78,10 +78,10 @@ var __vsm = [
 ];
 
 var __flash = [
-    [Flash.Auto,"icon-m-camera-flash-auto-pressed", "icon-m-camera-flash-auto"],
-    [Flash.On, "icon-m-camera-flash-always-pressed", "icon-m-camera-flash-always"],
-    [Flash.Off, "icon-m-camera-flash-off-pressed", "icon-m-camera-flash-off"],
-    [Flash.RedEye, "icon-m-camera-flash-red-eye-pressed", "icon-m-camera-flash-red-eye"]
+    [Flash.Auto,"icon-m-camera-flash-auto-selected", "icon-m-camera-flash-auto"],
+    [Flash.On, "icon-m-camera-flash-always-selected", "icon-m-camera-flash-always"],
+    [Flash.Off, "icon-m-camera-flash-off-selected", "icon-m-camera-flash-off"],
+    [Flash.RedEye, "icon-m-camera-flash-red-eye-selected", "icon-m-camera-flash-red-eye"]
 ];
 
 // ISO
@@ -172,15 +172,7 @@ function vsmName(sm) {
 }
 
 function isoIcon(value) {
-    var x = 0;
-    var len = __iso.length;
-    for (x = 0; x < len; x++) {
-	if (__iso[x][0] == value) {
-	    return __iso[x][1];
-	}
-    }
-
-    return "";
+    return filterData(value, __iso, 1);
 }
 
 function imageIcon(aspect, res) {