enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

trailing spaces 

SVN revision: 40425
This commit is contained in:
Iván Briano 2009-04-28 01:49:17 +00:00
parent 022e23f4cb
commit e2b5c2e968
1 changed files with 98 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
src/modules/conf_desklock/e_int_config_desklock.c
View File

@ -28,14 +28,14 @@ static void _cb_disable_check(void *data, Evas_Object *obj);
static void _cb_ask_presentation_changed(void *data, Evas_Object *obj);
struct _E_Config_Dialog_Data
struct _E_Config_Dialog_Data
{
E_Config_Dialog *cfd;
Evas_Object *o_prev;
Evas_Object *o_fm, *o_sf;
Evas_Object *o_btn, *o_custom;
Evas_Object *o_login_slider;
/* Common vars */
int use_xscreensaver;
int fmdir;
@ -47,7 +47,7 @@ struct _E_Config_Dialog_Data
int screensaver_lock;
double idle_time;
double post_screensaver_time;
/* Adv props */
int bg_method;
char *bg;
@ -74,11 +74,11 @@ struct _E_Config_Dialog_Data
EAPI E_Config_Dialog *
e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "_config_desklock_dialog")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
if (!v) return NULL;
@ -92,26 +92,26 @@ e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
v->advanced.apply_cfdata = _adv_apply;
v->advanced.check_changed = _adv_check_changed;
v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Screen Lock Settings"), "E",
cfd = e_config_dialog_new(con, _("Screen Lock Settings"), "E",
"_config_desklock_dialog", "preferences-desklock",
0, v, NULL);
return cfd;
}
static void
_fill_data(E_Config_Dialog_Data *cfdata)
static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
cfdata->fmdir = 0;
if (e_config->desklock_background)
if (e_config->desklock_background)
{
cfdata->bg = strdup(e_config->desklock_background);
if (!strstr(cfdata->bg, e_user_homedir_get()))
cfdata->fmdir = 1;
}
else
else
cfdata->bg = strdup("theme_desklock_background");
if (!strcmp(cfdata->bg, "theme_desklock_background"))
cfdata->bg_method = 0;
else if (!strcmp(cfdata->bg, "theme_background"))
@ -123,9 +123,9 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->use_xscreensaver = ecore_x_screensaver_event_available_get();
cfdata->zone_count = _zone_count_get();
cfdata->custom_lock = e_config->desklock_use_custom_desklock;
if (e_config->desklock_custom_desklock_cmd)
if (e_config->desklock_custom_desklock_cmd)
cfdata->custom_lock_cmd = strdup(e_config->desklock_custom_desklock_cmd);
cfdata->start_locked = e_config->desklock_start_locked;
@ -133,12 +133,12 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->screensaver_lock = e_config->desklock_autolock_screensaver;
cfdata->idle_time = e_config->desklock_autolock_idle_timeout / 60;
cfdata->post_screensaver_time = e_config->desklock_post_screensaver_time;
if (e_config->desklock_login_box_zone >= 0)
if (e_config->desklock_login_box_zone >= 0)
{
cfdata->login_zone = 0;
cfdata->zone = e_config->desklock_login_box_zone;
}
else
else
{
cfdata->login_zone = e_config->desklock_login_box_zone;
cfdata->zone = 0;
@ -149,17 +149,17 @@ _fill_data(E_Config_Dialog_Data *cfdata)
}
static void *
_create_data(E_Config_Dialog *cfd)
_create_data(E_Config_Dialog *cfd)
{
E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
_fill_data(cfdata);
return cfdata;
}
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
E_FREE(cfdata->custom_lock_cmd);
E_FREE(cfdata->bg);
@ -191,10 +191,10 @@ _basic_screensaver_lock_cb_changed(void *data, Evas_Object *o)
}
static Evas_Object *
_basic_create(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, *of, *ow;
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Automatic Locking"), 0);
e_widget_disabled_set(of, !cfdata->use_xscreensaver);
@ -202,7 +202,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
&cfdata->start_locked);
e_widget_disabled_set(ow, !cfdata->use_xscreensaver);
e_widget_framelist_object_append(of, ow);
ow = e_widget_check_add(evas, _("Lock when X screensaver activates"),
ow = e_widget_check_add(evas, _("Lock when X screensaver activates"),
&cfdata->screensaver_lock);
e_widget_on_change_hook_set(ow, _basic_screensaver_lock_cb_changed, cfdata);
e_widget_disabled_set(ow, !cfdata->use_xscreensaver);
@ -215,7 +215,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
cfdata->gui.basic.post_screensaver_slider = ow;
e_widget_disabled_set(ow, !cfdata->use_xscreensaver);
e_widget_framelist_object_append(of, ow);
ow = e_widget_check_add(evas, _("Lock when idle time exceeded"),
ow = e_widget_check_add(evas, _("Lock when idle time exceeded"),
&cfdata->auto_lock);
e_widget_on_change_hook_set(ow, _basic_auto_lock_cb_changed, cfdata);
e_widget_framelist_object_append(of, ow);
@ -236,7 +236,7 @@ _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_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
e_config->desklock_start_locked = cfdata->start_locked;
e_config->desklock_autolock_idle = cfdata->auto_lock;
@ -276,7 +276,7 @@ _user_wallpaper_get(void)
}
static Evas_Object *
_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *mt, *rt, *ft, *ow, *of;
Evas_Object *custom_screenlock_check;
@ -286,13 +286,13 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
int screen_count;
char path[PATH_MAX];
const char *f;
zone = e_zone_current_get(cfd->con);
screen_count = ecore_x_xinerama_screen_count_get();
mt = e_widget_table_add(evas, 0);
ft = e_widget_table_add(evas, 0);
rt = e_widget_table_add(evas, 1);
rg = e_widget_radio_group_new(&(cfdata->fmdir));
ow = e_widget_radio_add(evas, _("Personal"), 0, rg);
@ -302,8 +302,8 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_on_change_hook_set(ow, _cb_radio_change, cfdata);
e_widget_table_object_append(rt, ow, 1, 0, 1, 1, 1, 1, 0, 0);
e_widget_table_object_append(ft, rt, 0, 0, 1, 1, 0, 0, 0, 0);
cfdata->o_btn = e_widget_button_add(evas, _("Go up a Directory"),
"go-up", _cb_button_up,
cfdata->o_btn = e_widget_button_add(evas, _("Go up a Directory"),
"go-up", _cb_button_up,
cfdata, NULL);
e_widget_table_object_append(ft, cfdata->o_btn, 0, 1, 1, 1, 0, 0, 0, 0);
@ -311,7 +311,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_prefix_data_concat_static(path, "data/backgrounds");
else
e_user_dir_concat_static(path, "backgrounds");
ow = e_fm2_add(evas);
cfdata->o_fm = ow;
memset(&fmc, 0, sizeof(E_Fm2_Config));
@ -335,15 +335,15 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_fm2_icon_menu_flags_set(ow, E_FM2_MENU_NO_SHOW_HIDDEN);
e_fm2_path_set(ow, path, "/");
evas_object_smart_callback_add(ow, "dir_changed",
evas_object_smart_callback_add(ow, "dir_changed",
_cb_fm_dir_change, cfdata);
evas_object_smart_callback_add(ow, "selection_change",
evas_object_smart_callback_add(ow, "selection_change",
_cb_fm_sel_change, cfdata);
evas_object_smart_callback_add(ow, "changed", _cb_fm_change, cfdata);
cfdata->o_sf = e_widget_scrollframe_pan_add(evas, ow, e_fm2_pan_set,
cfdata->o_sf = e_widget_scrollframe_pan_add(evas, ow, e_fm2_pan_set,
e_fm2_pan_get,
e_fm2_pan_max_get,
e_fm2_pan_max_get,
e_fm2_pan_child_size_get);
e_widget_min_size_set(cfdata->o_sf, 100, 100);
e_widget_table_object_append(ft, cfdata->o_sf, 0, 2, 1, 1, 1, 1, 1, 1);
@ -353,15 +353,15 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
cfdata->o_prev = ow;
if (cfdata->bg_method == 0)
{
f = e_theme_edje_file_get("base/theme/desklock",
f = e_theme_edje_file_get("base/theme/desklock",
"e/desklock/background");
e_widget_preview_edje_set(cfdata->o_prev, f, "e/desklock/background");
E_FREE(cfdata->bg);
cfdata->bg = strdup("theme_desklock_background");
}
else if (cfdata->bg_method == 1)
else if (cfdata->bg_method == 1)
{
f = e_theme_edje_file_get("base/theme/backgrounds",
f = e_theme_edje_file_get("base/theme/backgrounds",
"e/desktop/background");
e_widget_preview_edje_set(cfdata->o_prev, f, "e/desktop/background");
E_FREE(cfdata->bg);
@ -374,16 +374,16 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
E_FREE(cfdata->bg);
cfdata->bg = strdup("user_background");
}
else
else
{
if (cfdata->bg)
if (cfdata->bg)
{
e_widget_preview_edje_set(cfdata->o_prev, cfdata->bg,
e_widget_preview_edje_set(cfdata->o_prev, cfdata->bg,
"e/desktop/background");
}
else
else
{
f = e_theme_edje_file_get("base/theme/backgrounds",
f = e_theme_edje_file_get("base/theme/backgrounds",
"e/desktop/background");
e_widget_preview_edje_set(cfdata->o_prev, f, "e/desktop/background");
E_FREE(cfdata->bg);
@ -407,14 +407,14 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_on_change_hook_set(ow, _cb_login_change, cfdata);
e_widget_disabled_set(ow, (screen_count <= 0));
e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0);
cfdata->o_login_slider = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0.0,
(cfdata->zone_count -1), 1.0,
cfdata->o_login_slider = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0.0,
(cfdata->zone_count -1), 1.0,
0, NULL, &(cfdata->zone), 100);
e_widget_disabled_set(cfdata->o_login_slider, (screen_count <= 0));
e_widget_frametable_object_append(of, cfdata->o_login_slider, 0, 3, 1, 1,
e_widget_frametable_object_append(of, cfdata->o_login_slider, 0, 3, 1, 1,
1, 0, 1, 0);
e_widget_table_object_append(mt, of, 2, 0, 1, 1, 1, 1, 1, 1);
of = e_widget_frametable_add(evas, _("Wallpaper Mode"), 0);
rg = e_widget_radio_group_new(&(cfdata->bg_method));
ow = e_widget_radio_add(evas, _("Theme Defined"), 0, rg);
@ -427,7 +427,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
evas_object_smart_callback_add(ow, "changed", _cb_method_change, cfdata);
e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0);
cfdata->o_custom = e_widget_radio_add(evas, _("Custom"), 3, rg);
evas_object_smart_callback_add(cfdata->o_custom, "changed",
evas_object_smart_callback_add(cfdata->o_custom, "changed",
_cb_method_change, cfdata);
e_widget_frametable_object_append(of, cfdata->o_custom, 0, 3, 1, 1,
1, 0, 1, 0);
@ -459,7 +459,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_table_object_append(mt, ow, 2, 1, 1, 2, 1, 1, 1, 1);
of = e_widget_framelist_add(evas, _("Custom Screenlock"), 0);
custom_screenlock_check = e_widget_check_add(evas, _("Use custom screenlock"),
custom_screenlock_check = e_widget_check_add(evas, _("Use custom screenlock"),
&(cfdata->custom_lock));
e_widget_framelist_object_append(of, custom_screenlock_check);
ow = e_widget_entry_add(evas, &(cfdata->custom_lock_cmd), NULL, NULL, NULL);
@ -469,12 +469,12 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
// handler for enable/disable widget array
e_widget_on_change_hook_set(custom_screenlock_check, _cb_disable_check, ow);
return mt;
}
static int
_adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
_adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
e_config->desklock_start_locked = cfdata->start_locked;
e_config->desklock_autolock_idle = cfdata->auto_lock;
@ -483,9 +483,9 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_config->desklock_ask_presentation = cfdata->ask_presentation;
e_config->desklock_ask_presentation_timeout = cfdata->ask_presentation_timeout;
if (cfdata->bg)
if (cfdata->bg)
{
if (e_config->desklock_background)
if (e_config->desklock_background)
{
e_filereg_deregister(e_config->desklock_background);
eina_stringshare_del(e_config->desklock_background);
@ -502,14 +502,14 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_config->desklock_login_box_zone = cfdata->zone;
e_config->desklock_use_custom_desklock = cfdata->custom_lock;
if (cfdata->custom_lock_cmd)
if (cfdata->custom_lock_cmd)
{
if (e_config->desklock_custom_desklock_cmd)
eina_stringshare_del(e_config->desklock_custom_desklock_cmd);
e_config->desklock_custom_desklock_cmd =
e_config->desklock_custom_desklock_cmd =
eina_stringshare_add(cfdata->custom_lock_cmd);
}
e_config_save_queue();
return 1;
}
@ -554,27 +554,27 @@ _adv_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
(e_config->desklock_ask_presentation_timeout != cfdata->ask_presentation_timeout));
}
static void
_cb_method_change(void *data, Evas_Object *obj, void *event_info)
static void
_cb_method_change(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
Eina_List *sel;
E_Fm2_Icon_Info *ic;
char path[PATH_MAX];
const char *f;
cfdata = data;
if (cfdata->bg_method == 0)
{
f = e_theme_edje_file_get("base/theme/desklock",
f = e_theme_edje_file_get("base/theme/desklock",
"e/desklock/background");
e_widget_preview_edje_set(cfdata->o_prev, f, "e/desklock/background");
E_FREE(cfdata->bg);
cfdata->bg = strdup("theme_desklock_background");
}
else if (cfdata->bg_method == 1)
else if (cfdata->bg_method == 1)
{
f = e_theme_edje_file_get("base/theme/backgrounds",
f = e_theme_edje_file_get("base/theme/backgrounds",
"e/desktop/background");
e_widget_preview_edje_set(cfdata->o_prev, f, "e/desktop/background");
E_FREE(cfdata->bg);
@ -587,7 +587,7 @@ _cb_method_change(void *data, Evas_Object *obj, void *event_info)
E_FREE(cfdata->bg);
cfdata->bg = strdup("user_background");
}
else
else
{
sel = e_fm2_selected_list_get(cfdata->o_fm);
if (!sel) sel = e_fm2_all_list_get(cfdata->o_fm);
@ -605,17 +605,17 @@ _cb_method_change(void *data, Evas_Object *obj, void *event_info)
if (ecore_file_is_dir(path)) return;
E_FREE(cfdata->bg);
cfdata->bg = strdup(path);
e_widget_preview_edje_set(cfdata->o_prev, path,
e_widget_preview_edje_set(cfdata->o_prev, path,
"e/desktop/background");
}
}
static void
_cb_radio_change(void *data, Evas_Object *obj)
static void
_cb_radio_change(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata;
char path[4096];
cfdata = data;
if (!cfdata->o_fm) return;
if (cfdata->fmdir == 0)
@ -625,64 +625,64 @@ _cb_radio_change(void *data, Evas_Object *obj)
e_fm2_path_set(cfdata->o_fm, path, "/");
}
static void
_cb_login_change(void *data, Evas_Object *obj)
static void
_cb_login_change(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata;
cfdata = data;
if (cfdata->login_zone < 0)
if (cfdata->login_zone < 0)
e_widget_disabled_set(cfdata->o_login_slider, 1);
else
else
e_widget_disabled_set(cfdata->o_login_slider, 0);
}
static void
_cb_button_up(void *data1, void *data2)
static void
_cb_button_up(void *data1, void *data2)
{
E_Config_Dialog_Data *cfdata;
cfdata = data1;
if (!cfdata->o_fm) return;
e_fm2_parent_go(cfdata->o_fm);
e_widget_scrollframe_child_pos_set(cfdata->o_sf, 0, 0);
}
static void
_cb_fm_dir_change(void *data, Evas_Object *obj, void *event_info)
static void
_cb_fm_dir_change(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
cfdata = data;
if (!cfdata->o_fm) return;
if (!e_fm2_has_parent_get(cfdata->o_fm))
if (!e_fm2_has_parent_get(cfdata->o_fm))
e_widget_disabled_set(cfdata->o_btn, 1);
else
e_widget_disabled_set(cfdata->o_btn, 0);
e_widget_scrollframe_child_pos_set(cfdata->o_sf, 0, 0);
}
static void
_cb_fm_sel_change(void *data, Evas_Object *obj, void *event_info)
static void
_cb_fm_sel_change(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
Eina_List *sel;
E_Fm2_Icon_Info *ic;
char path[PATH_MAX];
cfdata = data;
if (!cfdata->o_fm) return;
sel = e_fm2_selected_list_get(cfdata->o_fm);
if (!sel) return;
ic = sel->data;
eina_list_free(sel);
if (cfdata->fmdir == 0)
if (cfdata->fmdir == 0)
{
e_user_dir_snprintf(path, sizeof(path), "backgrounds/%s",
ic->file);
}
else
else
{
e_prefix_data_snprintf(path, sizeof(path), "data/backgrounds/%s",
ic->file);
@ -695,8 +695,8 @@ _cb_fm_sel_change(void *data, Evas_Object *obj, void *event_info)
e_widget_radio_toggle_set(cfdata->o_custom, 1);
}
static void
_cb_fm_change(void *data, Evas_Object *obj, void *event_info)
static void
_cb_fm_change(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
const char *p;
@ -707,11 +707,11 @@ _cb_fm_change(void *data, Evas_Object *obj, void *event_info)
if (!cfdata->bg) return;
if (!cfdata->o_fm) return;
p = e_fm2_real_path_get(cfdata->o_fm);
if (p)
if (p)
{
if (strncmp(p, cfdata->bg, strlen(p))) return;
}
else
else
return;
len = e_user_dir_concat_static(path, "backgrounds");
@ -729,22 +729,22 @@ _cb_fm_change(void *data, Evas_Object *obj, void *event_info)
e_fm2_file_show(cfdata->o_fm, p);
}
static int
_zone_count_get(void)
static int
_zone_count_get(void)
{
int num = 0;
Eina_List *m, *c;
for (m = e_manager_list(); m; m = m->next)
for (m = e_manager_list(); m; m = m->next)
{
E_Manager *man;
man = m->data;
if (!man) continue;
for (c = man->containers; c; c = c->next)
for (c = man->containers; c; c = c->next)
{
E_Container *con;
con = c->data;
if (!con) continue;
num += eina_list_count(con->zones);
@ -760,7 +760,7 @@ _zone_count_get(void)
static void
_cb_disable_check(void *data, Evas_Object *obj)
{
e_widget_disabled_set((Evas_Object *) data,
e_widget_disabled_set((Evas_Object *) data,
!e_widget_check_checked_get(obj));
}