rename deskpreview -> bgpreview

9 files changed, 28 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 279bff5f9..d187fcd26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-19 Mike Blumenkrantz
+
+        * deskpreview renamed to bgpreview
+
 2013-04-18 Mike Blumenkrantz
 
         * startup splash screen moved to compositor canvas
diff --git a/NEWS b/NEWS
index f055c17cb..18faa7fa4 100644
--- a/NEWS
+++ b/NEWS
@@ -60,6 +60,7 @@ Changes:
         * e_shelf_desk_visible_get now takes const params
         * e_util_size_debug_set now also prints for object show/hide events
         * E_FN_DEL renamed to E_FREE_FUNC for consistency
+        * deskpreview renamed to bgpreview
     Config:
         * move winlist_warp_speed option to pointer_warp_speed
         * bindings now use new E_Binding_Event structs for mouse events
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index f9f754a5d..0987d8963 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -175,7 +175,7 @@ e_widget_color_well.h \
 e_widget_config_list.h \
 e_widget_csel.h \
 e_widget_cslider.h \
-e_widget_deskpreview.h \
+e_widget_bgpreview.h \
 e_widget_entry.h \
 e_widget_filepreview.h \
 e_widget_flist.h \
@@ -341,7 +341,7 @@ e_widget_color_well.c \
 e_widget_config_list.c \
 e_widget_csel.c \
 e_widget_cslider.c \
-e_widget_deskpreview.c \
+e_widget_bgpreview.c \
 e_widget_entry.c \
 e_widget_filepreview.c \
 e_widget_flist.c \
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 70b5ceb25..809caa7c0 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -119,7 +119,7 @@
 #include "e_obj_dialog.h"
 #include "e_filereg.h"
 #include "e_widget_aspect.h"
-#include "e_widget_deskpreview.h"
+#include "e_widget_bgpreview.h"
 #include "e_fm_prop.h"
 #include "e_mouse.h"
 #include "e_order.h"
diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c
index 6a7c8e502..a8faaa6e2 100644
--- a/src/bin/e_int_border_menu.c
+++ b/src/bin/e_int_border_menu.c
@@ -935,8 +935,8 @@ _e_border_menu_cb_sendto_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
              e_menu_item_disabled_set(submi, EINA_TRUE);
           }
 
-// FIXME: Remove labels and add deskpreview to menu.
-// Evas_Object *o = e_widget_deskpreview_add(m->evas, 4, 2);
+// FIXME: Remove labels and add bgpreview to menu.
+// Evas_Object *o = e_widget_bgpreview_add(m->evas, 4, 2);
 
         for (i = 0; i < zone->desk_x_count * zone->desk_y_count; i++)
           {
diff --git a/src/bin/e_widget_deskpreview.c b/src/bin/e_widget_bgpreview.c
index 6910f4e76..10a9440d3 100644
--- a/src/bin/e_widget_deskpreview.c
+++ b/src/bin/e_widget_bgpreview.c
@@ -25,7 +25,7 @@ static void      _e_wid_cb_resize(void *data, Evas *evas, Evas_Object *obj, void
 static Eina_Bool _e_wid_cb_bg_update(void *data, int type, void *event);
 
 EAPI Evas_Object *
-e_widget_deskpreview_add(Evas *evas, int nx, int ny)
+e_widget_bgpreview_add(Evas *evas, int nx, int ny)
 {
    Evas_Object *obj;
    E_Widget_Data *wd;
@@ -45,7 +45,7 @@ e_widget_deskpreview_add(Evas *evas, int nx, int ny)
    evas_object_show(wd->table);
    e_widget_sub_object_add(wd->obj, wd->table);
 
-   e_widget_deskpreview_num_desks_set(obj, wd->dx, wd->dy);
+   e_widget_bgpreview_num_desks_set(obj, wd->dx, wd->dy);
 
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE,
                                   _e_wid_cb_resize, NULL);
@@ -53,7 +53,7 @@ e_widget_deskpreview_add(Evas *evas, int nx, int ny)
 }
 
 EAPI void
-e_widget_deskpreview_num_desks_set(Evas_Object *obj, int nx, int ny)
+e_widget_bgpreview_num_desks_set(Evas_Object *obj, int nx, int ny)
 {
    E_Widget_Data *wd;
 
@@ -64,7 +64,7 @@ e_widget_deskpreview_num_desks_set(Evas_Object *obj, int nx, int ny)
 }
 
 EAPI Evas_Object *
-e_widget_deskpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int w, int h)
+e_widget_bgpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int w, int h)
 {
    E_Widget_Desk_Data *dd;
    const char *bgfile;
@@ -79,7 +79,7 @@ e_widget_deskpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int
 
    dd->icon = edje_object_add(evas_object_evas_get(obj));
    e_theme_edje_object_set(dd->icon, "base/theme/widgets",
-                           "e/widgets/deskpreview/desk");
+                           "e/widgets/bgpreview/desk");
 
    dd->thumb = e_icon_add(evas_object_evas_get(obj));
    e_icon_fill_inside_set(dd->thumb, EINA_FALSE);
