From debd837c0ba0504c51017f5b3e7021f92c4a4b49 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 4 Apr 2009 14:15:08 +0000 Subject: [PATCH] add a slide out panel/tab to put options and stuff in. SVN revision: 39855 --- data/themes/default.edc | 244 ++++++++++++++++-- data/themes/images/Makefile.am | 8 +- data/themes/images/wp-bot1.png | Bin 0 -> 272 bytes data/themes/images/wp-bot2.png | Bin 0 -> 372 bytes data/themes/images/wp-tb1.png | Bin 0 -> 1458 bytes data/themes/images/wp-tb2.png | Bin 0 -> 2146 bytes data/themes/images/wp-tb3.png | Bin 0 -> 2632 bytes .../conf_wallpaper2/e_int_config_wallpaper.c | 32 +++ 8 files changed, 259 insertions(+), 25 deletions(-) create mode 100644 data/themes/images/wp-bot1.png create mode 100644 data/themes/images/wp-bot2.png create mode 100644 data/themes/images/wp-tb1.png create mode 100644 data/themes/images/wp-tb2.png create mode 100644 data/themes/images/wp-tb3.png diff --git a/data/themes/default.edc b/data/themes/default.edc index 58d343f5d..74f036172 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -23998,9 +23998,14 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); image: "dia_grad.png" COMP; image: "dia_topshad.png" COMP; image: "dia_botshad.png" COMP; - image: "menu_sep.png" COMP; image: "dia_botshad.png" COMP; image: "topsh.png" COMP; + image: "wp-bot1.png" COMP; + image: "wp-bot2.png" COMP; + image: "wp-tb1.png" COMP; + image: "wp-tb2.png" COMP; + image: "wp-tb3.png" COMP; + image: "big_arrow_up.png" COMP; } parts { part { name: "base"; @@ -24037,45 +24042,211 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); } rel2 { relative: 1.0 0.0; - offset: -3 -5; - to_y: "e.swallow.buttons"; + offset: -3 6; + to_y: "bot1"; } } } - part { name: "separator"; - mouse_events: 0; + part { name: "bot1"; + mouse_events: 0; description { state: "default" 0.0; - min: 16 2; - rel1 { - relative: 0.0 1.0; - offset: 4 -1; - to_y: "e.swallow.list"; - } - rel2 { - relative: 1.0 1.0; - offset: -5 0; - to_y: "e.swallow.list"; - } + color_class: "dialog_base"; + rel1 { + to_y: "e.swallow.buttons"; + relative: 0.0 0.0; + offset: 0 -15; + } + rel2 { + relative: 1.0 1.0; + offset: -1 -1; + } image { - normal: "menu_sep.png"; - border: 2 2 0 0; + normal: "wp-bot1.png"; + border: 0 0 21 0; + } + fill { + smooth: 0; + size { + relative: 0.0 1.0; + offset: 32 0; + } } - fill.smooth: 0; } } part { name: "e.swallow.buttons"; type: SWALLOW; description { state: "default" 0.0; - align: 0.5 1.0; + align: 1.0 1.0; + fixed: 0 1; + rel1 { + to_y: "bot2"; + relative: 1.0 0.0; + offset: -5 1; + } + rel2 { + to_y: "bot2"; + relative: 1.0 0.0; + offset: -5 1; + } + } + } + part { name: "tb1"; + description { state: "default" 0.0; + color_class: "dialog_base"; + rel1 { + to_x: "tb2"; + to_y: "aup"; + relative: 0.0 0.0; + offset: 0 -6; + } + rel2 { + to_x: "aup"; + to_y: "tb2"; + relative: 1.0 0.0; + offset: 15 -1; + } + image { + normal: "wp-tb1.png"; + border: 2 11 3 0; + } + fill.smooth: 0; + } + } + part { name: "tb2"; + description { state: "default" 0.0; + color_class: "dialog_base"; + rel1 { + to_x: "e.swallow.extras"; + to_y: "e.swallow.extras"; + relative: 0.0 0.0; + offset: -4 -7; + } + rel2 { + to_x: "tb1"; + to_y: "e.swallow.extras"; + relative: 1.0 1.0; + offset: -10 3; + } + image { + normal: "wp-tb2.png"; + border: 2 2 4 0; + } + fill.smooth: 0; + } + } + part { name: "tb3"; + description { state: "default" 0.0; + color_class: "dialog_base"; + rel1 { + to_x: "tb2"; + to_y: "tb2"; + relative: 1.0 0.0; + offset: 0 0; + } + rel2 { + to_x: "e.swallow.extras"; + to_y: "tb2"; + relative: 1.0 1.0; + offset: 18 -1; + } + image { + normal: "wp-tb3.png"; + border: 10 12 4 0; + } + fill.smooth: 0; + } + } + part { + name: "e.swallow.extras"; + type: SWALLOW; + description { state: "default" 0.0; + align: 0.0 0.0; fixed: 0 1; rel1 { relative: 0.0 1.0; - offset: 4 -5; + offset: 4 0; } rel2 { - relative: 1.0 1.0; - offset: -5 -5; + relative: 0.0 1.0; + offset: 4 0; + } + } + description { state: "out" 0.0; + inherit: "default" 0.0; + align: 0.0 1.0; + rel1 { + relative: 0.0 1.0; + offset: 4 -10; + } + rel2 { + relative: 0.0 1.0; + offset: 4 -10; + } + } + } + part { name: "aup"; + mouse_events: 0; + description { state: "default" 0.0; + align: 0.0 1.0; + min: 22 22; + max: 22 22; + rel1 { + to_x: "tb2"; + to_y: "tb2"; + relative: 0.0 0.0; + offset: 5 -5; + } + rel2 { + to_x: "tb2"; + to_y: "tb2"; + relative: 0.0 0.0; + offset: 5 -3; + } + image.normal: "big_arrow_up.png"; + } + } + part { name: "ain"; + type: RECT; + description { state: "default" 0.0; + rel1.to: "aup"; + rel2.to: "aup"; + color: 0 0 0 0; + } + } + part { name: "aout"; + type: RECT; + description { state: "default" 0.0; + rel1.to: "aup"; + rel2.to: "aup"; + color: 0 0 0 0; + } + description { state: "out" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "bot2"; + mouse_events: 0; + description { state: "default" 0.0; + color_class: "dialog_base"; + rel1 { + relative: 0.0 1.0; + offset: 0 -16; + } + rel2 { + relative: 1.0 1.0; + offset: -1 -1; + } + image { + normal: "wp-bot2.png"; + } + fill { + smooth: 0; + size { + relative: 0.0 1.0; + offset: 32 0; + } } } } @@ -24108,10 +24279,35 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); } programs { program { name: "send_click"; - signal: "mouse,clicked,1"; + signal: "mouse,up,1"; source: "events"; action: SIGNAL_EMIT "e,action,click" "e"; } + program { name: "out"; + signal: "mouse,down,1"; + source: "aout"; + action: STATE_SET "out" 0.0; + target: "aout"; + after: "out2"; + + } + program { name: "out2"; + action: STATE_SET "out" 0.0; + target: "e.swallow.extras"; + transition: DECELERATE 0.5; + } + program { name: "in"; + signal: "mouse,down,1"; + source: "ain"; + action: STATE_SET "default" 0.0; + target: "aout"; + after: "in2"; + } + program { name: "in2"; + action: STATE_SET "default" 0.0; + target: "e.swallow.extras"; + transition: DECELERATE 1.0; + } } } group { name: "e/conf/wallpaper/main/mini"; diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index fc8f2df3e..7ee544103 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -549,4 +549,10 @@ wifi_0.png \ wifi_1.png \ wifi_2.png \ wifi_3.png \ -wifi_4.png +wifi_4.png \ +wp-tb1.png \ +wp-bot1.png \ +wp-tb2.png \ +wp-bot2.png \ +wp-tb3.png + diff --git a/data/themes/images/wp-bot1.png b/data/themes/images/wp-bot1.png new file mode 100644 index 0000000000000000000000000000000000000000..a04e5553f4e92e2a49d7c8061c0e75f5ae2c0e1a GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^3P7yR!3HGr>b-n`6k~CayA#8@b22Z19JVBHcNYdp z5PYm(w;3qHS>O>_%)r1c48n{Iv*t(u1=&kHeO=javM{rlGj!g2)(8}u;OXKR5^?zL zRa>qD3OuY2rYp%>mAv??e|hs4DX(2y6c+uR8Q1n)spFKp&|*dd0rxHjkDLQ%*mQCZ zoMOxIX_z``u59C6-V@>aAF}?*9F+fkdoSAo;f6zf4GfA5_iDW2M7d^tUEU-sy0rJ) zz4Z>792Yz872R1aSaPmz=W%D#Ma`Tu9ORfd6dD-7M9Bfp8Ami_jbbgn0Nuvm>FVdQ I&MBb@068&Q7XSbN literal 0 HcmV?d00001 diff --git a/data/themes/images/wp-bot2.png b/data/themes/images/wp-bot2.png new file mode 100644 index 0000000000000000000000000000000000000000..cb86fb25cb40b4deb7cda5359cf83f5bc897530b GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-y!3HE-8_tRYDaPU;cPEB*=VV?2Ic!PZ?k)_H zAoy6nZZlAXv%n*=n1O*?7=#%aX3dcR3bL1Y`ns~;WMO78H*-rV1_^!fba4!^IDK}q zVct;#9%p&(#m?<~d;f>}mQ9#rAuk^rt8XYXvnEN2@zDdR|BMN9*nZgXekhfC@Z03T zc~6G3mdq1!WtcSHKY#pnM;7y?`QO6|MYf3cyzCV46kf@#xpjfq-tS-EE#qwPKEUO5 zc#5*XBCR#XSE|bF*_-v&FWJVXXOSyAy=wWj zlhYpZs-4QO_;qu^{XZ*bUw`a=H%Gp->SE=AeLV}`P7Xf7-hN%*VAXW~f2oPCK>ss% My85}Sb4q9e0D|L-@c;k- literal 0 HcmV?d00001 diff --git a/data/themes/images/wp-tb1.png b/data/themes/images/wp-tb1.png new file mode 100644 index 0000000000000000000000000000000000000000..4290c10994b97a319bdde66de0f912e43745338e GIT binary patch literal 1458 zcmV;j1x@;iP)Px#24YJ`L;x8882}mMFMhKC000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXJz z2NDe(+Vp||00lBhL_t(o!_`?`liW581ALpLog~x$|4Tbb8lw-UM39ob&$-O*W!JXE zF99Hr01o`QKYH^S06Brt-SZUNZK6-4^%g`ko#NDbk_2zGl=o zQx#5rj@K(*M|boXdy4?67FAt~Gs7=j_s;v2(cyH}TvS~T@w~w6QF>G_2S|^MN-)!7 z4GX>k_#40%%W84-H6zRLMgXX5bGf6uoS0b}F3seD6eueL#`jjj!vT&!i4hh;G)Do5 z*8(JbCyzM*d;{l)T1Na5tzi|4TPG)7Yp|7U%RAyoNV1c=#s##pp1N?@g1^L+SZNQk- z_$~hPD@wM5kB$b)8?bM1uf`X8U}Y`GnUqu2RR*%fM@A+v4TqSdO@QRYYN=pG;+i}=3aeBQM#^$5 zRx7X}(Dl?Ty{&Uq@eIylZro20)udMl2dWcvI$Ntj6Mf07S&b4hlx7lrv1{zhQTh}% z&S{@X(Q3!|G?a;-iy^ouPIG21#8$UK=F?;)8mk{pfh4#AJ<7|}l+(F~+wSbK1DVvQ z?OC-9by_HhsK%eEA5|4g`K+oS%6crYp<5){muo>!-gX7r2WpFiDGb=G)gs%M7Utn& z0WF=_$hdv0RYZ8>C+WTu(?*W5RHE$PJVQ&1CBA9jP>~pS_ z>f$@=qL&#>I__YRMP;hzefnjYe028k5Yf?0GPxCS9`xcgpw@Wg1MfD6l69dJ+MMi^fX!$*6Bb{*EHjUZei;1V1|b7Z$M z%0Ih~33w#VE0cPMt}ir=JtHMHFf#Q~&THN`8I~wcO*Ru3E9jCTga_L?vvXB;)2to$ zBTv58zONZq6p(=1|n^D&eu9xlgE`(}i zcUw&^6)J?P)7OT6_KWVPb==M?>jf2)_9@NIom60v9#95WREsHTuPbZv?t#A4nfFs)|a_p8Q_sc+m%eb*iD1 zNlO4Yr!k~mcEo>HJz6qJ8|q#>r`{{g&9jU2hF!t4Ve{-seNLtV)bydUj9+Cvt#$OW zIvwKSoe*f#Iu#yN;Xamru@9NLC~rk)6S~rwM`kO4X(Qsr-a4wt$9I4DIo81wA9#&# zxR;y#Otp#)op{r(aRCA?11{n`^<>C2_^54B?;o2WZX|N&Sm8A7s!2O4T|`^YJnZ-JKdm-XzvYePc>n+a M07*qoM6N<$g4Tba)c^nh literal 0 HcmV?d00001 diff --git a/data/themes/images/wp-tb2.png b/data/themes/images/wp-tb2.png new file mode 100644 index 0000000000000000000000000000000000000000..d739fee26c51ae141b4ae7a2db5c0b36a7573808 GIT binary patch literal 2146 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, "e.swallow.list", info->sframe); evas_object_show(info->sframe); evas_object_show(info->span); + + o = e_widget_table_add(info->win->evas, 0); + + rg = e_widget_radio_group_new(&(info->mode)); + o2 = e_widget_radio_add(info->win->evas, _("All Desktops"), 0, rg); + e_widget_table_object_align_append(o, o2, + 0, 1, 1, 1, + 1, 1, 0, 0, + 0.0, 0.5); + evas_object_show(o2); + o2 = e_widget_radio_add(info->win->evas, _("This Desktop"), 1, rg); + e_widget_table_object_align_append(o, o2, + 0, 2, 1, 1, + 1, 1, 0, 0, + 0.0, 0.5); + evas_object_show(o2); + o2 = e_widget_radio_add(info->win->evas, _("This Screen"), 2, rg); + e_widget_table_object_align_append(o, o2, + 0, 3, 1, 1, + 1, 1, 0, 0, + 0.0, 0.5); + evas_object_show(o2); + + e_widget_min_size_get(o, &mw, &mh); + edje_extern_object_min_size_set(o, mw, mh); + edje_object_part_swallow(info->bg, "e.swallow.extras", o); + evas_object_show(o); + // min size calc edje_object_size_min_calc(info->bg, &mw, &mh);