From: Enlightenment S. <no-...@en...> - 2009-09-04 19:58:45
|
Log: Fix module description. It was displaying in Czech by default. Make English the default and fix the czech translation of Comment to contain the country code. Author: devilhorns Date: 2009-09-04 12:58:33 -0700 (Fri, 04 Sep 2009) New Revision: 42265 Modified: trunk/e/src/modules/conf_icon_theme/module.desktop.in Modified: trunk/e/src/modules/conf_icon_theme/module.desktop.in =================================================================== --- trunk/e/src/modules/conf_icon_theme/module.desktop.in 2009-09-04 19:54:34 UTC (rev 42264) +++ trunk/e/src/modules/conf_icon_theme/module.desktop.in 2009-09-04 19:58:33 UTC (rev 42265) @@ -16,7 +16,7 @@ Name[zh_TW]= Icon=e-module-conf_icon_theme Comment=<title>E17 Settings Applet</title><br>Settings applet used to select an icon theme for E17. -Comment=<title>E17 applet nastavení</title><br>Určen k výběru tématu ikon freedesktop.org. +Comment[cs]=<title>E17 applet nastavení</title><br>Určen k výběru tématu ikon freedesktop.org. Comment[de]= Comment[eo]=<title>Aplikajeto de E17-agordo</title><br>Elekti piktograman etoson por E17. Comment[es]=<title>Applet de configuración de E17</title><br>Applet de configuración usado para seleccionar el tema de íconos para E17. @@ -29,4 +29,5 @@ Comment[tr]=<title>E17 Ayarlar Programcığı</title><br>E17 simge temasını seçmek için kullanılan programcık. Comment[zh_CN]= Comment[zh_TW]= + X-Enlightenment-ModuleType=config |
From: Enlightenment S. <no-...@en...> - 2009-12-01 08:44:48
|
Log: Remove nasty commented lines. Remove whitespace. Author: devilhorns Date: 2009-12-01 00:44:36 -0800 (Tue, 01 Dec 2009) New Revision: 44082 Modified: trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c trunk/e/src/modules/conf_icon_theme/e_mod_main.c Modified: trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c =================================================================== --- trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c 2009-12-01 08:29:44 UTC (rev 44081) +++ trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c 2009-12-01 08:44:36 UTC (rev 44082) @@ -33,11 +33,11 @@ if (e_config_dialog_find("E", "appearance/icon_theme")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); - v->create_cfdata = _create_data; - v->free_cfdata = _free_data; - v->basic.create_widgets = _basic_create_widgets; - v->basic.apply_cfdata = _basic_apply_data; - v->basic.check_changed = _basic_check_changed; + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.create_widgets = _basic_create_widgets; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.check_changed = _basic_check_changed; cfd = e_config_dialog_new(con, _("Icon Theme Settings"), Modified: trunk/e/src/modules/conf_icon_theme/e_mod_main.c =================================================================== --- trunk/e/src/modules/conf_icon_theme/e_mod_main.c 2009-12-01 08:29:44 UTC (rev 44081) +++ trunk/e/src/modules/conf_icon_theme/e_mod_main.c 2009-12-01 08:44:36 UTC (rev 44082) @@ -4,23 +4,10 @@ #include "e.h" #include "e_mod_main.h" -/***************************************************************************/ -/**/ /* actual module specifics */ static E_Module *conf_module = NULL; -/**/ -/***************************************************************************/ - -/***************************************************************************/ -/**/ - -/**/ -/***************************************************************************/ - -/***************************************************************************/ -/**/ /* module setup */ EAPI E_Module_Api e_modapi = { @@ -42,6 +29,7 @@ e_modapi_shutdown(E_Module *m) { E_Config_Dialog *cfd; + while ((cfd = e_config_dialog_get("E", "_config_icon_theme_dialog"))) e_object_del(E_OBJECT(cfd)); e_configure_registry_item_del("appearance/icon_theme"); e_configure_registry_category_del("appearance"); |
From: Enlightenment S. <no-...@en...> - 2010-07-27 15:12:48
|
Log: Make Icon Theme Dialog play nice on small screens. Fix some formatting. Author: devilhorns Date: 2010-07-27 08:12:40 -0700 (Tue, 27 Jul 2010) New Revision: 50544 Modified: trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c Modified: trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c =================================================================== --- trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c 2010-07-27 14:58:27 UTC (rev 50543) +++ trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c 2010-07-27 15:12:40 UTC (rev 50544) @@ -6,9 +6,8 @@ static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_check_changed(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 *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); - +static int _basic_apply(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 _sort_icon_themes(const void *data1, const void *data2); static Evas_Object *_icon_new(Evas *evas, const char *theme, const char *icon, unsigned int size); @@ -19,19 +18,21 @@ const char *themename; int overrides; int populating; - struct { - Evas_Object *list; - Evas_Object *checkbox; - Evas_Object *preview[4]; /* same size as _icon_previews */ - } gui; + struct + { + Evas_Object *list; + Evas_Object *checkbox; + Evas_Object *preview[4]; /* same size as _icon_previews */ + } gui; Ecore_Idler *fill_icon_themes_delayed; }; -static const char *_icon_previews[4] = { - "system-run", - "system-file-manager", - "preferences-desktop-theme", - "text-x-generic" +static const char *_icon_previews[4] = +{ + "system-run", + "system-file-manager", + "preferences-desktop-theme", + "text-x-generic" }; #define PREVIEW_SIZE (48) @@ -47,13 +48,12 @@ v->create_cfdata = _create_data; v->free_cfdata = _free_data; - v->basic.create_widgets = _basic_create_widgets; - v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create; + v->basic.apply_cfdata = _basic_apply; v->basic.check_changed = _basic_check_changed; - cfd = e_config_dialog_new(con, - _("Icon Theme Settings"), - "E", "appearance/icon_theme", + cfd = e_config_dialog_new(con, _("Icon Theme Settings"), + "E", "appearance/icon_theme", "preferences-icon-theme", 0, v, NULL); return cfd; } @@ -62,9 +62,9 @@ _fill_data(E_Config_Dialog_Data *cfdata) { cfdata->icon_themes = efreet_icon_theme_list_get(); - cfdata->icon_themes = eina_list_sort(cfdata->icon_themes, - eina_list_count(cfdata->icon_themes), - _sort_icon_themes); + cfdata->icon_themes = eina_list_sort(cfdata->icon_themes, + eina_list_count(cfdata->icon_themes), + _sort_icon_themes); return; } @@ -77,9 +77,7 @@ cfdata = E_NEW(E_Config_Dialog_Data, 1); cfdata->cfd = cfd; cfdata->themename = eina_stringshare_add(e_config->icon_theme); - cfdata->overrides = e_config->icon_theme_overrides; - return cfdata; } @@ -110,18 +108,15 @@ } 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_Event_Config_Icon_Theme *ev; - if (!_basic_check_changed(cfd, cfdata)) - return 1; + if (!_basic_check_changed(cfd, cfdata)) return 1; eina_stringshare_del(e_config->icon_theme); e_config->icon_theme = eina_stringshare_ref(cfdata->themename); - e_config->icon_theme_overrides = !!cfdata->overrides; - e_config_save_queue(); ev = E_NEW(E_Event_Config_Icon_Theme, 1); @@ -138,9 +133,13 @@ { const char *t = cfdata->themename; unsigned int i; + for (i = 0; i < sizeof(_icon_previews)/sizeof(_icon_previews[0]); i++) { - char *path = efreet_icon_path_find(t, _icon_previews[i], PREVIEW_SIZE); + char *path; + + if (!(path = efreet_icon_path_find(t, _icon_previews[i], PREVIEW_SIZE))) + continue; if (e_icon_file_set(cfdata->gui.preview[i], path)) e_icon_fill_inside_set(cfdata->gui.preview[i], EINA_TRUE); free(path); @@ -162,15 +161,16 @@ struct _fill_icon_themes_data *d = data; Efreet_Icon_Theme *theme; Evas_Object *oc = NULL; - const char **example_icon, *example_icons[] = { - NULL, - "folder", - "user-home", - "text-x-generic", - "system-run", - "preferences-system", - NULL, - }; + const char **example_icon, *example_icons[] = + { + NULL, + "folder", + "user-home", + "text-x-generic", + "system-run", + "preferences-system", + NULL, + }; if (!d->themes_loaded) { @@ -184,7 +184,13 @@ if (!d->l) { + int mw, mh; + e_widget_ilist_go(d->cfdata->gui.list); + + e_widget_size_min_get(d->cfdata->gui.list, &mw, &mh); + e_widget_size_min_set(d->cfdata->gui.list, mw, 50); + d->cfdata->fill_icon_themes_delayed = NULL; d->cfdata->populating = EINA_FALSE; _populate_preview(d->cfdata); @@ -199,9 +205,7 @@ example_icon = example_icons; } else - { - example_icon = example_icons + 1; - } + example_icon = example_icons + 1; for (; (*example_icon) && (!oc); example_icon++) oc = _icon_new(d->evas, theme->name.internal, *example_icon, 24); @@ -223,13 +227,15 @@ static void _icon_theme_changed(void *data, Evas_Object *o __UNUSED__) { - E_Config_Dialog_Data *cfdata = data; + E_Config_Dialog_Data *cfdata; + + cfdata = data; if (cfdata->populating) return; _populate_preview(cfdata); } 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, *ilist, *checkbox, *ol; struct _fill_icon_themes_data *d; @@ -240,7 +246,6 @@ ilist = e_widget_ilist_add(evas, 24, 24, &(cfdata->themename)); cfdata->gui.list = ilist; - e_widget_size_min_set(ilist, 200, 240); cfdata->populating = EINA_TRUE; e_widget_on_change_hook_set(ilist, _icon_theme_changed, cfdata); e_widget_list_object_append(o, ilist, 1, 1, 0.5); @@ -251,13 +256,15 @@ cfdata->gui.preview[i] = e_icon_add(evas); e_icon_preload_set(cfdata->gui.preview[i], EINA_TRUE); e_icon_scale_size_set(cfdata->gui.preview[i], PREVIEW_SIZE); - e_widget_framelist_object_append_full - (ol, cfdata->gui.preview[i], 0, 0, 0, 0, 0.5, 0.5, - PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE); + e_widget_framelist_object_append_full(ol, cfdata->gui.preview[i], + 0, 0, 0, 0, 0.5, 0.5, + PREVIEW_SIZE, PREVIEW_SIZE, + PREVIEW_SIZE, PREVIEW_SIZE); } e_widget_list_object_append(o, ol, 0, 0, 0.5); - checkbox = e_widget_check_add(evas, _("This overrides general theme"), &(cfdata->overrides)); + checkbox = e_widget_check_add(evas, _("This overrides general theme"), + &(cfdata->overrides)); e_widget_size_min_get(checkbox, &mw, &mh); e_widget_list_object_append(o, checkbox, 0, 0, 0.0); @@ -296,9 +303,9 @@ _icon_new(Evas *evas, const char *theme, const char *icon, unsigned int size) { Evas_Object *o; - char *path = efreet_icon_path_find(theme, icon, size); - if (!path) return NULL; + char *path; + if (!(path = efreet_icon_path_find(theme, icon, size))) return NULL; o = e_icon_add(evas); if (e_icon_file_set(o, path)) e_icon_fill_inside_set(o, 1); |
From: Enlightenment S. <no-...@en...> - 2010-07-28 00:24:45
|
Log: Return not needed here. Author: devilhorns Date: 2010-07-27 17:24:35 -0700 (Tue, 27 Jul 2010) New Revision: 50562 Modified: trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c Modified: trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c =================================================================== --- trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c 2010-07-28 00:17:40 UTC (rev 50561) +++ trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c 2010-07-28 00:24:35 UTC (rev 50562) @@ -65,8 +65,6 @@ cfdata->icon_themes = eina_list_sort(cfdata->icon_themes, eina_list_count(cfdata->icon_themes), _sort_icon_themes); - - return; } static void * |
From: Enlightenment S. <no-...@en...> - 2010-07-30 21:11:10
|
Log: Slightly better size for the ilist (not too big, not too small). Author: devilhorns Date: 2010-07-30 14:11:03 -0700 (Fri, 30 Jul 2010) New Revision: 50693 Modified: trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c Modified: trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c =================================================================== --- trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c 2010-07-30 20:33:32 UTC (rev 50692) +++ trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c 2010-07-30 21:11:03 UTC (rev 50693) @@ -187,7 +187,7 @@ e_widget_ilist_go(d->cfdata->gui.list); e_widget_size_min_get(d->cfdata->gui.list, &mw, &mh); - e_widget_size_min_set(d->cfdata->gui.list, mw, 50); + e_widget_size_min_set(d->cfdata->gui.list, mw, 100); d->cfdata->fill_icon_themes_delayed = NULL; d->cfdata->populating = EINA_FALSE; @@ -243,6 +243,7 @@ o = e_widget_list_add(evas, 0, 0); ilist = e_widget_ilist_add(evas, 24, 24, &(cfdata->themename)); cfdata->gui.list = ilist; + e_widget_size_min_set(cfdata->gui.list, 100, 100); cfdata->populating = EINA_TRUE; e_widget_on_change_hook_set(ilist, _icon_theme_changed, cfdata); |
From: Enlightenment S. <no-...@en...> - 2010-08-04 02:01:44
|
Log: Expose selected E_ICON_THEME to env so elm apps can read it, if they want to, and set a matching icon theme. Author: devilhorns Date: 2010-08-03 19:01:38 -0700 (Tue, 03 Aug 2010) New Revision: 50798 Modified: trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c Modified: trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c =================================================================== --- trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c 2010-08-04 02:00:59 UTC (rev 50797) +++ trunk/e/src/modules/conf_icon_theme/e_int_config_icon_themes.c 2010-08-04 02:01:38 UTC (rev 50798) @@ -117,6 +117,8 @@ e_config->icon_theme_overrides = !!cfdata->overrides; e_config_save_queue(); + e_util_env_set("E_ICON_THEME", e_config->icon_theme); + ev = E_NEW(E_Event_Config_Icon_Theme, 1); if (ev) { |