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

* fixing desklock cfg dialog bug. 

* removing comments.


SVN revision: 23187
This commit is contained in:
sndev 2006-06-05 16:47:55 +00:00 committed by sndev
parent 6649cecfe0
commit 9aaf7f3a5c
2 changed files with 16 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
data/themes/default_desklock.edc
View File

@ -202,206 +202,3 @@ group
}
}
/*group {
name, "widgets/desklock/main";
parts
{
part {
name: "background_image";
description {
state: "default" 0.0;
image {
normal: "e17_brushed.png";
}
fill {
size {
relative: 0 0;
offset: 400 300;
}
}
}
}
part {
name: "reflection_shadow_overlay";
description {
state: "default" 0.0;
image {
normal: "e17_"SM"reflection_shadow_overlay.png";
}
}
}
part
{
name: "logo";
mouse_events: 0;
description
{
state: "default" 0.0;
min: 64 64;
max: 64 64;
//align: 0.5 0.0;
rel1
{
relative: 0.45 0.5;
offset: 0 0;
}
rel2
{
relative: 0.45 0.5;
offset: 0 0;
}
image
{
normal: "e17_logo.png";
}
}
}
part
{
name: "label";
type: TEXT;
effect: SHADOW;
description {
state: "default" 0.0;
color: 0 0 0 255;
fixed: 0 1;
align: 0.0 0.5;
rel1
{
relative: 1.0 0.0;
offset: 20 0;
to: "logo";
}
rel2
{
relative: 1.0 0.3;
offset: 0 0;
to: "logo";
}
color: 0 0 0 255;
color3: 255 255 255 128;
text {
text: "Please enter your unlock password";
font: "Edje-Vera-Bold";
size: 10;
align: 0.0 0.5;
min: 1 1;
text_class: "desklock_title";
}
}
}
part
{
name: "passwd_entry_clip";
type: RECT;
mouse_events: 0;
description
{
state: "default" 0.0;
visible: 1;
rel1
{
relative: 0.0 0.0;
offset: 10 10;
to: "passwd_border";
}
rel2
{
relative: 1.0 1.0;
offset: -17 -10;
to: "passwd_border";
}
}
}
part
{
name: "passwd";
type: TEXT;
effect: SHADOW;
clip_to: "passwd_entry_clip";
description {
state: "default" 0.0;
color: 0 0 0 255;
fixed: 0 1;
align: 0.0 0.5;
rel1
{
relative: 0.0 0.0;
offset: 0 0;
to: "passwd_entry_clip";
}
rel2
{
relative: 0.0 1.0;
offset: 0 0;
to: "passwd_entry_clip";
}
color: 0 0 0 255;
color3: 255 255 255 128;
text {
text: "****";
font: "Edje-Vera-Bold";
size: 16;
align: 0.0 0.5;
min: 1 1;
text_class: "desklock_passwd";
}
}
}
part
{
name: "cursor";
mouse_events: 0;
clip_to: "passwd_entry_clip";
description {
state: "default" 0.0;
min: 16 16;
max: 16 16;
align: 0.0 0.5;
fixed: 1 1;
rel1 {
relative: 1.0 0.0;
offset: 0 -2;
to: "passwd";
}
rel2 {
relative: 1.0 0.9;
offset: 0 0;
to: "passwd";
}
image {
normal: "e17_entry_cursor.png";
}
}
}
part
{
name: "passwd_border";
mouse_events: 0;
description
{
state: "default" 0.0;
rel1
{
relative: 1.0 0.3;
offset: 0 0;
to: "logo";
}
rel2
{
relative: 5.0 0.9;
offset: 0 0;
to: "logo";
}
image
{
normal: "e17_gadman_overlay.png";
border: 15 15 15 15;
}
}
}
}
}*/

28
src/bin/e_int_config_desklock.c
View File

