From c8b26b696be6cff3058591536d0efe164ba2544d Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 27 Jun 2009 13:27:37 +0000 Subject: [PATCH] more todo's done, added another tho :( SVN revision: 41217 --- data/themes/default.edc | 28 +++++++++++++++++++ .../conf_wallpaper2/e_int_config_wallpaper.c | 15 ++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 23218acb1..d2d4f004e 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -25426,6 +25426,34 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); } } } + part { name: "e.text.filename"; + type: TEXT; + effect: SOFT_SHADOW; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + align: 0.5 1.0; + rel1 { + to: "bot2"; + relative: 0.0 1.0; + offset: 2 -11; + } + rel2 { + to: "bot2"; + relative: 1.0 1.0; + offset: -3 -11; + } + color: 255 255 255 255; + color3: 0 0 0 32; + text { + font: "Sans:style=Bold"; + size: 10; + min: 1 1; + align: 0.5 1.0; + } + } + } part { name: "shadow1"; mouse_events: 0; scale: 1; diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c index 9b59bcfcd..0d338ddd7 100644 --- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c +++ b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c @@ -8,7 +8,7 @@ // need choice after add (file, gradient, online source) // need delete select mode // need after select on delete an ok/cancel if file or "ok to remove whole online source" if online -// need filename display +// need to go to the current selected wallpaper (if it exists) or theme if theme selected (and set filename) // need to make thumb white rect better (shaded etc.) // need to make "exchange" wallpapers have a different look // need signal to emit for popping down slide-up panel @@ -41,7 +41,6 @@ struct _Info struct _Smart_Data { -// Evas_Object *child_obj; Eina_List *items; Ecore_Idle_Enterer *idle_enter; Ecore_Animator *animator; @@ -645,10 +644,21 @@ _pan_sel(Evas_Object *obj, Item *it) evas_object_hide(sd->info->mini); if (it->file) { + char *name = NULL, *p; sd->info->use_theme_bg = 0; sd->info->bg_file = strdup(it->file); edje_object_file_set(sd->info->mini, sd->info->bg_file, "e/desktop/background"); + p = strrchr(sd->info->bg_file, '/'); + if (p) + { + p++; + name = strdup(p); + p = strrchr(name, '.'); + if (p) *p = 0; + } + edje_object_part_text_set(sd->info->bg, "e.text.filename", name); + if (name) free(name); } else { @@ -658,6 +668,7 @@ _pan_sel(Evas_Object *obj, Item *it) "e/desktop/background"); sd->info->use_theme_bg = 1; sd->info->bg_file = NULL; + edje_object_part_text_set(sd->info->bg, "e.text.filename", _("Theme Wallpaper")); } evas_object_show(sd->info->mini); }