Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
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/pager/e_mod_config.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_mod_config.c 13 Feb 2006 15:48:41 -0000 1.14
+++ e_mod_config.c 12 Mar 2006 16:12:58 -0000 1.15
@@ -11,7 +11,6 @@
int name_pos;
int show_popup;
double popup_speed;
- int allow_overlap;
};
struct _Cfg_File_Data
@@ -64,7 +63,6 @@
cfdata->show_popup = p->conf->popup;
cfdata->popup_speed = p->conf->popup_speed;
- cfdata->allow_overlap = p->conf->allow_overlap;
}
static void *
@@ -111,11 +109,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);
-
/* Not Supported Yet ??
ob = e_widget_radio_add(evas, _("Left"), PAGER_DESKNAME_LEFT, rg);
e_widget_framelist_object_append(of, ob);
@@ -137,11 +130,6 @@
p->conf->deskname_pos = cfdata->name_pos;
if (!cfdata->show_name) p->conf->deskname_pos = PAGER_DESKNAME_NONE;
- if (cfdata->allow_overlap && !p->conf->allow_overlap)
- p->conf->allow_overlap = 1;
- else if (!cfdata->allow_overlap && p->conf->allow_overlap)
- p->conf->allow_overlap = 0;
-
e_config_save_queue();
_pager_cb_config_updated(p);
@@ -184,11 +172,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;
}
@@ -205,11 +188,6 @@
if (!cfdata->show_name) p->conf->deskname_pos = PAGER_DESKNAME_NONE;
p->conf->popup_speed = cfdata->popup_speed;
- if (cfdata->allow_overlap && !p->conf->allow_overlap)
- p->conf->allow_overlap = 1;
- else if (!cfdata->allow_overlap && p->conf->allow_overlap)
- p->conf->allow_overlap = 0;
-
e_border_button_bindings_grab_all();
e_config_save_queue();
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -3 -r1.164 -r1.165
--- e_mod_main.c 20 Feb 2006 19:11:22 -0000 1.164
+++ e_mod_main.c 12 Mar 2006 16:12:59 -0000 1.165
@@ -85,8 +85,6 @@
static void _pager_menu_cb_aspect_keep_width(void *data, E_Menu *m,
E_Menu_Item *mi);
static void _pager_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item
*mi);
-static void _pager_cb_update_policy(void *data);
-
static int _pager_count;
static E_Config_DD *_conf_edd;
@@ -225,7 +223,6 @@
E_CONFIG_VAL(D, T, deskname_pos, UINT);
E_CONFIG_VAL(D, T, popup_speed, DOUBLE);
E_CONFIG_VAL(D, T, popup, UINT);
- E_CONFIG_VAL(D, T, allow_overlap, INT);
pager->conf = e_config_domain_load("module.pager", _conf_edd);
@@ -235,12 +232,10 @@
pager->conf->deskname_pos = PAGER_DESKNAME_NONE;
pager->conf->popup_speed = 1.0;
pager->conf->popup = 1;
- pager->conf->allow_overlap = 0;
}
E_CONFIG_LIMIT(pager->conf->deskname_pos, PAGER_DESKNAME_NONE,
PAGER_DESKNAME_RIGHT);
E_CONFIG_LIMIT(pager->conf->popup_speed, 0.1, 10.0);
E_CONFIG_LIMIT(pager->conf->popup, 0, 1);
- E_CONFIG_LIMIT(pager->conf->allow_overlap, 0, 1);
_pager_config_menu_new(pager);
@@ -486,11 +481,6 @@
// E_GADMAN_POLICY_FIXED_ZONE |
E_GADMAN_POLICY_VSIZE;
- if (pager->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, 8, 8);
@@ -2156,7 +2146,6 @@
/* Handle Desktop Name Position Change */
pager = data;
- _pager_cb_update_policy(pager);
for (l = pager->faces; l; l = l->next)
{
Pager_Face *face;
@@ -2165,24 +2154,4 @@
_pager_face_deskname_position_change(face);
}
}
-static void _pager_cb_update_policy(void *data)
-{
- Pager *pg;
- Pager_Face *pf;
- Evas_List *l;
- E_Gadman_Policy policy;
-
- pg = data;
- for (l = pg->faces; l; l = l->next)
- {
- pf = l->data;
- policy = pf->gmc->policy;
-
- if (pg->conf->allow_overlap == 0)
- policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
- else
- policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
- e_gadman_client_policy_set(pf->gmc , policy);
- }
-}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e_mod_main.h 20 Jan 2006 04:04:14 -0000 1.41
+++ e_mod_main.h 12 Mar 2006 16:12:59 -0000 1.42
@@ -33,7 +33,6 @@
/* Show popup? */
unsigned int popup;
- int allow_overlap;
};
struct _Config_Face
-------------------------------------------------------
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
