Merge "Clipping API feature in Actor" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / styles / 1920x1080 / dali-toolkit-default-theme.json

diff --git a/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json b/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
index a6ded0d..19ac5bf 100644 (file)
--- a/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
@@ -28,7 +28,7 @@
 {
   "styles":
   {
-    "textlabel":
+    "TextLabel":
     {
       "pointSize":108,
       "enableAutoScroll":false,
@@ -37,28 +37,28 @@
       "autoScrollSpeed":80
     },
 
-    "textlabelFontSize0":
+    "TextLabelFontSize0":
     {
       "pointSize":84
     },
-    "textlabelFontSize1":
+    "TextLabelFontSize1":
     {
       "pointSize":96
     },
-    "textlabelFontSize2":
+    "TextLabelFontSize2":
     {
       "pointSize":108
     },
-    "textlabelFontSize3":
+    "TextLabelFontSize3":
     {
       "pointSize":120
     },
-    "textlabelFontSize4":
+    "TextLabelFontSize4":
     {
       "pointSize":132
     },
 
-    "textfield":
+    "TextField":
     {
       "pointSize":120,
       "primaryCursorColor":[0.0,0.72,0.9,1.0],
@@ -70,27 +70,27 @@
       "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" }
     },
 
-    "textfieldFontSize0":
+    "TextFieldFontSize0":
     {
       "pointSize":120
     },
-    "textfieldFontSize1":
+    "TextFieldFontSize1":
     {
       "pointSize":120
     },
-    "textfieldFontSize2":
+    "TextFieldFontSize2":
     {
       "pointSize":120
     },
-    "textfieldFontSize3":
+    "TextFieldFontSize3":
     {
       "pointSize":120
     },
-    "textfieldFontSize4":
+    "TextFieldFontSize4":
     {
       "pointSize":120
     },
-    "textselectionpopup":
+    "TextSelectionPopup":
     {
       "popupMaxSize":[1700,100],
       "optionDividerSize":[2,0],
@@ -104,7 +104,7 @@
       "popupFadeInDuration":0.25,
       "popupFadeOutDuration":0.25
     },
-    "textselectionpopupbutton":
+    "TextSelectionPopupButton":
     {
       "label":
       {
@@ -112,7 +112,7 @@
         "fontStyle":"{\"weight\":\"light\"}"
       }
     },
-    "textselectiontoolbar":
+    "TextSelectionToolbar":
     {
       "enableOvershoot":true,
       "scrollView":
@@ -121,19 +121,19 @@
         "overshootSize":[1920.0,130.0]
       }
     },
-    "scrollview":
+    "ScrollView":
     {
       "overshootEffectColor":"B018",
       "overshootAnimationSpeed":960.0,
       "overshootSize":[1920.0,130.0]
     },
-    "itemview":
+    "ItemView":
     {
       "overshootEffectColor":"B018",
       "overshootAnimationSpeed":960.0,
       "overshootSize":[1920.0,130.0]
     },
-    "texteditor":
+    "TextEditor":
     {
       "pointSize":120,
       "primaryCursorColor":[0.0,0.72,0.9,1.0],
@@ -143,6 +143,22 @@
       "grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png",
       "selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" },
       "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" }
+    },
+    "ProgressBar":
+    {
+      "progressValue": 0,
+      "trackVisual":{
+        "url":"{DALI_IMAGE_DIR}slider-skin.9.png",
+        "size":[24,24]
+      },
+      "progressVisual":{
+        "url":"{DALI_IMAGE_DIR}slider-skin-progress.9.png",
+        "size":[24,24]
+      }
+    },
+    "ProgressBarValueTextLabel":
+    {
+      "textColor":[0.8,0.8,1,1]
     }
   }
 }