From 017e915b7fade04a0a76b1b1ddf037cebeabddeb Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 14 Nov 2012 06:08:52 +0000 Subject: [PATCH] amke move/resize popup box themed now. also fix eye to size properly. SVN revision: 79266 --- data/themes/Makefile.am | 2 + data/themes/default.edc | 2 +- data/themes/edc/border.edc | 72 ++++++++++++++++++++++++++++++ data/themes/edc/gadman.edc | 1 - data/themes/edc/sys.edc | 2 +- data/themes/img/ic_win_move.png | Bin 0 -> 659 bytes data/themes/img/ic_win_resize.png | Bin 0 -> 732 bytes 7 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 data/themes/img/ic_win_move.png create mode 100644 data/themes/img/ic_win_resize.png diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index 8d3023eda..10de37707 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -182,6 +182,8 @@ img/horiz_bar_inset.png \ img/horiz_glow_run.png \ img/horizontal_separated_bar_glow.png \ img/horizontal_separated_bar_small_glow.png \ +img/ic_win_move.png \ +img/ic_win_resize.png \ img/inset_circle_tiny.png \ img/inset_shadow_circle_tiny.png \ img/inset_shadow.png \ diff --git a/data/themes/default.edc b/data/themes/default.edc index 661742bfd..fbc095e51 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -42,7 +42,7 @@ collections { #include "edc/O/about.edc" #include "edc/O/backlight.edc" #include "edc/O/battery.edc" -#include "edc/O/border.edc" +//#include "edc/O/border.edc" #include "edc/O/border_icons.edc" //#include "edc/O/clock.edc" #include "edc/O/colors.edc" diff --git a/data/themes/edc/border.edc b/data/themes/edc/border.edc index 42ec49d77..2d099bd57 100644 --- a/data/themes/edc/border.edc +++ b/data/themes/edc/border.edc @@ -872,3 +872,75 @@ group { name: "e/widgets/border/pixel/border"; } } } + +group { name: "e/widgets/border/default/move"; + images.image: "vgrad_tall.png" COMP; + images.image: "bevel_out.png" COMP; + images.image: "shine.png" COMP; + images.image: "ic_win_move.png" COMP; + parts { + part { name: "bg"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "vgrad_tall.png"; + fill.smooth: 0; + TILED_HORIZ(40) + } + } + part { name: "bevel"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "bevel_out.png"; + image.border: 1 1 1 1; + image.middle: 0; + fill.smooth: 0; + } + } + part { name: "icon"; + description { state: "default" 0.0; + align: 0.0 0.5; + FIXED_SIZE(21, 21) + rel1.offset: 2 2; + rel2.relative: 0.0 1.0; + rel2.offset: 2 -3; + image.normal: "ic_win_move.png"; + } + } + part { name: "e.text.label"; type: TEXT; + effect: SHADOW BOTTOM; + scale: 1; + description { state: "default" 0.0; + rel1.to_x: "icon"; + rel1.offset: 4 4; + rel1.relative: 1.0 0.0; + rel2.offset: -5 -5; + color: 255 255 255 255; + color3: 0 0 0 128; + color_class: "move_text"; + text { font: "Sans"; size: 10; + min: 1 1; + text_class: "move_text"; + } + } + } + part { name: "shine"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "shine.png"; + rel1.offset: 0 -2; + rel2.relative: 1.0 0.0; + rel2.offset: -1 2; + FIXED_SIZE(69, 5) + } + } + } +} + +group { name: "e/widgets/border/default/resize"; + inherit: "e/widgets/border/default/move"; + images.image: "ic_win_resize.png" COMP; + parts { + part { name: "icon"; + description { state: "default" 0.0; + image.normal: "ic_win_resize.png"; + } + } + } +} diff --git a/data/themes/edc/gadman.edc b/data/themes/edc/gadman.edc index 99319b9af..58b1f4779 100644 --- a/data/themes/edc/gadman.edc +++ b/data/themes/edc/gadman.edc @@ -35,4 +35,3 @@ group { name: "e/gadman/popup"; } } } - diff --git a/data/themes/edc/sys.edc b/data/themes/edc/sys.edc index fd32b54c6..f05c369c9 100644 --- a/data/themes/edc/sys.edc +++ b/data/themes/edc/sys.edc @@ -44,10 +44,10 @@ group { name: "e/sys/logout"; rel1.to_x: "knob"; rel1.offset: 8 8; rel2.offset: -9 -9; + min: 20 80; text { style: "sys_style"; min: 1 1; } - fixed: 1 1; } } part { name: "knob"; mouse_events: 0; diff --git a/data/themes/img/ic_win_move.png b/data/themes/img/ic_win_move.png new file mode 100644 index 0000000000000000000000000000000000000000..ec047b7c16d0e32997e8f7544d634c41c8dde759 GIT binary patch literal 659 zcmV;E0&M+>P)(HSxB@-V2o^af}%BeH_jodX;kz`>mZD@dCeQEz~* z0?Xf0rf0<8Gos59t=HKo3fi&JG9^ijZW6=8Cyfq!FemH4Ch3NzjUM?VQVSTir4ts_<|qyrCf%z z+xK|G5HqNOuA&9VtEUR>pp(ccJPPGbnd!dNN(q3eJN tT@y|;W&Ey9xeEAbefqzf|KI;nzX1-;c-~<(ukQc=002ovPDHLkV1m5ZJPiN< literal 0 HcmV?d00001 diff --git a/data/themes/img/ic_win_resize.png b/data/themes/img/ic_win_resize.png new file mode 100644 index 0000000000000000000000000000000000000000..915f8104d345f34a63afb723aef234e831369f86 GIT binary patch literal 732 zcmV<20wev2P)1&v6otP#GhC9Q;1y`uSO|$(gcVf;E}WXBUtsk-e3aDM7f{LCDU1|i6E<`LVPVSz z*Af4AXZEJBq{tGj!f=|La^}v#!M*3)5pJL==?R7u$RInVMnw4<9;p`qMrwvVq6M@f zgAE&e@gtk*8!ARpKOh{b>Hk6_{*#t%;mVqD0GsiQl9AK~RT=h(=AJ{@()T3;HT3po z#K!|1s&Zf9@c_3sBUVGtmkeY}f9^RP_J~jwmu8qhpk)Jz5q{%ZSF_1a4*mwJ`$C_9 z^-cEcir)c5fWWJT<0{Rl3_!HRilu!kMtIGd>O)SwtDPTmYSvULyuLXTOFLR(0Zf*n zp@9dA8$wZLCZ>3q;2#W2L|-O&6H|yXyF*-r20lws18A{j<2^ahw-pn&<)S@hm7VNX znw?O$r>xwT3tKS(`reZlTQ-0iM07f*3Qt)?OD+xr?_VS=$0GuK%~GP{5#dF`@-Xl| zT5=JdvY5`P5V<>974*hrkNESUVZZU+{}%sAPj9n-JitBq3wz+G_Y?eQJ3U6OlAdC& za@@jWKK(#ApWtt^-|y0}A2}#H99>$Tzsu~Lg1a?tP6 zKvfJNag&yFB)~K@82Bbf>ppwwDP|XCdWu>1+4D_~LW2P?b&e!%(gMV!8Dc9O5MOuY zOod)u5WmfLZ>hIAt}cjG=!tT6eG}UXmu83oC_4lVtpCjmXS8WNOLi-LmSAYpxI>5r z)@6qP;Ifo@_$!;aB`5IedRrCSEmy1k&qep~34+~nU@G<^(drf<{~EAWZHFHj%So#X8$|>QU3rQa!>1XtnP9E O0000