enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

e settings: merge window geometry and maximization policy settings. 

SVN revision: 73511
This commit is contained in:
Chidambar Zinnoury 2012-07-10 05:01:00 +00:00
parent 37347a6a0a
commit e70e5698e7
6 changed files with 57 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
po/POTFILES.in
View File

@ -191,7 +191,6 @@ src/modules/conf_window_manipulation/e_int_config_clientlist.c
src/modules/conf_window_manipulation/e_int_config_window_display.c
src/modules/conf_window_manipulation/e_int_config_focus.c
src/modules/conf_window_manipulation/e_int_config_window_geometry.c
src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
src/modules/conf_window_manipulation/e_int_config_window_process.c
src/modules/conf_window_manipulation/e_mod_main.c
src/modules/conf_window_remembers/e_int_config_remembers.c

1
src/modules/conf_window_manipulation/Makefile.am
View File

@ -22,7 +22,6 @@ module_la_SOURCES = e_mod_main.c \
e_mod_main.h \
e_int_config_window_manip.h \
e_int_config_window_geometry.c \
e_int_config_window_maxpolicy.c \
e_int_config_window_process.c \
e_int_config_window_display.c \
e_int_config_window_display.h \

57
src/modules/conf_window_manipulation/e_int_config_window_geometry.c
View File

@ -38,6 +38,10 @@ struct _E_Config_Dialog_Data
int desktop;
int iconify;
} transient;
int maximize_policy;
int maximize_direction;
int maximized_allow_manip;
int border_fix_on_shelf_toggle;
Eina_List *resistance_list;
};
@ -86,6 +90,15 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
cfdata->transient.layer = e_config->transient.layer;
cfdata->transient.desktop = e_config->transient.desktop;
cfdata->transient.iconify = e_config->transient.iconify;
cfdata->maximize_policy = (e_config->maximize_policy & E_MAXIMIZE_TYPE);
if (cfdata->maximize_policy == E_MAXIMIZE_NONE)
cfdata->maximize_policy = E_MAXIMIZE_FULLSCREEN;
cfdata->maximize_direction =
(e_config->maximize_policy & E_MAXIMIZE_DIRECTION);
if (!cfdata->maximize_direction)
cfdata->maximize_direction = E_MAXIMIZE_BOTH;
cfdata->maximized_allow_manip = e_config->allow_manip;
cfdata->border_fix_on_shelf_toggle = e_config->border_fix_on_shelf_toggle;
return cfdata;
}
@ -117,6 +130,10 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
e_config->transient.layer = cfdata->transient.layer;
e_config->transient.desktop = cfdata->transient.desktop;
e_config->transient.iconify = cfdata->transient.iconify;
e_config->maximize_policy =
(cfdata->maximize_policy | cfdata->maximize_direction);
e_config->allow_manip = cfdata->maximized_allow_manip;
e_config->border_fix_on_shelf_toggle = cfdata->border_fix_on_shelf_toggle;
e_config_save_queue();
return 1; /* Apply was OK */
}
@ -141,13 +158,17 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
(e_config->transient.lower != cfdata->transient.lower) ||
(e_config->transient.layer != cfdata->transient.layer) ||
(e_config->transient.desktop != cfdata->transient.desktop) ||
(e_config->transient.iconify != cfdata->transient.iconify));
(e_config->transient.iconify != cfdata->transient.iconify) ||
(e_config->maximize_policy != (cfdata->maximize_policy | cfdata->maximize_direction)) ||
(e_config->allow_manip != cfdata->maximized_allow_manip) ||
(e_config->border_fix_on_shelf_toggle != cfdata->border_fix_on_shelf_toggle));
}
static Evas_Object *
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *otb, *ol, *ow, *oc;
Evas_Object *otb, *ol, *of, *ow, *oc;
E_Radio_Group *rg;
otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
@ -187,6 +208,35 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
e_widget_toolbook_page_append(otb, NULL, _("Resistance"), ol,
1, 0, 1, 0, 0.5, 0.0);
/* Maximization */
ol = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Policy"), 0);
rg = e_widget_radio_group_new(&(cfdata->maximize_policy));
ow = e_widget_radio_add(evas, _("Fullscreen"), E_MAXIMIZE_FULLSCREEN, rg);
e_widget_framelist_object_append(of, ow);
/* FIXME smart is nothing else than expand - dont confuse users */
ow = e_widget_radio_add(evas, _("Smart expansion"), E_MAXIMIZE_SMART, rg);
e_widget_framelist_object_append(of, ow);
/* ob = e_widget_radio_add(evas, _("Expand the window"), E_MAXIMIZE_EXPAND, rg);
* e_widget_list_object_append(o, ob, 1, 1, 0.5); */
ow = e_widget_radio_add(evas, _("Fill available space"), E_MAXIMIZE_FILL, rg);
e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(ol, of, 1, 0, 0.5);
of = e_widget_framelist_add(evas, _("Direction"), 0);
rg = e_widget_radio_group_new(&(cfdata->maximize_direction));
ow = e_widget_radio_add(evas, _("Horizontal"), E_MAXIMIZE_HORIZONTAL, rg);
e_widget_framelist_object_append(of, ow);
ow = e_widget_radio_add(evas, _("Vertical"), E_MAXIMIZE_VERTICAL, rg);
e_widget_framelist_object_append(of, ow);
ow = e_widget_radio_add(evas, _("Both"), E_MAXIMIZE_BOTH, rg);
e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(ol, of, 1, 0, 0.5);
ow = e_widget_check_add(evas, _("Allow manipulation of maximized windows"),
&(cfdata->maximized_allow_manip));
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Maximization"), ol,
1, 0, 1, 0, 0.5, 0.0);
/* Keyboard Move and resize */
ol = e_widget_list_add(evas, 0, 0);
ow = e_widget_label_add(evas, _("Automatically accept changes after:"));
@ -216,6 +266,9 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
ow = e_widget_check_add(evas, _("Move after resize"),
&(cfdata->geometry_auto_move));
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
ow = e_widget_check_add(evas, _("Adjust windows on shelf hide"),
&(cfdata->border_fix_on_shelf_toggle));
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Automatic"), ol,
1, 0, 1, 0, 0.5, 0.0);

