forked from enlightenment/enlightenment
All config dialogs should now use E_FREE for things created by E_NEW.
Lots of formatting fixes in the config dialogs. SVN revision: 28004
This commit is contained in:
parent
e7c6ae29aa
commit
e6b814c6dc
|
@ -107,7 +107,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
E_FREE(m);
|
||||
}
|
||||
E_FREE(cfdata->themename);
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -200,7 +200,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
}
|
||||
}
|
||||
e_widget_ilist_append(ilist, oc, cm->theme->name, NULL, NULL, cm->name);
|
||||
if (strcmp(cfdata->themename, cm->name) == 0)
|
||||
if (!strcmp(cfdata->themename, cm->name))
|
||||
e_widget_ilist_selected_set(ilist, i);
|
||||
i++;
|
||||
}
|
||||
|
@ -272,11 +272,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
|
||||
e_widget_table_object_append(ot, of, 2, 0, 2, 4, 1, 1, 1, 1);
|
||||
e_widget_list_object_append(o, ot, 1, 1, 0.5);
|
||||
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
|
||||
_ilist_cb_change(cfdata, ilist);
|
||||
|
||||
return o;
|
||||
}
|
||||
|
||||
|
@ -333,11 +330,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
|
||||
e_widget_framelist_object_append(of, ilist);
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
|
||||
_ilist_cb_change(cfdata, ilist);
|
||||
|
||||
return o;
|
||||
}
|
||||
|
||||
|
|
|
@ -35,7 +35,6 @@ static const char* _e_imc_file_name_new_get (void);
|
|||
static Evas_Bool _change_hash_free_cb (Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _change_hash_apply_cb (Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
|
||||
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
E_Config_Dialog *cfd;
|
||||
|
@ -44,26 +43,21 @@ struct _E_Config_Dialog_Data
|
|||
Evas_Object *o_personal;
|
||||
Evas_Object *o_system;
|
||||
Evas_Object *o_up_button;
|
||||
|
||||
Evas_Object *o_fm; /* File manager */
|
||||
Evas_Object *o_frame; /* scrollpane for file manager*/
|
||||
|
||||
char *imc_current;
|
||||
|
||||
int imc_disable; /* 0=enable, 1=disable */
|
||||
int fmdir; /* 0=Local, 1=System*/
|
||||
struct
|
||||
{
|
||||
int dirty;
|
||||
|
||||
char *e_im_name;
|
||||
char *e_im_exec;
|
||||
|
||||
char *gtk_im_module;
|
||||
char *qt_im_module;
|
||||
char *xmodifiers;
|
||||
}
|
||||
imc;
|
||||
} imc;
|
||||
|
||||
Evas_Hash *imc_change_map;
|
||||
|
||||
|
@ -71,14 +65,12 @@ struct _E_Config_Dialog_Data
|
|||
{
|
||||
Evas_Object *imc_basic_list;
|
||||
Evas_Object *imc_basic_disable;
|
||||
|
||||
Evas_Object *e_im_name;
|
||||
Evas_Object *e_im_exec;
|
||||
Evas_Object *gtk_im_module;
|
||||
Evas_Object *qt_im_module;
|
||||
Evas_Object *xmodifiers;
|
||||
}
|
||||
gui;
|
||||
} gui;
|
||||
|
||||
E_Win *win_import;
|
||||
};
|
||||
|
@ -165,12 +157,10 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
E_FREE(cfdata->imc.gtk_im_module);
|
||||
E_FREE(cfdata->imc.qt_im_module);
|
||||
E_FREE(cfdata->imc.xmodifiers);
|
||||
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
/*** Start Basic Dialog Logic ***/
|
||||
|
||||
static int
|
||||
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
|
@ -251,7 +241,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
imc_basic_list = e_intl_input_method_list();
|
||||
/* Sort basic input method list */
|
||||
imc_basic_list = evas_list_sort(imc_basic_list,
|
||||
evas_list_count(imc_basic_list), _basic_list_sort_cb);
|
||||
evas_list_count(imc_basic_list),
|
||||
_basic_list_sort_cb);
|
||||
|
||||
i = 0;
|
||||
while(imc_basic_list)
|
||||
|
@ -286,19 +277,14 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
evas_event_thaw(evas_object_evas_get(ob));
|
||||
|
||||
e_widget_frametable_object_append(of, ob, 0, 1, 2, 6, 1, 1, 1, 1);
|
||||
|
||||
e_widget_framelist_content_align_set(of, 0.0, 0.0);
|
||||
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
return o;
|
||||
}
|
||||
|
||||
/*** End Basic Dialog Logic ***/
|
||||
|
||||
/*** Start Advanced Dialog Logic ***/
|
||||
|
||||
static Evas_Bool
|
||||
_change_hash_apply_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
{
|
||||
|
@ -808,14 +794,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
e_widget_frametable_object_append(ol, o, 1, 2, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
e_widget_list_object_append(of, ol, 0, 1, 0.5);
|
||||
|
||||
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
|
||||
_e_imc_form_fill(cfdata);
|
||||
|
||||
return ot;
|
||||
}
|
||||
|
||||
/*** End Advanced Dialog Logic ***/
|
||||
|
|
|
@ -804,7 +804,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
cfdata->region_list = evas_list_free(cfdata->region_list);
|
||||
cfdata->blang_list = evas_list_free(cfdata->blang_list);
|
||||
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static Evas_Bool
|
||||
|
@ -861,7 +861,6 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
}
|
||||
|
||||
e_config_save_queue();
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -876,7 +875,6 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
}
|
||||
|
||||
e_config_save_queue();
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -968,10 +966,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
e_widget_framelist_content_align_set(of, 0.0, 0.0);
|
||||
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
return o;
|
||||
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
|
@ -1282,7 +1278,6 @@ _lang_hash_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
|
|||
lang_node = data;
|
||||
|
||||
cfdata->lang_list = evas_list_append(cfdata->lang_list, lang_node);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -1296,7 +1291,6 @@ _region_hash_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
|
|||
reg_node = data;
|
||||
|
||||
cfdata->region_list = evas_list_append(cfdata->region_list, reg_node);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -1515,6 +1509,5 @@ _intl_charset_upper_get(const char *charset)
|
|||
}
|
||||
i++;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -160,7 +160,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
if (cfdata->locals.action) free(cfdata->locals.action);
|
||||
if (cfdata->locals.params) free(cfdata->locals.params);
|
||||
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
@ -70,7 +70,7 @@ _create_data(E_Config_Dialog *cfd)
|
|||
static void
|
||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
@ -206,7 +206,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
if (cfdata->locals.action) free(cfdata->locals.action);
|
||||
if (cfdata->locals.params) free(cfdata->locals.params);
|
||||
if (cfdata->locals.cur) free(cfdata->locals.cur);
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
@ -127,7 +127,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
cfdata->pcd_list = evas_list_remove_list(cfdata->pcd_list, cfdata->pcd_list);
|
||||
}
|
||||
free(cfdata->paths_available);
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -136,9 +136,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
Evas_List *l;
|
||||
Evas_List *ll;
|
||||
|
||||
_ilist_update( cfdata->gui.user_list,
|
||||
cfdata->cur_pcd,
|
||||
NULL);
|
||||
_ilist_update(cfdata->gui.user_list, cfdata->cur_pcd, NULL);
|
||||
|
||||
for (l = cfdata->pcd_list; l; l = l->next)
|
||||
{
|
||||
|
@ -157,12 +155,9 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
}
|
||||
}
|
||||
else if (*(pcd->path->user_dir_list) && pcd->dirty)
|
||||
{
|
||||
e_path_user_path_clear(pcd->path);
|
||||
}
|
||||
}
|
||||
e_config_save_queue();
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -218,7 +213,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
e_widget_framelist_object_append(of, ob);
|
||||
|
||||
e_widget_table_object_append(o, of, 0, 1, 3, 1, 1, 1, 1, 1);
|
||||
|
||||
return o;
|
||||
}
|
||||
|
||||
|
@ -321,4 +315,3 @@ _ilist_update(Evas_Object *obj, CFPath_Change_Data *old, CFPath_Change_Data *new
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -66,7 +66,7 @@ _create_data(E_Config_Dialog *cfd)
|
|||
static void
|
||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
@ -168,7 +168,6 @@ _cb_files_selected(void *data, Evas_Object *obj, void *event_info)
|
|||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
cfdata = data;
|
||||
printf("SEL\n");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -332,7 +331,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
e_int_config_theme_del(cfdata->win_import);
|
||||
|
||||
E_FREE(cfdata->theme);
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
|
|
|
@ -154,7 +154,6 @@ e_int_config_theme_del(E_Win *win)
|
|||
E_FREE(import->cfdata->file);
|
||||
E_FREE(import->cfdata);
|
||||
E_FREE(import);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -44,7 +44,6 @@ e_int_config_transitions(E_Container *con)
|
|||
cfd = e_config_dialog_new(con, _("Transition Settings"),
|
||||
"E", "_config_transitions_dialog",
|
||||
"enlightenment/transitions", 0, v, NULL);
|
||||
if (!cfd) return NULL;
|
||||
return cfd;
|
||||
}
|
||||
|
||||
|
@ -72,13 +71,10 @@ _create_data(E_Config_Dialog *cfd)
|
|||
static void
|
||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
if(cfdata->transition_start)
|
||||
E_FREE(cfdata->transition_start);
|
||||
if(cfdata->transition_desk)
|
||||
E_FREE(cfdata->transition_desk);
|
||||
if(cfdata->transition_change)
|
||||
E_FREE(cfdata->transition_change);
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
@ -429,7 +429,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
e_int_config_wallpaper_gradient_del(cfdata->dia_gradient);
|
||||
E_FREE(cfdata->bg);
|
||||
E_FREE(cfd->data);
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
|
@ -453,13 +453,11 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
rg = e_widget_radio_group_new(&(cfdata->fmdir));
|
||||
o = e_widget_radio_add(evas, _("Personal"), 0, rg);
|
||||
cfdata->o_personal = o;
|
||||
evas_object_smart_callback_add(o, "changed",
|
||||
_cb_dir, cfdata);
|
||||
evas_object_smart_callback_add(o, "changed", _cb_dir, cfdata);
|
||||
e_widget_table_object_append(il, o, 0, 0, 1, 1, 1, 1, 0, 0);
|
||||
o = e_widget_radio_add(evas, _("System"), 1, rg);
|
||||
cfdata->o_system = o;
|
||||
evas_object_smart_callback_add(o, "changed",
|
||||
_cb_dir, cfdata);
|
||||
evas_object_smart_callback_add(o, "changed", _cb_dir, cfdata);
|
||||
e_widget_table_object_append(il, o, 1, 0, 1, 1, 1, 1, 0, 0);
|
||||
|
||||
e_widget_table_object_append(ol, il, 0, 0, 1, 1, 0, 0, 0, 0);
|
||||
|
@ -524,8 +522,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
il = e_widget_list_add(evas, 0, 1);
|
||||
o = e_widget_check_add(evas, _("Use Theme Wallpaper"), &cfdata->use_theme_bg);
|
||||
cfdata->o_theme_bg = o;
|
||||
evas_object_smart_callback_add(o, "changed",
|
||||
_cb_theme_wallpaper, cfdata);
|
||||
evas_object_smart_callback_add(o, "changed", _cb_theme_wallpaper, cfdata);
|
||||
e_widget_list_object_append(il, o, 1, 0, 0.5);
|
||||
|
||||
ol = e_widget_list_add(evas, 1, 1);
|
||||
|
@ -608,13 +605,11 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
rg = e_widget_radio_group_new(&(cfdata->fmdir));
|
||||
o = e_widget_radio_add(evas, _("Personal"), 0, rg);
|
||||
cfdata->o_personal = o;
|
||||
evas_object_smart_callback_add(o, "changed",
|
||||
_cb_dir, cfdata);
|
||||
evas_object_smart_callback_add(o, "changed", _cb_dir, cfdata);
|
||||
e_widget_table_object_append(il, o, 0, 0, 1, 1, 1, 1, 0, 0);
|
||||
o = e_widget_radio_add(evas, _("System"), 1, rg);
|
||||
cfdata->o_system = o;
|
||||
evas_object_smart_callback_add(o, "changed",
|
||||
_cb_dir, cfdata);
|
||||
evas_object_smart_callback_add(o, "changed", _cb_dir, cfdata);
|
||||
e_widget_table_object_append(il, o, 1, 0, 1, 1, 1, 1, 0, 0);
|
||||
|
||||
e_widget_table_object_append(ol, il, 0, 0, 1, 1, 0, 0, 0, 0);
|
||||
|
@ -676,8 +671,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
il = e_widget_list_add(evas, 0, 1);
|
||||
o = e_widget_check_add(evas, _("Use Theme Wallpaper"), &cfdata->use_theme_bg);
|
||||
cfdata->o_theme_bg = o;
|
||||
evas_object_smart_callback_add(o, "changed",
|
||||
_cb_theme_wallpaper, cfdata);
|
||||
evas_object_smart_callback_add(o, "changed", _cb_theme_wallpaper, cfdata);
|
||||
e_widget_list_object_append(il, o, 1, 0, 0.5);
|
||||
|
||||
ol = e_widget_list_add(evas, 1, 1);
|
||||
|
|
|
@ -95,7 +95,7 @@ static void
|
|||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
/* Free the cfdata */
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
/**--APPLY--**/
|
||||
|
|
|
@ -93,7 +93,7 @@ static void
|
|||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
/* Free the cfdata */
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
/**--APPLY--**/
|
||||
|
|
|
@ -98,7 +98,7 @@ _create_data(E_Config_Dialog *cfd)
|
|||
static void
|
||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
free(cfdata);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
Loading…
Reference in New Issue