Enlightenment CVS committal
Author : urandom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_config.c e_desk.h e_int_menus.c e_zone.h
Log Message:
zone != desk. it was always about per desk deskshows, not per zone.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- e_actions.c 18 Jul 2006 13:35:07 -0000 1.73
+++ e_actions.c 21 Jul 2006 00:46:40 -0000 1.74
@@ -1428,22 +1428,24 @@
/***************************************************************************/
/***************************************************************************/
-ACT_FN_GO(zone_deskshow_toggle)
+ACT_FN_GO(desk_deskshow_toggle)
{
E_Border *bd;
E_Border_List *bl;
E_Zone *zone;
+ E_Desk *desk;
zone = _e_actions_zone_get(obj);
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
if (zone)
{
+ desk = e_desk_current_get(zone);
bl = e_container_border_list_first(zone->container);
while ((bd = e_container_border_list_next(bl)))
{
- if (bd->desk == e_desk_current_get(bd->zone))
+ if (bd->desk == desk)
{
- if (zone->deskshow_toggle)
+ if (desk->deskshow_toggle)
{
if (bd->deskshow) e_border_uniconify(bd);
bd->deskshow = 0;
@@ -1458,7 +1460,7 @@
}
}
}
- zone->deskshow_toggle = zone->deskshow_toggle ? 0 : 1;
+ desk->deskshow_toggle = desk->deskshow_toggle ? 0 : 1;
e_container_border_list_free(bl);
}
}
@@ -1717,10 +1719,10 @@
e_register_action_predef_name(_("Desktop"), _("Flip Desktop By..."),
"desk_flip_by", NULL, EDIT_RESTRICT_ACTION, 0);
- /* zone_deskshow_toggle */
- ACT_GO(zone_deskshow_toggle);
+ /* desk_deskshow_toggle */
+ ACT_GO(desk_deskshow_toggle);
e_register_action_predef_name(_("Desktop"), _("Show The Desktop"),
- "zone_deskshow_toggle", NULL,
+ "desk_deskshow_toggle", NULL,
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS,
0);
/* desk_linear_flip_to */
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -3 -r1.183 -r1.184
--- e_config.c 11 Jul 2006 18:57:13 -0000 1.183
+++ e_config.c 21 Jul 2006 00:46:40 -0000 1.184
@@ -869,7 +869,7 @@
"desk_lock", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "d",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
- "zone_deskshow_toggle", NULL);
+ "desk_deskshow_toggle", NULL);
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Left",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0,
"screen_send_by", "-1");
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_desk.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_desk.h 2 Mar 2006 12:03:48 -0000 1.22
+++ e_desk.h 21 Jul 2006 00:46:40 -0000 1.23
@@ -21,6 +21,7 @@
const char *name;
int x, y;
char visible : 1;
+ unsigned int deskshow_toggle : 1;
Evas_Object *bg_object;
};
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -3 -r1.142 -r1.143
--- e_int_menus.c 17 Jul 2006 18:24:16 -0000 1.142
+++ e_int_menus.c 21 Jul 2006 00:46:40 -0000 1.143
@@ -380,7 +380,7 @@
{
E_Action *act;
- act = e_action_find("zone_deskshow_toggle");
+ act = e_action_find("desk_deskshow_toggle");
if (act) act->func.go(E_OBJECT(m->zone), NULL);
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_zone.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- e_zone.h 3 Jun 2006 10:19:11 -0000 1.36
+++ e_zone.h 21 Jul 2006 00:46:40 -0000 1.37
@@ -26,7 +26,6 @@
unsigned int num;
E_Container *container;
int fullscreen;
- unsigned int deskshow_toggle : 1;
Evas_Object *bg_object;
Evas_Object *bg_event_object;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
