summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-06-16 16:28:59 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-06-16 16:31:10 -0400
commitf6c979266462d58bf56bb647b23af4b8f9875e22 (patch)
treef0bbf674acee91a88ee1db7961272a9417adb8fa
parentb4c4f339c3eb9196bb04601b3635a82fd0594f73 (diff)
theme: migrate all e users of darken_rounded_square to new darken_square image
nearly everything in e is square except for this, which was a holdover from the b&w theme. the new image looks more coherent with the rest of the square look image created by me, licensing to match rest of theme images @feature
-rw-r--r--data/themes/Makefile.am1
-rw-r--r--data/themes/edc/edgebindings.edc6
-rw-r--r--data/themes/edc/fileman.edc6
-rw-r--r--data/themes/edc/ibar-ibox.edc16
-rw-r--r--data/themes/edc/ilist.edc10
-rw-r--r--data/themes/edc/notification.edc6
-rw-r--r--data/themes/img/darken_square.pngbin0 -> 430 bytes
7 files changed, 23 insertions, 22 deletions
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 63c9a635f..58d649cae 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -220,6 +220,7 @@ img/col_sel_end_top.png \
220img/darken_rounded_square_half_h.png \ 220img/darken_rounded_square_half_h.png \
221img/darken_rounded_square_half.png \ 221img/darken_rounded_square_half.png \
222img/darken_rounded_square.png \ 222img/darken_rounded_square.png \
223img/darken_square.png \
223img/day_left_normal.png \ 224img/day_left_normal.png \
224img/day_left_press.png \ 225img/day_left_press.png \
225img/day_left_selected.png \ 226img/day_left_selected.png \
diff --git a/data/themes/edc/edgebindings.edc b/data/themes/edc/edgebindings.edc
index a54dad226..9bcffc6be 100644
--- a/data/themes/edc/edgebindings.edc
+++ b/data/themes/edc/edgebindings.edc
@@ -2,7 +2,7 @@ group { name: "e/modules/conf_edgebindings/selection";
2 images.image: "inset_shadow.png" COMP; 2 images.image: "inset_shadow.png" COMP;
3 images.image: "bevel_in.png" COMP; 3 images.image: "bevel_in.png" COMP;
4 images.image: "dot_pattern.png" COMP; 4 images.image: "dot_pattern.png" COMP;
5 images.image: "darken_rounded_square.png" COMP; 5 images.image: "darken_square.png" COMP;
6 images.image: "downlight_glow.png" COMP; 6 images.image: "downlight_glow.png" COMP;
7 images.image: "downlight_glow_left.png" COMP; 7 images.image: "downlight_glow_left.png" COMP;
8 images.image: "downlight_glow_right.png" COMP; 8 images.image: "downlight_glow_right.png" COMP;
@@ -50,8 +50,8 @@ group { name: "e/modules/conf_edgebindings/selection";
50 rel1.to: "e.text.selection"; 50 rel1.to: "e.text.selection";
51 rel2.offset: 9 5; 51 rel2.offset: 9 5;
52 rel2.to: "e.text.selection"; 52 rel2.to: "e.text.selection";
53 image.normal: "darken_rounded_square.png"; 53 image.normal: "darken_square.png";
54 image.border: 15 15 15 15; 54 image.border: 6 6 6 6;
55 fill.smooth: 0; 55 fill.smooth: 0;
56 fixed: 1 1; 56 fixed: 1 1;
57 } 57 }
diff --git a/data/themes/edc/fileman.edc b/data/themes/edc/fileman.edc
index 70b19294f..f4b0e30b4 100644
--- a/data/themes/edc/fileman.edc
+++ b/data/themes/edc/fileman.edc
@@ -868,7 +868,7 @@ group { name: "e/fileman/default/icon/fixed";
868group { name: "e/fileman/desktop/icon/fixed"; 868group { name: "e/fileman/desktop/icon/fixed";
869 inherit: "e/fileman/default/icon/fixed"; 869 inherit: "e/fileman/default/icon/fixed";
870 alias: "e/fileman/desktop/icon/variable"; 870 alias: "e/fileman/desktop/icon/variable";
871 images.image: "darken_rounded_square.png" COMP; 871 images.image: "darken_square.png" COMP;
872 styles { 872 styles {
873 style { name: "fileman_icon_full"; 873 style { name: "fileman_icon_full";
874 base: "font="FN" font_size=10 text_class=fileman_icon align=center color=#ff00ffff wrap=mixed style=shadow,bottom shadow_color=#00000080 align=center"; 874 base: "font="FN" font_size=10 text_class=fileman_icon align=center color=#ff00ffff wrap=mixed style=shadow,bottom shadow_color=#00000080 align=center";
@@ -914,8 +914,8 @@ group { name: "e/fileman/desktop/icon/fixed";
914 rel1.to: "e.text.label"; 914 rel1.to: "e.text.label";
915 rel2.offset: 7 7; 915 rel2.offset: 7 7;
916 rel2.to: "label_min"; 916 rel2.to: "label_min";
917 image.normal: "darken_rounded_square.png"; 917 image.normal: "darken_square.png";
918 image.border: 15 15 15 15; 918 image.border: 6 6 6 6;
919 fill.smooth: 0; 919 fill.smooth: 0;
920 fixed: 1 1; 920 fixed: 1 1;
921 } 921 }
diff --git a/data/themes/edc/ibar-ibox.edc b/data/themes/edc/ibar-ibox.edc
index 02664ae47..3d11c05d3 100644
--- a/data/themes/edc/ibar-ibox.edc
+++ b/data/themes/edc/ibar-ibox.edc
@@ -165,7 +165,7 @@ group { name: "e/modules/ibox/icon";
165} 165}
166 166
167group { name: "e/modules/ibar/menu"; 167group { name: "e/modules/ibar/menu";
168 images.image: "darken_rounded_square.png" COMP; 168 images.image: "darken_square.png" COMP;
169 parts { 169 parts {
170 part { name: "sizer"; type: SPACER; 170 part { name: "sizer"; type: SPACER;
171 description { state: "default"; } 171 description { state: "default"; }
@@ -190,8 +190,8 @@ group { name: "e/modules/ibar/menu";
190 description { state: "default" 0.0; 190 description { state: "default" 0.0;
191 rel1.to: "sizer"; 191 rel1.to: "sizer";
192 rel2.to: "sizer"; 192 rel2.to: "sizer";
193 image.normal: "darken_rounded_square.png"; 193 image.normal: "darken_square.png";
194 image.border: 15 15 15 15; 194 image.border: 6 6 6 6;
195 } 195 }
196 } 196 }
197 part { name: "e.box"; type: BOX; 197 part { name: "e.box"; type: BOX;
@@ -428,7 +428,7 @@ group { name: "e/modules/ibar/menu/item";
428 428
429group { name: "e/modules/ibox/icon_overlay"; 429group { name: "e/modules/ibox/icon_overlay";
430 alias: "e/modules/ibar/icon_overlay"; 430 alias: "e/modules/ibar/icon_overlay";
431 images.image: "darken_rounded_square.png" COMP; 431 images.image: "darken_square.png" COMP;
432 script { 432 script {
433 public urgent; 433 public urgent;
434 } 434 }
@@ -497,12 +497,12 @@ group { name: "e/modules/ibox/icon_overlay";
497 } 497 }
498 part { name: "bevel"; mouse_events: 0; 498 part { name: "bevel"; mouse_events: 0;
499 description { state: "default" 0.0; 499 description { state: "default" 0.0;
500 rel1.offset: -10 -6; 500 rel1.offset: -9 -5;
501 rel1.to: "e.text.label"; 501 rel1.to: "e.text.label";
502 rel2.offset: 9 5; 502 rel2.offset: 8 4;
503 rel2.to: "e.text.label"; 503 rel2.to: "e.text.label";
504 image.normal: "darken_rounded_square.png"; 504 image.normal: "darken_square.png";
505 image.border: 15 15 15 15; 505 image.border: 6 6 6 6;
506 fill.smooth: 0; 506 fill.smooth: 0;
507 fixed: 1 1; 507 fixed: 1 1;
508 color: 255 255 255 0; 508 color: 255 255 255 0;
diff --git a/data/themes/edc/ilist.edc b/data/themes/edc/ilist.edc
index 7bad83b0c..b6eae7c41 100644
--- a/data/themes/edc/ilist.edc
+++ b/data/themes/edc/ilist.edc
@@ -1,5 +1,5 @@
1group { name: "e/ilist"; 1group { name: "e/ilist";
2 images.image: "darken_rounded_square.png" COMP; 2 images.image: "darken_square.png" COMP;
3 parts { 3 parts {
4 part { name: "typebuf_clip"; type: RECT; 4 part { name: "typebuf_clip"; type: RECT;
5 description { state: "default" 0.0; 5 description { state: "default" 0.0;
@@ -14,12 +14,12 @@ group { name: "e/ilist";
14 part { name: "bevel"; mouse_events: 0; 14 part { name: "bevel"; mouse_events: 0;
15 clip_to: "typebuf_clip"; 15 clip_to: "typebuf_clip";
16 description { state: "default" 0.0; 16 description { state: "default" 0.0;
17 rel1.offset: -15 -15; 17 rel1.offset: -6 -6;
18 rel1.to: "e.text.label"; 18 rel1.to: "e.text.label";
19 rel2.offset: 14 14; 19 rel2.offset: 5 5;
20 rel2.to: "e.text.label"; 20 rel2.to: "e.text.label";
21 image.normal: "darken_rounded_square.png"; 21 image.normal: "darken_square.png";
22 image.border: 15 15 15 15; 22 image.border: 6 6 6 6;
23 fill.smooth: 0; 23 fill.smooth: 0;
24 } 24 }
25 } 25 }
diff --git a/data/themes/edc/notification.edc b/data/themes/edc/notification.edc
index 66564fb24..ab5d5252c 100644
--- a/data/themes/edc/notification.edc
+++ b/data/themes/edc/notification.edc
@@ -12,7 +12,7 @@ group { name: "e/modules/notification/logo";
12} 12}
13 13
14group { name: "e/modules/notification/main"; 14group { name: "e/modules/notification/main";
15 images.image: "darken_rounded_square.png" COMP; 15 images.image: "darken_square.png" COMP;
16 images.image: "sym_close_light_normal.png" COMP; 16 images.image: "sym_close_light_normal.png" COMP;
17 images.image: "sym_close_light_selected.png" COMP; 17 images.image: "sym_close_light_selected.png" COMP;
18 data.item: "app_icon_max" "48 48"; 18 data.item: "app_icon_max" "48 48";
@@ -47,8 +47,8 @@ group { name: "e/modules/notification/main";
47 parts { 47 parts {
48 part { name: "base"; 48 part { name: "base";
49 description { state: "default" 0.0; 49 description { state: "default" 0.0;
50 image.normal: "darken_rounded_square.png"; 50 image.normal: "darken_square.png";
51 image.border: 15 15 15 15; 51 image.border: 6 6 6 6;
52 } 52 }
53 } 53 }
54 part { name: "titleclip"; type: RECT; 54 part { name: "titleclip"; type: RECT;
diff --git a/data/themes/img/darken_square.png b/data/themes/img/darken_square.png
new file mode 100644
index 000000000..0bcc9ecb2
--- /dev/null
+++ b/data/themes/img/darken_square.png
Binary files differ