E CVS: apps/e sebastid

[<enl...@li...>]

Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
	e_border.c e_border.h 


Log Message:
Added button images from Sébastien HOUZEa.
Split user and application locks into submenus.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -3 -r1.337 -r1.338
--- e_border.c	19 Jul 2005 08:16:35 -0000	1.337
+++ e_border.c	19 Jul 2005 08:51:02 -0000	1.338
@@ -2068,6 +2068,16 @@
 	e_object_del(E_OBJECT(bd->border_locks_menu));
 	bd->border_locks_menu = NULL;
      }
+   if (bd->border_locks_user_menu)
+     {
+	e_object_del(E_OBJECT(bd->border_locks_user_menu));
+	bd->border_locks_user_menu = NULL;
+     }
+   if (bd->border_locks_application_menu)
+     {
+	e_object_del(E_OBJECT(bd->border_locks_application_menu));
+	bd->border_locks_application_menu = NULL;
+     }
    if (bd->border_remember_menu)
      {
 	e_object_del(E_OBJECT(bd->border_remember_menu));
@@ -5572,7 +5582,7 @@
    if (bd->border_menu) return;
 
    m = e_menu_new();
-   bd->border_locks_menu = m;
+   bd->border_locks_user_menu = m;
 
 #define NEW_LOCK_MI(txt, var) \
    mi = e_menu_item_new(m); \
@@ -5581,29 +5591,51 @@
    e_menu_item_toggle_set(mi, bd->var); \
    e_menu_item_callback_set(mi, _e_border_menu_cb_##var, bd);
 
-   /* FIXME: 1 big menu right now - mayeb layer make it 3 submenus? */
-   NEW_LOCK_MI(_("Position (User)"), lock_user_location);
-   NEW_LOCK_MI(_("Size (User)"), lock_user_size);
-   NEW_LOCK_MI(_("Stacking (User)"), lock_user_stacking);
-   NEW_LOCK_MI(_("Iconify (User)"), lock_user_iconify);
-/*   NEW_LOCK_MI(_("Virtual Desktop (User)"), lock_user_desk);*/
-   NEW_LOCK_MI(_("Sticky (User)"), lock_user_sticky);
-   NEW_LOCK_MI(_("Shade (User)"), lock_user_shade);
-   NEW_LOCK_MI(_("Maximize (User)"), lock_user_maximize);
-   NEW_LOCK_MI(_("Fullscreen (User)"), lock_user_fullscreen);
+   NEW_LOCK_MI(_("Position"), lock_user_location);
+   NEW_LOCK_MI(_("Size"), lock_user_size);
+   NEW_LOCK_MI(_("Stacking"), lock_user_stacking);
+   NEW_LOCK_MI(_("Iconify"), lock_user_iconify);
+/*   NEW_LOCK_MI(_("Virtual Desktop)"), lock_user_desk);*/
+   NEW_LOCK_MI(_("Sticky"), lock_user_sticky);
+   NEW_LOCK_MI(_("Shade"), lock_user_shade);
+   NEW_LOCK_MI(_("Maximize"), lock_user_maximize);
+   NEW_LOCK_MI(_("Fullscreen"), lock_user_fullscreen);
+
+   m = e_menu_new();
+   bd->border_locks_application_menu = m;
+
+   NEW_LOCK_MI(_("Position"), lock_client_location);
+   NEW_LOCK_MI(_("Size"), lock_client_size);
+   NEW_LOCK_MI(_("Stacking"), lock_client_stacking);
+   NEW_LOCK_MI(_("Iconify"), lock_client_iconify);
+/*   NEW_LOCK_MI(_("Virtual Desktop"), lock_client_desk);*/
+   NEW_LOCK_MI(_("Sticky"), lock_client_sticky);
+   NEW_LOCK_MI(_("Shade"), lock_client_shade);
+   NEW_LOCK_MI(_("Maximize"), lock_client_maximize);
+   NEW_LOCK_MI(_("Fullscreen"), lock_client_fullscreen);
+
+   m = e_menu_new();
+   bd->border_locks_menu = m;
+
    mi = e_menu_item_new(m);
-   e_menu_item_separator_set(mi, 1);
-   NEW_LOCK_MI(_("Position (Application)"), lock_client_location);
-   NEW_LOCK_MI(_("Size (Application)"), lock_client_size);
-   NEW_LOCK_MI(_("Stacking (Application)"), lock_client_stacking);
-   NEW_LOCK_MI(_("Iconify (Application)"), lock_client_iconify);
-/*   NEW_LOCK_MI(_("Virtual Desktop (Application)"), lock_client_desk);*/
-   NEW_LOCK_MI(_("Sticky (Application)"), lock_client_sticky);
-   NEW_LOCK_MI(_("Shade (Application)"), lock_client_shade);
-   NEW_LOCK_MI(_("Maximize (Application)"), lock_client_maximize);
-   NEW_LOCK_MI(_("Fullscreen (Application)"), lock_client_fullscreen);
+   e_menu_item_label_set(mi, _("User"));
+   e_menu_item_submenu_set(mi, bd->border_locks_user_menu);
+   e_menu_item_icon_edje_set(mi,
+			     (char *)e_theme_edje_file_get("base/theme/borders",
+							   "widgets/border/default/locks_user"),
+			     "widgets/border/default/locks_user");
+
+   mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, _("Application"));
+   e_menu_item_submenu_set(mi, bd->border_locks_application_menu);
+   e_menu_item_icon_edje_set(mi,
+			     (char *)e_theme_edje_file_get("base/theme/borders",
+							   "widgets/border/default/locks_application"),
+			     "widgets/border/default/locks_application");
+
    mi = e_menu_item_new(m);
    e_menu_item_separator_set(mi, 1);
+
    NEW_LOCK_MI(_("Border"), lock_border);
    NEW_LOCK_MI(_("Close"), lock_close);
 /*   NEW_LOCK_MI(_("Focus In"), lock_focus_in);*/
@@ -5691,7 +5723,7 @@
 							  "widgets/border/default/stack_below"),
 			    "widgets/border/default/stack_below");
      }
-   
+
    m = e_menu_new();
    e_object_data_set(E_OBJECT(m), bd);
    bd->border_menu = m;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- e_border.h	19 Jul 2005 08:04:19 -0000	1.97
+++ e_border.h	19 Jul 2005 08:51:12 -0000	1.98
@@ -336,6 +336,8 @@
    Evas_List *stick_desks;
    E_Menu *border_menu;
    E_Menu *border_locks_menu;
+   E_Menu *border_locks_user_menu;
+   E_Menu *border_locks_application_menu;
    E_Menu *border_remember_menu;
    E_Menu *border_stacking_menu;
    Evas_List *pending_move_resize;