@@ -103,7 +103,7 @@ e_widget_deskpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int
 }
 
 EAPI void
-e_widget_deskpreview_desk_configurable_set(Evas_Object *obj, Eina_Bool enable)
+e_widget_bgpreview_desk_configurable_set(Evas_Object *obj, Eina_Bool enable)
 {
    E_Widget_Desk_Data *dd;
 
@@ -207,7 +207,7 @@ _e_wid_reconfigure(E_Widget_Data *wd)
           {
              Evas_Object *dp;
 
-             dp = e_widget_deskpreview_desk_add(wd->obj, zone, x, y, mw, mh);
+             dp = e_widget_bgpreview_desk_add(wd->obj, zone, x, y, mw, mh);
              evas_object_size_hint_aspect_set(dp, EVAS_ASPECT_CONTROL_BOTH, zone->w, zone->h);
              evas_object_table_pack(wd->table, dp, x, y, 1, 1);
              wd->desks = eina_list_append(wd->desks, dp);
diff --git a/src/bin/e_widget_bgpreview.h b/src/bin/e_widget_bgpreview.h
new file mode 100644
index 000000000..bddeef090
--- /dev/null
+++ b/src/bin/e_widget_bgpreview.h
@@ -0,0 +1,9 @@
+#ifndef E_WIDGET_DESK_PREVIEW_H
+#define E_WIDGET_DESK_PREVIEW_H
+
+EAPI Evas_Object *e_widget_bgpreview_add(Evas *evas, int nx, int ny);
+EAPI void e_widget_bgpreview_num_desks_set(Evas_Object *obj, int nx, int ny);
+EAPI Evas_Object *e_widget_bgpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int w, int h);
+EAPI void e_widget_bgpreview_desk_configurable_set(Evas_Object *obj, Eina_Bool enable);
+
+#endif
diff --git a/src/bin/e_widget_deskpreview.h b/src/bin/e_widget_deskpreview.h
deleted file mode 100644
index 1858638eb..000000000
--- a/src/bin/e_widget_deskpreview.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef E_WIDGET_DESK_PREVIEW_H
-#define E_WIDGET_DESK_PREVIEW_H
-
-EAPI Evas_Object *e_widget_deskpreview_add(Evas *evas, int nx, int ny);
-EAPI void e_widget_deskpreview_num_desks_set(Evas_Object *obj, int nx, int ny);
-EAPI Evas_Object *e_widget_deskpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int w, int h);
-EAPI void e_widget_deskpreview_desk_configurable_set(Evas_Object *obj, Eina_Bool enable);
-
-#endif
diff --git a/src/modules/conf_display/e_int_config_desks.c b/src/modules/conf_display/e_int_config_desks.c
index abbd0158a..a0e4bb668 100644
--- a/src/modules/conf_display/e_int_config_desks.c
+++ b/src/modules/conf_display/e_int_config_desks.c
@@ -201,7 +201,7 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial
    ob = e_widget_label_add(evas, _("Click to change wallpaper"));
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
 
-   ob = e_widget_deskpreview_add(evas, cfdata->x, cfdata->y);
+   ob = e_widget_bgpreview_add(evas, cfdata->x, cfdata->y);
    e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
    cfdata->preview = ob;
 
@@ -267,5 +267,5 @@ _cb_slider_change(void *data, Evas_Object *obj __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata = data;
 
-   e_widget_deskpreview_num_desks_set(cfdata->preview, cfdata->x, cfdata->y);
+   e_widget_bgpreview_num_desks_set(cfdata->preview, cfdata->x, cfdata->y);
 }