hugok
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature: per-screen desklock logo visibility config 

T613
This commit is contained in:
Mike Blumenkrantz 2014-02-20 14:54:29 -05:00
parent 0e66cdda82
commit e86dc53ddc
6 changed files with 107 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bin/e_config.c
View File

@ -196,6 +196,7 @@ _e_config_edd_init(Eina_Bool old)
#define T E_Config_Desklock_Background
#define D _e_config_desklock_bg_edd
E_CONFIG_VAL(D, T, file, STR);
E_CONFIG_VAL(D, T, hide_logo, UCHAR);
_e_config_desktop_bg_edd = E_CONFIG_DD_NEW("E_Config_Desktop_Background", E_Config_Desktop_Background);
#undef T

1
src/bin/e_config.h
View File

@ -452,6 +452,7 @@ struct E_Config_Bindings
struct _E_Config_Desklock_Background
{
const char *file;
Eina_Bool hide_logo;
};
struct _E_Config_Env_Var

136
src/modules/conf_display/e_int_config_desklock.c
View File

@ -84,24 +84,47 @@ e_int_config_desklock(E_Comp *comp, const char *params __UNUSED__)
}
void
e_int_config_desklock_fsel_done(E_Config_Dialog *cfd, Evas_Object *bg, const char *bg_file)
e_int_config_desklock_fsel_done(E_Config_Dialog *cfd, Evas_Object *bg, const char *bg_file, Eina_Bool hide_logo)
{
E_Config_Dialog_Data *cfdata;
Eina_List *l;
const char *cbg;
E_Config_Desklock_Background *cbg;
Eina_Stringshare *bg_name;
Evas_Object *o;
unsigned int n = 0;
if (!(cfdata = cfd->cfdata)) return;
cfdata->bg_fsel = NULL;
if (!bg_file) return;
e_widget_preview_file_get(bg, &cbg, NULL);
l = eina_list_data_find_list(cfdata->bgs, cbg);
if (l && l->data)
eina_stringshare_replace((const char**)&l->data, bg_file);
else
eina_list_data_set(l, eina_stringshare_add(bg_file));
e_widget_preview_file_get(bg, &bg_name, NULL);
EINA_LIST_FOREACH(cfdata->gui.bgs, l, o)
{
if (o == bg) break;
n++;
}
cbg = eina_list_nth(cfdata->bgs, n);
if (!cbg) return; //wtf
eina_stringshare_replace(&cbg->file, bg_file);
cbg->hide_logo = hide_logo;
e_widget_preview_edje_set(bg, bg_file, "e/desktop/background");
}
static E_Config_Desklock_Background *
desklock_bg_dup(const E_Config_Desklock_Background *cbg, const char *str)
{
E_Config_Desklock_Background *ret;
ret = E_NEW(E_Config_Desklock_Background, 1);
if (cbg)
{
ret->file = eina_stringshare_ref(cbg->file);
ret->hide_logo = cbg->hide_logo;
}
else
ret->file = eina_stringshare_add(str);
return ret;
}
static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
@ -111,16 +134,17 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->zone_count = _zone_count_get();
EINA_LIST_FOREACH(e_config->desklock_backgrounds, l, bg)
cfdata->bgs = eina_list_append(cfdata->bgs, eina_stringshare_ref(bg->file));
cfdata->bgs = eina_list_append(cfdata->bgs, desklock_bg_dup(bg, NULL));
if (!cfdata->bgs)
for (x = 0; x < cfdata->zone_count; x++)
cfdata->bgs = eina_list_append(cfdata->bgs, eina_stringshare_add("theme_desklock_background"));
cfdata->bgs = eina_list_append(cfdata->bgs, desklock_bg_dup(NULL, "theme_desklock_background"));
if (!e_util_strcmp(eina_list_data_get(cfdata->bgs), "theme_desklock_background"))
bg = eina_list_data_get(cfdata->bgs);
if (!e_util_strcmp(bg->file, "theme_desklock_background"))
cfdata->bg_method = E_DESKLOCK_BACKGROUND_METHOD_THEME_DESKLOCK;
else if (!e_util_strcmp(eina_list_data_get(cfdata->bgs), "theme_background"))
else if (!e_util_strcmp(bg->file, "theme_background"))
cfdata->bg_method = E_DESKLOCK_BACKGROUND_METHOD_THEME;
else if (!e_util_strcmp(eina_list_data_get(cfdata->bgs), "user_background"))
else if (!e_util_strcmp(bg->file, "user_background"))
cfdata->bg_method = E_DESKLOCK_BACKGROUND_METHOD_WALLPAPER;
else
cfdata->bg_method = E_DESKLOCK_BACKGROUND_METHOD_CUSTOM;
@ -169,15 +193,18 @@ _create_data(E_Config_Dialog *cfd)
static void
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
const char *bg;
E_Config_Desklock_Background *bg;
if (cfdata->bg_fsel)
e_object_del(E_OBJECT(cfdata->bg_fsel));
E_FREE(cfdata->custom_lock_cmd);
E_FREE(cfdata->desklock_personal_passwd);
E_FREE(cfdata->pin_str);
EINA_LIST_FREE(cfdata->bgs, bg)
eina_stringshare_del(bg);
E_FREE(cfdata);
{
eina_stringshare_del(bg->file);
free(bg);
}
free(cfdata);
}
static Evas_Object *
@ -400,7 +427,6 @@ static int
_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
const Eina_List *l;
const char *bg;
E_Config_Desklock_Background *cbg;
e_config->desklock_auth_method = cfdata->desklock_auth_method;
@ -461,12 +487,10 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
eina_stringshare_del(cbg->file);
free(cbg);
}
EINA_LIST_FOREACH(cfdata->bgs, l, bg)
EINA_LIST_FOREACH(cfdata->bgs, l, cbg)
{
cbg = E_NEW(E_Config_Desklock_Background, 1);
cbg->file = eina_stringshare_ref(bg);
e_config->desklock_backgrounds = eina_list_append(e_config->desklock_backgrounds, cbg);
e_filereg_register(bg);
e_config->desklock_backgrounds = eina_list_append(e_config->desklock_backgrounds, desklock_bg_dup(cbg, NULL));
e_filereg_register(cbg->file);
}
}
@ -533,9 +557,11 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
ll = cfdata->bgs;
EINA_LIST_FOREACH(e_config->desklock_backgrounds, l, cbg)
{
if (!ll) return 1;
if (cbg->file != ll->data) return 1;
ll = ll->next;
E_Config_Desklock_Background *cbg2 = eina_list_data_get(ll);
if (!cbg2) return 1;
if (cbg->file != cbg2->file) return 1;
if (cbg->hide_logo != cbg2->hide_logo) return 1;
ll = eina_list_next(ll);
}
if (cfdata->login_zone < 0)
@ -569,6 +595,7 @@ _cb_method_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
Evas_Object *bg;
const char *theme = NULL;
int x;
E_Config_Desklock_Background *cbg;
if (!(cfdata = data)) return;
EINA_LIST_FOREACH(cfdata->gui.bgs, l, bg)
@ -578,10 +605,13 @@ _cb_method_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
switch (cfdata->bg_method)
{
case E_DESKLOCK_BACKGROUND_METHOD_THEME_DESKLOCK:
EINA_LIST_FREE(cfdata->bgs, theme)
eina_stringshare_del(theme);
EINA_LIST_FREE(cfdata->bgs, cbg)
{
eina_stringshare_del(cbg->file);
free(cbg);
}
for (x = 0; x < cfdata->zone_count; x++)
cfdata->bgs = eina_list_append(cfdata->bgs, eina_stringshare_add("theme_desklock_background"));
cfdata->bgs = eina_list_append(cfdata->bgs, desklock_bg_dup(NULL, "theme_desklock_background"));
theme = e_theme_edje_file_get("base/theme/desklock",
"e/desklock/background");
if (theme)
@ -596,10 +626,13 @@ _cb_method_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
{
EINA_LIST_FOREACH(cfdata->gui.bgs, l, bg)
e_widget_preview_edje_set(bg, theme, "e/desktop/background");
EINA_LIST_FREE(cfdata->bgs, theme)
eina_stringshare_del(theme);
EINA_LIST_FREE(cfdata->bgs, cbg)
{
eina_stringshare_del(cbg->file);
free(cbg);
}
for (x = 0; x < cfdata->zone_count; x++)
cfdata->bgs = eina_list_append(cfdata->bgs, eina_stringshare_add("theme_background"));
cfdata->bgs = eina_list_append(cfdata->bgs, desklock_bg_dup(NULL, "theme_background"));
}
break;
@ -612,25 +645,23 @@ _cb_method_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
{
EINA_LIST_FOREACH(cfdata->gui.bgs, l, bg)
e_widget_preview_edje_set(bg, e_config->desktop_default_background, "e/desktop/background");
EINA_LIST_FREE(cfdata->bgs, theme)
eina_stringshare_del(theme);
EINA_LIST_FREE(cfdata->bgs, cbg)
{
eina_stringshare_del(cbg->file);
free(cbg);
}
for (y = 0; y < cfdata->zone_count; y++)
cfdata->bgs = eina_list_append(cfdata->bgs, eina_stringshare_add("user_background"));
cfdata->bgs = eina_list_append(cfdata->bgs, desklock_bg_dup(NULL, "user_background"));
}
/* attempt to set wallpaper from desktop 0,0 on each zone as a desklock bg */
EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cdb)
if ((!cdb->desk_x) && (!cdb->desk_y))
{
Eina_List *ll;
ll = eina_list_nth_list(cfdata->bgs, cdb->zone);
if (ll)
{
theme = eina_list_data_get(ll);
eina_stringshare_replace(&theme, cdb->file);
eina_list_data_set(ll, theme);
}
cbg = eina_list_nth(cfdata->bgs, cdb->zone);
if (cbg)
eina_stringshare_refplace(&cbg->file, cdb->file);
else
cfdata->bgs = eina_list_append(cfdata->bgs, cdb->file);
cfdata->bgs = eina_list_append(cfdata->bgs, desklock_bg_dup(NULL, cdb->file));
bg = eina_list_nth(cfdata->gui.bgs, cdb->zone);
if (bg)
e_widget_preview_edje_set(bg, cdb->file, "e/desktop/background");
@ -640,26 +671,31 @@ _cb_method_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
{
EINA_LIST_FOREACH(cfdata->gui.bgs, l, bg)
e_widget_preview_edje_set(bg, e_config->desktop_default_background, "e/desktop/background");
EINA_LIST_FREE(cfdata->bgs, theme)
eina_stringshare_del(theme);
EINA_LIST_FREE(cfdata->bgs, cbg)
{
eina_stringshare_del(cbg->file);
free(cbg);
}
for (x = 0; x < cfdata->zone_count; x++)
cfdata->bgs = eina_list_append(cfdata->bgs, eina_stringshare_add("user_background"));
cfdata->bgs = eina_list_append(cfdata->bgs, desklock_bg_dup(NULL, "user_background"));
}
break;
case E_DESKLOCK_BACKGROUND_METHOD_CUSTOM:
{
Eina_List *ll;
E_Config_Desklock_Background *cbg;
EINA_LIST_FREE(cfdata->bgs, theme)
eina_stringshare_del(theme);
EINA_LIST_FREE(cfdata->bgs, cbg)
{
eina_stringshare_del(cbg->file);
free(cbg);
}
ll = cfdata->gui.bgs;
EINA_LIST_FOREACH(e_config->desklock_backgrounds, l, cbg)
{
if (!ll) break;
e_widget_preview_edje_set(ll->data, cbg->file, "e/desktop/background");
cfdata->bgs = eina_list_append(cfdata->bgs, eina_stringshare_ref(cbg->file));
cfdata->bgs = eina_list_append(cfdata->bgs, desklock_bg_dup(cbg, NULL));
ll = ll->next;
}
}

7
src/modules/conf_display/e_int_config_desklock_fsel.c
View File

@ -6,6 +6,7 @@ struct _E_Config_Dialog_Data
Evas_Object *o_list, *o_up;
int fmdir;
char *bg;
int hide_logo;
};
/* local function prototypes */
@ -58,11 +59,12 @@ static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
const char *bg_file = NULL;
Eina_Bool hide_logo = cfdata->hide_logo;
if (cfdata->bg) bg_file = strdup(cfdata->bg);
E_FREE(cfdata->bg);
E_FREE(cfdata);
e_int_config_desklock_fsel_done(cfd->data, e_object_data_get(E_OBJECT(cfd)), bg_file);
e_int_config_desklock_fsel_done(cfd->data, e_object_data_get(E_OBJECT(cfd)), bg_file, hide_logo);
}
static Evas_Object *
@ -113,7 +115,10 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
e_widget_flist_path_set(cfdata->o_list, path, "/");
e_widget_size_min_set(cfdata->o_list, 200, 160);
e_widget_table_object_append(ot, cfdata->o_list, 0, 2, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, ot, 1, 1, 0.5);
ow = e_widget_check_add(evas, _("Hide Logo"), &cfdata->hide_logo);
e_widget_list_object_append(o, ow, 1, 1, 0.5);
return o;
}

