From 59b4732444235d9932daff368ca90a958a1a80ec Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Mon, 28 Jun 2021 17:32:39 +0100 Subject: [PATCH] elm theme - more cc --- data/elementary/themes/colorclasses.edc | 9 ++ data/elementary/themes/edc/menu.edc | 5 -- data/elementary/themes/edc/mixer.edc | 49 ++++++----- .../themes/img/speaker-clip-040.png | Bin 0 -> 858 bytes .../themes/img/speaker-clip-080.png | Bin 0 -> 1751 bytes .../themes/img/speaker-clip-160.png | Bin 0 -> 3853 bytes data/elementary/themes/img/svg/speaker2.svg | 82 ++++++++++++++++++ 7 files changed, 118 insertions(+), 27 deletions(-) create mode 100644 data/elementary/themes/img/speaker-clip-040.png create mode 100644 data/elementary/themes/img/speaker-clip-080.png create mode 100644 data/elementary/themes/img/speaker-clip-160.png create mode 100644 data/elementary/themes/img/svg/speaker2.svg diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 63f51f98af..701049c236 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -478,6 +478,15 @@ color_classes { color: 255 51 153 255; } color_class { name: "/fg/normal/gadgets/cpufreq/hands/average"; color: 255 153 51 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/gadgets/mixer/base"; + color: 32 32 32 255; } + color_class { name: "/bg/normal/gadgets/mixer/middle"; + color: 48 48 48 255; } + color_class { name: "/fg/normal/gadgets/mixer/volume/normal"; + color: 51 153 255 255; } + color_class { name: "/fg/normal/gadgets/mixer/volume/mute"; + color: 255 153 51 255; } diff --git a/data/elementary/themes/edc/menu.edc b/data/elementary/themes/edc/menu.edc index 62fb43b1bb..343eead955 100644 --- a/data/elementary/themes/edc/menu.edc +++ b/data/elementary/themes/edc/menu.edc @@ -158,11 +158,6 @@ group { name: "e/widgets/menu/default/icon"; group { name: "e/widgets/menu/default/label"; parts { -// part { name: "base"; type: RECT; -// description { state: "default"; -// color: 0 0 0 0; // no cc -// } -// } part { name: "e.text.label"; type: TEXT; mouse_events: 0; scale: 1; description { state: "default" 0.0; diff --git a/data/elementary/themes/edc/mixer.edc b/data/elementary/themes/edc/mixer.edc index 1a2251bf6f..cc701afa44 100644 --- a/data/elementary/themes/edc/mixer.edc +++ b/data/elementary/themes/edc/mixer.edc @@ -1,7 +1,9 @@ group { name: "e/modules/mixer/main"; - images.image: "speaker.png" COMP; - images.image: "speaker_clip.png" COMP; - images.image: "speaker_vol.png" COMP; + set { name: "speaker_clip"; + image { image: "speaker-clip-160.png" COMP; size: 81 81 99999 99999; } + image { image: "speaker-clip-080.png" COMP; size: 41 41 80 80 99999; } + image { image: "speaker-clip-040.png" COMP; size: 0 0 40 40; } + } max: 160 160; min: 16 16; script { @@ -42,19 +44,27 @@ group { name: "e/modules/mixer/main"; parts { part { name: "base"; description { state: "default" 0.0; - rel1.relative: (25/380) (25/380); - rel2.relative: (365/380) (365/380); + image.normal: "clock_base"; aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "speaker.png"; + color_class: "/bg/normal/gadgets/mixer/base"; + } + } + part { name: "middle"; + description { state: "default" 0.0; + rel.to: "base"; + rel1.relative: 0.3 0.3; + rel2.relative: 0.7 0.7; + image.normal: "clock_base"; + color_class: "/bg/normal/gadgets/mixer/middle"; } } part { name: "state"; type: RECT; description { state: "default" 0.0; - color: 51 153 255 255; + color_class: "/fg/normal/gadgets/mixer/volume/normal"; } description { state: "mute" 0.0; inherit: "default" 0.0; - color: 255 153 51 255; + color_class: "/fg/normal/gadgets/mixer/volume/mute"; } } part { name: "state-l"; type: RECT; @@ -74,39 +84,34 @@ group { name: "e/modules/mixer/main"; part { name: "vclip-l"; clip_to: "state-l"; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "speaker_clip.png"; + rel.to: "base"; + image.normal: "speaker_clip"; } } part { name: "vclip-r"; clip_to: "state-r"; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "speaker_clip.png"; + rel.to: "base"; + image.normal: "speaker_clip"; } } part { name: "vol-l"; clip_to: "vclip-l"; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "speaker_vol.png"; + rel.to: "base"; + image.normal: "clock_base"; } } part { name: "vol-r"; clip_to: "vclip-r"; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - rel2.offset: 0 0; - image.normal: "speaker_vol.png"; + rel.to: "base"; + image.normal: "clock_base"; } } part { name: "over"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 0; + color: 0 0 0 0; // no cc } } } diff --git a/data/elementary/themes/img/speaker-clip-040.png b/data/elementary/themes/img/speaker-clip-040.png new file mode 100644 index 0000000000000000000000000000000000000000..fad440c469c0f7cdfb2c3ed274615a82858cd951 GIT binary patch literal 858 zcmV-g1Eu_lP)Ydz8H{3OBevYf;_kS0cJ}sm_m+xpwR7`(eCBbxGe2ov$z0(&L(OUg*< zl+-S1izFm1OInmPCuvgBBV$Z9F>M7<8-WYJbD}8+OakYCnzY~sfQ5))E`0)yRuilN zxKRZ#TSLI+u>58BAkZx7p``t;Zb{RUMkGy0`X%W{p|4F+v!p&rgOUygqv8 z4AceJ0(^0dJO|tc_C<)*0Sp&>ZG8l`MTKhs-Z+9S0EZ%vwiLG;$U5Ra12#nobkh-J zH1bH@v73M~NBpam1~?G_SDO^hlcUZ7nFEf5Io1MS9m|?{<{Y`29LxQla_>ptl4De{ z_gn>#J^24PXUaLevW#z~1?S0m$IAI6$gs;XdlkP*5&(8uc~^k8V!wC2`z_zs#+doE z0gW+pl4d+V)kr$#Z4{NUeD9~oWoyK0_ZA<#fL)f+L~1yG*|}C(ynt<%(NbzSe*LuC z?fJjOn4$50?gjU*Xkko4E;Ye|zRB-fwfgO~ifWwa|b z9KY;bt1Mo?S<9$bYo|V|y~^SRoU)7tQ^WD=l+~W}SvWp9IiMqLGRG%&1!xU2erXvG zuL0maE9YoA`oCbga5d7x|~BT{)i5wfJ{7-g_*PA04_%fQV&c!f@Fc71aKM0vI0y+ULl|vn0Exrkw2z)Mu^n~ z+;zkP_yBAT@(n9}?2z<8!KI5Cl}aB=DwRH3CGAwH^l>1-|EZ*tu}U8v$a>&f!06*D z2V5aaHK78~e&BNz;NB5-K~Dg=0XR>7Q%9Y#ao{Ww3z$htzJjF^h3?tt*NC0ZCwbtkYqU`2YX_07*qoM6N<$f>ern=>Px# literal 0 HcmV?d00001 diff --git a/data/elementary/themes/img/speaker-clip-080.png b/data/elementary/themes/img/speaker-clip-080.png new file mode 100644 index 0000000000000000000000000000000000000000..bde39656361dbb2ee59c9ee01f09772020ab9dad GIT binary patch literal 1751 zcmV;|1}OQ7P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H124qP@ zK~#90?VQ_-RaG3vzbma#M{Uf@OJ*a*s6>V4Ll?EMB1;SGW>H!MWg;f@BAJ#?A@mmn zK~OIdrB)I>Xjd)DQo};Whb-^dXkKOeQ)o`C{^P4h)twUDC~xS|m-9G*MEcq$WwjB_XL@(n(2YB>gFAZ{csJ zq~DA&y_t(Ika+-s>m@xdX||-9l13yn`LCpJC2f}Uu`%XoLVMK*&90FI&F<==mDDSv<0o()pk#Ee( zvJ<#7@A&i!FbsG%=ODT01>Od(3{~zRUtwU9q>m)s62e{vY?HLW7_%>_p~L|M=1KZc zw(S;&9!bAS+9GL>q*h4>W!ru21&tTlh2v%0ijyVHkaU}*!7=@wko1T#W^2s*lLIUQ zx?@zOE?^xnABf!!1V#dn0_zJlqjDB_IAlzsh+htzk0|&U@H#L$1wEsIRlq+HHFX2e zhSuW}`&`7}odH$=ajSV0ZH>TdKzqa>X7eNh^N3b$*8|sOBCfB_3BZO3I?n=kr7h|v zpuMUdDhS*rA^{+3TyO25EJipICgLTmW4khy&hoYLESn^H&!ih!em8_W`+tGmi5m zNdSEUh@DIs;xN)4QB*CFEP!>Q(x;z9QV}x2uuZBc{(LeXt^iQ^^O~Gy^u@D zB!HQxX=KO*$N5vm2g(KTFNYCVL%Wul>^NVNkXbH(uGV--hk5|v3SdbmqFex7J&klT znDS+&2TI4kKwG6C$!uX_>-j03cdzQx-XRQD&l@gl~Os5s7znEB!I@4 zE=fN)oMoF5n+>iqePxWH_+WoMkaa`t#NgsnZ;GWi8l}L3JfjfaJ z`Ya?iQ?nBFiFH*TOnBend$gowu~b(VuSy!@xaNb%Ry}{2%O$xe-r73+k}Ed^E>~s% z8$HVRauNr=36}AlzS`jThK$mf1ZNCE+xo( z?Hsns`n2;d&;i_$mAHjOTX5Zh&4y3C?~L8-XEp95(M#zD=BBN!Sm-Meg9vs2Vm09E zd&bc-7Ta?=9#K;_@JwhuzM>ZrtvX+z3-}b9R@;=o|0v)|>}w*9jt=auBe4mw?a70( zd&b1Ap1qQ`tM9fa2Xt}U6BTSX$23kq4SWtPAkG@!804`D?RZI# z$*#wnr80@z5jigD8%diatuw|POK2|=d2fR}NYXUf6+joZL2i~!bZjd8KQG%JJSE#U t+^37%An%a0%NTP$YwdOF)TvWP`XBHs|B)QjX1)Lb002ovPDHLkV1m5tBGCW< literal 0 HcmV?d00001 diff --git a/data/elementary/themes/img/speaker-clip-160.png b/data/elementary/themes/img/speaker-clip-160.png new file mode 100644 index 0000000000000000000000000000000000000000..28e1dc011e1310bad9b915409c6a42d56a25b805 GIT binary patch literal 3853 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 L%yeIBd))g!0VQ~0 literal 0 HcmV?d00001 diff --git a/data/elementary/themes/img/svg/speaker2.svg b/data/elementary/themes/img/svg/speaker2.svg new file mode 100644 index 0000000000..d4800f773d --- /dev/null +++ b/data/elementary/themes/img/svg/speaker2.svg @@ -0,0 +1,82 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + +