Cleaned up some & removed redundant JSON scripts, as well as background color propert...

[platform/core/uifw/dali-demo.git] / resources / scripts / table-view.json

diff --git a/resources/scripts/table-view.json b/resources/scripts/table-view.json
index 85940fa..ff46cd1 100644 (file)
--- a/resources/scripts/table-view.json
+++ b/resources/scripts/table-view.json
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,64 +16,107 @@
  */
 {
   // a tree of actors
+  /*
+   *  4 by 4 table:
+   * |------------------------------------|
+   * |          |    2(right,top)|   |    |
+   * |  -  -  - |----------------|---|----|
+   * |          |                |   |    |
+   * |          |                |   |    |
+   * |          |                |   |    |
+   * |  -  -  - |  -  -  -  -  - |--------|
+   * |          |                |   |    |
+   * |    1     |                |   |    |
+   * |          |  3             | 4 |    |
+   * |          |aligned to      |   |    |
+   * |          |(left, center)  |   |    |
+   * |  -  -  - |  -  -  -  -  - |--------|
+   * |          |                |   '    |
+   * |          |                |   '    |
+   * |          |                |   5    |
+   * |          |                |   '    |
+   * |          |                |   '    |
+   * |------------------------------------|
+  */
+
   "stage": [{
-      "name":"simple-table",
+      "name":"simpleTable",
       "type":"TableView",
-      "background-color": [0.5,0.5,0,1],
-      "parent-origin": "CENTER",
-      "size":[400,500,1],
+      "background":{
+        "rendererType": "color",
+        "blendColor": [0.5,0.5,0,1]
+        },
+      "parentOrigin": "CENTER",
+      "size":[400,400,1],
       "rows": 4,
-      "columns":4,
-      "cell-padding": [10, 5],
-      "layout-rows": {  // set the height of the rows
+      "columns": 4,
+      "cellPadding": [10, 5],
+      "layoutRows": {  // set the height of the rows
         "0": { "policy": "fixed", "value": 40 },
         "1": { "policy": "relative", "value": 0.33 },
-        "2": { "policy": "fixed", "value": 120 }
+        "2": { "policy": "fit", "value": 0 }
       },
-      "layout-columns": { // set the widths of the columns
-        "1": { "policy": "fixed", "value": 150 },
-        "2": { "policy": "relative", "value": 0.35 },
-        "3": { "policy": "relative", "value": 0.15 }
+      "layoutColumns": { // set the widths of the columns
+        "0": { "policy": "fit", "value": 0 },
+        "2": { "policy": "relative", "value": 0.2 },
+        "3": { "policy": "fixed", "value": 30 }
       },
       "actors": [{
-          "name":"gallery-1",
+          "name":"gallery1",
           "type":"ImageActor",
+          "heightResizePolicy":"FILL_TO_PARENT",
           "image": {
-            "filename": "{DALI_IMAGE_DIR}gallery-large-1.jpg"
+            "filename": "{DEMO_IMAGE_DIR}gallery-small-1.jpg"
           },
-          "custom-properties": { // properties registered dynamically
-            "cell-indices": [0,0],// property to specify the top-left cell this child occupies
-            "row-span":4, // property to specify how many rows this child occupies, if not set, default value is 1
-            "column-spam":1 // property to specify how many columns this child occupies, if nor set, defualt cvalue is 1
+          "customProperties": { // properties registered dynamically
+            "cellIndex": [0,0], // property to specify the top-left cell this child occupies
+            "rowSpan":4, // property to specify how many rows this child occupies, if not set, default value is 1
+            "columnSpan":1 // property to specify how many columns this child occupies, if nor set, defualt cvalue is 1
           }
         },{
-          "name":"gallery-2",
+          "name":"gallery2",
           "type":"ImageActor",
+          "heightResizePolicy":"FILL_TO_PARENT",
           "image": {
-            "filename": "{DALI_IMAGE_DIR}gallery-large-2.jpg"
+            "filename": "{DEMO_IMAGE_DIR}gallery-small-2.jpg"
           },
-          "custom-properties": {
-            "cell-indices":[1,1],
-            "row-span":3
+          "customProperties": { // properties registered dynamically
+            "cellIndex": [0,1],
+            "cellHorizontalAlignment": "right" // property to specify how to align horizontally inside the cells, if not set, default value is 'left'
+          }
+        },{
+          "name":"gallery3",
+          "type":"ImageActor",
+          "image": {
+            "filename": "{DEMO_IMAGE_DIR}gallery-small-3.jpg"
+          },
+          "customProperties": {
+            "cellIndex":[1,1],
+            "rowSpan":3,
+            "cellHorizontalAlignment": "left",// property to specify how to align horizontally inside the cells, if not set, default value is 'left'
+            "cellVerticalAlignment": "center" // property to specify how to align vertically inside the cells, if not set, default value is 'top'
           }
         }, {
-          "name":"gallery-3",
+          "name":"gallery4",
           "type":"ImageActor",
+          "widthResizePolicy":"FILL_TO_PARENT",
           "image": {
-            "filename": "{DALI_IMAGE_DIR}gallery-large-3.jpg"
+            "filename": "{DEMO_IMAGE_DIR}gallery-small-4.jpg"
           },
-          "custom-properties": {
-            "cell-indices":[2,2]
+          "customProperties": {
+            "cellIndex":[2,2]
           }
         }, {
-          "name":"gallery-4",
+          "name":"gallery5",
           "type":"ImageActor",
+          "widthResizePolicy":"FILL_TO_PARENT",
+          "heightResizePolicy":"FILL_TO_PARENT",
           "image": {
-            "filename": "{DALI_IMAGE_DIR}gallery-large-4.jpg"
+            "filename": "{DEMO_IMAGE_DIR}gallery-small-5.jpg"
           },
-          "custom-properties": {
-            "cell-indices":[3,2],
-            "column-span": 2
+          "customProperties": {
+            "cellIndex":[3,2],
+            "columnSpan": 2
           }
         }]
     }]