NorwayFun
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better Client List config dialog (fits small resolution screens). 

Fix formatting.

(May need label changes).



SVN revision: 46916
This commit is contained in:
Christopher Michael 2010-03-07 02:07:49 +00:00
parent 19bd523dc5
commit eda56c4c9d
1 changed files with 80 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
src/modules/conf_clientlist/e_int_config_clientlist.c
View File

@ -6,8 +6,8 @@
static void _fill_data(E_Config_Dialog_Data *cfdata); static void _fill_data(E_Config_Dialog_Data *cfdata);
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
@ -29,14 +29,12 @@ e_int_config_clientlist(E_Container *con, const char *params __UNUSED__)
if (e_config_dialog_find("E", "menus/client_list_menu")) if (e_config_dialog_find("E", "menus/client_list_menu"))
return NULL; return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data; v->create_cfdata = _create_data;
v->free_cfdata = _free_data; v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply_data; v->basic.apply_cfdata = _basic_apply;
v->basic.create_widgets = _basic_create_widgets; v->basic.create_widgets = _basic_create;
v->advanced.apply_cfdata = NULL;
v->advanced.create_widgets = NULL;
cfd = e_config_dialog_new(con, _("Client List Settings"), "E", cfd = e_config_dialog_new(con, _("Client List Settings"), "E",
"menus/client_list_menu", "menus/client_list_menu",
@ -74,14 +72,16 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
} }
static int static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
e_config->clientlist_group_by = cfdata->group_by; e_config->clientlist_group_by = cfdata->group_by;
e_config->clientlist_include_all_zones = cfdata->include_all_zones; e_config->clientlist_include_all_zones = cfdata->include_all_zones;
e_config->clientlist_separate_with = cfdata->separate_with; e_config->clientlist_separate_with = cfdata->separate_with;
e_config->clientlist_sort_by = cfdata->sort_by; e_config->clientlist_sort_by = cfdata->sort_by;
e_config->clientlist_separate_iconified_apps = cfdata->separate_iconified_apps; e_config->clientlist_separate_iconified_apps =
e_config->clientlist_warp_to_iconified_desktop = cfdata->warp_to_iconified_desktop; cfdata->separate_iconified_apps;
e_config->clientlist_warp_to_iconified_desktop =
cfdata->warp_to_iconified_desktop;
e_config->clientlist_limit_caption_len = cfdata->limit_caption_len; e_config->clientlist_limit_caption_len = cfdata->limit_caption_len;
e_config->clientlist_max_caption_len = cfdata->max_caption_len; e_config->clientlist_max_caption_len = cfdata->max_caption_len;
e_config_save_queue(); e_config_save_queue();
@ -89,69 +89,85 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
} }
static Evas_Object * static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of, *ob, *ot; Evas_Object *otb, *ol, *of, *ow;
E_Radio_Group *rg; E_Radio_Group *rg;
o = e_widget_list_add(evas, 0, 0); otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));
ot = e_widget_table_add(evas, 0);
ol = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Group By"), 0); of = e_widget_framelist_add(evas, _("Group By"), 0);
rg = e_widget_radio_group_new(&(cfdata->group_by)); rg = e_widget_radio_group_new(&(cfdata->group_by));
ob = e_widget_radio_add(evas, _("None"), E_CLIENTLIST_GROUP_NONE, rg); ow = e_widget_radio_add(evas, _("None"), E_CLIENTLIST_GROUP_NONE, rg);
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ow);
ob = e_widget_radio_add(evas, _("Desktop"), E_CLIENTLIST_GROUP_DESK, rg); ow = e_widget_radio_add(evas, _("Desktop"), E_CLIENTLIST_GROUP_DESK, rg);
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ow);
ob = e_widget_radio_add(evas, _("Window Class"), E_CLIENTLIST_GROUP_CLASS, rg); ow = e_widget_radio_add(evas, _("Window Class"), E_CLIENTLIST_GROUP_CLASS, rg);
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ow);
ob = e_widget_check_add(evas, _("Include windows from other screens"), &(cfdata->include_all_zones)); ow = e_widget_check_add(evas, _("Include windows from other screens"),
e_widget_framelist_object_append(of, ob); &(cfdata->include_all_zones));
e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1); e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(ol, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Separate Groups By"), 0);
e_widget_framelist_content_align_set(of, 0.0, 0.0); of = e_widget_framelist_add(evas, _("Seperate Groups By"), 0);
rg = e_widget_radio_group_new(&(cfdata->separate_with)); rg = e_widget_radio_group_new(&(cfdata->separate_with));
ob = e_widget_radio_add(evas, _("None"), E_CLIENTLIST_GROUP_SEP_NONE, rg); ow = e_widget_radio_add(evas, _("None"), E_CLIENTLIST_GROUP_SEP_NONE, rg);
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ow);
ob = e_widget_radio_add(evas, _("Using separator bars"), E_CLIENTLIST_GROUP_SEP_BAR, rg); ow = e_widget_radio_add(evas, _("Using separator bars"),
e_widget_framelist_object_append(of, ob); E_CLIENTLIST_GROUP_SEP_BAR, rg);
ob = e_widget_radio_add(evas, _("Using menus"), E_CLIENTLIST_GROUP_SEP_MENU, rg); e_widget_framelist_object_append(of, ow);
e_widget_framelist_object_append(of, ob); ow = e_widget_radio_add(evas, _("Using menus"),
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1); E_CLIENTLIST_GROUP_SEP_MENU, rg);
e_widget_framelist_object_append(of, ow);
of = e_widget_framelist_add(evas, _("Client Sort Order"), 0); e_widget_list_object_append(ol, of, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Grouping"), ol,
0, 0, 0, 0, 0.5, 0.0);
ol = e_widget_list_add(evas, 0, 0);
rg = e_widget_radio_group_new(&(cfdata->sort_by)); rg = e_widget_radio_group_new(&(cfdata->sort_by));
ob = e_widget_radio_add(evas, _("None"), E_CLIENTLIST_SORT_NONE, rg); ow = e_widget_radio_add(evas, _("None"), E_CLIENTLIST_SORT_NONE, rg);
e_widget_framelist_object_append(of, ob); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
ob = e_widget_radio_add(evas, _("Alphabetical"), E_CLIENTLIST_SORT_ALPHA, rg); ow = e_widget_radio_add(evas, _("Alphabetical"),
e_widget_framelist_object_append(of, ob); E_CLIENTLIST_SORT_ALPHA, rg);
ob = e_widget_radio_add(evas, _("Window stacking layer"), E_CLIENTLIST_SORT_ZORDER, rg); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_framelist_object_append(of, ob); ow = e_widget_radio_add(evas, _("Window stacking layer"),
ob = e_widget_radio_add(evas, _("Most recently used"), E_CLIENTLIST_SORT_MOST_RECENT, rg); E_CLIENTLIST_SORT_ZORDER, rg);
e_widget_framelist_object_append(of, ob); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 1, 1); ow = e_widget_radio_add(evas, _("Most recently used"),
E_CLIENTLIST_SORT_MOST_RECENT, rg);
of = e_widget_framelist_add(evas, _("Iconified Windows"), 0); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Sort Order"), ol,
0, 0, 0, 0, 0.5, 0.0);
ol = e_widget_list_add(evas, 0, 0);
rg = e_widget_radio_group_new(&(cfdata->separate_iconified_apps)); rg = e_widget_radio_group_new(&(cfdata->separate_iconified_apps));
ob = e_widget_radio_add(evas, _("Group with owning desktop"), E_CLIENTLIST_GROUPICONS_OWNER, rg); ow = e_widget_radio_add(evas, _("Group with owning desktop"),
e_widget_framelist_object_append(of, ob); E_CLIENTLIST_GROUPICONS_OWNER, rg);
ob = e_widget_radio_add(evas, _("Group with current desktop"), E_CLIENTLIST_GROUPICONS_CURRENT, rg); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_framelist_object_append(of, ob); ow = e_widget_radio_add(evas, _("Group with current desktop"),
ob = e_widget_radio_add(evas, _("Separate group"), E_CLIENTLIST_GROUPICONS_SEP, rg); E_CLIENTLIST_GROUPICONS_CURRENT, rg);
e_widget_framelist_object_append(of, ob); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
ob = e_widget_check_add(evas, _("Warp to owning desktop"), &(cfdata->warp_to_iconified_desktop)); ow = e_widget_radio_add(evas, _("Separate group"),
e_widget_framelist_object_append(of, ob); E_CLIENTLIST_GROUPICONS_SEP, rg);
e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
ow = e_widget_check_add(evas, _("Warp to owning desktop"),
&(cfdata->warp_to_iconified_desktop));
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Iconified Windows"), ol,
0, 0, 0, 0, 0.5, 0.0);
of = e_widget_framelist_add(evas, _("Menu Item Captions"), 0); ol = e_widget_list_add(evas, 0, 0);
ob = e_widget_check_add(evas, _("Limit caption length"), &(cfdata->limit_caption_len)); ow = e_widget_check_add(evas, _("Limit caption length"),
e_widget_framelist_object_append(of, ob); &(cfdata->limit_caption_len));
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f Chars"), 2.0, E_CLIENTLIST_MAX_CAPTION_LEN, 2.0, 0, NULL, &(cfdata->max_caption_len), 200); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_framelist_object_append(of, ob); ow = e_widget_slider_add(evas, 1, 0, _("%1.0f Chars"), 2.0,
e_widget_table_object_append(ot, of, 0, 2, 2, 1, 1, 1, 1, 0); E_CLIENTLIST_MAX_CAPTION_LEN, 2.0, 0, NULL,
&(cfdata->max_caption_len), 100);
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Captions"), ol,
0, 0, 0, 0, 0.5, 0.0);
e_widget_list_object_append(o, ot, 1, 1, 0.5); e_widget_toolbook_page_show(otb, 0);
return otb;
return o;
} }