Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entice
Dir : e17/apps/entice/src/bin
Modified Files:
entice.c entice.h main.c signals_thumb.c
Log Message:
misc cleanups
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- entice.c 21 Oct 2004 22:33:50 -0000 1.64
+++ entice.c 17 Feb 2005 03:27:24 -0000 1.65
@@ -104,9 +104,10 @@
* ecore_evas
* @ee - the ecore_evas we want to add entice to
*/
-void
+int
entice_init(Ecore_Evas * ee)
{
+ int result = 0;
int button = 1;
int x, y, w, h;
Entice *e = NULL;
@@ -125,8 +126,10 @@
o = edje_object_add(ecore_evas_get(ee));
if (!edje_object_file_set(o, entice_config_theme_get(), "entice"))
{
+ fprintf(stderr, "ERROR: Broken theme detected\n");
+ fprintf(stderr, "Unable to find default \"entice\" group\n");
evas_object_del(o);
- return;
+ return (result);
}
e->exiftags = entice_exif_edje_init(o);
@@ -159,24 +162,25 @@
e->current = evas_object_image_add(ecore_evas_get(ee));
e->preview = evas_object_image_add(ecore_evas_get(ee));
- /* initialize container */
- e->container = esmart_container_new(ecore_evas_get(ee));
- esmart_container_padding_set(e->container, 4, 4, 4, 4);
- esmart_container_spacing_set(e->container, 4);
- esmart_container_move_button_set(e->container, 2);
- if ((layout =
- edje_file_data_get(entice_config_theme_get(), "container_layout")))
- {
- esmart_container_layout_plugin_set(e->container, layout);
- free(layout);
- }
- else
- esmart_container_layout_plugin_set(e->container, "default");
- evas_object_layer_set(e->container, 0);
- evas_object_color_set(e->container, 255, 255, 255, 255);
-
if (edje_object_part_exists(e->edje, "entice.thumbnail.area"))
{
+ /* initialize container */
+ e->container = esmart_container_new(ecore_evas_get(ee));
+ esmart_container_padding_set(e->container, 4, 4, 4, 4);
+ esmart_container_spacing_set(e->container, 4);
+ esmart_container_move_button_set(e->container, 2);
+ if ((layout =
+ edje_file_data_get(entice_config_theme_get(),
+ "container_layout")))
+ {
+ esmart_container_layout_plugin_set(e->container, layout);
+ free(layout);
+ }
+ else
+ esmart_container_layout_plugin_set(e->container, "default");
+ evas_object_layer_set(e->container, 0);
+ evas_object_color_set(e->container, 255, 255, 255, 255);
+
edje_object_part_geometry_get(e->edje, "entice.thumbnail.area", NULL,
NULL, &ew, &eh);
@@ -247,6 +251,7 @@
}
}
entice = e;
+ return (1);
}
/**
@@ -391,18 +396,19 @@
entice_image_format_set(new_current, esmart_thumb_format_get(o));
entice_image_save_quality_set(new_current,
entice_config_image_quality_get());
-
- new_scroller =
- esmart_thumb_new(evas_object_evas_get(o),
- esmart_thumb_file_get(o));
edje_object_part_geometry_get(entice->edje, "entice.image", NULL,
NULL, &w, &h);
evas_object_resize(new_current, w, h);
evas_object_layer_set(new_current, evas_object_layer_get(o));
evas_object_show(new_current);
+ new_scroller =
+ esmart_thumb_new(evas_object_evas_get(o),
+ esmart_thumb_file_get(o));
+
edje_object_part_geometry_get(entice->edje, "entice.scroller", NULL,
NULL, &w, &h);
+ evas_object_move(new_scroller, -9999, -9999);
evas_object_resize(new_scroller, w, h);
evas_object_layer_set(new_scroller, evas_object_layer_get(o));
evas_object_show(new_scroller);
@@ -511,6 +517,7 @@
{
evas_object_layer_set(o,
evas_object_layer_get(entice->container));
+ evas_object_move(o, -9999, -9999);
entice->thumb.list = evas_list_append(entice->thumb.list, o);
evas_object_show(o);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- entice.h 18 Oct 2004 01:38:44 -0000 1.18
+++ entice.h 17 Feb 2005 03:27:24 -0000 1.19
@@ -35,7 +35,7 @@
typedef struct _Entice Entice;
-void entice_init(Ecore_Evas * ee);
+int entice_init(Ecore_Evas * ee);
void entice_free(void);
void entice_resize(int w, int h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/main.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- main.c 28 Aug 2004 02:37:50 -0000 1.33
+++ main.c 17 Feb 2005 03:27:24 -0000 1.34
@@ -254,17 +254,19 @@
evas_font_path_append(ecore_evas_get(ee),
PACKAGE_DATA_DIR "/fonts");
- entice_init(ee);
- ecore_evas_move_resize(ee, x, y, w, h);
- ecore_evas_show(ee);
- if (pnum >= 0)
+
+ if (entice_init(ee))
{
- write(pnum, "ok", 2);
- close(pnum);
- pnum = -1;
+ ecore_evas_move_resize(ee, x, y, w, h);
+ ecore_evas_show(ee);
+ if (pnum >= 0)
+ {
+ write(pnum, "ok", 2);
+ close(pnum);
+ pnum = -1;
+ }
+ ecore_main_loop_begin();
}
- ecore_main_loop_begin();
-
entice_free();
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/signals_thumb.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- signals_thumb.c 19 Nov 2004 03:19:58 -0000 1.9
+++ signals_thumb.c 17 Feb 2005 03:27:24 -0000 1.10
@@ -54,6 +54,6 @@
count = sizeof(signals) / sizeof(char *);
for (i = 0; i < count; i++)
edje_object_signal_callback_add(o, signals[i], "", funcs[i], im);
- if((image = esmart_thumb_evas_object_image_get(im)))
- evas_object_pass_events_set(image, 1);
+ if ((image = esmart_thumb_evas_object_image_get(im)))
+ evas_object_pass_events_set(image, 1);
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
