rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=2e05eadc8e45c23316b76d2c26ce22d3dab9519f

commit 2e05eadc8e45c23316b76d2c26ce22d3dab9519f
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date:   Wed Jan 27 15:59:22 2016 +0000

    layout: colorclass and style managers got their Apply buttons to be removed
---
 data/themes/default/widgets/layouts/tabs.edc | 87 +++++++++++-----------------
 src/bin/ui/colorclass_manager.c              |  6 +-
 src/bin/ui/editors/style_editor.c            |  5 +-
 3 files changed, 35 insertions(+), 63 deletions(-)

diff --git a/data/themes/default/widgets/layouts/tabs.edc 
b/data/themes/default/widgets/layouts/tabs.edc
index 71dc278..60690b6 100644
--- a/data/themes/default/widgets/layouts/tabs.edc
+++ b/data/themes/default/widgets/layouts/tabs.edc
@@ -1385,14 +1385,10 @@ group { name: "elm/layout/tab_home/item";
 }
 
 group { name: "elm/layout/tab_style/style_color_editor";
-   images {
-      image: "separator-vertical.png" COMP;
-      image: "separator-horizontal.png" COMP;
-   }
    parts {
       part { name: "top_pad";
          type: SPACER;
-         description {
+         description { state: "default" 0.0;
             align: 0.5 0.0;
             fixed: 0 1;
             max: -1 20;
@@ -1400,7 +1396,7 @@ group { name: "elm/layout/tab_style/style_color_editor";
       }
       part { name: "left_pad";
          type: SPACER;
-         description {
+         description { state: "default" 0.0;
             align: 0.0 0.0;
             fixed: 1 0;
             max: 6 -1;
@@ -1408,7 +1404,7 @@ group { name: "elm/layout/tab_style/style_color_editor";
       }
       part { name: "right_pad";
          type: SPACER;
-         description {
+         description { state: "default" 0.0;
             align: 1.0 1.0;
             fixed: 1 0;
             max: 6 -1;
@@ -1416,7 +1412,7 @@ group { name: "elm/layout/tab_style/style_color_editor";
       }
       part { name: "bottom_pad";
          type: SPACER;
-         description {
+         description { state: "default" 0.0;
             align: 0.0 1.0;
             fixed: 0 1;
             max: -1 6;
@@ -1430,52 +1426,37 @@ group { name: "elm/layout/tab_style/style_color_editor";
             fixed: 0 1;
             max: -1 19;
             color_class: "main";
+            rel1 {
+               relative: 1.0 1.0;
+               to_x: "left_pad";
+               to_y: "top_pad";
+            }
             text {
                font: "PT";
                size: 12;
                align: 0.0 0.0;
             }
-            rel1 {
-               to_y: "top_pad";
-               to_x: "left_pad";
-               relative: 1.0 1.0;
-            }
          }
       }
-      part { name: "elm.swallow.btn_apply";
-         type: SWALLOW;
-         description {
+      part { name: "separator_hor";
+         type: IMAGE;
+         description { state: "default" 0.0;
             align: 1.0 1.0;
-            fixed: 1 1;
+            min: 0 2;
+            max: -1 2;
             rel1 {
-               relative: 1.0 1.0;
+               relative: 1.0 0.0;
+               to_x: "left_pad";
             }
             rel2 {
+               relative: 0.0 0.0;
                to_x: "right_pad";
                to_y: "bottom_pad";
-               relative: 0.0 0.0;
             }
-         }
-      }
-      part { name: "separator_hor";
-         type: IMAGE;
-         description { state: "default" 0.0;
-            min: 0 2;
-            max: -1 2;
-            align: 0.5 1.0;
             image {
                normal: "separator-horizontal.png";
                middle: DEFAULT;
             }
-            rel1 {
-               to_x: "left_pad";
-               relative: 1.0 0.0;
-            }
-            rel2 {
-               to: "elm.swallow.btn_apply";
-               relative: 1.0 0.0;
-               offset: -1 -7;
-            }
          }
       }
       part { name: "swallow.list";
@@ -1485,12 +1466,12 @@ group { name: "elm/layout/tab_style/style_color_editor";
             fixed: 1 0;
             max: 300 -1;
             rel1 {
-               to: "top_pad";
                relative: 0.0 1.0;
+               to: "top_pad";
             }
             rel2 {
-               to: "separator_hor";
                relative: 1.0 0.0;
+               to: "separator_hor";
             }
          }
       }
@@ -1503,11 +1484,10 @@ group { name: "elm/layout/tab_style/style_color_editor";
             max: 6 -1;
             rel1 {
                to: "swallow.list";
-               relative: 0.0 0.0;
             }
             rel2 {
-               to: "swallow.list";
                relative: 0.0 1.0;
+               to: "swallow.list";
             }
          }
       }
@@ -1518,18 +1498,17 @@ group { name: "elm/layout/tab_style/style_color_editor";
             fixed: 1 0;
             min: 2 1;
             max: 2 -1;
-            image {
-               normal: "separator-vertical.png";
-               middle: DEFAULT;
-            }
             rel1 {
                to_x: "sep_beetwen_list_pad";
                to_y: "top_pad";
-               relative: 0.0 0.0;
             }
             rel2 {
-               to: "sep_beetwen_list_pad";
                relative: 0.0 1.0;
+               to: "sep_beetwen_list_pad";
+            }
+            image {
+               normal: "separator-vertical.png";
+               middle: DEFAULT;
             }
          }
       }
@@ -1540,13 +1519,13 @@ group { name: "elm/layout/tab_style/style_color_editor";
             fixed: 1 0;
             max: 6 -1;
             rel1 {
-               to_y: "top_pad";
-               to_x: "left_pad";
                relative: 1.0 1.0;
+               to_x: "left_pad";
+               to_y: "top_pad";
             }
             rel2 {
-               to: "separator_ver";
                relative: 0.0 1.0;
+               to: "separator_ver";
             }
          }
       }
@@ -1557,8 +1536,8 @@ group { name: "elm/layout/tab_style/style_color_editor";
             fixed: 0 1;
             max: -1 6;
             rel1 {
-               to: "label.preview";
                relative: 0.0 1.0;
+               to: "label.preview";
             }
          }
       }
@@ -1569,12 +1548,12 @@ group { name: "elm/layout/tab_style/style_color_editor";
             fixed: 0 1;
             max: -1 32;
             rel1 {
-               to: "left_pad";
                relative: 1.0 0.0;
+               to: "left_pad";
             }
             rel2 {
-               to: "pad_preview_vert_separ";
                relative: 0.0 1.0;
+               to: "pad_preview_vert_separ";
             }
          }
       }
@@ -1583,12 +1562,12 @@ group { name: "elm/layout/tab_style/style_color_editor";
          description { state: "default" 0.0;
             align: 0.0 0.5;
             rel1 {
-               to: "pad_preview";
                relative: 0.0 1.0;
+               to: "pad_preview";
             }
             rel2 {
-               to: "menu_container";
                relative: 1.0 0.0;
+               to: "menu_container";
             }
          }
       }
diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c
index cee1167..96c6dd1 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -410,7 +410,7 @@ _form_list_side(Colorclasses_Manager *edit)
 static void
 _colorclass_main_layout_create(Colorclasses_Manager *edit)
 {
-   Evas_Object *layout_list, *bg, *box_bg, *radio, *radio_group, *image_bg, 
*layout_bg, *btn_apply;
+   Evas_Object *layout_list, *bg, *box_bg, *radio, *radio_group, *image_bg, 
*layout_bg;
 
    assert(edit != NULL);
 
@@ -474,10 +474,6 @@ _colorclass_main_layout_create(Colorclasses_Manager *edit)
 #undef _RADIO_ADD
 
    elm_object_part_content_set(edit->layout, "menu_container", box_bg);
-
-   BUTTON_ADD(edit->layout, btn_apply, _("Apply"))
-   elm_object_part_content_set(edit->layout, "elm.swallow.btn_apply", 
btn_apply);
-   elm_object_disabled_set(btn_apply, EINA_TRUE);
 }
 
 static Eina_Bool
diff --git a/src/bin/ui/editors/style_editor.c 
b/src/bin/ui/editors/style_editor.c
index 5b01593..2596aab 100644
--- a/src/bin/ui/editors/style_editor.c
+++ b/src/bin/ui/editors/style_editor.c
@@ -941,7 +941,7 @@ Evas_Object *
 style_editor_window_add()
 {
    Evas_Object *main_layout, *layout_right;
-   Evas_Object *bg, *btn_apply, *box_bg;
+   Evas_Object *bg, *box_bg;
    Evas *canvas;
    Evas_Textblock_Style *ts;
    Style_Editor *style_edit;
@@ -984,9 +984,6 @@ style_editor_window_add()
    box_bg = _add_box_bg(style_edit);
    elm_object_part_content_set(main_layout, "menu_container", box_bg);
 
-   BUTTON_ADD(main_layout, btn_apply, _("Apply"))
-   elm_object_part_content_set(main_layout, "elm.swallow.btn_apply", 
btn_apply);
-
    evas_textblock_style_free(ts);
    evas_object_event_callback_add(main_layout, EVAS_CALLBACK_DEL,
                                   _on_style_editor_close, style_edit);

-- 


Reply via email to