From 9bb5aca06282621a0ff8ed805aae42dadcedf102 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 19 Mar 2006 09:09:03 +0000 Subject: [PATCH] some not-so-arsetastic shelf gfx SVN revision: 21402 --- data/themes/default_shelf.edc | 171 +++++++++++++++++++++++++---------- data/themes/images/Makefile.am | 12 ++- data/themes/images/e17_shelf1.png | Bin 0 -> 302 bytes data/themes/images/e17_shelf2.png | Bin 0 -> 1039 bytes data/themes/images/e17_shelf3.png | Bin 0 -> 355 bytes data/themes/images/e17_shelf4.png | Bin 0 -> 284 bytes data/themes/images/e17_shelf5.png | Bin 0 -> 1191 bytes data/themes/images/e17_shelf6.png | Bin 0 -> 389 bytes data/themes/images/e17_shelf_bg1.png | Bin 0 -> 261 bytes data/themes/images/e17_shelf_bg2.png | Bin 0 -> 194 bytes data/themes/images/e17_shelf_sh1.png | Bin 0 -> 324 bytes data/themes/images/e17_shelf_sh2.png | Bin 0 -> 269 bytes src/bin/e_config.c | 2 +- 13 files changed, 135 insertions(+), 50 deletions(-) create mode 100644 data/themes/images/e17_shelf1.png create mode 100644 data/themes/images/e17_shelf2.png create mode 100644 data/themes/images/e17_shelf3.png create mode 100644 data/themes/images/e17_shelf4.png create mode 100644 data/themes/images/e17_shelf5.png create mode 100644 data/themes/images/e17_shelf6.png create mode 100644 data/themes/images/e17_shelf_bg1.png create mode 100644 data/themes/images/e17_shelf_bg2.png create mode 100644 data/themes/images/e17_shelf_sh1.png create mode 100644 data/themes/images/e17_shelf_sh2.png diff --git a/data/themes/default_shelf.edc b/data/themes/default_shelf.edc index f1057ef..fc9ec3d 100644 --- a/data/themes/default_shelf.edc +++ b/data/themes/default_shelf.edc @@ -1,10 +1,22 @@ images { - image: "e17_menu_bg.png" COMP; - image: "e17_menu_bg_border.png" COMP; + image: "e17_shelf1.png" COMP; + image: "e17_shelf2.png" COMP; + image: "e17_shelf3.png" COMP; + image: "e17_shelf4.png" COMP; + image: "e17_shelf5.png" COMP; + image: "e17_shelf6.png" COMP; + image: "e17_shelf_bg1.png" COMP; + image: "e17_shelf_bg2.png" COMP; + image: "e17_shelf_sh1.png" COMP; + image: "e17_shelf_sh2.png" COMP; } group { name: "shelf/default/base"; + data { + // this tells e the border is shaped + item: "shaped" "1"; + } parts { part { name: "base"; @@ -14,12 +26,13 @@ group { state: "default" 0.0; rel1 { relative: 0.0 1.0; - offset: 1 0; - to_y: "base2"; + offset: 0 0; + to: "base2"; } rel2 { + to_x: "base2"; relative: 1.0 1.0; - offset: -2 -2; + offset: -1 -2; } color: 221 221 221 255; } @@ -29,21 +42,23 @@ group { mouse_events: 0; description { state: "default" 0.0; - max: 99999 48; - align: 0.5 0.0; rel1 { relative: 0.0 0.0; - offset: 1 1; + offset: 32 0; } rel2 { - relative: 1.0 1.0; - offset: -2 -2; + relative: 1.0 0.0; + offset: -33 19; } image { - normal: "e17_menu_bg.png"; + normal: "e17_shelf_bg1.png"; } fill { smooth: 0; + size { + relative: 1.0 0; + offset: 0 20; + } } } } @@ -52,18 +67,19 @@ group { mouse_events: 0; description { state: "default" 0.0; + max: 99999 20; rel1 { - relative: 0.0 0.0; - offset: 0 0; + to_x: "base2"; + relative: 0.0 1.0; + offset: 0 -1; } rel2 { + to_x: "base2"; relative: 1.0 1.0; offset: -1 -1; } image { - normal: "e17_menu_bg_border.png"; - border: 1 1 1 1; - middle: 0; + normal: "e17_shelf_bg2.png"; } fill { smooth: 0; @@ -78,97 +94,156 @@ group { state: "default" 0.0; rel1 { relative: 0.0 0.0; - offset: 2 2; + offset: 32 2; } rel2 { relative: 1.0 1.0; - offset: -3 -3; + offset: -33 -3; } } } part { - name: "drag"; - mouse_events: 1; - type: RECT; + name: "sh1"; + mouse_events: 0; description { state: "default" 0.0; rel1 { + to_x: "base2"; + relative: 0.0 0.0; + offset: 0 0; + } + rel2 { + to_x: "base2"; relative: 0.0 1.0; - offset: 5 -5; + offset: 9 -1; + } + image { + normal: "e17_shelf_sh1.png"; + } + } + } + part { + name: "sh2"; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 { + to_x: "base2"; + relative: 1.0 0.0; + offset: -10 0; } rel2 { + to_x: "base2"; relative: 1.0 1.0; - offset: -6 -3; + offset: -1 -1; + } + image { + normal: "e17_shelf_sh2.png"; } - color: 0 255 0 100; } } part { name: "resize_l"; - mouse_events: 1; - type: RECT; description { state: "default" 0.0; rel1 { relative: 0.0 0.0; - offset: 2 2; + offset: 0 0; + } + rel2 { + relative: 0.0 0.0; + offset: 31 9; + } + image { + normal: "e17_shelf1.png"; + } + } + } + part { + name: "drag1"; + description { + state: "default" 0.0; + rel1 { + relative: 0.0 0.0; + offset: 0 10; } rel2 { relative: 0.0 1.0; - offset: 4 -6; + offset: 31 -11; + } + image { + normal: "e17_shelf2.png"; + border: 4 4 4 4; + } + } + } + part { + name: "resize_b1"; + description { + state: "default" 0.0; + rel1 { + relative: 0.0 1.0; + offset: 0 -10; + } + rel2 { + relative: 0.0 1.0; + offset: 31 -1; + } + image { + normal: "e17_shelf3.png"; } - color: 0 0 255 100; } } part { name: "resize_r"; - mouse_events: 1; - type: RECT; description { state: "default" 0.0; rel1 { relative: 1.0 0.0; - offset: -5 2; + offset: -32 0; } rel2 { - relative: 1.0 1.0; - offset: -3 -6; + relative: 1.0 0.0; + offset: -1 9; + } + image { + normal: "e17_shelf4.png"; } - color: 0 0 255 100; } } part { - name: "resize_b"; - mouse_events: 1; - type: RECT; + name: "drag2"; description { state: "default" 0.0; rel1 { - relative: 0.0 1.0; - offset: 2 -5; + relative: 1.0 0.0; + offset: -32 10; } rel2 { - relative: 0.0 1.0; - offset: 4 -3; + relative: 1.0 1.0; + offset: -1 -11; + } + image { + normal: "e17_shelf5.png"; + border: 4 4 4 4; } - color: 255 0 0 100; } } part { name: "resize_b2"; - mouse_events: 1; - type: RECT; description { state: "default" 0.0; rel1 { relative: 1.0 1.0; - offset: -5 -5; + offset: -32 -10; } rel2 { relative: 1.0 1.0; - offset: -3 -3; + offset: -1 -1; + } + image { + normal: "e17_shelf6.png"; } - color: 255 0 0 100; } } } diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index 6b97826..a8a335a 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -417,4 +417,14 @@ e17_entry_cursor.png \ e17_border1b.png \ e17_border3b.png \ e17_border5b.png \ -e17_border7b.png +e17_border7b.png \ +e17_shelf1.png \ +e17_shelf2.png \ +e17_shelf3.png \ +e17_shelf4.png \ +e17_shelf5.png \ +e17_shelf6.png \ +e17_shelf_bg1.png \ +e17_shelf_bg2.png \ +e17_shelf_sh1.png \ +e17_shelf_sh2.png diff --git a/data/themes/images/e17_shelf1.png b/data/themes/images/e17_shelf1.png new file mode 100644 index 0000000000000000000000000000000000000000..5b8c3b769fb42b8cd047da1cc334a5da96f5b795 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-o!3HF+`o=5)Qfx`y?k+$Y2!1;6t_M<_1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPmvoO1ya^1ClX`qmCiEBiObAE1aYF-J0b5UwyNotBh zQl&yrVsS}oQEpVaCB6`XBxps=7d~QJPHJ&bxAr_~P_HX26Ruo`qpPqbr z?hbbIwwG;2GLr=-PZFA-u*gb%tx`V;f)z4*}Q$iB}u^3^W literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf2.png b/data/themes/images/e17_shelf2.png new file mode 100644 index 0000000000000000000000000000000000000000..a869737aa05f7aa5bbbf9ffb2d38183019a81da0 GIT binary patch literal 1039 zcmV+q1n~QbP)WFTUBAW~s-bY*gFVQwHia$$3HWpY4rVRLk4a&2L5E@N+P zJ|R^OMgRZGC2-mRm1zu`g~vfSA*V?{zNSF)%ou$9 z`xD(3@CRTbgna`di8!zi;K14lA6P5o3R+Pvgp6|s?O;zU5Jq00DUk3;EU_#by}*S1 z33w%<2-rzPVh;jA4npNDG$0e_K}h)A%Pc?(g8A_zFp5By8kSi1gKn=A^fM7(I0;3l zuDoSm4$4_fY2)S?>3h39cP1&3BiZ*skJzT%E7k%Yb=cFX^%JMlhAQeeB;FG7&4$Er zB$>(AWv7!Xv;*%866Edqxb~Du%4CW>*HYczo{u4pk#vp?UUsy8g=499vMv&L74lm`E*nC+EYnxy z^7EN2a)_a1q_IqA-|@Q@?;GqJK2spyNZg6|4T+MwBGeh7jAU%hYgzeB!Xhki(!DQu zEO?tFl$Z4972ocsI#UhLNX-PfSxCeTB)4gu!{VTaHaGV6@VM?a(jm%uz zo|(F$l!e34Oi=5H+G`fFX_)3jv(-Ce!}}}V54;~W!91fj#Qb3agLw;jM*du5Ji&!= zo6l5}DFYM@1kr=;9B3?L?sFa(q6io&B9&83MXa|96t|0vCZVVqd-*c8A71vIUD|>~D9cUJsB%EcMlT7Kk zcR4QPifArpy6$O<>KJl-)pE}k<5c4(pQtZ| zuX7E0|K)e|`ha)8(fS8M14}gJ%&$-mq?`p=Z!%o16!09ggPw+E z{crX*7|s5l0|&qjJAj7Oupg70=I;_Y$+2T4#Ef#j8w@=93$3-QP%$qrFZ4hE`iIY- zUnfIfxjw5`nm}i+D=k*ecFakjIwOcFdl7D}L9~iKxD{n#{0}co3|I0(DC+j-R literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf3.png b/data/themes/images/e17_shelf3.png new file mode 100644 index 0000000000000000000000000000000000000000..3b0474601c8eb227a27a214c2aa0ae00bad99735 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^3P8-o!3HF+`o=5)Qfx`y?k+$Y2!1;6t_M<_1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPmvoO27=!$af!$2Y964!_l=ltB<)VvY~=c3falGGH1 zq)LUL#Nv|FqTIwh1)Cx;(*Z&OMf8&MbL|vE`P_ioH+s4_hFF|FI%y+svw?u?|Aib@ zD*lsXjRdq0@XTXR7gsT##-nl~LQki!PffI4q^|sIy??y>nKPQIcP8$8|ItJ9U{rOt z!#PRTJfF}|BgVB~&##?gbvJn0QlABxvz(o>d$;8pp5L6o*k!nBtC)*QloJFVdQ&MBb@0Pk2_00000 literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf5.png b/data/themes/images/e17_shelf5.png new file mode 100644 index 0000000000000000000000000000000000000000..c40b4c6ec34af6a433702241f7cdfd6775244fd4 GIT binary patch literal 1191 zcmV;Y1X%ltP)WFTUBAW~s-bY*gFVQwHia$$3HWpY4rVRLk4a&2L5E@N+P zJ|R^OMgRZ<^+`lQR7l5Fmfeoz#tnr(ma2CRZ*reU%bWQ{@te*gZ?h7yzO&sXVAW$r4rOIK_Sx zkE8hUIC<!@anL)6pIRP9n23TMt!_;BICVu?~JpX_?a5d6Wp-ie0D^Z;tWCV7h zI#Cu?C#r?6j7o%pTMQU5HI!Q>vGP00--M?ns ziD1_I?xg*pbxD+s1!WOoZW~x))^RZMAeZq}*@)L>ufQE#3)KttYrGQbwbsBb@1XAm zcrn6~VP+o8+EE^@btS$&R)2hLp!UlOg!;MN%y^-;btPjy62q{l0-HLEi4L3(!Uw~N zsn$14M57N(3=>k%baK5pgp6W64VUt8Ezy`dxqlioh{&w0~Udy%C@wEH=~k6RHMZzYb=m z$o)=LwVnhvtNFYn0Xwdm@9=>b4ect;z?cfd_6bB7JermbV%yrdb1;v`gZX&lcsx-a z7fl_Yoy}kc|47hRY58hUb@hd-a+g$rqa`f|8qJn&UzoR_zv6MQefz?=^zSiN&3ZMS zHlZ%3TZ@rsV_DtZ44-5(a&!_Sa0GUPJ5$X0mv3x0F@Cz?td^n#5z9#f6N?X^1`hQq zwr} zCC^94i!m4xFt*khD2W)cY#g|Xb3fVlgWQud#hGwsaNouJ*Y7_lnM`qJaaNJ3|NDi~ z>%5nHEg|!9N;)oyUjG5>*g*k{U>9&~udC)}krcSfhT@{NBbS6#HFdpFx!@N=zddbIkx#zq}(Zp9C)_y4`R zY8BT*1D+Yre+nI#Idk88L96EuF4G-m{CxUu*E)_l#c>HsuP`R2J*n)|=<549_ttmW z#`V8dJo}WV1fAH#^Vs5_{lRswf9R~*tWxv9rDcdZdG^acXb%}3U9fVG3%MTS0#7%q93;y&-CQp?%DcHZ|R<;nZGKS3R34X UPB<>&kwOS(sf>WZqT=4WN*5iEBiObAE1aYF-J0b5UwyNotBh zQl&yrVsS}oQEpVaCB6`XBxps=7d~QJP!JaOTAr`0aPCCoQpuo|b{^ei( zn>Q&g^#Za=<$(cgze7Bv^rnQ0=JR^|%e!DCF!9#x-s73i_X+nlKA-dS{qs0wg9u5B n_J7}w*Kc6vV&I(4l@P#C%k6P_rh#Mu(0B$<>&kwOS(sf>_uz&O1)z{|iEBiObAE1aYF-J0b5UwyNotBh zQl&yrVsS}oQEpVaCB6`XBxps=7d~QJP0-i38Asp9}=NKd&s%HbbarsoH UjlOa9FMx6kp00i_>zopr0Q!Y7yZ`_I literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_sh1.png b/data/themes/images/e17_shelf_sh1.png new file mode 100644 index 0000000000000000000000000000000000000000..074142e6087ca75c2fd8c057600bb35d591d55c5 GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^AhtRO8;~?(xETth*pj^6U4S$Y{B+)352QE?JR*x3 z7`TN&n2}-D90{Nxdx@v7EBiHOVRj{jDLTvJfI`M4t`Q~9`MJ5Nc_j?aMX8A;sVNFc zl?p+L#U-glxruoSHbr2j1B3#K=q2ap+9`(exdF9L@^oDk&5c+^Eg1sbRZKGm^?y)rs*L;5?;XCnL-tpXN7e(CG z&r32n+Osn4$^6XnFX2mSRqSPVi1df>y*a?%QD0ucCdYcF@8b@GG<99WV{iIa?wDt$ zeB8K1wx4a^>UHPScFcVoBrE%){N}}(3wOWy{)#(bg>9Tfujh53>li#;{an^LB{Ts5 DbeeNx literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_shelf_sh2.png b/data/themes/images/e17_shelf_sh2.png new file mode 100644 index 0000000000000000000000000000000000000000..fcd565697073c028fdc1858c7b4c9829349432fe GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^Ahrev8<0F6mfZlP*pj^6U4S$Y{B+)352QE?JR*x3 z7`TN&n2}-D90{Nxdx@v7EBiHOVRmK4gK=$+Kq2E2*N775{M_8syb=cIqSVBa)D(rJ zN`;`r;*!*&+{8Qun<6mN0YU*q^pf*)?G!`#+<@AnJzX3_EKc8@?8tS%f#b-c-~aX3 z+kU;H!!zaD<`ff+mer?B7_Uyck()7XMsMB3it208-{rqt(KKA0-mvka%U7NaxnCal x6z@9I_xhyJ)Oj1LeoUH|8lQNw`iM|%>|cAS@OxQa;XrE`JYD@<);T3K0RYgBT^|4d literal 0 HcmV?d00001 diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 090e5f9..8bfd958 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -1041,7 +1041,7 @@ e_config_init(void) cf_escf->x = 0; cf_escf->y = 0; cf_escf->w = 800; - cf_escf->h = 32; + cf_escf->h = 40; cf_escf->orient = E_GADCON_ORIENT_TOP; cf_escf->style = evas_stringshare_add("default"); cf_es->configs = evas_list_append(cf_es->configs, cf_escf); -- 2.7.4