Added network gengrid edc

Change-Id: I4e060eccd8e1bc0810003a00a4e99896166e69ad
Signed-off-by: Hyojung Jo <hj903.jo@samsung.com>

diff --git a/res/layout/network.edc b/res/layout/network.edc
index 96c3948..f4da75f 100644 (file)
--- a/res/layout/network.edc
+++ b/res/layout/network.edc
@@ -113,5 +113,76 @@ group {
                                fixed, 1 0;
                        }
                }
+
+               part {
+                       name, "padding.list.area1";
+                       type, SPACER;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 0 60;
+                               rel1 {
+                                       to, "padding.button.area2";
+                                       relative, 0.0 1.0;
+                               }
+                               rel2.to, "padding.button.area2";
+                               align, 0.5 0.0;
+                               fixed, 0 1;
+                       }
+               }
+
+               part {
+                       name, "padding.list.area2";
+                       type, SPACER;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 62 0;
+                               rel1 {
+                                       to, "padding.list.area1";
+                                       relative, 0.0 1.0;
+                               }
+                               rel2 {
+                                       to, "padding.list.area1";
+                                       relative, 0.0 1.0;
+                               }
+                               align, 0.0 0.5;
+                               fixed, 1 0;
+                       }
+               }
+
+               part {
+                       name, "padding.list.area3";
+                       type, SPACER;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 0 74;
+                               rel1 {
+                                       to, "area";
+                                       relative, 0.0 1.0;
+                               }
+                               rel2.to, "area";
+                               align, 0.5 1.0;
+                               fixed, 0 1;
+                       }
+               }
+
+               part {
+                       name, PART_WIRELESS_LIST;
+                       type, SWALLOW;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1 {
+                                       to, "padding.list.area2";
+                                       relative, 1.0 1.0;
+                               }
+                               rel2 {
+                                       to, "padding.list.area3";
+                                       relative, 1.0 0.0;
+                               }
+                       }
+               }
        }
 }

