From 5999b5d4b5dadbd2ed65ac328e3a88c30306d1a4 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 5 Dec 2018 14:28:53 +0000 Subject: [PATCH] TH - conf --- data/elementary/themes/edc/conf.edc | 70 +++++++------------------ data/elementary/themes/img/spanner.png | Bin 0 -> 4960 bytes 2 files changed, 18 insertions(+), 52 deletions(-) create mode 100644 data/elementary/themes/img/spanner.png diff --git a/data/elementary/themes/edc/conf.edc b/data/elementary/themes/edc/conf.edc index 4bb007f5d1..e93b66b0c6 100644 --- a/data/elementary/themes/edc/conf.edc +++ b/data/elementary/themes/edc/conf.edc @@ -21,10 +21,10 @@ group { name: "e/widgets/configure/main"; } part { name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.offset: 8 8; + rel1.offset: 0 8; rel1.to_x: "base"; rel2.relative: 1.0 0.0; - rel2.offset: -9 -17; + rel2.offset: -1 -17; rel2.to_y: "e.swallow.button"; } } @@ -42,61 +42,36 @@ 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; + images.image: "spanner.png" COMP; min: 16 16; - max: 80 80; parts { - part { name: "base"; + part { name: "base"; type: RECT; + scale: 1; 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; + color: 80 80 80 255; + rel1.offset: 2 2; + rel2.offset: -3 -3; + offscale; } 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"; + color: 40 40 40 255; } } part { name: "spanner"; mouse_events: 0; + scale: 1; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - max: 80 80; + rel.to: "base"; 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; + image.normal: "spanner.png"; + offscale; + color: 160 160 160 255; } description { state: "clicked" 0.0; inherit: "default" 0.0; - visible: 1; + color: 255 255 255 255; } } } @@ -105,26 +80,17 @@ group { name: "e/modules/conf/main"; signal: "mouse,down,1"; source: "base"; action: STATE_SET "clicked" 0.0; target: "base"; + target: "spanner"; } program { signal: "mouse,up,1"; source: "base"; action: STATE_SET "default" 0.0; target: "base"; - target: "spanner_glow"; + target: "spanner"; } 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/elementary/themes/img/spanner.png b/data/elementary/themes/img/spanner.png new file mode 100644 index 0000000000000000000000000000000000000000..0b90edb215fcb6d0ce657d5f33669da9fa6c31db GIT binary patch literal 4960 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 e7-Nhvt?~~@*w|YU3)cw%0000