summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorHermet Park <chuneon.park@samsung.com>2021-02-18 13:21:16 +0900
committerHermet Park <chuneon.park@samsung.com>2021-02-18 13:21:16 +0900
commit23cce0129cad582fa892dba3e431f745a8009011 (patch)
tree833211c72ab7cb7517ee2a1f470a2e00543add24 /data
parentd33454cfdef203c3aa4ec33e46ae0829c7aa5efa (diff)
parent1842d3997a88e22421eddeed49be50a0db08b7ce (diff)
Merge branch 'master' into devs/hermet/lottie
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/elm/progress.edc35
-rw-r--r--data/evas/evas.xml13
-rw-r--r--data/evas/meson.build4
-rw-r--r--data/meson.build3
4 files changed, 54 insertions, 1 deletions
diff --git a/data/elementary/themes/edc/elm/progress.edc b/data/elementary/themes/edc/elm/progress.edc
index d5d848737d..f9f54f1e11 100644
--- a/data/elementary/themes/edc/elm/progress.edc
+++ b/data/elementary/themes/edc/elm/progress.edc
@@ -165,6 +165,41 @@ group { name: "elm/progressbar/horizontal/default";
165 description { state: "default" 0.0; 165 description { state: "default" 0.0;
166 rel1.to: "bg"; 166 rel1.to: "bg";
167 rel2.to: "bg"; 167 rel2.to: "bg";
168 min: 5 16;
169 align: 1.0 0.5;
170 }
171 }
172 part { name: "inside-hi";
173 scale: 1;
174 description { state: "default" 0.0;
175 rel1.to: "inside";
176 rel1.offset: 0 1;
177 rel2.to: "inside";
178 rel2.offset: -1 0;
179 image.normal: "inset_bar_horiz_inside_light.png";
180 image.border: 8 8 0 0;
181 image.border_scale_by: 0.25; image.border_scale: 1;
182 }
183 }
184 part { name: "inside";
185 scale: 1;
186 description { state: "default" 0.0;
187 fixed: 1 1;
188 min: 4 4;
189 rel1.to: "ins0";
190 rel1.relative: 1.0 (6/16);
191 rel2.to: "ins1";
192 rel2.relative: 0.0 (10/16);
193 image.normal: "inset_bar_horiz_inside_base.png";
194 image.border: 8 8 0 0;
195 image.border_scale_by: 0.25; image.border_scale: 1;
196 }
197 }
198 part { name: "elm.swallow.bar"; type: SWALLOW; mouse_events: 0;
199 description { state: "default" 0.0;
200 rel1.to: "inside";
201 rel2.to: "inside";
202>>>>>>> master
168 } 203 }
169 } 204 }
170 part { name: "elm.cur.progressbar"; mouse_events: 0; type: SPACER; 205 part { name: "elm.cur.progressbar"; mouse_events: 0; type: SPACER;
diff --git a/data/evas/evas.xml b/data/evas/evas.xml
new file mode 100644
index 0000000000..7764c0c05e
--- /dev/null
+++ b/data/evas/evas.xml
@@ -0,0 +1,13 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
3>------<mime-type type="image/heif">
4>------>-------<comment>HEIF image file</comment>
5>------>-------<glob pattern="*.heif"/>
6>------>-------<glob pattern="*.heic"/>
7>------</mime-type>
8>------<mime-type type="image/avif">
9>------>-------<comment>AVIF image file</comment>
10>------>--------<glob pattern="*.avif"/>
11>------</mime-type>
12</mime-info>
13
diff --git a/data/evas/meson.build b/data/evas/meson.build
new file mode 100644
index 0000000000..ddcc57dcad
--- /dev/null
+++ b/data/evas/meson.build
@@ -0,0 +1,4 @@
1install_data(files('evas.xml'),
2 install_dir : join_paths(dir_data, 'mime', 'packages')
3)
4
diff --git a/data/meson.build b/data/meson.build
index 4e1f68d406..5944dad07c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,4 +1,4 @@
1checkme_files = ['ecore', 'ecore_imf', 'ecore_x', 'eeze', 'efreet', 'elua', 'emotion', 'ethumb', 'ethumb_client', 'evas'] 1checkme_files = ['ecore', 'ecore_imf', 'ecore_x', 'eeze', 'efreet', 'elua', 'emotion', 'ethumb', 'ethumb_client']
2foreach checkme : checkme_files 2foreach checkme : checkme_files
3 install_data(join_paths(checkme, 'checkme'), 3 install_data(join_paths(checkme, 'checkme'),
4 install_dir : join_paths(dir_data, checkme) 4 install_dir : join_paths(dir_data, checkme)
@@ -10,3 +10,4 @@ subdir('edje')
10subdir('embryo') 10subdir('embryo')
11subdir(join_paths('ethumb', 'frames')) 11subdir(join_paths('ethumb', 'frames'))
12subdir('elementary') 12subdir('elementary')
13subdir('evas')