Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_int_border_menu.c
Log Message:
ram's fullscreen action patch and laurent's small radiobutton patch for send
to desktop menu
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- e_actions.c 17 Jun 2006 03:29:54 -0000 1.70
+++ e_actions.c 2 Jul 2006 06:57:38 -0000 1.71
@@ -353,6 +353,67 @@
}
/***************************************************************************/
+ACT_FN_GO(window_fullscreen_toggle)
+{
+ if (!obj) obj = E_OBJECT(e_border_focused_get());
+ if (!obj) return;
+ if (obj->type != E_BORDER_TYPE)
+ {
+ obj = E_OBJECT(e_border_focused_get());
+ if (!obj) return;
+ }
+ if (!((E_Border *)obj)->lock_user_fullscreen)
+ {
+ E_Border *bd;
+ bd = (E_Border *)obj;
+ if (bd->fullscreen)
+ e_border_unfullscreen(bd);
+ else if (params == 0 || *params == '\0')
+ e_border_fullscreen(bd, e_config->fullscreen_policy);
+ else if (! strcmp(params, "resize"))
+ e_border_fullscreen(bd, E_FULLSCREEN_RESIZE);
+ else if (! strcmp(params, "zoom"))
+ e_border_fullscreen(bd, E_FULLSCREEN_ZOOM);
+ }
+}
+
+/***************************************************************************/
+ACT_FN_GO(window_fullscreen)
+{
+ if (!obj) obj = E_OBJECT(e_border_focused_get());
+ if (!obj) return;
+ if (obj->type != E_BORDER_TYPE)
+ {
+ obj = E_OBJECT(e_border_focused_get());
+ if (!obj) return;
+ }
+ if (!((E_Border *)obj)->lock_user_fullscreen)
+ {
+ E_Border *bd;
+ bd = (E_Border *)obj;
+ if (params)
+ {
+ int v;
+ char buf[32];
+ if (sscanf(params, "%i %20s", &v, buf) == 2)
+ {
+ if (v == 1)
+ {
+ if (buf == 0 || *buf == '\0')
+ e_border_fullscreen(bd, e_config->fullscreen_policy);
+ else if (! strcmp(buf, "resize"))
+ e_border_fullscreen(bd, E_FULLSCREEN_RESIZE);
+ else if (! strcmp(buf, "zoom"))
+ e_border_fullscreen(bd, E_FULLSCREEN_ZOOM);
+ }
+ else if (v == 0)
+ e_border_unfullscreen(bd);
+ }
+ }
+ }
+}
+
+/***************************************************************************/
ACT_FN_GO(window_maximized_toggle)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
@@ -1594,6 +1655,14 @@
ACT_GO(window_iconic);
+ /* window_fullscreen_toggle */
+ ACT_GO(window_fullscreen_toggle);
+ e_register_action_predef_name(_("Window : State"), _("Fullscreen Mode
Toggle"),
+ "window_fullscreen_toggle", NULL,
+ EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS,
0);
+
+ ACT_GO(window_fullscreen);
+
/* window_maximized_toggle */
ACT_GO(window_maximized_toggle);
e_register_action_predef_name(_("Window : State"), _("Maximize"),
"window_maximized_toggle",
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_int_border_menu.c 15 Jun 2006 19:27:27 -0000 1.26
+++ e_int_border_menu.c 2 Jul 2006 06:57:38 -0000 1.27
@@ -706,9 +706,11 @@
E_Menu *subm;
E_Menu_Item *submi;
E_Border *bd;
+ E_Desk *desk_cur;
int i;
bd = data;
+ desk_cur = e_desk_current_get(bd->zone);
subm = e_menu_new();
e_object_data_set(E_OBJECT(subm), bd);
@@ -721,6 +723,9 @@
desk = bd->zone->desks[i];
submi = e_menu_item_new(subm);
e_menu_item_label_set(submi, desk->name);
+ e_menu_item_radio_set(submi, 1);
+ e_menu_item_radio_group_set(submi, 2);
+ e_menu_item_toggle_set(submi, (desk_cur == desk ? 1 : 0));
e_menu_item_callback_set(submi, _e_border_menu_cb_sendto, desk);
}
}
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
