I don't like it, and i don't think it's an improvement:

The old menu was sorted logically, easy to understand and clean:
- Icon Options
- Window Options
- Some often used shortcuts (Move to, Always on Top, Sticky)
- Close Button

Now you have
- Icon Options
- Stacking
- Maximize
- Move to
- Window
- Settings
- Close

We are now back with a settings menu option, and the options in it are 
something like
skip window list (which is an option) while we have a top level window 
submenu where are also options.

Also the shortcut options where liked by people, just a few days ago 
someone in #e told raster that he liked the fact that the sticky option 
is in the toplevel menu. Yes, this option can be readded, but then the 
toplevel window menu is back getting huge again. Yes, having a small 
toplevel menu was an idea of the old menu.

I don't like how you just commit your stuff, not taking care of other 
peoples code. You commit and write something about "open for critique", 
but i think you should first ask people before you change everything 
just as you like. Start a discussion on ml, e.g. common things.

Same with the efm_nav module. It allowed the user to enter a path in the 
efm toolbar with the keyboard. You removed the module from svn, i told 
you that it worked and that users might want it, but you didn't care and 
didn't restore.

This is not my idea of working in a team on a project. If i follow your 
way, i would just commit the old menu code and overwrite your changes.

Please revert.

Brian 'morlenxus' Miculcy


