Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_border.h e_dialog.h e_module.c
Log Message:
As per HandyAndE request, this patch gives ability for modules config
dialogs to show their icon in their config dialog by passing in the
module_eap path to the config_dialog_new function as the icon parameter ie:
e_config_dialog_new(con, module_name, eap_path, 0, v, data);
Update E core modules to use this ability.
Fix dropshadow config dialog to fit in 640x480.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -3 -r1.509 -r1.510
--- e_border.c 2 Jul 2006 18:55:31 -0000 1.509
+++ e_border.c 3 Jul 2006 07:35:44 -0000 1.510
@@ -2448,17 +2448,20 @@
if (bd->internal)
{
o = edje_object_add(evas);
- if ((!bd->internal_icon) && (!bd->module_eap))
+ if (!bd->internal_icon)
e_util_edje_icon_set(o, "enlightenment/e");
- else if (bd->internal_icon)
- {
- if (!e_util_edje_icon_set(o, bd->internal_icon))
- e_util_edje_icon_set(o, "enlightenment/e");
- }
- else if (bd->module_eap)
+ else
{
- if (!edje_object_file_set(o, bd->module_eap, "icon"))
- e_util_edje_icon_set(o, "enlightenment/e");
+ if (!strcmp(bd->internal_icon + strlen(bd->internal_icon) - 4,
".eap"))
+ {
+ if (!edje_object_file_set(o, bd->internal_icon, "icon"))
+ e_util_edje_icon_set(o, "enlightenment/e");
+ }
+ else
+ {
+ if (!e_util_edje_icon_set(o, bd->internal_icon))
+ e_util_edje_icon_set(o, "enlightenment/e");
+ }
}
return o;
}
@@ -3037,7 +3040,6 @@
if (bd->client.netwm.name) free(bd->client.netwm.name);
if (bd->client.netwm.icon_name) free(bd->client.netwm.icon_name);
e_object_del(E_OBJECT(bd->shape));
- if (bd->module_eap) evas_stringshare_del(bd->module_eap);
if (bd->internal_icon) evas_stringshare_del(bd->internal_icon);
if (bd->icon_object) evas_object_del(bd->icon_object);
evas_object_del(bd->bg_object);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -3 -r1.143 -r1.144
--- e_border.h 2 Jul 2006 18:55:31 -0000 1.143
+++ e_border.h 3 Jul 2006 07:35:44 -0000 1.144
@@ -135,7 +135,6 @@
Evas_Object *icon_object;
Ecore_X_Window event_win;
const char *internal_icon;
- const char *module_eap;
struct {
Ecore_X_Window shell_win;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_dialog.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_dialog.h 2 Jul 2006 16:19:51 -0000 1.13
+++ e_dialog.h 3 Jul 2006 07:35:44 -0000 1.14
@@ -29,18 +29,18 @@
unsigned char resizable : 1;
};
-EAPI E_Dialog *e_dialog_new (E_Container *con);
-EAPI void e_dialog_button_add (E_Dialog *dia, const char
*label, const char *icon, void (*func) (void *data, E_Dialog *dia), void *data);
-EAPI int e_dialog_button_focus_num (E_Dialog *dia, int button);
-EAPI int e_dialog_button_disable_num_set (E_Dialog *dia, int button, int
disabled);
-EAPI int e_dialog_button_disable_num_get (E_Dialog *dia, int button);
-EAPI void e_dialog_title_set (E_Dialog *dia, const char
*title);
-EAPI void e_dialog_text_set (E_Dialog *dia, const char
*text);
-EAPI void e_dialog_icon_set (E_Dialog *dia, const char
*icon, Evas_Coord size);
-EAPI void e_dialog_border_icon_set (E_Dialog *dia, const char
*icon);
-EAPI void e_dialog_content_set (E_Dialog *dia, Evas_Object
*obj, Evas_Coord minw, Evas_Coord minh);
-EAPI void e_dialog_resizable_set (E_Dialog *dia, int resizable);
-EAPI void e_dialog_show (E_Dialog *dia);
+EAPI E_Dialog *e_dialog_new (E_Container *con);
+EAPI void e_dialog_button_add (E_Dialog *dia, const char
*label, const char *icon, void (*func) (void *data, E_Dialog *dia), void *data);
+EAPI int e_dialog_button_focus_num (E_Dialog *dia, int button);
+EAPI int e_dialog_button_disable_num_set (E_Dialog *dia, int button,
int disabled);
+EAPI int e_dialog_button_disable_num_get (E_Dialog *dia, int button);
+EAPI void e_dialog_title_set (E_Dialog *dia, const char
*title);
+EAPI void e_dialog_text_set (E_Dialog *dia, const char
*text);
+EAPI void e_dialog_icon_set (E_Dialog *dia, const char
*icon, Evas_Coord size);
+EAPI void e_dialog_border_icon_set (E_Dialog *dia, const char
*icon);
+EAPI void e_dialog_content_set (E_Dialog *dia, Evas_Object
*obj, Evas_Coord minw, Evas_Coord minh);
+EAPI void e_dialog_resizable_set (E_Dialog *dia, int
resizable);
+EAPI void e_dialog_show (E_Dialog *dia);
#endif
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- e_module.c 2 Jul 2006 19:34:51 -0000 1.59
+++ e_module.c 3 Jul 2006 07:35:44 -0000 1.60
@@ -383,7 +383,7 @@
if (!m) return;
bd = dia->win->border;
if (!bd) return;
- bd->module_eap = evas_stringshare_add(eap);
+ bd->internal_icon = evas_stringshare_add(eap);
}
/* local subsystem functions */
@@ -505,9 +505,8 @@
e_module_disable(mod);
}
else if ((!mod->enabled) && (enabled))
- {
- e_module_enable(mod);
- }
+ e_module_enable(mod);
+
e_menu_item_toggle_set(mi, e_module_enabled_get(mod));
}
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
