From 691eb8886b917c05fad4d5394b9d3fd71011fdd6 Mon Sep 17 00:00:00 2001 From: Chidambar Zinnoury Date: Wed, 26 Dec 2012 13:57:34 +0000 Subject: [PATCH] =?UTF-8?q?=20e=20pager=20settings:=20fix=20check=20change?= =?UTF-8?q?d=20not=20accounting=20for=20flip=20desktop=20on=20mouse=20whee?= =?UTF-8?q?l=20and=20some=20strings=20(px=E2=86=92pixels).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SVN revision: 81715 --- ChangeLog | 2 ++ NEWS | 2 ++ src/modules/pager/e_mod_config.c | 13 +++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d49a708be..2a2638446 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 2012-12-26 Chidambar Zinnoury (ilLogict) + + * Pager settings: fix check changed and strings (px→pixels). * Language settings: add check changed and cleanup code. 2012-12-25 Chidambar Zinnoury (ilLogict) diff --git a/NEWS b/NEWS index 6ebc09432..20b27ecf3 100644 --- a/NEWS +++ b/NEWS @@ -18,7 +18,9 @@ Improvements: - language. * Improve UI of desk settings. * Add icons for gadcon settings. + * Improve strings of pager settings. Fixes: * Force check changed upon confirmation dialog closure for engine settings. * Clock date formats are now internationalizable. + * Advanced pager settings check changed accounts for flip desktop on mouse wheel. diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c index 00d58ee44..8c974d8d2 100644 --- a/src/modules/pager/e_mod_config.c +++ b/src/modules/pager/e_mod_config.c @@ -197,7 +197,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) e_widget_list_object_append(ol, ow, 1, 0, 0.5); ow = e_widget_label_add(evas, _("Resistance to dragging")); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 0.0, 10.0, 1.0, 0, NULL, + ow = e_widget_slider_add(evas, 1, 0, _("%.0f pixels"), 0.0, 10.0, 1.0, 0, NULL, &(cfdata->drag_resist), 100); e_widget_list_object_append(ol, ow, 1, 0, 0.5); @@ -236,7 +236,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) cfdata->gui.popup_list = eina_list_append(cfdata->gui.popup_list, ow); e_widget_disabled_set(ow, !cfdata->popup.show); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 20.0, 200.0, 1.0, 0, NULL, + ow = e_widget_slider_add(evas, 1, 0, _("%.0f pixels"), 20.0, 200.0, 1.0, 0, NULL, &(cfdata->popup.height), 100); cfdata->gui.popup_list = eina_list_append(cfdata->gui.popup_list, ow); e_widget_disabled_set(ow, !cfdata->popup.show); @@ -255,7 +255,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) cfdata->gui.popup_list); ow = e_widget_label_add(evas, _("Pager action popup height")); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 20.0, 200.0, 1.0, 0, NULL, + ow = e_widget_slider_add(evas, 1, 0, _("%.0f pixels"), 20.0, 200.0, 1.0, 0, NULL, &(cfdata->popup.act_height), 100); e_widget_list_object_append(ol, ow, 1, 0, 0.5); e_widget_toolbook_page_append(otb, NULL, _("Popup"), ol, 1, 0, 1, 0, @@ -324,16 +324,17 @@ static int _adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { if ((int)pager_config->popup != cfdata->popup.show) return 1; - if ((int)pager_config->disable_live_preview != !cfdata->live_preview) return 1; - if ((int)pager_config->show_desk_names != cfdata->show_desk_names) return 1; - if ((int)pager_config->popup_urgent != cfdata->popup.urgent_show) return 1; if (pager_config->popup_speed != cfdata->popup.speed) return 1; + if ((int)pager_config->flip_desk != cfdata->flip_desk) return 1; + if ((int)pager_config->disable_live_preview != !cfdata->live_preview) return 1; + if ((int)pager_config->popup_urgent != cfdata->popup.urgent_show) return 1; if ((int)pager_config->popup_urgent_stick != cfdata->popup.urgent_stick) return 1; if ((int)pager_config->popup_urgent_focus != cfdata->popup.urgent_focus) return 1; if (pager_config->popup_urgent_speed != cfdata->popup.urgent_speed) return 1; + if ((int)pager_config->show_desk_names != cfdata->show_desk_names) return 1; if (pager_config->popup_height != cfdata->popup.height) return 1; if (pager_config->popup_act_height != cfdata->popup.act_height) return 1; if ((int)pager_config->drag_resist != cfdata->drag_resist) return 1;