Better definition between e/toolbar and e/widgets/toolbar. Its now e/fileman/toolbar as it is fileman specific, where as the other is a widget. THEME MAKERS: You will need to update to accomodate this change. I think the e_toolbar.c should probably be renamed too...

SVN revision: 47678
This commit is contained in:
toma 2010-04-02 04:30:09 +00:00 committed by toma
parent fc578352d0
commit 58703dc534
5 changed files with 9 additions and 11 deletions

View File

@ -1,6 +1,4 @@
// TODO:
// Sort out toolbar_*.png name structures
// Rename e/toolbar or e/widget/toolbar
// Formatting cleanup :~(
// Icons:
@ -20143,23 +20141,23 @@ collections { /* begin the collection of edje groups that are in this file */
/////////////////////////////////////////////////////////////////////////////
/*** FILE MANAGER TOOLBAR ***/
group { name: "e/toolbar/default/base";
group { name: "e/fileman/toolbar/default/base";
images {
image: "toolbar_top.png" COMP;
image: "toolbar_bottom.png" COMP;
image: "efm_toolbar_top.png" COMP;
image: "efm_toolbar_bottom.png" COMP;
}
parts {
part { name: "base";
mouse_events: 0;
description { state: "default" 0.0;
max: 99999 48;
image.normal: "toolbar_top.png";
image.normal: "efm_toolbar_top.png";
image.border: 4 4 4 4;
fill.smooth: 0;
}
description { state: "bottom" 0.0;
inherit: "default" 0.0;
image.normal: "toolbar_bottom.png";
image.normal: "efm_toolbar_bottom.png";
}
}
part { name: "e.swallow.content";

View File

@ -90,6 +90,8 @@ dia_grad.png \
dia_topshad.png \
e17_fileman_thumb_bg.png \
e17_mini_button_shadow2.png \
efm_toolbar_bottom.png \
efm_toolbar_top.png \
everything_bar.png \
everything_border.png \
everything_box.png \
@ -389,9 +391,7 @@ tacho_fg.png \
temp_base.png \
temp_mid.png \
temp_over.png \
toolbar_bottom.png \
toolbar_sel.png \
toolbar_top.png \
topsh.png \
transition_vswipe.png \
vgrad_dark.png \

View File

Before

Width:  |  Height:  |  Size: 409 B

After

Width:  |  Height:  |  Size: 409 B

View File

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 194 B

View File

@ -84,8 +84,8 @@ e_toolbar_new(Evas *evas, const char *name, E_Win *fwin, Evas_Object *fm2)
tbar->o_base = edje_object_add(evas);
evas_object_resize(tbar->o_base, tbar->w, tbar->h);
e_theme_edje_object_set(tbar->o_base, "base/theme/toolbar",
"e/toolbar/default/base");
e_theme_edje_object_set(tbar->o_base, "base/theme/fileman/toolbar",
"e/fileman/toolbar/default/base");
e_toolbar_move_resize(tbar, tbar->x, tbar->y, tbar->w, tbar->h);