From 19c402a7432f112f1e4f8dddaa8c37849420f445 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 6 Dec 2012 10:31:23 +0000 Subject: [PATCH] theme - conf gadget done. boring button with blue spanner inset+glow. SVN revision: 80335 --- data/themes/Makefile.am | 3 + data/themes/default.edc | 2 +- data/themes/edc/conf.edc | 88 ++++++++++++++++++++++++++++ data/themes/img/spanner_glow.png | Bin 0 -> 4004 bytes data/themes/img/spanner_hilight.png | Bin 0 -> 1235 bytes data/themes/img/spanner_inset.png | Bin 0 -> 1892 bytes 6 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 data/themes/img/spanner_glow.png create mode 100644 data/themes/img/spanner_hilight.png create mode 100644 data/themes/img/spanner_inset.png diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index 6d2a135b8..256cc3f1e 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -259,6 +259,9 @@ img/slider_run_bevel_horiz.png \ img/slider_run_bevel_vert.png \ img/slot_horiz_bottom.png \ img/slot_horiz_top.png \ +img/spanner_glow.png \ +img/spanner_hilight.png \ +img/spanner_inset.png \ img/speaker.png \ img/speaker_shadow.png \ img/sym_check_alum.png \ diff --git a/data/themes/default.edc b/data/themes/default.edc index 649766e10..0483a3b98 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -60,12 +60,12 @@ collections { #include "edc/evrything.edc" // port unchanged stuff so this can work as a replacement -#include "edc/O/conf_gad.edc" #include "edc/O/illume_gad.edc" #include "edc/O/border_icons.edc" #include "edc/O/efm_icons.edc" #include "edc/O/icons.edc" #include "edc/O/wallpaper.edc" +//#include "edc/O/conf_gad.edc" //#include "edc/O/evrything.edc" //#include "edc/O/battery.edc" //#include "edc/O/mixer.edc" diff --git a/data/themes/edc/conf.edc b/data/themes/edc/conf.edc index 1cb99859b..1d277aa11 100644 --- a/data/themes/edc/conf.edc +++ b/data/themes/edc/conf.edc @@ -52,3 +52,91 @@ group { name: "e/widgets/configure/main"; } } } + +group { name: "e/modules/conf/main"; + images.image: "button_normal.png" COMP; + images.image: "button_clicked.png" COMP; + images.image: "spanner_inset.png" COMP; + images.image: "spanner_hilight.png" COMP; + images.image: "spanner_glow.png" COMP; + min: 16 16; + max: 80 80; + parts { + part { name: "base"; + description { state: "default" 0.0; + image.normal: "button_normal.png"; + image.border: 4 4 3 5; + image.middle: SOLID; + rel1.offset: -1 0; + rel2.offset: 0 1; + fill.smooth: 0; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + image.normal: "button_clicked.png"; + image.border: 5 5 4 6; + } + } + part { name: "spanner_hilight"; mouse_events: 0; + description { state: "default" 0.0; + aspect: 1.0 1.0; aspect_preference: BOTH; + max: 80 80; + rel1.offset: 0 1; + rel1.to: "spanner"; + rel2.offset: -1 0; + rel2.to: "spanner"; + image.normal: "spanner_hilight.png"; + } + } + part { name: "spanner"; mouse_events: 0; + description { state: "default" 0.0; + aspect: 1.0 1.0; aspect_preference: BOTH; + max: 80 80; + rel1.offset: 4 4; + rel2.offset: -5 -5; + image.normal: "spanner_inset.png"; + } + } + part { name: "spanner_glow"; mouse_events: 0; + description { state: "default" 0.0; + aspect: 1.0 1.0; aspect_preference: BOTH; + max: 80 80; + rel1.to: "spanner"; + rel2.to: "spanner"; + image.normal: "spanner_glow.png"; + visible: 0; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + } + programs { + program { + signal: "mouse,down,1"; source: "base"; + action: STATE_SET "clicked" 0.0; + target: "base"; + } + program { + signal: "mouse,up,1"; source: "base"; + action: STATE_SET "default" 0.0; + target: "base"; + target: "spanner_glow"; + } + program { + signal: "mouse,clicked,1*"; source: "base"; + action: SIGNAL_EMIT "e,action,conf" ""; + } + program { + signal: "mouse,in"; source: "base"; + action: STATE_SET "clicked" 0.0; + target: "spanner_glow"; + } + program { + signal: "mouse,out"; source: "base"; + action: STATE_SET "default" 0.0; + target: "spanner_glow"; + } + } +} diff --git a/data/themes/img/spanner_glow.png b/data/themes/img/spanner_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..bd3d5ff353f10f3037ed76e954c2dcda42257979 GIT binary patch literal 4004 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 literal 0 HcmV?d00001 diff --git a/data/themes/img/spanner_inset.png b/data/themes/img/spanner_inset.png new file mode 100644 index 0000000000000000000000000000000000000000..040fae0ee6c662c7947f3ed2455a0f92cc2b43e9 GIT binary patch literal 1892 zcmV-q2b=hbP)J;sZDBvX{2Cm)21nhE1?PDl^5NSFU>3I4 zd52rA*7}jl!a)!iA|lW8B)csYx>?8q0Ex&`N~xRbUYpl|Ec-VL&+|OWyRcIzTYlCg zBJ$%wz-xp9!!Q)j^X6c63f(Rt3jo(J^YepR-%ux!IF26|5fD*f==Om35oUg8kZT-j zfFg2r<}~V6=jGs?WabMOVvWOo4qTbJujo9N&lw~luPhY2p$3>F$&QlXY-d3t@+dQZ zb|Kd}%ntlaK74yYWae83SW3OzD1aieuH@_Hdfch0sqYVBExzxcGRCZFngiGL3f&GM zw+;Z_SrJ+0`~HEZ0le7Fx@AC$$fg=gsE_-;F93q9{=Bbg06$nY>H$QPlam+L0Pof` zP2X?}_;$PfhsFS$oSa;iIZw)lu7S4393&a;}CnYp)V4*Yyk;>bVd z)`(fihfx&$JC5VhP7H#e1z>eH@qyEG6A}HRiG}p#RWq}{jWNFo!|=ax9B=8; z?W_%gK!_-@vqtChBzwBPoc9sevF>|k|EpWA zR!@UX3{mJ_q_y7Z`~EqO=r#xJl#R0itaYIa)ec$R1aaPH*h`;8bZ6<}a~Kqc;aSh~ zg0k-Gjc125nB=L%gCk^6@U-as6fB*`Udn!eQ!yrPiJp4-UG2Qg%#nw_^!Ykjz8 zc(VXjF!OsDLQ#$IHfXI6&KF*;%{t1=t1!g!YJzv=0O0+7*x}UzFplGEwAO#AQs)(A zS`iUr42j4S%)9{&kT*|w+qBldtKz&)(_{O4j;zM}2{Ug;Lqzj{_f@U+BUPQ(BhzkU z=4a3#QJ?U>rM3P=73Y;GQ$EGaucKk2KH%M=aQ$yMOx%9PX0yc`WzDS%NF{Y*r@S0lWmO{no|0T@NmuSMh= zHNtzFnb%;6h#}1JyzHF!Ff)G*BcP4|iRhm_CMbpQ06e6W`Z`8LMGkz;vMDi+a^d}w znZJn?)BOSlv2|eK@|d= zot=F#2!f*kwsdl;GYGw1DYXkDs#4RKsi~vbW eHP%>7)c*mTQtB=_E3h~K0000