Use data.js for setting icons and names.

diff --git a/qml/ImageColorFilterPage.qml b/qml/ImageColorFilterPage.qml
index bfcd338..e491b69 100644 (file)
--- a/qml/ImageColorFilterPage.qml
+++ b/qml/ImageColorFilterPage.qml
@@ -2,6 +2,7 @@
 import QtQuick 1.1
 import com.nokia.meego 1.1
 import QtCamera 1.0
+import "data.js" as Data
 
 Page {
         id: page
@@ -32,62 +33,62 @@ Page {
 
                         IconButton {
                                 width: parent.width / 6
-                                normalIcon: "image://theme/icon-m-camera-no-filter"
-                                checkedIcon: "image://theme/icon-m-camera-no-filter-selected"
+                                normalIcon: "image://theme/" + Data.cfIcon(value);
+                                checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
                                 value: ColorTone.Normal
                                 savedValue: settings.imageColorFilter
                                 onClicked: settings.imageColorFilter = value;
-                                text: qsTr("Off");
+                                text: Data.cfName(value);
                         }
 
                         IconButton {
                                 width: parent.width / 6
-                                normalIcon: "image://theme/icon-m-camera-filter-black-white"
-                                checkedIcon: "image://theme/icon-m-camera-filter-black-white-selected"
+                                normalIcon: "image://theme/" + Data.cfIcon(value);
+                                checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
                                 value: ColorTone.GrayScale
                                 savedValue: settings.imageColorFilter
                                 onClicked: settings.imageColorFilter = value;
-                                text: qsTr("Black & white");
+                                text: Data.cfName(value);
                         }
 
                         IconButton {
                                 width: parent.width / 6
-                                normalIcon: "image://theme/icon-m-camera-filter-sepia"
-                                checkedIcon: "image://theme/icon-m-camera-filter-sepia-selected"
+                                normalIcon: "image://theme/" + Data.cfIcon(value);
+                                checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
                                 value: ColorTone.Sepia
                                 savedValue: settings.imageColorFilter
                                 onClicked: settings.imageColorFilter = value;
-                                text: qsTr("Sepia");
+                                text: Data.cfName(value);
                         }
 
                         IconButton {
                                 width: parent.width / 6
-                                normalIcon: "image://theme/icon-m-camera-filter-vivid"
-                                checkedIcon: "image://theme/icon-m-camera-filter-vivid-selected"
+                                normalIcon: "image://theme/" + Data.cfIcon(value);
+                                checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
                                 value: ColorTone.Vivid
                                 savedValue: settings.imageColorFilter
                                 onClicked: settings.imageColorFilter = value;
-                                text: qsTr("Vivid");
+                                text: Data.cfName(value);
                         }
 
                         IconButton {
                                 width: parent.width / 6
-                                normalIcon: "image://theme/icon-m-camera-filter-negative"
-                                checkedIcon: "image://theme/icon-m-camera-filter-negative-selected"
+                                normalIcon: "image://theme/" + Data.cfIcon(value);
+                                checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
                                 value: ColorTone.Negative
                                 savedValue: settings.imageColorFilter
                                 onClicked: settings.imageColorFilter = value;
-                                text: qsTr("Negative");
+                                text: Data.cfName(value);
                         }
 
                         IconButton {
                                 width: parent.width / 6
-                                normalIcon: "image://theme/icon-m-camera-filter-solarize"
-                                checkedIcon: "image://theme/icon-m-camera-filter-solarize-selected"
+                                normalIcon: "image://theme/" + Data.cfIcon(value);
+                                checkedIcon: "image://theme/" + Data.cfSelectedIcon(value);
                                 value: ColorTone.Solarize
                                 savedValue: settings.imageColorFilter
                                 onClicked: settings.imageColorFilter = value;
-                                text: qsTr("Solarize");
+                                text: Data.cfName(value);
                         }
                 }
         }

diff --git a/qml/ImageWhiteBalancePage.qml b/qml/ImageWhiteBalancePage.qml
index c026b99..3e89c01 100644 (file)
--- a/qml/ImageWhiteBalancePage.qml
+++ b/qml/ImageWhiteBalancePage.qml
@@ -2,6 +2,7 @@
 import QtQuick 1.1
 import com.nokia.meego 1.1
 import QtCamera 1.0
+import "data.js" as Data
 
 Page {
         id: page
@@ -30,55 +31,54 @@ Page {
                         anchors.top: title.bottom
                         anchors.topMargin: 10
 
-
                         IconButton {
                                 width: parent.width / 5
-                                normalIcon: "image://theme/icon-m-camera-whitebalance-auto"
-                                checkedIcon: "image://theme/icon-m-camera-whitebalance-auto-selected"
+                                normalIcon: "image://theme/" + Data.wbIcon(value);
+                                checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
                                 value: WhiteBalance.Auto
                                 savedValue: settings.imageWhiteBalance
                                 onClicked: settings.imageWhiteBalance = value;
-                                text: qsTr("Automatic");
+                                text: Data.wbName(value);
                         }
 
                         IconButton {
                                 width: parent.width / 5
-                                normalIcon: "image://theme/icon-m-camera-whitebalance-sunny"
-                                checkedIcon: "image://theme/icon-m-camera-whitebalance-sunny-selected"
+                                normalIcon: "image://theme/" + Data.wbIcon(value);
+                                checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
                                 value: WhiteBalance.Sunset
                                 savedValue: settings.imageWhiteBalance
                                 onClicked: settings.imageWhiteBalance = value;
-                                text: qsTr("Sunset");
+                                text: Data.wbName(value);
                         }
 
                         IconButton {
                                 width: parent.width / 5
-                                normalIcon: "image://theme/icon-m-camera-whitebalance-cloudy"
-                                checkedIcon: "image://theme/icon-m-camera-whitebalance-cloudy-selected"
+                                normalIcon: "image://theme/" + Data.wbIcon(value);
+                                checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
                                 value: WhiteBalance.Cloudy
                                 savedValue: settings.imageWhiteBalance
                                 onClicked: settings.imageWhiteBalance = value;
-                                text: qsTr("Cloudy");
+                                text: Data.wbName(value);
                         }
 
                         IconButton {
                                 width: parent.width / 5
-                                normalIcon: "image://theme/icon-m-camera-whitebalance-fluorescent"
-                                checkedIcon: "image://theme/icon-m-camera-whitebalance-fluorescent-selected"
+                                normalIcon: "image://theme/" + Data.wbIcon(value);
+                                checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
                                 value: WhiteBalance.Flourescent
                                 savedValue: settings.imageWhiteBalance
                                 onClicked: settings.imageWhiteBalance = value;
-                                text: qsTr("Flourescent");
+                                text: Data.wbName(value);
                         }
 
                         IconButton {
                                 width: parent.width / 5
-                                normalIcon: "image://theme/icon-m-camera-whitebalance-tungsten"
-                                checkedIcon: "image://theme/icon-m-camera-whitebalance-tungsten-selected"
+                                normalIcon: "image://theme/" + Data.wbIcon(value);
+                                checkedIcon: "image://theme/" + Data.wbSelectedIcon(value);
                                 value: WhiteBalance.Tungsten
                                 savedValue: settings.imageWhiteBalance
                                 onClicked: settings.imageWhiteBalance = value;
-                                text: qsTr("Tungsten");
+                                text: Data.wbName(value);
                         }
                 }
         }