1
src/modules/conf_window_manipulation/e_int_config_window_manip.h
View File

@ -4,7 +4,6 @@
#define E_INT_CONFIG_WINDOW_MANIPULATION_H
E_Config_Dialog *e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__);
E_Config_Dialog *e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__);
E_Config_Dialog *e_int_config_window_process(E_Container *con, const char *params __UNUSED__);
#endif

191
src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
View File

@ -1,191 +0,0 @@
#include "e.h"
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _advanced_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _advanced_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static Evas_Object *_advanced_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
/* Actual config data we will be playing with whil the dialog is active */
struct _E_Config_Dialog_Data
{
/*- BASIC -*/
int maximize_policy;
/*- ADVANCED -*/
int maximize_direction;
int allow_manip;
int border_fix_on_shelf_toggle;
};
E_Config_Dialog *
e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "windows/window_maxpolicy_dialog"))
return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
/* methods */
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply;
v->basic.create_widgets = _basic_create;
v->basic.check_changed = _basic_check_changed;
v->advanced.apply_cfdata = _advanced_apply;
v->advanced.create_widgets = _advanced_create;
v->advanced.check_changed = _advanced_check_changed;
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con, _("Window Maximize Policy"),
"E", "windows/window_maxpolicy_dialog",
"preferences-window-manipulation", 0, v, NULL);
return cfd;
}
static void *
_create_data(E_Config_Dialog *cfd __UNUSED__)
{
E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
if (!cfdata) return NULL;
cfdata->maximize_policy = (e_config->maximize_policy & E_MAXIMIZE_TYPE);
if (cfdata->maximize_policy == E_MAXIMIZE_NONE)
cfdata->maximize_policy = E_MAXIMIZE_FULLSCREEN;
cfdata->maximize_direction =
(e_config->maximize_policy & E_MAXIMIZE_DIRECTION);
if (!cfdata->maximize_direction)
cfdata->maximize_direction = E_MAXIMIZE_BOTH;
cfdata->allow_manip = e_config->allow_manip;
cfdata->border_fix_on_shelf_toggle = e_config->border_fix_on_shelf_toggle;
return cfdata;
}
static void
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
E_FREE(cfdata);
}
static int
_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
e_config->maximize_policy =
(cfdata->maximize_policy | cfdata->maximize_direction);
e_config_save_queue();
return 1;
}
static int
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
return (e_config->maximize_policy !=
(cfdata->maximize_policy | cfdata->maximize_direction));
}
static int
_advanced_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
e_config->maximize_policy =
(cfdata->maximize_policy | cfdata->maximize_direction);
e_config->allow_manip = cfdata->allow_manip;
e_config->border_fix_on_shelf_toggle = cfdata->border_fix_on_shelf_toggle;
e_config_save_queue();
return 1;
}
static int
_advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
return ((e_config->maximize_policy != (cfdata->maximize_policy | cfdata->maximize_direction)) ||
(e_config->allow_manip != cfdata->allow_manip) ||
(e_config->border_fix_on_shelf_toggle != cfdata->border_fix_on_shelf_toggle));
}
static Evas_Object *
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ob, *of;
E_Radio_Group *rg;
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Maximize Policy"), 0);
rg = e_widget_radio_group_new(&(cfdata->maximize_policy));
ob = e_widget_radio_add(evas, _("Fullscreen"), E_MAXIMIZE_FULLSCREEN, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Smart expansion"), E_MAXIMIZE_SMART, rg);
e_widget_framelist_object_append(of, ob);
/* ob = e_widget_radio_add(evas, _("Expand the window"), E_MAXIMIZE_EXPAND, rg);
* e_widget_list_object_append(o, ob, 1, 1, 0.5); */
ob = e_widget_radio_add(evas, _("Fill available space"), E_MAXIMIZE_FILL, rg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 0, 0.5);
return o;
}
static Evas_Object *
_advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *otb, *ol, *ow;
E_Radio_Group *rg;
otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
/* Policy */
ol = e_widget_list_add(evas, 0, 0);
rg = e_widget_radio_group_new(&(cfdata->maximize_policy));
ow = e_widget_radio_add(evas, _("Fullscreen"), E_MAXIMIZE_FULLSCREEN, rg);
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
/* FIXME smart is nothing else than expand - dont confuse users */
ow = e_widget_radio_add(evas, _("Smart expansion"), E_MAXIMIZE_SMART, rg);
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
/* ow = e_widget_radio_add(evas, _("Expand the window"), E_MAXIMIZE_EXPAND, rg);
e_widget_list_object_append(ol, ow, 1, 0, 0.5); */
ow = e_widget_radio_add(evas, _("Fill available space"),
E_MAXIMIZE_FILL, rg);
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Policy"), ol,
1, 0, 1, 0, 0.5, 0.0);
/* Directions */
ol = e_widget_list_add(evas, 0, 0);
rg = e_widget_radio_group_new(&(cfdata->maximize_direction));
ow = e_widget_radio_add(evas, _("Horizontal"), E_MAXIMIZE_HORIZONTAL, rg);
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
ow = e_widget_radio_add(evas, _("Vertical"), E_MAXIMIZE_VERTICAL, rg);
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
ow = e_widget_radio_add(evas, _("Both"), E_MAXIMIZE_BOTH, rg);
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Direction"), ol,
1, 0, 1, 0, 0.5, 0.0);
/* Misc */
ol = e_widget_list_add(evas, 0, 0);
/* FIXME this should be default imho. no big deal if one resizes
a maximized window by mistake and then it's not maximized
anymore.. people will rather wonder why they can't shade
their window (hannes)
k-s: often this also mean disable such border decoration, so makes sense.
I'd say it makes no sense to move/resize maximized windows :-)
*/
ow = e_widget_check_add(evas, _("Allow manipulation of maximized windows"),
&(cfdata->allow_manip));
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
ow = e_widget_check_add(evas, _("Adjust windows on shelf hide"),
&(cfdata->border_fix_on_shelf_toggle));
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Miscellaneous"), ol,
1, 0, 1, 0, 0.5, 0.0);
e_widget_toolbook_page_show(otb, 0);
return otb;
}

