From 8375d61b0c61fd47b1fd5b0e9d844946f83acc5c Mon Sep 17 00:00:00 2001 From: Chidambar Zinnoury Date: Mon, 19 Apr 2010 05:37:03 +0000 Subject: [PATCH] Use FDO-icon for fonts module and remove useless edje file. SVN revision: 48120 --- .../conf_fonts/e-module-conf_fonts.edj | Bin 9468 -> 0 bytes src/modules/conf_fonts/module.desktop.in | 2 +- .../conf_mime/e_int_config_mime_edit.c | 39 ++++++++++++++---- 3 files changed, 31 insertions(+), 10 deletions(-) delete mode 100644 src/modules/conf_fonts/e-module-conf_fonts.edj diff --git a/src/modules/conf_fonts/e-module-conf_fonts.edj b/src/modules/conf_fonts/e-module-conf_fonts.edj deleted file mode 100644 index e931157ec603068c344efefdd53f5dd16e2c3e81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9468 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 o@~ diff --git a/src/modules/conf_fonts/module.desktop.in b/src/modules/conf_fonts/module.desktop.in index e9dcd4c1d..9320a1860 100644 --- a/src/modules/conf_fonts/module.desktop.in +++ b/src/modules/conf_fonts/module.desktop.in @@ -14,7 +14,7 @@ Name[pt_BR]= Name[tr]=Ayarlar - Yazıtipleri Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_fonts +Icon=preferences-desktop-font Comment=Font configuration dialog. Comment[cs]=Dialog pro výběr písma. Comment[de]= diff --git a/src/modules/conf_mime/e_int_config_mime_edit.c b/src/modules/conf_mime/e_int_config_mime_edit.c index d5898739d..81d537a9b 100644 --- a/src/modules/conf_mime/e_int_config_mime_edit.c +++ b/src/modules/conf_mime/e_int_config_mime_edit.c @@ -5,6 +5,7 @@ static void *_create_data (E_Config_Dialog *cfd); static void _fill_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 (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_check (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_apply (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static void _cb_icon_sel (void *data, void *data2); static Evas_Object *_get_icon (void *data); @@ -64,6 +65,7 @@ e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2) v->create_cfdata = _create_data; v->free_cfdata = _free_data; v->basic.create_widgets = _basic_create; + v->basic.check_changed = _basic_check; v->basic.apply_cfdata = _basic_apply; cfd = e_config_dialog_new(con, _("File Icon"), "E", @@ -80,7 +82,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_fill_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_fill_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { E_Config_Mime_Icon *mi; @@ -112,7 +114,7 @@ _fill_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static void -_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { if (cfdata->gui.fsel) e_object_del(E_OBJECT(cfdata->gui.fsel)); @@ -135,7 +137,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) of = e_widget_frametable_add(evas, _("Basic Info"), 0); ob = e_widget_label_add(evas, _("Mime:")); - e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 0, 1); ob = e_widget_entry_add(evas, &(cfdata->mime), NULL, NULL, NULL); e_widget_entry_readonly_set(ob, 1); e_widget_size_min_set(ob, 100, 1); @@ -187,7 +189,25 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_basic_check(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +{ + E_Config_Mime_Icon *mi; + + mi = (E_Config_Mime_Icon *) cfdata->data; + + return ((cfdata->type == DEFAULT) && (mi->icon)) || + ((cfdata->type == THUMB) && + ((!mi->icon) || strcmp(mi->icon, "THUMB"))) || + ((cfdata->type == THEME) && + ((!mi->icon) || strncmp(mi->icon, "e/icons/fileman/mime", 20))) || + (((cfdata->type == EDJ) || (cfdata->type == IMG)) && + ((!mi->icon) || !strcmp(mi->icon, "THUMB") || + !strncmp(mi->icon, "e/icons/fileman/mime", 20) || + strcmp(mi->icon, cfdata->icon))); +} + +static int +_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { Eina_List *l; E_Config_Mime_Icon *mi; @@ -226,6 +246,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) break; case EDJ: case IMG: + if (!mi->icon) return 0; mi->icon = eina_stringshare_add(cfdata->file); break; case DEFAULT: @@ -267,9 +288,9 @@ _cb_icon_sel(void *data, void *data2) dia = e_dialog_new(cfd->con, "E", "_mime_icon_select_dialog"); if (!dia) return; if (cfdata->type == EDJ) - e_dialog_title_set(dia, _("Select an Edj File")); + e_dialog_title_set(dia, _("Select an Edje file")); else if (cfdata->type == IMG) - e_dialog_title_set(dia, _("Select an Image")); + e_dialog_title_set(dia, _("Select an image")); dia->data = cfdata; o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL, @@ -285,7 +306,7 @@ _cb_icon_sel(void *data, void *data2) e_dialog_resizable_set(dia, 1); e_win_centered_set(dia->win, 1); e_dialog_show(dia); - e_win_resize(dia->win, 475, 341); + e_dialog_border_icon_set(dia, "enlightenment/file_icons"); cfdata->gui.fsel = dia; } @@ -339,7 +360,7 @@ _get_icon(void *data) } static void -_cb_type(void *data, Evas_Object *obj, void *event_info) +_cb_type(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -358,7 +379,7 @@ _cb_type(void *data, Evas_Object *obj, void *event_info) } static void -_cb_fsel_sel(void *data, Evas_Object *obj) +_cb_fsel_sel(void *data, Evas_Object *obj __UNUSED__) { E_Config_Dialog_Data *cfdata;