Added CheckBoxStyle, refactored DefaultSettings to use color keys

and generated images( javascript object )

diff --git a/.gitignore b/.gitignore
index f07eb6a..28a2895 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 *.user
+*.user.*
+
 Makefile
\ No newline at end of file

diff --git a/examples/examples.pro b/examples/examples.pro
new file mode 100644 (file)
index 0000000..e105ae6
--- /dev/null
+++ b/examples/examples.pro
@@ -0,0 +1,3 @@
+TEMPLATE=subdirs
+
+SUBDIRS+= touch

diff --git a/examples/touch/content/AndroidDelegate.qml b/examples/touch/content/AndroidDelegate.qml
index 36a439a..7ab13ac 100644 (file)
--- a/examples/touch/content/AndroidDelegate.qml
+++ b/examples/touch/content/AndroidDelegate.qml
@@ -60,7 +60,7 @@ Item {
 
     Text {
         id: textitem
-        color: "white"
+        color: "black"
         font.pixelSize: 32
         text: modelData
         anchors.verticalCenter: parent.verticalCenter

diff --git a/examples/touch/content/ButtonPage.qml b/examples/touch/content/ButtonPage.qml
index 51d669e..56cff0c 100644 (file)
--- a/examples/touch/content/ButtonPage.qml
+++ b/examples/touch/content/ButtonPage.qml
@@ -38,10 +38,6 @@
 **
 ****************************************************************************/
 
-
-
-
-
 import QtQuick 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Controls.Styles 1.0
@@ -73,49 +69,19 @@ Item {
         Button {
             anchors.margins: 20
             text: "Press me"
-            //style: touchStyle
         }
 
         Button {
             anchors.margins: 20
-            //style: touchStyle
             text: "Press me too"
         }
 
         Button {
             anchors.margins: 20
-            //style: touchStyle
             enabled:false
             text: "Dont press me"
             onClicked: if (pageStack) pageStack.pop()
         }
 
     }
-
-    Component {
-        id: touchStyle
-        ButtonStyle {
-            panel: Item {
-                implicitHeight: 50
-                implicitWidth: 320
-                BorderImage {
-                    anchors.fill: parent
-                    antialiasing: true
-                    border.bottom: 8
-                    border.top: 8
-                    border.left: 8
-                    border.right: 8
-                    anchors.margins: control.pressed ? -4 : 0
-                    source: control.pressed ? "../images/button_pressed.png" : "../images/button_default.png"
-                    Text {
-                        text: control.text
-                        anchors.centerIn: parent
-                        color: "white"
-                        font.pixelSize: 23
-                        renderType: Text.NativeRendering
-                    }
-                }
-            }
-        }
-    }
 }

diff --git a/examples/touch/content/TextInputPage.qml b/examples/touch/content/TextInputPage.qml
index 605afef..da63da5 100644 (file)
--- a/examples/touch/content/TextInputPage.qml
+++ b/examples/touch/content/TextInputPage.qml
@@ -44,7 +44,8 @@
 
 import QtQuick 2.1
 import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+//import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Styles.Tizen 1.0
 
 Item {
     width: parent.width
@@ -70,37 +71,21 @@ Item {
         spacing: 40
         anchors.centerIn: parent
 
-        TextField {
-            anchors.margins: 20
-            text: "Text input"
-            style: touchStyle
+        CheckBox {
+            text:"Check box"
         }
-
-        TextField {
-            anchors.margins: 20
-            text: "Readonly Text input"
-            style: touchStyle
-            readOnly: true
+        CheckBox {
+            text:"Details"
+            style: CheckBoxStyle {
+                showDetails: true
+                onOff:true
+            }
         }
-    }
-    Component {
-        id: touchStyle
-
-        TextFieldStyle {
-            textColor: "white"
-            font.pixelSize: 28
-            background: Item {
-                implicitHeight: 50
-                implicitWidth: 320
-                BorderImage {
-                    source: "../images/textinput.png"
-                    border.left: 8
-                    border.right: 8
-                    anchors.bottom: parent.bottom
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                }
+        CheckBox {
+            text:"onOff"
+            style: CheckBoxStyle {
+                onOff:true
             }
         }
-    }
+    }    
 }

diff --git a/examples/touch/main.qml b/examples/touch/main.qml
index f93c0a4..337fce8 100644 (file)
--- a/examples/touch/main.qml
+++ b/examples/touch/main.qml
@@ -47,7 +47,7 @@ ApplicationWindow {
     height: 1280
 
     Rectangle {
-        color: "#212126"
+        color: "#FFFFFF"
         anchors.fill: parent
     }
 
@@ -77,7 +77,7 @@ ApplicationWindow {
             antialiasing: true
             height: 60
             radius: 4
-            color: backmouse.pressed ? "#222" : "transparent"
+            color: backmouse.pressed ? "#EEEEEE" : "transparent"
             Behavior on opacity { NumberAnimation{} }
             Image {
                 anchors.verticalCenter: parent.verticalCenter
@@ -96,7 +96,7 @@ ApplicationWindow {
             Behavior on x { NumberAnimation{ easing.type: Easing.OutCubic} }
             x: backButton.x + backButton.width + 20
             anchors.verticalCenter: parent.verticalCenter
-            color: "white"
+            color: "black"
             text: "Widget Gallery"
         }
     }

diff --git a/qtquickcontrols-tizen.pro b/qtquickcontrols-tizen.pro
index 58c33f2..7e469c8 100644 (file)
--- a/qtquickcontrols-tizen.pro
+++ b/qtquickcontrols-tizen.pro
@@ -1 +1,3 @@
-load(qt_parts)
+#load(qt_parts)
+TEMPLATE=subdirs
+SUBDIRS += src examples

diff --git a/src/styles/ButtonStyle.qml b/src/styles/ButtonStyle.qml
index 776122a..d341755 100644 (file)
--- a/src/styles/ButtonStyle.qml
+++ b/src/styles/ButtonStyle.qml
@@ -39,68 +39,26 @@
 ****************************************************************************/
 import QtQuick 2.1
 import QtQuick.Controls 1.0
-import QtQuick.Controls.Private 1.0
+import QtQuick.Controls.Styles 1.0
 import "DefaultSettings.js" as Default
 
-/*!
-    \qmltype ButtonStyle
-    \inqmlmodule QtQuick.Controls.Styles 1.0
-    \since QtQuick.Controls.Styles 1.0
-    \brief Provides custom styling for Button
-
-    You can create a custom button by replacing the "background" delegate
-    of the ButtonStyle with a custom design.
-
-    Example:
-    \qml
-    Button {
-        text: "A button"
-        style: ButtonStyle {
-            background: Rectangle {
-                implicitWidth: 100
-                implicitHeight: 25
-                border.width: control.activeFocus ? 2 : 1
-                border.color: "#888"
-                radius: 4
-                gradient: Gradient {
-                    GradientStop { position: 0 ; color: control.pressed ? "#ccc" : "#eee" }
-                    GradientStop { position: 1 ; color: control.pressed ? "#aaa" : "#ccc" }
-                }
-            }
-        }
-    }
-    \endqml
-    If you need a custom label, you can replace the label item.
-*/
-
-Style {
+ButtonStyle {
     id: buttonstyle
 
-    /*! The \l Button attached to this style. */
-    readonly property Button control: __control
-
-    /*! The padding between the background and the label components. */
-    property Margins padding: Margins { top: 4 ; left: 4 ; right: 4 ; bottom: 4 }
-
-    /*! The background of the button. */
-    property Component background: TizenBorderImage {
+    background: TizenBorderImage {
         implicitWidth: 300
         implicitHeight: 50
         source: control.enabled ? (control.pressed ? Default.button.source.pressed: Default.button.source.normal) : Default.button.source.disabled
         effectSource: control.enabled ? (control.pressed ? Default.button.effectSource.pressed: Default.button.effectSource.normal) : Default.button.effectSource.disabled
         backgroundColor: control.enabled ? (control.pressed ? Default.button.backgroundColor.pressed: Default.button.backgroundColor.normal) : Default.button.backgroundColor.disabled
-        onEffectSourceChanged: {
-            console.log(effectSource)
-        }
-
-        //foregroundColor: control.enabled ? (control.pressed ? Default.button.foregroundColor.pressed: Default.button.foregroundColor.normal) : Default.button.foregroundColor.disabled
     }
 
     /*! The label of the button. */
-    property Component label: Item {
+    label: Item {
         implicitWidth: 0
         implicitHeight: 0
         Text {
+            id:txt
             anchors.leftMargin: Default.button.text.margins.left
             anchors.rightMargin: Default.button.text.margins.right
             anchors.topMargin: Default.button.text.margins.top
@@ -115,31 +73,6 @@ Style {
             minimumPixelSize: Default.button.font.minimumPixelSize
             maximumLineCount:2
             wrapMode: Text.Wrap
-            clip:true
-        }
-    }
-
-    /*! \internal */
-    property Component panel: Item {
-        anchors.centerIn: parent
-        anchors.fill: parent
-        implicitWidth: Math.max(labelLoader.implicitWidth + padding.left + padding.right, backgroundLoader.implicitWidth)
-        implicitHeight: Math.max(labelLoader.implicitHeight + padding.top + padding.bottom, backgroundLoader.implicitHeight)
-
-        Loader {
-            id: backgroundLoader
-            anchors.fill: parent
-            sourceComponent: background
-        }
-
-        Loader {
-            id: labelLoader
-            sourceComponent: label
-            anchors.fill: parent
-            anchors.leftMargin: padding.left
-            anchors.topMargin: padding.top
-            anchors.rightMargin: padding.right
-            anchors.bottomMargin: padding.bottom
         }
     }
 }

diff --git a/src/styles/CheckBoxStyle.qml b/src/styles/CheckBoxStyle.qml
new file mode 100644 (file)
index 0000000..2baca26
--- /dev/null
+++ b/src/styles/CheckBoxStyle.qml
@@ -0,0 +1,159 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Quick Controls module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 2.1
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Styles 1.0
+import "DefaultSettings.js" as Default
+
+CheckBoxStyle {
+    id: checkboxStyle
+
+    label: Text {
+        text: control.text
+        font.pointSize: Default.checkBox.font.pixelSize
+        color:if (control.enabled) {
+                  if (control.pressed) {
+                      Default.checkBox.text.color.pressed
+                  } else {
+                      Default.checkBox.text.color.normal
+                  }
+              } else {
+                  Default.checkBox.text.color.disabled
+              }
+        verticalAlignment: Text.AlignVCenter
+    }
+
+    /*
+      0 - default CheckBox - with check indicator on the left
+      1 - check box with onoff indicator on the right
+      */
+    property bool onOff: false
+
+    property bool showDetails: false
+
+    indicator: Item {
+        implicitWidth: indicatorLoader.implicitWidth
+        implicitHeight: indicatorLoader.implicitHeight
+        Image {
+            id:bg
+            source: control.enabled ? (control.pressed? Default.checkBox.indicator.source.pressed: Default.checkBox.indicator.source.normal):Default.checkBox.indicator.source.disabled
+            Image {
+                visible: control.checked
+                source: control.enabled ? (control.pressed || !control.checked ? Default.checkBox.indicator.markSource.pressed: Default.checkBox.indicator.markSource.normal):Default.checkBox.indicator.markSource.disabled
+            }
+        }        
+    }
+    property Component onOffIndicator: Item {
+        implicitWidth: onOffBackground.implicitWidth
+        implicitHeight: onOffBackground.implicitHeight
+        TizenBorderImage {
+            id:onOffBackground
+            anchors.centerIn: parent
+            source: Default.checkBox.onOff.icon.source.normal
+        }
+    }
+
+    property Component background: Panel {
+        pressed: control.pressed
+        implicitWidth: 600
+        implicitHeight: 100
+    }
+
+
+    property Component details: Item {
+        implicitWidth: detailsBg.implicitWidth
+        implicitHeight: detailsBg.height
+        TizenBorderImage {
+            id:detailsBg
+            source: Default.checkBox.details.source.normal
+            backgroundColor: control.enabled ? (control.pressed ? Default.checkBox.details.color.pressed : Default.checkBox.details.color.normal) : Default.checkBox.details.color.disabled
+            effectSource: control.enabled ? (control.pressed ? Default.checkBox.details.effectSource.pressed : Default.checkBox.details.effectSource.normal) : Default.checkBox.details.effectSource.disabled
+        }
+        TizenBorderImage {
+            anchors.centerIn: detailsBg
+            source: Default.checkBox.details.iconSource.normal
+            backgroundColor: control.enabled ? (control.pressed ? Default.checkBox.details.iconColor.pressed : Default.checkBox.details.iconColor.normal) : Default.checkBox.details.iconColor.disabled
+            effectSource: Default.checkBox.details.iconEffectSource.normal
+        }
+    }
+
+    /*! \internal */
+    property Component panel: Item {
+        implicitWidth: backgroundLoader.implicitWidth + padding.left + padding.right
+        implicitHeight: backgroundLoader.implicitHeight + padding.top + padding.bottom
+        Loader {
+            id:backgroundLoader
+            anchors.fill: parent
+            sourceComponent: background
+        }
+        Loader {
+            id: markIndicatorLoader
+            sourceComponent: onOff ? null : indicator
+            anchors.left: backgroundLoader.left
+            anchors.top: backgroundLoader.top
+            anchors.bottom: backgroundLoader.bottom
+            anchors.leftMargin: Default.checkBox.margins.left
+            anchors.topMargin: Default.checkBox.margins.top
+            anchors.bottomMargin: Default.checkBox.margins.bottom
+        }
+        Loader {
+            id: labelLoader
+            anchors.left: markIndicatorLoader.right
+            anchors.leftMargin:  checkboxStyle.spacing
+            anchors.top: backgroundLoader.top
+            anchors.bottom: backgroundLoader.bottom
+            anchors.right: detailsLoader.right
+            anchors.topMargin: Default.checkBox.margins.top
+            anchors.bottomMargin: Default.checkBox.margins.bottom
+            anchors.rightMargin: Default.checkBox.margins.right
+            sourceComponent: label
+        }
+        Loader {
+            id:detailsLoader
+            anchors.top: backgroundLoader.top
+            anchors.bottom: backgroundLoader.bottom
+            anchors.right: backgroundLoader.right
+            anchors.topMargin: Default.checkBox.margins.top
+            anchors.bottomMargin: Default.checkBox.margins.bottom
+            anchors.rightMargin: Default.checkBox.margins.right
+            sourceComponent: showDetails ? details : null
+        }
+    }
+}

diff --git a/src/styles/DefaultSettings.js b/src/styles/DefaultSettings.js
index aa2533e..5ea2e98 100644 (file)
--- a/src/styles/DefaultSettings.js
+++ b/src/styles/DefaultSettings.js
@@ -1,37 +1,699 @@
 .pragma library
 
+var theme="white/"
+var resolution="720x1280/"
 
-var theme="white"
+var imagesPath="images/"+resolution
+
+var colors = {
+    foreground:"#FF000000",
+    background:"#FFF8F6EF",
+    B011:"#FFF8F6EF",
+    B012:"#FFF8F6EF",
+    B013:"#FF000000",
+    B014:"#FFFFFFFF",
+    B015:"#FFF8F6EF",
+    B016:"#FF000000",
+    B017:"#FFFFFFFF",
+    B0211:"#FFF8F6EF",
+    B0211D:"#FFDBD9D4",
+    B0212:"#FFF8F6EF",
+    B0213:"#FF5B5656",
+    B0214:"#FFDCDAD3",
+    B0215:"#00000000",
+    B0216:"#FFDCDAD3",
+    B0217:"#FFEFEDE5",
+    B0217D:"#00000000",
+    B0221:"#FFB2B1AE",
+    B0222:"#FFFFFFFF",
+    B0223:"#FFD3D1CB",
+    B0224:"#FFB9B8B2",
+    B0225:"#FF2A5181",
+    B0226:"#FF4B73A3",
+    B0227:"#FF000000",
+    B0228:"#7FCFCFCF",
+    B0232:"#00000000",
+    B0233:"#FF1A5274",
+    B031:"#00000000",
+    B041:"#FF5787C2",
+    B041P:"#FFFFFFFF",
+    B042:"#FF3B73B6",
+    B043:"#FF5787C2",
+    B044:"#FF2A89C2",
+    B0511:"#FFF8F6EF",
+    B0512:"#00000000",
+    B0513:"#FFF8F6EF",
+    B0514:"#00000000",
+    B0514P1:"#FFA9A597",
+    B0514P2:"#00000000",
+    B0515L1:"#FFF8F6EF",
+    B0515L2:"#7F454442",
+    B0516:"#00000000",
+    B0517:"#00000000",
+    B0517P1:"#00000000",
+    B0517P2:"#00000000",
+    B0518:"#003567A3",
+    B0518P:"#00000000",
+    B0519:"#FFFFFFFF",
+    B0520:"#FF3567A3",
+    B0520P:"#FF2A89C2",
+    B052L1:"#FF737373",
+    B052L1P:"#FF4093F7",
+    B052L1D:"#4C737373",
+    B052L2:"#FF525252",
+    B052L2P:"#005787B8",
+    B052L3:"#00000000",
+    B052L3P:"#00000000",
+    B052L4:"#FF3A3A3A",
+    B052L4P:"#FFFFFFFF",
+    B052L4D:"#4C3A3A3A",
+    B052L5:"#FF3B73B6",
+    B052L6:"#FF999999",
+    B052L6P:"#FF3B73B6",
+    B052L7:"#FF0A64D0",
+    B052L8:"#FFFFFFFF",
+    B052L8P:"#FF4093F7",
+    B052L8D:"#4CFFFFFF",
+    B052L9:"#FFE4E4E4",
+    B052L9P:"#FFFFFFFF",
+    B052L9D:"#4CE4E4E4",
+    B052L10:"#FFBABABA",
+    B0531:"#FFF8F6EF",
+    B0532:"#00000000",
+    B0533:"#00000000",
+    B0534:"#00000000",
+    B0535:"#00000000",
+    B0536:"#00000000",
+    B0537:"#00000000",
+    B0541:"#00000000",
+    B0542:"#00000000",
+    B0542P:"#00000000",
+    B0543:"#00000000",
+    B0544:"#00000000",
+    B0545:"#00000000",
+    B0551:"#00000000",
+    B0552:"#00000000",
+    B0553:"#FFA5A5A5",
+    B0554:"#FFFFFFFF",
+    B0555:"#00000000",
+    B0556:"#00000000",
+    B0557:"#00000000",
+    B0558:"#00000000",
+    B061L1:"#FFF8F6EF",
+    B061L2:"#00000000",
+    B061L3:"#00000000",
+    B061L4:"#FF444444",
+    B061L5:"#FF343432",
+    B061L6:"#FF333537",
+    B0621L1:"#00000000",
+    B0621L2:"#00000000",
+    B0622L1:"#FF2D2D2D",
+    B0622L2:"#FF5B5B5B",
+    B0623L1:"#FF2D2D2D",
+    B0623L2:"#FF5B5B5B",
+    B0624L1:"#00000000",
+    B0624L2:"#00000000",
+    B0624L3:"#FFFDFCF9",
+    B063L1:"#FF000000",
+    B063L1P:"#00000000",
+    B063L1D:"#4C000000",
+    B063L2:"#FFFFFFFF",
+    B063L3:"#FF808080",
+    B063L4:"#FFFFFFFF",
+    B063L5:"#FFFFFFFF",
+    B063L5D:"#4CFFFFFF",
+    B063L6:"#FF454545",
+    B063L6P:"#FFFFFFFF",
+    B063L6D:"#4C454545",
+    B063L7:"#FF656565",
+    B063L8:"#FF808080",
+    B063L8P:"#00000000",
+    B063L8D:"#4C808080",
+    B063L9:"#FF3B73B6",
+    B064L1:"#00000000",
+    B064L1P:"#00000000",
+    B064L2:"#FF808080",
+    B064L2P:"#00000000",
+    B064L2D:"#4C808080",
+    B065L1:"#00000000",
+    B065L2:"#00000000",
+    B065L3:"#00000000",
+    B065L3P:"#00000000",
+    B065L4:"#00000000",
+    B065L4P:"#00000000",
+    B065L5:"#00000000",
+    B071:"#FFC6C4BE",
+    B0721:"#FFA09F9A",
+    B0722:"#FF3B73B6",
+    B0723:"#FFEBE9E1",
+    B0724:"#FFD9D5CA",
+    B0725:"#FF3B73B6",
+    B0731:"#FF3B73B6",
+    B0732:"#FFFFFFFF",
+    B0741:"#FFA09F9A",
+    B0742:"#FF3B73B6",
+    B0743:"#FFE6E3D8",
+    B0744:"#FFC5C2B7",
+    B0745:"#00000000",
+    B0751:"#FF3B73B6",
+    F011L1:"#FF000000",
+    F011L1P:"#FFFFFFFF",
+    F011L1D:"#4C000000",
+    F011L2:"#FF3B73B6",
+    F011L2D:"#4C3B73B6",
+    F011L3:"#FF808080",
+    F011L3D:"#CC808080",
+    F011L4:"#FF808080",
+    F011L4D:"#CC808080",
+    F011L5:"#FF3B73B6",
+    F011L6:"#00000000",
+    F011L7:"#FF808080",
+    F011L7D:"#CC808080",
+    F011L8:"#FFC24747",
+    F011L9:"#FFFFFFFF",
+    F011L10:"#FFFFFFFF",
+    F011L11:"#FF808080",
+    F011L12:"#FF4093F7",
+    F011L13:"#00000000",
+    F011L14:"#00000000",
+    F011L15:"#FFE94949",
+    F011L16:"#FF8B8B8B",
+    F011L17:"#FF8B8B8B",
+    F011L18:"#FF686868",
+    F011L19:"#FF8B8B8B",
+    F011L20:"#00000000",
+    F011L21:"#FF808080",
+    F011L22:"#FF9A9A9A",
+    F011L23:"#FF1382FF",
+    F021L1i:"#FF808080",
+    F021L1iP:"#FFFFFFFF",
+    F021L1iD:"#CC808080",
+    F022L1i:"#FFB8B8B8",
+    F022L2i:"#FF4C85C9",
+    F022L2iD:"#4C4C85C9",
+    F031L1:"#FF3A3A3A",
+    F031L1P:"#FFFFFFFF",
+    F031L1D:"#4C3A3A3A",
+    F031L2:"#00000000",
+    F031L2P:"#00000000",
+    F031L2D:"#00000000",
+    F031L3:"#FFFFFFFF",
+    F031L3P:"#FFFFFFFF",
+    F031L3D:"#4CFFFFFF",
+    F032L1:"#FF808080",
+    F032L1P:"#FFFFFFFF",
+    F032L1D:"#4C808080",
+    F032L2:"#FFFFFFFF",
+    F032L2P:"#FFFFFFFF",
+    F032L2D:"#4CFFFFFF",
+    F032L3:"#FFF9F9F9",
+    F032L3P:"#FFF9F9F9",
+    F041i:"#FF808080",
+    F041iD:"#4C808080",
+    F051:"#FF90A9C7",
+    F052:"#FF000000",
+    F053:"#FFB1B1B1",
+    F053P:"#FFFFFFFF",
+    F053D:"#4CB1B1B1",
+    W011:"#FFF8F6EF",
+    W012:"#00000000",
+    W013:"#00000000",
+    W0141:"#FFD05252",
+    W0141P:"#FF9E2C2C",
+    W0141D:"#4CD05252",
+    W015:"#FF404040",
+    W021L1:"#FFF8F6EF",
+    W021L1P:"#FF84A2C6",
+    W021L2:"#FF3B73B6",
+    W021L2P:"#FFFFFFFF",
+    W021L3:"#FF3B73B6",
+    W021L3P:"#FFFFFFFF",
+    W031:"#FFFFFFFF",
+    W031D:"#4CFFFFFF",
+    W032:"#FF878580",
+    W032P:"#FF000000",
+    W032D:"#4C878580",
+    W041:"#FFE1DDD1",
+    W051:"#FF000000",
+    W0611:"#FF3B73B6",
+    W0611P:"#FFFFFFFF",
+    W0611D:"#FF808080",
+    W062L1:"#FFF0EDE9",
+    W062L1D:"#4CF0EDE9",
+    W062L2:"#FF5A95DC",
+    W062L2D:"#4C5A95DC",
+    W062L3:"#FFD8D7D2",
+    W062L3D:"#4CD8D7D2",
+    W062L4:"#FF3677C3",
+    W062L4D:"#4C3677C3",
+    W0631:"#FF656565",
+    W0632:"#FFFFFFFF",
+    W0641:"#FFE0DAD1",
+    W0641P:"#FF5288C9",
+    W0641D:"#FFBFBFBF",
+    W0651:"#FFE8E6DF",
+    W0711:"#FF769DCC",
+    W0712:"#FF4267A9",
+    W0713:"#FF4093F7",
+    W0714:"#FF263E5F",
+    W0715:"#FF2889FF",
+    W0721:"#00000000",
+    W0811:"#FF5787C2",
+    W0812:"#00000000",
+    W0813:"#FF494949",
+    W082:"#00000000",
+    W083:"#00000000",
+    W084:"#B2FFFFFF",
+    W084P:"#FFFFFFFF",
+    W085:"#00000000",
+    W091:"#FF444444",
+    W092:"#FFFFFFFF",
+    W101:"#FF5893E4",
+    W111:"#FFE7E5DE",
+    W1121:"#FF000000",
+    W1122:"#FFFFFFFF",
+    W1123:"#4C000000",
+    W112L1:"#FFB4B4B4",
+    W112L2:"#FFFFFFFF",
+    W1211:"#00000000",
+    W1212:"#00000000",
+    W1221:"#00000000",
+    W1222:"#00000000",
+    W1223:"#00000000",
+    W131:"#FF959595",
+    W132:"#FF5787C2",
+    W141:"#FF808080",
+    W151:"#FF95948F",
+    W152:"#FF878787",
+    W153:"#FF5787C2",
+    W154:"#FFEFECE0",
+    W161:"#FF5787C2"
+}
+
+
+var images = {
+    img_00_arrow_left: imagesPath + theme + "00_arrow_left.png",
+    img_00_arrow_right: imagesPath + theme + "00_arrow_right.png",
+    img_00_badge_bg: imagesPath + "00_badge_bg.sci",
+    img_00_badge_bg_ef: imagesPath + theme + "00_badge_bg_ef.sci",
+    img_00_button_01: imagesPath + "00_button_01.sci",
+    img_00_button_01_ef: imagesPath + theme + "00_button_01_ef.sci",
+    img_00_button_01_ef_dim: imagesPath + theme + "00_button_01_ef_dim.sci",
+    img_00_button_01_ef_press: imagesPath + theme + "00_button_01_ef_press.sci",
+    img_00_button_01_focus: imagesPath + "00_button_01_focus.sci",
+    img_00_button_02: imagesPath + "00_button_02.sci",
+    img_00_button_02_ef: imagesPath + "00_button_02_ef.sci",
+    img_00_button_02_ef_press: imagesPath + "00_button_02_ef_press.sci",
+    img_00_button_03: imagesPath + "00_button_03.sci",
+    img_00_button_expand_closed: imagesPath + "00_button_expand_closed.png",
+    img_00_button_expand_closed_ef: imagesPath + theme + "00_button_expand_closed_ef.png",
+    img_00_button_expand_opened: imagesPath + "00_button_expand_opened.png",
+    img_00_button_expand_opened_ef: imagesPath + theme + "00_button_expand_opened_ef.png",
+    img_00_button_left: imagesPath + "00_button_left.png",
+    img_00_button_left_ef: imagesPath + theme + "00_button_left_ef.png",
+    img_00_button_off: imagesPath + theme + "00_button_off.png",
+    img_00_button_off_dim: imagesPath + theme + "00_button_off_dim.png",
+    img_00_button_on: imagesPath + theme + "00_button_on.png",
+    img_00_button_on_dim: imagesPath + theme + "00_button_on_dim.png",
+    img_00_button_on_off_handler: imagesPath + theme + "00_button_on_off_handler.png",
+    img_00_button_on_off_handler_dim: imagesPath + theme + "00_button_on_off_handler_dim.png",
+    img_00_button_on_off_handler_focus: imagesPath + theme + "00_button_on_off_handler_focus.png",
+    img_00_button_plus: imagesPath + "00_button_plus.png",
+    img_00_button_plus_ef: imagesPath + "00_button_plus_ef.png",
+    img_00_button_radio: imagesPath + "00_button_radio.png",
+    img_00_button_radio_Activated: imagesPath + theme + "00_button_radio_Activated.png",
+    img_00_button_radio_Activated_dim: imagesPath + theme + "00_button_radio_Activated_dim.png",
+    img_00_button_radio_bg: imagesPath + theme + "00_button_radio_bg.png",
+    img_00_button_radio_bg_dim: imagesPath + theme + "00_button_radio_bg_dim.png",
+    img_00_button_radio_dim: imagesPath + "00_button_radio_dim.png",
+    img_00_button_radio_dim_bg: imagesPath + "00_button_radio_dim_bg.png",
+    img_00_button_radio_Disabled: imagesPath + "00_button_radio_Disabled.png",
+    img_00_button_radio_focus: imagesPath + theme + "00_button_radio_focus.png",
+    img_00_button_radio_normal1: imagesPath + theme + "00_button_radio_normal1.png",
+    img_00_button_radio_normal2: imagesPath + theme + "00_button_radio_normal2.png",
+    img_00_button_radio_press: imagesPath + theme + "00_button_radio_press.png",
+    img_00_button_radio_press1: imagesPath + "00_button_radio_press1.png",
+    img_00_button_radio_press2: imagesPath + "00_button_radio_press2.png",
+    img_00_button_radio_press_bg: imagesPath + theme + "00_button_radio_press_bg.png",
+    img_00_button_radio_select: imagesPath + "00_button_radio_select.png",
+    img_00_button_radio_select_dim: imagesPath + "00_button_radio_select_dim.png",
+    img_00_button_reveal: imagesPath + "00_button_reveal.png",
+    img_00_button_right: imagesPath + "00_button_right.png",
+    img_00_button_right_ef: imagesPath + theme + "00_button_right_ef.png",
+    img_00_category_button: imagesPath + theme + "00_category_button.sci",
+    img_00_category_button_focus: imagesPath + theme + "00_category_button_focus.sci",
+    img_00_category_left_gradation: imagesPath + theme + "00_category_left_gradation.png",
+    img_00_category_panel_bg: imagesPath + theme + "00_category_panel_bg.sci",
+    img_00_category_panel_bg_ef: imagesPath + theme + "00_category_panel_bg_ef.sci",
+    img_00_category_right_gradation: imagesPath + theme + "00_category_right_gradation.png",
+    img_00_check_Activated: imagesPath + theme + "00_check_Activated.png",
+    img_00_check_Activated_dim: imagesPath + theme + "00_check_Activated_dim.png",
+    img_00_check_bg: imagesPath + theme + "00_check_bg.png",
+    img_00_check_bg_dim: imagesPath + "00_check_bg_dim.png",
+    img_00_check_bg_press: imagesPath + "00_check_bg_press.png",
+    img_00_check_checking: imagesPath + "00_check_checking.png",
+    img_00_check_checking_dim: imagesPath + "00_check_checking_dim.png",
+    img_00_check_dim: imagesPath + theme + "00_check_dim.png",
+    img_00_check_dim_bg: imagesPath + theme + "00_check_dim_bg.png",
+    img_00_check_Disabled: imagesPath + "00_check_Disabled.png",
+    img_00_check_focus: imagesPath + theme + "00_check_focus.png",
+    img_00_check_press: imagesPath + theme + "00_check_press.png",
+    img_00_check_press_bg: imagesPath + theme + "00_check_press_bg.png",
+    img_00_circle_bg: imagesPath + theme + "00_circle_bg.png",
+    img_00_circle_bg_ef: imagesPath + theme + "00_circle_bg_ef.png",
+    img_00_circle_bg_ef_dim: imagesPath + theme + "00_circle_bg_ef_dim.png",
+    img_00_circle_bg_ef_press: imagesPath + theme + "00_circle_bg_ef_press.png",
+    img_00_circle_button_focus: imagesPath + theme + "00_circle_button_focus.png",
+    img_00_color_picker_brightness: imagesPath + "00_color_picker_brightness.png",
+    img_00_color_picker_brightness_h: imagesPath + "00_color_picker_brightness_h.png",
+    img_00_color_picker_color: imagesPath + "00_color_picker_color.png",
+    img_00_color_picker_color_h: imagesPath + "00_color_picker_color_h.png",
+    img_00_color_picker_custom_color: imagesPath + "00_color_picker_custom_color.png",
+    img_00_color_picker_custom_color_h: imagesPath + "00_color_picker_custom_color_h.png",
+    img_00_color_picker_handler: imagesPath + "00_color_picker_handler.png",
+    img_00_color_picker_handler_focus: imagesPath + "00_color_picker_handler_focus.png",
+    img_00_color_picker_saturation: imagesPath + "00_color_picker_saturation.png",
+    img_00_color_picker_saturation_h: imagesPath + "00_color_picker_saturation_h.png",
+    img_00_contacts_button_bg: imagesPath + "00_contacts_button_bg.sci",
+    img_00_contacts_button_bg_ef: imagesPath + theme + "00_contacts_button_bg_ef.sci",
+    img_00_contacts_button_bg_press_ef: imagesPath + theme + "00_contacts_button_bg_press_ef.sci",
+    img_00_date_picker_dot: imagesPath + "00_date_picker_dot.png",
+    img_00_edit_field_clear: imagesPath + "00_edit_field_clear.png",
+    img_00_edit_field_line_round_bg_01: imagesPath + "00_edit_field_line_round_bg_01.sci",
+    img_00_edit_field_no_line_square_bg: imagesPath + "00_edit_field_no_line_square_bg.sci",
+    img_00_edit_field_round_bg: imagesPath + "00_edit_field_round_bg.sci",
+    img_00_effect_tab_bounce_left: imagesPath + theme + "00_effect_tab_bounce_left.png",
+    img_00_effect_tab_bounce_left_h: imagesPath + "00_effect_tab_bounce_left_h.png",
+    img_00_effect_tab_bounce_right: imagesPath + theme + "00_effect_tab_bounce_right.png",
+    img_00_effect_tab_bounce_right_h: imagesPath + "00_effect_tab_bounce_right_h.png",
+    img_00_effect_title_tab_bounce_left: imagesPath + "00_effect_title_tab_bounce_left.png",
+    img_00_effect_title_tab_bounce_right: imagesPath + "00_effect_title_tab_bounce_right.png",
+    img_00_effect_toolbar_tab_bounce_left: imagesPath + "00_effect_toolbar_tab_bounce_left.png",
+    img_00_effect_toolbar_tab_bounce_left_h: imagesPath + "00_effect_toolbar_tab_bounce_left_h.png",
+    img_00_effect_toolbar_tab_bounce_right: imagesPath + "00_effect_toolbar_tab_bounce_right.png",
+    img_00_effect_toolbar_tab_bounce_right_h: imagesPath + "00_effect_toolbar_tab_bounce_right_h.png",
+    img_00_fast_scroll_handler: imagesPath + "00_fast_scroll_handler.sci",
+    img_00_fast_scroll_handler_h: imagesPath + "00_fast_scroll_handler_h.sci",
+    img_00_fast_scroll_popup_bg: imagesPath + "00_fast_scroll_popup_bg.sci",
+    img_00_fast_scroll_popup_bg_ef: imagesPath + "00_fast_scroll_popup_bg_ef.sci",
+    img_00_fast_scroll_rollover_bg: imagesPath + "00_fast_scroll_rollover_bg.sci",
+    img_00_fast_scroll_rollover_bg_focus: imagesPath + "00_fast_scroll_rollover_bg_focus.sci",
+    img_00_fast_scroll_rollover_bg_line_focus: imagesPath + theme + "00_fast_scroll_rollover_bg_line_focus.sci",
+    img_00_focus: imagesPath + theme + "00_focus.sci",
+    img_00_grid_select_check: imagesPath + "00_grid_select_check.png",
+    img_00_grid_select_check_bg: imagesPath + "00_grid_select_check_bg.png",
+    img_00_grid_select_check_bg_press: imagesPath + "00_grid_select_check_bg_press.png",
+    img_00_groupedlist_bg_focus: imagesPath + "00_groupedlist_bg_focus.sci",
+    img_00_groupedlist_bg_press: imagesPath + "00_groupedlist_bg_press.sci",
+    img_00_groupedlist_bottom_bg_focus: imagesPath + "00_groupedlist_bottom_bg_focus.sci",
+    img_00_groupedlist_bottom_bg_press: imagesPath + "00_groupedlist_bottom_bg_press.sci",
+    img_00_groupedlist_center_bg_focus: imagesPath + "00_groupedlist_center_bg_focus.sci",
+    img_00_groupedlist_center_bg_press: imagesPath + "00_groupedlist_center_bg_press.sci",
+    img_00_groupedlist_top_bg_focus: imagesPath + "00_groupedlist_top_bg_focus.sci",
+    img_00_groupedlist_top_bg_press: imagesPath + "00_groupedlist_top_bg_press.sci",
+    img_00_header_process_01: imagesPath + theme + "00_header_process_01.png",
+    img_00_header_process_02: imagesPath + theme + "00_header_process_02.png",
+    img_00_header_process_03: imagesPath + theme + "00_header_process_03.png",
+    img_00_header_process_04: imagesPath + theme + "00_header_process_04.png",
+    img_00_header_process_05: imagesPath + theme + "00_header_process_05.png",
+    img_00_header_process_06: imagesPath + theme + "00_header_process_06.png",
+    img_00_header_process_07: imagesPath + theme + "00_header_process_07.png",
+    img_00_header_process_08: imagesPath + theme + "00_header_process_08.png",
+    img_00_header_process_09: imagesPath + theme + "00_header_process_09.png",
+    img_00_header_process_10: imagesPath + theme + "00_header_process_10.png",
+    img_00_header_process_11: imagesPath + theme + "00_header_process_11.png",
+    img_00_header_process_12: imagesPath + theme + "00_header_process_12.png",
+    img_00_header_process_13: imagesPath + theme + "00_header_process_13.png",
+    img_00_header_process_14: imagesPath + theme + "00_header_process_14.png",
+    img_00_header_process_15: imagesPath + theme + "00_header_process_15.png",
+    img_00_header_process_16: imagesPath + theme + "00_header_process_16.png",
+    img_00_header_process_17: imagesPath + theme + "00_header_process_17.png",
+    img_00_header_process_18: imagesPath + theme + "00_header_process_18.png",
+    img_00_header_process_19: imagesPath + theme + "00_header_process_19.png",
+    img_00_header_process_20: imagesPath + theme + "00_header_process_20.png",
+    img_00_header_process_21: imagesPath + theme + "00_header_process_21.png",
+    img_00_header_process_22: imagesPath + theme + "00_header_process_22.png",
+    img_00_header_process_23: imagesPath + theme + "00_header_process_23.png",
+    img_00_header_process_24: imagesPath + theme + "00_header_process_24.png",
+    img_00_header_process_25: imagesPath + theme + "00_header_process_25.png",
+    img_00_header_process_26: imagesPath + theme + "00_header_process_26.png",
+    img_00_header_process_27: imagesPath + theme + "00_header_process_27.png",
+    img_00_header_process_28: imagesPath + theme + "00_header_process_28.png",
+    img_00_header_process_29: imagesPath + theme + "00_header_process_29.png",
+    img_00_header_process_30: imagesPath + theme + "00_header_process_30.png",
+    img_00_icon_Back: imagesPath + "00_icon_Back.png",
+    img_00_icon_Back_ef: imagesPath + theme + "00_icon_Back_ef.png",
+    img_00_icon_Back_ef_02: imagesPath + theme + "00_icon_Back_ef_02.png",
+    img_00_icon_Back_trans_ef: imagesPath + theme + "00_icon_Back_trans_ef.png",
+    img_00_icon_jump: imagesPath + "00_icon_jump.png",
+    img_00_icon_jump_ef: imagesPath + theme + "00_icon_jump_ef.png",
+    img_00_icon_jump_left: imagesPath + "00_icon_jump_left.png",
+    img_00_icon_jump_left_ef: imagesPath + theme + "00_icon_jump_left_ef.png",
+    img_00_icon_more: imagesPath + "00_icon_more.png",
+    img_00_icon_more_ef: imagesPath + theme + "00_icon_more_ef.png",
+    img_00_icon_SIP_close: imagesPath + "00_icon_SIP_close.png",
+    img_00_icon_SIP_close_ef: imagesPath + theme + "00_icon_SIP_close_ef.png",
+    img_00_indexlist_bg: imagesPath + "00_indexlist_bg.sci",
+    img_00_indexlist_bg_ef: imagesPath + theme + "00_indexlist_bg_ef.sci",
+    img_00_list_group_bg: imagesPath + "00_list_group_bg.sci",
+    img_00_list_group_bg_bottom: imagesPath + "00_list_group_bg_bottom.sci",
+    img_00_list_group_bg_bottom_ef: imagesPath + theme + "00_list_group_bg_bottom_ef.sci",
+    img_00_list_group_bg_bottom_focus: imagesPath + "00_list_group_bg_bottom_focus.sci",
+    img_00_list_group_bg_center: imagesPath + "00_list_group_bg_center.sci",
+    img_00_list_group_bg_center_ef: imagesPath + theme + "00_list_group_bg_center_ef.sci",
+    img_00_list_group_bg_center_focus: imagesPath + "00_list_group_bg_center_focus.sci",
+    img_00_list_group_bg_ef: imagesPath + theme + "00_list_group_bg_ef.sci",
+    img_00_list_group_bg_focus: imagesPath + "00_list_group_bg_focus.sci",
+    img_00_list_group_bg_top: imagesPath + "00_list_group_bg_top.sci",
+    img_00_list_group_bg_top_ef: imagesPath + theme + "00_list_group_bg_top_ef.sci",
+    img_00_list_group_bg_top_focus: imagesPath + "00_list_group_bg_top_focus.sci",
+    img_00_list_group_bottom_cover_round_bg_normal: imagesPath + "00_list_group_bottom_cover_round_bg_normal.sci",
+    img_00_list_group_center_cover_round_bg_normal: imagesPath + "00_list_group_center_cover_round_bg_normal.sci",
+    img_00_list_group_press_bg: imagesPath + "00_list_group_press_bg.sci",
+    img_00_list_group_press_bg_bottom: imagesPath + "00_list_group_press_bg_bottom.sci",
+    img_00_list_group_press_bg_center: imagesPath + "00_list_group_press_bg_center.sci",
+    img_00_list_group_press_bg_top: imagesPath + "00_list_group_press_bg_top.sci",
+    img_00_list_group_single_cover_round_bg_normal: imagesPath + "00_list_group_single_cover_round_bg_normal.sci",
+    img_00_list_group_top_cover_round_bg_normal: imagesPath + "00_list_group_top_cover_round_bg_normal.sci",
+    img_00_list_process_01: imagesPath + theme + "00_list_process_01.png",
+    img_00_list_process_02: imagesPath + theme + "00_list_process_02.png",
+    img_00_list_process_03: imagesPath + theme + "00_list_process_03.png",
+    img_00_list_process_04: imagesPath + theme + "00_list_process_04.png",
+    img_00_list_process_05: imagesPath + theme + "00_list_process_05.png",
+    img_00_list_process_06: imagesPath + theme + "00_list_process_06.png",
+    img_00_list_process_07: imagesPath + theme + "00_list_process_07.png",
+    img_00_list_process_08: imagesPath + theme + "00_list_process_08.png",
+    img_00_list_process_09: imagesPath + theme + "00_list_process_09.png",
+    img_00_list_process_10: imagesPath + theme + "00_list_process_10.png",
+    img_00_list_process_11: imagesPath + theme + "00_list_process_11.png",
+    img_00_list_process_12: imagesPath + theme + "00_list_process_12.png",
+    img_00_list_process_13: imagesPath + theme + "00_list_process_13.png",
+    img_00_list_process_14: imagesPath + theme + "00_list_process_14.png",
+    img_00_list_process_15: imagesPath + theme + "00_list_process_15.png",
+    img_00_list_process_16: imagesPath + theme + "00_list_process_16.png",
+    img_00_list_process_17: imagesPath + theme + "00_list_process_17.png",
+    img_00_list_process_18: imagesPath + theme + "00_list_process_18.png",
+    img_00_list_process_19: imagesPath + theme + "00_list_process_19.png",
+    img_00_list_process_20: imagesPath + theme + "00_list_process_20.png",
+    img_00_list_process_21: imagesPath + theme + "00_list_process_21.png",
+    img_00_list_process_22: imagesPath + theme + "00_list_process_22.png",
+    img_00_list_process_23: imagesPath + theme + "00_list_process_23.png",
+    img_00_list_process_24: imagesPath + theme + "00_list_process_24.png",
+    img_00_list_process_25: imagesPath + theme + "00_list_process_25.png",
+    img_00_list_process_26: imagesPath + theme + "00_list_process_26.png",
+    img_00_list_process_27: imagesPath + theme + "00_list_process_27.png",
+    img_00_list_process_28: imagesPath + theme + "00_list_process_28.png",
+    img_00_list_process_29: imagesPath + theme + "00_list_process_29.png",
+    img_00_list_process_30: imagesPath + theme + "00_list_process_30.png",
+    img_00_more_popup_press: imagesPath + theme + "00_more_popup_press.sci",
+    img_00_option_panel_contextual_popup_arrow: imagesPath + "00_option_panel_contextual_popup_arrow.png",
+    img_00_option_panel_handle_bg: imagesPath + "00_option_panel_handle_bg.png",
+    img_00_option_panel_handle_bg_ef: imagesPath + theme + "00_option_panel_handle_bg_ef.png",
+    img_00_option_panel_handle_bg_ef_press: imagesPath + theme + "00_option_panel_handle_bg_ef_press.png",
+    img_00_option_panel_handle_bg_press: imagesPath + "00_option_panel_handle_bg_press.png",
+    img_00_option_panel_handle_more: imagesPath + "00_option_panel_handle_more.png",
+    img_00_option_panel_handle_more_press: imagesPath + "00_option_panel_handle_more_press.png",
+    img_00_overscrolling_bottom: imagesPath + theme + "00_overscrolling_bottom.sci",
+    img_00_overscrolling_left: imagesPath + theme + "00_overscrolling_left.sci",
+    img_00_overscrolling_right: imagesPath + theme + "00_overscrolling_right.sci",
+    img_00_overscrolling_top: imagesPath + theme + "00_overscrolling_top.sci",
+    img_00_panel_bg: imagesPath + "00_panel_bg.sci",
+    img_00_panel_handle_arrow: imagesPath + "00_panel_handle_arrow.png",
+    img_00_panel_handle_bg: imagesPath + "00_panel_handle_bg.sci",
+    img_00_panel_handle_bg_ef: imagesPath + theme + "00_panel_handle_bg_ef.sci",
+    img_00_panel_handle_bg_ef_press: imagesPath + theme + "00_panel_handle_bg_ef_press.sci",
+    img_00_panel_list_bg_ef_press: imagesPath + theme + "00_panel_list_bg_ef_press.sci",
+    img_00_panel_list_bg_press: imagesPath + "00_panel_list_bg_press.sci",
+    img_00_picker_button: imagesPath + "00_picker_button.sci",
+    img_00_picker_button_dim_ef: imagesPath + theme + "00_picker_button_dim_ef.sci",
+    img_00_picker_button_ef: imagesPath + theme + "00_picker_button_ef.sci",
+    img_00_picker_button_focus: imagesPath + "00_picker_button_focus.sci",
+    img_00_picker_button_press_ef: imagesPath + theme + "00_picker_button_press_ef.sci",
+    img_00_popup_bg: imagesPath + theme + "00_popup_bg.sci",
+    img_00_popup_bg_ef: imagesPath + theme + "00_popup_bg_ef.sci",
+    img_00_popup_bubble_bg: imagesPath + theme + "00_popup_bubble_bg.sci",
+    img_00_popup_bubble_bg_ef: imagesPath + theme + "00_popup_bubble_bg_ef.sci",
+    img_00_popup_bubble_tail_bottom: imagesPath + theme + "00_popup_bubble_tail_bottom.png",
+    img_00_popup_bubble_tail_bottom_ef: imagesPath + theme + "00_popup_bubble_tail_bottom_ef.png",
+    img_00_popup_bubble_tail_left: imagesPath + theme + "00_popup_bubble_tail_left.png",
+    img_00_popup_bubble_tail_left_ef: imagesPath + theme + "00_popup_bubble_tail_left_ef.png",
+    img_00_popup_bubble_tail_right: imagesPath + theme + "00_popup_bubble_tail_right.png",
+    img_00_popup_bubble_tail_right_ef: imagesPath + theme + "00_popup_bubble_tail_right_ef.png",
+    img_00_popup_bubble_tail_top: imagesPath + theme + "00_popup_bubble_tail_top.png",
+    img_00_popup_bubble_tail_top_ef: imagesPath + theme + "00_popup_bubble_tail_top_ef.png",
+    img_00_popup_button_bg_ef: imagesPath + theme + "00_popup_button_bg_ef.sci",
+    img_00_popup_dim_lighting: imagesPath + theme + "00_popup_dim_lighting.png",
+    img_00_popup_dim_lighting_h: imagesPath + theme + "00_popup_dim_lighting_h.png",
+    img_00_popup_title_bg: imagesPath + "00_popup_title_bg.png",
+    img_00_popup_title_bg_ef: imagesPath + "00_popup_title_bg_ef.png",
+    img_00_progress_bar: imagesPath + "00_progress_bar.sci",
+    img_00_progress_bar_ef: imagesPath + theme + "00_progress_bar_ef.sci",
+    img_00_progress_bg: imagesPath + "00_progress_bg.sci",
+    img_00_progress_ef_bg: imagesPath + theme + "00_progress_ef_bg.sci",
+    img_00_scroll_bar_h: imagesPath + "00_scroll_bar_h.sci",
+    img_00_scroll_bar_handler_h: imagesPath + theme + "00_scroll_bar_handler_h.png",
+    img_00_scroll_bar_handler_v: imagesPath + theme + "00_scroll_bar_handler_v.png",
+    img_00_scroll_bar_h_ef: imagesPath + "00_scroll_bar_h_ef.sci",
+    img_00_scroll_bar_v: imagesPath + "00_scroll_bar_v.sci",
+    img_00_scroll_bar_v_ef: imagesPath + "00_scroll_bar_v_ef.sci",
+    img_00_search_edit_field_bg: imagesPath + "00_search_edit_field_bg.sci",
+    img_00_search_edit_field_bg_ef: imagesPath + theme + "00_search_edit_field_bg_ef.sci",
+    img_00_search_icon: imagesPath + "00_search_icon.png",
+    img_00_search_icon_ef: imagesPath + theme + "00_search_icon_ef.png",
+    img_00_slider_bg: imagesPath + theme + "00_slider_bg.sci",
+    img_00_slider_handle: imagesPath + "00_slider_handle.png",
+    img_00_slider_handle_ef: imagesPath + theme + "00_slider_handle_ef.png",
+    img_00_slider_handle_ef_dim: imagesPath + theme + "00_slider_handle_ef_dim.png",
+    img_00_slider_handle_ef_press: imagesPath + theme + "00_slider_handle_ef_press.png",
+    img_00_slider_handle_focus: imagesPath + "00_slider_handle_focus.png",
+    img_00_slider_popup_bg: imagesPath + "00_slider_popup_bg.sci",
+    img_00_slider_popup_bg_ef: imagesPath + theme + "00_slider_popup_bg_ef.sci",
+    img_00_softkey_icon_add: imagesPath + "00_softkey_icon_add.png",
+    img_00_softkey_icon_zoom: imagesPath + "00_softkey_icon_zoom.png",
+    img_00_softkey_left_bg: imagesPath + "00_softkey_left_bg.png",
+    img_00_softkey_left_bg_ef: imagesPath + theme + "00_softkey_left_bg_ef.png",
+    img_00_softkey_left_bg_ef_press: imagesPath + theme + "00_softkey_left_bg_ef_press.png",
+    img_00_softkey_left_text_bg: imagesPath + "00_softkey_left_text_bg.png",
+    img_00_softkey_left_text_bg_ef: imagesPath + theme + "00_softkey_left_text_bg_ef.png",
+    img_00_softkey_left_text_bg_ef_press: imagesPath + theme + "00_softkey_left_text_bg_ef_press.png",
+    img_00_softkey_right_bg: imagesPath + "00_softkey_right_bg.png",
+    img_00_softkey_right_bg_ef: imagesPath + theme + "00_softkey_right_bg_ef.png",
+    img_00_softkey_right_bg_ef_press: imagesPath + theme + "00_softkey_right_bg_ef_press.png",
+    img_00_softkey_right_text_bg: imagesPath + "00_softkey_right_text_bg.png",
+    img_00_softkey_right_text_bg_ef: imagesPath + theme + "00_softkey_right_text_bg_ef.png",
+    img_00_softkey_right_text_bg_ef_press: imagesPath + theme + "00_softkey_right_text_bg_ef_press.png",
+    img_00_split_handler_bg: imagesPath + "00_split_handler_bg.sci",
+    img_00_split_handler_bg_ef_h: imagesPath + theme + "00_split_handler_bg_ef_h.sci",
+    img_00_split_handler_bg_ef_v: imagesPath + theme + "00_split_handler_bg_ef_v.sci",
+    img_00_split_handler_h: imagesPath + theme + "00_split_handler_h.png",
+    img_00_split_handler_v: imagesPath + theme + "00_split_handler_v.png",
+    img_00_system_control_bg: imagesPath + "00_system_control_bg.sci",
+    img_00_tab_bg: imagesPath + "00_tab_bg.sci",
+    img_00_tab_bg_focus_ef: imagesPath + "00_tab_bg_focus_ef.png",
+    img_00_tab_bg_line_ef: imagesPath + "00_tab_bg_line_ef.png",
+    img_00_tab_focus: imagesPath + "00_tab_focus.sci",
+    img_00_tab_press_ef: imagesPath + "00_tab_press_ef.sci",
+    img_00_thumbs_bg_focus: imagesPath + "00_thumbs_bg_focus.sci",
+    img_00_thumbs_line_bg: imagesPath + "00_thumbs_line_bg.sci",
+    img_00_time_picker_keypad_bg: imagesPath + "00_time_picker_keypad_bg.sci",
+    img_00_time_picker_keypad_button_bg: imagesPath + "00_time_picker_keypad_button_bg.sci",
+    img_00_time_picker_keypad_button_bg_ef: imagesPath + "00_time_picker_keypad_button_bg_ef.sci",
+    img_00_time_picker_number_bg: imagesPath + "00_time_picker_number_bg.sci",
+    img_00_time_picker_tail: imagesPath + "00_time_picker_tail.png",
+    img_00_time_picker_tail_01: imagesPath + "00_time_picker_tail_01.png",
+    img_00_title_bg: imagesPath + "00_title_bg.sci",
+    img_00_title_bg_ef: imagesPath + "00_title_bg_ef.png",
+    img_00_toolbar_bg: imagesPath + "00_toolbar_bg.sci",
+    img_00_toolbar_bg_ef: imagesPath + theme + "00_toolbar_bg_ef.sci",
+    img_00_toolbar_bg_shadow: imagesPath + theme + "00_toolbar_bg_shadow.sci",
+    img_00_toolbar_button: imagesPath + theme + "00_toolbar_button.sci",
+    img_00_toolbar_button_bg: imagesPath + "00_toolbar_button_bg.sci",
+    img_00_toolbar_button_ef: imagesPath + theme + "00_toolbar_button_ef.sci",
+    img_00_toolbar_button_ef_focus: imagesPath + "00_toolbar_button_ef_focus.sci",
+    img_00_toolbar_button_ef_press: imagesPath + theme + "00_toolbar_button_ef_press.sci",
+    img_00_toolbar_button_press: imagesPath + theme + "00_toolbar_button_press.sci",
+    img_00_toolbar_ef_press: imagesPath + theme + "00_toolbar_ef_press.sci",
+    img_00_toolbar_press: imagesPath + "00_toolbar_press.sci",
+    img_copy_and_paste_Handler_center: imagesPath + "copy_and_paste_Handler_center.png",
+    img_copy_and_paste_Handler_center_reverse: imagesPath + "copy_and_paste_Handler_center_reverse.png",
+    img_copy_and_paste_Handler_left: imagesPath + "copy_and_paste_Handler_left.png",
+    img_copy_and_paste_Handler_left_01: imagesPath + "copy_and_paste_Handler_left_01.png",
+    img_copy_and_paste_Handler_left_reverse: imagesPath + "copy_and_paste_Handler_left_reverse.png",
+    img_copy_and_paste_Handler_right: imagesPath + "copy_and_paste_Handler_right.png",
+    img_copy_and_paste_icon_search: imagesPath + "copy_and_paste_icon_search.png",
+    img_copy_and_paste_Magnifier: imagesPath + "copy_and_paste_Magnifier.sci",
+    img_pd_btn_bg: imagesPath + theme + "pd_btn_bg.sci",
+    img_pd_btn_bg_arrow_down: imagesPath + theme + "pd_btn_bg_arrow_down.png",
+    img_pd_btn_bg_arrow_up: imagesPath + theme + "pd_btn_bg_arrow_up.png",
+    img_TTS_focus: imagesPath + "TTS_focus.sci",
+    img_TTS_popup_bg: imagesPath + "TTS_popup_bg.sci",
+}
+
+
+var panel = {
+    color: {
+        normal:colors.B0217,
+        pressed: colors.B041
+    },
+
+    source: {
+        normal:images.img_00_list_group_bg,
+        pressed:images.img_00_list_group_bg,
+        disabled:images.img_00_list_group_bg,
+        highlihgted:images.img_00_list_group_bg,
+        selected:images.img_00_list_group_bg
+    },
+
+    effectSource: {
+        normal:images.img_00_list_group_bg_ef,
+        pressed:images.img_00_list_group_bg_ef,
+        selected:images.img_00_groupedlist_bg_focus
+    }
+}
 
 var progress = {
-    margins: {top:0, left:8, right:8, bottom: 0},
-    progressColor: "#5A95DC",
-    backgroundColor: "#F0EDE9"
+    margins:{left:8,right:8,top:0,bottom:0},
+
+    backgroundColor: colors.W062L1,
+    progressColor: colors.W062L2,
+
+    height:36,
+    source: {
+        normal: images.img_00_progress_bar
+    },
+    backgroundSource: {
+        normal:images.img_00_progress_bg
+    },
+    backgroundEffectSource: {
+        normal:images.img_00_progress_ef_bg
+    },
+
+    effectSource: {
+        normal:images.img_00_progress_bar_ef
+    }
 };
 
 var slider = {
+
     handle:{
         backgroundColor:{
-            pressed: "#5288C9",
-            normal:"#E0DAD1",
-            disabled:"#BFBFBF"
-        },
-        foregroundColor:{
-            normal:"#3B73B6",
-            disabled:"#808080"
+            pressed: colors.W0641P,
+            normal: colors.W0641,
+            disabled: colors.W0641D
         },
-        source:{ normal: "images/00_slider_handle.sci"},
+
+        source:{ normal: images.img_00_slider_handle},
         effectSource: {
-            normal: "images/"+theme+"/00_slider_handle_ef.sci",
-            disabled: "images/"+theme+"/00_slider_handle_ef_dim.sci"            ,
-            pressed: "images/"+theme+"/00_slider_handle_ef_press.sci"
+            normal: images.img_00_slider_handle_ef,
+            disabled: images.img_00_slider_handle_ef_dim,
+            pressed: images.img_00_slider_handle_ef_press
         },
         font: {pointSize: 28},
         text: {
             margins: 8,
             color: {
-                normal:"#3B73B6",
-                disabled:"#808080"
+                normal:colors.W0611,
+                disabled:colors.W0611D
             }
         }
     },
@@ -41,17 +703,17 @@ var slider = {
 var button= {
 
     backgroundColor: {
-        normal:"#F8F6EF",
-        disabled: "#F8F6EF",
-        pressed:"#3B73B6"
-        //highlighted:"#3B73B6"
+        normal:colors.W011,
+        disabled: colors.W011,
+        pressed:colors.B042
+        //highlighted:colors.W042
     },
     text: {
         color: {
-            normal:"#3A3A3A",
-            disabled: "#4C3A3A3A",
-            pressed: "#FFFFFF"
-            //highlighted:"#FFFFFF"
+            normal:colors.F031L1,
+            disabled: colors.F031L1D,
+            pressed: colors.F031L1P
+            //highlighted:colors.F031L1P
         },
         margins: {
             left: 12,
@@ -59,24 +721,144 @@ var button= {
             right:12,
             bottom:4
         }
-
-        //    ADD_SHAPE_CONFIG(LEFT_MARGIN, 12);
-        //    ADD_SHAPE_CONFIG(TOP_MARGIN, 4);
-        //    ADD_SHAPE_CONFIG(RIGHT_MARGIN, 12);
-        //    ADD_SHAPE_CONFIG(BOTTOM_MARGIN, 4);
     },
 
     source: {
-        normal: "images/00_button_01.sci",
-        disabled:"images/00_button_01.sci",
-        pressed: "images/00_button_01.sci"
-        //highlighted:"images/00_button_01.sci"
+        normal: images.img_00_button_01,
+        disabled:images.img_00_button_01,
+        pressed: images.img_00_button_01
+        //highlighted:images.img_00_button_01
     },
     effectSource: {
-        normal: "images/"+theme+"/00_button_01_ef.sci",
-        disabled:"images/"+theme+"/00_button_01_ef_dim.sci",
-        pressed: "images/"+theme+"/00_button_01_ef_press.sci"
-        //highlighted:"images/"+theme+"/00_button_01_ef_press.sci"
+        normal: images.img_00_button_01_ef,
+        disabled:images.img_00_button_01_ef_dim,
+        pressed: images.img_00_button_01_ef_press
+        //highlighted:images.img_00_button_01_ef_press
     },
     font:{pixelSize:36, minimumPixelSize: 28}
 }
+
+var checkBox = {
+
+     indicator: {
+        color: {
+            normal:colors.B0217,
+            pressed: colors.B041,
+            checked:colors.B0217,
+            disabled:colors.B0217
+            //highlighted:colors.B041
+        },
+        source: {
+            normal:images.img_00_check_bg,
+            pressed:images.img_00_check_press_bg,
+            disabled: images.img_00_check_dim_bg
+        },
+        markSource: {
+            normal: images.img_00_check_Activated,
+            disabled: images.img_00_check_Activated_dim,
+            pressed: images.img_00_check_press,
+            checked: images.img_00_check_Activated
+        }
+    },
+
+
+//  ADD_IMAGE_CONFIG(ONOFF_ICON_BG_NORMAL, #00_button_radio_bg.png);
+//     ADD_IMAGE_CONFIG(ONOFF_ICON_BG_DISABLED, #00_button_radio_dim_bg.png);
+//     ADD_IMAGE_CONFIG(ONOFF_ICON_BG_PRESSED, #00_button_radio_press_bg.png);
+//     ADD_IMAGE_CONFIG(ONOFF_ICON_BG_HIGHLIGHTED, #00_button_radio_press_bg.png);
+//     ADD_IMAGE_CONFIG(ONOFF_ICON_BG_SELECTED, #00_button_radio_bg.png);
+
+//     ADD_IMAGE_CONFIG(ONOFF_ICON_NORMAL, #00_button_radio_Activated.png);
+//     ADD_IMAGE_CONFIG(ONOFF_ICON_DISABLED, #00_button_radio_Activated_dim.png);
+//     ADD_IMAGE_CONFIG(ONOFF_ICON_PRESSED, #00_button_radio_press.png);
+//     ADD_IMAGE_CONFIG(ONOFF_ICON_HIGHLIGHTED, #00_button_radio_press.png);
+//     ADD_IMAGE_CONFIG(ONOFF_ICON_SELECTED, #00_button_radio_Activated.png);
+
+//     ADD_IMAGE_CONFIG(ONOFF_SLIDING_ON_BG_NORMAL, #00_button_on.png);
+//     ADD_IMAGE_CONFIG(ONOFF_SLIDING_ON_BG_DISABLED, #00_button_on_dim.png);
+//     ADD_IMAGE_CONFIG(ONOFF_SLIDING_ON_BG_PRESSED, #00_button_on.png);
+//     ADD_IMAGE_CONFIG(ONOFF_SLIDING_ON_BG_HIGHLIGHTED, #00_button_on.png);
+//     ADD_IMAGE_CONFIG(ONOFF_SLIDING_ON_BG_SELECTED, #00_button_on.png);
+
+//     ADD_IMAGE_CONFIG(ONOFF_SLIDING_OFF_BG_NORMAL,  #00_button_off.png);
+//     ADD_IMAGE_CONFIG(ONOFF_SLIDING_OFF_BG_DISABLED, #00_button_off_dim.png);
+//     ADD_IMAGE_CONFIG(ONOFF_SLIDING_OFF_BG_PRESSED, #00_button_off.png);
+//     ADD_IMAGE_CONFIG(ONOFF_SLIDING_OFF_BG_HIGHLIGHTED, #00_button_off.png);
+//     ADD_IMAGE_CONFIG(ONOFF_SLIDING_OFF_BG_SELECTED, #00_button_off.png);
+
+    onOff: {
+        icon: {
+            source: {
+                normal: images.img_00_button_radio_bg,
+                disabled: images.img_00_button_radio_dim_bg,
+                pressed: images.img_00_button_radio_press_bg,
+                highlighted: images.img_00_button_radio_press_bg,
+                selected: images.img_00_button_radio_bg
+            },
+            effectSource: {
+                normal: images.img_00_button_radio_Activated,
+                disabled: images.img_00_button_radio_Activated_dim,
+                pressed: images.img_00_button_radio_press,
+                highlighted: images.img_00_button_radio_press,
+                selected: images.img_00_button_radio_Activated
+            }
+        },
+
+        handlerSource: {
+            normal: images.img_00_button_on_off_handler,
+            disabled: images.img_00_button_on_off_handler_dim,
+            pressed: images.img_00_button_on_off_handler,
+            highlighted: images.img_00_button_on_off_handler,
+            selected: images.img_00_button_on_off_handler
+        }
+
+    },
+
+    text: {
+        color: {
+            normal:colors.F011L1,
+            disabled:colors.F011L3,
+            pressed:colors.F031L1P,
+            checked:colors.F011L1
+            //highlighted:"#FFFFFF"
+        }
+    },
+    font: {
+        pixelSize: 44
+    },
+    margins: {
+        top:10,
+        left: 26,
+        right:26,
+        bottom: 10
+    },
+    details: {
+        color: {
+            normal: colors.W011,
+            disabled:colors.W011,
+            pressed:colors.B042
+        },
+        source: {
+            normal: images.img_00_circle_bg
+        },
+        effectSource: {
+            normal: images.img_00_circle_bg_ef,
+            disabled:images.img_00_circle_bg_ef_dim,
+            pressed: images.img_00_circle_bg_ef_press
+        },
+        iconSource: {
+            normal: images.img_00_button_right
+        },
+        iconEffectSource: {
+            normal:images.img_00_button_right_ef,
+            pressed:images.img_00_button_right_ef
+        },
+        iconColor: {
+            normal: colors.F032L1,
+            disabled: colors.F032L1,
+            pressed: colors.F032L1P
+            //highlighted: colors.F032L1P,
+        }
+    }
+
+}

diff --git a/src/styles/Panel.qml b/src/styles/Panel.qml
new file mode 100644 (file)
index 0000000..46528c5
--- /dev/null
+++ b/src/styles/Panel.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.0
+import "DefaultSettings.js" as Default
+
+TizenBorderImage {
+    implicitWidth: 200
+    implicitHeight: 100
+    property bool pressed:false
+    source: pressed ? Default.panel.source.pressed : Default.panel.source.normal
+    effectSource: pressed ? Default.panel.effectSource.pressed : (activeFocus ? Default.panel.effectSource.selected : Default.panel.effectSource.normal)
+    backgroundColor: pressed ? Default.panel.color.pressed: Default.panel.color.normal
+}

diff --git a/src/styles/ProgressBarStyle.qml b/src/styles/ProgressBarStyle.qml
index c5dd8ca..f205d50 100644 (file)
--- a/src/styles/ProgressBarStyle.qml
+++ b/src/styles/ProgressBarStyle.qml
@@ -40,101 +40,38 @@
 
 import QtQuick 2.1
 import QtQuick.Controls 1.0
-import QtQuick.Controls.Private 1.0
+import QtQuick.Controls.Styles 1.0
 import "DefaultSettings.js" as Default
 
-/*!
-    \qmltype ProgressBarStyle
-
-    \inqmlmodule QtQuick.Controls.Styles 1.0
-    \since QtQuick.Controls.Styles 1.0
-    \brief Provides custom styling for ProgressBar
-
-    Example:
-    \qml
-    ProgressBar {
-        value: slider.value
-        style: ProgressBarStyle {
-            background: Rectangle {
-                radius: 2
-                color: "lightgray"
-                border.color: "gray"
-                border.width: 1
-                implicitWidth: 200
-                implicitHeight: 24
-            }
-            progress: Rectangle {
-                color: "lightsteelblue"
-                border.color: "steelblue"
-            }
-        }
-    }
-    \endqml
-*/
-
-Style {
+ProgressBarStyle {
     id: progressBarStyle
 
-    /*! The \l ProgressBar attached to this style. */
-    readonly property ProgressBar control: __control
-
-    /*! A value in the range [0-1] indicating the current progress. */
-    readonly property real currentProgress: control.indeterminate ? 1.0 :
-                                                                    control.value / control.maximumValue
-
-    /*! This property holds the visible contents of the progress bar
-        You can access the Slider through the \c control property.
-
-        For convenience, you can also access the readonly property \c controlState.progress
-        which provides the current progress as a \c real in the range [0-1]
-    */
-    property Margins padding: Margins { top: 0 ; left: 8 ; right: 8 ; bottom: 0 }
-
-
-    property Component progress: TizenBorderImage {
-        id:bar
-        source: "images/00_progress_bar.sci"
-        backgroundColor: Default.progress.progressColor
-        effectSource: "images/white/00_progress_bar_ef.sci"
-    }
-
-
-    property Component background: TizenBorderImage {
-        source: "images/00_progress_bg.sci"
-        backgroundColor: Default.progress.backgroundColor
-        effectSource: "images/white/00_progress_ef_bg.sci"
+    padding.left: Default.progress.margins.left
+    padding.right: Default.progress.margins.right
+    progress: Item {
+        implicitWidth: bar.implicitWidth
+        implicitHeight: bar.implicitHeight
+        TizenBorderImage {
+            id:bar
+            anchors.centerIn: parent
+            width: parent.width
+            source: Default.progress.source.normal
+            backgroundColor: Default.progress.progressColor
+            effectSource: Default.progress.effectSource.normal
+        }
     }
 
-    property Component panel: Item{
-        property bool horizontal: control.orientation == Qt.Horizontal
-        implicitWidth: horizontal ? backgroundLoader.implicitWidth : backgroundLoader.implicitHeight
-        implicitHeight: horizontal ? backgroundLoader.implicitHeight : backgroundLoader.implicitWidth
-
-        Item {
-            width: horizontal ? parent.width : parent.height
-            height: !horizontal ? parent.width : parent.height
-            y: horizontal ? 0 : width
-            rotation: horizontal ? 0 : -90
-            transformOrigin: Item.TopLeft
-
-            Loader {
-                id: backgroundLoader
-                anchors.fill: parent
-                sourceComponent: background
-            }
-
-            Loader {
-                sourceComponent: progressBarStyle.progress
-                anchors.topMargin: padding.top
-                anchors.leftMargin: padding.left
-                anchors.rightMargin: padding.right
-                anchors.bottomMargin: padding.bottom
-
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.bottom: parent.bottom
-                width: currentProgress * (parent.width - padding.left - padding.right)
-            }
+    background: Item {
+        implicitHeight: bg.implicitHeight
+        implicitWidth: bg.implicitWidth
+        TizenBorderImage {
+            id:bg
+            anchors.centerIn: parent
+            width:parent.width
+            height:Default.progress.height
+            source: Default.progress.backgroundSource.normal
+            backgroundColor: Default.progress.backgroundColor
+            effectSource: Default.progress.backgroundEffectSource.normal
         }
     }
 }

diff --git a/src/styles/SliderStyle.qml b/src/styles/SliderStyle.qml
index bbc4a4e..2a05599 100644 (file)
--- a/src/styles/SliderStyle.qml
+++ b/src/styles/SliderStyle.qml
@@ -39,95 +39,54 @@
 ****************************************************************************/
 import QtQuick 2.1
 import QtQuick.Controls 1.0
-import QtQuick.Controls.Private 1.0
+import QtQuick.Controls.Styles 1.0
 import "DefaultSettings.js" as Default
 
-/*!
-    \qmltype SliderStyle
-    \inqmlmodule QtQuick.Controls.Styles 1.0
-    \since QtQuick.Controls.Styles 1.0
-    \brief Provides custom styling for Slider
-
-    The slider style allows you to create a custom appearance for
-    a \l Slider control.
-
-    The implicit size of the slider is calculated based on the
-    maximum implicit size of the \c background and \c handle
-    delegates combined.
-
-    Example:
-    \qml
-    Slider {
-        anchors.centerIn: parent
-        style: SliderStyle {
-            groove: Rectangle {
-                implicitWidth: 200
-                implicitHeight: 8
-                color: "gray"
-                radius: 8
-            }
-            handle: Rectangle {
-                anchors.centerIn: parent
-                color: control.pressed ? "white" : "lightgray"
-                border.color: "gray"
-                border.width: 2
-                width: 34
-                height: 34
-                radius: 12
-            }
-        }
-    }
-    \endqml
-*/
-Style {
+SliderStyle {
     id: styleitem
 
-    /*! The \l Slider attached to this style. */
-    readonly property Slider control: __control
-
-    /*! The padding around the groove item. */
-    property Margins padding: Margins { top: 0 ; left: 0 ; right: 0 ; bottom: 0 }
-
-    /*! This property holds the item for the slider handle.
-        You can access the slider through the \c control property
-    */
     Component.onCompleted: {
         control.stepSize = 1.0
         control.maximumValue = 100
     }
 
-    property Component handle:  TizenBorderImage {
-        id:bg
-        source: Default.slider.handle.source.normal
-        effectSource: if (control.enabled) {
-                          control.pressed ?
-                          Default.slider.handle.effectSource.pressed:
-                          Default.slider.handle.effectSource.normal
-                      } else {
-                          Default.slider.handle.effectSource.disabled
-                      }
-
-        backgroundColor: control.enabled ? (control.pressed ? Default.slider.handle.backgroundColor.pressed : Default.slider.handle.backgroundColor.normal):Default.slider.handle.backgroundColor.disabled
-        foregroundColor: control.enabled ? Default.slider.handle.foregroundColor.normal:Default.slider.handle.foregroundColor.disabled
-        Text {
-            visible:!control.pressed
-            text: control.value
-            anchors.fill: parent
-            anchors.margins: Default.slider.handle.text.margins
-            fontSizeMode: Text.Fit
-            font.pointSize: Default.slider.handle.font.pointSize
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            color: control.enabled ? Default.slider.handle.text.color.normal : Default.slider.handle.text.color.disabled
+    handle:  Item {
+        implicitWidth: bg.implicitWidth
+        implicitHeight: bg.implicitHeight
+        TizenBorderImage {
+            id:bg
+
+            anchors.centerIn: parent
+            source: Default.slider.handle.source.normal
+            effectSource: if (control.enabled) {
+                              control.pressed ?
+                                          Default.slider.handle.effectSource.pressed:
+                                          Default.slider.handle.effectSource.normal
+                          } else {
+                              Default.slider.handle.effectSource.disabled
+                          }
+
+            backgroundColor: control.enabled ? (control.pressed ? Default.slider.handle.backgroundColor.pressed : Default.slider.handle.backgroundColor.normal):Default.slider.handle.backgroundColor.disabled
+
+            Text {
+                visible:!control.pressed
+                text: control.value
+                anchors.fill: parent
+                anchors.margins: Default.slider.handle.text.margins
+                fontSizeMode: Text.Fit
+                font.pointSize: Default.slider.handle.font.pointSize
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                color: control.enabled ? Default.slider.handle.text.color.normal : Default.slider.handle.text.color.disabled
+            }
         }
     }
 
-
     /*! This property holds the background groove of the slider.
         You can access the handle position through the \c handlePosition property.
     */
-    property Component groove: Item {
-        implicitHeight: 50
+    groove: Item {
+        implicitHeight: 36
         implicitWidth: 400
         ProgressBar {
             anchors.fill: parent
@@ -136,42 +95,4 @@ Style {
             minimumValue: control.minimumValue
         }
     }
-
-    /*! This property holds the slider style panel.
-
-        Note that it is generally not recommended to override this.
-    */
-    property Component panel: Item {
-        id: root
-        property bool horizontal : control.orientation === Qt.Horizontal
-        property int horizontalSize: grooveLoader.implicitWidth + padding.left + padding.right
-        property int verticalSize: Math.max(handleLoader.implicitHeight, grooveLoader.implicitHeight) + padding.top + padding.bottom
-
-        implicitWidth: horizontal ? horizontalSize : verticalSize
-        implicitHeight: horizontal ? verticalSize : horizontalSize
-
-        y: horizontal ? 0 : height
-        rotation: horizontal ? 0 : -90
-        transformOrigin: Item.TopLeft
-
-        Item {
-
-            anchors.fill: parent
-
-            Loader {
-                id: grooveLoader
-                property int handlePosition: handleLoader.x + handleLoader.width/2
-                x: padding.left
-                sourceComponent: groove
-                width: (horizontal ? parent.width : parent.height) - padding.left - padding.right
-                y:  padding.top +  (Math.round(horizontal ? parent.height : parent.width - padding.top - padding.bottom) - grooveLoader.item.height)/2
-            }
-            Loader {
-                id: handleLoader
-                sourceComponent: handle
-                anchors.verticalCenter: grooveLoader.verticalCenter
-                x: Math.round(control.value / control.maximumValue * ((horizontal ? root.width : root.height)- item.width))
-            }
-        }
-    }
 }

diff --git a/src/styles/qmldir b/src/styles/qmldir
index 74e59c6..d9d5677 100644 (file)
--- a/src/styles/qmldir
+++ b/src/styles/qmldir
@@ -1,3 +1,12 @@
 module QtQuick.Controls.Styles.Tizen
+
+
 ProgressBarStyle 1.0 ProgressBarStyle.qml
+CheckBoxStyle 1.0 CheckBoxStyle.qml
+ButtonStyle 1.0 ButtonStyle.qml
+SliderStyle 1.0 SliderStyle.qml
+TizenBorderImage 1.0 TizenBorderImage.qml
+Panel 1.0 Panel.qml
+
+
 

diff --git a/src/styles/styles.pro b/src/styles/styles.pro
index 42f0475..091836c 100644 (file)
--- a/src/styles/styles.pro
+++ b/src/styles/styles.pro
@@ -5,40 +5,22 @@ QML_FILES = \
     ProgressBarStyle.qml \
     SliderStyle.qml \
     ButtonStyle.qml \
-    CheckBoxStyle.qml
+    CheckBoxStyle.qml \
+    Panel.qml
 # Images
 QML_FILES += \
-    images/00_progress_bar.sci \
-    images/qt-00_progress_bar.png \
-    images/00_progress_bg.sci \
-    images/qt-00_progress_bg.png  \
-    images/00_slider_handle.sci \
-    images/qt-00_slider_handle.png \
-    images/00_button_01.sci \
-    images/qt-00_button_01.png
-    
-QML_FILES += \
-    images/white/00_progress_bar_ef.sci \
-    images/white/qt-00_progress_bar_ef.png \
-    images/white/00_progress_ef_bg.sci \
-    images/white/qt-00_progress_ef_bg.png \
-    images/white/00_slider_handle_ef_dim.sci \
-    images/white/qt-00_slider_handle_ef_dim.png \
-    images/white/00_slider_handle_ef_press.sci \
-    images/white/qt-00_slider_handle_ef_press.png \
-    images/white/00_slider_handle_ef.sci \
-    images/white/qt-00_slider_handle_ef.png \
-    images/white/00_button_01_ef.sci \
-    images/white/qt-00_button_01_ef.png \
-    images/white/00_button_01_ef_press.sci \
-    images/white/qt-00_button_01_ef_press.png \
-    images/white/00_button_01_ef_dim.sci \
-    images/white/qt-00_button_01_ef_dim.png
+    images/720x1280/*.png \
+    images/720x1280/*.sci \
+    images/720x1280/white/*.png \
+    images/720x1280/white/*.sci
 
 QML_FILES += \
     DefaultSettings.js
 
+OTHER_FILES +=    qmldir
+
 load(qml_module)
 
 
 
+