Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/clock
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
Move the manipulation of user specified policy flags (ALLOW_OVERLAP and
ALWAYS_ON_TOP (not used yet)) to the gadman edit menu, saves a LOT of code
inside modules
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_config.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_mod_config.c 13 Feb 2006 15:42:55 -0000 1.16
+++ e_mod_config.c 12 Mar 2006 16:12:56 -0000 1.17
@@ -8,7 +8,6 @@
struct _E_Config_Dialog_Data
{
int digital_style;
- int allow_overlap;
};
struct _Cfg_File_Data
@@ -46,7 +45,6 @@
_fill_data(Clock_Face *clk, E_Config_Dialog_Data *cfdata)
{
cfdata->digital_style = clk->conf->digitalStyle;
- cfdata->allow_overlap = clk->clock->conf->allow_overlap;
}
static void *
@@ -88,11 +86,6 @@
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, _("Extras"), 0);
- ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"),
&(cfdata->allow_overlap));
- e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
return o;
}
@@ -105,11 +98,6 @@
e_border_button_bindings_ungrab_all();
clk->conf->digitalStyle = cfdata->digital_style;
- if (cfdata->allow_overlap && !clk->clock->conf->allow_overlap)
- clk->clock->conf->allow_overlap = 1;
- else if (!cfdata->allow_overlap && clk->clock->conf->allow_overlap)
- clk->clock->conf->allow_overlap = 0;
-
e_border_button_bindings_grab_all();
e_config_save_queue();
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- e_mod_main.c 20 Feb 2006 19:10:09 -0000 1.53
+++ e_mod_main.c 12 Mar 2006 16:12:57 -0000 1.54
@@ -24,8 +24,6 @@
static void _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _clock_face_cb_menu_configure(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _clock_face_cb_update_policy(void *data);
-
static int _clock_count;
static E_Config_DD *conf_edd;
@@ -139,16 +137,13 @@
#undef D
#define T Config
#define D conf_edd
- E_CONFIG_VAL(D, T, allow_overlap, INT);
E_CONFIG_LIST(D, T, faces, conf_face_edd);
clock->conf = e_config_domain_load("module.clock", conf_edd);
if (!clock->conf)
{
clock->conf = E_NEW(Config, 1);
- clock->conf->allow_overlap = 0;
}
- E_CONFIG_LIMIT(clock->conf->allow_overlap, 0, 1);
_clock_config_menu_new(clock);
@@ -281,11 +276,6 @@
E_GADMAN_POLICY_HSIZE |
E_GADMAN_POLICY_VSIZE;
- if (clock->conf->allow_overlap == 0)
- policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
- else
- policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
-
e_gadman_client_policy_set(face->gmc, policy);
e_gadman_client_min_size_set(face->gmc, 4, 4);
e_gadman_client_max_size_set(face->gmc, 512, 512);
@@ -455,27 +445,5 @@
snprintf(buf, sizeof(buf), "%i", face->conf->digitalStyle);
edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
- _clock_face_cb_update_policy(face->clock);
}
-static void _clock_face_cb_update_policy(void *data)
-{
- Clock *clock;
- Clock_Face *cf;
- Evas_List *l;
- E_Gadman_Policy policy;
-
- clock = data;
- for (l = clock->faces; l; l = l->next)
- {
- cf = l->data;
- policy = cf->gmc->policy;
-
- if (clock->conf->allow_overlap ==0)
- policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
- else
- policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
-
- e_gadman_client_policy_set(cf->gmc , policy);
- }
-}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_mod_main.h 20 Jan 2006 04:04:12 -0000 1.17
+++ e_mod_main.h 12 Mar 2006 16:12:57 -0000 1.18
@@ -11,7 +11,6 @@
struct _Config
{
- int allow_overlap;
Evas_List *faces;
};
-------------------------------------------------------
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