diff --git a/res/widget/gengrid.edc b/res/widget/gengrid.edc
new file mode 100644 (file)
index 0000000..fb75850
--- /dev/null
+++ b/res/widget/gengrid.edc
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+group {
+       name, "elm/gengrid/item/style.grid.wireless/default";
+       data.item, "focus_highlight" "on";
+       data.item, "texts" "part.thumb.text";
+       data.item, "contents" "part.thumb.icon";
+       parts {
+               part {
+                       name, "padding.bottom.right";
+                       type, SPACER;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1.relative, 1.0 1.0;
+                               min, 26 26;
+                               align, 1.0 1.0;
+                               fixed, 1 1;
+                       }
+               }
+
+               part {
+                       name, "map";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               perspective {
+                                       zplane, 0;
+                                       focal, 1000;
+                               }
+                               visible, 0;
+                       }
+                       description {
+                               state, "selected" 0.0;
+                               inherit, "default" 0.0;
+                               perspective.zplane, -100;
+                       }
+               }
+
+               part {
+                       name, "part.bg";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel2 {
+                                       to, "padding.bottom.right";
+                                       relative, 0.0 0.0;
+                               }
+                               fixed, 1 1;
+                               visible, 0;
+                       }
+               }
+
+               part {
+                       name, "padding.thumb.icon";
+                       type, SPACER;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 28 0;
+                               rel1.to, "part.bg";
+                               rel2 {
+                                       to, "part.bg";
+                                       relative, 0.0 1.0;
+                               }
+                               align, 0.0 0.5;
+                               fixed, 1 0;
+                       }
+               }
+
+               part {
+                       name, PART_THUMB_ICON;
+                       type, SWALLOW;
+                       scale, 1;
+                       mouse_events, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 40 40;
+                               rel1 {
+                                       to, "padding.thumb.icon";
+                                       relative, 1.0 0.5;
+                               }
+                               rel2 {
+                                       to, "padding.thumb.icon";
+                                       relative, 1.0 0.5;
+                               }
+                               align, 0.0 0.5;
+                               fixed, 1 1;
+                               map {
+                                       perspective_on, 1;
+                                       perspective, "map";
+                               }
+                       }
+                       description {
+                               state, "focused" 0.0;
+                               inherit, "default" 0.0;
+                               map.on, 1;
+                       }
+               }
+
+               part {
+                       name, "padding.thumb.text.left";
+                       type, SPACER;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 48 0;
+                               rel1 {
+                                       to, "padding.thumb.icon";
+                                       relative, 1.0 0.0;
+                               }
+                               rel2.to, "padding.thumb.icon";
+                               align, 0.0 0.5;
+                               fixed, 1 0;
+                       }
+               }
+
+               part {
+                       name, "padding.thumb.text.right";
+                       type, SPACER;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 90 0;
+                               rel1 {
+                                       to, "part.bg";
+                                       relative, 1.0 0.0;
+                               }
+                               rel2.to, "part.bg";
+                               align, 1.0 0.5;
+                               fixed, 1 0;
+                       }
+               }
+
+               part {
+                       name, PART_THUMB_TEXT;
+                       type, TEXT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               color, 51 51 51 255;
+                               rel1 {
+                                       to, "padding.thumb.text.left";
+                                       relative, 1.0 0.0;
+                               }
+                               rel2 {
+                                       to, "padding.thumb.text.right";
+                                       relative, 0.0 1.0;
+                               }
+                               text {
+                                       font, FONT_LIGHT;
+                                       size, 28;
+                                       align, 0.0 0.5;
+                               }
+                               map {
+                                       perspective_on, 1;
+                                       perspective, "map";
+                               }
+                       }
+                       description {
+                               state, "focused" 0.0;
+                               inherit, "default" 0.0;
+                               color, 255 255 255 255;
+                               map.on, 1;
+                       }
+               }
+
+               part {
+                       name, "part.inside.line.up";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               color, 194 194 194 255;
+                               min, 0 1;
+                               rel1.to, "part.bg";
+                               rel2 {
+                                       to, "part.bg";
+                                       relative, 1.0 0.0;
+                               }
+                               align, 0.5 0.0;
+                               fixed, 0 1;
+                       }
+               }
+
+               part {
+                       name, "part.inside.line.left";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               color, 194 194 194 255;
+                               min, 1 0;
+                               rel1 {
+                                       to, "part.inside.line.up";
+                                       relative, 0.0 1.0;
+                               }
+                               rel2 {
+                                       to, "part.bg";
+                                       relative, 0.0 1.0;
+                               }
+                               align, 0.0 0.5;
+                               fixed, 1 0;
+                       }
+               }
+
+               part {
+                       name, "part.inside.line.down";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               color, 194 194 194 255;
+                               min, 0 1;
+                               rel1 {
+                                       to, "part.inside.line.left";
+                                       relative, 1.0 1.0;
+                               }
+                               rel2 {
+                                       to, "part.inside.line.right";
+                                       relative, 0.0 1.0;
+                               }
+                               align, 0.5 1.0;
+                               fixed, 0 1;
+                       }
+               }
+
+               part {
+                       name, "part.inside.line.right";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               color, 194 194 194 255;
+                               min, 1 0;
+                               rel1 {
+                                       to, "part.inside.line.up";
+                                       relative, 1.0 1.0;
+                               }
+                               rel2.to, "part.bg";
+                               align, 1.0 0.5;
+                               fixed, 1 0;
+                       }
+               }
+       }
+}

diff --git a/src/common/utils.c b/src/common/utils.c
index dbce0e4..123c931 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -191,7 +191,7 @@ Evas_Object *utils_add_table(Evas_Object *parent, int padding_x, int padding_y)
 Evas_Object *utils_add_ctxpopup(Evas_Object *parent, int opt_size, int *opt_id,
                const char **opt_text, input_handler *opt_handler, void *data)
 {
-       Evas_Object *ctxpopup, *box, *btn = NULL, *firstbtn = NULL;
+       Evas_Object *ctxpopup, *box, *btn, *firstbtn;
        int i;
 
        if (!parent || opt_size <= 0 || !opt_text) {
@@ -240,4 +240,4 @@ Evas_Object *utils_add_ctxpopup(Evas_Object *parent, int opt_size, int *opt_id,
        elm_object_focus_next_object_set(btn, firstbtn, ELM_FOCUS_DOWN);
 
        return ctxpopup;
-}
\ No newline at end of file
+}