7
src/modules/conf_window_manipulation/e_mod_main.c
View File

@ -18,9 +18,8 @@ e_modapi_init(E_Module *m)
e_configure_registry_item_add("windows/window_display", 10, _("Window Display"), NULL, "preferences-system-windows", e_int_config_window_display);
e_configure_registry_item_add("windows/window_focus", 20, _("Window Focus"), NULL, "preferences-focus", e_int_config_focus);
e_configure_registry_item_add("windows/window_geometry", 30, _("Window Geometry"), NULL, "preferences-window-geometry", e_int_config_window_geometry);
e_configure_registry_item_add("windows/window_maxpolicy", 40, _("Window Maximize Policy"), NULL, "preferences-window-maximize", e_int_config_window_maxpolicy);
e_configure_registry_item_add("windows/window_list_menu", 50, _("Window List Menu"), NULL, "preferences-winlist", e_int_config_clientlist);
e_configure_registry_item_add("windows/window_process", 60, _("Window Process Management"), NULL, "preferences-window-process", e_int_config_window_process);
e_configure_registry_item_add("windows/window_list_menu", 40, _("Window List Menu"), NULL, "preferences-winlist", e_int_config_clientlist);
e_configure_registry_item_add("windows/window_process", 50, _("Window Process Management"), NULL, "preferences-window-process", e_int_config_window_process);
conf_module = m;
e_module_delayed_set(m, 1);
return m;
@ -32,13 +31,11 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
E_Config_Dialog *cfd;
while ((cfd = e_config_dialog_get("E", "windows/window_process"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_list_menu"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_maxpolicy_dialog"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_geometry"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_focus"))) e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "windows/window_display"))) e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("windows/window_process");
e_configure_registry_item_del("windows/window_list_menu");
e_configure_registry_item_del("windows/window_maxpolicy");
e_configure_registry_item_del("windows/window_geometry");
e_configure_registry_item_del("windows/window_focus");
e_configure_registry_item_del("windows/window_display");