rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=dec8af49ed43fcea6d761a6668a070e82d3b8386
commit dec8af49ed43fcea6d761a6668a070e82d3b8386
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Wed Feb 17 10:43:24 2016 +0200
merge two layouts to one
The layout 'elm/layout/tab_style/style_color_editor' and
'elm/layout/style_color_editor/list' to layout
'elm/layout/style_manager/default'. Use it layout in the
colorclass and style managers
Change-Id: I29eb6942aafa331b651bc1f978ff93035dc3f9e7
---
data/themes/default/widgets/layout.edc | 174 +++++++----
.../default/widgets/layouts/colorclass_manager.edc | 327 +--------------------
data/themes/default/widgets/layouts/tabs.edc | 170 -----------
src/bin/ui/colorclass_manager.c | 77 ++---
src/bin/ui/style_manager.c | 190 +++++-------
5 files changed, 222 insertions(+), 716 deletions(-)
diff --git a/data/themes/default/widgets/layout.edc
b/data/themes/default/widgets/layout.edc
index de36853..6d91383 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -1,11 +1,3 @@
-#include "layouts/style_editor.edc"
-#include "layouts/colorclass_manager.edc"
-#include "layouts/live_view_toolbar_helper.edc"
-#include "layouts/property.edc"
-#include "layouts/signal_list.edc"
-#include "layouts/history.edc"
-#include "layouts/tabs.edc"
-
group { name: "elm/layout/window/main";
images {
image: "status-top_border-bg.png" COMP;
@@ -256,110 +248,164 @@ group{ name: "elm/layout/colorclass_editor/preview";
}
}
-group { name: "elm/layout/style_color_editor/list";
+group { name: "elm/layout/style_manager/default";
parts {
- part { name: "label.list";
+ part { name: "elm.text";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
align: 0.0 0.0;
- fixed: 1 1;
+ fixed: 0 1;
+ max: -1 19;
color_class: "main";
- max: 232 19;
+ rel1 {
+ offset: 0 2;
+ }
+ rel2 {
+ offset: -7 -1;
+ to_x: "separator";
+ }
text {
font: "PT";
size: 12;
- align: 0.0 0.0;
+ max: 1 0;
}
}
}
- part { name: "swallow.button_rm";
+ part { name: "elm.swallow.preview";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
- align: 1.0 0.0;
- FIXED_SIZE(18, 19);
+ align: 0.0 0.5;
rel1 {
- to: "label.list";
- relative: 1.0 0.0;
+ relative: 0.0 1.0;
+ offset: 0 6;
+ to_y: "elm.text";
}
- }
- }
- part { name: "pad_between_but";
- type: SPACER;
- description { state: "default" 0.0;
- align: 1.0 0.0;
- FIXED_SIZE(3, 21);
rel2 {
- to: "swallow.button_rm";
relative: 0.0 0.0;
+ offset: -7 -7;
+ to_x: "separator";
+ to_y: "elm.swallow.menu";
}
}
}
- part { name: "swallow.button_add";
+ part { name: "elm.swallow.menu";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
- align: 1.0 0.0;
- FIXED_SIZE(18, 19);
+ align: 1.0 1.0;
+ fixed: 0 1;
+ max: -1 19;
rel2 {
- to: "pad_between_but";
- relative: 0.0 0.0;
+ offset: -1 -7;
+ to_x: "elm.swallow.preview";
}
}
}
- part { name: "pad_list";
- type: SPACER;
+ part { name: "elm.swallow.list";
+ type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
- align: 0.5 0.0;
- fixed: 0 1;
- max: -1 6;
+ align: 1.0 1.0;
+ fixed: 1 0;
+ max: 300 -1;
rel1 {
- to: "label.list";
relative: 0.0 1.0;
+ offset: 0 6;
+ to_y: "elm.text";
+ }
+ rel2 {
+ relative: 1.0 0.0;
+ offset: -1 -6;
+ to_y: "elm.swallow.search";
}
}
}
- part { name: "pad_bottom";
- type: SPACER;
+ part { name: "separator";
+ type: IMAGE;
description { state: "default" 0.0;
- align: 0.0 1.0;
- fixed: 1 1;
- max: -1 6;
+ align: 1.0 0.5;
+ fixed: 1 0;
+ min: 2 1;
+ max: 2 -1;
+ rel2 {
+ relative: 0.0 1.0;
+ offset: -7 -1;
+ to_x: "elm.swallow.list";
+ }
+ image {
+ normal: "separator-vertical.png";
+ middle: DEFAULT;
+ }
}
}
- part { name: "swallow.search";
- type: SWALLOW;
+ part { name: "elm.subtext";
+ type: TEXT;
+ scale: 1;
description { state: "default" 0.0;
- align: 0.0 1.0;
- fixed: 1 1;
+ align: 0.0 0.0;
max: -1 19;
+ color_class: "main";
+ rel1 {
+ offset: 0 2;
+ to_x: "elm.swallow.list";
+ }
rel2 {
- to: "pad_bottom";
- relative: 1.0 0.0;
+ relative: 0.0 1.0;
+ to_x: "elm.swallow.btn_add";
+ }
+ text {
+ font: "PT";
+ size: 12;
+ max: 1 0;
}
}
}
- part { name: "pad_list_between_search";
- type: SPACER;
+ part { name: "elm.swallow.btn_del";
+ type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
- align: 0.0 1.0;
- fixed: 1 1;
- max: -1 6;
+ align: 1.0 0.5;
+ max: 18 19;
+ rel1 {
+ to_y: "elm.subtext";
+ }
rel2 {
- to: "swallow.search";
- relative: 1.0 0.0;
+ to_y: "elm.subtext";
}
}
}
- part { name: "swallow.list";
+ part { name: "elm.swallow.btn_add";
type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
+ align: 1.0 0.5;
+ max: 18 19;
rel1 {
- to: "pad_list";
- relative: 0.0 1.0;
+ to_y: "elm.subtext";
}
rel2 {
- to: "pad_list_between_search";
+ relative: 0.0 1.0;
+ offset: -4 -1;
+ to_x: "elm.swallow.btn_del";
+ to_y: "elm.subtext";
+ }
+ }
+ }
+ part { name: "elm.swallow.search";
+ type: SWALLOW;
+ scale: 1;
+ description { state: "default" 0.0;
+ align: 0.5 1.0;
+ max: -1 19;
+ rel1 {
relative: 1.0 0.0;
+ offset: 6 0;
+ to_x: "separator";
+ }
+ rel2 {
+ offset: -1 -7;
}
}
}
@@ -1905,3 +1951,13 @@ group { name: "elm/layout/groupview/default";
target: "bg";
}
}
+
+#include "layouts/style_editor.edc"
+#include "layouts/colorclass_manager.edc"
+#include "layouts/live_view_toolbar_helper.edc"
+#include "layouts/property.edc"
+#include "layouts/signal_list.edc"
+#include "layouts/history.edc"
+#include "layouts/tabs.edc"
+
+
diff --git a/data/themes/default/widgets/layouts/colorclass_manager.edc
b/data/themes/default/widgets/layouts/colorclass_manager.edc
index 6fd4176..1387cb7 100644
--- a/data/themes/default/widgets/layouts/colorclass_manager.edc
+++ b/data/themes/default/widgets/layouts/colorclass_manager.edc
@@ -1,330 +1,5 @@
group { name: "elm/layout/colorclass_manager/default";
- parts {
- part { name: "area.list";
- type: SPACER;
- description { state: "default" 0.0;
- align: 0.0 1.0;
- fixed: 1 1;
- max: 322 -1;
- rel2 {
- relative: 0.2 1.0;
- }
- }
- }
- part { name: "padding.params";
- type: SPACER;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- fixed: 1 1;
- min: 0 45;
- max: -1 45;
- rel1 {
- relative: 0.0 1.0;
- to_y: "swallow.entry";
- }
- }
- }
- part { name: "swallow.search";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- min: 0 23;
- max: -1 23;
- rel2 {
- relative: 0.0 1.0;
- offset: -9 -1;
- to_x: "swallow.control.add";
- }
- }
- }
- part { name: "swallow.control.minus";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 1.0 0.0;
- min: 21 19;
- max: 21 19;
- rel2 {
- offset: -9 -1;
- to_x: "area.list";
- }
- }
- }
- part { name: "swallow.control.add";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 1.0 0.0;
- min: 21 19;
- max: 21 19;
- rel2 {
- relative: 0.0 1.0;
- offset: -7 -1;
- to_x: "swallow.control.minus";
- }
- }
- }
- part { name: "separator.left";
- type: IMAGE;
- description { state: "default" 0.0;
- align: 0.0 0.5;
- fixed: 1 1;
- min: 2 0;
- max: 2 -1;
- rel1 {
- relative: 1.0 0.0;
- offset: 6 0;
- to_x: "swallow.list";
- }
- image {
- normal: "separator-vertical.png";
- middle: DEFAULT;
- }
- }
- }
- part { name: "swallow.entry.bg";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 1.0 0.0;
- min: 0 100;
- max: -1 100;
- rel1 {
- relative: 1.0 0.0;
- offset: 6 0;
- to_x: "separator.left";
- }
- }
- }
- part { name: "swallow.entry";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 1.0 0.0;
- min: 0 100;
- max: -1 100;
- rel1 {
- relative: 1.0 0.0;
- offset: 6 0;
- to_x: "separator.left";
- }
- }
- }
- part { name: "swallow.radio";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 1.0 0.5;
- min: 90 22;
- max: 90 22;
- rel1 {
- to_y: "padding.params";
- }
- rel2 {
- offset: -25 -1;
- to_y: "padding.params";
- }
- }
- }
- part { name: "text.object";
- type: TEXT;
- description { state: "default" 0.0;
- align: 0.5 0.0;
- fixed: 1 0;
- max: 265 -1;
- color_class: "main_alternative";
- rel1 {
- relative: 0.0 1.0;
- to_x: "swallow.entry";
- to_y: "padding.params";
- }
- rel2 {
- relative: 0.33 1.0;
- to_x: "swallow.entry";
- }
- text {
- text: "";
- font: "PT";
- size: 16;
- min: 0 1;
- max: 0 1;
- }
- }
- }
- part { name: "separator.outline.left";
- type: IMAGE;
- description { state: "default" 0.0;
- align: 0.5 1.0;
- fixed: 1 1;
- min: 2 0;
- max: 2 -1;
- rel1 {
- to_x: "text.object";
- to_y: "text.outline";
- }
- rel2 {
- to_x: "text.outline";
- }
- image {
- normal: "separator-vertical.png";
- middle: DEFAULT;
- }
- }
- }
- part { name: "text.outline";
- type: TEXT;
- description { state: "default" 0.0;
- align: 0.5 0.0;
- fixed: 1 0;
- max: 265 -1;
- color_class: "main_alternative";
- rel1 {
- relative: 0.33 1.0;
- to_x: "swallow.entry";
- to_y: "padding.params";
- }
- rel2 {
- relative: 0.66 1.0;
- to_x: "swallow.entry";
- }
- text {
- text: "";
- font: "PT";
- size: 16;
- min: 0 1;
- max: 0 1;
- }
- }
- }
- part { name: "separator.outline.right";
- type: IMAGE;
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 2 0;
- max: 2 -1;
- rel1 {
- relative: 1.0 1.0;
- to_x: "text.outline";
- to_y: "padding.params";
- }
- rel2 {
- relative: 0.0 1.0;
- to_x: "text.shadow";
- }
- image {
- normal: "separator-vertical.png";
- middle: DEFAULT;
- }
- }
- }
- part { name: "text.shadow";
- type: TEXT;
- description { state: "default" 0.0;
- align: 0.5 0.0;
- fixed: 1 0;
- max: 265 -1;
- color_class: "main_alternative";
- rel1 {
- relative: 0.66 1.0;
- to_x: "swallow.entry";
- to_y: "padding.params";
- }
- rel2 {
- relative: 1.0 1.0;
- to_x: "swallow.entry";
- }
- text {
- text: "";
- font: "PT";
- size: 16;
- min: 0 1;
- max: 0 1;
- }
- }
- }
- part { name: "swallow.colorselector.object";
- type: SWALLOW;
- clip_to: "clipper.object";
- description { state: "default" 0.0;
- align: 0.5 0;
- rel1 {
- relative: 0.0 1.0;
- offset: 23 0;
- to: "text.object";
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -24 -1;
- to_x: "text.object";
- }
- }
- }
- part { name: "swallow.colorselector.outline";
- type: SWALLOW;
- clip_to: "clipper.outline";
- description { state: "default" 0.0;
- align: 0.5 0;
- rel1 {
- relative: 0.0 1.0;
- offset: 23 0;
- to: "text.outline";
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -24 -1;
- to_x: "text.outline";
- }
- }
- }
- part { name: "swallow.colorselector.shadow";
- type: SWALLOW;
- clip_to: "clipper.shadow";
- description { state: "default" 0.0;
- align: 0.5 0;
- rel1 {
- relative: 0.0 1.0;
- offset: 23 0;
- to: "text.shadow";
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -24 -1;
- to_x: "text.shadow";
- }
- }
- }
- part { name: "swallow.list";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- max: 322 -1;
- rel1 {
- relative: 0.0 1.0;
- offset: 0 8;
- to_y: "swallow.search";
- }
- rel2 {
- relative: 0.2 1.0;
- }
- }
- }
- part { name: "clipper.object";
- type: RECT;
- description { state: "default" 0.0;
- rel1.to: "swallow.colorselector.object";
- rel2.to: "swallow.colorselector.object";
- }
- }
- part { name: "clipper.outline";
- type: RECT;
- description { state: "default" 0.0;
- rel1.to: "swallow.colorselector.outline";
- rel2.to: "swallow.colorselector.outline";
- }
- }
- part { name: "clipper.shadow";
- type: RECT;
- description { state: "default" 0.0;
- rel1.to: "swallow.colorselector.shadow";
- rel2.to: "swallow.colorselector.shadow";
- }
- }
- }
+ inherit: "elm/layout/style_manager/default";
}
group {
diff --git a/data/themes/default/widgets/layouts/tabs.edc
b/data/themes/default/widgets/layouts/tabs.edc
index 4bbe548..d989074 100644
--- a/data/themes/default/widgets/layouts/tabs.edc
+++ b/data/themes/default/widgets/layouts/tabs.edc
@@ -1382,173 +1382,3 @@ group { name: "elm/layout/tab_home/item";
}
}
}
-
-group { name: "elm/layout/tab_style/style_color_editor";
- parts {
- part { name: "top_pad";
- type: SPACER;
- description { state: "default" 0.0;
- align: 0.5 0.0;
- fixed: 0 1;
- max: -1 2;
- }
- }
- part { name: "left_pad";
- type: SPACER;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- fixed: 1 0;
- max: 0 -1;
- }
- }
- part { name: "right_pad";
- type: SPACER;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- fixed: 1 0;
- max: 0 -1;
- }
- }
- part { name: "bottom_pad";
- type: SPACER;
- description { state: "default" 0.0;
- align: 0.0 1.0;
- fixed: 0 1;
- max: -1 0;
- }
- }
- part { name: "label.preview";
- type: TEXT;
- scale: 1;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- 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;
- }
- }
- }
- part { name: "swallow.list";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- fixed: 1 0;
- max: 300 -1;
- rel1 {
- relative: 0.0 1.0;
- to: "top_pad";
- }
- rel2 {
- relative: 0.0 0.0;
- to_x: "right_pad";
- to_y: "bottom_pad";
- }
- }
- }
- part { name: "sep_beetwen_list_pad";
- type: SPACER;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- fixed: 1 0;
- min: 6 1;
- max: 6 -1;
- rel1 {
- to: "swallow.list";
- }
- rel2 {
- relative: 0.0 1.0;
- to: "swallow.list";
- }
- }
- }
- part { name: "separator_ver";
- type: IMAGE;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- fixed: 1 0;
- min: 2 1;
- max: 2 -1;
- rel1 {
- to_x: "sep_beetwen_list_pad";
- to_y: "top_pad";
- }
- rel2 {
- relative: 0.0 1.0;
- to: "sep_beetwen_list_pad";
- }
- image {
- normal: "separator-vertical.png";
- middle: DEFAULT;
- }
- }
- }
- part { name: "pad_preview_vert_separ";
- type: SPACER;
- description { state: "default" 0.0;
- align: 1.0 0.5;
- fixed: 1 0;
- max: 6 -1;
- rel1 {
- relative: 1.0 1.0;
- to_x: "left_pad";
- to_y: "top_pad";
- }
- rel2 {
- relative: 0.0 1.0;
- to: "separator_ver";
- }
- }
- }
- part { name: "pad_preview";
- type: SPACER;
- description { state: "default" 0.0;
- align: 0.5 0.0;
- fixed: 0 1;
- max: -1 6;
- rel1 {
- relative: 0.0 1.0;
- to: "label.preview";
- }
- }
- }
- part { name: "menu_container";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- fixed: 0 1;
- max: -1 32;
- rel1 {
- relative: 1.0 0.0;
- to: "left_pad";
- }
- rel2 {
- relative: 0.0 1.0;
- to: "pad_preview_vert_separ";
- }
- }
- }
- part { name: "swallow.preview";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 0.0 0.5;
- rel1 {
- relative: 0.0 1.0;
- to: "pad_preview";
- }
- rel2 {
- 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 f3b4cdd..6a80ee6 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -347,10 +347,12 @@ _item_ccl_del(void *data,
ccl_it = NULL;
}
-static Evas_Object *
-_form_list_side(Colorclasses_Manager *edit)
+static void
+_colorclass_main_layout_create(Colorclasses_Manager *edit)
{
- Evas_Object *layout, *search, *ic, *button;
+ Evas_Object *bg, *box_bg, *radio, *radio_group, *image_bg, *layout_bg,
*search, *ic, *button;
+
+ assert(edit != NULL);
if (!_itc_ccl)
{
@@ -360,72 +362,44 @@ _form_list_side(Colorclasses_Manager *edit)
_itc_ccl->func.del = _item_ccl_del;
}
- layout = elm_layout_add(ap.win);
- evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
- elm_layout_theme_set(layout, "layout", "style_color_editor", "list");
- elm_object_part_text_set(layout, "label.list", _("Color list"));
- evas_object_show(layout);
+ /* Creating main layout of window */
+ edit->layout = elm_layout_add(ap.win);
+ elm_layout_theme_set(edit->layout, "layout", "colorclass_manager",
"default");
+ elm_layout_text_set(edit->layout, "elm.text", _("Preview"));
+ elm_layout_text_set(edit->layout, "elm.subtext", _("Color classes list"));
- /* List of project's colorclasses */
- edit->genlist = elm_genlist_add(layout);
- evas_object_size_hint_weight_set(edit->genlist, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(edit->genlist, EVAS_HINT_FILL,
EVAS_HINT_FILL);
+ edit->genlist = elm_genlist_add(edit->layout);
evas_object_show(edit->genlist);
- elm_object_part_content_set(layout, "swallow.list", edit->genlist);
+ elm_object_part_content_set(edit->layout, "elm.swallow.list",
edit->genlist);
evas_object_smart_callback_add(edit->genlist, "selected", _on_selected,
edit);
evas_object_smart_callback_add(edit->genlist, "unselected", _on_unselected,
edit);
- search = _manager_search_field_create(layout);
- elm_object_part_content_set(layout, "swallow.search", search);
+ search = _manager_search_field_create(edit->layout);
+ elm_object_part_content_set(edit->layout, "elm.swallow.search", search);
evas_object_smart_callback_add(search, "changed", _search_changed, edit);
evas_object_smart_callback_add(search, "activated", _search_nxt_gd_item,
edit);
- evas_object_smart_callback_add(edit->genlist, "pressed", _search_reset_cb,
- &(edit->style_search_data));
+ evas_object_smart_callback_add(edit->genlist, "pressed", _search_reset_cb,
&(edit->style_search_data));
edit->style_search_data.search_entry = search;
edit->style_search_data.last_item_found = NULL;
/* Controls (add, remove) of colorclasses */
- button = elm_button_add(layout);
+ button = elm_button_add(edit->layout);
elm_object_style_set(button, "anchor");
evas_object_show(button);
ICON_STANDARD_ADD(button, ic, true, "plus");
elm_object_part_content_set(button, NULL, ic);
- evas_object_smart_callback_add(button, "clicked",
- _on_button_add_clicked_cb, edit);
- elm_object_part_content_set(layout, "swallow.button_add", button);
+ evas_object_smart_callback_add(button, "clicked",
_on_button_add_clicked_cb, edit);
+ elm_object_part_content_set(edit->layout, "elm.swallow.btn_add", button);
- edit->del_button = elm_button_add(layout);
+ edit->del_button = elm_button_add(edit->layout);
elm_object_style_set(edit->del_button, "anchor");
evas_object_show(edit->del_button);
ICON_STANDARD_ADD(button, ic, true, "minus");
elm_object_part_content_set(edit->del_button, NULL, ic);
- evas_object_smart_callback_add(edit->del_button, "clicked",
- _on_button_delete_clicked_cb, edit);
- elm_object_part_content_set(layout, "swallow.button_rm", edit->del_button);
+ evas_object_smart_callback_add(edit->del_button, "clicked",
_on_button_delete_clicked_cb, edit);
+ elm_object_part_content_set(edit->layout, "elm.swallow.btn_del",
edit->del_button);
elm_object_disabled_set(edit->del_button, EINA_TRUE);
- return layout;
-}
-
-static void
-_colorclass_main_layout_create(Colorclasses_Manager *edit)
-{
- Evas_Object *layout_list, *bg, *box_bg, *radio, *radio_group, *image_bg,
*layout_bg;
-
- assert(edit != NULL);
-
- /* Creating main layout of window */
- edit->layout = elm_layout_add(ap.win);
- elm_layout_theme_set(edit->layout, "layout", "tab_style",
"style_color_editor");
- evas_object_size_hint_weight_set(edit->layout, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
-
- elm_object_part_text_set(edit->layout, "label.preview", _("Preview"));
-
- layout_list = _form_list_side(edit);
- elm_object_part_content_set(edit->layout, "swallow.list", layout_list);
- evas_object_show(layout_list);
-
-
layout_bg = elm_layout_add(edit->layout);
elm_layout_theme_set(layout_bg, "layout", "colorclass_editor", "preview");
evas_object_size_hint_weight_set(layout_bg, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
@@ -436,8 +410,7 @@ _colorclass_main_layout_create(Colorclasses_Manager *edit)
evas_object_show(bg);
edit->edje_preview = edje_object_add(evas_object_evas_get(layout_bg));
- if (!edje_object_file_set(edit->edje_preview,
- EFLETE_THEME,
+ if (!edje_object_file_set(edit->edje_preview, EFLETE_THEME,
"elm/layout/colorclass_manager/preview"))
{
ERR("Couldn't load layout for text example field!");
@@ -449,11 +422,11 @@ _colorclass_main_layout_create(Colorclasses_Manager *edit)
evas_object_show(edit->edje_preview);
elm_object_part_content_set(layout_bg, "swallow.entry", edit->edje_preview);
- elm_object_part_content_set(edit->layout, "swallow.preview", layout_bg);
+ elm_object_part_content_set(edit->layout, "elm.swallow.preview", layout_bg);
/* Background changing radios */
BOX_ADD(edit->layout, box_bg, true, false);
- elm_box_padding_set(box_bg, 10, 0);
+ elm_box_padding_set(box_bg, 6, 0);
elm_box_align_set(box_bg, 1.0, 0.5);
#define _RADIO_ADD(RADIO, VALUE, IMAGE) \
@@ -473,7 +446,7 @@ _colorclass_main_layout_create(Colorclasses_Manager *edit)
elm_radio_group_add(radio, radio_group);
#undef _RADIO_ADD
- elm_object_part_content_set(edit->layout, "menu_container", box_bg);
+ elm_object_part_content_set(edit->layout, "elm.swallow.menu", box_bg);
}
static Eina_Bool
diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c
index 5bd77b9..7d70c16 100644
--- a/src/bin/ui/style_manager.c
+++ b/src/bin/ui/style_manager.c
@@ -829,103 +829,6 @@ _on_bt_add(void *data,
elm_object_item_disabled_set(style_edit->menu_tag, true);
}
-/* Creating the view of the mwin!!! */
-static Evas_Object *
-_form_right_side(Style_Editor *style_edit)
-{
- Elm_Object_Item *glit_style;
- Evas_Object *layout, *button_add, *search, *ic;
- Eina_List *styles, *l_st;
- Resource *res;
-
- assert(style_edit != NULL);
-
- if (!_itc_style)
- {
- _itc_style = elm_genlist_item_class_new();
- _itc_style->item_style = "aligned";
- _itc_style->func.text_get = _item_style_label_get;
- _itc_style->func.content_get = _item_style_icon_get;
- _itc_style->func.state_get = NULL;
- _itc_style->func.del = NULL;
- }
- if (!_itc_tags)
- {
- _itc_tags= elm_genlist_item_class_new();
- _itc_tags->item_style = "aligned";
- _itc_tags->func.text_get = _item_tags_label_get;
- _itc_tags->func.content_get = _item_tags_icon_get;
- _itc_tags->func.state_get = NULL;
- _itc_tags->func.del = NULL;
- }
-
- layout = elm_layout_add(ap.win);
- evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
- elm_layout_theme_set(layout, "layout", "style_color_editor", "list");
- elm_object_part_text_set(layout, "label.list", _("Font list"));
- evas_object_show(layout);
-
- search = _style_manager_search_field_create(layout);
- elm_object_part_content_set(layout, "swallow.search", search);
- evas_object_smart_callback_add(search, "changed", _search_changed,
style_edit);
- evas_object_smart_callback_add(search, "activated", _search_nxt_gd_item,
style_edit);
- evas_object_smart_callback_add(style_edit->glist, "pressed",
_search_reset_cb,
- &(style_edit->style_search_data));
- style_edit->style_search_data.search_entry = search;
- style_edit->style_search_data.last_item_found = NULL;
-
- style_edit->glist = elm_genlist_add(layout);
- elm_object_part_content_set(layout, "swallow.list", style_edit->glist);
- evas_object_smart_callback_add(style_edit->glist, "clicked,double",
_on_clicked_double, NULL);
- evas_object_smart_callback_add(style_edit->glist, "expand,request",
_expand_request_cb, NULL);
- evas_object_smart_callback_add(style_edit->glist, "expanded", _expanded_cb,
style_edit);
- evas_object_smart_callback_add(style_edit->glist, "contract,request",
_contract_request_cb, NULL);
- evas_object_smart_callback_add(style_edit->glist, "contracted",
_contracted_cb, NULL);
- evas_object_smart_callback_add(style_edit->glist, "unselected",
_on_unselected_cb, style_edit);
- evas_object_show(style_edit->glist);
- /*elm_genlist_tree_effect_enabled_set(style_edit->glist, EINA_TRUE);*/
-
- evas_object_size_hint_align_set(style_edit->glist, EVAS_HINT_FILL,
- EVAS_HINT_FILL);
- evas_object_size_hint_weight_set(style_edit->glist, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
-
- styles = ap.project->styles;
-
- EINA_LIST_FOREACH(styles, l_st, res)
- {
- glit_style = elm_genlist_item_append(style_edit->glist, _itc_style,
- res->name, NULL,
ELM_GENLIST_ITEM_TREE,
- _on_glit_selected, style_edit);
- elm_object_item_data_set(glit_style, (char *)res->name);
- }
-
- style_edit->menu = elm_menu_add(ap.win);
- elm_menu_item_add(style_edit->menu, NULL, NULL, _("Style"),
_on_bt_style_add, style_edit);
- style_edit->menu_tag = elm_menu_item_add(style_edit->menu, NULL, NULL,
_("Tag"), _on_bt_tag_add, style_edit);
-
- button_add = elm_button_add(ap.win);
- elm_object_style_set(button_add, "anchor");
- evas_object_show(button_add);
- ic = elm_icon_add(button_add);
- elm_icon_standard_set(ic, "plus");
- elm_object_part_content_set(button_add, NULL, ic);
- evas_object_smart_callback_add(button_add, "clicked", _on_bt_add,
style_edit);
- elm_object_part_content_set(layout, "swallow.button_add", button_add);
-
- style_edit->button_del = elm_button_add(ap.win);
- elm_object_style_set(style_edit->button_del, "anchor");
- evas_object_show(style_edit->button_del);
- ic = elm_icon_add(style_edit->button_del);
- elm_icon_standard_set(ic, "minus");
- elm_object_part_content_set(style_edit->button_del, NULL, ic);
- evas_object_smart_callback_add(style_edit->button_del, "clicked",
_on_bt_del, style_edit);
- elm_object_part_content_set(layout, "swallow.button_rm",
style_edit->button_del);
- elm_object_disabled_set(style_edit->button_del, true);
-
- return layout;
-}
-
static void
_change_bg_cb(void *data,
Evas_Object *obj,
@@ -1012,9 +915,13 @@ _on_style_manager_close(void *data,
Evas_Object *
style_manager_add()
{
- Evas_Object *main_layout, *layout_right;
+ Evas_Object *main_layout;
Evas_Object *bg, *box_bg;
Evas *canvas;
+ Elm_Object_Item *glit_style;
+ Evas_Object *button_add, *search, *ic;
+ Eina_List *styles, *l_st;
+ Resource *res;
Evas_Textblock_Style *ts;
Style_Editor *style_edit;
static const char *style_buf = FONT_DEFAULT"'";
@@ -1024,12 +931,11 @@ style_manager_add()
style_edit = (Style_Editor *)mem_calloc(1, sizeof(Style_Editor));
main_layout = elm_layout_add(ap.win);
- elm_layout_theme_set(main_layout, "layout", "tab_style",
"style_color_editor");
- elm_object_part_text_set(main_layout, "label.preview", _("Preview"));
+ elm_layout_theme_set(main_layout, "layout", "style_manager", "default");
+ elm_object_part_text_set(main_layout, "elm.text", _("Preview"));
+ elm_layout_text_set(main_layout, "elm.subtext", _("Font list"));
style_edit->entry_prev = elm_layout_add(main_layout);
- evas_object_size_hint_weight_set(style_edit->entry_prev, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
elm_layout_theme_set(style_edit->entry_prev, "layout", "style_editor",
"preview");
evas_object_show(style_edit->entry_prev);
elm_object_signal_emit(style_edit->entry_prev, "entry,hide", "eflete");
@@ -1046,18 +952,84 @@ style_manager_add()
evas_object_textblock_style_set(style_edit->textblock_style, ts);
evas_object_textblock_text_markup_set(style_edit->textblock_style,
TEST_TEXT);
evas_object_show(style_edit->textblock_style);
- elm_object_part_content_set(main_layout, "swallow.preview",
style_edit->entry_prev);
+ elm_object_part_content_set(main_layout, "elm.swallow.preview",
style_edit->entry_prev);
+
+ if (!_itc_style)
+ {
+ _itc_style = elm_genlist_item_class_new();
+ _itc_style->item_style = "aligned";
+ _itc_style->func.text_get = _item_style_label_get;
+ _itc_style->func.content_get = _item_style_icon_get;
+ _itc_style->func.state_get = NULL;
+ _itc_style->func.del = NULL;
+ }
+ if (!_itc_tags)
+ {
+ _itc_tags= elm_genlist_item_class_new();
+ _itc_tags->item_style = "aligned";
+ _itc_tags->func.text_get = _item_tags_label_get;
+ _itc_tags->func.content_get = _item_tags_icon_get;
+ _itc_tags->func.state_get = NULL;
+ _itc_tags->func.del = NULL;
+ }
- layout_right = _form_right_side(style_edit);
- elm_object_part_content_set(main_layout, "swallow.list", layout_right);
- evas_object_show(layout_right);
+ search = _style_manager_search_field_create(main_layout);
+ elm_object_part_content_set(main_layout, "elm.swallow.search", search);
+ evas_object_smart_callback_add(search, "changed", _search_changed,
style_edit);
+ evas_object_smart_callback_add(search, "activated", _search_nxt_gd_item,
style_edit);
+ evas_object_smart_callback_add(style_edit->glist, "pressed",
_search_reset_cb, &(style_edit->style_search_data));
+ style_edit->style_search_data.search_entry = search;
+ style_edit->style_search_data.last_item_found = NULL;
+
+ style_edit->glist = elm_genlist_add(main_layout);
+ elm_object_part_content_set(main_layout, "elm.swallow.list",
style_edit->glist);
+ evas_object_smart_callback_add(style_edit->glist, "clicked,double",
_on_clicked_double, NULL);
+ evas_object_smart_callback_add(style_edit->glist, "expand,request",
_expand_request_cb, NULL);
+ evas_object_smart_callback_add(style_edit->glist, "expanded", _expanded_cb,
style_edit);
+ evas_object_smart_callback_add(style_edit->glist, "contract,request",
_contract_request_cb, NULL);
+ evas_object_smart_callback_add(style_edit->glist, "contracted",
_contracted_cb, NULL);
+ evas_object_smart_callback_add(style_edit->glist, "unselected",
_on_unselected_cb, style_edit);
+ evas_object_show(style_edit->glist);
+ /*elm_genlist_tree_effect_enabled_set(style_edit->glist, EINA_TRUE);*/
+
+ styles = ap.project->styles;
+
+ EINA_LIST_FOREACH(styles, l_st, res)
+ {
+ glit_style = elm_genlist_item_append(style_edit->glist, _itc_style,
+ res->name, NULL,
ELM_GENLIST_ITEM_TREE,
+ _on_glit_selected, style_edit);
+ elm_object_item_data_set(glit_style, (char *)res->name);
+ }
+
+ style_edit->menu = elm_menu_add(ap.win);
+ elm_menu_item_add(style_edit->menu, NULL, NULL, _("Style"),
_on_bt_style_add, style_edit);
+ style_edit->menu_tag = elm_menu_item_add(style_edit->menu, NULL, NULL,
_("Tag"), _on_bt_tag_add, style_edit);
+
+ button_add = elm_button_add(ap.win);
+ elm_object_style_set(button_add, "anchor");
+ evas_object_show(button_add);
+ ic = elm_icon_add(button_add);
+ elm_icon_standard_set(ic, "plus");
+ elm_object_part_content_set(button_add, NULL, ic);
+ evas_object_smart_callback_add(button_add, "clicked", _on_bt_add,
style_edit);
+ elm_object_part_content_set(main_layout, "elm.swallow.btn_add", button_add);
+
+ style_edit->button_del = elm_button_add(ap.win);
+ elm_object_style_set(style_edit->button_del, "anchor");
+ evas_object_show(style_edit->button_del);
+ ic = elm_icon_add(style_edit->button_del);
+ elm_icon_standard_set(ic, "minus");
+ elm_object_part_content_set(style_edit->button_del, NULL, ic);
+ evas_object_smart_callback_add(style_edit->button_del, "clicked",
_on_bt_del, style_edit);
+ elm_object_part_content_set(main_layout, "elm.swallow.btn_del",
style_edit->button_del);
+ elm_object_disabled_set(style_edit->button_del, true);
box_bg = _add_box_bg(style_edit);
- elm_object_part_content_set(main_layout, "menu_container", box_bg);
+ elm_object_part_content_set(main_layout, "elm.swallow.menu", box_bg);
evas_textblock_style_free(ts);
- evas_object_event_callback_add(main_layout, EVAS_CALLBACK_DEL,
- _on_style_manager_close, style_edit);
+ evas_object_event_callback_add(main_layout, EVAS_CALLBACK_DEL,
_on_style_manager_close, style_edit);
evas_object_smart_callback_call(ap.win, SIGNAL_STYLE_SELECTED, NULL);
return main_layout;
--
