Enlightenment CVS committal
Author : kiwi
Project : e_modules
Module : devian
Dir : e_modules/devian/src/module
Modified Files:
e_mod_config_dialog_devian.c e_mod_data_file.c
e_mod_source_file.c
Log Message:
Config panel work, animation goes to advanced.
Some work one source file, not usable yet
===================================================================
RCS file: /cvs/e/e_modules/devian/src/module/e_mod_config_dialog_devian.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config_dialog_devian.c 5 Apr 2006 17:48:48 -0000 1.2
+++ e_mod_config_dialog_devian.c 6 Apr 2006 22:40:08 -0000 1.3
@@ -31,8 +31,8 @@
#endif
/*- BASIC -*/
int container_box_size;
- int container_box_animation;
int container_box_infos_show;
+ int container_box_infos_pos;
int container_box_allow_overlap;
int container_box_alpha;
#ifdef HAVE_RSS
@@ -51,7 +51,7 @@
/*- ADVANCED -*/
int container_box_speed;
int container_box_auto_resize;
- int container_box_infos_pos;
+ int container_box_animation;
#ifdef HAVE_PICTURE
int source_picture_timer;
int source_picture_timer_yn;
@@ -287,15 +287,15 @@
cfdata->c_box->max_size = devian->conf->box_max_size_source +
cfdata->c_box->theme_border_h;
DEVIANF(container_box_resize_auto) (devian);
}
- if (devian->conf->box_anim != cfdata->container_box_animation)
- {
- devian->conf->box_anim = cfdata->container_box_animation;
- DEVIANF(container_box_animation_start) (devian->container,
devian->conf->box_anim);
- }
if (devian->conf->box_infos_show != cfdata->container_box_infos_show)
{
DEVIANF(container_box_infos_text_change_set) (devian->container,
cfdata->container_box_infos_show);
}
+ if (devian->conf->box_infos_pos != cfdata->container_box_infos_pos)
+ {
+ devian->conf->box_infos_pos = cfdata->container_box_infos_pos;
+ DEVIANF(container_box_infos_pos_set) (devian->container);
+ }
if (devian->conf->box_allow_overlap !=
cfdata->container_box_allow_overlap)
{
devian->conf->box_allow_overlap =
cfdata->container_box_allow_overlap;
@@ -351,20 +351,17 @@
{
if (devian->conf->box_max_size_source != cfdata->container_box_size)
{
- DCONTAINER(("CALLING MAX SIZE"));
devian->conf->box_max_size_source = cfdata->container_box_size;
cfdata->c_box->max_size = devian->conf->box_max_size_source +
cfdata->c_box->theme_border_h;
DEVIANF(container_box_resize_auto) (devian);
}
if (devian->conf->box_auto_resize != cfdata->container_box_auto_resize)
{
- DCONTAINER(("CALLING RESIZE AUTO"));
devian->conf->box_auto_resize = cfdata->container_box_auto_resize;
DEVIANF(container_box_resize_auto) (devian);
}
if (devian->conf->box_anim != cfdata->container_box_animation)
{
- DCONTAINER(("CALLING ANIM START"));
devian->conf->box_anim = cfdata->container_box_animation;
DEVIANF(container_box_animation_start) (devian->container,
devian->conf->box_anim);
}
@@ -477,19 +474,13 @@
e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10.0, 255.0, 1.0, 0,
NULL, &(cfdata->container_box_alpha), 100);
e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 0, 1, 0);
- ob = e_widget_label_add(evas, _("Animation"));
- e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
- rg = e_widget_radio_group_new(&(cfdata->container_box_animation));
- ob = e_widget_radio_add(evas, _("None"), CONTAINER_BOX_ANIM_NO, rg);
- e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Line"), CONTAINER_BOX_ANIM_LINE, rg);
- e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Gouloum"),
CONTAINER_BOX_ANIM_GOULOUM, rg);
- e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Ghost"), CONTAINER_BOX_ANIM_GHOST,
rg);
- e_widget_frametable_object_append(of, ob, 1, 5, 1, 1, 1, 1, 1, 1);
ob = e_widget_check_add(evas, _("Show information panel"),
&(cfdata->container_box_infos_show));
- e_widget_frametable_object_append(of, ob, 0, 6, 2, 1, 1, 1, 1, 1);
+ e_widget_frametable_object_append(of, ob, 0, 3, 2, 1, 1, 1, 1, 10);
+ ob = e_widget_label_add(evas, _("Information panel position"));
+ e_widget_frametable_object_append(of, ob, 0, 4, 2, 1, 1, 1, 1, 1);
+ ob = e_widget_slider_add(evas, 1, 0, _("Position no%1.0f"), 1.0, 4.0,
1.0, 0,
+ NULL, &(cfdata->container_box_infos_pos),
100);
+ e_widget_frametable_object_append(of, ob, 0, 5, 2, 1, 1, 0, 1, 0);
e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1);
}
@@ -583,25 +574,25 @@
e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10.0, 255.0, 1.0, 0,
NULL, &(cfdata->container_box_alpha), 100);
e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 0, 1, 0);
- ob = e_widget_label_add(evas, _("Animation"));
- e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_check_add(evas, _("Box auto resize"),
&(cfdata->container_box_auto_resize));
+ e_widget_frametable_object_append(of, ob, 0, 3, 2, 1, 1, 1, 1, 1);
+ ob = e_widget_label_add(evas, _("Box Animation"));
+ e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 10);
rg = e_widget_radio_group_new(&(cfdata->container_box_animation));
ob = e_widget_radio_add(evas, _("None"), CONTAINER_BOX_ANIM_NO, rg);
- e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Line"), CONTAINER_BOX_ANIM_LINE, rg);
- e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Gouloum"),
CONTAINER_BOX_ANIM_GOULOUM, rg);
e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Ghost"), CONTAINER_BOX_ANIM_GHOST,
rg);
+ ob = e_widget_radio_add(evas, _("Line"), CONTAINER_BOX_ANIM_LINE, rg);
e_widget_frametable_object_append(of, ob, 1, 5, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Speed"));
+ ob = e_widget_radio_add(evas, _("Gouloum"),
CONTAINER_BOX_ANIM_GOULOUM, rg);
e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_add(evas, _("Ghost"), CONTAINER_BOX_ANIM_GHOST,
rg);
+ e_widget_frametable_object_append(of, ob, 1, 6, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_label_add(evas, _("Animation Speed"));
+ e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 1, 1, 1);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 1.0, 3.0, 1.0, 0,
NULL, &(cfdata->container_box_speed), 100);
- e_widget_frametable_object_append(of, ob, 1, 6, 1, 1, 1, 0, 1, 0);
- ob = e_widget_check_add(evas, _("Box auto resize"),
&(cfdata->container_box_auto_resize));
- e_widget_frametable_object_append(of, ob, 0, 7, 2, 1, 1, 1, 1, 1);
+ e_widget_frametable_object_append(of, ob, 1, 7, 1, 1, 1, 0, 1, 0);
ob = e_widget_check_add(evas, _("Show information panel"),
&(cfdata->container_box_infos_show));
- e_widget_frametable_object_append(of, ob, 0, 8, 2, 1, 1, 1, 1, 1);
+ e_widget_frametable_object_append(of, ob, 0, 8, 2, 1, 1, 1, 1, 10);
ob = e_widget_label_add(evas, _("Information panel position"));
e_widget_frametable_object_append(of, ob, 0, 9, 2, 1, 1, 1, 1, 1);
ob = e_widget_slider_add(evas, 1, 0, _("Position no%1.0f"), 1.0, 4.0,
1.0, 0,
===================================================================
RCS file: /cvs/e/e_modules/devian/src/module/e_mod_data_file.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_data_file.c 5 Apr 2006 17:48:48 -0000 1.2
+++ e_mod_data_file.c 6 Apr 2006 22:40:08 -0000 1.3
@@ -4,7 +4,7 @@
static Evas_Object *_create_tb(FILE *fd);
-static Ecore_List *_get_lines(char *buffer, int *size);
+static Ecore_List *_get_lines(char **buffer, int *size);
static int _get_file_first(Source_File *source);
static int _get_file_update(Source_File *source);
static int _set_text_tb(Source_File *source);
@@ -138,7 +138,7 @@
* @return The ecore list of carrier's returns positions
*/
static Ecore_List *
-_get_lines(char *buffer, int *size)
+_get_lines(char **buffer, int *size)
{
Ecore_List *lines;
int size_left;
@@ -147,10 +147,10 @@
lines = ecore_list_new();
ecore_list_set_free_cb(lines, _cb_destroy_retlines);
- p1 = buffer;
+ p1 = *buffer;
size_left = *size;
- while (p1 < (buffer + *size))
+ while (p1 < (*buffer + *size))
{
if (*p1 == 0xd)
*p1 = ' ';
@@ -159,14 +159,14 @@
p1++;
};
- p1 = buffer;
+ p1 = *buffer;
while ((p2 = memchr(p1, '\n', size_left)))
{
/* Replace by <br> */
*size = *size + 3;
- realloc(buffer, *size);
+ *buffer = realloc(*buffer, *size);
memmove(p2 + 3, p2, strlen(p2) + 1);
*p2 = '<';
*(p2 + 1) = 'b';
@@ -176,7 +176,7 @@
/* Add the position to the list */
pos = E_NEW(int, 1);
- *pos = p2 - buffer;
+ *pos = p2 - *buffer;
ecore_list_append(lines, pos);
/*
* p1 = p2+1;
@@ -186,6 +186,8 @@
p1 = p2 + 4;
size_left = *size - (*pos + 4);
+ if (size_left > 0)
+ break;
};
return lines;
@@ -249,7 +251,7 @@
E_FREE(block->buf); //....CHANGE delete block
return 0;
}
- block->retlines = _get_lines(block->buf, &block->size);
+ block->retlines = _get_lines(&block->buf, &block->size);
DDATAFILE(("read_first (%d lines, block_size %d, offset %d):\n%s",
ecore_list_nodes(block->retlines), block_size,
ftell(source->fd), block->buf));
@@ -305,7 +307,7 @@
memcpy(block->buf, buffer, block_size);
block->size = block_size;
- block->retlines = _get_lines(block->buf, &block->size);
+ block->retlines = _get_lines(&block->buf, &block->size);
source->lines_tot += ecore_list_nodes(block->retlines);
source->new_blocks++;
===================================================================
RCS file: /cvs/e/e_modules/devian/src/module/e_mod_source_file.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_source_file.c 5 Apr 2006 17:48:48 -0000 1.2
+++ e_mod_source_file.c 6 Apr 2006 22:40:08 -0000 1.3
@@ -13,7 +13,7 @@
{
Source_File *source;
- return 0;
+ return 0; /* SOURCE_FILE IS NOT STABLE YET */
DSOURCE(("Source file creation START"));
-------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
