Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/dropshadow
Modified Files:
e_mod_main.c e_mod_main.h Makefile.am
Added Files:
e_mod_config.c e_mod_config.h
Log Message:
Basic Dropshadow Config Dialogue. Still needs work
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e/src/modules/dropshadow/e_mod_main.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_mod_main.c 8 Oct 2005 14:20:05 -0000 1.34
+++ e_mod_main.c 20 Dec 2005 23:07:52 -0000 1.35
@@ -17,22 +17,7 @@
/* module private routines */
static Dropshadow *_ds_init(E_Module *m);
static void _ds_shutdown(Dropshadow *ds);
-static E_Menu *_ds_config_menu_new(Dropshadow *ds);
-static void _ds_menu_very_fuzzy(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_fuzzy(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_medium(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_sharp(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_very_sharp(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_very_dark(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_dark(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_light(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_very_light(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_very_far(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_far(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_close(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_very_close(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ds_menu_extremely_close(void *data, E_Menu *m, E_Menu_Item
*mi);
-static void _ds_menu_under(void *data, E_Menu *m, E_Menu_Item *mi);
+//static E_Menu *_ds_config_menu_new(Dropshadow *ds);
static void _ds_menu_high_quality(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _ds_menu_medium_quality(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _ds_menu_low_quality(void *data, E_Menu *m, E_Menu_Item
*mi);
@@ -102,7 +87,7 @@
Dropshadow *ds;
ds = _ds_init(m);
- m->config_menu = _ds_config_menu_new(ds);
+ //m->config_menu = _ds_config_menu_new(ds);
#if 0
{
Shpix *sh;
@@ -148,16 +133,7 @@
Dropshadow *ds;
ds = m->data;
- if (ds)
- {
- if (m->config_menu)
- {
- e_menu_deactivate(m->config_menu);
- e_object_del(E_OBJECT(m->config_menu));
- m->config_menu = NULL;
- }
- _ds_shutdown(ds);
- }
+ if (ds) _ds_shutdown(ds);
return 1;
}
@@ -191,6 +167,19 @@
return 1;
}
+int
+e_modapi_config(E_Module *m)
+{
+ Dropshadow *ds;
+ E_Container *con;
+
+ ds = m->data;
+ if (!ds) return 0;
+ con = e_container_current_get(e_manager_current_get());
+ _config_dropshadow_module(con, ds);
+ return 1;
+}
+
/* module private routines */
static Dropshadow *
_ds_init(E_Module *m)
@@ -285,6 +274,7 @@
free(ds);
}
+/*
static E_Menu *
_ds_config_menu_new(Dropshadow *ds)
{
@@ -295,150 +285,6 @@
mn = e_menu_new();
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Very Fuzzy"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_very_fuzzy.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (ds->conf->blur_size == 80) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_very_fuzzy, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Fuzzy"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_fuzzy.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (ds->conf->blur_size == 40) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_fuzzy, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Medium"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_medium.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (ds->conf->blur_size == 20) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_medium, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Sharp"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_sharp.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (ds->conf->blur_size == 10) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_sharp, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Very Sharp"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_very_sharp.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (ds->conf->blur_size == 5) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_very_sharp, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_separator_set(mi, 1);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Very Dark"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_very_dark.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ds->conf->shadow_darkness == 1.0) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_very_dark, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Dark"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_dark.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ds->conf->shadow_darkness == 0.75) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_dark, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Light"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_light.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ds->conf->shadow_darkness == 0.5) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_light, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Very Light"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_very_light.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ds->conf->shadow_darkness == 0.25) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_very_light, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_separator_set(mi, 1);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Very Far"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_very_far.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 3);
- if (ds->conf->shadow_x == 32) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_very_far, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Far"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_very_far.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 3);
- if (ds->conf->shadow_x == 16) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_far, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Near"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_far.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 3);
- if (ds->conf->shadow_x == 8) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_close, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Very Near"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_close.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 3);
- if (ds->conf->shadow_x == 4) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_very_close, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Extremely Near"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_underneath.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 3);
- if (ds->conf->shadow_x == 2) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_extremely_close, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Immediately Underneath"));
- snprintf(buf, sizeof(buf), "%s/menu_icon_underneath.png",
e_module_dir_get(ds->module));
- e_menu_item_icon_file_set(mi, buf);
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 3);
- if (ds->conf->shadow_x == 0) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ds_menu_under, ds);
-
- mi = e_menu_item_new(mn);
- e_menu_item_separator_set(mi, 1);
-
- mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("High Quality"));
snprintf(buf, sizeof(buf), "%s/menu_icon_hi_quality.png",
e_module_dir_get(ds->module));
e_menu_item_icon_file_set(mi, buf);
@@ -466,147 +312,11 @@
e_menu_item_radio_group_set(mi, 4);
if (ds->conf->quality == 4) e_menu_item_toggle_set(mi, 1);
else e_menu_item_toggle_set(mi, 0);
- e_menu_item_callback_set(mi, _ds_menu_low_quality, ds);
-
+ e_menu_item_callback_set(mi, _ds_menu_low_quality, ds);
return mn;
}
static void
-_ds_menu_very_fuzzy(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_blur_set(ds, 80);
-}
-
-static void
-_ds_menu_fuzzy(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_blur_set(ds, 40);
-}
-
-static void
-_ds_menu_medium(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_blur_set(ds, 20);
-}
-
-static void
-_ds_menu_sharp(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_blur_set(ds, 10);
-}
-
-static void
-_ds_menu_very_sharp(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_blur_set(ds, 5);
-}
-
-static void
-_ds_menu_very_dark(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_darkness_set(ds, 1.0);
-}
-
-static void
-_ds_menu_dark(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_darkness_set(ds, 0.75);
-}
-
-static void
-_ds_menu_light(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_darkness_set(ds, 0.5);
-}
-
-static void
-_ds_menu_very_light(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_darkness_set(ds, 0.25);
-}
-
-static void
-_ds_menu_very_far(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_shadow_xy_set(ds, 32, 32);
-}
-
-static void
-_ds_menu_far(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_shadow_xy_set(ds, 16, 16);
-}
-
-static void
-_ds_menu_close(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_shadow_xy_set(ds, 8, 8);
-}
-
-static void
-_ds_menu_very_close(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_shadow_xy_set(ds, 4, 4);
-}
-
-static void
-_ds_menu_extremely_close(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_shadow_xy_set(ds, 2, 2);
-}
-
-static void
-_ds_menu_under(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Dropshadow *ds;
-
- ds = data;
- _ds_config_shadow_xy_set(ds, 0, 0);
-}
-
-static void
_ds_menu_high_quality(void *data, E_Menu *m, E_Menu_Item *mi)
{
Dropshadow *ds;
@@ -632,6 +342,7 @@
ds = data;
_ds_config_quality_set(ds, 4);
}
+*/
static void
_ds_container_shapes_add(Dropshadow *ds, E_Container *con)
@@ -1406,8 +1117,8 @@
if (v < 0.0) v = 0.0;
else if (v > 1.0) v = 1.0;
- if (ds->conf->shadow_darkness == v) return;
- ds->conf->shadow_darkness = v;
+ //if (ds->conf->shadow_darkness == v) return;
+ //ds->conf->shadow_darkness = v;
for (l = ds->shadows; l; l = l->next)
{
Shadow *sh;
@@ -1434,7 +1145,7 @@
255 * ds->conf->shadow_darkness);
}
}
- e_config_save_queue();
+ //e_config_save_queue();
}
static void
@@ -1442,9 +1153,9 @@
{
Evas_List *l;
- if ((ds->conf->shadow_x == x) && (ds->conf->shadow_y == y)) return;
- ds->conf->shadow_x = x;
- ds->conf->shadow_y = y;
+ //if ((ds->conf->shadow_x == x) && (ds->conf->shadow_y == y)) return;
+ //ds->conf->shadow_x = x;
+ //ds->conf->shadow_y = y;
if (ds->conf->shadow_x >= ds->conf->blur_size)
ds->conf->shadow_x = ds->conf->blur_size - 1;
if (ds->conf->shadow_y >= ds->conf->blur_size)
@@ -1466,8 +1177,8 @@
Evas_List *l;
if (blur < 0) blur = 0;
- if (ds->conf->blur_size == blur) return;
- ds->conf->blur_size = blur;
+ //if (ds->conf->blur_size == blur) return;
+ //ds->conf->blur_size = blur;
if (ds->conf->shadow_x >= ds->conf->blur_size)
ds->conf->shadow_x = ds->conf->blur_size - 1;
@@ -2579,3 +2290,17 @@
free(r);
}
}
+
+void
+_dropshadow_cb_config_updated(void *data)
+{
+ Dropshadow *ds;
+
+ ds = data;
+ if (!ds) return;
+
+ _ds_config_quality_set(ds, ds->conf->quality);
+ _ds_config_darkness_set(ds, ds->conf->shadow_darkness);
+ _ds_config_shadow_xy_set(ds, ds->conf->shadow_x, ds->conf->shadow_y);
+ _ds_config_blur_set(ds, ds->conf->blur_size);
+}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e/src/modules/dropshadow/e_mod_main.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.h 24 Sep 2005 13:42:05 -0000 1.10
+++ e_mod_main.h 20 Dec 2005 23:07:52 -0000 1.11
@@ -105,4 +105,6 @@
EAPI int e_modapi_info (E_Module *m);
EAPI int e_modapi_about (E_Module *m);
+EAPI void _dropshadow_cb_config_updated(void *data);
+
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/dropshadow/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 8 May 2005 22:34:44 -0000 1.4
+++ Makefile.am 20 Dec 2005 23:07:52 -0000 1.5
@@ -32,7 +32,9 @@
pkgdir =
$(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \
- e_mod_main.h
+ e_mod_main.h \
+ e_mod_config.c \
+ e_mod_config.h
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
