From 57d79200630e1320ea6044f01089910c161e81ed Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 26 Jun 2009 15:11:03 +0000 Subject: [PATCH] fix todo's for wp2 - do one. SVN revision: 41207 --- data/themes/default.edc | 19 +++++++++++++++++- data/themes/images/Makefile.am | 3 ++- data/themes/images/theme-label.png | Bin 0 -> 1225 bytes .../conf_wallpaper2/e_int_config_wallpaper.c | 15 ++++++++------ 4 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 data/themes/images/theme-label.png diff --git a/data/themes/default.edc b/data/themes/default.edc index 4576dc399..9ca7688ac 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -25673,6 +25673,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); group { name: "e/conf/wallpaper/main/mini-theme"; images { image: "e17_mini_button_shadow2.png" COMP; + image: "theme-label.png" COMP; } parts { part { name: "icon_box_shadow"; @@ -25740,7 +25741,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); relative: 1.0 1.0; offset: -5 -5; } - color: 100 100 100 255; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -25786,6 +25786,23 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); } } } + part { name: "theme"; + mouse_events: 0; + description { state: "default" 0.0; + aspect: 1.709677419 1.709677419; + rel1 { + to: "e.swallow.content"; + relative: 0.6 0.6; + offset: -1 -1; + } + rel2 { + to: "e.swallow.content"; + relative: 1.0 1.0; + offset: -1 -1; + } + image.normal: "theme-label.png"; + } + } part { name: "events"; type: RECT; description { state: "default" 0.0; diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index d4f49afa2..fb3621f57 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -558,5 +558,6 @@ wp-tb2.png \ wp-bot2.png \ wp-tb3.png \ wp-tbs.png \ -systray_rounded_corners.png +systray_rounded_corners.png \ +theme-label.png diff --git a/data/themes/images/theme-label.png b/data/themes/images/theme-label.png new file mode 100644 index 0000000000000000000000000000000000000000..6dd6c1162bb4686d89d69b56499b6cc39071e5e3 GIT binary patch literal 1225 zcmV;)1UCDLP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXQ1 z4ly0(#N&Mc000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000CeNkljjI<8Hh>%J$v7bGZ-YV<7Zd{!DeY@xW&bjAv ze}B&JNXJaTx5o+QDC6CD*8H}Et2 z)KLHm0$cnG9cGvsAZ7;e@Zm$=y?b}Kp@7rCQ!|)IB*NLVXK^~6%+JrWy}f<-pn#LW zJu{eOGRd`T*N{X{PmeLa(_4oH=q9jf1~fQ0$i~J7l90s8$_fDO?d@E-a^-M90T+R& z8O-YHDkUW)NaFeP=iIq-2T2qc7vu4GICt(Gkx0bw*#8An2n?CQdOcz@2Wudn0rct}rAM-sigy$lTv zA&I=aJW{C?&CSh7VrpuNg9K^<*3E$4zJ1Gy6DN!f_xJZRFfhQ?t5<1jYeN!tyPae* ziO=UV@~ft%hIl-FFrETRff+NH@$qroZa1-5jHae0W3v?%6`VSC3a8V_;^HE;wY5m% z`t|EXqfxwGFEcYU2XjsV9w1}}v$C>6RaF&PSy|k_e;C8IDjG&C4FRb5?8JRUa-wRND$%24|b_|pvN_3PILz~<)1PN=lB6iJkq zmy<{&44Xh8fX!y3v9Xb@tvzoXoq)qCm}=m6)8Gz;$j;6tnM_h%UXCPg-@eV0Cr`-9 z$-(FIk)555B*Nh^ot>RXqO!7*g@uK^mL38Mt%4~A!e%hhXcWKSPew)t;qZI&+1Xjc z6K=Pg;o)JUU`Qe(BLjeE&z|kMG;q->7#Hx9SrJGklU%xVY1ig=s->j`N%;N#UE@BV zkB*Lxy_VkuZd#c)EkI&Fwe-!KH`LYD0Z>*}h9rW)pz%JDNZ@k0ki?@$kBo7Xs&)@J zX%)=Zz;FCVO;1l79*f03-pISVyOBhFeZAQdPl3}`!F&M>Vu1pIfYE5~)adBwUejVg zja4vq;72Uf+S(d+yB$f4kB^&~ZvjE8(k2}UNE(&ox3Xn&xm-$1OH*cMrf%H0A*a(R no6Ytq(_bWgW3$=9R(<;~T4g2>lo64y00000NkvXXu0mjfBq%AM literal 0 HcmV?d00001 diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c index f25a7a3fe..d0bb1671e 100644 --- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c +++ b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c @@ -5,20 +5,23 @@ #include "e_mod_main.h" // FIXME: -// need a "add" button (to add exchange, image file or gradient) +// need single 'add' button +// need single 'delete' button +// need single "options' button +// 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 "theme wallpaper" image // need to make thumb white rect better (shaded etc.) -// need to make "theme wallpaper" have different look // need to make "exchange" wallpapers have a different look // need indicator that sort is pending +// need to show busy info while loading files / generating thumbs // need signal to emit for popping down slide-up panel // bug: animated wp doesnt workon first show +// need options panel (this screen, this desktop, all desktops) if screens > 1 or desktops > 1 // need to disable "this screen" if multiple containers/zones dont exist // need to disable "this desktop vs all desktops" if only 1 desk exists -// need to show busy info while loading files / generating thumbs -// need to delete/create objects as neede (not just hide/show) -// need to be able to "type name to search/filter +// need to be able to "type name to search/filter" typedef struct _Info Info; typedef struct _Smart_Data Smart_Data;