Enlightenment CVS committal
Author : mej
Project : e_modules
Module : slideshow
Dir : e_modules/slideshow
Modified Files:
e_mod_config.c e_mod_main.c
Log Message:
Wed Apr 5 13:48:36 2006 Michael Jennings (mej)
Indent!
----------------------------------------------------------------------
===================================================================
RCS file: /cvs/e/e_modules/slideshow/e_mod_config.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_mod_config.c 28 Mar 2006 18:31:24 -0000 1.20
+++ e_mod_config.c 5 Apr 2006 17:48:49 -0000 1.21
@@ -15,10 +15,8 @@
/* Protos */
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
- E_Config_Dialog_Data *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd,
- E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
/* Config Calls */
void
@@ -58,6 +56,7 @@
s = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
+
_fill_data(s, cfdata);
return cfdata;
}
@@ -74,8 +73,7 @@
}
static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
- E_Config_Dialog_Data *cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
Evas_Object *o, *ob, *of;
@@ -83,8 +81,7 @@
of = e_widget_framelist_add(evas, D_("Cycle Time"), 0);
ob = e_widget_check_add(evas, D_("Disable Timer"),
&(cfdata->disable_timer));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, D_("%3.0f seconds"), 5.0, 600.0, 1.0,
0,
- &(cfdata->cycle_time), NULL, 200);
+ ob = e_widget_slider_add(evas, 1, 0, D_("%3.0f seconds"), 5.0, 600.0, 1.0,
0, &(cfdata->cycle_time), NULL, 200);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
@@ -115,9 +112,9 @@
s->conf->disable_timer = cfdata->disable_timer;
#ifdef WANT_OSIRIS
if (cfdata->theme != NULL)
- s->conf->theme = (char *)evas_stringshare_add(cfdata->theme);
+ s->conf->theme = (char *)evas_stringshare_add(cfdata->theme);
else
- s->conf->theme = (char *)evas_stringshare_add("");
+ s->conf->theme = (char *)evas_stringshare_add("");
#endif
e_config_save_queue();
e_border_button_bindings_grab_all();
===================================================================
RCS file: /cvs/e/e_modules/slideshow/e_mod_main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_mod_main.c 20 Feb 2006 18:27:53 -0000 1.17
+++ e_mod_main.c 5 Apr 2006 17:48:49 -0000 1.18
@@ -22,13 +22,10 @@
static void _slide_face_enable(Slide_Face *face);
static void _slide_face_disable(Slide_Face *face);
static void _slide_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _slide_face_cb_menu_configure(void *data, E_Menu *m,
- E_Menu_Item *mi);
+static void _slide_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item
*mi);
-static void _slide_face_cb_mouse_down(void *data, Evas *e,
- Evas_Object *obj, void *event_info);
-static void _slide_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
- E_Gadman_Change change);
+static void _slide_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
void *event_info);
+static void _slide_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
E_Gadman_Change change);
static int _slide_cb_check(void *data);
@@ -226,8 +223,8 @@
if (ef)
{
- ef->conf_face_edd =
- E_CONFIG_DD_NEW("Slide_Config_Face", Config_Face);
+ ef->conf_face_edd = E_CONFIG_DD_NEW("Slide_Config_Face",
Config_Face);
+
#undef T
#undef D
#define T Config_Face
@@ -253,8 +250,7 @@
/* Add main menu to face menu */
mi = e_menu_item_new(e->config_menu);
e_menu_item_label_set(mi, _("Configuration"));
- e_menu_item_callback_set(mi, _slide_face_cb_menu_configure,
- ef);
+ e_menu_item_callback_set(mi, _slide_face_cb_menu_configure,
ef);
mi = e_menu_item_new(e->config_menu);
e_menu_item_label_set(mi, con->name);
@@ -316,8 +312,7 @@
sf->slide_object = o;
snprintf(buff, sizeof(buff), PACKAGE_DATA_DIR "/slideshow.edj");
- if (!e_theme_edje_object_set
- (o, "base/theme/modules/slideshow", "modules/slideshow/main"))
+ if (!e_theme_edje_object_set(o, "base/theme/modules/slideshow",
"modules/slideshow/main"))
edje_object_file_set(o, buff, "modules/slideshow/main");
evas_object_show(o);
@@ -326,16 +321,14 @@
evas_object_layer_set(o, 2);
evas_object_repeat_events_set(o, 1);
evas_object_color_set(o, 0, 0, 0, 0);
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
- _slide_face_cb_mouse_down, sf);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_slide_face_cb_mouse_down, sf);
evas_object_show(o);
sf->gmc = e_gadman_client_new(sf->con->gadman);
e_gadman_client_domain_set(sf->gmc, "module.slideshow", slide_count++);
e_gadman_client_policy_set(sf->gmc,
E_GADMAN_POLICY_ANYWHERE | E_GADMAN_POLICY_HMOVE
|
- E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_HSIZE |
- E_GADMAN_POLICY_VSIZE);
+ E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_HSIZE |
E_GADMAN_POLICY_VSIZE);
e_gadman_client_min_size_set(sf->gmc, 4, 4);
e_gadman_client_max_size_set(sf->gmc, 128, 128);
e_gadman_client_auto_size_set(sf->gmc, 40, 40);
@@ -378,12 +371,12 @@
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Configuration"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
e_menu_item_callback_set(mi, _slide_face_cb_menu_configure, face);
/* Edit */
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Edit Mode"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets");
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets");
e_menu_item_callback_set(mi, _slide_face_cb_menu_edit, face);
}
@@ -400,29 +393,24 @@
{
if (face->slide->conf->cycle_time != 0)
{
- ecore_timer_interval_set(face->slide->cycle_timer,
- face->slide->conf->cycle_time);
+ ecore_timer_interval_set(face->slide->cycle_timer,
face->slide->conf->cycle_time);
}
else
{
- face->slide->cycle_timer =
- ecore_timer_del(face->slide->cycle_timer);
+ face->slide->cycle_timer =
ecore_timer_del(face->slide->cycle_timer);
face->slide->cycle_timer = NULL;
}
}
else
{
- face->slide->cycle_timer =
- ecore_timer_add(face->slide->conf->cycle_time, _slide_cb_check,
- face);
+ face->slide->cycle_timer =
ecore_timer_add(face->slide->conf->cycle_time, _slide_cb_check, face);
}
}
else
{
if (face->slide->cycle_timer)
{
- face->slide->cycle_timer =
- ecore_timer_del(face->slide->cycle_timer);
+ face->slide->cycle_timer =
ecore_timer_del(face->slide->cycle_timer);
face->slide->cycle_timer = NULL;
}
}
@@ -443,8 +431,7 @@
}
static void
-_slide_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
- E_Gadman_Change change)
+_slide_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change
change)
{
Slide_Face *ef;
Evas_Coord x, y, w, h;
@@ -471,8 +458,7 @@
}
static void
-_slide_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
- void *event_info)
+_slide_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
{
Evas_Event_Mouse_Down *ev;
Slide_Face *ef;
@@ -487,8 +473,7 @@
E_Zone *zone;
zone = e_zone_current_get(ef->con);
- e_menu_activate_mouse(ef->menu, zone, ev->output.x, ev->output.y, 1, 1,
- E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+ e_menu_activate_mouse(ef->menu, zone, ev->output.x, ev->output.y, 1,
1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
e_util_container_fake_mouse_up_all_later(ef->con);
}
else if (ev->button == 2)
@@ -502,8 +487,7 @@
}
else
{
- es->cycle_timer =
- ecore_timer_add(es->conf->cycle_time, _slide_cb_check, ef);
+ es->cycle_timer = ecore_timer_add(es->conf->cycle_time,
_slide_cb_check, ef);
}
}
else if (ev->button == 1)
@@ -609,8 +593,7 @@
}
else
{
- snprintf(buffer, sizeof(buffer), "%s/.e/e/backgrounds/%s/%s", home,
- e->conf->theme, bg);
+ snprintf(buffer, sizeof(buffer), "%s/.e/e/backgrounds/%s/%s", home,
e->conf->theme, bg);
}
#else
snprintf(buffer, sizeof(buffer), "%s/.e/e/backgrounds/%s", home, bg);
@@ -663,8 +646,7 @@
}
else
{
- s->cycle_timer =
- ecore_timer_add(s->conf->cycle_time, _slide_cb_check, s->face);
+ s->cycle_timer = ecore_timer_add(s->conf->cycle_time,
_slide_cb_check, s->face);
}
}
}
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs