From 23296b46ec6eb3fd5f75d6e7249f19b7cd3dca13 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 20 Jul 2012 03:57:32 +0000 Subject: [PATCH] after figuring out why my deskotp didnt screnblank... massively simplify blanking/dpms etc. dialogs. just 1 timert. enabled dpms/screensaver/the workjs. no interval settable. dpms always turned on when screensaver is. dpmb dialog now only does backlight. added checkbox to see current presentation mode status. SVN revision: 74201 --- src/modules/conf_display/e_int_config_dpms.c | 303 +----------------- .../conf_display/e_int_config_screensaver.c | 106 ++---- src/modules/conf_display/e_mod_main.c | 4 +- 3 files changed, 51 insertions(+), 362 deletions(-) diff --git a/src/modules/conf_display/e_int_config_dpms.c b/src/modules/conf_display/e_int_config_dpms.c index f1a3d25a6..032f23e1f 100644 --- a/src/modules/conf_display/e_int_config_dpms.c +++ b/src/modules/conf_display/e_int_config_dpms.c @@ -6,116 +6,29 @@ static int _advanced_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data * static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static void _cb_standby_slider_change(void *data, Evas_Object *obj); -static void _cb_suspend_slider_change(void *data, Evas_Object *obj); -static void _cb_off_slider_change(void *data, Evas_Object *obj); static void _cb_backlight_slider_change(void *data, Evas_Object *obj); -static int _e_int_config_dpms_available(void); -static int _e_int_config_dpms_capable(void); - -static void _cb_disable_changed(void *data, Evas_Object *obj); - struct _E_Config_Dialog_Data { E_Config_Dialog *cfd; - Evas_Object *standby_slider; - Evas_Object *suspend_slider; - Evas_Object *off_slider; Evas_Object *backlight_slider; - int enable_dpms; - int enable_standby; - int enable_suspend; - int enable_off; int enable_idle_dim; - /* - * The following timeouts are represented as minutes - * while the underlying e_config variables are in seconds - */ - double standby_timeout; - double suspend_timeout; - double off_timeout; - Eina_List *dpms_list; - double backlight_normal; double backlight_dim; double backlight_timeout; double backlight_transition; }; -/* static E_Dialog *dpms_dialog = NULL; */ - -/* always allow as dmps now has backlight too -static void -_cb_dpms_dialog_ok(void *data __UNUSED__, E_Dialog *dia __UNUSED__) -{ - e_object_del(E_OBJECT(dpms_dialog)); - dpms_dialog = NULL; -} -*/ - -static int -_e_int_config_dpms_capable(void) -{ - return 1; -/* always allow as dmps now has backlight too - * this all needs to merge with screensaver too into a simple screen blank+ - * dim+brightness etc. config - if (ecore_x_dpms_capable_get()) return 1; - - if (dpms_dialog) e_object_del(E_OBJECT(dpms_dialog)); - dpms_dialog = e_dialog_new(e_container_current_get(e_manager_current_get()), - "E", "_dpms_capable_dialog"); - if (!dpms_dialog) return 0; - - e_dialog_title_set(dpms_dialog, _("Display Power Management Signaling")); - e_dialog_text_set(dpms_dialog, _("The current display server is not
" - "DPMS capable.")); - e_dialog_icon_set(dpms_dialog, "preferences-system-power-management", 64); - e_dialog_button_add(dpms_dialog, _("OK"), NULL, _cb_dpms_dialog_ok, NULL); - e_dialog_button_focus_num(dpms_dialog, 1); - e_win_centered_set(dpms_dialog->win, 1); - e_dialog_show(dpms_dialog); - */ - return 0; -} - -static int -_e_int_config_dpms_available(void) -{ - return 1; -/* always allow as dmps now has backlight too - if (ecore_x_dpms_query()) return 1; - - if (dpms_dialog) e_object_del(E_OBJECT(dpms_dialog)); - dpms_dialog = e_dialog_new(e_container_current_get(e_manager_current_get()), - "E", "_dpms_available_dialog"); - if (!dpms_dialog) return 0; - - e_dialog_title_set(dpms_dialog, _("Display Power Management Signaling")); - e_dialog_text_set(dpms_dialog, _("The current display server does not
" - "have the DPMS extension.")); - e_dialog_icon_set(dpms_dialog, "preferences-system-power-management", 64); - e_dialog_button_add(dpms_dialog, _("OK"), NULL, _cb_dpms_dialog_ok, NULL); - e_dialog_button_focus_num(dpms_dialog, 1); - e_win_centered_set(dpms_dialog->win, 1); - e_dialog_show(dpms_dialog); - return 0; - */ -} - E_Config_Dialog * e_int_config_dpms(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if ((e_config_dialog_find("E", "screen/power_management")) || - (!_e_int_config_dpms_available()) || - (!_e_int_config_dpms_capable())) + if (e_config_dialog_find("E", "screen/power_management")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); @@ -127,7 +40,7 @@ e_int_config_dpms(E_Container *con, const char *params __UNUSED__) v->basic.check_changed = _advanced_check_changed; v->override_auto_apply = 1; - cfd = e_config_dialog_new(con, _("Display Power Management Settings"), "E", + cfd = e_config_dialog_new(con, _("Backlight Settings"), "E", "screen/power_management", "preferences-system-power-management", 0, v, NULL); return cfd; @@ -136,13 +49,6 @@ e_int_config_dpms(E_Container *con, const char *params __UNUSED__) static void _fill_data(E_Config_Dialog_Data *cfdata) { - cfdata->enable_dpms = e_config->dpms_enable; - cfdata->enable_standby = e_config->dpms_standby_enable; - cfdata->standby_timeout = e_config->dpms_standby_timeout / 60; - cfdata->enable_suspend = e_config->dpms_suspend_enable; - cfdata->suspend_timeout = e_config->dpms_suspend_timeout / 60; - cfdata->enable_off = e_config->dpms_off_enable; - cfdata->off_timeout = e_config->dpms_off_timeout / 60; cfdata->backlight_normal = e_config->backlight.normal * 100.0; cfdata->backlight_dim = e_config->backlight.dim * 100.0; cfdata->backlight_transition = e_config->backlight.transition; @@ -150,16 +56,6 @@ _fill_data(E_Config_Dialog_Data *cfdata) cfdata->backlight_timeout = e_config->backlight.timer; } -static void -_list_disabled_state_apply(Eina_List *list, Eina_Bool disabled) -{ - Eina_List *l; - Evas_Object *o; - - EINA_LIST_FOREACH(list, l, o) - e_widget_disabled_set(o, disabled); -} - static void * _create_data(E_Config_Dialog *cfd) { @@ -168,10 +64,6 @@ _create_data(E_Config_Dialog *cfd) cfdata = E_NEW(E_Config_Dialog_Data, 1); cfdata->cfd = cfd; - cfdata->standby_slider = NULL; - cfdata->suspend_slider = NULL; - cfdata->off_slider = NULL; - _fill_data(cfdata); return cfdata; } @@ -179,22 +71,12 @@ _create_data(E_Config_Dialog *cfd) static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - eina_list_free(cfdata->dpms_list); E_FREE(cfdata); } static int _apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - e_config->dpms_enable = cfdata->enable_dpms; - e_config->dpms_standby_enable = cfdata->enable_standby; - e_config->dpms_suspend_enable = cfdata->enable_suspend; - e_config->dpms_off_enable = cfdata->enable_off; - - e_config->dpms_standby_timeout = cfdata->standby_timeout * 60; - e_config->dpms_suspend_timeout = cfdata->suspend_timeout * 60; - e_config->dpms_off_timeout = cfdata->off_timeout * 60; - e_config->backlight.normal = cfdata->backlight_normal / 100.0; e_config->backlight.dim = cfdata->backlight_dim / 100.0; e_config->backlight.transition = cfdata->backlight_transition; @@ -204,7 +86,6 @@ _apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) e_backlight_level_set(NULL, e_config->backlight.normal, -1.0); e_config_save_queue(); - e_dpms_update(); return 1; } @@ -212,14 +93,7 @@ _apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) static int _advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - return (e_config->dpms_enable != cfdata->enable_dpms) || - (e_config->dpms_standby_enable != cfdata->enable_standby) || - (e_config->dpms_suspend_enable != cfdata->enable_suspend) || - (e_config->dpms_off_enable != cfdata->enable_off) || - (e_config->dpms_standby_timeout / 60 != cfdata->standby_timeout) || - (e_config->dpms_suspend_timeout / 60 != cfdata->suspend_timeout) || - (e_config->dpms_off_timeout / 60 != cfdata->off_timeout) || - (e_config->backlight.normal * 100.0 != cfdata->backlight_normal) || + return (e_config->backlight.normal * 100.0 != cfdata->backlight_normal) || (e_config->backlight.dim * 100.0 != cfdata->backlight_dim) || (e_config->backlight.transition != cfdata->backlight_transition) || (e_config->backlight.timer != cfdata->backlight_timeout); @@ -235,68 +109,10 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) static Evas_Object * _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) { - Evas_Object *o, *of, *ob, *otb; - Evas_Object *dpms_check; - - otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale)); - - /* dpms */ - o = e_widget_list_add(evas, 0, 0); - - dpms_check = e_widget_check_add(evas, _("Enable Display Power Management"), - &(cfdata->enable_dpms)); - e_widget_list_object_append(o, dpms_check, 1, 1, 0); - - of = e_widget_framelist_add(evas, _("Timers"), 0); - - ob = e_widget_check_add(evas, _("Standby time"), &(cfdata->enable_standby)); - e_widget_framelist_object_append(of, ob); - cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob); - e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0, - &(cfdata->standby_timeout), NULL, 100); - e_widget_on_change_hook_set(ob, _cb_standby_slider_change, cfdata); - cfdata->standby_slider = ob; - cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob); - e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config - e_widget_framelist_object_append(of, ob); - - ob = e_widget_check_add(evas, _("Suspend time"), &(cfdata->enable_suspend)); - e_widget_framelist_object_append(of, ob); - cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob); - e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0, - &(cfdata->suspend_timeout), NULL, 100); - e_widget_on_change_hook_set(ob, _cb_suspend_slider_change, cfdata); - cfdata->suspend_slider = ob; - cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob); - e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config - e_widget_framelist_object_append(of, ob); - - ob = e_widget_check_add(evas, _("Off time"), &(cfdata->enable_off)); - e_widget_framelist_object_append(of, ob); - cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob); - e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0, - &(cfdata->off_timeout), NULL, 100); - e_widget_on_change_hook_set(ob, _cb_off_slider_change, cfdata); - cfdata->off_slider = ob; - cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob); - e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config - e_widget_framelist_object_append(of, ob); - - // handler for enable/disable widget array - e_widget_on_change_hook_set(dpms_check, _cb_disable_changed, cfdata->dpms_list); - // setting initial state - _list_disabled_state_apply(cfdata->dpms_list, !cfdata->enable_dpms); - - e_widget_list_object_append(o, of, 1, 1, 0.5); - - e_widget_toolbook_page_append(otb, NULL, _("DPMS"), o, - 1, 0, 1, 0, 0.5, 0.0); + Evas_Object *o, *ob; o = e_widget_list_add(evas, 0, 0); - +/* { char buf[32]; switch (e_config->backlight.mode) @@ -313,7 +129,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D ob = e_widget_label_add(evas, buf); e_widget_list_object_append(o, ob, 0, 1, 0.5); } - + */ ob = e_widget_label_add(evas, _("Normal Backlight")); e_widget_list_object_append(o, ob, 1, 1, 0.5); ob = e_widget_slider_add(evas, 1, 0, _("%3.0f"), 0.0, 100.0, 1.0, 0, @@ -326,7 +142,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D &(cfdata->backlight_dim), NULL, 100); e_widget_list_object_append(o, ob, 1, 1, 0.5); - ob = e_widget_check_add(evas, _("Idle Fade Time"), &(cfdata->enable_off)); + ob = e_widget_check_add(evas, _("Idle Fade Time"), &(cfdata->enable_idle_dim)); e_widget_list_object_append(o, ob, 1, 1, 0.5); e_widget_disabled_set(ob, cfdata->enable_idle_dim); // set state from saved config ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 0.5, 90.0, 1.0, 0, @@ -342,113 +158,24 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D &(cfdata->backlight_transition), NULL, 100); e_widget_list_object_append(o, ob, 1, 1, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Backlight"), o, - 1, 0, 1, 0, 0.5, 0.0); - - e_widget_toolbook_page_show(otb, 0); - - return otb; + return o; } /* general functionality/callbacks */ -static void -_cb_standby_slider_change(void *data, Evas_Object *obj __UNUSED__) -{ - E_Config_Dialog_Data *cfdata = data; - - /* standby-slider */ - if (cfdata->standby_timeout > cfdata->suspend_timeout) - { - cfdata->suspend_timeout = cfdata->standby_timeout; - if (cfdata->suspend_slider) - e_widget_slider_value_double_set(cfdata->suspend_slider, - cfdata->suspend_timeout); - - if (cfdata->suspend_timeout > cfdata->off_timeout) - { - cfdata->off_timeout = cfdata->suspend_timeout; - if (cfdata->off_slider) - e_widget_slider_value_double_set(cfdata->off_slider, - cfdata->off_timeout); - } - } -} - -static void -_cb_suspend_slider_change(void *data, Evas_Object *obj __UNUSED__) -{ - E_Config_Dialog_Data *cfdata = data; - - /* suspend-slider */ - if (cfdata->suspend_timeout > cfdata->off_timeout) - { - cfdata->off_timeout = cfdata->suspend_timeout; - if (cfdata->off_slider) - e_widget_slider_value_double_set(cfdata->off_slider, - cfdata->off_timeout); - } - if (cfdata->suspend_timeout < cfdata->standby_timeout) - { - cfdata->standby_timeout = cfdata->suspend_timeout; - if (cfdata->standby_slider) - e_widget_slider_value_double_set(cfdata->standby_slider, - cfdata->standby_timeout); - } -} - static void _cb_backlight_slider_change(void *data, Evas_Object *obj __UNUSED__) { E_Config_Dialog_Data *cfdata = data; /* off-slider */ - if (cfdata->backlight_timeout < cfdata->suspend_timeout) + if (cfdata->backlight_timeout < e_config->screensaver_timeout) { - cfdata->suspend_timeout = cfdata->backlight_timeout; - if (cfdata->suspend_slider) - e_widget_slider_value_double_set(cfdata->suspend_slider, - cfdata->suspend_timeout); - - if (cfdata->suspend_timeout < cfdata->backlight_timeout) - { - cfdata->backlight_timeout = cfdata->suspend_timeout; - if (cfdata->backlight_slider) - e_widget_slider_value_double_set(cfdata->backlight_slider, - cfdata->backlight_timeout); - } + e_config->screensaver_timeout = cfdata->backlight_timeout; + e_config->dpms_standby_timeout = e_config->screensaver_timeout; + e_config->dpms_suspend_timeout = e_config->screensaver_timeout; + e_config->dpms_off_timeout = e_config->screensaver_timeout; } + e_screensaver_update(); + e_dpms_update(); e_backlight_update(); } - -static void -_cb_off_slider_change(void *data, Evas_Object *obj __UNUSED__) -{ - E_Config_Dialog_Data *cfdata = data; - - /* off-slider */ - if (cfdata->off_timeout < cfdata->suspend_timeout) - { - cfdata->suspend_timeout = cfdata->off_timeout; - if (cfdata->suspend_slider) - e_widget_slider_value_double_set(cfdata->suspend_slider, - cfdata->suspend_timeout); - - if (cfdata->suspend_timeout < cfdata->standby_timeout) - { - cfdata->standby_timeout = cfdata->suspend_timeout; - if (cfdata->standby_slider) - e_widget_slider_value_double_set(cfdata->standby_slider, - cfdata->standby_timeout); - } - } -} - -/*! - * @param data A Eina_List of Evas_Object to chain widgets together with the checkbox - * @param obj A Evas_Object checkbox created with e_widget_check_add() - */ -static void -_cb_disable_changed(void *data, Evas_Object *obj) -{ - _list_disabled_state_apply(data, !e_widget_check_checked_get(obj)); -} diff --git a/src/modules/conf_display/e_int_config_screensaver.c b/src/modules/conf_display/e_int_config_screensaver.c index 5c5b3c898..619ae2a43 100644 --- a/src/modules/conf_display/e_int_config_screensaver.c +++ b/src/modules/conf_display/e_int_config_screensaver.c @@ -22,9 +22,7 @@ struct _E_Config_Dialog_Data int enable_screensaver; double timeout; - double interval; - int blanking; - int exposures; + int presentation_mode; int ask_presentation; double ask_presentation_timeout; @@ -68,10 +66,8 @@ _fill_data(E_Config_Dialog_Data *cfdata) { cfdata->enable_screensaver = e_config->screensaver_enable; cfdata->timeout = e_config->screensaver_timeout / 60; - cfdata->interval = e_config->screensaver_interval; - cfdata->blanking = e_config->screensaver_blanking; - cfdata->exposures = e_config->screensaver_expose; cfdata->ask_presentation = e_config->screensaver_ask_presentation; + cfdata->presentation_mode = e_config->mode.presentation; cfdata->ask_presentation_timeout = e_config->screensaver_ask_presentation_timeout; cfdata->screensaver_suspend = e_config->screensaver_suspend; cfdata->screensaver_suspend_on_ac = e_config->screensaver_suspend_on_ac; @@ -101,18 +97,26 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { e_config->screensaver_enable = cfdata->enable_screensaver; e_config->screensaver_timeout = (cfdata->timeout * 60); - e_config->screensaver_interval = cfdata->interval; - e_config->screensaver_blanking = cfdata->blanking; - e_config->screensaver_expose = cfdata->exposures; e_config->screensaver_ask_presentation = cfdata->ask_presentation; + e_config->mode.presentation = cfdata->presentation_mode; e_config->screensaver_ask_presentation_timeout = cfdata->ask_presentation_timeout; e_config->screensaver_suspend = cfdata->screensaver_suspend; e_config->screensaver_suspend_on_ac = cfdata->screensaver_suspend_on_ac; e_config->screensaver_suspend_delay = cfdata->screensaver_suspend_delay; + + // enough of dpms vs screensaver being different! useless + e_config->dpms_enable = e_config->screensaver_enable; + e_config->dpms_standby_enable = e_config->dpms_enable; + e_config->dpms_suspend_enable = e_config->dpms_enable; + e_config->dpms_off_enable = e_config->dpms_enable; + e_config->dpms_standby_timeout = e_config->screensaver_timeout; + e_config->dpms_suspend_timeout = e_config->screensaver_timeout; + e_config->dpms_off_timeout = e_config->screensaver_timeout; /* Apply settings */ e_screensaver_update(); - + e_dpms_update(); + e_config_save_queue(); return 1; } @@ -122,10 +126,8 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda { return ((e_config->screensaver_enable != cfdata->enable_screensaver) || (e_config->screensaver_timeout != (int)(cfdata->timeout * 60)) || - (e_config->screensaver_interval != cfdata->interval) || - (e_config->screensaver_blanking != cfdata->blanking) || - (e_config->screensaver_expose != cfdata->exposures) || (e_config->screensaver_ask_presentation != cfdata->ask_presentation) || + (e_config->mode.presentation != cfdata->presentation_mode) || (e_config->screensaver_ask_presentation_timeout != cfdata->ask_presentation_timeout) || (e_config->screensaver_suspend != cfdata->screensaver_suspend) || (e_config->screensaver_suspend_on_ac != cfdata->screensaver_suspend_on_ac) || @@ -135,27 +137,35 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda static Evas_Object * _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) { - Evas_Object *otb, *ol, *ow, *of; - E_Radio_Group *rg; + Evas_Object *otb, *ol, *ow; otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale)); /* Screensaver */ ol = e_widget_list_add(evas, 0, 0); - ow = e_widget_check_add(evas, _("Enable X Screensaver"), + ow = e_widget_check_add(evas, _("Enable screen blanking"), &(cfdata->enable_screensaver)); e_widget_on_change_hook_set(ow, _cb_disable, cfdata); e_widget_list_object_append(ol, ow, 1, 1, 0.5); + ow = e_widget_label_add(evas, _("Timeout")); + cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); + e_widget_list_object_append(ol, ow, 1, 1, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), + 1.0, 90.0, 1.0, 0, &(cfdata->timeout), NULL, 100); + cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); + e_widget_list_object_append(ol, ow, 1, 1, 0.5); + ow = e_widget_check_add(evas, _("Suspend on blank"), &(cfdata->screensaver_suspend)); cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - ow = e_widget_check_add(evas, _("Even if on power"), + ow = e_widget_check_add(evas, _("Suspend even if AC"), &(cfdata->screensaver_suspend_on_ac)); cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - ow = e_widget_label_add(evas, _("Delay until suspend")); + + ow = e_widget_label_add(evas, _("Suspend delay")); cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); e_widget_list_object_append(ol, ow, 1, 1, 0.5); ow = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), @@ -163,30 +173,13 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Screensaver"), ol, + e_widget_toolbook_page_append(otb, NULL, _("Blanking"), ol, 1, 0, 1, 0, 0.5, 0.0); - - /* Timers */ - ol = e_widget_list_add(evas, 0, 0); - ow = e_widget_label_add(evas, _("Initial timeout")); - cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); - e_widget_list_object_append(ol, ow, 1, 1, 0.5); - ow = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), - 1.0, 90.0, 1.0, 0, &(cfdata->timeout), NULL, 100); - cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); - e_widget_list_object_append(ol, ow, 1, 1, 0.5); - ow = e_widget_label_add(evas, _("Alternation timeout")); - cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); - e_widget_list_object_append(ol, ow, 1, 1, 0.5); - ow = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), - 1.0, 300.0, 1.0, 0, &(cfdata->interval), NULL, 100); - cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); - e_widget_list_object_append(ol, ow, 1, 1, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Timers"), ol, - 1, 0, 1, 0, 0.5, 0.0); - /* Presentation */ ol = e_widget_list_add(evas, 0, 0); + ow = e_widget_check_add(evas, _("Presentation mode enabled"), + &(cfdata->presentation_mode)); + e_widget_list_object_append(ol, ow, 1, 1, 0.5); ow = e_widget_check_add(evas, _("Suggest if deactivated before"), &(cfdata->ask_presentation)); e_widget_on_change_hook_set(ow, _cb_ask_presentation_changed, cfdata); @@ -198,40 +191,9 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data cfdata->gui.ask_presentation_slider = ow; cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Presentation Mode"), ol, + e_widget_toolbook_page_append(otb, NULL, _("Presentation"), ol, 1, 0, 1, 0, 0.5, 0.0); - - /* Misc */ - ol = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("Blanking"), 0); - rg = e_widget_radio_group_new(&(cfdata->blanking)); - ow = e_widget_radio_add(evas, _("Default"), E_CONFIG_BLANKING_DEFAULT, rg); - cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); - e_widget_framelist_object_append(of, ow); - ow = e_widget_radio_add(evas, _("Preferred"), E_CONFIG_BLANKING_PREFERRED, rg); - cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); - e_widget_framelist_object_append(of, ow); - ow = e_widget_radio_add(evas, _("Not Preferred"), E_CONFIG_BLANKING_NOT_PREFERRED, rg); - cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); - e_widget_framelist_object_append(of, ow); - e_widget_list_object_append(ol, of, 1, 1, 0.5); - - of = e_widget_framelist_add(evas, _("Exposure Events"), 0); - rg = e_widget_radio_group_new(&(cfdata->exposures)); - ow = e_widget_radio_add(evas, _("Default"), E_CONFIG_EXPOSURES_DEFAULT, rg); - cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); - e_widget_framelist_object_append(of, ow); - ow = e_widget_radio_add(evas, _("Allow"), E_CONFIG_EXPOSURES_ALLOWED, rg); - cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); - e_widget_framelist_object_append(of, ow); - ow = e_widget_radio_add(evas, _("Don't Allow"), - E_CONFIG_EXPOSURES_NOT_ALLOWED, rg); - cfdata->disable_list = eina_list_append(cfdata->disable_list, ow); - e_widget_framelist_object_append(of, ow); - e_widget_list_object_append(ol, of, 1, 1, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Miscellaneous"), ol, - 1, 0, 1, 0, 0.5, 0.0); - + e_widget_toolbook_page_show(otb, 0); // handler for enable/disable widget array diff --git a/src/modules/conf_display/e_mod_main.c b/src/modules/conf_display/e_mod_main.c index 39d767f5d..e04dc5b1b 100644 --- a/src/modules/conf_display/e_mod_main.c +++ b/src/modules/conf_display/e_mod_main.c @@ -29,11 +29,11 @@ e_modapi_init(E_Module *m) "preferences-system-lock-screen", e_int_config_desklock); e_configure_registry_item_add("screen/screen_saver", 40, - _("Screen Saver"), NULL, + _("Blanking"), NULL, "preferences-desktop-screensaver", e_int_config_screensaver); e_configure_registry_item_add("screen/power_management", 50, - _("Power Management"), NULL, + _("Backlight"), NULL, "preferences-system-power-management", e_int_config_dpms);