Gadman Config for small screens. Patch by jf_simon (simon@jesusfreaks-herrenberg.de)

SVN revision: 48392
This commit is contained in:
Miculcy Brian 2010-04-28 14:30:28 +00:00
parent b76df169ab
commit e6d2c0f4bb
1 changed files with 28 additions and 36 deletions

View File

@ -23,8 +23,6 @@ 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 Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _basic_apply_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 Evas_Object *_adv_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _adv_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static void _fill_gadgets_list(Evas_Object *ilist); static void _fill_gadgets_list(Evas_Object *ilist);
static void _cb_add(void *data, void *data2); static void _cb_add(void *data, void *data2);
static void _avail_list_cb_change(void *data, Evas_Object *obj); static void _avail_list_cb_change(void *data, Evas_Object *obj);
@ -51,9 +49,7 @@ _config_gadman_module(E_Container *con, const char *params __UNUSED__)
v->free_cfdata = _free_data; v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create_widgets; v->basic.create_widgets = _basic_create_widgets;
v->basic.apply_cfdata = _basic_apply_data; v->basic.apply_cfdata = _basic_apply_data;
v->advanced.create_widgets = _adv_create_widgets;
v->advanced.apply_cfdata = _adv_apply_data;
snprintf(buf, sizeof(buf), "%s/e-module-gadman.edj", Man->module->dir); snprintf(buf, sizeof(buf), "%s/e-module-gadman.edj", Man->module->dir);
cfd = e_config_dialog_new(con, _("Gadgets Manager"), cfd = e_config_dialog_new(con, _("Gadgets Manager"),
"E", "extensions/gadman", "E", "extensions/gadman",
@ -100,10 +96,16 @@ _free_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_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of, *ob, *ol; Evas_Object *o, *ol, *ob, *ow, *ft, *of, *otb;
E_Radio_Group *rg;
Evas_Coord mw, mh; Evas_Coord mw, mh;
E_Fm2_Config fmc;
char path[PATH_MAX];
otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale);
o = e_widget_list_add(evas, 0, 0); o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Available Gadgets"), 0); of = e_widget_framelist_add(evas, _("Available Gadgets"), 0);
//o_avail List of available gadgets //o_avail List of available gadgets
@ -130,29 +132,13 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
e_dialog_resizable_set(cfd->dia, 1); e_dialog_resizable_set(cfd->dia, 1);
return o;
} e_widget_toolbook_page_append(otb, NULL, _("Add Gadget"), o, 1, 1, 1, 1, 0.5, 0.0);
o = e_widget_list_add(evas, 0, 0);
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
gadman_gadget_edit_end(NULL, NULL, NULL, NULL);
e_config_save_queue();
return 1;
}
static Evas_Object *
_adv_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *ow, *ft, *of;
E_Radio_Group *rg;
E_Fm2_Config fmc;
char path[PATH_MAX];
ft = e_widget_table_add(evas, 0); ft = e_widget_table_add(evas, 0);
//Background mode //Background mode
of = e_widget_frametable_add(evas, _("Background Mode"), 0); of = e_widget_frametable_add(evas, _("Mode"), 0);
rg = e_widget_radio_group_new(&(cfdata->bg_method)); rg = e_widget_radio_group_new(&(cfdata->bg_method));
ow = e_widget_radio_add(evas, _("Theme Defined"), BG_STD, rg); ow = e_widget_radio_add(evas, _("Theme Defined"), BG_STD, rg);
//~ evas_object_smart_callback_add(ow, "changed", _cb_method_change, cfdata); //~ evas_object_smart_callback_add(ow, "changed", _cb_method_change, cfdata);
@ -191,9 +177,11 @@ _adv_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfda
//Background filemanager chooser //Background filemanager chooser
of = e_widget_frametable_add(evas, _("Custom Image"), 0); of = e_widget_frametable_add(evas, _("Custom Image"), 0);
rg = e_widget_radio_group_new(&(cfdata->fmdir)); rg = e_widget_radio_group_new(&(cfdata->fmdir));
ow = e_widget_radio_add(evas, _("Personal"), 0, rg); ow = e_widget_radio_add(evas, _("Personal"), 0, rg);
e_widget_on_change_hook_set(ow, _cb_fm_radio_change, cfdata); e_widget_on_change_hook_set(ow, _cb_fm_radio_change, cfdata);
e_widget_frametable_object_append(of, ow, 0, 0, 1, 1, 1, 1, 0, 0); e_widget_frametable_object_append(of, ow, 0, 0, 1, 1, 1, 1, 0, 0);
ow = e_widget_radio_add(evas, _("System"), 1, rg); ow = e_widget_radio_add(evas, _("System"), 1, rg);
e_widget_on_change_hook_set(ow, _cb_fm_radio_change, cfdata); e_widget_on_change_hook_set(ow, _cb_fm_radio_change, cfdata);
e_widget_frametable_object_append(of, ow, 1, 0, 1, 1, 1, 1, 0, 0); e_widget_frametable_object_append(of, ow, 1, 0, 1, 1, 1, 1, 0, 0);
@ -201,7 +189,7 @@ _adv_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfda
cfdata->o_btn = e_widget_button_add(evas, _("Go up a Directory"), cfdata->o_btn = e_widget_button_add(evas, _("Go up a Directory"),
"widgets/up_dir", _cb_button_up, "widgets/up_dir", _cb_button_up,
cfdata, NULL); cfdata, NULL);
e_widget_frametable_object_append(of, cfdata->o_btn, 0, 1, 2, 1, 1, 1, 0, 0); e_widget_frametable_object_append(of, cfdata->o_btn, 0, 1, 2, 1, 1, 1, 1, 0);
if (cfdata->fmdir == 1) if (cfdata->fmdir == 1)
@ -217,8 +205,8 @@ _adv_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfda
fmc.view.selector = 1; fmc.view.selector = 1;
fmc.view.single_click = 0; fmc.view.single_click = 0;
fmc.view.no_subdir_jump = 0; fmc.view.no_subdir_jump = 0;
fmc.icon.list.w = 48; fmc.icon.list.w = 36;
fmc.icon.list.h = 48; fmc.icon.list.h = 36;
fmc.icon.fixed.w = 1; fmc.icon.fixed.w = 1;
fmc.icon.fixed.h = 1; fmc.icon.fixed.h = 1;
fmc.icon.extension.show = 0; fmc.icon.extension.show = 0;
@ -240,17 +228,20 @@ _adv_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfda
e_fm2_pan_get, e_fm2_pan_get,
e_fm2_pan_max_get, e_fm2_pan_max_get,
e_fm2_pan_child_size_get); e_fm2_pan_child_size_get);
e_widget_size_min_set(cfdata->o_sf, 200, 250); e_widget_size_min_set(cfdata->o_sf, 150, 250);
e_widget_frametable_object_append(of, cfdata->o_sf, 0, 2, 2, 1, 1, 1, 1, 1); e_widget_frametable_object_append(of, cfdata->o_sf, 0, 2, 2, 1, 1, 1, 1, 1);
e_widget_table_object_append(ft, of, 1, 0, 1, 3, 1, 1, 1, 1); e_widget_table_object_append(ft, of, 2, 0, 1, 3, 1, 1, 1, 1);
e_dialog_resizable_set(cfd->dia, 1); e_dialog_resizable_set(cfd->dia, 0);
return ft; e_widget_toolbook_page_append(otb, NULL, _("Background Options"), ft, 0, 0, 0, 0, 0.5, 0.0);
e_widget_toolbook_page_show(otb, 0);
return otb;
} }
static int static int
_adv_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
Eina_List *sel; Eina_List *sel;
const char *p = NULL; const char *p = NULL;
@ -279,7 +270,8 @@ _adv_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
} }
eina_list_free(sel); eina_list_free(sel);
} }
gadman_gadget_edit_end(NULL, NULL, NULL, NULL);
e_config_save_queue(); e_config_save_queue();
gadman_update_bg(); gadman_update_bg();