forked from enlightenment/enlightenment
revert all window menu changes since august of last year
I tried to like the new layout, but it required way too much navigation for most commonly used functions if people really liked the other layout, perhaps it can be merged as a config option. SVN revision: 69262
This commit is contained in:
parent
a35a47a558
commit
2674d7eedc
|
@ -19,6 +19,7 @@ static void _e_border_menu_cb_resistance(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
static void _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item *mi);
|
static void _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||||
static void _e_border_menu_cb_application_pre(void *data, E_Menu *m, E_Menu_Item *mi);
|
static void _e_border_menu_cb_application_pre(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||||
static void _e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi);
|
static void _e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi);
|
||||||
|
static void _e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi);
|
||||||
static void _e_border_menu_cb_prop(void *data, E_Menu *m, E_Menu_Item *mi);
|
static void _e_border_menu_cb_prop(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||||
static void _e_border_menu_cb_stick(void *data, E_Menu *m, E_Menu_Item *mi);
|
static void _e_border_menu_cb_stick(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||||
static void _e_border_menu_cb_stacking_pre(void *data, E_Menu *m, E_Menu_Item *mi);
|
static void _e_border_menu_cb_stacking_pre(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||||
|
@ -47,7 +48,6 @@ static void _e_border_menu_cb_iconpref_netwm(void *data, E_Menu *m, E_Menu_Item
|
||||||
static void _e_border_menu_cb_iconpref_user(void *data, E_Menu *m, E_Menu_Item *mi);
|
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_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_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
|
EAPI void
|
||||||
e_int_border_menu_create(E_Border *bd)
|
e_int_border_menu_create(E_Border *bd)
|
||||||
|
@ -76,51 +76,6 @@ e_int_border_menu_create(E_Border *bd)
|
||||||
e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_application_pre, bd);
|
e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_application_pre, bd);
|
||||||
if (bd->desktop)
|
if (bd->desktop)
|
||||||
e_util_desktop_menu_item_icon_add(bd->desktop, 16, mi);
|
e_util_desktop_menu_item_icon_add(bd->desktop, 16, mi);
|
||||||
|
|
||||||
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);
|
|
||||||
e_menu_item_label_set(mi, _("Move to"));
|
|
||||||
e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_sendto_pre, bd);
|
|
||||||
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");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mi = e_menu_item_new(m);
|
mi = e_menu_item_new(m);
|
||||||
|
@ -134,13 +89,42 @@ e_int_border_menu_create(E_Border *bd)
|
||||||
mi = e_menu_item_new(m);
|
mi = e_menu_item_new(m);
|
||||||
e_menu_item_separator_set(mi, 1);
|
e_menu_item_separator_set(mi, 1);
|
||||||
|
|
||||||
|
if ((!bd->sticky) && ((bd->zone->desk_x_count > 1) || (bd->zone->desk_y_count > 1)))
|
||||||
|
{
|
||||||
mi = e_menu_item_new(m);
|
mi = e_menu_item_new(m);
|
||||||
e_menu_item_label_set(mi, _("Settings"));
|
e_menu_item_label_set(mi, _("Move to"));
|
||||||
e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_settings_pre, bd);
|
e_menu_item_submenu_pre_callback_set(mi, _e_border_menu_cb_sendto_pre, bd);
|
||||||
e_menu_item_icon_edje_set(mi,
|
e_menu_item_icon_edje_set(mi,
|
||||||
e_theme_edje_file_get("base/theme/borders",
|
e_theme_edje_file_get("base/theme/borders",
|
||||||
"e/widgets/border/default/settings"),
|
"e/widgets/border/default/sendto"),
|
||||||
"e/widgets/border/default/settings");
|
"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_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");
|
||||||
|
|
||||||
|
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");
|
||||||
|
}
|
||||||
|
|
||||||
if (!bd->lock_close)
|
if (!bd->lock_close)
|
||||||
{
|
{
|
||||||
|
@ -497,7 +481,7 @@ _e_border_menu_cb_application_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_border_menu_cb_settings_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 *subm;
|
||||||
E_Menu_Item *submi;
|
E_Menu_Item *submi;
|
||||||
|
@ -509,6 +493,36 @@ _e_border_menu_cb_settings_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
|
||||||
e_object_data_set(E_OBJECT(subm), bd);
|
e_object_data_set(E_OBJECT(subm), bd);
|
||||||
e_menu_item_submenu_set(mi, subm);
|
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))
|
||||||
|
{
|
||||||
|
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_icon_edje_set(submi,
|
||||||
|
e_theme_edje_file_get("base/theme/borders",
|
||||||
|
"e/widgets/border/default/stacking"),
|
||||||
|
"e/widgets/border/default/stacking");
|
||||||
|
}
|
||||||
|
|
||||||
|
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");
|
||||||
|
|
||||||
if (!bd->lock_border)
|
if (!bd->lock_border)
|
||||||
{
|
{
|
||||||
submi = e_menu_item_new(subm);
|
submi = e_menu_item_new(subm);
|
||||||
|
@ -520,6 +534,9 @@ _e_border_menu_cb_settings_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
|
||||||
"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);
|
submi = e_menu_item_new(subm);
|
||||||
e_menu_item_label_set(submi, _("Locks"));
|
e_menu_item_label_set(submi, _("Locks"));
|
||||||
e_menu_item_callback_set(submi, _e_border_menu_cb_locks, bd);
|
e_menu_item_callback_set(submi, _e_border_menu_cb_locks, bd);
|
||||||
|
@ -539,6 +556,17 @@ _e_border_menu_cb_settings_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
|
||||||
submi = e_menu_item_new(subm);
|
submi = e_menu_item_new(subm);
|
||||||
e_menu_item_separator_set(submi, 1);
|
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);
|
submi = e_menu_item_new(subm);
|
||||||
e_menu_item_label_set(submi, _("ICCCM/NetWM"));
|
e_menu_item_label_set(submi, _("ICCCM/NetWM"));
|
||||||
e_menu_item_callback_set(submi, _e_border_menu_cb_prop, bd);
|
e_menu_item_callback_set(submi, _e_border_menu_cb_prop, bd);
|
||||||
|
@ -549,7 +577,7 @@ _e_border_menu_cb_settings_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
|
_e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
|
||||||
{
|
{
|
||||||
E_Menu *subm;
|
E_Menu *subm;
|
||||||
E_Menu_Item *submi;
|
E_Menu_Item *submi;
|
||||||
|
@ -561,6 +589,17 @@ _e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
|
||||||
e_object_data_set(E_OBJECT(subm), bd);
|
e_object_data_set(E_OBJECT(subm), bd);
|
||||||
e_menu_item_submenu_set(mi, subm);
|
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)
|
if (!bd->lock_user_sticky)
|
||||||
{
|
{
|
||||||
submi = e_menu_item_new(subm);
|
submi = e_menu_item_new(subm);
|
||||||
|
@ -575,15 +614,38 @@ _e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
|
||||||
}
|
}
|
||||||
|
|
||||||
submi = e_menu_item_new(subm);
|
submi = e_menu_item_new(subm);
|
||||||
e_menu_item_label_set(submi, _("Skip"));
|
e_menu_item_separator_set(submi, 1);
|
||||||
e_menu_item_submenu_pre_callback_set(submi, _e_border_menu_cb_skip_pre, bd);
|
|
||||||
|
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))
|
||||||
|
{
|
||||||
|
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_menu_item_icon_edje_set(submi,
|
||||||
e_theme_edje_file_get("base/theme/borders",
|
e_theme_edje_file_get("base/theme/borders",
|
||||||
"e/widgets/border/default/skip"),
|
"e/widgets/border/default/maximize"),
|
||||||
"e/widgets/border/default/skip");
|
"e/widgets/border/default/maximize");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((!bd->lock_user_iconify) && (!bd->fullscreen))
|
||||||
|
{
|
||||||
submi = e_menu_item_new(subm);
|
submi = e_menu_item_new(subm);
|
||||||
e_menu_item_separator_set(submi, 1);
|
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_location) && (!bd->fullscreen) &&
|
if ((!bd->lock_user_location) && (!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))
|
||||||
|
@ -611,20 +673,6 @@ _e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
|
||||||
"e/widgets/border/default/resize_icon");
|
"e/widgets/border/default/resize_icon");
|
||||||
}
|
}
|
||||||
|
|
||||||
submi = e_menu_item_new(subm);
|
|
||||||
e_menu_item_separator_set(submi, 1);
|
|
||||||
|
|
||||||
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) &&
|
if ((!bd->lock_user_shade) && (!bd->fullscreen) && (!bd->maximized) &&
|
||||||
((!bd->client.border.name) || (strcmp("borderless", bd->client.border.name))))
|
((!bd->client.border.name) || (strcmp("borderless", bd->client.border.name))))
|
||||||
{
|
{
|
||||||
|
@ -638,20 +686,6 @@ _e_border_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
|
||||||
"e/widgets/border/default/shade"),
|
"e/widgets/border/default/shade"),
|
||||||
"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->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");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue