Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/start
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
e packages build again - also not much point having an enlightenment-data as
it's built as an arch specific package and it is intrinsically required by e
and cannot work without it nor is the data shared betwene e and other apps
unless e itself is installed too
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/start/e_mod_main.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_mod_main.c 4 Apr 2006 15:42:25 -0000 1.21
+++ e_mod_main.c 20 Apr 2006 11:30:25 -0000 1.22
@@ -45,7 +45,6 @@
E_Gadcon_Client *gcc;
Instance *inst;
- printf("CREATE START GADCON %s %s\n", name, id);
inst = E_NEW(Instance, 1);
o = edje_object_add(gc->evas);
@@ -59,13 +58,10 @@
inst->o_button = o;
inst->main_menu = NULL;
+ e_gadcon_client_util_menu_attach(gcc);
+
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_button_cb_mouse_down, inst);
- /* FIXME: add callback to resize - and based off one dimension, request
- * another to be the same */
- e_gadcon_client_size_request(gcc, 32, 32);
- e_gadcon_client_min_size_set(gcc, 16, 16);
- e_gadcon_client_aspect_set(gcc, 1, 1);
return gcc;
}
@@ -75,6 +71,7 @@
Instance *inst;
inst = gcc->data;
+ evas_object_del(inst->o_button);
free(inst);
}
@@ -84,9 +81,8 @@
Instance *inst;
inst = gcc->data;
- printf("OREINT to %i\n", gcc->gadcon->orient);
- e_gadcon_client_aspect_set(gcc, 20, 20);
- e_gadcon_client_min_size_set(gcc, 20, 20);
+ e_gadcon_client_aspect_set(gcc, 16, 16);
+ e_gadcon_client_min_size_set(gcc, 16, 16);
}
/**/
/***************************************************************************/
@@ -105,15 +101,12 @@
{
Evas_Coord x, y, w, h;
int cx, cy, cw, ch;
- E_Zone *zone;
evas_object_geometry_get(inst->o_button, &x, &y, &w, &h);
- e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, &cw,
&ch);
+ e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon,
+ &cx, &cy, &cw, &ch);
x += cx;
y += cy;
- zone = e_gadcon_zone_get(inst->gcc->gadcon);
- if (!zone)
- zone = e_util_zone_current_get(e_manager_current_get());
if (!inst->main_menu)
inst->main_menu = e_int_menus_main_new();
if (inst->main_menu)
@@ -152,7 +145,8 @@
x, y, w, h,
dir, ev->timestamp);
edje_object_signal_emit(inst->o_button, "active", "");
- evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
EVAS_BUTTON_NONE, ev->timestamp, NULL);
+ evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
+ EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
}
}
@@ -184,7 +178,7 @@
e_modapi_init(E_Module *m)
{
e_gadcon_provider_register(&_gadcon_class);
- return NULL;
+ return 1;
}
EAPI int
@@ -216,12 +210,6 @@
e_module_dialog_show(_("Enlightenment Start Module"),
_("Experimental Button module for E17"));
return 1;
-}
-
-int
-e_modapi_config(E_Module *m)
-{
- return 0;
}
/**/
/***************************************************************************/
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/start/e_mod_main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.h 10 Feb 2006 09:26:12 -0000 1.7
+++ e_mod_main.h 20 Apr 2006 11:30:25 -0000 1.8
@@ -1,7 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
-/* standard module api calls e looks for */
EAPI extern E_Module_Api e_modapi;
EAPI void *e_modapi_init (E_Module *m);
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
