From 80cac7d84b2ca93daf5826e9331733fefec94ec6 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Mon, 27 Feb 2006 18:39:20 +0000 Subject: [PATCH] Reorder Config Panel (alphabetical). Fix small bug in new hinting dialog where if no hinting has been specified in evas yet, and bytecode is not avaiable, the radio's ended up empty (nothing selected) and a hinting could not be chosen. SVN revision: 20834 --- src/bin/e_configure.c | 2 +- src/bin/e_int_config_hinting.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index 9fdbb76e2..fb94d7de0 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -72,6 +72,7 @@ e_configure_show(E_Container *con) e_configure_standard_item_add(eco, "enlightenment/desktops", _("Desktop Lock Settings"), e_int_config_desklock); e_configure_standard_item_add(eco, "enlightenment/desktops", _("Display Settings"), e_int_config_display); e_configure_standard_item_add(eco, "enlightenment/e", _("Focus Settings"), e_int_config_focus); + e_configure_standard_item_add(eco, "enlightenment/e", _("Font Display Hinting"), e_int_config_hinting); e_configure_standard_item_add(eco, "enlightenment/e", _("Key Binding Settings"), e_int_config_keybindings); e_configure_standard_item_add(eco, "enlightenment/favorites", _("Menu Settings"), e_int_config_menus); e_configure_standard_item_add(eco, "enlightenment/configuration", _("Performance Settings"), e_int_config_performance); @@ -80,7 +81,6 @@ e_configure_show(E_Container *con) e_configure_standard_item_add(eco, "enlightenment/windows", _("Window List Settings"), e_int_config_winlist); e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Display Settings"), e_int_config_window_display); e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Manipulation Settings"), e_int_config_window_manipulation); - e_configure_standard_item_add(eco, "enlightenment/e", _("Font Display Hinting"), e_int_config_hinting); /* FIXME: we should have a way for modules to hook in here and add their * own entries diff --git a/src/bin/e_int_config_hinting.c b/src/bin/e_int_config_hinting.c index 4d9c8231e..31d583067 100644 --- a/src/bin/e_int_config_hinting.c +++ b/src/bin/e_int_config_hinting.c @@ -43,6 +43,7 @@ static void _fill_data(E_Config_Dialog_Data *cfdata) { cfdata->hinting = e_config->font_hinting; + printf("Hinting: %d\n", e_config->font_hinting); } static void * @@ -88,17 +89,17 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf rg = e_widget_radio_group_new(&(cfdata->hinting)); if (evas_imaging_font_hinting_can_hint(EVAS_FONT_HINTING_BYTECODE)) { - ob = e_widget_radio_add(evas, _("Bytecode Hinting"), 0, rg); + ob = e_widget_radio_add(evas, _("Bytecode Hinting"), EVAS_FONT_HINTING_BYTECODE, rg); e_widget_list_object_append(o, ob, 1, 1, 0.5); } if (evas_imaging_font_hinting_can_hint(EVAS_FONT_HINTING_AUTO)) { - ob = e_widget_radio_add(evas, _("Automatic Hinting"), 1, rg); + ob = e_widget_radio_add(evas, _("Automatic Hinting"), EVAS_FONT_HINTING_AUTO, rg); e_widget_list_object_append(o, ob, 1, 1, 0.5); } if (evas_imaging_font_hinting_can_hint(EVAS_FONT_HINTING_NONE)) { - ob = e_widget_radio_add(evas, _("No Hinting"), 2, rg); + ob = e_widget_radio_add(evas, _("No Hinting"), EVAS_FONT_HINTING_NONE, rg); e_widget_list_object_append(o, ob, 1, 1, 0.5); } return o;