From aeb9419e5533adab213f17efbc7b504985189772 Mon Sep 17 00:00:00 2001 From: Mohammed Sameer Date: Sun, 4 Aug 2013 00:29:17 +0300 Subject: [PATCH] Kill data.js and move all icons and functions to CameraTheme --- qml/FlashButton.qml | 3 +- qml/ImageColorFilterButton.qml | 3 +- qml/ImageIsoButton.qml | 3 +- qml/ImageOverlay.qml | 9 ++- qml/ImageSceneButton.qml | 3 +- qml/ImageWhiteBalanceButton.qml | 3 +- qml/VideoColorFilterButton.qml | 3 +- qml/VideoOverlay.qml | 5 +- qml/VideoSceneButton.qml | 3 +- qml/VideoWhiteBalanceButton.qml | 3 +- qml/data.js | 109 -------------------------------- qml/harmattan/CameraTheme.qml | 99 +++++++++++++++++++++++++++++ qml/qml.qrc | 1 - 13 files changed, 113 insertions(+), 134 deletions(-) delete mode 100644 qml/data.js diff --git a/qml/FlashButton.qml b/qml/FlashButton.qml index e5f6b09..933b21d 100644 --- a/qml/FlashButton.qml +++ b/qml/FlashButton.qml @@ -22,12 +22,11 @@ import QtQuick 2.0 import QtCamera 1.0 -import "data.js" as Data CameraToolIcon { id: button - iconId: Data.flashIcon(settings.imageFlashMode) + iconId: cameraTheme.flashIcon(settings.imageFlashMode) property list toolsModel: [ ToolsModelItem {icon: cameraTheme.flashAutoIconId; value: Flash.Auto }, diff --git a/qml/ImageColorFilterButton.qml b/qml/ImageColorFilterButton.qml index e59d793..f05ef33 100644 --- a/qml/ImageColorFilterButton.qml +++ b/qml/ImageColorFilterButton.qml @@ -22,12 +22,11 @@ import QtQuick 2.0 import QtCamera 1.0 -import "data.js" as Data CameraToolIcon { id: button - iconId: Data.cfIcon(settings.imageColorFilter) + iconId: cameraTheme.colorFilterIcon(settings.imageColorFilter) property list toolsModel: [ ToolsModelItem {icon: cameraTheme.colorFilterNormalIconId; value: ColorTone.Normal }, diff --git a/qml/ImageIsoButton.qml b/qml/ImageIsoButton.qml index 0c79075..50931d2 100644 --- a/qml/ImageIsoButton.qml +++ b/qml/ImageIsoButton.qml @@ -22,12 +22,11 @@ import QtQuick 2.0 import QtCamera 1.0 -import "data.js" as Data CameraToolIcon { id: button - iconId: Data.isoIcon(settings.imageIso) + iconId: cameraTheme.isoIcon(settings.imageIso) property CameraToolBarTools tools: CameraToolBarTools { CameraLabel { diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml index 18e7c9b..5b08ecb 100644 --- a/qml/ImageOverlay.qml +++ b/qml/ImageOverlay.qml @@ -23,7 +23,6 @@ import QtQuick 2.0 import QtCamera 1.0 import CameraPlus 1.0 -import "data.js" as Data Item { id: overlay @@ -174,7 +173,7 @@ Item { Indicator { id: flashIndicator - source: "image://theme/" + Data.flashIcon(settings.imageFlashMode) + "-screen" + source: "image://theme/" + cameraTheme.flashIcon(settings.imageFlashMode) + "-screen" } Indicator { @@ -186,20 +185,20 @@ Item { Indicator { id: wbIndicator - source: visible ? "image://theme/" + Data.wbIcon(settings.imageWhiteBalance) + "-screen" : "" + source: visible ? "image://theme/" + cameraTheme.whiteBalanceIcon(settings.imageWhiteBalance) + "-screen" : "" visible: settings.imageWhiteBalance != WhiteBalance.Auto } Indicator { id: cfIndicator - source: "image://theme/" + Data.cfIcon(settings.imageColorFilter) + "-screen" + source: "image://theme/" + cameraTheme.colorFilterIcon(settings.imageColorFilter) + "-screen" visible: settings.imageColorFilter != ColorTone.Normal } Indicator { id: isoIndicator visible: settings.imageIso != 0 - source: "image://theme/" + Data.isoIcon(settings.imageIso) + source: "image://theme/" + cameraTheme.isoIcon(settings.imageIso) } Indicator { diff --git a/qml/ImageSceneButton.qml b/qml/ImageSceneButton.qml index 0bb15c4..dcd4bfe 100644 --- a/qml/ImageSceneButton.qml +++ b/qml/ImageSceneButton.qml @@ -22,12 +22,11 @@ import QtQuick 2.0 import QtCamera 1.0 -import "data.js" as Data CameraToolIcon { id: button - iconId: Data.ismIcon(settings.imageSceneMode) + iconId: cameraTheme.imageSceneModeIcon(settings.imageSceneMode) property list toolsModel: [ ToolsModelItem {icon: cameraTheme.imageSceneModeAutoIconId; value: Scene.Auto}, ToolsModelItem {icon: cameraTheme.imageSceneModeCloseupIconId; value: Scene.Closeup}, diff --git a/qml/ImageWhiteBalanceButton.qml b/qml/ImageWhiteBalanceButton.qml index cd6c29c..b257ca2 100644 --- a/qml/ImageWhiteBalanceButton.qml +++ b/qml/ImageWhiteBalanceButton.qml @@ -22,12 +22,11 @@ import QtQuick 2.0 import QtCamera 1.0 -import "data.js" as Data CameraToolIcon { id: button - iconId: Data.wbIcon(settings.imageWhiteBalance) + iconId: cameraTheme.whiteBalanceIcon(settings.imageWhiteBalance) property list toolsModel: [ ToolsModelItem {icon: cameraTheme.whiteBalanceAutoIconId; value: WhiteBalance.Auto }, diff --git a/qml/VideoColorFilterButton.qml b/qml/VideoColorFilterButton.qml index 9f4c2d7..6b0c568 100644 --- a/qml/VideoColorFilterButton.qml +++ b/qml/VideoColorFilterButton.qml @@ -22,12 +22,11 @@ import QtQuick 2.0 import QtCamera 1.0 -import "data.js" as Data CameraToolIcon { id: button - iconId: Data.cfIcon(settings.videoColorFilter) + iconId: cameraTheme.colorFilterIcon(settings.videoColorFilter) property list toolsModel: [ ToolsModelItem {icon: cameraTheme.colorFilterNormalIconId; value: ColorTone.Normal }, diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml index 3e46aaa..3dbc726 100644 --- a/qml/VideoOverlay.qml +++ b/qml/VideoOverlay.qml @@ -23,7 +23,6 @@ import QtQuick 2.0 import QtCamera 1.0 import CameraPlus 1.0 -import "data.js" as Data Item { id: overlay @@ -156,13 +155,13 @@ Item { Indicator { id: wbIndicator - source: visible ? "image://theme/" + Data.wbIcon(settings.videoWhiteBalance) + "-screen" : "" + source: visible ? "image://theme/" + cameraTheme.whiteBalanceIcon(settings.videoWhiteBalance) + "-screen" : "" visible: settings.videoWhiteBalance != WhiteBalance.Auto } Indicator { id: cfIndicator - source: "image://theme/" + Data.cfIcon(settings.videoColorFilter) + "-screen" + source: "image://theme/" + cameraTheme.colorFilterIcon(settings.videoColorFilter) + "-screen" visible: settings.videoColorFilter != ColorTone.Normal } diff --git a/qml/VideoSceneButton.qml b/qml/VideoSceneButton.qml index 5a217ea..444a056 100644 --- a/qml/VideoSceneButton.qml +++ b/qml/VideoSceneButton.qml @@ -22,12 +22,11 @@ import QtQuick 2.0 import QtCamera 1.0 -import "data.js" as Data CameraToolIcon { id: button - iconId: Data.vsmIcon(settings.videoSceneMode) + iconId: cameraTheme.videoSceneModeIcon(settings.videoSceneMode) property list toolsModel: [ ToolsModelItem {icon: cameraTheme.videoSceneModeAutoIconId; value: Scene.Auto}, diff --git a/qml/VideoWhiteBalanceButton.qml b/qml/VideoWhiteBalanceButton.qml index 7d02667..e519396 100644 --- a/qml/VideoWhiteBalanceButton.qml +++ b/qml/VideoWhiteBalanceButton.qml @@ -22,12 +22,11 @@ import QtQuick 2.0 import QtCamera 1.0 -import "data.js" as Data CameraToolIcon { id: button - iconId: Data.wbIcon(settings.videoWhiteBalance) + iconId: cameraTheme.whiteBalanceIcon(settings.videoWhiteBalance) property list toolsModel: [ ToolsModelItem {icon: cameraTheme.whiteBalanceAutoIconId; value: WhiteBalance.Auto }, diff --git a/qml/data.js b/qml/data.js deleted file mode 100644 index 59078f2..0000000 --- a/qml/data.js +++ /dev/null @@ -1,109 +0,0 @@ -// -*- js -*- - -/*! - * This file is part of CameraPlus. - * - * Copyright (C) 2012-2013 Mohammed Sameer - * - * 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 - */ - -// Shared between all QML components -//.pragma library - -// White Balance -var __wb = [ - [WhiteBalance.Auto, "icon-m-camera-whitebalance-auto"], - [WhiteBalance.Sunset, "icon-m-camera-whitebalance-sunny"], - [WhiteBalance.Cloudy, "icon-m-camera-whitebalance-cloudy"], - [WhiteBalance.Flourescent, "icon-m-camera-whitebalance-fluorescent"], - [WhiteBalance.Tungsten, "icon-m-camera-whitebalance-tungsten"], -]; - -// Color Filter -var __cf = [ - [ColorTone.Normal, "icon-m-camera-no-filter"], - [ColorTone.GrayScale, "icon-m-camera-filter-black-white"], - [ColorTone.Sepia, "icon-m-camera-filter-sepia"], - [ColorTone.Vivid, "icon-m-camera-filter-vivid"], - [ColorTone.Negative, "icon-m-camera-filter-negative"], - [ColorTone.Solarize, "icon-m-camera-filter-solarize"] -]; - -// Image Scene Mode -var __ism = [ - [Scene.Auto, "icon-m-camera-scene-auto"], - [Scene.Closeup, "icon-m-camera-scene-macro"], - [Scene.Landscape, "icon-m-camera-scene-landscape"], - [Scene.Portrait, "icon-m-camera-scene-portrait"], - [Scene.Night, "icon-m-camera-night"], - [Scene.Sport, "icon-m-camera-scene-sports"] -]; - -// Video Scene Mode -var __vsm = [ - [Scene.Auto, "icon-m-camera-scene-auto"], - [Scene.Night, "icon-m-camera-video-night"] -]; - -var __flash = [ - [Flash.Auto, "icon-m-camera-flash-auto"], - [Flash.On, "icon-m-camera-flash-always"], - [Flash.Off, "icon-m-camera-flash-off"], - [Flash.RedEye, "icon-m-camera-flash-red-eye"] -]; - -// ISO -var __iso = [ - [0, "icon-m-camera-iso-auto"], - [100, "icon-m-camera-iso-100"], - [200, "icon-m-camera-iso-200"], - [400, "icon-m-camera-iso-400"], - [800, "icon-m-camera-iso-800"] -]; - -function filterData(val, data, item) { - var x = 0; - var i = data.length; - for (x = 0; x < i; x++) { - if (data[x][0] == val) { - return data[x][item]; - } - } -} - -function wbIcon(wb) { - return filterData(wb, __wb, 1); -} - -function cfIcon(cf) { - return filterData(cf, __cf, 1); -} - -function ismIcon(sm) { - return filterData(sm, __ism, 1); -} - -function vsmIcon(sm) { - return filterData(sm, __vsm, 1); -} - -function isoIcon(value) { - return filterData(value, __iso, 1); -} - -function flashIcon(val) { - return filterData(val, __flash, 1); -} diff --git a/qml/harmattan/CameraTheme.qml b/qml/harmattan/CameraTheme.qml index 41ec359..431e913 100644 --- a/qml/harmattan/CameraTheme.qml +++ b/qml/harmattan/CameraTheme.qml @@ -21,6 +21,7 @@ */ import QtQuick 1.1 +import QtCamera 1.0 QtObject { property string standbyIcon: "image://theme/icon-l-camera-standby" @@ -121,4 +122,102 @@ QtObject { return "" } + + function whiteBalanceIcon(val) { + switch (val) { + case WhiteBalance.Auto: + return whiteBalanceAutoIconId + case WhiteBalance.Sunset: + return whiteBalanceSunsetIconId + case WhiteBalance.Cloudy: + return whiteBalanceCloudyIconId + case WhiteBalance.Flourescent: + return whiteBalanceFlourescentIconId + case WhiteBalance.Tungsten: + return whiteBalanceTungstenIconId + default: + return "" + } + } + + function colorFilterIcon(val) { + switch (val) { + case ColorTone.Normal: + return colorFilterNormalIconId + case ColorTone.GrayScale: + return colorFilterGrayScaleIconId + case ColorTone.Sepia: + return colorFilterSepiaIconId + case ColorTone.Vivid: + return colorFilterVividIconId + case ColorTone.Negative: + return colorFilterNegativeIconId + case ColorTone.Solarize: + return colorFilterSolarizeIconId + default: + return "" + } + } + + function imageSceneModeIcon(val) { + switch (val) { + case Scene.Auto: + return imageSceneModeAutoIconId + case Scene.Closeup: + return imageSceneModeCloseupIconId + case Scene.Landscape: + return imageSceneModeLandscapeIconId + case Scene.Portrait: + return imageSceneModePortraitIconId + case Scene.Night: + return imageSceneModeNightIconId + case Scene.Sport: + return imageSceneModeSportIconId + default: + return "" + } + } + + function videoSceneModeIcon(val) { + switch (val) { + case Scene.Auto: + return videoSceneModeAutoIconId + case Scene.Night: + return videoSceneModeNightIconId + default: + return "" + } + } + + function flashIcon(val) { + switch (val) { + case Flash.Auto: + return flashAutoIconId + case Flash.On: + return flashOnIconId + case Flash.Off: + return flashOffIconId + case Flash.RedEye: + return flashRedEyeIconId + default: + return "" + } + } + + function isoIcon(val) { + switch (val) { + case 0: + return isoAudoIconId + case 100: + return iso100IconId + case 200: + return iso200IconId + case 400: + return iso400IconId + case 800: + return iso800IconId + default: + return "" + } + } } \ No newline at end of file diff --git a/qml/qml.qrc b/qml/qml.qrc index 25d3d8f..898130f 100644 --- a/qml/qml.qrc +++ b/qml/qml.qrc @@ -8,7 +8,6 @@ CameraView.qml CaptureButton.qml CheckButton.qml - data.js FlashButton.qml FocusReticle.qml ImageColorFilterButton.qml -- 2.25.1