@ -523,6 +523,7 @@ _load_bgs(E_Config_Dialog_Data *cfdata)
eebuf = ecore_evas_buffer_new(1, 1);
evasbuf = ecore_evas_get(eebuf);
ic = NULL;
/* Desklock background */
o = edje_object_add(evasbuf);
f1 = e_theme_edje_file_get("base/theme/desklock", "desklock/background");
@ -535,19 +536,19 @@ _load_bgs(E_Config_Dialog_Data *cfdata)
ic = e_thumb_generate_begin(c, BG_LIST_ICON_SIZE_W, BG_LIST_ICON_SIZE_H,
cfdata->evas, &ic, NULL, NULL);
else
ic = e_thumb_evas_object_get(c, cfdata->evas, BG_LIST_ICON_SIZE_W, BG_LIST_ICON_SIZE_H, 1);
ic = e_thumb_evas_object_get(c, cfdata->evas, BG_LIST_ICON_SIZE_W,
BG_LIST_ICON_SIZE_H, 1);
e_widget_ilist_append(cfdata->gui.bg_list, ic, _("Theme Desklock Background"),
_ibg_list_cb_bg_selected, cfdata, DEF_DESKLOCK_BACKGROUND);
}
if ((!e_config->desklock_background) ||
if ((e_config->desklock_background) &&
(!strcmp(e_config->desklock_background, DEF_DESKLOCK_BACKGROUND)))
e_widget_ilist_selected_set(cfdata->gui.bg_list, 0);
e_widget_ilist_selected_set(cfdata->gui.bg_list, 1);
im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W, BG_PREVIEW_H);
e_widget_preview_edje_set(im, c, "desktop/background");
e_widget_preview_edje_set(im, c, "desklock/background");
evas_object_del(o);
ecore_evas_free(eebuf);
@ -561,22 +562,25 @@ _load_bgs(E_Config_Dialog_Data *cfdata)
o = edje_object_add(evasbuf);
f = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background");
c = strdup(f);
ic = NULL;
if (edje_object_file_set(o, f, "desktop/background"))
{
if (!e_thumb_exists(c))
ic = e_thumb_generate_begin(c, BG_LIST_ICON_SIZE_W, BG_LIST_ICON_SIZE_H,
cfdata->evas, &ic, NULL, NULL);
else
ic = e_thumb_evas_object_get(c, cfdata->evas, BG_LIST_ICON_SIZE_W, BG_LIST_ICON_SIZE_H, 1);
ic = e_thumb_evas_object_get(c, cfdata->evas, BG_LIST_ICON_SIZE_W,
BG_LIST_ICON_SIZE_H, 1);
e_widget_ilist_append(cfdata->gui.bg_list, ic, _("Theme Background"), _ibg_list_cb_bg_selected,
cfdata, DEF_THEME_BACKGROUND);
e_widget_ilist_append(cfdata->gui.bg_list, ic, _("Theme Background"),
_ibg_list_cb_bg_selected, cfdata, DEF_THEME_BACKGROUND);
}
if ((e_config->desklock_background) &&
(!strcmp(e_config->desklock_background, DEF_THEME_BACKGROUND)))
{
e_widget_ilist_selected_set(cfdata->gui.bg_list, 1);
e_widget_ilist_selected_set(cfdata->gui.bg_list, 2);
evas_object_del(im);
im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W, BG_PREVIEW_H);
e_widget_preview_edje_set(im, c, "desktop/background");
}
@ -652,7 +656,7 @@ _ibg_list_cb_bg_selected(void *data)
const char *theme;
theme = e_theme_edje_file_get("base/theme/desklock", "desklock/background");
e_widget_preview_edje_set(cfdata->preview_image, theme, "desktop/background");
e_widget_preview_edje_set(cfdata->preview_image, theme, "desklock/background");
}
else if (!strcmp(cfdata->cur_bg, DEF_THEME_BACKGROUND))
{
@ -669,7 +673,7 @@ _ibg_list_cb_bg_selected(void *data)
const char *theme;
theme = e_theme_edje_file_get("base/theme/desklock", "desklock/background");
e_widget_preview_edje_set(cfdata->preview_image, theme, "desktop/background");
e_widget_preview_edje_set(cfdata->preview_image, theme, "desklock/background");
}
}