forked from enlightenment/enlightenment
futz around with config dialog layout - make it more able to fit in 640x480 -
if not perfectly, more "usably". SVN revision: 30388
This commit is contained in:
parent
1583bec0f8
commit
faad6364ea
|
@ -56,7 +56,7 @@ struct _CFText_Class
|
|||
};
|
||||
|
||||
const E_Text_Class_Pair text_class_predefined_names[ ] = {
|
||||
{ NULL, N_("Window Manager")},
|
||||
{ NULL, N_("Core")},
|
||||
{ "title_bar", N_("Title Bar")},
|
||||
{ "menu_item", N_("Menu Item")},
|
||||
{ "menu_title", N_("Menu Title")},
|
||||
|
@ -78,7 +78,7 @@ const E_Text_Class_Pair text_class_predefined_names[ ] = {
|
|||
{ "init_text", N_("Splash Text")},
|
||||
{ "init_version", N_("Splash Version")},
|
||||
|
||||
{ NULL, N_("Widget")},
|
||||
{ NULL, N_("Widgets")},
|
||||
{ "entry", N_("Entry")},
|
||||
{ "frame", N_("Frame")},
|
||||
{ "label", N_("Label")},
|
||||
|
@ -90,11 +90,11 @@ const E_Text_Class_Pair text_class_predefined_names[ ] = {
|
|||
{ "ilist_item", N_("List Item")},
|
||||
{ "ilist_header", N_("List Header")},
|
||||
|
||||
{ NULL, N_("EFM")},
|
||||
{ NULL, N_("Filemanager")},
|
||||
{ "fileman_typebuf", N_("Typebuf")},
|
||||
{ "fileman_icon", N_("Icon")},
|
||||
|
||||
{ NULL, N_("Module")},
|
||||
{ NULL, N_("Modules")},
|
||||
{ "module_small", N_("Small")},
|
||||
{ "module_normal", N_("Normal")},
|
||||
{ "module_large", N_("Large")},
|
||||
|
@ -611,7 +611,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
static Evas_Object *
|
||||
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *ot, *ob, *of, *ol;
|
||||
Evas_Object *ot, *ob, *of, *ol, *ol2;
|
||||
Evas_Coord w;
|
||||
E_Radio_Group *rg;
|
||||
Evas_List *next;
|
||||
|
@ -621,7 +621,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
cfdata->evas = evas;
|
||||
|
||||
/* Serup Section List */
|
||||
ol = e_widget_list_add(evas, 0, 0);
|
||||
ol = e_widget_list_add(evas, 0, 1);
|
||||
|
||||
/* Table for Font Class Setup */
|
||||
ot = e_widget_table_add(evas, 0);
|
||||
|
@ -631,7 +631,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
_class_list_load(cfdata);
|
||||
e_widget_ilist_multi_select_set(ob, 1);
|
||||
e_widget_min_size_get(ob, &w, NULL);
|
||||
e_widget_min_size_set(ob, w, 250);
|
||||
e_widget_min_size_set(ob, w, 180);
|
||||
e_widget_on_change_hook_set(ob, _adv_class_cb_change, cfdata);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_table_object_append(ot, of, 0, 0, 1, 2, 1, 1, 1, 1);
|
||||
|
@ -649,7 +649,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
cfdata->gui.style_list = ob;
|
||||
e_widget_on_change_hook_set(ob, _adv_style_cb_change, cfdata);
|
||||
e_widget_ilist_go(ob);
|
||||
e_widget_min_size_set(ob, 125, 125);
|
||||
e_widget_min_size_set(ob, 90, 90);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_table_object_append(ot, of, 2, 0, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
|
@ -657,7 +657,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
ob = e_widget_ilist_add(evas, 16, 16, NULL);
|
||||
cfdata->gui.size_list = ob;
|
||||
e_widget_ilist_go(ob);
|
||||
e_widget_min_size_set(ob, 125, 125);
|
||||
e_widget_min_size_set(ob, 90, 90);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_table_object_append(ot, of, 2, 1, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
|
@ -672,8 +672,10 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
e_widget_table_object_append(ot, ob, 1, 2, 2, 1, 1, 0, 1, 0);
|
||||
e_widget_list_object_append(ol, ot, 1, 1, 0.5);
|
||||
|
||||
ol2 = e_widget_list_add(evas, 0, 0);
|
||||
|
||||
/* Frame for Hinting Setup */
|
||||
of = e_widget_framelist_add(evas, _("Hinting"), 1);
|
||||
of = e_widget_framelist_add(evas, _("Hinting"), 0);
|
||||
rg = e_widget_radio_group_new(&(cfdata->hinting));
|
||||
option_enable = evas_font_hinting_can_hint(evas, EVAS_FONT_HINTING_BYTECODE);
|
||||
ob = e_widget_radio_add(evas, _("Bytecode"), 0, rg);
|
||||
|
@ -687,7 +689,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
ob = e_widget_radio_add(evas, _("None"), 2, rg);
|
||||
e_widget_disabled_set(ob, !option_enable);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_list_object_append(ol, of, 1, 1, 0.5);
|
||||
e_widget_list_object_append(ol2, of, 1, 1, 0.5);
|
||||
|
||||
/* Frame for Fallbacks Setup */
|
||||
of = e_widget_framelist_add(evas, _("Font Fallbacks"), 0);
|
||||
|
@ -706,12 +708,14 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
|
||||
ob = e_widget_check_add(evas, _("Enable Fallbacks"), &(cfdata->cur_fallbacks_enabled));
|
||||
e_widget_config_list_object_append(cfdata->gui.fallback_list, ob,
|
||||
0, 3, 2, 1, 1, 1, 1, 1);
|
||||
0, 0, 2, 1, 1, 1, 1, 1);
|
||||
e_widget_on_change_hook_set(ob, _adv_enabled_fallback_cb_change, cfdata);
|
||||
e_widget_check_checked_set(ob, option_enable);
|
||||
e_widget_change(ob);
|
||||
e_widget_list_object_append(ol, of, 1, 1, 0.5);
|
||||
e_widget_list_object_append(ol2, of, 1, 1, 0.5);
|
||||
|
||||
e_widget_list_object_append(ol, ol2, 1, 1, 0.5);
|
||||
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
return ol;
|
||||
}
|
||||
|
|
|
@ -223,7 +223,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
of = e_widget_frametable_add(evas, _("Key Bindings"), 0);
|
||||
ob = e_widget_ilist_add(evas, 32, 32, &(cfdata->locals.binding));
|
||||
cfdata->gui.o_binding_list = ob;
|
||||
e_widget_min_size_set(ob, 250, 280);
|
||||
e_widget_min_size_set(ob, 200, 200);
|
||||
e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 1);
|
||||
ob = e_widget_button_add(evas, _("Add Key"), NULL, _add_key_binding_cb, cfdata, NULL);
|
||||
cfdata->gui.o_add = ob;
|
||||
|
@ -248,7 +248,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
of = e_widget_framelist_add(evas, _("Action"), 0);
|
||||
ob = e_widget_ilist_add(evas, 24, 24, &(cfdata->locals.action));
|
||||
cfdata->gui.o_action_list = ob;
|
||||
e_widget_min_size_set(ob, 250, 325);
|
||||
e_widget_min_size_set(ob, 200, 280);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
|
|
|
@ -295,7 +295,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
ot = e_widget_frametable_add(evas, _("Mouse Bindings"), 0);
|
||||
ob = e_widget_ilist_add(evas, 32, 32, &(cfdata->locals.binding));
|
||||
cfdata->gui.o_binding_list = ob;
|
||||
e_widget_min_size_set(ob, 250, 280);
|
||||
e_widget_min_size_set(ob, 200, 200);
|
||||
e_widget_frametable_object_append(ot, ob, 0, 0, 2, 1, 1, 1, 1, 1);
|
||||
|
||||
ob = e_widget_button_add(evas, _("Add Binding"), NULL, _add_mouse_binding_cb, cfdata, NULL);
|
||||
|
@ -321,7 +321,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
of = e_widget_framelist_add(evas, _("Action"), 0);
|
||||
ob = e_widget_ilist_add(evas, 24, 24, &(cfdata->locals.action));
|
||||
cfdata->gui.o_action_list = ob;
|
||||
e_widget_min_size_set(ob, 250, 250);
|
||||
e_widget_min_size_set(ob, 200, 200);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_table_object_append(ot, of, 0, 0, 3, 1, 1, 1, 1, 1);
|
||||
|
||||
|
|
|
@ -203,7 +203,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
cfdata->gui.default_list = ob;
|
||||
e_widget_min_size_set(ob, 100, 100);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 1);
|
||||
e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
of = e_widget_framelist_add(evas, _("User Defined Directories"), 0);
|
||||
// e_widget_framelist_content_align_set(of, 0.5, 0.5);
|
||||
|
@ -211,7 +211,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
e_widget_disabled_set(ob, 1);
|
||||
cfdata->gui.user_list = ob;
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_table_object_append(o, of, 0, 1, 2, 1, 1, 0, 1, 0);
|
||||
e_widget_table_object_append(o, of, 1, 0, 1, 2, 0, 1, 0, 1);
|
||||
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
return o;
|
||||
|
|
|
@ -494,24 +494,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
e_widget_frametable_object_append(of, ob, 4, 3, 1, 1, 1, 1, 1, 1);
|
||||
e_widget_list_object_append(o2, of, 1, 1, 0.5);
|
||||
|
||||
of = e_widget_framelist_add(evas, _("Autohide"), 0);
|
||||
ob = e_widget_check_add(evas, _("Auto-hide the shelf"), &(cfdata->autohiding));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
rg = e_widget_radio_group_new(&(cfdata->autohiding_show_action));
|
||||
ob = e_widget_radio_add(evas, _("Show on mouse in"), 0, rg);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_radio_add(evas, _("Show on mouse click"), 1, rg);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_label_add(evas, _("Hide timeout"));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_slider_add(evas, 1, 0, _("%.1f seconds"), 0.2, 6.0, 0.2, 0, &(cfdata->hide_timeout), NULL, 100);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_label_add(evas, _("Hide duration"));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_slider_add(evas, 1, 0, _("%.1f seconds"), 0.1, 2.0, 0.1, 0, &(cfdata->hide_duration), NULL, 100);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_list_object_append(o2, of, 1, 1, 0.5);
|
||||
|
||||
e_widget_list_object_append(o, o2, 1, 1, 0.5);
|
||||
|
||||
o2 = e_widget_list_add(evas, 0, 0);
|
||||
|
@ -559,6 +541,28 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
ob = e_widget_button_add(evas, _("Configure Contents..."), "widget/config", _cb_configure, cfdata, NULL);
|
||||
e_widget_list_object_append(o2, ob, 0, 0, 0.5);
|
||||
|
||||
e_widget_list_object_append(o, o2, 0, 0, 0.0);
|
||||
|
||||
o2 = e_widget_list_add(evas, 0, 0);
|
||||
|
||||
of = e_widget_framelist_add(evas, _("Auto Hide"), 0);
|
||||
ob = e_widget_check_add(evas, _("Auto-hide the shelf"), &(cfdata->autohiding));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
rg = e_widget_radio_group_new(&(cfdata->autohiding_show_action));
|
||||
ob = e_widget_radio_add(evas, _("Show on mouse in"), 0, rg);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_radio_add(evas, _("Show on mouse click"), 1, rg);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_label_add(evas, _("Hide timeout"));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_slider_add(evas, 1, 0, _("%.1f seconds"), 0.2, 6.0, 0.2, 0, &(cfdata->hide_timeout), NULL, 60);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_label_add(evas, _("Hide duration"));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_slider_add(evas, 1, 0, _("%.1f seconds"), 0.1, 2.0, 0.1, 0, &(cfdata->hide_duration), NULL, 60);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_list_object_append(o2, of, 1, 1, 0.5);
|
||||
|
||||
e_widget_list_object_append(o, o2, 0, 0, 0.0);
|
||||
|
||||
return o;
|
||||
|
|
|
@ -50,50 +50,50 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas,
|
|||
wd = E_NEW(E_Widget_Data, 1);
|
||||
e_widget_data_set(obj, wd);
|
||||
|
||||
o = e_widget_table_add(evas, 1);
|
||||
o = e_widget_table_add(evas, 0);
|
||||
wd->gui.table = o;
|
||||
e_widget_sub_object_add(obj, o);
|
||||
|
||||
o = e_widget_button_add(evas, _("Move Up"), "widget/up_arrow",
|
||||
_button_cb_up, wd, NULL);
|
||||
wd->gui.up = o;
|
||||
o = e_widget_button_add(evas, _("Add"), NULL, _button_cb_add, wd, obj);
|
||||
wd->gui.add = o;
|
||||
e_widget_disabled_set(o, 1);
|
||||
e_widget_table_object_append(wd->gui.table, o, 2, 0, 1, 1, 1, 1, 1, 1);
|
||||
e_widget_table_object_append(wd->gui.table, o, 0, 1, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
|
||||
o = e_widget_button_add(evas, _("Move Down"), "widget/down_arrow",
|
||||
_button_cb_down, wd, NULL);
|
||||
wd->gui.down = o;
|
||||
o = e_widget_button_add(evas, _("Remove"), NULL, _button_cb_remove, wd, obj);
|
||||
wd->gui.remove = o;
|
||||
e_widget_disabled_set(o, 1);
|
||||
e_widget_table_object_append(wd->gui.table, o, 2, 3, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
o = e_widget_ilist_add(evas, 0, 0, NULL);
|
||||
wd->gui.list = o;
|
||||
e_widget_disabled_set(o, 1);
|
||||
e_widget_min_size_set(o, 100, 100);
|
||||
e_widget_on_change_hook_set(o, _list_cb_change, wd);
|
||||
e_widget_ilist_go(o);
|
||||
e_widget_table_object_append(wd->gui.table, o, 3, 0, listspan, 4, 1, 1, 1, 1);
|
||||
|
||||
e_widget_table_object_append(wd->gui.table, o, 1, 1, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
o = e_widget_label_add(evas, label);
|
||||
e_widget_table_object_append(wd->gui.table, o, 0, 0, 2, 1, 1, 1, 1, 1);
|
||||
e_widget_table_object_append(wd->gui.table, o, 0, 2, 2, 1, 1, 1, 1, 1);
|
||||
|
||||
o = func_entry_add(evas, &(wd->cur_entry));
|
||||
wd->gui.entry = o;
|
||||
e_widget_disabled_set(o, 1);
|
||||
e_widget_min_size_set(o, 100, 25);
|
||||
e_widget_table_object_append(wd->gui.table, o, 0, 1, 2, 1, 1, 1, 1, 1);
|
||||
e_widget_table_object_append(wd->gui.table, o, 0, 3, 2, 1, 1, 1, 1, 1);
|
||||
|
||||
o = e_widget_button_add(evas, _("Add"), NULL, _button_cb_add, wd, obj);
|
||||
wd->gui.add = o;
|
||||
o = e_widget_button_add(evas, _("Up"), "widget/up_arrow",
|
||||
_button_cb_up, wd, NULL);
|
||||
wd->gui.up = o;
|
||||
e_widget_disabled_set(o, 1);
|
||||
e_widget_table_object_append(wd->gui.table, o, 2, 1, 1, 1, 1, 1, 1, 1);
|
||||
e_widget_table_object_append(wd->gui.table, o, 0, 4, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
o = e_widget_button_add(evas, _("Remove"), NULL, _button_cb_remove, wd, obj);
|
||||
wd->gui.remove = o;
|
||||
|
||||
o = e_widget_button_add(evas, _("Down"), "widget/down_arrow",
|
||||
_button_cb_down, wd, NULL);
|
||||
wd->gui.down = o;
|
||||
e_widget_disabled_set(o, 1);
|
||||
e_widget_table_object_append(wd->gui.table, o, 2, 2, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
e_widget_table_object_append(wd->gui.table, o, 1, 4, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
o = e_widget_ilist_add(evas, 0, 0, NULL);
|
||||
wd->gui.list = o;
|
||||
e_widget_disabled_set(o, 1);
|
||||
e_widget_min_size_set(o, 80, 80);
|
||||
e_widget_on_change_hook_set(o, _list_cb_change, wd);
|
||||
e_widget_ilist_go(o);
|
||||
e_widget_table_object_append(wd->gui.table, o, 0, 5, 2, 1, 1, 1, 1, 1);
|
||||
|
||||
e_widget_min_size_get(wd->gui.table, &mw, &mh);
|
||||
e_widget_min_size_set(obj, mw, mh);
|
||||
e_widget_resize_object_set(obj, wd->gui.table);
|
||||
|
|
Loading…
Reference in New Issue