summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/bin/Makefile.am4
-rw-r--r--src/bin/e_includes.h2
-rw-r--r--src/bin/e_int_border_menu.c4
-rw-r--r--src/bin/e_widget_bgpreview.c (renamed from src/bin/e_widget_deskpreview.c)14
-rw-r--r--src/bin/e_widget_bgpreview.h9
-rw-r--r--src/bin/e_widget_deskpreview.h9
-rw-r--r--src/modules/conf_display/e_int_config_desks.c4
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 @@
12013-04-19 Mike Blumenkrantz
2
3 * deskpreview renamed to bgpreview
4
12013-04-18 Mike Blumenkrantz 52013-04-18 Mike Blumenkrantz
2 6
3 * startup splash screen moved to compositor canvas 7 * 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:
60 * e_shelf_desk_visible_get now takes const params 60 * e_shelf_desk_visible_get now takes const params
61 * e_util_size_debug_set now also prints for object show/hide events 61 * e_util_size_debug_set now also prints for object show/hide events
62 * E_FN_DEL renamed to E_FREE_FUNC for consistency 62 * E_FN_DEL renamed to E_FREE_FUNC for consistency
63 * deskpreview renamed to bgpreview
63 Config: 64 Config:
64 * move winlist_warp_speed option to pointer_warp_speed 65 * move winlist_warp_speed option to pointer_warp_speed
65 * bindings now use new E_Binding_Event structs for mouse events 66 * 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 \
175e_widget_config_list.h \ 175e_widget_config_list.h \
176e_widget_csel.h \ 176e_widget_csel.h \
177e_widget_cslider.h \ 177e_widget_cslider.h \
178e_widget_deskpreview.h \ 178e_widget_bgpreview.h \
179e_widget_entry.h \ 179e_widget_entry.h \
180e_widget_filepreview.h \ 180e_widget_filepreview.h \
181e_widget_flist.h \ 181e_widget_flist.h \
@@ -341,7 +341,7 @@ e_widget_color_well.c \
341e_widget_config_list.c \ 341e_widget_config_list.c \
342e_widget_csel.c \ 342e_widget_csel.c \
343e_widget_cslider.c \ 343e_widget_cslider.c \
344e_widget_deskpreview.c \ 344e_widget_bgpreview.c \
345e_widget_entry.c \ 345e_widget_entry.c \
346e_widget_filepreview.c \ 346e_widget_filepreview.c \
347e_widget_flist.c \ 347e_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 @@
119#include "e_obj_dialog.h" 119#include "e_obj_dialog.h"
120#include "e_filereg.h" 120#include "e_filereg.h"
121#include "e_widget_aspect.h" 121#include "e_widget_aspect.h"
122#include "e_widget_deskpreview.h" 122#include "e_widget_bgpreview.h"
123#include "e_fm_prop.h" 123#include "e_fm_prop.h"
124#include "e_mouse.h" 124#include "e_mouse.h"
125#include "e_order.h" 125#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)
935 e_menu_item_disabled_set(submi, EINA_TRUE); 935 e_menu_item_disabled_set(submi, EINA_TRUE);
936 } 936 }
937 937
938// FIXME: Remove labels and add deskpreview to menu. 938// FIXME: Remove labels and add bgpreview to menu.
939// Evas_Object *o = e_widget_deskpreview_add(m->evas, 4, 2); 939// Evas_Object *o = e_widget_bgpreview_add(m->evas, 4, 2);
940 940
941 for (i = 0; i < zone->desk_x_count * zone->desk_y_count; i++) 941 for (i = 0; i < zone->desk_x_count * zone->desk_y_count; i++)
942 { 942 {
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
25static Eina_Bool _e_wid_cb_bg_update(void *data, int type, void *event); 25static Eina_Bool _e_wid_cb_bg_update(void *data, int type, void *event);
26 26
27EAPI Evas_Object * 27EAPI Evas_Object *
28e_widget_deskpreview_add(Evas *evas, int nx, int ny) 28e_widget_bgpreview_add(Evas *evas, int nx, int ny)
29{ 29{
30 Evas_Object *obj; 30 Evas_Object *obj;
31 E_Widget_Data *wd; 31 E_Widget_Data *wd;
@@ -45,7 +45,7 @@ e_widget_deskpreview_add(Evas *evas, int nx, int ny)
45 evas_object_show(wd->table); 45 evas_object_show(wd->table);
46 e_widget_sub_object_add(wd->obj, wd->table); 46 e_widget_sub_object_add(wd->obj, wd->table);
47 47
48 e_widget_deskpreview_num_desks_set(obj, wd->dx, wd->dy); 48 e_widget_bgpreview_num_desks_set(obj, wd->dx, wd->dy);
49 49
50 evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, 50 evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE,
51 _e_wid_cb_resize, NULL); 51 _e_wid_cb_resize, NULL);
@@ -53,7 +53,7 @@ e_widget_deskpreview_add(Evas *evas, int nx, int ny)
53} 53}
54 54
55EAPI void 55EAPI void
56e_widget_deskpreview_num_desks_set(Evas_Object *obj, int nx, int ny) 56e_widget_bgpreview_num_desks_set(Evas_Object *obj, int nx, int ny)
57{ 57{
58 E_Widget_Data *wd; 58 E_Widget_Data *wd;
59 59
@@ -64,7 +64,7 @@ e_widget_deskpreview_num_desks_set(Evas_Object *obj, int nx, int ny)
64} 64}
65 65
66EAPI Evas_Object * 66EAPI Evas_Object *
67e_widget_deskpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int w, int h) 67e_widget_bgpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int w, int h)
68{ 68{
69 E_Widget_Desk_Data *dd; 69 E_Widget_Desk_Data *dd;
70 const char *bgfile; 70 const char *bgfile;
@@ -79,7 +79,7 @@ e_widget_deskpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int
79 79
80 dd->icon = edje_object_add(evas_object_evas_get(obj)); 80 dd->icon = edje_object_add(evas_object_evas_get(obj));
81 e_theme_edje_object_set(dd->icon, "base/theme/widgets", 81 e_theme_edje_object_set(dd->icon, "base/theme/widgets",
82 "e/widgets/deskpreview/desk"); 82 "e/widgets/bgpreview/desk");
83 83
84 dd->thumb = e_icon_add(evas_object_evas_get(obj)); 84 dd->thumb = e_icon_add(evas_object_evas_get(obj));
85 e_icon_fill_inside_set(dd->thumb, EINA_FALSE); 85 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
103} 103}
104 104
105EAPI void 105EAPI void
106e_widget_deskpreview_desk_configurable_set(Evas_Object *obj, Eina_Bool enable) 106e_widget_bgpreview_desk_configurable_set(Evas_Object *obj, Eina_Bool enable)
107{ 107{
108 E_Widget_Desk_Data *dd; 108 E_Widget_Desk_Data *dd;
109 109
@@ -207,7 +207,7 @@ _e_wid_reconfigure(E_Widget_Data *wd)
207 { 207 {
208 Evas_Object *dp; 208 Evas_Object *dp;
209 209
210 dp = e_widget_deskpreview_desk_add(wd->obj, zone, x, y, mw, mh); 210 dp = e_widget_bgpreview_desk_add(wd->obj, zone, x, y, mw, mh);
211 evas_object_size_hint_aspect_set(dp, EVAS_ASPECT_CONTROL_BOTH, zone->w, zone->h); 211 evas_object_size_hint_aspect_set(dp, EVAS_ASPECT_CONTROL_BOTH, zone->w, zone->h);
212 evas_object_table_pack(wd->table, dp, x, y, 1, 1); 212 evas_object_table_pack(wd->table, dp, x, y, 1, 1);
213 wd->desks = eina_list_append(wd->desks, dp); 213 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 @@
1#ifndef E_WIDGET_DESK_PREVIEW_H
2#define E_WIDGET_DESK_PREVIEW_H
3
4EAPI Evas_Object *e_widget_bgpreview_add(Evas *evas, int nx, int ny);
5EAPI void e_widget_bgpreview_num_desks_set(Evas_Object *obj, int nx, int ny);
6EAPI Evas_Object *e_widget_bgpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int w, int h);
7EAPI void e_widget_bgpreview_desk_configurable_set(Evas_Object *obj, Eina_Bool enable);
8
9#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 @@
1#ifndef E_WIDGET_DESK_PREVIEW_H
2#define E_WIDGET_DESK_PREVIEW_H
3
4EAPI Evas_Object *e_widget_deskpreview_add(Evas *evas, int nx, int ny);
5EAPI void e_widget_deskpreview_num_desks_set(Evas_Object *obj, int nx, int ny);
6EAPI Evas_Object *e_widget_deskpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int w, int h);
7EAPI void e_widget_deskpreview_desk_configurable_set(Evas_Object *obj, Eina_Bool enable);
8
9#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
201 ob = e_widget_label_add(evas, _("Click to change wallpaper")); 201 ob = e_widget_label_add(evas, _("Click to change wallpaper"));
202 e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); 202 e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
203 203
204 ob = e_widget_deskpreview_add(evas, cfdata->x, cfdata->y); 204 ob = e_widget_bgpreview_add(evas, cfdata->x, cfdata->y);
205 e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); 205 e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
206 cfdata->preview = ob; 206 cfdata->preview = ob;
207 207
@@ -267,5 +267,5 @@ _cb_slider_change(void *data, Evas_Object *obj __UNUSED__)
267{ 267{
268 E_Config_Dialog_Data *cfdata = data; 268 E_Config_Dialog_Data *cfdata = data;
269 269
270 e_widget_deskpreview_num_desks_set(cfdata->preview, cfdata->x, cfdata->y); 270 e_widget_bgpreview_num_desks_set(cfdata->preview, cfdata->x, cfdata->y);
271} 271}