On 08/22/2011 01:37 AM, Enlightenment SVN wrote:
> Log:
> e17: my suggestion for a better window menu.
>
>    I'm open to critique for improvements :)
>
>
> Author:       jeffdameth
> Date:         2011-08-21 16:37:31 -0700 (Sun, 21 Aug 2011)
> New Revision: 62670
> Trac:         http://trac.enlightenment.org/e/changeset/62670
>
> Modified:
>    trunk/e/src/bin/e_int_border_menu.c
>
> Modified: trunk/e/src/bin/e_int_border_menu.c
> ===================================================================
> --- trunk/e/src/bin/e_int_border_menu.c       2011-08-21 21:36:16 UTC (rev 
> 62669)
> +++ trunk/e/src/bin/e_int_border_menu.c       2011-08-21 23:37:31 UTC (rev 
> 62670)
> @@ -48,6 +48,7 @@
>   static void _e_border_menu_cb_iconpref_user(void *data, E_Menu *m, 
> E_Menu_Item *mi);
>   static void _e_border_menu_cb_default_icon(void *data, E_Menu *m, 
> E_Menu_Item *mi);
>   static void _e_border_menu_cb_netwm_icon(void *data, E_Menu *m, E_Menu_Item 
> *mi);
> +static void _e_border_menu_cb_settings_pre(void *data, E_Menu *m __UNUSED__, 
> E_Menu_Item *mi);
>
>   EAPI void
>   e_int_border_menu_create(E_Border *bd)
> @@ -67,28 +68,51 @@
>
>      if (!bd->internal)
>        {
> -        if (bd->client.icccm.class)
> -          snprintf(buf, sizeof(buf), "%s", bd->client.icccm.class);
> -        else
> -          snprintf(buf, sizeof(buf), _("Application"));
> -        mi = e_menu_item_new(m);
> -        e_menu_item_label_set(mi, buf);
> -        e_menu_item_submenu_pre_callback_set(mi, 
> _e_border_menu_cb_application_pre, bd);
> -        if (bd->desktop)
> -          e_util_desktop_menu_item_icon_add(bd->desktop, 16, mi);
> +     if (bd->client.icccm.class)
> +       snprintf(buf, sizeof(buf), "%s", bd->client.icccm.class);
> +     else
> +       snprintf(buf, sizeof(buf), _("Application"));
> +     mi = e_menu_item_new(m);
> +     e_menu_item_label_set(mi, buf);
> +     e_menu_item_submenu_pre_callback_set(mi, 
> _e_border_menu_cb_application_pre, bd);
> +     if (bd->desktop)
> +       e_util_desktop_menu_item_icon_add(bd->desktop, 16, mi);
>        }
>
>      mi = e_menu_item_new(m);
> -   e_menu_item_label_set(mi, _("Window"));
> -   e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_window_pre, 
> bd);
> -   e_menu_item_icon_edje_set(mi,
> -                             e_theme_edje_file_get("base/theme/borders",
> -                                                   
> "e/widgets/border/default/window"),
> -                                                   
> "e/widgets/border/default/window");
> -
> -   mi = e_menu_item_new(m);
>      e_menu_item_separator_set(mi, 1);
>
> +   if ((!bd->lock_user_stacking)&&  (!bd->fullscreen))
> +     {
> +        mi = e_menu_item_new(m);
> +        e_menu_item_label_set(mi, _("Stacking"));
> +        e_menu_item_submenu_pre_callback_set(mi, 
> _e_border_menu_cb_stacking_pre, bd);
> +        e_menu_item_icon_edje_set(mi,
> +                                  e_theme_edje_file_get("base/theme/borders",
> +                                                        
> "e/widgets/border/default/stacking"),
> +                               "e/widgets/border/default/stacking");
> +     }
> +
> +   if ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
> +       (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
> +     {
> +        if (!(((bd->client.icccm.min_w == bd->client.icccm.max_w)&&
> +               (bd->client.icccm.min_h == bd->client.icccm.max_h)) ||
> +              (bd->lock_user_maximize)))
> +          {
> +             if ((!bd->lock_user_maximize)&&  (!bd->shaded))
> +               {
> +                  mi = e_menu_item_new(m);
> +                  e_menu_item_label_set(mi, _("Maximize"));
> +                  e_menu_item_submenu_pre_callback_set(mi, 
> _e_border_menu_cb_maximize_pre, bd);
> +                  e_menu_item_icon_edje_set(mi,
> +                                            
> e_theme_edje_file_get("base/theme/borders",
> +                                                                  
> "e/widgets/border/default/maximize"),
> +                                         
> "e/widgets/border/default/maximize");
> +               }
> +          }
> +     }
> +
>      if ((!bd->sticky)&&  ((bd->zone->desk_x_count>  1) || 
> (bd->zone->desk_y_count>  1)))
>        {
>           mi = e_menu_item_new(m);
> @@ -97,35 +121,28 @@
>           e_menu_item_icon_edje_set(mi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
>                                                           
> "e/widgets/border/default/sendto"),
> -                                                        
> "e/widgets/border/default/sendto");
> +                               "e/widgets/border/default/sendto");
>        }
>
>      mi = e_menu_item_new(m);
> -   e_menu_item_label_set(mi, _("Always on Top"));
> -   e_menu_item_check_set(mi, 1);
> -   e_menu_item_toggle_set(mi, (bd->layer == 150 ? 1 : 0));
> -   if (bd->layer == 150)
> -     e_menu_item_callback_set(mi, _e_border_menu_cb_normal, bd);
> -   else
> -     e_menu_item_callback_set(mi, _e_border_menu_cb_on_top, bd);
> +   e_menu_item_label_set(mi, _("Window"));
> +   e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_window_pre, 
> bd);
>      e_menu_item_icon_edje_set(mi,
> -                          e_theme_edje_file_get("base/theme/borders",
> -                                                
> "e/widgets/border/default/stack_on_top"),
> -                                                   
> "e/widgets/border/default/stack_on_top");
> +                             e_theme_edje_file_get("base/theme/borders",
> +                                                   
> "e/widgets/border/default/window"),
> +                          "e/widgets/border/default/window");
>
> -   if (!bd->lock_user_sticky)
> -     {
> -        mi = e_menu_item_new(m);
> -        e_menu_item_label_set(mi, _("Sticky"));
> -        e_menu_item_check_set(mi, 1);
> -        e_menu_item_toggle_set(mi, (bd->sticky ? 1 : 0));
> -        e_menu_item_callback_set(mi, _e_border_menu_cb_stick, bd);
> -        e_menu_item_icon_edje_set(mi,
> -                                  e_theme_edje_file_get("base/theme/borders",
> -                                                        
> "e/widgets/border/default/stick"),
> -                                                        
> "e/widgets/border/default/stick");
> -     }
> +   mi = e_menu_item_new(m);
> +   e_menu_item_separator_set(mi, 1);
>
> +   mi = e_menu_item_new(m);
> +   e_menu_item_label_set(mi, _("Settings"));
> +   e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_settings_pre, 
> bd);
> +   e_menu_item_icon_edje_set(mi,
> +                             e_theme_edje_file_get("base/theme/borders",
> +                                                   
> "e/widgets/border/default/settings"),
> +                          "e/widgets/border/default/settings");
> +
>      if (!bd->lock_close)
>        {
>           mi = e_menu_item_new(m);
> @@ -137,7 +154,7 @@
>       e_menu_item_icon_edje_set(mi,
>                                 e_theme_edje_file_get("base/theme/borders",
>                                                       
> "e/widgets/border/default/close"),
> -                                                     
> "e/widgets/border/default/close");
> +                               "e/widgets/border/default/close");
>        }
>   }
>
> @@ -295,7 +312,7 @@
>           e_menu_item_icon_edje_set(submi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
>                                                           
> "e/widgets/border/default/fullscreen"),
> -                                                        
> "e/widgets/border/default/fullscreen");
> +                               "e/widgets/border/default/fullscreen");
>        }
>
>      if (!bd->fullscreen)
> @@ -309,7 +326,7 @@
>           e_menu_item_icon_edje_set(submi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
>                                                           
> "e/widgets/border/default/maximize"),
> -                                                        
> "e/widgets/border/default/maximize");
> +                               "e/widgets/border/default/maximize");
>
>           submi = e_menu_item_new(subm);
>           e_menu_item_label_set(submi, _("Maximize vertically"));
> @@ -320,7 +337,7 @@
>           e_menu_item_icon_edje_set(submi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
>                                                           
> "e/widgets/border/default/maximize"),
> -                                                        
> "e/widgets/border/default/maximize");
> +                               "e/widgets/border/default/maximize");
>
>           submi = e_menu_item_new(subm);
>           e_menu_item_label_set(submi, _("Maximize horizontally"));
> @@ -331,7 +348,7 @@
>           e_menu_item_icon_edje_set(submi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
>                                                           
> "e/widgets/border/default/maximize"),
> -                                                        
> "e/widgets/border/default/maximize");
> +                               "e/widgets/border/default/maximize");
>
>           submi = e_menu_item_new(subm);
>           e_menu_item_label_set(submi, _("Unmaximize"));
> @@ -342,7 +359,7 @@
>           e_menu_item_icon_edje_set(submi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
>                                                           
> "e/widgets/border/default/maximize"),
> -                                                        
> "e/widgets/border/default/maximize");
> +                               "e/widgets/border/default/maximize");
>        }
>   }
>
> @@ -444,17 +461,17 @@
>
>      if (bd->desktop)
>        {
> -        submi = e_menu_item_new(subm);
> -        e_menu_item_label_set(submi, _("Edit Icon"));
> -        e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
> -        e_util_desktop_menu_item_icon_add(bd->desktop, 16, submi);
> +     submi = e_menu_item_new(subm);
> +     e_menu_item_label_set(submi, _("Edit Icon"));
> +     e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
> +     e_util_desktop_menu_item_icon_add(bd->desktop, 16, submi);
>        }
>      else if (bd->client.icccm.class)
>        {
> -        /* icons with no class useless to borders */
> -        submi = e_menu_item_new(subm);
> -        e_menu_item_label_set(submi, _("Create Icon"));
> -        e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
> +     /* icons with no class useless to borders */
> +     submi = e_menu_item_new(subm);
> +     e_menu_item_label_set(submi, _("Create Icon"));
> +     e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
>        }
>
>      submi = e_menu_item_new(subm);
> @@ -468,7 +485,7 @@
>      submi = e_menu_item_new(subm);
>      e_menu_item_label_set(submi, _("Add to IBar"));
>      e_menu_item_submenu_pre_callback_set(submi,
> -                                        _e_border_menu_cb_ibar_add_pre, bd);
> +                                     _e_border_menu_cb_ibar_add_pre, bd);
>      e_util_menu_item_theme_icon_set(submi, "preferences-applications-ibar");
>
>      if (e_configure_registry_exists("keyboard_and_mouse/key_bindings"))
> @@ -481,7 +498,7 @@
>   }
>
>   static void
> -_e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item 
> *mi)
> +_e_border_menu_cb_settings_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item 
> *mi)
>   {
>      E_Menu *subm;
>      E_Menu_Item *submi;
> @@ -493,57 +510,32 @@
>      e_object_data_set(E_OBJECT(subm), bd);
>      e_menu_item_submenu_set(mi, subm);
>
> -   submi = e_menu_item_new(subm);
> -   e_menu_item_label_set(submi, _("Placement"));
> -   e_menu_item_submenu_pre_callback_set(submi, 
> _e_border_menu_cb_placement_pre, bd);
> -   e_menu_item_icon_edje_set(submi,
> -                             e_theme_edje_file_get("base/theme/borders",
> -                                                   
> "e/widgets/border/default/placement"),
> -                                                   
> "e/widgets/border/default/placement");
> -
> -   if ((!bd->lock_user_stacking)&&  (!bd->fullscreen))
> +   if (!bd->lock_border)
>        {
>           submi = e_menu_item_new(subm);
> -        e_menu_item_label_set(submi, _("Stacking"));
> -        e_menu_item_submenu_pre_callback_set(submi, 
> _e_border_menu_cb_stacking_pre, bd);
> +        e_menu_item_label_set(submi, _("Border"));
> +        e_menu_item_submenu_pre_callback_set(submi, 
> _e_border_menu_cb_border_pre, bd);
>           e_menu_item_icon_edje_set(submi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
> -                                                        
> "e/widgets/border/default/stacking"),
> -                                                        
> "e/widgets/border/default/stacking");
> +                                                        
> "e/widgets/border/default/borderless"),
> +                               "e/widgets/border/default/borderless");
>        }
>
>      submi = e_menu_item_new(subm);
> -   e_menu_item_separator_set(submi, 1);
> -
> -   submi = e_menu_item_new(subm);
>      e_menu_item_label_set(submi, _("Skip"));
>      e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_skip_pre, 
> bd);
>      e_menu_item_icon_edje_set(submi,
>                            e_theme_edje_file_get("base/theme/borders",
>                                                  
> "e/widgets/border/default/skip"),
> -                                                   
> "e/widgets/border/default/skip");
> +                          "e/widgets/border/default/skip");
>
> -   if (!bd->lock_border)
> -     {
> -        submi = e_menu_item_new(subm);
> -        e_menu_item_label_set(submi, _("Border"));
> -        e_menu_item_submenu_pre_callback_set(submi, 
> _e_border_menu_cb_border_pre, bd);
> -        e_menu_item_icon_edje_set(submi,
> -                                  e_theme_edje_file_get("base/theme/borders",
> -                                                        
> "e/widgets/border/default/borderless"),
> -                                                        
> "e/widgets/border/default/borderless");
> -     }
> -
>      submi = e_menu_item_new(subm);
> -   e_menu_item_separator_set(submi, 1);
> -
> -   submi = e_menu_item_new(subm);
>      e_menu_item_label_set(submi, _("Locks"));
>      e_menu_item_callback_set(submi, _e_border_menu_cb_locks, bd);
>      e_menu_item_icon_edje_set(submi,
>                                e_theme_edje_file_get("base/theme/borders",
>                                                      
> "e/widgets/border/default/locks"),
> -                                                   
> "e/widgets/border/default/locks");
> +                          "e/widgets/border/default/locks");
>
>      submi = e_menu_item_new(subm);
>      e_menu_item_label_set(submi, _("Remember"));
> @@ -551,33 +543,22 @@
>      e_menu_item_icon_edje_set(submi,
>                                e_theme_edje_file_get("base/theme/borders",
>                                                      
> "e/widgets/border/default/remember"),
> -                                                   
> "e/widgets/border/default/remember");
> +                          "e/widgets/border/default/remember");
>
>      submi = e_menu_item_new(subm);
>      e_menu_item_separator_set(submi, 1);
>
> -   if ((!bd->internal)&&  (!bd->lock_close))
> -     {
> -        submi = e_menu_item_new(subm);
> -        e_menu_item_label_set(submi, _("Kill"));
> -        e_menu_item_callback_set(submi, _e_border_menu_cb_kill, bd);
> -        e_menu_item_icon_edje_set(submi,
> -                                  e_theme_edje_file_get("base/theme/borders",
> -                                                        
> "e/widgets/border/default/kill"),
> -                                                        
> "e/widgets/border/default/kill");
> -     }
> -
>      submi = e_menu_item_new(subm);
>      e_menu_item_label_set(submi, _("ICCCM/NetWM"));
>      e_menu_item_callback_set(submi, _e_border_menu_cb_prop, bd);
>      e_menu_item_icon_edje_set(submi,
>                                e_theme_edje_file_get("base/theme/borders",
>                                                      
> "e/widgets/border/default/properties"),
> -                                                   
> "e/widgets/border/default/properties");
> +                          "e/widgets/border/default/properties");
>   }
>
>   static void
> -_e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, 
> E_Menu_Item *mi)
> +_e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item 
> *mi)
>   {
>      E_Menu *subm;
>      E_Menu_Item *submi;
> @@ -589,17 +570,6 @@
>      e_object_data_set(E_OBJECT(subm), bd);
>      e_menu_item_submenu_set(mi, subm);
>
> -   if ((!bd->sticky)&&  ((bd->zone->desk_x_count>  1) || 
> (bd->zone->desk_y_count>  1)))
> -     {
> -        submi = e_menu_item_new(subm);
> -        e_menu_item_label_set(submi, _("Move to"));
> -        e_menu_item_submenu_pre_callback_set(submi, 
> _e_border_menu_cb_sendto_pre, bd);
> -        e_menu_item_icon_edje_set(submi,
> -                                  e_theme_edje_file_get("base/theme/borders",
> -                                                        
> "e/widgets/border/default/sendto"),
> -                                                        
> "e/widgets/border/default/sendto");
> -     }
> -
>      if (!bd->lock_user_sticky)
>        {
>           submi = e_menu_item_new(subm);
> @@ -610,43 +580,37 @@
>           e_menu_item_icon_edje_set(submi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
>                                                           
> "e/widgets/border/default/stick"),
> -                                                        
> "e/widgets/border/default/stick");
> +                               "e/widgets/border/default/stick");
>        }
>
> -   submi = e_menu_item_new(subm);
> -   e_menu_item_separator_set(submi, 1);
> -
> -   if ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
> -       (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
> +   if ((!bd->lock_user_iconify)&&  (!bd->fullscreen))
>        {
> -        if (!(((bd->client.icccm.min_w == bd->client.icccm.max_w)&&
> -               (bd->client.icccm.min_h == bd->client.icccm.max_h)) ||
> -              (bd->lock_user_maximize)))
> -          {
> -             if ((!bd->lock_user_maximize)&&  (!bd->shaded))
> -               {
> -                  submi = e_menu_item_new(subm);
> -                  e_menu_item_label_set(submi, _("Maximize"));
> -                  e_menu_item_submenu_pre_callback_set(submi, 
> _e_border_menu_cb_maximize_pre, bd);
> -                  e_menu_item_icon_edje_set(submi,
> -                                            
> e_theme_edje_file_get("base/theme/borders",
> -                                                                  
> "e/widgets/border/default/maximize"),
> -                                                                  
> "e/widgets/border/default/maximize");
> -               }
> -          }
> +     submi = e_menu_item_new(subm);
> +     e_menu_item_label_set(submi, _("Iconify"));
> +     e_menu_item_callback_set(submi, _e_border_menu_cb_iconify, bd);
> +     e_menu_item_icon_edje_set(submi,
> +                               e_theme_edje_file_get("base/theme/borders",
> +                                                     
> "e/widgets/border/default/minimize"),
> +                               "e/widgets/border/default/minimize");
> +     }
>
> -        if ((!bd->lock_user_iconify)&&  (!bd->fullscreen))
> -          {
> -             submi = e_menu_item_new(subm);
> -             e_menu_item_label_set(submi, _("Iconify"));
> -             e_menu_item_callback_set(submi, _e_border_menu_cb_iconify, bd);
> -             e_menu_item_icon_edje_set(submi,
> -                                       
> e_theme_edje_file_get("base/theme/borders",
> -                                                             
> "e/widgets/border/default/minimize"),
> -                                                             
> "e/widgets/border/default/minimize");
> -          }
> +   if ((!bd->lock_user_shade)&&  (!bd->fullscreen)&&  (!bd->maximized)&&
> +       ((!bd->client.border.name) || (strcmp("borderless", 
> bd->client.border.name))))
> +     {
> +        submi = e_menu_item_new(subm);
> +        e_menu_item_label_set(submi, _("Shade"));
> +        e_menu_item_check_set(submi, 1);
> +        e_menu_item_toggle_set(submi, (bd->shaded ? 1 : 0));
> +        e_menu_item_callback_set(submi, _e_border_menu_cb_shade, bd);
> +        e_menu_item_icon_edje_set(submi,
> +                                  e_theme_edje_file_get("base/theme/borders",
> +                                                        
> "e/widgets/border/default/shade"),
> +                               "e/widgets/border/default/shade");
>        }
>
> +   submi = e_menu_item_new(subm);
> +   e_menu_item_separator_set(submi, 1);
> +
>      if ((!bd->lock_user_location)&&  (!bd->fullscreen)&&
>          (((bd->maximized&  E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) || 
> e_config->allow_manip))
>        {
> @@ -656,11 +620,11 @@
>           e_menu_item_icon_edje_set(submi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
>                                                           
> "e/widgets/border/default/move_icon"),
> -                                                        
> "e/widgets/border/default/move_icon");
> +                               "e/widgets/border/default/move_icon");
>        }
>
>      if (((!bd->lock_user_size)&&  (!bd->fullscreen)&&
> -       (((bd->maximized&  E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) || 
> e_config->allow_manip))&&
> +     (((bd->maximized&  E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) || 
> e_config->allow_manip))&&
>          ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
>           (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN)))
>        {
> @@ -670,25 +634,40 @@
>           e_menu_item_icon_edje_set(submi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
>                                                           
> "e/widgets/border/default/resize_icon"),
> -                                                        
> "e/widgets/border/default/resize_icon");
> +                               "e/widgets/border/default/resize_icon");
>        }
>
> -   if ((!bd->lock_user_shade)&&  (!bd->fullscreen)&&  (!bd->maximized)&&
> -       ((!bd->client.border.name) || (strcmp("borderless", 
> bd->client.border.name))))
> +   submi = e_menu_item_new(subm);
> +   e_menu_item_separator_set(submi, 1);
> +
> +   if ((!bd->internal)&&  (!bd->lock_close))
>        {
>           submi = e_menu_item_new(subm);
> -        e_menu_item_label_set(submi, _("Shade"));
> -        e_menu_item_check_set(submi, 1);
> -        e_menu_item_toggle_set(submi, (bd->shaded ? 1 : 0));
> -        e_menu_item_callback_set(submi, _e_border_menu_cb_shade, bd);
> +        e_menu_item_label_set(submi, _("Kill"));
> +        e_menu_item_callback_set(submi, _e_border_menu_cb_kill, bd);
>           e_menu_item_icon_edje_set(submi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
> -                                                        
> "e/widgets/border/default/shade"),
> -                                                        
> "e/widgets/border/default/shade");
> +                                                        
> "e/widgets/border/default/kill"),
> +                               "e/widgets/border/default/kill");
>        }
>   }
>
>   static void
> +_e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, 
> E_Menu_Item *mi)
> +{
> +   E_Menu *subm;
> +   E_Menu_Item *submi;
> +   E_Border *bd;
> +
> +   if (!(bd = data)) return;
> +
> +   subm = e_menu_new();
> +   e_object_data_set(E_OBJECT(subm), bd);
> +   e_menu_item_submenu_set(mi, subm);
> +
> +}
> +
> +static void
>   _e_border_menu_cb_prop(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi 
> __UNUSED__)
>   {
>      E_Border *bd;
> @@ -867,8 +846,8 @@
>                e_menu_item_disabled_set(submi, EINA_TRUE);
>             }
>               
> -// FIXME: Remove labels and add deskpreview to menu.
> -// Evas_Object *o = e_widget_deskpreview_add(m->evas, 4, 2);
> +     // FIXME: Remove labels and add deskpreview to menu.
> +     // Evas_Object *o = e_widget_deskpreview_add(m->evas, 4, 2);
>
>           for (i = 0; i<  zone->desk_x_count * zone->desk_y_count; i++)
>             {
> @@ -985,7 +964,7 @@
>           e_menu_item_icon_edje_set(submi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
>                                                           
> "e/widgets/border/default/stack_on_top"),
> -                                                        
> "e/widgets/border/default/stack_on_top");
> +                               "e/widgets/border/default/stack_on_top");
>
>           submi = e_menu_item_new(subm);
>           e_menu_item_label_set(submi, _("Lower"));
> @@ -993,7 +972,7 @@
>           e_menu_item_icon_edje_set(submi,
>                                     
> e_theme_edje_file_get("base/theme/borders",
>                                                           
> "e/widgets/border/default/stack_below"),
> -                                                        
> "e/widgets/border/default/stack_below");
> +                               "e/widgets/border/default/stack_below");
>        }
>
>      submi = e_menu_item_new(subm);
> @@ -1011,7 +990,7 @@
>                e_menu_item_icon_edje_set(submi,
>                                          
> e_theme_edje_file_get("base/theme/borders",
>                                                                
> "e/widgets/border/default/stick"),
> -                                                             
> "e/widgets/border/default/stick");
> +                                    "e/widgets/border/default/stick");
>             }
>           if ((bd->client.netwm.state.stacking == E_STACKING_BELOW)&&
>               (bd->user_skip_winlist)&&  (bd->borderless))
> @@ -1022,7 +1001,7 @@
>                e_menu_item_icon_edje_set(submi,
>                                          
> e_theme_edje_file_get("base/theme/borders",
>                                                                
> "e/widgets/border/default/stick"),
> -                                                             
> "e/widgets/border/default/stick");
> +                                    "e/widgets/border/default/stick");
>             }
>        }
>   }
> @@ -1149,9 +1128,9 @@
>      e_menu_item_toggle_set(submi, (bd->offer_resistance ? 1 : 0));
>      e_menu_item_callback_set(submi, _e_border_menu_cb_resistance, bd);
>      e_menu_item_icon_edje_set(submi,
> -   e_theme_edje_file_get("base/theme/borders",
> -                             "e/widgets/border/default/borderless"),
> -                             "e/widgets/border/default/borderless");
> +                          e_theme_edje_file_get("base/theme/borders",
> +                                                
> "e/widgets/border/default/borderless"),
> +                          "e/widgets/border/default/borderless");
>   }
>
>   static void
>
>
> ------------------------------------------------------------------------------
> Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
> user administration capabilities and model configuration. Take
> the hassle out of deploying and managing Subversion and the
> tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
> _______________________________________________
> enlightenment-svn mailing list
> enlightenment-...@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn


------------------------------------------------------------------------------
uberSVN's rich system and user administration capabilities and model 
configuration take the hassle out of deploying and managing Subversion and 
the tools developers use with it. Learn more about uberSVN and get a free 
download at:  http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to