X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fstyles%2F720x1280%2Fdali-toolkit-default-theme.json;h=6b3a131cf9c4b0969009001723c460d96457409f;hp=69abfe1d8d40dda28876572a0a5d7fb7f47d09e6;hb=1fca3ce677ff263d2e3a9a18ac3b3a220f24513e;hpb=5dfc8a984974c173ce1ebc1969749e8c84268184 diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json index 69abfe1..6b3a131 100644 --- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json +++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json @@ -203,19 +203,52 @@ }, "ProgressBar": { - "progressValue": 0, "trackVisual":{ - "url":"{DALI_IMAGE_DIR}progress-skin.9.png", - "size":[24,24] + "visualType":"IMAGE", + "url":"{DALI_IMAGE_DIR}progress-bar-skin-track.9.png" }, "progressVisual":{ - "url":"{DALI_IMAGE_DIR}progress-skin-progress.9.png", - "size":[24,24] - } - }, - "ProgressBarValueTextLabel": - { - "textColor":[0.8,0.8,1,1] + "visualType":"IMAGE", + "url":"{DALI_IMAGE_DIR}progress-bar-skin-progress.9.png" + }, + "secondaryProgressVisual":{ + "visualType":"IMAGE", + "url":"{DALI_IMAGE_DIR}progress-bar-skin-secondary-progress.9.png" + }, + "indeterminateVisual":{ + "visualType":"IMAGE", + "pixelArea":[0.0, 0.0, 10.0, 1.0], + "wrapModeU":"REPEAT", + "url":"{DALI_IMAGE_DIR}progress-bar-skin-indeterminate.png" + }, + "indeterminateVisualAnimation": + [ + { + "target":"indeterminateVisual", + "property":"pixelArea", + "initialValue":[0.0, 0.0, 10.0, 1.0], + "targetValue":[-1.0, 0.0, 10.0, 1.0], + "animator": + { + "alphaFunction":"DEFAULT", + "timePeriod": + { + "duration":0.8, + "delay":0 + } + } + } + ], + "labelVisual":{ + "visualType": "TEXT", + "textColor": [ 1.0, 1.0, 1.0, 1.0 ], + "pointSize" : 12.0, // Point size must always be provided to Text Visual + "horizontalAlignment": "CENTER", + "verticalAlignment": "CENTER" + }, + "progressValue": 0.0, + "secondaryProgressValue":0.0, + "indeterminate": false }, "Button": { @@ -233,7 +266,7 @@ { "visualType": "TEXT", "horizontalAlignment": "CENTER", - "pointSize" : 12.0, // Point size must always be provided to Text Visual + "pointSize" : 10.0, // Point size must always be provided to Text Visual "verticalAlignment": "CENTER" }, "unselectedBackgroundVisual": @@ -264,7 +297,7 @@ "label": { "visualType": "TEXT", - "pointSize" : 12.0, // Point size must always be provided to Text Visual + "pointSize" : 10.0, // Point size must always be provided to Text Visual "verticalAlignment": "CENTER" }, "unselectedVisual": @@ -295,7 +328,7 @@ "label": { "visualType": "TEXT", - "pointSize" : 12.0, // Point size must always be provided to Text Visual + "pointSize" : 10.0, // Point size must always be provided to Text Visual "verticalAlignment": "CENTER" }, "unselectedVisual":