Revert "Fix to align wireless button text with wired text when no ap"

That commit:
- spoils the menu buttons (click action)
- tangles menumanager with widgets "style" concept and makes the code dependent on it

Change-Id: I7a484ec156b334a86550ec1a6e2626b13c5e9293
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/res/widget/button.edc b/res/widget/button.edc
index 5e3a233..61e249b 100755 (executable)
--- a/res/widget/button.edc
+++ b/res/widget/button.edc
@@ -657,9 +657,11 @@ group {
                                state, "default" 0.0;
                                align, 0.5 0.0;
                                rel1 {
+                                       relative, 0.0 0.2283;
                                        to, "bg.content";
                                }
                                rel2 {
+                                       relative, 1.0 0.4567;
                                        to, "bg.content";
                                }
                                text {
@@ -768,19 +770,6 @@ group {
                        name, "elm.text";
                        description {
                                state, "default" 0.0;
-                               align, 0.5 0.0;
-                               rel1 {
-                                       relative, 0.0 0.2283;
-                                       to, "bg.content";
-                               }
-                               rel2 {
-                                       relative, 1.0 0.4567;
-                                       to, "bg.content";
-                               }
-                               text {
-                                       style: "style.normal";
-                               }
-                               color, COLOR_TEXT_ITEM;
                        }
                        description {
                                state, "focused" 0.0;

diff --git a/src/common/menumgr.c b/src/common/menumgr.c
index bc1f4e6..47de08a 100755 (executable)
--- a/src/common/menumgr.c
+++ b/src/common/menumgr.c
@@ -148,7 +148,6 @@ void menumgr_update(struct menumgr *m)
        for (i = 0; i < m->len; i++) {
                if (m->info[i]) {
                        if (m->info[i]->status) {
-                               elm_object_style_set(m->btn[i], m->info[i]->style);
                                str = m->info[i]->status(m->data, m->info[i]->id);
 
                                if (!str) {
@@ -157,8 +156,6 @@ void menumgr_update(struct menumgr *m)
                                        elm_object_part_text_set(m->btn[i], PART_MENU_VALUE, STATUS_DEFAULT);
 
                                        elm_object_signal_emit(m->btn[i], SIG_NOTAVAILABLE, "");
-                                       if (!strcmp(m->info[i]->style, STYLE_STATUS_BTN))
-                                               elm_object_style_set(m->btn[i], STYLE_NORMAL_BTN);
                                } else {
                                        str_copy = strdup(str);
                                        token = strtok_r(str, delimiters, &save_ptr);

diff --git a/src/layout/layout_network.c b/src/layout/layout_network.c
index 06d1807..87a4930 100644 (file)
--- a/src/layout/layout_network.c
+++ b/src/layout/layout_network.c
@@ -104,6 +104,7 @@ static struct menumgr_info menu_info[] = {
                .title = STR_WIRED,
                .style = STYLE_NORMAL_BTN,
                .disabled = EINA_FALSE,
+               //.status = _get_contrast,
                .status = NULL,
                .progress_value = NULL,
                .progress_evas = NULL,
@@ -126,7 +127,7 @@ static char *_get_connected_ap(void *data, int id)
                free(essid);
                return temp;
        }
-       return NULL;
+       return strdup("");
 }
 
 static void _destroy_status_popup()