2
src/modules/conf_display/e_mod_main.h
View File

@ -7,7 +7,7 @@ E_Config_Dialog *e_int_config_dpms(E_Comp *comp, const char *params __UNUSED__);
E_Config_Dialog *e_int_config_display(E_Comp *comp, const char *params __UNUSED__);
E_Config_Dialog *e_int_config_desks(E_Comp *comp, const char *params __UNUSED__);
E_Config_Dialog *e_int_config_desklock(E_Comp *comp, const char *params __UNUSED__);
void e_int_config_desklock_fsel_done(E_Config_Dialog *cfd, Evas_Object *bg, const char *bg_file);
void e_int_config_desklock_fsel_done(E_Config_Dialog *cfd, Evas_Object *bg, const char *bg_file, Eina_Bool hide_logo);
E_Config_Dialog *e_int_config_desklock_fsel(E_Config_Dialog *parent, Evas_Object *bg);
void e_int_config_desklock_fsel_del(E_Config_Dialog *cfd);

12
src/modules/lokker/lokker.c
View File

@ -447,6 +447,18 @@ _lokker_popup_add(E_Zone *zone)
case E_DESKLOCK_AUTH_METHOD_EXTERNAL: //handled by e_desklock
default: break;
}
if (cbg)
{
const char *sig[] =
{
"e,state,logo,visible",
"e,state,logo,hidden",
};
if (lp->bg_object)
edje_object_signal_emit(lp->bg_object, sig[cbg->hide_logo], "e");
if (lp->login_box)
edje_object_signal_emit(lp->login_box, sig[cbg->hide_logo], "e");
}
}
evas_event_thaw(evas);