layout/editfield: refactoring editfield layouts according to new naming rules

Change-Id: Ib449052e3a9869a64439e7ddd85dcd89a51b37c1

1 files changed, 59 insertions, 63 deletions

diff --git a/mobile/widgets/layout.edc b/mobile/widgets/layout.edc
index 35db78ac..7e32f849 100644
--- a/mobile/widgets/layout.edc
+++ b/mobile/widgets/layout.edc
@@ -675,14 +675,14 @@ group { "elm/layout/editfield/singleline";
       rect { "bg";
          scale;
          desc { "default";
-            min: 0 EDITFIELD_BASE_HEIGHT_INC;
+            min: 0 EDITFIELD_BG_HEIGHT_INC;
 			color: 0 0 0 0;
          }
       }
-      spacer { "top_left_padding";
+      spacer { "padding_top_left";
          scale;
          desc { "default";
-            min: EDITFIELD_TOP_LEFT_PADDING_MIN_INC;
+            min: EDITFIELD_PADDING_TOP_LEFT_MIN_INC;
             fixed: 1 1;
             align: 0.0 0.0;
             rel1.to: "bg";
@@ -690,11 +690,11 @@ group { "elm/layout/editfield/singleline";
             rel2.relative: 0.0 0.0;
          }
       }
-      spacer { "bottom_right_padding";
+      spacer { "padding_bottom_right";
          type: SPACER;
          scale;
          desc { "default";
-            min: EDITFIELD_BOTTOM_RIGHT_PADDING_MIN_INC;
+            min: EDITFIELD_PADDING_BOTTOM_RIGHT_MIN_INC;
             fixed: 1 1;
             align: 1.0 1.0;
             rel1.to: "bg";
@@ -702,10 +702,10 @@ group { "elm/layout/editfield/singleline";
             rel2.to: "bg";
          }
       }
-      spacer { "line_left_padding";
+      spacer { "padding_line_left";
          scale;
          desc { "default";
-            min: EDITFIELD_LINE_LEFT_PADDING_MIN_INC;
+            min: EDITFIELD_PADDING_LINE_LEFT_MIN_INC;
             fixed: 1 0;
             align: 0.0 0.5;
             rel1.to: "bg";
@@ -713,10 +713,10 @@ group { "elm/layout/editfield/singleline";
             rel2.relative: 0.0 1.0;
          }
       }
-      spacer { "line_right_padding";
+      spacer { "padding_line_right";
          scale;
          desc { "default";
-            min: EDITFIELD_LINE_RIGHT_PADDING_MIN_INC;
+            min: EDITFIELD_PADDING_LINE_RIGHT_MIN_INC;
             fixed: 1 0;
             align: 1.0 0.5;
             rel1.to: "bg";
@@ -724,10 +724,10 @@ group { "elm/layout/editfield/singleline";
             rel2.to: "bg";
          }
       }
-      spacer { "line_bottom_padding";
+      spacer { "padding_line_bottom";
          scale;
          desc { "default";
-            min: EDITFIELD_LINE_BOTTOM_PADDING_MIN_INC;
+            min: EDITFIELD_PADDING_LINE_BOTTOM_MIN_INC;
             fixed: 0 1;
             align: 0.5 1.0;
             rel1.to: "bg";
@@ -742,13 +742,13 @@ group { "elm/layout/editfield/singleline";
             fixed: 1 1;
             align: 0.5 1.0;
             rel1 {
-               to_x: "line_left_padding";
-               to_y: "line_bottom_padding";
+               to_x: "padding_line_left";
+               to_y: "padding_line_bottom";
                relative: 1.0 0.0;
             }
             rel2 {
-               to_x: "line_right_padding";
-               to_y: "line_bottom_padding";
+               to_x: "padding_line_right";
+               to_y: "padding_line_bottom";
                relative: 0.0 0.0;
             }
             color_class: "layout/editfield/underline-normal";
@@ -758,110 +758,107 @@ group { "elm/layout/editfield/singleline";
             color_class: "layout/editfield/underline-focused";
          }
       }
-      spacer { "button_field_right_padding";
+      spacer { "padding_elm.swallow.button_right";
          scale;
          desc { "default";
-            min: EDITFIELD_BUTTON_FIELD_RIGHT_PADDING_MIN_INC;
+            min: EDITFIELD_PADDING_ELM_SWALLOW_BUTTON_RIGHT_MIN_INC;
             fixed: 1 0;
             align: 1.0 0.5;
             rel1 {
                to: "bg";
                relative: 1.0 0.0;
             }
-            rel2 {
-               to: "bg";
-               relative: 1.0 1.0;
-            }
+            rel2.to: "bg";
          }
       }
-      spacer { "button_field";
+      spacer { "sizer_elm.swallow.button";
          scale;
          desc { "default";
-            min: EDITFIELD_BUTTON_FIELD_MIN_INC;
+            min: EDITFIELD_ELM_SWALLOW_BUTTON_MIN_INC;
             fixed: 1 1;
             align: 1.0 0.5;
             rel1 {
-               to_x: "button_field_right_padding";
+               to_x: "padding_elm.swallow.button_right";
                to_y: "bg";
                relative: 0.0 0.5;
             }
             rel2 {
-               to_x: "button_field_right_padding";
+               to_x: "padding_elm.swallow.button_right";
                to_y: "bg";
                relative: 0.0 0.5;
             }
          }
       }
-      spacer { "button_field_left_padding";
+      spacer { "padding_elm.swallow.button_left";
          scale;
          desc { "default";
-            min: EDITFIELD_BUTTON_FIELD_LEFT_PADDING_MIN_INC;
+            min: EDITFIELD_PADDING_ELM_SWALLOW_CONTENT_LEFT_MIN_INC;
             fixed: 1 0;
             align: 1.0 0.5;
             rel1 {
-               to_x: "button_field";
+               to_x: "sizer_elm.swallow.button";
                to_y: "bg";
                relative: 0.0 0.0;
             }
             rel2 {
-               to_x: "button_field";
+               to_x: "sizer_elm.swallow.button";
                to_y: "bg";
                relative: 0.0 1.0;
             }
          }
       }
-      spacer { "entry_field_left_padding";
+      spacer { "padding_elm.swallow.content_left";
          scale;
          desc { "default";
             fixed: 1 0;
-            min: EDITFIELD_ENTRY_FIELD_LEFT_PADDING_MIN_INC;
+            min: EDITFIELD_PADDING_ELM_SWALLOW_CONTENT_LEFT_MIN_INC;
             align: 0.0 0.5;
             rel1 {
-               to: "top_left_padding";
+               to: "padding_top_left";
                relative: 1.0 1.0;
             }
             rel2 {
-               to_x: "top_left_padding";
-               to_y: "bottom_right_padding";
+               to_x: "padding_top_left";
+               to_y: "padding_bottom_right";
                relative: 1.0 0.0;
             }
          }
       }
-      spacer { "entry_field_right_padding";
+      spacer { "padding_elm.swallow.content_right";
          scale;
          desc { "default";
             fixed: 1 0;
-            min: EDITFIELD_ENTRY_FIELD_RIGHT_PADDING_MIN_INC;
+            min: EDITFIELD_PADDING_ELM_SWALLOW_CONTENT_RIGHT_MIN_INC;
             align: 1.0 0.5;
             rel1 {
-               to_x: "bottom_right_padding";
-               to_y: "top_left_padding";
+               to_x: "padding_bottom_right";
+               to_y: "padding_top_left";
                relative: 0.0 1.0;
             }
             rel2 {
-               to: "bottom_right_padding";
+               to: "padding_bottom_right";
                relative: 0.0 0.0;
             }
          }
       }
-      spacer { "entry_field";
+      spacer { "sizer_elm.swallow.content";
          scale;
          desc { "default";
-            min: EDITFIELD_ENTRY_FIELD_MIN_INC;
+            min: EDITFIELD_ELM_SWALLOW_CONTENT_MIN_INC;
             rel1 {
-               to: "entry_field_left_padding";
+               to: "padding_elm.swallow.content_left";
                relative: 1.0 0.0;
             }
             rel2 {
-               to: "entry_field_right_padding";
+               to: "padding_elm.swallow.content_right";
                relative: 0.0 1.0;
             }
          }
          desc { "show_button";
             inherit: "default";
             rel2 {
-               to_x: "button_field_left_padding";
-               to_y: "entry_field_right_padding";
+               to_x: "padding_elm.swallow.button_left";
+               to_y: "padding_elm.swallow.content_right";
                relative: 0.0 1.0;
             }
          }
@@ -869,16 +866,15 @@ group { "elm/layout/editfield/singleline";
       swallow { "elm.swallow.content";
          scale;
          desc { "default";
-            align: EDITFIELD_ENTRY_SWALLOW_ALIGN;
-            rel1.to: "entry_field";
-            rel2.to: "entry_field";
+            align: EDITFIELD_ELM_SWALLOW_CONTENT_ALIGN;
+            rel.to: "sizer_elm.swallow.content";
          }
       }
       swallow { "elm.swallow.button";
          scale;
          desc { "default";
             fixed: 1 0;
-            rel.to: "button_field";
+            rel.to: "sizer_elm.swallow.button";
             hid;
          }
          desc { "show_button";
@@ -904,14 +900,14 @@ group { "elm/layout/editfield/singleline";
          signal: "elm,action,show,button";
          source: "";
          action: STATE_SET "show_button";
-         target: "entry_field";
+         target: "sizer_elm.swallow.content";
          target: "elm.swallow.button";
       }
       program { "hide_button";
          signal: "elm,action,hide,button";
          source: "";
          action: STATE_SET "default";
-         target: "entry_field";
+         target: "sizer_elm.swallow.content";
          target: "elm.swallow.button";
       }
    }
@@ -923,7 +919,7 @@ group { "elm/layout/searchfield/singleline";
       rect { "bg";
          scale;
          desc { "default";
-            min: 0 EDITFIELD_BASE_HEIGHT_INC;
+            min: 0 EDITFIELD_BG_HEIGHT_INC;
             color_class: "layout/searchfield/bg";
          }
       }
@@ -933,10 +929,10 @@ group { "elm/layout/searchfield/singleline";
 group { "elm/layout/editfield/multiline";
    inherit: "elm/layout/editfield/singleline";
    parts {
-      spacer { "top_left_padding";
+      spacer { "padding_top_left";
          scale;
          desc { "default";
-            min: EDITFIELD_MULTILINE_TOP_LEFT_PADDING_MIN_INC;
+            min: EDITFIELD_MULTILINE_PADDING_TOP_LEFT_MIN_INC;
             fixed: 1 1;
             align: 0.0 0.0;
             rel1.to: "bg";
@@ -944,10 +940,10 @@ group { "elm/layout/editfield/multiline";
             rel2.relative: 0.0 0.0;
          }
       }
-      spacer { "bottom_right_padding";
+      spacer { "padding_bottom_right";
          scale;
          desc { "default";
-            min: EDITFIELD_MULTILINE_BOTTOM_RIGHT_PADDING_MIN_INC;
+            min: EDITFIELD_MULTILINE_PADDING_BOTTOM_RIGHT_MIN_INC;
             fixed: 1 1;
             align: 1.0 1.0;
             rel1.to: "bg";
@@ -955,27 +951,27 @@ group { "elm/layout/editfield/multiline";
             rel2.to: "bg";
          }
       }
-      spacer { "entry_field";
+      spacer { "sizer_elm.swallow.content";
          scale;
          desc { "default";
-            min: EDITFIELD_ENTRY_FIELD_MIN_INC;
+            min: EDITFIELD_ELM_SWALLOW_CONTENT_MIN_INC;
             rel1 {
-               to: "entry_field_left_padding";
+               to: "padding_elm.swallow.content_left";
                relative: 1.0 0.0;
             }
             rel2 {
-               to: "entry_field_right_padding";
+               to: "padding_elm.swallow.content_right";
                relative: 0.0 1.0;
             }
          }
          desc { "show_button";
             inherit: "default";
             rel1 {
-               to: "entry_field_left_padding";
+               to: "padding_elm.swallow.content_left";
                relative: 1.0 0.0;
             }
             rel2 {
-               to: "entry_field_right_padding";
+               to: "padding_elm.swallow.content_right";
                relative: 0.0 1.0;
             }
          }
@@ -984,7 +980,7 @@ group { "elm/layout/editfield/multiline";
          scale;
          desc { "default";
             fixed: 1 0;
-            rel.to: "button_field";
+            rel.to: "sizer_elm.swallow.button";
             hid;
          }
          desc { "show_button";