From 58703dc534de0a118ebca733e9fa0a050742218a Mon Sep 17 00:00:00 2001
From: toma <toma>
Date: Fri, 2 Apr 2010 04:30:09 +0000
Subject: [PATCH] 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
---
 data/themes/default.edc                             |  12 +++++-------
 data/themes/images/Makefile.am                      |   4 ++--
 .../{toolbar_bottom.png => efm_toolbar_bottom.png}  | Bin
 .../images/{toolbar_top.png => efm_toolbar_top.png} | Bin
 src/bin/e_toolbar.c                                 |   4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)
 rename data/themes/images/{toolbar_bottom.png => efm_toolbar_bottom.png} (100%)
 rename data/themes/images/{toolbar_top.png => efm_toolbar_top.png} (100%)

diff --git a/data/themes/default.edc b/data/themes/default.edc
index d5ae7dc04..e1c017547 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -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";
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index faf9681ac..45ca45332 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -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 \
diff --git a/data/themes/images/toolbar_bottom.png b/data/themes/images/efm_toolbar_bottom.png
similarity index 100%
rename from data/themes/images/toolbar_bottom.png
rename to data/themes/images/efm_toolbar_bottom.png
diff --git a/data/themes/images/toolbar_top.png b/data/themes/images/efm_toolbar_top.png
similarity index 100%
rename from data/themes/images/toolbar_top.png
rename to data/themes/images/efm_toolbar_top.png
diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c
index c1c456d7a..0af1fe5f6 100644
--- a/src/bin/e_toolbar.c
+++ b/src/bin/e_toolbar.c
@@ -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);