diff options
| author | Hermet Park <chuneon.park@samsung.com> | 2021-03-03 09:59:46 +0900 |
|---|---|---|
| committer | Hermet Park <chuneon.park@samsung.com> | 2021-03-03 09:59:46 +0900 |
| commit | ea61e95e4cb0d8567300400373da290daa86d92f (patch) | |
| tree | 7c39b1f49d202eec0159003a756e93c35b5773c3 | |
| parent | ec2356e9fbbdda2806c380871a4e95118b23844a (diff) | |
| parent | fd18561a40b2f8d5fe0886bbf153a463af551e25 (diff) | |
| download | efl-ea61e95e4cb0d8567300400373da290daa86d92f.tar.gz | |
Merge branch 'feature/themes/flat' into devs/hermet/lottie
46 files changed, 1472 insertions, 3651 deletions
diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc index 14a5f69e31..ecc4db9884 100644 --- a/data/elementary/themes/default.edc +++ b/data/elementary/themes/default.edc @@ -10,6 +10,18 @@ data.item: "version" "119"; data.item: "efl_theme_base" "dark"; collections { + +sounds { + sample { name: "splash" LOSSY 256; source: "splash.wav"; } + sample { name: "wood-tap1" LOSSY 64; source: "wood-tap.wav"; } + sample { name: "wood-tap2" LOSSY 64; source: "wood-tap2.wav"; } + sample { name: "key-tap1" LOSSY 64; source: "kbd-tap.wav"; } + sample { name: "key-tap2" LOSSY 64; source: "kbd-tap2.wav"; } + sample { name: "key-tap3" LOSSY 64; source: "kbd-tap3.wav"; } + sample { name: "key-tap4" LOSSY 64; source: "kbd-tap4.wav"; } + sample { name: "key-tap5" LOSSY 64; source: "kbd-tap5.wav"; } +} + #include "ic.edc" #include "fonts.edc" diff --git a/data/elementary/themes/edc/about-theme.edc b/data/elementary/themes/edc/about-theme.edc index e6868eb30c..36aa24a5fd 100644 --- a/data/elementary/themes/edc/about-theme.edc +++ b/data/elementary/themes/edc/about-theme.edc @@ -2,7 +2,7 @@ group { name: "e/theme/about"; // data.item: "borderless" "1"; // data.item: "shaped" "1"; // images.image: "check_fill.png" COMP; - images.image: "clouds.jpg" LOSSY 99; + images.image: "about-flat-bg.png" COMP; min: 220 320; parts { part { name: "sizer"; type: SPACER; @@ -35,7 +35,7 @@ group { name: "e/theme/about"; part { name: "image"; description { state: "default" 0.0; fixed: 1 1; - image.normal: "clouds.jpg"; + image.normal: "about-flat-bg.png"; aspect: 1.0 1.0; aspect_preference: NONE; } } diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc index f325b9621f..f7e3e0be99 100644 --- a/data/elementary/themes/edc/comp.edc +++ b/data/elementary/themes/edc/comp.edc @@ -254,6 +254,7 @@ group { name: "e/comp/frame/default"; description { state: "focused" 0.0; inherit; color_class: "comp_focus_color"; + color: 255 255 255 255; } } part { name: "e.swallow.content"; type: SWALLOW; diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc index 3cf0364730..ffc9990b37 100644 --- a/data/elementary/themes/edc/comp_compat.edc +++ b/data/elementary/themes/edc/comp_compat.edc @@ -45,8 +45,7 @@ group { name: "e/comp/border/default"; mouse_events: 0; description { state: "default" 0.0; color_class: "comp_alpha"; - rel1.to: "clipper"; - rel2.to: "clipper"; + rel.to: "clipper"; } } part { name: "focus-clipper"; @@ -55,20 +54,18 @@ group { name: "e/comp/border/default"; mouse_events: 0; description { state: "default" 0.0; color_class: "comp_focus-out_color"; - rel1.to: "clipper"; - rel2.to: "clipper"; + rel.to: "clipper"; } description { state: "focused" 0.0; inherit: "default" 0.0; - color_class: ""; + color_class: "comp_focus_color"; color: 255 255 255 255; } } part { name: "e.swallow.content"; type: SWALLOW; clip_to: "focus-clipper"; description { state: "default" 0.0; - rel1.to: "shower"; - rel2.to: "shower"; + rel.to: "shower"; } } } diff --git a/data/elementary/themes/edc/efl/calendar.edc b/data/elementary/themes/edc/efl/calendar.edc index 6afbeda728..79f81c218d 100644 --- a/data/elementary/themes/edc/efl/calendar.edc +++ b/data/elementary/themes/edc/efl/calendar.edc @@ -1,12 +1,21 @@ -#define CIT_STYLE\ +#define CIT_STYLES\ style { name: "efl_ui_calendar_date_style";\ - base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 align=center text_class=calendar_day_text color_class=calendar_day_text";\ + base: "font="FN" font_size=10 color=#a0a0a0 align=center text_class=calendar_day_text";\ + }\ + style { name: "efl_ui_calendar_date_holiday_style";\ + base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_holiday";\ }\ style { name: "efl_ui_calendar_date_today_style";\ - base: "font="FN" font_size=10 color=#3399ff style=glow glow_color=#3399ff18 align=center text_class=calendar_day_text_today color_class=calendar_day_text_today";\ + base: "font="FN" font_size=10 color=#ffffff align=center text_class=calendar_day_text_today";\ }\ style { name: "efl_ui_calendar_date_disabled_style";\ - base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffffc0 align=center text_class=calendar_day_text_disabled text_class=calendar_day_text_disabled";\ + base: "font="FN" font_size=10 color=#282828 align=center text_class=calendar_day_text_disabled";\ + }\ + style { name: "efl_ui_calendar_date_weekend1_style";\ + base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend1";\ + }\ + style { name: "efl_ui_calendar_date_weekend2_style";\ + base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend2";\ }\ #define CAL_SPIN(_sufix, _text, _relative)\ @@ -21,8 +30,8 @@ offset: 0 -1;\ }\ align: 0.0 0.5;\ - min: 15 15;\ - max: 15 15;\ + min: 25 25;\ + max: 25 25;\ }\ }\ part { name: "right_bt"#_sufix; type: RECT;\ @@ -36,139 +45,110 @@ offset: -1 -1;\ }\ align: 1.0 0.5;\ - min: 15 15;\ - max: 15 15;\ + min: 25 25;\ + max: 25 25;\ color: 0 0 0 0;\ }\ }\ - part { name: "efl.calendar.button"#_sufix".left";\ - type: SWALLOW;\ + part { name: "efl.calendar.button"#_sufix".left"; type: SWALLOW;\ scale: 1;\ description { state: "default" 0.0;\ fixed: 1 1;\ - rel1.to: "left_bt"#_sufix;\ - rel2.to: "left_bt"#_sufix;\ + rel.to: "left_bt"#_sufix;\ + min: 15 15;\ + max: 15 15;\ }\ description { state: "rtl" 0.0;\ inherit: "default" 0.0;\ - rel1.to: "right_bt"#_sufix;\ - rel2.to: "right_bt"#_sufix;\ + rel.to: "right_bt"#_sufix;\ }\ }\ - part { name: "efl.calendar.button"#_sufix".right";\ - type: SWALLOW;\ + part { name: "efl.calendar.button"#_sufix".right"; type: SWALLOW;\ scale: 1;\ description { state: "default" 0.0;\ fixed: 1 1;\ - rel1.to: "right_bt"#_sufix;\ - rel2.to: "right_bt"#_sufix;\ + rel.to: "right_bt"#_sufix;\ + min: 15 15;\ + max: 15 15;\ }\ description { state: "rtl" 0.0;\ inherit: "default" 0.0;\ - rel1.to: "left_bt"#_sufix;\ - rel2.to: "left_bt"#_sufix;\ + rel.to: "left_bt"#_sufix;\ }\ }\ part { name: #_text; type: TEXT; mouse_events: 0;\ - effect: SHADOW BOTTOM; \ scale: 1;\ description { state: "default" 0.0;\ fixed: 1 1;\ rel1 { relative: 1.0 0.0;\ to: "left_bt"#_sufix;\ + offset: 8 8;\ }\ rel2 { relative: 0.0 1.0;\ to: "right_bt"#_sufix;\ + offset: -9 -9;\ }\ + offscale;\ text { font: FNBD; size: 10;\ min: 0 1;\ text_class: "calendar_"#_text; \ }\ - color_class: "calendar_"#_text; \ + color: 160 160 160 255; \ }\ } #define CH(_pos) \ part { name: "ch_"#_pos"_base"; type: SPACER; \ description { state: "default" 0.0; \ - rel1 { \ - relative: (_pos % 7 / 7) 0.0; \ - to: "header"; \ - } \ - rel2 { \ - relative: (_pos % 7 / 7 + 1 / 7) 1.0; \ - to: "header"; \ - } \ + rel.to: "header";\ + rel1.relative: (_pos % 7 / 7) 0.0; \ + rel2.relative: (_pos % 7 / 7 + 1 / 7) 1.0; \ } \ } \ part { name: "efl.ch_"#_pos".text"; type: TEXT; mouse_events: 0; \ - effect: SHADOW BOTTOM; \ scale: 1; \ clip_to: "ch_"#_pos"_clipper"; \ description { state: "default" 0.0; \ - rel1.to: "ch_"#_pos"_base"; \ - rel2.to: "ch_"#_pos"_base"; \ + rel.to: "ch_"#_pos"_base"; \ + rel1.offset: 0 3; \ + rel2.offset: -1 -4; \ + offscale;\ text { font: FN; size: 8; \ min: 1 1; \ ellipsis: -1; \ text_class: "calendar_weekday_text"; \ } \ - color_class: "calendar_weekday_text"; \ + color: 160 160 160 255; \ } \ } \ part { name: "ch_"#_pos"_clipper"; type: RECT; \ description { state: "default" 0.0; \ - rel1.to: "ch_"#_pos"_base"; \ - rel2.to: "ch_"#_pos"_base"; \ + rel.to: "ch_"#_pos"_base"; \ } \ } #define CIT(_pos) \ part { name: "cit_"#_pos"_rect"; type: SPACER; \ description { state: "default" 0.0; \ - rel1 { \ - relative: (_pos % 7 / 7) \ - (_pos / 7 / 6 - _pos % 7 / 7 / 6); \ - to: "base"; \ - } \ - rel2 { \ - relative: (_pos % 7 / 7 + 1 / 7) \ - (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \ - to: "base"; \ - } \ + rel.to: "base"; \ + rel1.relative: (_pos % 7 / 7) (_pos / 7 / 6 - _pos % 7 / 7 / 6); \ + rel2.relative: (_pos % 7 / 7 + 1 / 7) (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \ } \ } \ part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \ description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_rect"; \ - rel2.to: "cit_"#_pos"_rect"; \ + rel.to: "cit_"#_pos"_rect"; \ color: 0 0 0 0; \ } \ - } \ - part { name: "cit_"#_pos"_pat"; mouse_events: 0; \ - description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_selected"; \ - rel1.offset: 1 1; \ - rel2.to: "cit_"#_pos"_selected"; \ - rel2.offset: -2 -2; \ - image.normal: "diagonal_stripes.png"; \ - color: 51 153 255 25; \ - TILED_PATTERN(240, 240) \ - color_class: "calendar_day_selected"; \ - visible: 0; \ - } \ - description { state: "selected" 0.0; \ + description { state: "today" 0.0; \ inherit: "default" 0.0; \ - visible: 1; \ + color: 0 0 0 64; \ } \ } \ - part { name: "cit_"#_pos"_selected"; mouse_events: 0; \ + part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \ description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_rect"; \ - rel2.to: "cit_"#_pos"_rect"; \ - image.normal: "outline.png"; \ - image.border: 4 4 4 4; \ - color: 51 153 255 255; \ + rel.to: "cit_"#_pos"_rect"; \ + color: 51 153 255 128; \ visible: 0; \ } \ description { state: "selected" 0.0; \ @@ -176,32 +156,13 @@ visible: 1; \ } \ } \ - part { name: "cit_"#_pos"_selected2"; mouse_events: 0; \ + part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \ description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_rect"; \ - rel2.to: "cit_"#_pos"_rect"; \ - image.normal: "outline.png"; \ - image.border: 4 4 4 4; \ - color: 51 153 255 255; \ - color_class: "calendar_day_highlighted"; \ + rel.to: "cit_"#_pos"_rect"; \ + color: 255 153 51 128; \ visible: 0; \ } \ - description { state: "highlighted" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ - } \ - } \ - part { name: "cit_"#_pos"_glow"; mouse_events: 0; \ - description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_rect"; \ - rel2.to: "cit_"#_pos"_rect"; \ - image.normal: "box_glow.png"; \ - image.border: 12 12 12 12; \ - image.middle: 0; \ - fill.smooth: 0; \ - visible: 0; \ - } \ - description { state: "focused" 0.0; \ + description { state: "selected" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ } \ @@ -209,11 +170,17 @@ part { name: "efl.cit_"#_pos".text"; type: TEXTBLOCK; mouse_events: 0; \ scale: 1; \ description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_rect"; \ - rel2.to: "cit_"#_pos"_rect"; \ + rel.to: "cit_"#_pos"_rect"; \ + rel1.offset: 3 0; \ + rel2.offset: -4 -1; \ text.style: "efl_ui_calendar_date_style"; \ text.min: 1 1; \ text.ellipsis: -1; \ + offscale; \ + } \ + description { state: "holiday" 0.0; \ + inherit: "default" 0.0; \ + text.style: "efl_ui_calendar_date_holiday_style"; \ } \ description { state: "today" 0.0; \ inherit: "default" 0.0; \ @@ -223,25 +190,26 @@ inherit: "default" 0.0; \ text.style: "efl_ui_calendar_date_disabled_style"; \ } \ + description { state: "weekend/day1" 0.0; \ + inherit: "default" 0.0; \ + text.style: "efl_ui_calendar_date_weekend1_style"; \ + } \ + description { state: "weekend/day2" 0.0; \ + inherit: "default" 0.0; \ + text.style: "efl_ui_calendar_date_weekend2_style"; \ + } \ } \ part { name: "cit_"#_pos"_check"; mouse_events: 0; \ scale: 1; \ description { state: "default" 0.0; \ fixed: 1 1; \ - rel1 { \ - to: "cit_"#_pos"_rect"; \ - relative: 0.6 0.5; \ - } \ - rel2 { \ - to: "cit_"#_pos"_rect"; \ - relative: 0.6 0.5; \ - } \ - min: 16 16; \ - max: 16 16; \ - aspect: 1 1; \ + rel.to: "cit_"#_pos"_rect"; \ + rel1.relative: 0.6 0.5; \ + min: 15 15; \ + max: 15 15; \ align: 0.0 1.0;\ - image.normal: "icon_border_remember.png"; \ - color_class: "calendar_day_checked"; \ + image.normal: "i-check"; \ + color: 53 153 255 255; \ visible: 0; \ } \ description { state: "visible" 0.0; \ @@ -251,8 +219,7 @@ } \ part { name: "efl.cit_"#_pos".access"; type: RECT; repeat_events: 1; \ description { state: "default" 0.0; \ - rel1.to: "cit_"#_pos"_event"; \ - rel2.to: "cit_"#_pos"_event"; \ + rel.to: "cit_"#_pos"_event"; \ color: 0 0 0 0; \ } \ } \ @@ -262,7 +229,6 @@ signal: "cit_"#_pos",selected"; \ source: "efl"; \ action: STATE_SET "selected" 0.0; \ - target: "cit_"#_pos"_pat"; \ target: "cit_"#_pos"_selected"; \ } \ program { \ @@ -270,7 +236,6 @@ signal: "cit_"#_pos",unselected"; \ source: "efl"; \ action: STATE_SET "default" 0.0; \ - target: "cit_"#_pos"_pat"; \ target: "cit_"#_pos"_selected"; \ } \ program { \ @@ -281,7 +246,7 @@ set_int(item_focus_enabled, 1); \ set_int(last_focused_item, _pos); \ if (get_int(win_focus_enabled) == 1) \ - set_state(PART:"cit_"#_pos"_glow", "focused", 0.0); \ + set_state(PART:"cit_"#_pos"_focus", "selected", 0.0); \ } \ } \ program { \ @@ -290,7 +255,7 @@ source: "efl"; \ script { \ set_int(item_focus_enabled, 0); \ - set_state(PART:"cit_"#_pos"_glow", "default", 0.0); \ + set_state(PART:"cit_"#_pos"_focus", "default", 0.0); \ } \ } \ program { \ @@ -299,6 +264,7 @@ source: "efl"; \ action: STATE_SET "today" 0.0; \ target: "efl.cit_"#_pos".text"; \ + target: "cit_"#_pos"_event";\ } \ program { \ name: "cit_"#_pos"_not_today"; \ @@ -306,6 +272,7 @@ source: "efl"; \ action: STATE_SET "default" 0.0; \ target: "efl.cit_"#_pos".text"; \ + target: "cit_"#_pos"_event";\ } \ program { \ name: "cit_"#_pos"_enable"; \ @@ -330,15 +297,15 @@ source: "cit_"#_pos"_clicked"; \ signal: "mouse,down,1"; \ source: "cit_"#_pos"_event"; \ - action: STATE_SET "highlighted" 0.0; \ - target: "cit_"#_pos"_selected2"; \ + action: STATE_SET "selected" 0.0; \ + target: "cit_"#_pos"_selected"; \ } \ program { \ source: "cit_"#_pos"_clicked"; \ signal: "mouse,up,1"; \ source: "cit_"#_pos"_event"; \ action: STATE_SET "default" 0.0; \ - target: "cit_"#_pos"_selected2"; \ + target: "cit_"#_pos"_selected"; \ } \ program { \ source: "cit_"#_pos"_clicked"; \ @@ -420,15 +387,8 @@ } \ } -group { "efl/calendar"; data.item: "version" "123"; - images.image: "sym_left_light_normal.png" COMP; - images.image: "sym_right_light_normal.png" COMP; - images.image: "sym_left_glow_normal.png" COMP; - images.image: "sym_right_glow_normal.png" COMP; - images.image: "icon_border_remember.png" COMP; - images.image: "outline.png" COMP; - images.image: "box_glow.png" COMP; - images.image: "diagonal_stripes.png" COMP; +group { name: "efl/calendar"; + data.item: "version" "123"; data.item: "focus_highlight" "on"; script { public rtl; @@ -437,32 +397,34 @@ group { "efl/calendar"; data.item: "version" "123"; public last_focused_item; } styles { - CIT_STYLE + CIT_STYLES } parts { part { name: "bg"; type: SPACER; + scale: 1; description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; + rel1.offset: 8 8; + rel2.offset: -9 -9; + offscale; } } part { name: "efl.background"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; } } part { name: "spinner-base1"; type: SPACER; + scale: 1; description { state: "default" 0.0; min: 24 16; max: 999999 16; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; rel2.relative: 1.0 (1/8); align: 0.5 0.0; } } part { name: "table-base"; type: SPACER; + scale: 1; description { state: "default" 0.0; min: 70 60; rel1.to_x: "bg"; @@ -471,29 +433,31 @@ group { "efl/calendar"; data.item: "version" "123"; rel1.relative: 0.0 1.0; rel2.to: "bg"; rel2.offset: -4 -4; + offscale; } } part { name: "header"; type: SPACER; description { state: "default" 0.0; - rel1.to: "table-base"; - rel2.to: "table-base"; + rel.to: "table-base"; rel2.relative: 1.0 (1/7); align: 0.5 0.0; - min: 0 16; + min: 0 25; } } - part { name: "header_separator"; mouse_events: 0; + part { name: "header_separator"; type: RECT; mouse_events: 0; + scale: 1; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "header"; + rel.to: "header"; rel1.relative: 0.0 1.0; - rel1.offset: 0 -2; - rel2.to: "header"; - image.normal: "separator_horiz.png"; - fill.smooth: 0; + rel1.offset: 8 -1; + rel2.offset: -9 -1; + color: 80 80 80 255; + offscale; } } part { name: "base"; type: SPACER; + scale: 1; description { state: "default" 0.0; rel1.to_x: "table-base"; rel1.to_y: "header"; @@ -501,6 +465,7 @@ group { "efl/calendar"; data.item: "version" "123"; rel1.offset: 3 0; rel2.to: "table-base"; rel2.offset: -3 0; + offscale; } } @@ -537,182 +502,148 @@ group { "efl/calendar"; data.item: "version" "123"; } } -#undef CAL_SPIN -#undef CIT -#undef CH - - group { name: "efl/calendar/inc_button"; data.item: "version" "123"; - images.image: "sym_right_light_normal.png" COMP; - images.image: "sym_right_glow_normal.png" COMP; - images.image: "sym_right_dark_normal.png" COMP; - script { - public mouse_down = 0; - public multi_down = 0; - } - parts { - part { name: "arrow.image"; - scale: 1; - description { state: "default" 0.0; - min: 15 15; - max: 15 15; - color_class: "F032L1"; - image.normal: "sym_right_light_normal.png"; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "sym_right_glow_normal.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "sym_right_dark_normal.png"; - } +group { name: "efl/calendar/inc_button"; + data.item: "version" "123"; + script { + public mouse_down = 0; + public multi_down = 0; + } + parts { + part { name: "arrow.image"; + scale: 1; + description { state: "default" 0.0; + min: 15 15; max: 15 15; + color: 160 160 160 255; + image.normal: "i-arrow-r"; } - part { name: "over"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } - part { name: "disabler"; - type: RECT; - description { state: "default" 0.0; - color: 0 0 0 0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 96 96 96 255; } } - programs { - program { name: "button_press"; - signal: "mouse,down,1"; - source: "over"; - script { - if ((get_int(multi_down) == 0) && - (get_int(mouse_down) == 0)) { - set_int(mouse_down, 1); - run_program(PROGRAM:"button_press2"); - } - } + part { name: "over"; type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; } - program { name: "button_press2"; - action: SIGNAL_EMIT "efl,action,press" ""; - after: "button_press_anim"; + } + part { name: "disabler"; type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + visible: 0; } - program { name: "button_press_anim"; - action: STATE_SET "pressed" 0.0; - target: "arrow.image"; + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; } - program { name: "button_unpress"; - signal: "mouse,up,1"; - source: "over"; - script { - if (get_int(mouse_down) == 1) { - set_int(mouse_down, 0); - run_program(PROGRAM:"button_unpress2"); - run_program(PROGRAM:"button_unpress_anim"); - } + } + } + programs { + program { signal: "mouse,down,1"; source: "over"; + script { + if ((get_int(multi_down) == 0) && + (get_int(mouse_down) == 0)) { + set_int(mouse_down, 1); + run_program(PROGRAM:"button_press2"); } } - program { name: "button_unpress2"; - action: SIGNAL_EMIT "efl,action,unpress" ""; - } - program { name: "button_unpress_anim"; - action: STATE_SET "default" 0.0; - target: "arrow.image"; - } - program { name: "button_click"; - signal: "mouse,clicked,1"; - source: "over"; - script { - if (get_int(multi_down) == 0) { - run_program(PROGRAM:"button_click2"); - } + } + program { name: "button_press2"; + action: SIGNAL_EMIT "efl,action,press" ""; + after: "button_press_anim"; + } + program { name: "button_press_anim"; + action: STATE_SET "pressed" 0.0; + target: "arrow.image"; + } + program { signal: "mouse,up,1"; source: "over"; + script { + if (get_int(mouse_down) == 1) { + set_int(mouse_down, 0); + run_program(PROGRAM:"button_unpress2"); + run_program(PROGRAM:"button_unpress_anim"); } } - program { name: "action_unpressed"; - signal: "efl,action,unpressed"; - source: "efl"; - after: "button_unpress_anim"; - } - program { name: "action_pressed"; - signal: "efl,action,pressed"; - source: "efl"; - after: "button_press_anim"; - } - program { name: "button_click2"; - action: SIGNAL_EMIT "efl,action,click" ""; - } - program { name: "access_pressed"; - signal: "efl,state,animation,activated"; - source: "efl"; - action: STATE_SET "pressed" 0.0; - target: "arrow.image"; - after: "access_pressed_anim"; - } - program { name: "access_pressed_anim"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.1; - target: "arrow.image"; - } - program { name: "disable"; - signal: "efl,state,disabled"; - source: "efl"; - action: STATE_SET "disabled" 0.0; - target: "arrow.image"; - target: "disabler"; - } - program { name: "enable"; - signal: "efl,state,enabled"; - source: "efl"; - action: STATE_SET "default" 0.0; - target: "arrow.image"; - target: "disabler"; - } - program { - name: "multi_down"; - signal: "efl,action,multi,down"; - source: "efl"; - script { - set_int(multi_down, 1); + } + program { name: "button_unpress2"; + action: SIGNAL_EMIT "efl,action,unpress" ""; + } + program { name: "button_unpress_anim"; + action: STATE_SET "default" 0.0; + target: "arrow.image"; + } + program { signal: "mouse,clicked,1"; source: "over"; + script { + if (get_int(multi_down) == 0) { + run_program(PROGRAM:"button_click2"); } } - program { - name: "multi_up"; - signal: "efl,action,multi,up"; - source: "efl"; - script { - set_int(multi_down, 0); - } + } + program { signal: "efl,action,unpressed"; source: "efl"; + after: "button_unpress_anim"; + } + program { signal: "efl,action,pressed"; source: "efl"; + after: "button_press_anim"; + } + program { name: "button_click2"; + action: SIGNAL_EMIT "efl,action,click" ""; + } + program { signal: "efl,state,animation,activated"; source: "efl"; + action: STATE_SET "pressed" 0.0; + target: "arrow.image"; + after: "access_pressed_anim"; + } + program { name: "access_pressed_anim"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.1; + target: "arrow.image"; + } + program { signal: "efl,state,disabled"; source: "efl"; + action: STATE_SET "disabled" 0.0; + target: "arrow.image"; + target: "disabler"; + } + program { signal: "efl,state,enabled"; source: "efl"; + action: STATE_SET "default" 0.0; + target: "arrow.image"; + target: "disabler"; + } + program { signal: "efl,action,multi,down"; source: "efl"; + script { + set_int(multi_down, 1); + } + } + program { signal: "efl,action,multi,up"; source: "efl"; + script { + set_int(multi_down, 0); } } } +} - group { name: "efl/calendar/dec_button"; - inherit: "efl/calendar/inc_button"; - data.item: "version" "123"; - images.image: "sym_left_light_normal.png" COMP; - images.image: "sym_left_glow_normal.png" COMP; - images.image: "sym_left_dark_normal.png" COMP; - parts { - part { name: "arrow.image"; - scale: 1; - description { state: "default" 0.0; - min: 15 15; - max: 15 15; - image.normal: "sym_left_light_normal.png"; - } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "sym_left_glow_normal.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "sym_left_dark_normal.png"; - } +group { name: "efl/calendar/dec_button"; + inherit: "efl/calendar/inc_button"; + data.item: "version" "123"; + parts { + part { name: "arrow.image"; + scale: 1; + description { state: "default" 0.0; + image.normal: "i-arrow-l"; + } + description { state: "pressed" 0.0; + image.normal: "i-arrow-l"; + } + description { state: "disabled" 0.0; + image.normal: "i-arrow-l"; } } } +} +#undef CIT_STYLES +#undef CAL_SPIN +#undef CIT +#undef CH diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc index 0e01adc1c8..c07594520f 100644 --- a/data/elementary/themes/edc/efl/check.edc +++ b/data/elementary/themes/edc/efl/check.edc @@ -24,511 +24,443 @@ Group: efl/check (@since 1.23) Signal: efl,text,set Signal: efl,text,unset */ -group { "efl/check"; data.item: "version" "123"; - images.image: "inset_shadow_tiny.png" COMP; - images.image: "bevel_in.png" COMP; - images.image: "sym_check_alum.png" COMP; -#define ICON 1 -#define LABEL 2 -#define MASK 3 -#define DISABLE 4 +#define ICON 1 +#define LABEL 2 +#define MASK 3 +#define DISABLE 4 +#define PRESSED 8 +#define BACKGROUND 16 + +group { name: "efl/check"; + data.item: "version" "123"; script { - public btmode; - public eval_mode(m) { - new m1 = m & MASK; - new d = m & DISABLE; - if (m1 == (ICON | LABEL)) { - if (!d) { - set_state(PART:"efl.content", "visible", 0.0); - set_state(PART:"sizer_content", "visible", 0.0); - set_state(PART:"efl.text", "visible", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"base", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"efl.content", "visible", 0.0); - set_state(PART:"sizer_content", "visible", 0.0); - set_state(PART:"efl.text", "disabled_visible", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"base", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } else if (m1 == (ICON)) { - if (!d) { - set_state(PART:"efl.content", "visible", 0.0); - set_state(PART:"sizer_content", "icononly", 0.0); - set_state(PART:"efl.text", "default", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"base", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"efl.content", "visible", 0.0); - set_state(PART:"sizer_content", "icononly", 0.0); - set_state(PART:"efl.text", "disabled", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"base", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } else if (m1 == (LABEL)) { - if (!d) { - set_state(PART:"efl.content", "default", 0.0); - set_state(PART:"sizer_content", "default", 0.0); - set_state(PART:"efl.text", "visible", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"base", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"efl.content", "default", 0.0); - set_state(PART:"sizer_content", "default", 0.0); - set_state(PART:"efl.text", "disabled_visible", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"base", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } else { - if (!d) { - set_state(PART:"efl.content", "default", 0.0); - set_state(PART:"sizer_content", "default", 0.0); - set_state(PART:"efl.text", "default", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"base", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - } else { - set_state(PART:"efl.content", "default", 0.0); - set_state(PART:"sizer_content", "default", 0.0); - set_state(PART:"efl.text", "default", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"base", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - } - } - } + BUTTONMODE_SCRIPT2 } parts { - part { name: "base"; type: RECT; - description { state: "default" 0.0; - rel1.offset: 1 1; - rel1.to: "inset"; - rel2.offset: -2 -2; - rel2.to: "inset"; - color: 24 24 24 255; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 64 64 64 255; + part { name: "shadow"; type: SPACER; + description { state: "default"; } - } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow_tiny.png"; - image.border: 4 4 4 4; - rel1.to: "base"; - rel2.to: "base"; + desc { "pressed"; inherit; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; + desc { "disabled"; inherit; } } - part { name: "inset"; mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 0; - rel1.offset: 2 2; - rel2.relative: 0.0 1.0; - rel2.offset: 2 -3; - align: 0.0 0.5; - min: 13 13; - max: 13 13; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + rect { "icon_clip"; + desc { "default"; + color_class: "button_icon"; } - } - part { name: "indicator"; mouse_events: 0; - scale: 1; - clip_to: "clip"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "sym_check_alum.png"; - min: 11 11; - max: 11 11; - visible: 0; + desc { "pressed"; inherit; + color_class: "button_icon_pressed"; } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; + desc { "disabled"; inherit; + color_class: "button_icon_disabled"; } } - part { name: "clip"; type: RECT; - description { state: "default" 0.0; + swallow { "efl.background"; nomouse; + required; + desc { "default"; + rel.to: "shadow"; + visible: 0; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; + desc { "visible"; + inherit: "default"; + visible: 1; } } - part { name: "efl.content"; type: SWALLOW; + swallow { "efl.content"; nomouse; + clip_to: "icon_clip"; scale: 1; - clip_to: "clip"; - required; - description { state: "default" 0.0; + desc { "default"; fixed: 1 0; - visible: 0; align: 0.0 0.5; - max: 0 0; - rel1.to_x: "inset"; + rel1.to_x: "base"; + rel2.to_x: "base"; + rel1.offset: 4 4; rel1.relative: 1.0 0.0; - rel1.offset: 1 1; - rel2.to_x: "inset"; - rel2.offset: 1 -2; - rel2.relative: 1.0 1.0; + rel2.relative: 0.0 1.0; + rel2.offset: 4 -5; + visible: 0; + offscale; } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + desc { "visible"; inherit; + fixed: 1 0; aspect: 1.0 1.0; - min: 16 16; + min: ICMIN ICMIN; + visible: 1; + } + desc { "icononly"; inherit; + fixed: 0 0; + align: 0.5 0.5; + rel2.relative: 1.0 1.0; + rel2.offset: -5 -5; + rel2.to_x: ""; + visible: 1; } } - part { name: "sizer_content"; type: TEXT; mouse_events: 0; + text { "sizer_content"; nomouse; scale: 1; - description { state: "default" 0.0; + desc { "default"; fixed: 1 1; visible: 0; text { font: FN; size: 10; min: 0 0; - text_class: "check_text"; + text_class: "button_text"; } } - description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1.to: "efl.content"; - rel2.to: "efl.content"; + desc { "visible"; inherit; + rel.to: "efl.content"; text { min: 1 1; ellipsis: -1; - text: "M"; + text: SPACER_TEXT; } } - description { state: "icononly" 0.0; - inherit: "default" 0.0; - rel1.to: "efl.content"; - rel2.to: "efl.content"; + desc { "icononly"; inherit; + rel.to: "efl.content"; text { min: 1 1; ellipsis: -1; - text: "M"; + text: SPACER_TEXT; } } } - part { name: "efl.text"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; + part { name: "base"; type: RECT; + scale: 1; + description { state: "default"; + fixed: 1 0; + color: 0 0 0 64; + align: 0.0 0.5; + min: 13 13; + max: 13 13; + rel1.offset: 4 4; + rel2.relative: 0.0 1.0; + rel2.offset: 4 -5; + aspect: 1.0 1.0; aspect_preference: VERTICAL; + offscale; + } + desc { "pressed"; inherit; + color: 0 0 0 128; + } + desc { "disabled"; inherit; + color: 0 0 0 16; + } + } + part { name: "ck_check"; + clip_to: "ck_selected"; scale: 1; - required; description { state: "default" 0.0; - rel1.offset: 2 2; - rel1.to_x: "efl.content"; + fixed: 0 0; + rel.to: "base"; + image.normal: "i-check"; + min: 15 15; + max: 15 15; + visible: 0; + color: 160 160 160 255; + fixed: 1 1; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + visible: 1; + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "ck_selected"; type: RECT; + description { state: "default" 0.0; + rel.to: "base"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 153 153 153 255; + } + } + text { "efl.text"; nomouse; + scale: 1; + desc { "default"; + fixed: 0 1; + color: 160 160 160 255; + rel1.offset: 0 4; rel1.relative: 1.0 0.0; - rel2.offset: -3 -3; - color: FN_COL_DEFAULT; - color_class: "check_text"; + rel1.to_x: "efl.content"; + rel2.offset: -5 -5; text { font: FN; size: 10; - min: 0 0; - align: 0.0 0.5; - text_class: "check"; + align: 0.0 0.5; + min: 0 0; } + visible: 0; + offscale; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color_class: "check_text_disabled"; - color3: 255 255 255 255; + desc { "visible"; inherit; + fixed: 0 0; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; + visible: 1; } - description { state: "visible" 0.0; - inherit: "default" 0.0; + desc { "pressed_visible"; inherit; + fixed: 0 0; + color: 255 255 255 255; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; visible: 1; + } + desc { "textonly"; inherit; + fixed: 0 0; text.min: 1 1; text.ellipsis: -1; + visible: 1; } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - color_class: "check_text_disabled"; - color3: 255 255 255 255; + desc { "pressed_textonly"; inherit; + fixed: 0 0; + color: 255 255 255 255; + text.min: 1 1; + text.ellipsis: -1; + visible: 1; + } + desc { "disabled_visible"; inherit; + fixed: 0 0; + color: 96 96 96 255; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; visible: 1; + } + desc { "disabled_textonly"; inherit; + fixed: 0 0; + color: 96 96 96 255; text.min: 1 1; text.ellipsis: -1; + visible: 1; } } - part { name: "event"; type: RECT; + rect { "event"; ignore_flags: ON_HOLD; - description { state: "default" 0.0; + desc { "default"; color: 0 0 0 0; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; + desc { "disabled"; inherit; visible: 0; } } } programs { - EFL_UI_CLICKABLE_PART_BIND(event) - program { - signal: "efl,state,selected"; source: "efl"; + EFL_UI_CLICKABLE_PART_BIND("event") + program { signal: "mouse,down,1"; source: "event"; + script { + new buf[32]; new Float:val; + get_state(PART:"ck_check", buf, 32, val); + if (!strcmp(buf, "default")) { run_program(PROGRAM:"snd-check-on"); } + else { run_program(PROGRAM:"snd-check-off"); } + echo(buf); + } + } + program { signal: "efl,state,selected"; source: "efl"; action: STATE_SET "selected" 0.0; - target: "indicator"; + target: "ck_check"; } - program { - signal: "efl,state,unselected"; source: "efl"; + program { signal: "efl,state,unselected"; source: "efl"; action: STATE_SET "default" 0.0; - target: "indicator"; + target: "ck_check"; } - program { - signal: "efl,text,set"; source: "efl"; - script { - new m = get_int(btmode); - m |= LABEL; set_int(btmode, m); - eval_mode(m); - } + program { name: "snd-check-on"; + action: PLAY_SAMPLE "wood-tap1" 1.0 INPUT; } - program { - signal: "efl,text,unset"; source: "efl"; - script { - new m = get_int(btmode); - m &= ~LABEL; set_int(btmode, m); - eval_mode(m); - } + program { name: "snd-check-off"; + action: PLAY_SAMPLE "wood-tap2" 1.0 INPUT; } - program { - signal: "efl,content,set"; source: "efl"; - script { - new m = get_int(btmode); - m |= ICON; set_int(btmode, m); - eval_mode(m); - } + program { signal: "mouse,down,1"; source: "event"; + action: SIGNAL_EMIT "efl,action,press" "efl"; + after: "button_click_anim"; } - program { - signal: "efl,content,unset"; source: "efl"; - script { - new m = get_int(btmode); - m &= ~ICON; set_int(btmode, m); - eval_mode(m); - } + program { signal: "mouse,down,1"; source: "event"; + action: STATE_SET "pressed" 0.0; + target: "ck_check"; } - program { - signal: "efl,state,disabled"; source: "efl"; - script { - new m = get_int(btmode); - m |= DISABLE; set_int(btmode, m); - eval_mode(m); - } + program { name: "button_click_anim"; + script { flag_set(PRESSED); } } - program { - signal: "efl,state,enabled"; source: "efl"; - script { - new m = get_int(btmode); - m &= ~DISABLE; set_int(btmode, m); - eval_mode(m); - } + program { signal: "mouse,up,1"; source: "event"; + action: STATE_SET "default" 0.0; + target: "ck_check"; + } + program { signal: "mouse,up,1"; source: "event"; + script { flag_unset(PRESSED); } + } + program { signal: "efl,text,set"; source: "efl"; + script { flag_set(LABEL); } + } + program { signal: "efl,text,unset"; source: "efl"; + script { flag_unset(LABEL); } + } + program { signal: "efl,content,set"; source: "efl"; + script { flag_set(ICON); } + } + program { signal: "efl,content,unset"; source: "efl"; + script { flag_unset(ICON); } + } + program { signal: "efl,state,disabled"; source: "efl"; + script { flag_set(DISABLE); } + } + program { signal: "efl,state,enabled"; source: "efl"; + script { flag_unset(DISABLE); } + } + program { signal: "efl,state,disabled"; source: "efl"; + action: STATE_SET "disabled" 0.0; + target: "ck_selected"; + } + program { signal: "efl,state,enabled"; source: "efl"; + action: STATE_SET "default" 0.0; + target: "ck_selected"; } } -#undef ICON -#undef LABEL -#undef MASK -#undef DISABLE } -group { "efl/check:toggle"; data.item: "version" "123"; - images.image: "inset_shadow_tiny.png" COMP; - images.image: "bevel_in.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "vgrad_med_lighter.png" COMP; - images.image: "shadow_square_tiny.png" COMP; - images.image: "glow_small.png" COMP; - -#define ICON 1 -#define LABEL 2 -#define MASK 3 -#define DISABLE 4 +group { name: "efl/check:toggle"; script { - public is_rtl; public is_drag; public was_drag; - public btmode; - public eval_mode(m) { - new m1 = m & MASK; - new d = m & DISABLE; - if (m1 == (ICON | LABEL)) { - if (!d) { - set_state(PART:"efl.content", "visible", 0.0); - set_state(PART:"sizer_content", "visible", 0.0); - set_state(PART:"efl.text", "visible", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - set_state(PART:"event2", "default", 0.0); - set_state(PART:"efl.ontext", "default", 0.0); - set_state(PART:"efl.offtext", "default", 0.0); - set_state(PART:"onrect", "default", 0.0); - set_state(PART:"offrect", "default", 0.0); - } else { - set_state(PART:"efl.content", "visible", 0.0); - set_state(PART:"sizer_content", "visible", 0.0); - set_state(PART:"efl.text", "disabled_visible", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - set_state(PART:"event2", "disabled", 0.0); - set_state(PART:"efl.ontext", "disabled", 0.0); - set_state(PART:"efl.offtext", "disabled", 0.0); - set_state(PART:"onrect", "disabled", 0.0); - set_state(PART:"offrect", "disabled", 0.0); - } - } else if (m1 == (ICON)) { - if (!d) { - set_state(PART:"efl.content", "visible", 0.0); - set_state(PART:"sizer_content", "icononly", 0.0); - set_state(PART:"efl.text", "default", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - set_state(PART:"event2", "default", 0.0); - set_state(PART:"efl.ontext", "default", 0.0); - set_state(PART:"efl.offtext", "default", 0.0); - set_state(PART:"onrect", "default", 0.0); - set_state(PART:"offrect", "default", 0.0); - } else { - set_state(PART:"efl.content", "visible", 0.0); - set_state(PART:"sizer_content", "icononly", 0.0); - set_state(PART:"efl.text", "disabled", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - set_state(PART:"event2", "disabled", 0.0); - set_state(PART:"efl.ontext", "disabled", 0.0); - set_state(PART:"efl.offtext", "disabled", 0.0); - set_state(PART:"onrect", "disabled", 0.0); - set_state(PART:"offrect", "disabled", 0.0); + public is_rtl; + + BUTTONMODE_SCRIPT2 + } + parts { + part { name: "shadow"; type: SPACER; + description { state: "default"; + } + desc { "pressed"; inherit; + } + desc { "disabled"; inherit; + } + } + swallow { "efl.background"; nomouse; + required; + desc { "default"; + rel.to: "shadow"; + visible: 0; + } + desc { "visible"; + inherit: "default"; + visible: 1; + } + } + rect { "icon_clip"; + desc { "default"; + color_class: "button_icon"; + } + desc { "pressed"; inherit; + color_class: "button_icon_pressed"; + } + desc { "disabled"; inherit; + color_class: "button_icon_disabled"; + } + } + swallow { "efl.content"; nomouse; + clip_to: "icon_clip"; + scale: 1; + desc { "default"; + fixed: 1 0; + align: 0.0 0.5; + rel1.offset: 4 4; + rel2.relative: 0.0 1.0; + rel2.offset: 4 -5; + visible: 0; + offscale; + } + desc { "visible"; inherit; + fixed: 1 0; + aspect: 1.0 1.0; + visible: 1; + } + desc { "icononly"; inherit; + fixed: 0 0; + align: 0.5 0.5; + rel2.relative: 1.0 1.0; + rel2.offset: -5 -5; + rel2.to_x: "tog"; + rel2.relative: 0.0 1.0; + visible: 1; + } + } + text { "sizer_content"; nomouse; + scale: 1; + desc { "default"; + visible: 0; + text { font: FN; size: 10; + min: 0 0; + text_class: "button_text"; } - } else if (m1 == (LABEL)) { - if (!d) { - set_state(PART:"efl.content", "default", 0.0); - set_state(PART:"sizer_content", "default", 0.0); - set_state(PART:"efl.text", "visible", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - set_state(PART:"event2", "default", 0.0); - set_state(PART:"efl.ontext", "default", 0.0); - set_state(PART:"efl.offtext", "default", 0.0); - set_state(PART:"onrect", "default", 0.0); - set_state(PART:"offrect", "default", 0.0); - } else { - set_state(PART:"efl.content", "default", 0.0); - set_state(PART:"sizer_content", "default", 0.0); - set_state(PART:"efl.text", "disabled_visible", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - set_state(PART:"event2", "disabled", 0.0); - set_state(PART:"efl.ontext", "disabled", 0.0); - set_state(PART:"efl.offtext", "disabled", 0.0); - set_state(PART:"onrect", "disabled", 0.0); - set_state(PART:"offrect", "disabled", 0.0); + } + desc { "visible"; inherit; + rel.to: "efl.content"; + text { + min: 1 1; + ellipsis: -1; + text: SPACER_TEXT; } - } else { - if (!d) { - set_state(PART:"efl.content", "default", 0.0); - set_state(PART:"sizer_content", "default", 0.0); - set_state(PART:"efl.text", "default", 0.0); - set_state(PART:"shadow", "default", 0.0); - set_state(PART:"clip", "default", 0.0); - set_state(PART:"event", "default", 0.0); - set_state(PART:"event2", "default", 0.0); - set_state(PART:"efl.ontext", "default", 0.0); - set_state(PART:"efl.offtext", "default", 0.0); - set_state(PART:"onrect", "default", 0.0); - set_state(PART:"offrect", "default", 0.0); - } else { - set_state(PART:"efl.content", "default", 0.0); - set_state(PART:"sizer_content", "default", 0.0); - set_state(PART:"efl.text", "default", 0.0); - set_state(PART:"shadow", "disabled", 0.0); - set_state(PART:"clip", "disabled", 0.0); - set_state(PART:"event", "disabled", 0.0); - set_state(PART:"event2", "disabled", 0.0); - set_state(PART:"efl.ontext", "disabled", 0.0); - set_state(PART:"efl.offtext", "disabled", 0.0); - set_state(PART:"onrect", "disabled", 0.0); - set_state(PART:"offrect", "disabled", 0.0); + } + desc { "icononly"; inherit; + rel.to: "efl.content"; + text { + min: 1 1; + ellipsis: -1; + text: SPACER_TEXT; } } } - } - parts { - part { name: "tog"; type: SPACER; - scale: 1; + spacer { name: "tog"; scale: 1; description { state: "default" 0.0; - fixed: 1 0; + fixed: 1 1; rel1.relative: 1.0 0.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; + rel1.offset: -5 4; + rel2.offset: -5 -5; align: 1.0 0.5; min: 88 15; max: 88 15; + offscale; } } - part { name: "onrect"; type: RECT; mouse_events: 0; - scale: 1; - clip_to: "tog_clip"; + rect { name: "base"; + description { state: "default"; + fixed: 1 1; + color: 0 0 0 64; + rel.to: "tog"; + } + desc { "pressed"; inherit; + color: 0 0 0 128; + } + desc { "disabled"; inherit; + color: 0 0 0 16; + } + } + spacer { name: "onrect"; description { state: "default" 0.0; - rel1.to: "button"; + rel.to: "button"; rel1.relative: -5.0 0.0; - rel2.to: "button"; rel2.relative: 0.5 1.0; - color: 24 24 24 255; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 64 64 64 255; } } - part { name: "offrect"; type: RECT; mouse_events: 0; - scale: 1; - clip_to: "tog_clip"; + spacer { name: "offrect"; description { state: "default" 0.0; - rel1.to: "button"; + rel.to: "button"; rel1.relative: 0.5 0.0; - rel2.to: "button"; rel2.relative: 6.0 1.0; - color: 24 24 24 255; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 64 64 64 255; } } - part { name: "efl.offtext"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; - scale: 1; + text { name: "efl.offtext"; nomouse; scale: 1; clip_to: "tog_clip"; description { state: "default" 0.0; fixed: 1 1; rel1.to: "button"; rel1.relative: 1.0 0.0; + rel1.offset: 4 0; rel2.to: "offrect"; - color: FN_COL_DEFAULT; - color_class: "check_off_text"; + rel2.offset: -5 -1; + offscale; + color: 160 160 160 255; text { font: FN; size: 10; min: 0 1; align: 0.5 0.5; @@ -538,24 +470,24 @@ group { "efl/check:toggle"; data.item: "version" "123"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color_class: "check_off_text_disabled"; - color3: 255 255 255 255; + color: 96 96 96 255; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } } - part { name: "efl.ontext"; type: TEXT; mouse_events: 0; - effect: GLOW; - scale: 1; + text { name: "efl.ontext"; nomouse; scale: 1; clip_to: "tog_clip"; description { state: "default" 0.0; fixed: 1 1; rel1.to: "onrect"; - rel1.offset: 2 -1; + rel1.offset: 4 0; rel2.to: "button"; rel2.relative: 0.0 1.0; - rel2.offset: -1 -2; - color_class: "check_on_text"; - color2: 255 255 255 255; - color3: 255 255 255 255; + rel2.offset: -5 -1; + offscale; + color: 51 153 255 255; text { font: FN; size: 10; min: 0 1; align: 0.5 0.5; @@ -565,44 +497,19 @@ group { "efl/check:toggle"; data.item: "version" "123"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color_class: "check_on_text_disabled"; - color3: 255 255 255 255; + color: 96 96 96 255; } - } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow_tiny.png"; - image.border: 4 4 4 4; - rel1.to: "tog"; - rel2.to: "tog"; - } - description { state: "disabled" 0.0; + description { state: "clicked" 0.0; inherit: "default" 0.0; - visible: 0; - } - } - part { name: "inset"; mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "tog"; - rel1.offset: -1 -1; - rel2.to: "tog"; - rel2.offset: 0 0; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + color: 255 255 255 255; } } part { name: "tog_clip"; type: RECT; description { state: "default" 0.0; - rel1.to: "tog"; - rel2.to: "tog"; + rel.to: "tog"; } } - part { name: "button"; type: RECT; - scale: 1; + part { name: "button"; type: RECT; scale: 1; clip_to: "tog_clip"; dragable { x: 1 1 0; @@ -611,219 +518,132 @@ group { "efl/check:toggle"; data.item: "version" "123"; } description { state: "default" 0.0; fixed: 1 1; - rel1.to: "tog"; - rel2.to: "tog"; + rel.to: "tog"; min: 15 15; max: 15 99999; color: 0 0 0 0; } } - part { name: "shadow_but"; mouse_events: 0; + rect { name: "base_but"; nomouse; description { state: "default" 0.0; - rel1.offset: -3 -2; - rel1.to: "base_but"; - rel2.offset: 2 4; - rel2.to: "base_but"; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; + rel.to: "button"; + color: 51 153 255 255; } description { state: "clicked" 0.0; inherit: "default" 0.0; - rel1.offset: -2 -2; - rel2.offset: 1 1; - color: 255 255 255 128; + color: 255 255 255 255; } - } - part { name: "glow_but"; mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: -3 -3; - rel1.to: "base_but"; - rel2.offset: 2 2; - rel2.to: "base_but"; - image.normal: "glow_small.png"; - image.border: 7 7 7 7; - fill.smooth: 0; - visible: 0; - } - description { state: "clicked" 0.0; + description { state: "disabled" 0.0; inherit: "default" 0.0; - visible: 1; - } - } - part { name: "base_but"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button"; - rel2.to: "button"; - image.normal: "vgrad_med_lighter.png"; - fill.smooth: 0; - TILED_HORIZ(120) - } - } - part { name: "bevel_but"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base_but"; - rel2.to: "base_but"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + color: 64 64 64 255; } } - part { name: "button_events"; type: RECT; + rect { name: "button_events"; dragable.events: "button"; description { state: "default" 0.0; color: 0 0 0 0; } } - part { name: "clip"; type: RECT; - description { state: "default" 0.0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; - } - } - part { name: "efl.content"; type: SWALLOW; + text { "efl.text"; nomouse; scale: 1; - clip_to: "clip"; - description { state: "default" 0.0; - fixed: 1 0; - visible: 0; - align: 0.0 0.5; - max: 0 0; - rel1.offset: 1 1; - rel2.offset: 1 -2; + desc { "default"; + fixed: 0 1; + color: 160 160 160 255; + rel1.offset: 0 4; + rel1.relative: 1.0 0.0; + rel1.to_x: "efl.content"; + rel2.offset: -5 -5; rel2.relative: 0.0 1.0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - fixed: 0 0; - visible: 1; - min: 16 16; - } - } - part { name: "sizer_content"; type: TEXT; mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; + rel2.to_x: "tog"; text { font: FN; size: 10; + align: 0.5 0.5; min: 0 0; - text_class: "check_text"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1.to: "efl.content"; - rel2.to: "efl.content"; - text { - min: 1 1; - ellipsis: -1; - text: "M"; - } - } - description { state: "icononly" 0.0; - inherit: "default" 0.0; - rel1.to: "efl.content"; - rel2.to: "efl.content"; - text { - min: 1 1; - ellipsis: -1; - text: "M"; } + visible: 0; + offscale; } - } - part { name: "efl.text"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; - scale: 1; - description { state: "default" 0.0; - rel1.to_x: "efl.content"; - rel1.relative: 1.0 0.0; - rel1.offset: 2 2; - rel2.to_x: "tog"; - rel2.relative: 0.0 1.0; - rel2.offset: -5 -3; - color: FN_COL_DEFAULT; - color_class: "check_text"; - text { font: FN; size: 10; - min: 0 0; - align: 0.0 0.5; - text_class: "check"; - } + desc { "visible"; inherit; + fixed: 0 0; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; + visible: 1; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color_class: "check_text_disabled"; - color3: 255 255 255 255; + desc { "pressed_visible"; inherit; + fixed: 0 0; + color: 255 255 255 255; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; + visible: 1; } - description { state: "visible" 0.0; - inherit: "default" 0.0; + desc { "textonly"; inherit; + fixed: 0 0; + text.min: 1 1; + text.ellipsis: -1; visible: 1; + } + desc { "pressed_textonly"; inherit; + fixed: 0 0; + color: 255 255 255 255; text.min: 1 1; text.ellipsis: -1; + visible: 1; } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - color_class: "check_text_disabled"; - color3: 255 255 255 255; + desc { "disabled_visible"; inherit; + fixed: 0 0; + color: 96 96 96 255; + rel1.offset: 4 4; + text.min: 1 1; + text.ellipsis: -1; visible: 1; + } + desc { "disabled_textonly"; inherit; + fixed: 0 0; + color: 96 96 96 255; text.min: 1 1; text.ellipsis: -1; + visible: 1; } } - part { name: "event"; type: RECT; - ignore_flags: ON_HOLD; - description { state: "default" 0.0; + rect { "event2"; + desc { "default"; color: 0 0 0 0; - rel1.to_x: "efl.content"; - rel2.to_x: "efl.text"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; visible: 0; } + desc { "disabled"; inherit; + visible: 1; + } } - part { name: "event2"; type: RECT; + rect { "event"; repeat; ignore_flags: ON_HOLD; - description { state: "default" 0.0; + desc { "default"; color: 0 0 0 0; - visible: 0; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; + desc { "disabled"; inherit; + visible: 0; } } } programs { - EFL_UI_CLICKABLE_PART_BIND(event) - program { - signal: "efl,state,selected"; source: "efl"; + EFL_UI_CLICKABLE_PART_BIND("event") + program { signal: "efl,state,selected"; source: "efl"; script { new Float:drag; - if (get_int(is_rtl) == 0) { - drag = 100.0; - } else { - drag = 0.0; - } + if (get_int(is_rtl) == 0) { drag = 100.0; } + else { drag = 0.0; } set_drag(PART:"button", drag, 0.0); } } - program { - signal: "efl,state,unselected"; source: "efl"; + program { signal: "efl,state,unselected"; source: "efl"; script { new Float:drag; - if (get_int(is_rtl) == 0) { - drag = 0.0; - } else { - drag = 100.0; - } + if (get_int(is_rtl) == 0) { drag = 0.0; } + else { drag = 100.0; } set_drag(PART:"button", drag, 0.0); } } - program { - signal: "mouse,clicked,1"; source: "button"; + program { signal: "mouse,clicked,1"; source: "button"; script { new Float:dx, Float:dy; get_drag(PART:"button", dx, dy); @@ -842,21 +662,18 @@ group { "efl/check:toggle"; data.item: "version" "123"; } } } - program { - signal: "drag"; source: "button"; + program { signal: "drag"; source: "button"; script { set_int(is_drag, 1); } } - program { - signal: "mouse,down,1"; source: "button"; + program { signal: "mouse,down,1"; source: "button"; script { set_int(was_drag, 0); set_int(is_drag, 0); } } - program { name: "drag_end"; - signal: "mouse,up,1"; source: "button"; + program { signal: "mouse,up,1"; source: "button"; script { new Float:dx, Float:dy; get_drag(PART:"button", dx, dy); @@ -877,81 +694,45 @@ group { "efl/check:toggle"; data.item: "version" "123"; } } } - program { - signal: "mouse,down,1"; source: "button"; + program { signal: "mouse,down,1"; source: "button"; action: STATE_SET "clicked" 0.0; - target: "shadow_but"; - target: "glow_but"; + target: "base_but"; + target: "efl.ontext"; + target: "efl.offtext"; } - program { - signal: "mouse,up,1"; source: "button"; + program { signal: "mouse,up,1"; source: "button"; action: STATE_SET "default" 0.0; - target: "shadow_but"; - target: "glow_but"; + target: "base_but"; + target: "efl.ontext"; + target: "efl.offtext"; } - program { - signal: "efl,text,set"; source: "efl"; - script { - new m = get_int(btmode); - m |= LABEL; set_int(btmode, m); - eval_mode(m); - } + program { signal: "efl,text,set"; source: "efl"; + script { flag_set(LABEL); } } - program { - signal: "efl,text,unset"; source: "efl"; - script { - new m = get_int(btmode); - m &= ~LABEL; set_int(btmode, m); - eval_mode(m); - } + program { signal: "efl,text,unset"; source: "efl"; + script { flag_unset(LABEL); } } - program { - signal: "efl,content,set"; source: "efl"; - script { - new m = get_int(btmode); - m |= ICON; set_int(btmode, m); - eval_mode(m); - } + program { signal: "efl,content,set"; source: "efl"; + script { flag_set(ICON); } } - program { - signal: "efl,content,unset"; source: "efl"; - script { - new m = get_int(btmode); - m &= ~ICON; set_int(btmode, m); - eval_mode(m); - } + program { signal: "efl,content,unset"; source: "efl"; + script { flag_unset(ICON); } } - program { - signal: "efl,state,disabled"; source: "efl"; - script { - new m = get_int(btmode); - m |= DISABLE; set_int(btmode, m); - eval_mode(m); - } + program { signal: "efl,state,disabled"; source: "efl"; + script { flag_set(DISABLE); } } - program { - signal: "efl,state,enabled"; source: "efl"; - script { - new m = get_int(btmode); - m &= ~DISABLE; set_int(btmode, m); - eval_mode(m); - } + program { signal: "efl,state,enabled"; source: "efl"; + script { flag_unset(DISABLE); } } - program { - signal: "edje,state,rtl"; source: "edje"; + program { signal: "edje,state,rtl"; source: "edje"; script { set_int(is_rtl, 1); } } - program { - signal: "edje,state,ltr"; source: "edje"; + program { signal: "edje,state,ltr"; source: "edje"; script { set_int(is_rtl, 0); } } } -#undef ICON -#undef LABEL -#undef MASK -#undef DISABLE } diff --git a/data/elementary/themes/edc/efl/cursor.edc b/data/elementary/themes/edc/efl/cursor.edc index d59d4b8030..fbadbc852f 100644 --- a/data/elementary/themes/edc/efl/cursor.edc +++ b/data/elementary/themes/edc/efl/cursor.edc @@ -78,7 +78,8 @@ // "watch" // "xterm" -group { name: "efl/cursor/hand1"; data.item: "version" "123"; +group { name: "efl/cursor/hand1"; + data.item: "version" "123"; images.image: "pointer_hand1.png" COMP; parts { part { name: "base"; mouse_events: 0; scale: 1; @@ -104,7 +105,8 @@ group { name: "efl/cursor/hand1"; data.item: "version" "123"; } } -group { name: "efl/cursor/blank"; data.item: "version" "123"; +group { name: "efl/cursor/blank"; + data.item: "version" "123"; parts { part { name: "efl.hotspot"; type: SWALLOW; description { state: "default" 0.0; diff --git a/data/elementary/themes/edc/efl/datepicker.edc b/data/elementary/themes/edc/efl/datepicker.edc index c84de86980..ce8986d6e0 100644 --- a/data/elementary/themes/edc/efl/datepicker.edc +++ b/data/elementary/themes/edc/efl/datepicker.edc @@ -17,60 +17,44 @@ Group: efl/datepicker/spin_button (@since 1.23) Signal: efl,state,disabled Signal: efl,state,enabled */ -group { "efl/datepicker"; data.item: "version" "123"; +group { "efl/datepicker"; + data.item: "version" "123"; parts { spacer { "base"; scale; desc { "default"; - min: 150 170; - } - } - rect { "base_bg"; - scale; - desc { "default"; - rel.to: "base"; - color_class: "datepicker_bg"; + min: 160 40; } } spacer { "padding_bg_top"; scale; desc { "default"; - min: 0 10; - max: -1 10; + min: 0 5; + max: -1 5; fixed: 0 1; - rel1 { - relative: 0.0 0.0; - to: "base_bg"; - } - rel2 { - relative: 1.0 0.0; - to: "base_bg"; - } + rel.to: "base"; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.0; align: 0.5 0.0; } } spacer { "padding_bg_bottom"; scale; desc { "default"; - min: 0 10; - max: -1 10; + min: 0 5; + max: -1 5; fixed: 0 1; - rel1 { - relative: 0.0 1.0; - to: "base_bg"; - } - rel2 { - relative: 1.0 1.0; - to: "base_bg"; - } + rel.to: "base"; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 1.0; align: 0.5 1.0; } } spacer { "bg"; scale; desc { "default"; - min: 150 150; - max: 150 150; + min: 160 40; + max: 160 40; rel1 { relative: 0.0 1.0; to: "padding_bg_top"; @@ -87,14 +71,9 @@ group { "efl/datepicker"; data.item: "version" "123"; min: 5 0; max: 5 -1; fixed: 1 0; - rel1 { - relative: 0.0 0.0; - to: "bg"; - } - rel2 { - relative: 0.0 1.0; - to: "bg"; - } + rel.to: "bg"; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 1.0; align: 0.0 0.0; } } @@ -104,15 +83,9 @@ group { "efl/datepicker"; data.item: "version" "123"; min: 5 0; max: 5 -1; fixed: 1 0; - rel2.to: "bg"; - rel1 { - relative: 1.0 0.0; - to: "bg"; - } - rel2 { - relative: 1.0 1.0; - to: "bg"; - } + rel.to: "bg"; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 1.0; align: 1.0 1.0; } } @@ -120,13 +93,10 @@ group { "efl/datepicker"; data.item: "version" "123"; mouse; scale; desc { "default"; - fixed: 1 0; + fixed: 1 1; min: 40 0; - rel1 { - relative: 1.0 0.0; - to: "padding_left"; - } - rel2.to: "padding_left"; + rel.to: "padding_left"; + rel1.relative: 1.0 0.0; align: 0.0 0.5; } } @@ -134,13 +104,10 @@ group { "efl/datepicker"; data.item: "version" "123"; scale; desc { "default"; fixed: 1 0; - min: 10 0; - max: 10 -1; - rel1 { - relative: 1.0 0.0; - to: "efl.field0"; - } - rel2.to: "efl.field0"; + min: 5 0; + max: 5 -1; + rel.to: "efl.field0"; + rel1.relative: 1.0 0.0; align: 0.0 0.5; } } @@ -148,7 +115,7 @@ group { "efl/datepicker"; data.item: "version" "123"; mouse; scale; desc { "default"; - fixed: 1 0; + fixed: 1 1; min: 40 0; rel1 { relative: 1.0 0.0; @@ -167,11 +134,8 @@ group { "efl/datepicker"; data.item: "version" "123"; fixed: 1 0; min: 10 0; max: 10 -1; - rel1.to: "efl.field2"; - rel2 { - relative: 0.0 1.0; - to: "efl.field2"; - } + rel.to: "efl.field2"; + rel2.relative: 0.0 1.0; align: 1.0 0.5; } } @@ -179,13 +143,10 @@ group { "efl/datepicker"; data.item: "version" "123"; mouse; scale; desc { "default"; - fixed: 1 0; + fixed: 1 1; min: 40 0; - rel1.to: "padding_right"; - rel2 { - relative: 0.0 1.0; - to: "padding_right"; - } + rel.to: "padding_right"; + rel2.relative: 0.0 1.0; align: 1.0 0.5; } } @@ -193,15 +154,15 @@ group { "efl/datepicker"; data.item: "version" "123"; repeat; desc { "default"; fixed: 1 1; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; color: 0 0 0 0; } } } } -group { "efl/datepicker/spin_button"; data.item: "version" "123"; +group { "efl/datepicker/spin_button"; + data.item: "version" "123"; parts { rect { "clip"; desc { "default"; @@ -211,13 +172,7 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123"; spacer { "base"; scale; desc { "default"; - min: 40 150; - } - } - rect { "bg"; - scale; - desc { "default"; - color_class: "spinner_bg"; + min: 20 60; } } rect { "access"; @@ -225,8 +180,7 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123"; desc { "default"; fixed: 1 1; color: 0 0 0 0; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; hid; } desc { "active"; @@ -238,8 +192,8 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123"; scale; desc { "default"; align: 0.5 0.0; - min: 40 40; - max: 40 40; + min: 20 20; + max: 20 20; fixed: 1 1; } } @@ -247,8 +201,8 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123"; scale; desc { "default"; align: 0.5 1.0; - min: 40 40; - max: 40 40; + min: 20 20; + max: 20 20; fixed: 1 1; } } @@ -256,8 +210,7 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123"; clip: "clip"; desc { "default"; fixed: 1 1; - rel1.to: "efl.text_button"; - rel2.to: "efl.text_button"; + rel.to: "efl.text_button"; hid; } desc { "active"; @@ -277,8 +230,8 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123"; to_y: "efl.dec_button"; relative: 1.0 0.0; } - min: 0 70; - max: -1 70; + min: 0 20; + max: -1 20; fixed: 0 1; } desc { "inactive"; @@ -300,51 +253,35 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123"; } } programs { - program { "entry_active"; - signal: "efl,entry,visible,on"; - source: "efl"; + program { signal: "efl,entry,visible,on"; source: "efl"; action: STATE_SET "active"; target: "efl.entry"; } - program { "entry_inactive"; - signal: "efl,entry,visible,off"; - source: "efl"; + program { signal: "efl,entry,visible,off"; source: "efl"; action: STATE_SET "default"; target: "efl.entry"; } - program { "text_button_active"; - signal: "efl,button,visible,on"; - source: "efl"; + program { signal: "efl,button,visible,on"; source: "efl"; action: STATE_SET "default"; target: "efl.text_button"; } - program { "text_button_inactive"; - signal: "efl,button,visible,off"; - source: "efl"; + program { signal: "efl,button,visible,off"; source: "efl"; action: STATE_SET "inactive"; target: "efl.text_button"; } - program { "access_activate"; - signal: "efl,state,access,active"; - source: "efl"; + program { signal: "efl,state,access,active"; source: "efl"; action: STATE_SET "active"; target: "access"; } - program { "access_inactivate"; - signal: "efl,state,access,inactive"; - source: "efl"; + program { signal: "efl,state,access,inactive"; source: "efl"; action: STATE_SET "default"; target: "access"; } - program { "disable"; - signal: "efl,state,disabled"; - source: "efl"; + program { signal: "efl,state,disabled"; source: "efl"; action: STATE_SET "disabled"; target: "disabler"; } - program { "enable"; - signal: "efl,state,enabled"; - source: "efl"; + program { signal: "efl,state,enabled"; source: "efl"; action: STATE_SET "default"; target: "disabler"; } diff --git a/data/elementary/themes/edc/efl/focus.edc b/data/elementary/themes/edc/efl/focus.edc index 32b5e6e564..d135632570 100644 --- a/data/elementary/themes/edc/efl/focus.edc +++ b/data/elementary/themes/edc/efl/focus.edc @@ -5,9 +5,8 @@ Group: efl/focus_highlight/top (@since 1.23) Signal: efl,state,animating,stopped Group: efl/focus_highlight/top:blank (@since 1.23) */ -group { name: "efl/focus_highlight/top"; data.item: "version" "123"; - images.image: "box_glow.png" COMP; - images.image: "box_outline.png" COMP; +group { name: "efl/focus_highlight/top"; + data.item: "version" "123"; data.item: "animate" "on"; script { public s_x, s_y, s_w, s_h; /* source */ @@ -34,14 +33,14 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123"; public update_offset(x, y, w, h) { set_state_val(PART:"base", STATE_REL1_OFFSET, x, y); - set_state_val(PART:"base", STATE_REL2_OFFSET, x + w, y + h); + set_state_val(PART:"base", STATE_REL2_OFFSET, x + w - 1, y + h - 1); } public message(Msg_Type:type, id, ...) { if ((type == MSG_INT_SET) && (id == 1)) { new x1, y1, w1, h1, x2, y2, w2, h2; new anim_id; - + anim_id = get_int(g_anim_id); if (anim_id != 0) { cancel_anim(anim_id); @@ -70,7 +69,7 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123"; set_state_val(PART:"base", STATE_REL2, 0.0, 0.0); update_offset(x1, y1, w1, h1); set_state(PART:"base", "custom", 0.0); - + anim_id = anim(0.2, "animator1", 1); set_int(g_anim_id, anim_id); } @@ -84,38 +83,106 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123"; } part { name: "clip"; type: RECT; description { state: "default" 0.0; - rel1.to: "glow"; - rel2.to: "glow"; + rel.to: "base"; + rel1.relative: -1.0 -1.0; + rel1.offset: -999 -999; + rel2.relative: 2.0 2.0; + rel2.offset: 999 999; color: 255 255 255 0; + visible: 0; } description { state: "visible" 0.0; inherit: "default" 0.0; color: 255 255 255 255; + visible: 1; } } - part { name: "glow"; mouse_events: 0; + part { name: "top"; type: RECT; clip_to: "clip"; + scale: 1; description { state: "default" 0.0; - image.normal: "box_glow.png"; - image.border: 12 12 12 12; - image.middle: 0; - fill.smooth: 0; - rel1.to: "base"; - rel1.offset: -7 -7; - rel2.to: "base"; - rel2.offset: 5 5; + rel.to: "base"; + color: 51 153 255 255; + rel2.relative: 1.0 0.0; + min: 4 4; + } + description { state: "hi" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } } - part { name: "sel"; mouse_events: 0; + part { name: "topl"; type: RECT; clip_to: "clip"; + scale: 1; description { state: "default" 0.0; - image.normal: "box_outline.png"; - image.border: 12 12 12 12; - image.middle: 0; - fill.smooth: 0; - rel1.to: "glow"; - rel2.to: "glow"; - color: 255 255 255 0; + rel.to: "top"; + color: 51 153 255 255; + rel1.relative: 0.0 1.0; + rel2.relative: 0.0 1.0; + align: 0.0 0.0; + min: 4 4; + } + description { state: "hi" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "topr"; type: RECT; + clip_to: "clip"; + scale: 1; + description { state: "default" 0.0; + rel.to: "top"; + color: 51 153 255 255; + rel1.relative: 1.0 1.0; + rel2.relative: 1.0 1.0; + align: 1.0 0.0; + min: 4 4; + } + description { state: "hi" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "bot"; type: RECT; + clip_to: "clip"; + scale: 1; + description { state: "default" 0.0; + rel.to: "base"; + color: 51 153 255 255; + rel1.relative: 0.0 1.0; + min: 4 4; + } + description { state: "hi" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "botl"; type: RECT; + clip_to: "clip"; + scale: 1; + description { state: "default" 0.0; + rel.to: "bot"; + color: 51 153 255 255; + rel1.relative: 0.0 0.0; + rel2.relative: 0.0 0.0; + align: 0.0 1.0; + min: 4 4; + } + description { state: "hi" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "botr"; type: RECT; + clip_to: "clip"; + scale: 1; + description { state: "default" 0.0; + rel.to: "bot"; + color: 51 153 255 255; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 0.0; + align: 1.0 1.0; + min: 4 4; } description { state: "hi" 0.0; inherit: "default" 0.0; @@ -124,8 +191,7 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123"; } } programs { - program { - signal: "efl,focus,visible,on"; source: "efl"; + program { signal: "efl,focus,visible,on"; source: "efl"; action: ACTION_STOP; target: "pulse"; target: "pulse2"; @@ -141,8 +207,7 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123"; program { name: "go3"; action: SIGNAL_EMIT "efl,focus,visible,on,done" "efl"; } - program { - signal: "efl,focus,visible,off"; source: "efl"; + program { signal: "efl,focus,visible,off"; source: "efl"; action: STATE_SET "default" 0.0; transition: DECELERATE 0.4; target: "clip"; @@ -161,24 +226,34 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123"; action: STATE_SET "hi" 0.0; transition: SINUSOIDAL 0.2; in: 3.0 0.0; - target: "sel"; + target: "top"; + target: "topl"; + target: "topr"; + target: "bot"; + target: "botl"; + target: "botr"; after: "pulse2"; } program { name: "pulse2"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.4; - target: "sel"; + target: "top"; + target: "topl"; + target: "topr"; + target: "bot"; + target: "botl"; + target: "botr"; after: "pulse"; } - program { - signal: "efl,state,animating,stopped"; source: "efl"; + program { signal: "efl,state,animating,stopped"; source: "efl"; action: STATE_SET "default" 0.0; target: "base"; } } } -group { name: "efl/focus_highlight/top:blank"; data.item: "version" "123"; +group { name: "efl/focus_highlight/top:blank"; + data.item: "version" "123"; parts { } } diff --git a/data/elementary/themes/edc/efl/frame.edc b/data/elementary/themes/edc/efl/frame.edc index 1844d25f22..7e967c48db 100644 --- a/data/elementary/themes/edc/efl/frame.edc +++ b/data/elementary/themes/edc/efl/frame.edc @@ -1,113 +1,85 @@ -group { name: "efl/frame"; data.item: "version" "123"; - images.image: "shadow_square_tiny.png" COMP; - images.image: "vgrad_med_curved.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "holes_tiny_vert.png" COMP; +group { name: "efl/frame"; + data.item: "version" "123"; + images.image: "win_shad_flat.png" COMP; parts { - part { name: "shadow"; mouse_events: 0; + part { name: "shadow"; type: RECT; description { state: "default" 0.0; - rel1.offset: -1 0; - rel2.offset: 0 1; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; + rel.to: "_sh1"; } - } - part { name: "base"; type: RECT; - description { state: "default" 0.0; - rel1.relative: 0.0 1.0; - rel1.offset: 2 0; - rel1.to_y: "top"; - rel2.offset: -3 -3; - color: 64 64 64 255; + description { state: "hidden" 0.0; + inherit; + visible: 0; } } - part { name: "top"; - description { state: "default" 0.0; - image.normal: "vgrad_med_curved.png"; - rel1.offset: 2 2; - rel2.to_y: "efl.text"; - rel2.offset: -3 -1; - fill.smooth: 0; - TILED_HORIZ(120) - } - } - part { name: "edge1"; + WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25); + part { name: "base"; type: RECT; + scale: 1; description { state: "default" 0.0; - image.normal: "holes_tiny_vert.png"; - rel1.offset: 4 0; - rel1.to_y: "efl.text"; - rel2.offset: 4 -1; - rel2.relative: 0.0 1.0; - rel2.to_y: "efl.text"; - align: 0.0 0.5; - FIXED_SIZE(3, 11) + rel1.offset: 6 6; + rel2.offset: -7 -7; + color: 80 80 80 255; + offscale; } } - part { name: "edge2"; + part { name: "top"; type: SPACER; + scale: 1; description { state: "default" 0.0; - image.normal: "holes_tiny_vert.png"; - rel1.offset: -5 0; - rel1.to_y: "efl.text"; - rel1.relative: 1.0 0.0; - rel2.offset: -5 -1; - rel2.relative: 1.0 1.0; + rel1.to: "base"; + rel2.to_x: "base"; rel2.to_y: "efl.text"; - align: 1.0 0.5; - FIXED_SIZE(3, 11) + rel2.offset: -1 3; + offscale; } } part { name: "efl.text"; type: TEXT; scale: 1; - effect: SHADOW BOTTOM; description { state: "default" 0.0; - color_class: "frame"; - rel1.relative: 1.0 0.0; - rel1.offset: 1 2; - rel1.to_x: "edge1"; - rel2.relative: 0.0 0.0; - rel2.offset: -3 1; - rel2.to_x: "edge2"; + rel1.offset: 4 4; + rel1.to: "base"; + rel2.relative: 1.0 0.0; + rel2.offset: -5 4; + rel2.to: "base"; align: 0.0 0.0; - color: FN_COL_DISABLE; + color: 255 255 255 255; text { font: FNBD; size: 10; - text_class: "frame"; align: 0.0 0.0; min: 0 1; } fixed: 0 1; + offscale; } } - part { name: "clip"; type: RECT; + part { name: "bg"; type: RECT; + scale: 1; description { state: "default" 0.0; + rel1.to_x: "base"; + rel1.to_y: "top"; rel1.relative: 0.0 1.0; - rel1.offset: 5 0; - rel1.to_y: "efl.text"; - rel2.offset: -7 -7; + rel2.to: "base"; + color: 64 64 64 255; + } + } + part { name: "clip"; type: RECT; + description { state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; } } part { name: "efl.content"; type: SWALLOW; clip_to: "clip"; + scale: 1; description { state: "default" 0.0; align: 0.0 1.0; - rel1.relative: 0.0 1.0; - rel1.offset: 5 0; - rel1.to_y: "efl.text"; - rel2.offset: -7 -7; + rel.to: "bg"; + rel1.offset: 4 4; + rel2.offset: -5 -5; + offscale; } description { state: "collapsed" 0.0; inherit: "default" 0.0; minmul: 1.0 0.0; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + rel1.offset: 4 0; + rel2.offset: -5 -1; } } part { name: "event"; type: RECT; ignore_flags: ON_HOLD; @@ -119,6 +91,7 @@ group { name: "efl/frame"; data.item: "version" "123"; } } programs { + EFL_UI_CLICKABLE_PART_BIND("event") program { name: "collapse"; action: STATE_SET "collapsed" 0.0; target: "efl.content"; @@ -131,9 +104,10 @@ group { name: "efl/frame"; data.item: "version" "123"; transition: DECELERATE 0.3; after: "signal"; } - EFL_UI_CLICKABLE_PART_BIND("event") - program { - signal: "efl,action,toggle"; source: "efl"; + program { signal: "mouse,up,1"; source: "event"; + action: SIGNAL_EMIT "efl,action,click" "efl"; + } + program { signal: "efl,action,toggle"; source: "efl"; script { new st[31]; new Float:vl; @@ -144,8 +118,7 @@ group { name: "efl/frame"; data.item: "version" "123"; run_program(PROGRAM:"expand"); } } - program { - signal: "efl,action,switch"; source: "efl"; + program { signal: "efl,action,switch"; source: "efl"; script { new st[31]; new Float:vl; diff --git a/data/elementary/themes/edc/efl/grid.edc b/data/elementary/themes/edc/efl/grid.edc index d312ee71db..5879f543ef 100644 --- a/data/elementary/themes/edc/efl/grid.edc +++ b/data/elementary/themes/edc/efl/grid.edc @@ -41,265 +41,163 @@ group { "efl/view_grid"; data.item: "version" "123"; } -group { "efl/grid_item"; data.item: "version" "124"; +group { "efl/grid_item"; + data.item: "version" "124"; data.item: "selectraise" "on"; data.item: "focusraise" "on"; - images.image: "bevel_dark_out.png" COMP; - images.image: "shadow_rounded_horiz.png" COMP; - images.image: "vgrad_med_dark.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; + data.item: "texts" "elm.text"; parts { +//--------------------------------------------------------------------------- +#define BASEP() \ + part { name: "base"; type: RECT; mouse_events: 0; \ + description { state: "default" 0.0; \ + color: 64 64 64 255; \ + } \ + } \ + part { name: "sel_base"; type: RECT; mouse_events: 0; \ + description { state: "default" 0.0; \ + color: 51 153 255 255; \ + visible: 0; \ + } \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + visible: 1; \ + } \ + } \ + program { signal: "efl,state,selected"; source: "efl"; \ + action: STATE_SET "selected" 0.0; \ + target: "sel_base"; \ + } \ + program { signal: "efl,state,unselected"; source: "efl"; \ + action: STATE_SET "default" 0.0; \ + target: "sel_base"; \ + } \ + program { signal: "efl,state,disabled"; source: "efl"; \ + action: STATE_SET "disabled" 0.0; \ + target: "event"; \ + } \ + program { signal: "efl,state,enabled"; source: "efl"; \ + action: STATE_SET "default" 0.0; \ + target: "event"; \ + } +#define TOPP() \ + part { name: "event"; type: RECT; \ + repeat_events: 1; \ + description { state: "default" 0.0; \ + color: 0 0 0 0; \ + } \ + description { state: "disabled" 0.0; \ + inherit: "default" 0.0; \ + visible: 0; \ + } \ + } \ + part { name: "event_block"; type: RECT; \ + description { state: "default" 0.0; \ + color: 0 0 0 0; \ + visible: 0; \ + } \ + description { state: "disabled" 0.0; \ + inherit: "default" 0.0; \ + visible: 1; \ + } \ + } \ + program { signal: "efl,state,disabled"; source: "efl"; \ + action: STATE_SET "disabled" 0.0; \ + target: "event_block"; \ + } \ + program { signal: "efl,state,enabled"; source: "efl"; \ + action: STATE_SET "default" 0.0; \ + target: "event_block"; \ + } +//--------------------------------------------------------------------------- + BASEP() - // BASE PARTS // - rect { "base"; mouse; - desc { "default"; - } - } - image { "bevel"; nomouse; - desc { "default"; - image.normal: "bevel_dark_out.png"; - image.border: 2 2 2 2; - image.middle: 0; - fill.smooth: 0; - } - } - image { "sel_shadow"; nomouse; - desc { "default"; - image.normal: "shadow_rounded_horiz.png"; - image.border: 0 0 9 9; - rel1.offset: 0 -4; - rel2.offset: -1 5; - fill.smooth: 0; - hid; - } - desc { "selected"; - inherit: "default"; - vis; - } - } - image { "sel_base"; nomouse; - desc { "default"; - image.normal: "vgrad_med_dark.png"; - fill.smooth: 0; - hid; - TILED_HORIZ(120) - } - desc { "selected"; - inherit: "default"; - vis; - } - } - image { "sel_bevel"; nomouse; - desc { "default"; - image.normal: "bevel_out.png"; - image.border: 2 2 2 2; - image.middle: 0; - fill.smooth: 0; - hid; - } - desc { "selected"; - inherit: "default"; - vis; - } - } - // BASE PARTS // - - // TEXT PARTS // - text { "efl.text"; nomouse; - effect: SHADOW BOTTOM; + //##// + part { name: "efl.text"; type: TEXT; mouse_events: 0; scale: 1; - desc { "default"; + description { state: "default" 0.0; fixed: 0 1; rel1.relative: 0.0 1.0; - rel1.offset: 5 -5; - rel2.relative: 1.0 1.0; + rel1.offset: 4 -5; rel2.offset: -5 -5; - color: FN_COL_DEFAULT; - color_class: "grid_item"; + color: 160 160 160 255; align: 0.5 1.0; + offscale; text { font: FN; size: 10; min: 0 1; align: 0.5 1.0; text_class: "grid_item"; } } - desc { "selected"; - inherit: "default"; - hid; + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } - desc { "disabled"; - inherit: "default"; - hid; + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 80 80 80 255; } } - text { "label2"; nomouse; - effect: SHADOW BOTTOM; - scale: 1; - desc { "default"; - rel1.to: "efl.text"; - rel2.to: "efl.text"; - color: FN_COL_DISABLE; - color_class: "grid_item_disabled"; - text { font: FN; size: 10; - text_source: "efl.text"; - align: 0.5 1.0; - text_class: "grid_item"; - } - hid; - } - desc { "selected"; - inherit: "default"; - hid; - } - desc { "disabled"; - inherit: "default"; - vis; - } + program { signal: "efl,state,selected"; source: "efl"; + action: STATE_SET "selected" 0.0; + target: "efl.text"; } - text { "label3"; nomouse; - effect: GLOW; - scale: 1; - desc { "default"; - rel1.offset: -2 -2; - rel1.to: "efl.text"; - rel2.offset: 1 0; - rel2.to: "efl.text"; - color: FN_COL_HIGHLIGHT; - color_class: "grid_item_selected"; - text { font: FN; size: 10; - text_source: "efl.text"; - align: 0.5 1.0; - text_class: "grid_item"; - } - hid; - } - desc { "selected"; - inherit: "default"; - vis; - } - desc { "disabled"; - inherit: "default"; - hid; - } + program { signal: "efl,state,unselected"; source: "efl"; + action: STATE_SET "default" 0.0; + target: "efl.text"; } - // TEXT PARTS // - - // CONTENT PARTS // - rect { "icon_area"; - desc { "default"; - fixed: 1 0; - rel1.offset: 2 2; + program { signal: "efl,state,disabled"; source: "efl"; + action: STATE_SET "disabled" 0.0; + target: "efl.text"; + target: "icon_area"; + } + program { signal: "efl,state,enabled"; source: "efl"; + action: STATE_SET "default" 0.0; + target: "efl.text"; + target: "icon_area"; + } + //##// + part { name: "icon_area"; type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1.offset: 4 4; rel2.to_y: "efl.text"; rel2.relative: 1.0 0.0; - rel2.offset: -3 -3; + rel2.offset: -5 -5; + offscale; } - desc { "disabled"; - inherit: "default"; + description { state: "disabled" 0.0; + inherit: "default" 0.0; color: 255 255 255 64; } } - rect { "event"; - desc { "default"; - color: 0 0 0 0; - } - desc { "disabled"; - inherit: "default"; - hid; - } - } - swallow { "efl.icon"; + part { name: "efl.icon"; type: SWALLOW; clip_to: "icon_area"; - desc { "default"; - rel1.to: "icon_area"; - rel2.to: "icon_area"; + description { state: "default" 0.0; + rel.to: "icon_area"; } } - swallow { "efl.extra"; + part { name: "efl.extra"; type: SWALLOW; + scale: 1; clip_to: "icon_area"; - desc { "default"; - fixed: 1 1; + description { state: "default" 0.0; + min: ICMIN ICMIN; align: 1.0 0.0; + rel.to: "icon_area"; rel1.relative: 1.0 0.0; - rel1.offset: -3 2; + rel1.offset: -5 4; rel2.relative: 1.0 0.0; - rel2.offset: -3 2; + rel2.offset: -5 4; + offscale; } } - // CONTENT PARTS // + //##// - // TOP PARTS // - image { "sel_shine"; nomouse; - desc { "default"; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "sel_base"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "sel_base"; - hid; - FIXED_SIZE(69, 5) - } - desc { "selected"; - inherit: "default"; - vis; - } - } - rect { "event_block"; - desc { "default"; - color: 0 0 0 0; - hid; - } - desc { "disabled"; - inherit: "default"; - vis; - } - } - // TOP PARTS // + TOPP() } programs { EFL_UI_CLICKABLE_PART_BIND("event") - program { - signal: "efl,state,selected"; source: "efl"; - action: STATE_SET "selected"; - target: "sel_shadow"; - target: "sel_base"; - target: "sel_bevel"; - target: "sel_shine"; - target: "efl.text"; - target: "label2"; - target: "label3"; - } - program { - signal: "efl,state,unselected"; source: "efl"; - action: STATE_SET "default"; - target: "sel_shadow"; - target: "sel_base"; - target: "sel_bevel"; - target: "sel_shine"; - target: "efl.text"; - target: "label2"; - target: "label3"; - } - program { - signal: "efl,state,disabled"; source: "efl"; - action: STATE_SET "disabled"; - target: "event"; - target: "event_block"; - target: "efl.text"; - target: "label2"; - target: "label3"; - target: "icon_area"; - } - program { - signal: "efl,state,enabled"; source: "efl"; - action: STATE_SET "default"; - target: "event"; - target: "event_block"; - target: "efl.text"; - target: "label2"; - target: "label3"; - target: "icon_area"; - } } } +#undef BASEP +#undef TOPP diff --git a/data/elementary/themes/edc/efl/group_item.edc b/data/elementary/themes/edc/efl/group_item.edc index 16d4c78b94..f19a720a83 100644 --- a/data/elementary/themes/edc/efl/group_item.edc +++ b/data/elementary/themes/edc/efl/group_item.edc @@ -7,56 +7,29 @@ Group: efl/group_item (@since 1.23) Signal: efl,state,enabled */ - -group { "efl/group_item"; data.item: "version" "124"; nomouse; program_source: "efl"; - images.image: "shadow_square_tiny.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "horizontal_separated_bar_small_glow.png" COMP; - +group { "efl/group_item"; + data.item: "version" "124"; + nomouse; + program_source: "efl"; parts { - image { "shadow_vbar"; - desc { "default"; - rel1.offset: -3 -2; - rel1.to: "base_vbar"; - rel2.offset: 2 4; - rel2.to: "base_vbar"; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; - } - } - image { "base_vbar"; - desc { "default"; - image.normal: "vgrad_med_lighter.png"; - fill.smooth: 0; - min: 5 13; - TILED_HORIZ(120) - } - } - image { "bevel_vbar"; + rect { "base"; desc { "default"; - rel1.to: "base_vbar"; - rel2.to: "base_vbar"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - min: 5 5; + color: 32 32 32 255; } } - text { "efl.text"; - effect: SHADOW BOTTOM; scale; desc { "default"; - rel1.offset: 2 3; + offscale; + min: 0 ICMIN; + rel1.offset: 4 4; rel1.relative: 1.0 0.0; rel1.to_x: "efl.icon"; - rel2.offset: -3 -3; + rel2.offset: -5 -5; rel2.relative: 0.0 1.0; rel2.to_x: "efl.extra"; - color: FN_COL_DEFAULT; - color_class: "list_group_item"; + align: 0.0 0.5; + color: 255 255 255 255; text { font: FNBD; size: 10; min: 1 1; ellipsis: -1; @@ -67,56 +40,33 @@ group { "efl/group_item"; data.item: "version" "124"; nomouse; program_source: " } desc { "disabled"; inherit: "default"; - color: FN_COL_DISABLE; - color_class: "list_group_item_disabled"; + color: 80 80 80 255; link.base: "efl,state,disabled"; } } - swallow { "pad"; mouse; - desc { "default"; - fixed: 1 0; - align: 0.0 0.5; - rel1.offset: 2 2; - rel2.relative: 0.0 1.0; - rel2.offset: 2 -3; - } - } swallow { "efl.icon"; mouse; + scale; desc { "default"; + offscale; + min: ICMIN ICMIN; fixed: 1 0; align: 0.0 0.5; - rel1.to_x: "pad"; - rel1.relative: 1.0 0.0; - rel1.offset: -1 2; - rel2.to_x: "pad"; - rel2.relative: 1.0 1.0; - rel2.offset: -1 -3; + rel1.relative: 0.0 0.0; + rel1.offset: 4 2; + rel2.relative: 0.0 1.0; + rel2.offset: 4 -3; } } swallow { "efl.extra"; mouse; + scale; desc { "default"; + offscale; + min: ICMIN ICMIN; fixed: 1 0; align: 1.0 0.5; - rel1.offset: -3 2; + rel1.offset: -5 4; rel1.relative: 1.0 0.0; - rel2.offset: -3 -3; - } - } - image { "bar"; - desc { "default"; - image.normal: "horizontal_separated_bar_small_glow.png"; - image.border: 4 4 4 4; - fill.smooth: 0; - fixed: 0 1; - rel1.relative: 0.0 1.0; - rel1.offset: -3 -6; - rel2.offset: 2 3; - link.base: "efl,state,enabled"; - } - desc { "disabled"; - inherit: "default"; - color: 255 255 255 64; - link.base: "efl,state,disabled"; + rel2.offset: -5 -5; } } } diff --git a/data/elementary/themes/edc/efl/image_zoomable.edc b/data/elementary/themes/edc/efl/image_zoomable.edc index 535cbbde6b..64d759a723 100644 --- a/data/elementary/themes/edc/efl/image_zoomable.edc +++ b/data/elementary/themes/edc/efl/image_zoomable.edc @@ -17,101 +17,22 @@ Group: efl/image_zoomable (@since 1.23) group { name: "efl/image_zoomable"; inherit: "efl/scroller"; data.item: "version" "123"; - images.image: "knob_round_busy.png" COMP; - images.image: "glow_round_corners.png" COMP; + IMAGE_RING("ringa", 160) + IMAGE_RING("ringb", 160) + IMAGE_RING("ringc", 160) parts { - part { name: "busy_clip"; type: RECT; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - } - description { state: "active" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "knob"; mouse_events: 0; - clip_to: "busy_clip"; + BUSY("base", "elm,state,pulse,started", "efl", "elm,state,pulse,stopped", "efl") + part { name: "base"; type: RECT; scale: 1; description { state: "default" 0.0; - image.normal: "knob_round_busy.png"; + color: 0 0 0 0; + rel1.offset: 4 4; + rel2.offset: -5 -5; + align: 1.0 1.0; min: 40 40; max: 40 40; - align: 0.0 0.0; - rel1.offset: 3 3; - rel2.offset: 3 3; - fixed: 1 1; + offscale; } } - part { name: "knob_spinner"; mouse_events: 0; - clip_to: "busy_clip"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "knob"; - rel2.to: "knob"; - image.normal: "glow_round_corners.png"; - map.on: 1; - map.smooth: 1; - map.rotation.center: "knob"; - } - description { state: "spin" 0.0; - inherit: "default" 0.0; - map.rotation.z: 360; - } - } - } - programs { - program { name: "spin"; - signal: "efl,state,busy,started"; source: "efl"; - action: ACTION_STOP; - target: "spin"; - target: "spin0"; - target: "spin1"; - target: "spin2"; - target: "spin3"; - target: "spin4"; - after: "spin0"; - } - program { name: "spin0"; - action: STATE_SET "default" 0.0; - target: "knob_spinner"; - after: "spin1"; - } - program { name: "spin1"; - action: STATE_SET "spin" 0.0; - transition: LINEAR 1.0; - target: "knob_spinner"; - after: "spin2"; - } - program { name: "spin2"; - action: STATE_SET "default" 0.0; - target: "knob_spinner"; - after: "spin1"; - } - - program { - signal: "efl,state,busy,started"; source: "efl"; - action: STATE_SET "active" 0.0; - transition: SINUSOIDAL 0.25; - target: "busy_clip"; - } - - program { - signal: "efl,state,busy,stopped"; source: "efl"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 1.0; - target: "busy_clip"; - after: "spin3"; - } - program { name: "spin3"; - action: ACTION_STOP; - target: "spin"; - target: "spin2"; - after: "spin4"; - } - program { name: "spin4"; - action: STATE_SET "default" 0.0; - target: "knob_spinner"; - } } } diff --git a/data/elementary/themes/edc/efl/text.edc b/data/elementary/themes/edc/efl/text.edc index 818ea79190..24116c2b65 100644 --- a/data/elementary/themes/edc/efl/text.edc +++ b/data/elementary/themes/edc/efl/text.edc @@ -522,23 +522,6 @@ group { "efl/text"; item: "guide.font.size" "10"; item: "guide.style.color" "#666"; } - sounds { - sample { name: "key-tap1" LOSSY 64; - source: "kbd-tap.wav"; - } - sample { name: "key-tap2" LOSSY 64; - source: "kbd-tap2.wav"; - } - sample { name: "key-tap3" LOSSY 64; - source: "kbd-tap3.wav"; - } - sample { name: "key-tap4" LOSSY 64; - source: "kbd-tap4.wav"; - } - sample { name: "key-tap5" LOSSY 64; - source: "kbd-tap5.wav"; - } - } styles { style { name: "efl_ui_text_guide_style"; base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0"; diff --git a/data/elementary/themes/edc/elm/actionslider.edc b/data/elementary/themes/edc/elm/actionslider.edc index c2ce9f0a80..655e09a46a 100644 --- a/data/elementary/themes/edc/elm/actionslider.edc +++ b/data/elementary/themes/edc/elm/actionslider.edc @@ -1,9 +1,4 @@ group { name: "elm/actionslider/base/default"; - images.image: "bevel_in.png" COMP; - images.image: "button_normal.png" COMP; - images.image: "button_clicked.png" COMP; - images.image: "glow_small.png" COMP; - images.image: "inset_shadow.png" COMP; parts { part { name: "bg"; type: RECT; mouse_events: 0; scale: 1; @@ -214,7 +209,6 @@ group { name: "elm/actionslider/base/default"; group { name: "elm/actionslider/base/bar"; inherit: "elm/actionslider/base/default"; - images.image: "horiz_glow_run_big.png" COMP; parts { part { name: "bar"; type: RECT; mouse_events: 0; insert_before: "elm.drag_button_base"; diff --git a/data/elementary/themes/edc/elm/button.edc b/data/elementary/themes/edc/elm/button.edc index 34c6a23c8d..7a0fe7405d 100644 --- a/data/elementary/themes/edc/elm/button.edc +++ b/data/elementary/themes/edc/elm/button.edc @@ -1425,9 +1425,6 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default"; group { name: "elm/button/base/spinner/decrease/vertical"; inherit: "elm/button/base/spinner/decrease/default"; alias: "elm/button/base/spin_button/decrease/vertical"; - images.image: "sym_down_light_normal.png" COMP; - images.image: "sym_down_glow_normal.png" COMP; - images.image: "sym_down_dark_normal.png" COMP; parts { part { name: "arrow.image"; description { state: "default" 0.0; diff --git a/data/elementary/themes/edc/elm/calendar.edc b/data/elementary/themes/edc/elm/calendar.edc index 9a9a4901a4..73bad621be 100644 --- a/data/elementary/themes/edc/elm/calendar.edc +++ b/data/elementary/themes/edc/elm/calendar.edc @@ -537,6 +537,7 @@ group { name: "elm/calendar/base/double_spinners"; } } +#undef CIT_STYLES #undef CAL_SPIN #undef CIT #undef CH diff --git a/data/elementary/themes/edc/elm/check.edc b/data/elementary/themes/edc/elm/check.edc index 11226d2195..635c94052b 100644 --- a/data/elementary/themes/edc/elm/check.edc +++ b/data/elementary/themes/edc/elm/check.edc @@ -1,12 +1,4 @@ group { name: "elm/check/base/default"; - sounds { - sample { name: "wood-tap1" LOSSY 64; - source: "wood-tap.wav"; - } - sample { name: "wood-tap2" LOSSY 64; - source: "wood-tap2.wav"; - } - } script { BUTTONMODE_SCRIPT } @@ -326,7 +318,6 @@ group { name: "elm/check/base/default"; } group { name: "elm/check/base/toggle"; - images.image: "check.png" COMP; script { public is_drag; public was_drag; diff --git a/data/elementary/themes/edc/elm/colorclass.edc b/data/elementary/themes/edc/elm/colorclass.edc index b6aff288b4..372a31673b 100644 --- a/data/elementary/themes/edc/elm/colorclass.edc +++ b/data/elementary/themes/edc/elm/colorclass.edc @@ -164,6 +164,7 @@ group { "elm/layout/colorclass/base"; program_source: "elm"; nobroadcast; } group { "colorclass/colors"; program_source: "elm"; nobroadcast; + images.image: "box_glow.png" COMP; parts { group { "color1"; source: "colorclass/color1"; desc { min: 1 1; max: 1 1; hid; diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc index 2f1bb8fb9e..5e6fbf7ef6 100644 --- a/data/elementary/themes/edc/elm/entry.edc +++ b/data/elementary/themes/edc/elm/entry.edc @@ -539,23 +539,6 @@ group { name: "elm/entry/anchor/default"; } group { name: "elm/entry/base/default"; - sounds { - sample { name: "key-tap1" LOSSY 64; - source: "kbd-tap.wav"; - } - sample { name: "key-tap2" LOSSY 64; - source: "kbd-tap2.wav"; - } - sample { name: "key-tap3" LOSSY 64; - source: "kbd-tap3.wav"; - } - sample { name: "key-tap4" LOSSY 64; - source: "kbd-tap4.wav"; - } - sample { name: "key-tap5" LOSSY 64; - source: "kbd-tap5.wav"; - } - } styles { style { name: "entry_style"; base: "font="FN" font_size=10 color=#a0a0a0 wrap=word text_class=entry_text color_class=entry_text left_margin=2 right_margin=2"; @@ -1147,23 +1130,6 @@ group { name: "elm/entry/handler/end/default"; } group { name: "elm/efl_ui_text/base/default"; - sounds { - sample { name: "key-tap1" LOSSY 64; - source: "kbd-tap.wav"; - } - sample { name: "key-tap2" LOSSY 64; - source: "kbd-tap2.wav"; - } - sample { name: "key-tap3" LOSSY 64; - source: "kbd-tap3.wav"; - } - sample { name: "key-tap4" LOSSY 64; - source: "kbd-tap4.wav"; - } - sample { name: "key-tap5" LOSSY 64; - source: "kbd-tap5.wav"; - } - } // data.item: "context_menu_orientation" "horizontal"; parts { part { name: "elm.swallow.background"; type: SWALLOW; diff --git a/data/elementary/themes/edc/elm/frame.edc b/data/elementary/themes/edc/elm/frame.edc index 263147ae84..23394651fd 100644 --- a/data/elementary/themes/edc/elm/frame.edc +++ b/data/elementary/themes/edc/elm/frame.edc @@ -69,9 +69,8 @@ group { name: "elm/frame/base/default"; scale: 1; description { state: "default" 0.0; align: 0.0 1.0; - rel1.to: "bg"; + rel.to: "bg"; rel1.offset: 4 4; - rel2.to: "bg"; rel2.offset: -5 -5; offscale; } @@ -103,12 +102,10 @@ group { name: "elm/frame/base/default"; transition: DECELERATE 0.3; after: "signal"; } - program { - signal: "mouse,up,1"; source: "event"; + program { signal: "mouse,up,1"; source: "event"; action: SIGNAL_EMIT "elm,action,click" "elm"; } - program { - signal: "elm,action,toggle"; source: "elm"; + program { signal: "elm,action,toggle"; source: "elm"; script { new st[31]; new Float:vl; @@ -119,8 +116,7 @@ group { name: "elm/frame/base/default"; run_program(PROGRAM:"expand"); } } - program { - signal: "elm,action,switch"; source: "elm"; + program { signal: "elm,action,switch"; source: "elm"; script { new st[31]; new Float:vl; @@ -168,11 +164,13 @@ group { name: "elm/frame/base/pad_medium"; inherit: "elm/frame/base/pad_small"; parts { part { name: "b0"; + scale: 1; description { state: "default" 0.0; min: 6 6; max: 6 6; } } part { name: "b1"; + scale: 1; description { state: "default" 0.0; min: 6 6; max: 6 6; } @@ -184,11 +182,13 @@ group { name: "elm/frame/base/pad_large"; inherit: "elm/frame/base/pad_small"; parts { part { name: "b0"; + scale: 1; description { state: "default" 0.0; min: 12 12; max: 12 12; } } part { name: "b1"; + scale: 1; description { state: "default" 0.0; min: 12 12; max: 12 12; } @@ -200,11 +200,13 @@ group { name: "elm/frame/base/pad_huge"; inherit: "elm/frame/base/pad_small"; parts { part { name: "b0"; + scale: 1; description { state: "default" 0.0; min: 24 24; max: 24 24; } } part { name: "b1"; + scale: 1; description { state: "default" 0.0; min: 24 24; max: 24 24; } @@ -213,9 +215,9 @@ group { name: "elm/frame/base/pad_huge"; } group { name: "elm/frame/base/outdent_top"; - images.image: "separator_horiz.png" COMP; parts { part { name: "elm.swallow.content"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; rel1.to_y: "base"; rel1.relative: 0.0 1.0; @@ -224,6 +226,7 @@ group { name: "elm/frame/base/outdent_top"; } } part { name: "base"; type: RECT; + scale: 1; description { state: "default" 0.0; fixed: 0 1; rel1.offset: 4 2; @@ -236,9 +239,9 @@ group { name: "elm/frame/base/outdent_top"; } group { name: "elm/frame/base/outdent_bottom"; - images.image: "separator_horiz.png" COMP; parts { part { name: "elm.swallow.content"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; rel1.offset: 4 4; rel2.to_y: "base"; @@ -247,6 +250,7 @@ group { name: "elm/frame/base/outdent_bottom"; } } part { name: "base"; type: RECT; + scale: 1; description { state: "default" 0.0; fixed: 0 1; rel1.offset: 4 -3; @@ -259,7 +263,6 @@ group { name: "elm/frame/base/outdent_bottom"; } group { name: "elm/frame/base/outline"; - images.image: "win_shad_flat.png" COMP; parts { part { name: "shadow"; type: RECT; description { state: "default" 0.0; diff --git a/data/elementary/themes/edc/elm/radio.edc b/data/elementary/themes/edc/elm/radio.edc index b564214b8e..6f7afd6109 100644 --- a/data/elementary/themes/edc/elm/radio.edc +++ b/data/elementary/themes/edc/elm/radio.edc @@ -285,7 +285,6 @@ group { name: "elm/radio/base/default"; group { name: "elm/radio/base/plain"; alias: "elm/check/base/plain"; - images.image: "win_shadow.png" COMP; script { public btmode; public eval_mode(m) { @@ -623,7 +622,6 @@ group { name: "elm/radio/base/plain"; group { name: "elm/radio/base/icon"; alias: "elm/check/base/icon"; - images.image: "win_shadow.png" COMP; script { public btmode; public eval_mode(m) { diff --git a/data/elementary/themes/edc/elm/slider.edc b/data/elementary/themes/edc/elm/slider.edc index 7752f0bc08..fa05040971 100644 --- a/data/elementary/themes/edc/elm/slider.edc +++ b/data/elementary/themes/edc/elm/slider.edc @@ -2906,796 +2906,4 @@ group { name: "elm/slider/range/vertical/default"; #undef MASKBITS #undef INVERT #undef DISABLE - - - - - - - - - -#if 0 - images.image: "slider_run_base_vert.png" COMP; - images.image: "slider_run_bevel_vert.png" COMP; - images.image: "slider_run_base_light_vert.png" COMP; - images.image: "vert_glow_run.png" COMP; - images.image: "vert_glow_range.png" COMP; - images.image: "vert_glow_run_rev.png" COMP; - images.image: "knob_round_small_normal.png" COMP; - images.image: "knob_round_small_selected.png" COMP; - set { name: "knob"; - // XXX: add more sizes (at least up to 128x128) - image { image: "knob_sz_24.png" COMP; size: 31 31 32 32; } - image { image: "knob_sz_22.png" COMP; size: 29 29 30 30; } - image { image: "knob_sz_20.png" COMP; size: 27 27 28 28; } - image { image: "knob_sz_18.png" COMP; size: 25 25 26 26; } - image { image: "knob_sz_16.png" COMP; size: 23 23 24 24; } - image { image: "knob_sz_14.png" COMP; size: 21 21 22 22; } - image { image: "knob_sz_12.png" COMP; size: 19 19 20 20; } - image { image: "knob_sz_10.png" COMP; size: 17 17 18 18; } - image { image: "knob_sz_08.png" COMP; size: 15 15 16 16; } - image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; } - image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; } - } -#define ICON 1 -#define LABEL 2 -#define END 4 -#define UNITS 8 -#define MASKBITS 15 -#define INVERT 16 -#define DISABLE 32 - script { - public slmode; - public range; - public g_timer_id; - public update_glow() - { - new x1,y1,w1,h1; - new x2,y2,w2,h2; - get_geometry(PART:"knob", x1, y1, w1, h1); - get_geometry(PART:"knob2", x2, y2, w2, h2); - if(y2 < y1) - set_state(PART:"glow", "range_reverse", 0.0); - else - set_state(PART:"glow", "range", 0.0); - } - public eval_mode(m) { - new ic = m & ICON; - new l = m & LABEL; - new e = m & END; - new u = m & UNITS; - new d = m & DISABLE; - new i = m & INVERT; - new r = get_int(range); - if (!r) { - if (i) { - if (!d) { - set_state(PART:"base", "default", 0.0); - set_state(PART:"glow", "inverted", 0.0); - } else { - set_state(PART:"base", "disabled", 0.0); - set_state(PART:"glow", "disabled_inverted", 0.0); - } - } else { - if (!d) { - set_state(PART:"base", "default", 0.0); - set_state(PART:"glow", "default", 0.0); - } else { - set_state(PART:"base", "disabled", 0.0); - set_state(PART:"glow", "disabled", 0.0); - } - } - } else if (d) { - new x1,y1,w1,h1; - new x2,y2,w2,h2; - get_geometry(PART:"knob", x1, y1, w1, h1); - get_geometry(PART:"knob2", x2, y2, w2, h2); - set_state(PART:"base", "disabled", 0.0); - if(y2 < y1) - set_state(PART:"glow", "disabled_range_reverse", 0.0); - else - set_state(PART:"glow", "disabled_range", 0.0); - } - if (l) { - if (!d) { - set_state(PART:"elm.text", "visible", 0.0); - } else { - set_state(PART:"elm.text", "disabled_visible", 0.0); - } - } else { - set_state(PART:"elm.text", "default", 0.0); - } - if (u) { - if (!d) { - set_state(PART:"elm.units", "visible", 0.0); - set_state(PART:"limits", "visible", 0.0); - } else { - set_state(PART:"elm.units", "disabled_visible", 0.0); - set_state(PART:"limits", "disabled_visible", 0.0); - } - } else { - set_state(PART:"elm.units", "default", 0.0); - set_state(PART:"limits", "default", 0.0); - } - if (ic) { - set_state(PART:"elm.swallow.icon", "visible", 0.0); - set_state(PART:"sizer_content", "visible", 0.0); - } else { - set_state(PART:"elm.swallow.icon", "default", 0.0); - set_state(PART:"sizer_content", "default", 0.0); - } - if (e) { - set_state(PART:"elm.swallow.end", "visible", 0.0); - set_state(PART:"sizer_content_end", "visible", 0.0); - } else { - set_state(PART:"elm.swallow.end", "default", 0.0); - set_state(PART:"sizer_content_end", "default", 0.0); - } - if (!d) { - set_state(PART:"event", "default", 0.0); - set_state(PART:"dis_clip", "default", 0.0); - } else { - set_state(PART:"event", "disabled", 0.0); - set_state(PART:"dis_clip", "disabled", 0.0); - } - } - } - parts { - part { name: "elm.swallow.bar"; type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - min: 21 42; - max: 21 99999; - align: 0.5 1.0; - rel1.to_y: "elm.text"; - rel1.relative: 0.0 1.0; - rel1.offset: 0 2; - rel2.to_y: "limits"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 -3; - } - } - part { name: "base"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.swallow.bar"; - rel2.to: "elm.swallow.bar"; - image.normal: "slider_run_base_vert.png"; - image.border: 0 0 4 4; - fill.smooth: 0; - min: 5 8; - max: 5 99999; - fixed: 1 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image.normal: "slider_run_base_light_vert.png"; - } - } - part { name: "glow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "vert_glow_run.png"; - rel1.offset: 1 1; - rel1.to: "base"; - rel2.relative: 1.0 0.5; - rel2.offset: -2 -1; - rel2.to_y: "button"; - rel2.to_x: "base"; - image.border: 0 0 0 4; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; - } - description { state: "inverted" 0.0; - image.normal: "vert_glow_run_rev.png"; - rel1.relative: 0.0 0.5; - rel1.offset: 1 0; - rel1.to_y: "button"; - rel1.to_x: "base"; - rel2.offset: -2 -2; - rel2.to: "base"; - image.border: 0 0 4 0; - } - description { state: "range" 0.0; - image.normal: "vert_glow_range.png"; - rel1.relative: 0.5 1.0; - rel1.offset: -1 -2; - rel1.to_x: "base"; - rel1.to_y: "button"; - rel2.relative: 0.5 1.0; - rel2.offset: -1 -2; - rel2.to_x: "base"; - rel2.to_y: "button2"; - fixed: 1 0; - image.border: 0 4 0 0; - } - description { state: "disabled_range" 0.0; - inherit: "range" 0.0; - color: 255 255 255 64; - } - description { state: "range_reverse" 0.0; - inherit: "range" 0.0; - rel1.to_y: "button2"; - rel2.to_y: "button"; - } - description { state: "disabled_range_reverse" 0.0; - inherit: "range_reverse" 0.0; - color: 255 255 255 64; - } - description { state: "disabled_inverted" 0.0; - inherit: "inverted" 0.0; - color: 255 255 255 64; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "slider_run_bevel_vert.png"; - image.border: 0 0 5 5; - fill.smooth: 0; - } - } - part { name: "dis_clip"; type: RECT; - description { state: "default" 0.0; - rel1.to: "elm.swallow.icon"; - rel2.to: "elm.swallow.end"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; - } - } - part { name: "elm.swallow.icon"; type: SWALLOW; - clip_to: "dis_clip"; - description { state: "default" 0.0; - visible: 0; - align: 0.5 0.0; - rel1.offset: 2 0; - rel1.to_x: "elm.swallow.bar"; - rel2.offset: -3 -1; - rel2.relative: 1.0 0.0; - rel2.to_x: "elm.swallow.bar"; - fixed: 0 1; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - aspect: 1.0 1.0; aspect_preference: VERTICAL; - rel1.offset: 2 2; - rel2.offset: -3 2; - } - } - part { name: "sizer_content"; type: TEXT; mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - text { font: FN; size: 10; - min: 0 0; - text_class: "slider_text"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1.to: "elm.swallow.icon"; - rel2.to: "elm.swallow.icon"; - text { - min: 1 1; - ellipsis: -1; - text: SPACER_TEXT; - } - } - } - part { name: "elm.text"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; - scale: 1; - description { state: "default" 0.0; - fixed: 0 1; - align: 0.5 0.0; - rel1.to_y: "elm.swallow.icon"; - rel1.relative: 0.0 1.0; - rel1.offset: 2 -1; - rel2.to_y: "elm.swallow.icon"; - rel2.relative: 1.0 1.0; - rel2.offset: -3 -1; - color: FN_COL_DEFAULT; - color_class: "slider_text"; - text { font: FN; size: 10; - text_class: "slider"; - min: 1 0; - ellipsis: -1; - align: 0.5 0.0; - } - visible: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - rel1.offset: 2 2; - rel2.offset: -3 2; - text.min: 1 1; - text.ellipsis: -1; - - } - description { state: "disabled_visible" 0.0; - inherit: "visible" 0.0; - color_class: "slider_text_disabled"; - color3: 255 255 255 255; - } - } - part { name: "elm.swallow.end"; type: SWALLOW; - clip_to: "dis_clip"; - description { state: "default" 0.0; - visible: 0; - align: 0.5 1.0; - rel1.offset: 2 0; - rel1.relative: 0.0 1.0; - rel2.offset: -3 -1; - fixed: 0 1; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - rel2.offset: 2 -3; - rel2.offset: -3 -3; - } - } - part { name: "sizer_content_end"; type: TEXT; mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - text { font: FN; size: 10; - min: 0 0; - text_class: "slider_text"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1.to: "elm.swallow.end"; - rel2.to: "elm.swallow.end"; - text { - min: 1 1; - ellipsis: -1; - text: SPACER_TEXT; - } - } - } - alias: "elm.units.min" "limits:elm.units.min"; - alias: "elm.units.max" "limits:elm.units.max"; - part { name: "limits"; type: GROUP; mouse_events: 0; - source: "elm/slider/hidden/limit"; - scale: 1; - description { state: "default" 0.0; - align: 0.5 1.0; - fixed: 1 1; - max: 0 0; - rel1.to_y: "elm.swallow.end"; - rel1.relative: 0.0 0.0; - rel1.offset: 2 1; - rel2.to_y: "elm.swallow.end"; - rel2.relative: 1.0 0.0; - rel2.offset: -3 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - min: SOURCE; - rel1.offset: 2 -3; - rel2.offset: -3 -3; - } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - rel1.offset: -3 2; - rel2.offset: -3 -3; - color: 255 255 255 64; - } - } - part { name: "elm.units"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; - scale: 1; - description { state: "default" 0.0; - visible: 0; - fixed: 1 1; - rel1.to_y: "limits"; - rel2.to_y: "limits"; - color: FN_COL_DEFAULT; - color_class: "slider_text"; - text { font: FN; size: 10; - text_class: "slider"; - min: 0 0; - align: 0.5 1.0; - ellipsis: -1; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - text.min: 1 1; - text.ellipsis: -1; - } - description { state: "disabled_visible" 0.0; - inherit: "visible" 0.0; - color_class: "slider_text_disabled"; - color3: 255 255 255 255; - } - } - part { name: "button"; type: GROUP; mouse_events: 0; - source: "elm/slider/vertical/indicator/default"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "elm.dragable.slider"; - rel2.to: "elm.dragable.slider"; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "elm.dragable.slider"; type: RECT; - scale: 1; - nomouse; - dragable.x: 0 0 0; - dragable.y: 1 1 0; - dragable.confine: "elm.swallow.bar"; - description { state: "default" 0.0; - color: 0 0 0 0; - min: 16 16; - max: 16 16; - fixed: 1 1; - rel1.relative: 0.0 0.5; - rel1.to_x: "elm.swallow.bar"; - rel2.relative: 1.0 0.5; - rel2.to_x: "elm.swallow.bar"; - } - } - part { name: "knob"; - nomouse; - description { state: "default" 0.0; - image.normal: "knob"; - fixed: 1 1; - min: 12 12; - step: 2 2; - max: 32 32; // XXX allow bigger sizes with more knob images - rel1.to: "elm.dragable.slider"; - rel1.offset: -4 -4; - rel2.to: "elm.dragable.slider"; - rel2.offset: 3 3; - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - } - } - part { name: "slideevent"; type: RECT; repeat_events: 1; - scale: 1; - nomouse; - ignore_flags: ON_HOLD; - dragable.events: "elm.dragable.slider"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "elm.dragable.slider"; - rel2.to: "elm.dragable.slider"; - color: 0 0 0 0; - } - } - part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.dragable.slider"; - rel2.to: "elm.dragable.slider"; - } - } - part { name: "button2"; type: GROUP; mouse_events: 0; - source: "elm/slider/vertical/indicator/default"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "elm.dragable2.slider"; - rel2.to: "elm.dragable2.slider"; - visible: 0; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "elm.dragable2.slider"; type: RECT; - scale: 1; - nomouse; - dragable.x: 0 0 0; - dragable.y: 1 1 0; - dragable.confine: "elm.swallow.bar"; - description { state: "default" 0.0; - color: 0 0 0 0; - min: 16 16; - max: 16 16; - fixed: 1 1; - rel1.relative: 0.0 0.5; - rel1.to_x: "elm.swallow.bar"; - rel2.relative: 1.0 0.5; - rel2.to_x: "elm.swallow.bar"; - visible: 0; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "knob2"; - nomouse; - description { state: "default" 0.0; - image.normal: "knob"; - fixed: 1 1; - min: 12 12; - step: 2 2; - max: 32 32; // XXX allow bigger sizes with more knob images - rel1.to: "elm.dragable2.slider"; - rel1.offset: -4 -4; - rel2.to: "elm.dragable2.slider"; - rel2.offset: 3 3; - visible: 0; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - } - } - part { name: "slideevent2"; type: RECT; repeat_events: 1; - scale: 1; - nomouse; - ignore_flags: ON_HOLD; - dragable.events: "elm.dragable2.slider"; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "elm.dragable2.slider"; - rel2.to: "elm.dragable2.slider"; - color: 0 0 0 0; - visible: 0; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "elm.track2.slider"; type: SWALLOW; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.dragable2.slider"; - rel2.to: "elm.dragable2.slider"; - visible: 0; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "event"; type: RECT; - description { state: "default" 0.0; - color: 0 0 0 0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - } - programs { - program { - signal: "mouse,down,1"; source: "elm.dragable.slider"; - action: STATE_SET "clicked" 0.0; - target: "knob"; - } - program { - signal: "mouse,up,1"; source: "elm.dragable.slider"; - action: STATE_SET "default" 0.0; - target: "knob"; - } - program { - signal: "elm,slider,range,enable"; - source: "elm"; - script { - set_int(range, 1); - set_state(PART:"button2", "show", 0.0); - set_state(PART:"elm.dragable2.slider", "show", 0.0); - set_state(PART:"knob2", "show", 0.0); - set_state(PART:"slideevent2", "show", 0.0); - set_state(PART:"elm.track2.slider", "show", 0.0); - update_glow(); - new m = get_int(slmode); - eval_mode(m); - } - } - program { - signal: "elm,slider,range,disable"; - source: "elm"; - script { - set_int(range, 0); - set_state(PART:"button2", "default", 0.0); - set_state(PART:"elm.dragable2.slider", "default", 0.0); - set_state(PART:"knob2", "default", 0.0); - set_state(PART:"slideevent2", "default", 0.0); - set_state(PART:"elm.track2.slider", "default", 0.0); - set_state(PART:"glow", "default", 0.0); - new m = get_int(slmode); - eval_mode(m); - } - } - program { - signal: "drag"; - source: "elm.dragable*"; - script { - new r; - r = get_int(range); - if (r) - update_glow(); - } - } - program { - signal: "elm,state,indicator,show"; source: "elm"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; - after: "popup_show2"; - } - program { - signal: "elm,state,indicator,hide"; source: "elm"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; - after: "popup_hide2"; - } - program { - signal: "mouse,down,1"; source: "slideevent"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; - after: "popup_show2"; - } - program { name: "popup_show2"; - action: STATE_SET "hidden" 0.0; - target: "button"; - } - program { - signal: "mouse,up,1"; source: "slideevent"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; - after: "popup_hide2"; - } - program { name: "popup_hide2"; - action: STATE_SET "default" 0.0; - target: "button"; - } - program { - signal: "mouse,down,1"; source: "slideevent2"; - action: SIGNAL_EMIT "elm,popup,show" "elm"; - after: "popup2_show2"; - } - program { name: "popup2_show2"; - action: STATE_SET "show" 0.0; - target: "button2"; - } - program { - signal: "mouse,up,1"; source: "slideevent2"; - action: SIGNAL_EMIT "elm,popup,hide" "elm"; - after: "popup2_hide2"; - } - program { name: "popup2_hide2"; - action: STATE_SET "hidden" 0.0; - target: "button2"; - } - program { - signal: "elm,state,text,visible"; source: "elm"; - script { - new m = get_int(slmode); - m |= LABEL; set_int(slmode, m); - eval_mode(m); - } - } - program { - signal: "elm,state,text,hidden"; source: "elm"; - script { - new m = get_int(slmode); - m &= ~LABEL; set_int(slmode, m); - eval_mode(m); - } - } - program { - signal: "elm,state,icon,visible"; source: "elm"; - script { - new m = get_int(slmode); - m |= ICON; set_int(slmode, m); - eval_mode(m); - } - } - program { - signal: "elm,state,icon,hidden"; source: "elm"; - script { - new m = get_int(slmode); - m &= ~ICON; set_int(slmode, m); - eval_mode(m); - } - } - program { name: "end_show"; - signal: "elm,state,end,visible"; source: "elm"; - script { - new m = get_int(slmode); - m |= END; set_int(slmode, m); - eval_mode(m); - } - } - program { name: "end_hide"; - signal: "elm,state,end,hidden"; source: "elm"; - script { - new m = get_int(slmode); - m &= ~END; set_int(slmode, m); - eval_mode(m); - } - } - program { - signal: "elm,state,units,visible"; source: "elm"; - script { - new m = get_int(slmode); - m |= UNITS; set_int(slmode, m); - eval_mode(m); - } - } - program { - signal: "elm,state,units,visible"; source: "elm"; - action: SIGNAL_EMIT "limits:limits,visible" "elm"; - } - program { - signal: "elm,state,units,hidden"; source: "elm"; - action: STATE_SET "default" 0.0; - script { - new m = get_int(slmode); - m &= ~UNITS; set_int(slmode, m); - eval_mode(m); - } - } - program { - signal: "elm,state,units,hidden"; source: "elm"; - action: SIGNAL_EMIT "limits:limits,hide" "elm"; - } - program { - signal: "elm,state,inverted,on"; source: "elm"; - script { - new m = get_int(slmode); - m |= INVERT; set_int(slmode, m); - eval_mode(m); - } - } - program { - signal: "elm,state,inverted,off"; source: "elm"; - script { - new m = get_int(slmode); - m &= ~INVERT; set_int(slmode, m); - eval_mode(m); - } - } - program { - signal: "elm,state,disabled"; source: "elm"; - script { - new m = get_int(slmode); - m |= DISABLE; set_int(slmode, m); - eval_mode(m); - } - } - program { - signal: "elm,state,enabled"; source: "elm"; - script { - new m = get_int(slmode); - m &= ~DISABLE; set_int(slmode, m); - eval_mode(m); - } - } - } -#undef ICON -#undef LABEL -#undef END -#undef UNITS -#undef MASKBITS -#undef INVERT -#undef DISABLE -#endif } diff --git a/data/elementary/themes/edc/elm/thumb.edc b/data/elementary/themes/edc/elm/thumb.edc index 57d1f6f05f..f35865fd6d 100644 --- a/data/elementary/themes/edc/elm/thumb.edc +++ b/data/elementary/themes/edc/elm/thumb.edc @@ -1,7 +1,5 @@ group { name: "elm/thumb/base/default"; - images.image: "knob_round_busy.png" COMP; - images.image: "glow_round_corners.png" COMP; - images.image: "shadow_square_tiny.png" COMP; + images.image: "win_shadow.png" COMP; parts { part { name: "shadow"; mouse_events: 0; scale: 1; diff --git a/data/elementary/themes/edc/init.edc b/data/elementary/themes/edc/init.edc index 948aae03b4..e39d2c802e 100644 --- a/data/elementary/themes/edc/init.edc +++ b/data/elementary/themes/edc/init.edc @@ -1,9 +1,4 @@ group { name: "e/init/splash"; - sounds { - sample { name: "splash" LOSSY 256; - source: "splash.wav"; - } - } set { name: "logo_mono"; image { image: "logo.png" COMP; size: 601 601 99999 99999; } image { image: "logo2.png" COMP; size: 301 301 600 600; } diff --git a/data/elementary/themes/img/about-flat-bg.png b/data/elementary/themes/img/about-flat-bg.png Binary files differnew file mode 100644 index 0000000000..24f5138115 --- /dev/null +++ b/data/elementary/themes/img/about-flat-bg.png diff --git a/data/elementary/themes/img/about-flat-bg.svg b/data/elementary/themes/img/about-flat-bg.svg new file mode 100644 index 0000000000..8c1c5b5e1f --- /dev/null +++ b/data/elementary/themes/img/about-flat-bg.svg @@ -0,0 +1,148 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="80" + height="80" + viewBox="0 0 21.166667 21.166667" + version="1.1" + id="svg8" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + sodipodi:docname="about-flat-bg.svg"> + <defs + id="defs2"> + <filter + inkscape:collect="always" + style="color-interpolation-filters:sRGB" + id="filter969" + x="-0.108" + width="1.216" + y="-0.108" + height="1.216"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="1.23825" + id="feGaussianBlur971" /> + </filter> + <filter + inkscape:collect="always" + style="color-interpolation-filters:sRGB" + id="filter975" + x="-0.092159999" + width="1.18432" + y="-0.18432" + height="1.36864"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="1.05664" + id="feGaussianBlur977" /> + </filter> + <filter + inkscape:collect="always" + style="color-interpolation-filters:sRGB" + id="filter981" + x="-0.12672" + width="1.25344" + y="-0.11926588" + height="1.2385318"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.89408002" + id="feGaussianBlur983" /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#404040" + bordercolor="#202020" + borderopacity="1" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:zoom="7.60625" + inkscape:cx="66.732809" + inkscape:cy="40.45743" + inkscape:document-units="px" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + showgrid="true" + units="px" + inkscape:showpageshadow="false" + borderlayer="true" + inkscape:window-width="2560" + inkscape:window-height="1377" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid833" + empspacing="4" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <rect + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:2.65159;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0" + id="rect841" + width="23.283335" + height="24.341665" + x="-1.0583334" + y="-1.0583334" /> + <path + id="path823" + style="fill:#000000;fill-opacity:1;stroke-width:0.2887" + d="M -5.4921875 56 C -5.2682571 56.223926 -5.0442441 56.447949 -4.8203125 56.671875 C -5.7541204 57.605672 -6.6872972 58.53886 -7.6210938 59.472656 L -7.6210938 60.615234 C -6.4967901 59.491127 -5.3723618 58.366295 -4.2480469 57.242188 C -3.0775726 58.412518 -1.9067873 59.583579 -0.73632812 60.753906 C -1.9067987 61.92435 -3.0775726 63.0952 -4.2480469 64.265625 C -4.7379266 63.775757 -5.2288665 63.28479 -5.71875 62.794922 C -5.038333 62.11435 -4.35814 61.434478 -3.6777344 60.753906 C -3.8682604 60.563418 -4.0575247 60.372133 -4.2480469 60.181641 C -5.1189672 61.052886 -5.9900374 61.924039 -6.8613281 62.794922 C -5.9902226 63.665789 -5.1191373 64.537321 -4.2480469 65.408203 C -2.6965319 63.856764 -1.1452309 62.305349 0.40625 60.753906 C -1.1783963 59.169361 -2.7630033 57.584543 -4.3476562 56 L -5.4921875 56 z M -0.064453125 56 C -0.28839446 56.223984 -0.51238464 56.44789 -0.73632812 56.671875 C 0.13459596 57.542841 1.0040873 58.414191 1.875 59.285156 L 4.4882812 56.671875 C 4.2975663 56.481387 4.1067041 56.290101 3.9160156 56.099609 C 3.23561 56.779973 2.5553905 57.460261 1.875 58.140625 C 1.3851165 57.650753 0.89614857 57.161743 0.40625 56.671875 C 0.63021919 56.447884 0.85415762 56.223991 1.078125 56 L -0.064453125 56 z M 6.7558594 56 C 6.9797766 56.223951 7.2038303 56.447909 7.4277344 56.671875 C 4.0253659 60.0743 0.62307158 63.476466 -2.7792969 66.878906 C -1.2276194 68.430149 0.32367026 69.981609 1.875 71.533203 C 2.7459241 70.661958 3.6170095 69.790804 4.4882812 68.919922 C 3.6170095 68.049039 2.7459241 67.177886 1.875 66.306641 C 1.684474 66.497356 1.4951946 66.688188 1.3046875 66.878906 C 1.9850818 67.559255 2.6653126 68.239562 3.3457031 68.919922 C 2.8558197 69.409805 2.3648835 69.898804 1.875 70.388672 C 0.70452947 69.218439 -0.46429509 68.049135 -1.6347656 66.878906 C 1.5770995 63.666984 4.7881349 60.454106 8 57.242188 C 9.1704592 58.412518 10.34126 59.583579 11.511719 60.753906 C 10.34143 61.924532 9.1706368 63.095366 8 64.265625 C 7.5101052 63.775757 7.0211335 63.28479 6.53125 62.794922 C 7.211667 62.11435 7.8918486 61.434478 8.5722656 60.753906 C 8.3817396 60.563418 8.190492 60.372133 8 60.181641 C 7.1290759 61.052708 6.2576277 61.923843 5.3867188 62.794922 L 8 65.408203 C 9.5516926 63.856945 11.102982 62.305546 12.654297 60.753906 C 11.069307 59.168994 9.4834268 57.584919 7.8984375 56 L 6.7558594 56 z M 10.839844 56 C 11.934705 57.09492 13.030194 58.190181 14.125 59.285156 C 14.996109 58.414191 15.867172 57.542841 16.738281 56.671875 C 16.514366 56.447877 16.290345 56.223973 16.066406 56 L 14.921875 56 C 15.145807 56.223921 15.369818 56.447952 15.59375 56.671875 C 15.1037 57.161758 14.615054 57.650742 14.125 58.140625 C 13.411624 57.42718 12.69774 56.713453 11.984375 56 L 10.839844 56 z M 19.005859 56 C 19.229814 56.223957 19.453779 56.447918 19.677734 56.671875 C 16.275351 60.0743 12.871134 63.476466 9.46875 66.878906 C 11.020427 68.430153 12.573674 69.981609 14.125 71.533203 C 14.996109 70.662139 15.867172 69.790986 16.738281 68.919922 C 15.867172 68.048854 14.996109 67.177689 14.125 66.306641 C 13.934512 66.497356 13.743241 66.688195 13.552734 66.878906 C 14.233306 67.559274 14.913178 68.239546 15.59375 68.919922 C 15.1037 69.409817 14.615054 69.898773 14.125 70.388672 C 12.954715 69.218439 11.78357 68.049127 10.613281 66.878906 C 11.783585 65.708368 12.9547 64.5377 14.125 63.367188 C 15.975876 65.218075 17.826847 67.069034 19.677734 68.919922 C 17.826847 70.770836 15.975876 72.621742 14.125 74.472656 C 10.722628 71.070216 7.320341 67.668069 3.9179688 64.265625 C 3.7274806 64.456113 3.5362253 64.645442 3.3457031 64.835938 C 4.7066959 66.196983 6.0667568 67.558903 7.4277344 68.919922 C 5.5768582 70.770836 3.7258762 72.621742 1.875 74.472656 C -1.2906944 71.306947 -4.4553955 68.140308 -7.6210938 64.974609 L -7.6210938 66.119141 C -6.6872972 67.052922 -5.7541241 67.986137 -4.8203125 68.919922 C -5.754109 69.853563 -6.6872972 70.787073 -7.6210938 71.720703 L -7.6210938 72.863281 C -6.4967901 71.738978 -5.3723618 70.616491 -4.2480469 69.492188 C -2.3971707 71.34309 -0.54620003 73.192077 1.3046875 75.042969 C 0.13420185 76.213394 -1.0365456 77.384255 -2.2070312 78.554688 C -3.3773317 77.384255 -4.5484458 76.213394 -5.71875 75.042969 C -5.2288665 74.553097 -4.7379303 74.064091 -4.2480469 73.574219 C -3.5676563 74.254598 -2.8874218 74.934874 -2.2070312 75.615234 C -2.0165053 75.424746 -1.8252727 75.233461 -1.6347656 75.042969 C -2.5056746 74.171999 -3.3771379 73.302606 -4.2480469 72.431641 C -5.1191373 73.302606 -5.9902226 74.171999 -6.8613281 75.042969 C -5.309817 76.594393 -3.7585273 78.145845 -2.2070312 79.697266 C 1.195341 76.294946 4.5976127 72.894514 8 69.492188 C 9.8508724 71.34309 11.701862 73.192077 13.552734 75.042969 C 12.382434 76.213394 11.211305 77.384255 10.041016 78.554688 C 8.8705338 77.384255 7.7017357 76.213394 6.53125 75.042969 C 7.0211335 74.553097 7.5101014 74.064091 8 73.574219 C 8.680572 74.254598 9.3604285 74.934874 10.041016 75.615234 C 10.231504 75.424746 10.422763 75.233461 10.613281 75.042969 C 9.7421758 74.171999 8.8710904 73.302606 8 72.431641 C 7.1290721 73.302606 6.2576277 74.171999 5.3867188 75.042969 C 6.9380485 76.594578 8.4893382 78.146019 10.041016 79.697266 C 13.443388 76.294946 16.84566 72.894514 20.248047 69.492188 C 22.098923 71.34309 23.949909 73.192077 25.800781 75.042969 C 24.630144 76.213243 23.461316 77.384081 22.291016 78.554688 C 21.120715 77.384081 19.949937 76.213243 18.779297 75.042969 C 19.26935 74.55307 19.757993 74.064106 20.248047 73.574219 C 20.928449 74.254598 21.610614 74.934874 22.291016 75.615234 C 22.481504 75.424746 22.670821 75.233461 22.861328 75.042969 C 21.990415 74.171999 21.118956 73.302606 20.248047 72.431641 C 19.376953 73.302606 18.505871 74.171999 17.634766 75.042969 C 19.186095 76.594578 20.739338 78.146019 22.291016 79.697266 C 25.693388 76.294946 29.095674 72.894514 32.498047 69.492188 C 34.348919 71.34309 36.199893 73.192077 38.050781 75.042969 C 36.880294 76.213394 35.709548 77.384255 34.539062 78.554688 C 33.368773 77.384255 32.197644 76.213394 31.027344 75.042969 C 31.517227 74.553097 32.008163 74.064091 32.498047 73.574219 C 33.178437 74.254598 33.858672 74.934874 34.539062 75.615234 C 34.729588 75.424746 34.918868 75.233461 35.109375 75.042969 C 34.238462 74.171999 33.368956 73.302606 32.498047 72.431641 C 31.626953 73.302606 30.755857 74.171999 29.884766 75.042969 C 32.797251 77.955435 35.708608 80.868784 38.621094 83.78125 C 39.492188 82.910186 40.363281 82.039025 41.234375 81.167969 C 40.363281 80.296992 39.492188 79.425657 38.621094 78.554688 C 38.430568 78.745176 38.241288 78.936461 38.050781 79.126953 C 38.731172 79.807427 39.411395 80.487495 40.091797 81.167969 C 39.601883 81.658026 39.110992 82.148618 38.621094 82.638672 C 37.450611 81.468122 36.279857 80.297507 35.109375 79.126953 C 36.280027 77.956694 37.450788 76.785856 38.621094 75.615234 C 40.47197 77.466145 42.322952 79.317051 44.173828 81.167969 L 33.966797 91.375 C 34.175139 91.583347 34.383455 91.791652 34.591797 92 L 35.734375 92 C 35.526058 91.791674 35.317692 91.583326 35.109375 91.375 C 36.279846 90.204752 37.450622 89.035486 38.621094 87.865234 C 40.000015 89.243851 41.379079 90.621197 42.757812 92 L 43.900391 92 C 42.331245 90.4308 40.762502 88.862171 39.193359 87.292969 C 41.044232 85.44207 42.895206 83.591129 44.746094 81.740234 C 45.916394 82.910841 47.087161 84.079741 48.257812 85.25 C 47.087331 86.42052 45.916561 87.59121 44.746094 88.761719 C 44.25618 88.271684 43.765304 87.783015 43.275391 87.292969 C 43.955811 86.612518 44.636001 85.930462 45.316406 85.25 C 45.12588 85.059512 44.936601 84.870198 44.746094 84.679688 C 43.875181 85.550653 43.003725 86.421999 42.132812 87.292969 C 43.003725 88.164033 43.875181 89.035182 44.746094 89.90625 C 46.297798 88.35495 47.849121 86.801749 49.400391 85.25 C 45.998007 81.847666 42.595743 78.445311 39.193359 75.042969 C 41.044232 73.192081 42.895206 71.341133 44.746094 69.490234 L 44.765625 69.511719 L 44.787109 69.53125 C 46.624375 71.368527 48.461551 73.20568 50.298828 75.042969 C 49.128528 76.213398 47.957398 77.384255 46.787109 78.554688 C 45.616624 77.384255 44.445876 76.213398 43.275391 75.042969 C 43.765274 74.5531 44.256195 74.064091 44.746094 73.574219 C 45.426666 74.254598 46.106522 74.934874 46.787109 75.615234 C 46.977598 75.424746 47.168868 75.233461 47.359375 75.042969 C 46.48827 74.172003 45.617184 73.302606 44.746094 72.431641 L 42.132812 75.042969 C 43.684142 76.594578 45.235432 78.146019 46.787109 79.697266 C 50.189478 76.294946 53.591757 72.892561 56.994141 69.490234 C 58.845013 71.341133 60.695999 73.192081 62.546875 75.042969 C 61.376238 76.213243 60.205457 77.384081 59.035156 78.554688 C 57.864856 77.384081 56.694074 76.213243 55.523438 75.042969 C 56.013487 74.553074 56.504091 74.064106 56.994141 73.574219 C 57.674543 74.254598 58.354751 74.934874 59.035156 75.615234 C 59.225644 75.424746 59.416915 75.233461 59.607422 75.042969 C 58.736513 74.172003 57.86505 73.302606 56.994141 72.431641 C 56.12305 73.302606 55.251969 74.172003 54.380859 75.042969 C 55.932189 76.594578 57.483479 78.146019 59.035156 79.697266 C 62.437525 76.294946 65.839819 72.892561 69.242188 69.490234 C 71.093075 71.341133 72.944046 73.192081 74.794922 75.042969 C 73.624448 76.213398 72.453681 77.384255 71.283203 78.554688 C 70.11291 77.384255 68.943738 76.213398 67.773438 75.042969 C 68.263321 74.5531 68.752308 74.064091 69.242188 73.574219 C 69.922582 74.254598 70.602805 74.934874 71.283203 75.615234 C 71.473691 75.424746 71.664965 75.233461 71.855469 75.042969 C 70.984556 74.172003 70.1131 73.302606 69.242188 72.431641 C 68.371097 73.302606 67.5 74.172003 66.628906 75.042969 C 68.180406 76.594397 69.7317 78.145845 71.283203 79.697266 C 74.685583 76.294946 78.087851 72.892561 81.490234 69.490234 C 83.341111 71.341133 85.192093 73.192081 87.042969 75.042969 C 85.872676 76.213398 84.703492 77.384255 83.533203 78.554688 C 82.362725 77.384255 81.191959 76.213398 80.021484 75.042969 C 80.511375 74.5531 81.000351 74.064091 81.490234 73.574219 C 82.170806 74.254598 82.85262 74.934874 83.533203 75.615234 C 83.723691 75.424746 83.913012 75.233461 84.103516 75.042969 C 83.232418 74.172003 82.361332 73.302606 81.490234 72.431641 C 80.619322 73.302606 79.749819 74.172003 78.878906 75.042969 C 81.791206 77.955435 84.702931 80.868784 87.615234 83.78125 C 88.486506 82.91036 89.357592 82.039207 90.228516 81.167969 C 89.357418 80.296992 88.486332 79.425653 87.615234 78.554688 C 87.424708 78.745176 87.233483 78.936461 87.042969 79.126953 C 87.723594 79.807438 88.405324 80.487484 89.085938 81.167969 C 88.595585 81.657818 88.105095 82.148331 87.615234 82.638672 C 86.44493 81.468118 85.273816 80.297518 84.103516 79.126953 C 85.273816 77.956528 86.44493 76.785675 87.615234 75.615234 C 89.076792 77.076822 90.53844 78.538407 92 80 L 92 78.855469 C 90.729154 77.584637 89.458343 76.313801 88.1875 75.042969 C 89.458307 73.772152 90.729192 72.501294 92 71.230469 L 92 70.087891 L 87.615234 74.472656 C 83.722967 70.580348 79.829778 66.687215 75.9375 62.794922 C 77.788376 60.944019 79.639358 59.093075 81.490234 57.242188 C 82.660701 58.412518 83.831475 59.583579 85.001953 60.753906 C 83.831475 61.92435 82.660712 63.0952 81.490234 64.265625 C 81.000351 63.775757 80.511375 63.28479 80.021484 62.794922 C 80.701905 62.11435 81.382102 61.434478 82.0625 60.753906 C 81.872012 60.563418 81.680749 60.372133 81.490234 60.181641 C 80.619322 61.052708 79.749819 61.923843 78.878906 62.794922 C 79.749819 63.665789 80.619322 64.537321 81.490234 65.408203 C 83.041927 63.856945 84.595177 62.305546 86.146484 60.753906 C 84.561496 59.168994 82.975614 57.584919 81.390625 56 L 80.248047 56 C 80.471965 56.223951 80.696017 56.447909 80.919922 56.671875 C 77.517538 60.0743 74.115259 63.476466 70.712891 66.878906 C 72.264561 68.430149 73.815869 69.981609 75.367188 71.533203 C 76.238112 70.661958 77.109186 69.790804 77.980469 68.919922 C 77.109186 68.049039 76.238112 67.177886 75.367188 66.306641 C 75.176699 66.497356 74.985437 66.688188 74.794922 66.878906 C 75.47532 67.559255 76.155539 68.239562 76.835938 68.919922 C 76.346043 69.409805 75.857082 69.898804 75.367188 70.388672 C 74.196725 69.218439 73.025936 68.049135 71.855469 66.878906 C 73.025947 65.708364 74.196713 64.537715 75.367188 63.367188 C 77.218064 65.218079 79.069034 67.069034 80.919922 68.919922 C 79.069034 70.77084 77.218064 72.621742 75.367188 74.472656 C 71.474928 70.580348 67.581724 66.687215 63.689453 62.794922 C 65.540329 60.944019 67.391315 59.093075 69.242188 57.242188 C 70.41248 58.412503 71.583625 59.583591 72.753906 60.753906 C 71.583613 61.92435 70.412492 63.095211 69.242188 64.265625 C 68.752308 63.775757 68.263321 63.28479 67.773438 62.794922 C 68.453854 62.11435 69.134036 61.434478 69.814453 60.753906 C 69.623927 60.563418 69.43271 60.372133 69.242188 60.181641 C 68.371267 61.052886 67.500182 61.924039 66.628906 62.794922 C 67.5 63.665789 68.371097 64.537321 69.242188 65.408203 C 70.793695 63.856764 72.344977 62.305349 73.896484 60.753906 C 72.31183 59.169332 70.727229 57.584579 69.142578 56 L 68 56 C 68.223954 56.223957 68.447921 56.447918 68.671875 56.671875 C 65.269491 60.0743 61.867212 63.476466 58.464844 66.878906 C 60.01634 68.430315 61.567629 69.981775 63.119141 71.533203 C 63.990053 70.662139 64.859556 69.79099 65.730469 68.919922 C 64.859556 68.048858 63.990053 67.177689 63.119141 66.306641 C 62.928615 66.497356 62.737397 66.688188 62.546875 66.878906 C 63.227281 67.559255 63.9075 68.239562 64.587891 68.919922 C 64.098022 69.409805 63.609024 69.898804 63.119141 70.388672 C 61.94867 69.218439 60.777892 68.049135 59.607422 66.878906 C 60.777681 65.708156 61.948447 64.537488 63.119141 63.367188 C 64.970013 65.218079 66.821003 67.069034 68.671875 68.919922 C 66.82078 70.770602 64.969794 72.621504 63.119141 74.472656 C 59.716757 71.070216 56.314466 67.668065 52.912109 64.265625 C 52.721583 64.456113 52.530336 64.645449 52.339844 64.835938 C 53.70064 66.196972 55.061064 67.558903 56.421875 68.919922 C 54.570999 70.77084 52.720017 72.621742 50.869141 74.472656 C 46.976874 70.580348 43.085615 66.687215 39.193359 62.794922 C 41.044232 60.944019 42.895206 59.093075 44.746094 57.242188 C 45.916549 58.412518 47.087342 59.583579 48.257812 60.753906 C 47.087342 61.92435 45.916549 63.0952 44.746094 64.265625 C 44.256195 63.775757 43.765274 63.28479 43.275391 62.794922 C 43.955811 62.11435 44.636001 61.434478 45.316406 60.753906 C 45.12588 60.563418 44.936601 60.372133 44.746094 60.181641 C 43.875181 61.052708 43.003725 61.923843 42.132812 62.794922 C 43.003725 63.665789 43.875181 64.537321 44.746094 65.408203 C 46.297786 63.856945 47.849076 62.305546 49.400391 60.753906 C 47.815402 59.168994 46.229521 57.584919 44.644531 56 L 43.501953 56 C 43.725871 56.223951 43.949924 56.447909 44.173828 56.671875 C 40.771456 60.0743 37.369169 63.476466 33.966797 66.878906 C 35.518474 68.430149 37.069763 69.981609 38.621094 71.533203 C 39.492014 70.661958 40.363099 69.790804 41.234375 68.919922 C 40.363099 68.049039 39.492014 67.177886 38.621094 66.306641 C 38.430568 66.497356 38.239335 66.688188 38.048828 66.878906 L 40.091797 68.919922 C 39.601902 69.409805 39.110973 69.898804 38.621094 70.388672 C 37.450618 69.218439 36.279849 68.049135 35.109375 66.878906 C 36.279861 65.708364 37.450607 64.537715 38.621094 63.367188 C 40.471966 65.218079 42.322952 67.069034 44.173828 68.919922 L 38.621094 74.472656 C 34.728822 70.580348 30.83758 66.687215 26.945312 62.794922 C 28.796184 60.944019 30.647174 59.093075 32.498047 57.242188 C 33.668517 58.412518 34.837357 59.583579 36.007812 60.753906 C 34.837346 61.92435 33.668517 63.0952 32.498047 64.265625 C 32.008163 63.775757 31.517227 63.28479 31.027344 62.794922 C 31.707765 62.11435 32.387942 61.434478 33.068359 60.753906 C 32.877833 60.563418 32.688569 60.372133 32.498047 60.181641 C 31.627123 61.052886 30.756038 61.924039 29.884766 62.794922 C 30.755857 63.665789 31.626956 64.537321 32.498047 65.408203 C 34.049558 63.856764 35.600848 62.305349 37.152344 60.753906 C 35.567347 59.168994 33.981475 57.584919 32.396484 56 L 31.253906 56 C 31.477847 56.22393 31.70184 56.447944 31.925781 56.671875 C 28.523393 60.0743 25.121122 63.476466 21.71875 66.878906 C 23.270246 68.430315 24.821532 69.981775 26.373047 71.533203 C 27.243956 70.662139 28.11542 69.79099 28.986328 68.919922 C 28.11542 68.048858 27.243956 67.177689 26.373047 66.306641 C 26.182521 66.497356 25.9913 66.688188 25.800781 66.878906 C 26.481183 67.559255 27.161406 68.239562 27.841797 68.919922 C 27.351925 69.409805 26.862927 69.898804 26.373047 70.388672 C 25.202573 69.218439 24.031802 68.049135 22.861328 66.878906 C 24.031591 65.708156 25.202334 64.537488 26.373047 63.367188 C 28.223919 65.218079 30.074908 67.069034 31.925781 68.919922 C 30.07467 70.770602 28.223681 72.621504 26.373047 74.472656 C 22.480765 70.580348 18.587583 66.687215 14.695312 62.794922 C 16.546189 60.944019 18.397174 59.093075 20.248047 57.242188 C 21.418336 58.412503 22.58948 59.583591 23.759766 60.753906 C 22.58948 61.92435 21.418336 63.095211 20.248047 64.265625 C 19.757967 63.775726 19.269373 63.284805 18.779297 62.794922 C 19.460092 62.114516 20.139937 61.434716 20.820312 60.753906 C 20.629787 60.563418 20.438569 60.372133 20.248047 60.181641 C 19.376956 61.052708 18.505871 61.923843 17.634766 62.794922 C 18.505871 63.665789 19.376956 64.537321 20.248047 65.408203 C 21.799361 63.856764 23.351029 62.305349 24.902344 60.753906 C 23.317864 59.169247 21.732997 57.584587 20.148438 56 L 19.005859 56 z M 24.431641 56 C 24.207672 56.223971 23.983733 56.447903 23.759766 56.671875 C 24.63086 57.542841 25.501938 58.414191 26.373047 59.285156 C 27.243956 58.414191 28.11542 57.542841 28.986328 56.671875 C 28.79584 56.481387 28.60458 56.290101 28.414062 56.099609 C 27.733672 56.779973 27.053434 57.460261 26.373047 58.140625 C 25.882967 57.650726 25.392424 57.161758 24.902344 56.671875 C 25.126288 56.447944 25.350275 56.22393 25.574219 56 L 24.431641 56 z M 36.679688 56 C 36.455746 56.223971 36.231754 56.447903 36.007812 56.671875 C 36.87874 57.542841 37.75018 58.414191 38.621094 59.285156 C 39.492184 58.414191 40.363281 57.542841 41.234375 56.671875 C 41.043698 56.481387 40.852813 56.290101 40.662109 56.099609 C 39.981707 56.779973 39.301481 57.460261 38.621094 58.140625 C 38.131207 57.650753 37.642231 57.161743 37.152344 56.671875 C 37.37631 56.447884 37.600252 56.223991 37.824219 56 L 36.679688 56 z M 48.929688 56 C 48.705747 56.223984 48.481752 56.44789 48.257812 56.671875 C 49.128725 57.542841 49.998232 58.414191 50.869141 59.285156 C 51.74025 58.414191 52.611313 57.542841 53.482422 56.671875 C 53.291896 56.481387 53.102605 56.290101 52.912109 56.099609 C 52.231526 56.779973 51.549716 57.460246 50.869141 58.140625 C 50.379257 57.650753 49.890278 57.161743 49.400391 56.671875 C 49.624295 56.447909 49.848347 56.223951 50.072266 56 L 48.929688 56 z M 55.75 56 C 55.973967 56.223991 56.197906 56.447884 56.421875 56.671875 C 53.019488 60.0743 49.617227 63.476466 46.214844 66.878906 C 47.766521 68.430149 49.317815 69.981609 50.869141 71.533203 C 51.74025 70.662139 52.611313 69.79099 53.482422 68.919922 C 52.611313 68.048858 51.74025 67.177689 50.869141 66.306641 C 50.678652 66.497356 50.489335 66.688188 50.298828 66.878906 C 50.97943 67.559267 51.659257 68.239546 52.339844 68.919922 C 51.849779 69.40982 51.359221 69.898773 50.869141 70.388672 C 49.698855 69.218439 48.529664 68.049124 47.359375 66.878906 C 50.57124 63.666984 53.782275 60.454106 56.994141 57.242188 C 58.164426 58.412503 59.33557 59.583591 60.505859 60.753906 C 59.33557 61.92435 58.164426 63.095211 56.994141 64.265625 C 56.504091 63.775742 56.013487 63.284805 55.523438 62.794922 C 56.204021 62.11435 56.885819 61.434478 57.566406 60.753906 C 57.37588 60.563418 57.184663 60.372133 56.994141 60.181641 C 56.12305 61.052708 55.251969 61.923843 54.380859 62.794922 C 55.251969 63.665789 56.12305 64.537321 56.994141 65.408203 C 58.545455 63.856764 60.097108 62.305349 61.648438 60.753906 C 60.063696 59.169143 58.479272 57.584771 56.894531 56 L 55.75 56 z M 59.833984 56 C 60.928936 57.094902 62.024186 58.190255 63.119141 59.285156 C 63.990053 58.414191 64.859556 57.542841 65.730469 56.671875 C 65.506473 56.447844 65.282589 56.224034 65.058594 56 L 63.916016 56 C 64.139886 56.223921 64.364019 56.447956 64.587891 56.671875 C 64.098022 57.161743 63.609024 57.650753 63.119141 58.140625 C 62.405542 57.427291 61.691975 56.713477 60.978516 56 L 59.833984 56 z M 73.425781 56 C 73.201813 56.223971 72.977875 56.447903 72.753906 56.671875 C 73.625012 57.542841 74.49609 58.414191 75.367188 59.285156 C 76.238278 58.414191 77.109378 57.542829 77.980469 56.671875 C 77.789792 56.481387 77.59888 56.290116 77.408203 56.099609 C 76.727805 56.779973 76.047586 57.460261 75.367188 58.140625 C 74.877304 57.650753 74.386368 57.161743 73.896484 56.671875 C 74.120389 56.447946 74.344456 56.223929 74.568359 56 L 73.425781 56 z M 85.673828 56 C 85.44986 56.223971 85.225921 56.447903 85.001953 56.671875 C 85.872866 57.542841 86.744322 58.414191 87.615234 59.285156 C 88.486332 58.414191 89.357418 57.542841 90.228516 56.671875 C 90.038027 56.481387 89.846768 56.290101 89.65625 56.099609 C 88.975667 56.779973 88.295806 57.460246 87.615234 58.140625 C 87.12534 57.650753 86.636372 57.161743 86.146484 56.671875 C 86.370451 56.447847 86.594379 56.224013 86.818359 56 L 85.673828 56 z M 92 57.839844 C 88.986949 60.85294 85.973994 63.8658 82.960938 66.878906 C 84.512619 68.430149 86.063901 69.981609 87.615234 71.533203 C 88.486332 70.662139 89.357418 69.79099 90.228516 68.919922 C 89.357418 68.048858 88.486332 67.177689 87.615234 66.306641 C 87.424708 66.497356 87.233483 66.688188 87.042969 66.878906 C 87.723571 67.559267 88.405343 68.239546 89.085938 68.919922 C 88.595869 69.40982 88.105303 69.898773 87.615234 70.388672 C 86.444941 69.218439 85.273805 68.049124 84.103516 66.878906 C 85.273816 65.708364 86.44493 64.5377 87.615234 63.367188 C 89.076792 64.82876 90.53844 66.29038 92 67.751953 L 92 66.607422 C 90.729101 65.336574 89.458397 64.065769 88.1875 62.794922 C 89.458307 61.524095 90.729192 60.253244 92 58.982422 L 92 57.839844 z M 92 61.921875 L 91.126953 62.794922 C 91.417912 63.085862 91.709045 63.377028 92 63.667969 L 92 61.921875 z M 92 74.169922 C 91.708937 74.461006 91.418021 74.751887 91.126953 75.042969 C 91.41795 75.334018 91.708992 75.62498 92 75.916016 L 92 74.169922 z M 3.9179688 76.513672 C 2.3666541 78.065206 0.8149865 79.616431 -0.73632812 81.167969 C 0.13459218 82.039025 1.004091 82.910186 1.875 83.78125 C 2.7460942 82.910186 3.6171871 82.039025 4.4882812 81.167969 L 3.9179688 80.595703 C 3.2375669 81.276286 2.5554057 81.958092 1.875 82.638672 C 1.3850901 82.148618 0.89617503 81.658026 0.40625 81.167969 C 1.5765505 79.997623 2.7476834 78.826596 3.9179688 77.65625 C 5.0884431 78.826596 6.2572638 79.997612 7.4277344 81.167969 L -2.7792969 91.375 C -2.570955 91.583347 -2.3626388 91.791652 -2.1542969 92 L -1.0097656 92 C -1.2181405 91.791616 -1.4263899 91.583384 -1.6347656 91.375 C -0.46429509 90.204752 0.70452947 89.035486 1.875 87.865234 C 3.2539208 89.243851 4.632984 90.621197 6.0117188 92 L 7.1542969 92 C 5.5852823 90.430931 4.0162773 88.862041 2.4472656 87.292969 C 4.298138 85.44207 6.1491125 83.591129 8 81.740234 C 9.1704554 82.910667 10.34126 84.079567 11.511719 85.25 C 10.341244 86.42052 9.1704705 87.59121 8 88.761719 C 7.5100712 88.271684 7.0211637 87.783015 6.53125 87.292969 C 7.211667 86.612518 7.89186 85.930462 8.5722656 85.25 C 8.3817396 85.059512 8.190492 84.870202 8 84.679688 C 7.1290721 85.550653 6.2576277 86.422003 5.3867188 87.292969 C 6.2576277 88.164033 7.1290721 89.035186 8 89.90625 C 9.5517039 88.35495 11.103028 86.801749 12.654297 85.25 C 9.7418119 82.337534 6.8304575 79.426134 3.9179688 76.513672 z M 16.166016 76.513672 C 14.614508 78.065206 13.063226 79.616431 11.511719 81.167969 C 12.382628 82.039025 13.254091 82.910186 14.125 83.78125 C 14.996276 82.91036 15.867353 82.03921 16.738281 81.167969 C 16.547755 80.977443 16.356511 80.786206 16.166016 80.595703 C 15.485417 81.276264 14.805587 81.9581 14.125 82.638672 C 13.63509 82.148626 13.144211 81.658007 12.654297 81.167969 C 13.824767 79.997612 14.995534 78.826596 16.166016 77.65625 C 17.336305 78.826596 18.507434 79.997623 19.677734 81.167969 C 16.275351 84.570284 12.871134 87.972684 9.46875 91.375 C 9.6770482 91.583304 9.8854513 91.791696 10.09375 92 L 11.238281 92 C 11.029998 91.791674 10.821567 91.583324 10.613281 91.375 C 11.78357 90.204764 12.954715 89.035474 14.125 87.865234 C 15.503921 89.243851 16.882981 90.621197 18.261719 92 L 19.404297 92 C 17.835151 90.430799 16.266413 88.862173 14.697266 87.292969 C 16.548142 85.44207 18.397174 83.591129 20.248047 81.740234 C 21.418336 82.910667 22.589477 84.079567 23.759766 85.25 C 22.589461 86.420512 21.418336 87.591222 20.248047 88.761719 C 19.757812 88.271824 19.269211 87.783189 18.779297 87.292969 C 19.459873 86.612506 20.139725 85.930462 20.820312 85.25 C 20.629787 85.059512 20.438569 84.870202 20.248047 84.679688 C 19.376953 85.550653 18.505871 86.422003 17.634766 87.292969 C 18.50569 88.164207 19.376756 89.03536 20.248047 89.90625 C 21.799361 88.354724 23.351029 86.801519 24.902344 85.25 C 21.99004 82.337534 19.078308 79.426134 16.166016 76.513672 z M 28.414062 76.513672 C 27.638413 77.28948 26.863552 78.065992 26.087891 78.841797 C 25.312056 79.61753 24.535612 80.39224 23.759766 81.167969 C 24.63069 82.039207 25.501756 82.91036 26.373047 83.78125 C 27.243956 82.910186 28.11542 82.039021 28.986328 81.167969 C 28.79584 80.977481 28.60458 80.786203 28.414062 80.595703 C 27.733687 81.276328 27.053392 81.958002 26.373047 82.638672 C 25.88319 82.148267 25.39276 81.657784 24.902344 81.167969 C 26.07312 79.997861 27.24372 78.826781 28.414062 77.65625 C 29.584547 78.826596 30.755296 79.997612 31.925781 81.167969 L 21.71875 91.375 C 21.92706 91.583378 22.135431 91.79163 22.34375 92 L 23.486328 92 C 23.278011 91.791674 23.069646 91.583326 22.861328 91.375 C 26.073208 88.163165 29.286181 84.952054 32.498047 81.740234 C 33.668351 82.910841 34.837161 84.079741 36.007812 85.25 C 34.837346 86.42052 33.668517 87.59121 32.498047 88.761719 C 32.008137 88.271684 31.517257 87.783015 31.027344 87.292969 C 31.707749 86.612518 32.387942 85.930462 33.068359 85.25 C 32.877833 85.059512 32.688569 84.870198 32.498047 84.679688 C 31.626956 85.550653 30.755857 86.421999 29.884766 87.292969 C 30.755857 88.164033 31.626956 89.035182 32.498047 89.90625 L 37.152344 85.25 C 34.239844 82.337534 31.326547 79.426134 28.414062 76.513672 z M 52.912109 76.513672 C 51.360598 78.065209 49.809309 79.616431 48.257812 81.167969 C 49.128725 82.039021 49.998232 82.910186 50.869141 83.78125 C 51.740416 82.91036 52.611494 82.039207 53.482422 81.167969 C 53.291896 80.977481 53.102605 80.786203 52.912109 80.595703 C 52.231526 81.276264 51.549728 81.9581 50.869141 82.638672 C 50.379231 82.148626 49.890304 81.658003 49.400391 81.167969 C 50.570861 79.997612 51.741628 78.826596 52.912109 77.65625 C 54.082398 78.826596 55.251571 79.997623 56.421875 81.167969 C 53.019488 84.570284 49.617227 87.972684 46.214844 91.375 C 46.423186 91.583347 46.631501 91.791652 46.839844 92 L 47.984375 92 C 47.776034 91.791617 47.567718 91.583382 47.359375 91.375 C 48.529664 90.20476 49.698855 89.035474 50.869141 87.865234 C 52.248073 89.243851 53.627123 90.621197 55.005859 92 L 56.148438 92 C 54.579423 90.430931 53.010429 88.86204 51.441406 87.292969 C 53.292294 85.44207 55.143264 83.591129 56.994141 81.740234 C 58.164426 82.910667 59.33557 84.079567 60.505859 85.25 C 59.335555 86.420508 58.164426 87.591218 56.994141 88.761719 C 56.503906 88.271824 56.013347 87.783189 55.523438 87.292969 C 56.204009 86.612506 56.885819 85.930462 57.566406 85.25 C 57.37588 85.059512 57.184663 84.870198 56.994141 84.679688 C 56.12305 85.550653 55.251969 86.421999 54.380859 87.292969 C 55.251787 88.164207 56.122865 89.035356 56.994141 89.90625 C 58.545455 88.35472 60.097108 86.801515 61.648438 85.25 C 58.736134 82.337534 55.824402 79.426134 52.912109 76.513672 z M 65.160156 76.513672 C 63.608672 78.065209 62.057355 79.616431 60.505859 81.167969 C 61.376783 82.039207 62.247854 82.91036 63.119141 83.78125 C 63.990053 82.910186 64.859556 82.039021 65.730469 81.167969 C 65.539981 80.977481 65.350675 80.786203 65.160156 80.595703 C 64.479777 81.276328 63.79949 81.958002 63.119141 82.638672 C 62.629284 82.148267 62.138854 81.657784 61.648438 81.167969 C 62.819214 79.997861 63.98981 78.826781 65.160156 77.65625 C 66.330638 78.826596 67.501408 79.997612 68.671875 81.167969 C 65.269507 84.570284 61.867212 87.972684 58.464844 91.375 C 58.673154 91.583378 58.881525 91.79163 59.089844 92 L 60.232422 92 C 60.024105 91.791674 59.81574 91.583326 59.607422 91.375 C 60.777892 90.204752 61.94867 89.035486 63.119141 87.865234 C 64.497935 89.243983 65.877064 90.621261 67.255859 92 L 68.396484 92 C 66.82747 90.430931 65.258471 88.86204 63.689453 87.292969 C 65.540329 85.44207 67.391315 83.591129 69.242188 81.740234 C 70.412492 82.910667 71.583613 84.079567 72.753906 85.25 C 71.583613 86.420508 70.412492 87.591218 69.242188 88.761719 C 68.752278 88.271684 68.263351 87.783015 67.773438 87.292969 C 68.453839 86.612518 69.134036 85.930462 69.814453 85.25 C 69.623927 85.059512 69.43271 84.870198 69.242188 84.679688 C 68.371097 85.550653 67.5 86.421999 66.628906 87.292969 C 67.5 88.164033 68.371097 89.035182 69.242188 89.90625 C 70.793695 88.35472 72.344977 86.801515 73.896484 85.25 L 65.160156 76.513672 z M 77.408203 76.513672 C 76.632546 77.28948 75.857696 78.065992 75.082031 78.841797 C 74.306189 79.61753 73.529756 80.39224 72.753906 81.167969 C 73.625012 82.039021 74.49609 82.910186 75.367188 83.78125 C 76.238278 82.910209 77.109378 82.03901 77.980469 81.167969 C 77.789792 80.977443 77.59888 80.786225 77.408203 80.595703 C 76.727794 81.276286 76.047597 81.958089 75.367188 82.638672 C 74.877285 82.148615 74.386391 81.658026 73.896484 81.167969 C 75.066777 79.997623 76.23791 78.826596 77.408203 77.65625 C 78.57867 78.826596 79.749444 79.997612 80.919922 81.167969 C 77.517538 84.570284 74.115259 87.972684 70.712891 91.375 L 71.337891 92 L 72.480469 92 C 72.272152 91.791674 72.063785 91.583326 71.855469 91.375 C 75.067338 88.163165 78.278369 84.952054 81.490234 81.740234 C 82.660539 82.910841 83.831301 84.079741 85.001953 85.25 C 83.831475 86.42052 82.660712 87.59121 81.490234 88.761719 C 81.000328 88.271684 80.511398 87.783015 80.021484 87.292969 C 80.701894 86.612518 81.382102 85.930462 82.0625 85.25 C 81.872012 85.059512 81.680749 84.870198 81.490234 84.679688 C 80.619322 85.550653 79.749819 86.421999 78.878906 87.292969 C 79.749819 88.164033 80.619322 89.035182 81.490234 89.90625 C 83.041957 88.35495 84.595208 86.801749 86.146484 85.25 C 83.233999 82.337534 80.320692 79.426134 77.408203 76.513672 z M -7.6210938 77.222656 L -7.6210938 78.367188 C -6.6872972 79.300829 -5.754109 80.234327 -4.8203125 81.167969 C -5.7541204 82.101754 -6.6872972 83.034969 -7.6210938 83.96875 L -7.6210938 85.113281 C -6.4967901 83.988981 -5.3723618 82.864523 -4.2480469 81.740234 C -3.0777426 82.910841 -1.9069801 84.079741 -0.73632812 85.25 C -1.9067987 86.42052 -3.0775726 87.59121 -4.2480469 88.761719 C -4.7379568 88.271684 -5.2288401 87.783015 -5.71875 87.292969 C -5.0383481 86.612518 -4.35814 85.930462 -3.6777344 85.25 C -3.8682604 85.059512 -4.0575247 84.870198 -4.2480469 84.679688 C -5.1191373 85.550653 -5.9902226 86.421999 -6.8613281 87.292969 C -5.9902226 88.164033 -5.1191373 89.035182 -4.2480469 89.90625 C -2.6965319 88.35472 -1.1452309 86.801515 0.40625 85.25 C -2.2695496 82.574174 -4.9452828 79.898482 -7.6210938 77.222656 z M 92 82.335938 C 88.986955 85.348935 85.973994 88.362004 82.960938 91.375 C 83.169281 91.583347 83.377594 91.791652 83.585938 92 L 84.728516 92 C 84.520232 91.791675 84.3118 91.583324 84.103516 91.375 C 85.273805 90.20476 86.444941 89.035474 87.615234 87.865234 C 88.994152 89.243851 90.37322 90.621197 91.751953 92 L 92 92 L 92 91.105469 C 90.728996 89.834481 89.458504 88.563958 88.1875 87.292969 C 89.458307 86.022144 90.729192 84.751288 92 83.480469 L 92 82.335938 z M 92 86.419922 C 91.709045 86.710895 91.417912 87.001995 91.126953 87.292969 C 91.417912 87.583974 91.709045 87.87501 92 88.166016 L 92 86.419922 z M 28.414062 88.761719 C 28.223537 88.952207 28.034272 89.14347 27.84375 89.333984 C 28.732637 90.222818 29.620892 91.111162 30.509766 92 L 31.652344 92 C 30.572904 90.920574 29.493502 89.841144 28.414062 88.761719 z M 77.408203 88.761719 C 77.217715 88.952207 77.026441 89.14347 76.835938 89.333984 C 77.725054 90.222805 78.614959 91.11101 79.503906 92 L 80.646484 92 C 79.567047 90.920574 78.487642 89.841144 77.408203 88.761719 z M -7.6210938 89.472656 L -7.6210938 90.615234 C -7.159405 91.07694 -6.6980187 91.5383 -6.2363281 92 L -5.09375 92 C -5.9362869 91.157411 -6.778557 90.315244 -7.6210938 89.472656 z M 1.875 90.802734 C 1.684474 90.993223 1.4951946 91.184508 1.3046875 91.375 C 1.5130368 91.583405 1.7213379 91.791594 1.9296875 92 L 3.0722656 92 C 2.6731743 91.600927 2.2740887 91.201811 1.875 90.802734 z M 14.125 90.802734 C 13.934512 90.993223 13.743241 91.184508 13.552734 91.375 C 13.761144 91.583405 13.969325 91.791597 14.177734 92 L 15.322266 92 C 14.923166 91.600933 14.524172 91.201726 14.125 90.802734 z M 26.373047 90.802734 C 26.182521 90.993223 25.9913 91.184504 25.800781 91.375 C 26.009134 91.583405 26.21743 91.791594 26.425781 92 L 27.570312 92 C 27.171311 91.600927 26.772051 91.201809 26.373047 90.802734 z M 38.621094 90.802734 C 38.430568 90.993223 38.241288 91.184508 38.050781 91.375 C 38.259131 91.583405 38.467432 91.791594 38.675781 92 L 39.818359 92 C 39.419268 91.600927 39.020182 91.201811 38.621094 90.802734 z M 50.869141 90.802734 C 50.678652 90.993223 50.489335 91.184504 50.298828 91.375 C 50.507238 91.583405 50.715418 91.791597 50.923828 92 L 52.066406 92 C 51.667307 91.600932 51.268312 91.201724 50.869141 90.802734 z M 63.119141 90.802734 C 62.928615 90.993223 62.737397 91.184504 62.546875 91.375 C 62.755229 91.583405 62.963523 91.791594 63.171875 92 L 64.316406 92 L 63.119141 90.802734 z M 75.367188 90.802734 C 75.176699 90.993223 74.985437 91.184504 74.794922 91.375 C 75.003273 91.583405 75.21157 91.791594 75.419922 92 L 76.564453 92 C 76.165362 91.600927 75.76628 91.201809 75.367188 90.802734 z M 87.615234 90.802734 C 87.424708 90.993223 87.233483 91.184504 87.042969 91.375 C 87.25128 91.583305 87.459659 91.791696 87.667969 92 L 88.8125 92 C 88.413403 91.600932 88.014404 91.201724 87.615234 90.802734 z " + transform="scale(0.26458334)" /> + <path + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0;opacity:0.5;filter:url(#filter969)" + d="M -3.1750001,10.583334 24.341667,-3.1750001 V 24.341667 H -3.1750001 Z" + id="path843" /> + <path + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0" + d="M -3.1750001,10.583334 24.341667,-3.1750001 V 24.341667 H -3.1750001 Z" + id="path835" /> + <path + id="path6741" + style="fill:#000000;fill-opacity:1;stroke-width:0.2887;opacity:0.25" + d="M 85.523438 -8.7617188 L 84.695312 -8.3476562 C 84.117247 -7.7695926 83.53901 -7.1913567 82.960938 -6.6132812 C 84.512664 -5.0619817 86.063946 -3.5107185 87.615234 -1.9589844 C 88.486332 -2.8301314 89.357418 -3.701107 90.228516 -4.5722656 C 89.357418 -5.4431217 88.486332 -6.3127415 87.615234 -7.1835938 C 87.424708 -6.9931056 87.233483 -6.8037732 87.042969 -6.6132812 C 87.723594 -5.9329209 88.405332 -5.252641 89.085938 -4.5722656 C 88.595835 -4.0822877 88.105322 -3.5915329 87.615234 -3.1015625 C 86.444941 -4.2718934 85.273805 -5.4429506 84.103516 -6.6132812 C 84.819419 -7.3293505 85.536058 -8.0456495 86.251953 -8.7617188 L 85.523438 -8.7617188 z M 88.978516 -8.7617188 C 89.985673 -7.7545941 90.992845 -6.7473609 92 -5.7402344 L 92 -6.8828125 C 91.37367 -7.5091052 90.747423 -8.135426 90.121094 -8.7617188 L 88.978516 -8.7617188 z M 80.421875 -6.2109375 L 79.658203 -5.8300781 C 80.077566 -5.4095413 80.498626 -4.9908512 80.919922 -4.5722656 C 79.069276 -2.7211247 77.218302 -0.8702075 75.367188 0.98046875 C 74.330743 -0.055972903 73.294257 -1.0924638 72.257812 -2.1289062 L 71.494141 -1.7480469 C 72.594392 -0.64773478 73.694514 0.45256898 74.794922 1.5527344 C 73.624448 2.7232616 72.453681 3.8939259 71.283203 5.0644531 C 70.112903 3.8939263 68.943738 2.7232465 67.773438 1.5527344 C 68.263321 1.0628547 68.752308 0.57385649 69.242188 0.083984375 C 69.922582 0.76434846 70.602805 1.4446246 71.283203 2.125 C 71.473691 1.9345118 71.664965 1.7432301 71.855469 1.5527344 C 71.082192 0.77949786 70.308433 0.0056610621 69.535156 -0.76757812 L 68.363281 -0.18164062 C 67.785154 0.39633862 67.207032 0.97475961 66.628906 1.5527344 C 68.180406 3.1042493 69.7317 4.6554902 71.283203 6.2070312 C 74.685583 2.8046176 78.087851 -0.59759016 81.490234 -4 C 83.341111 -2.1491127 85.192093 -0.29816449 87.042969 1.5527344 C 85.872676 2.7232465 84.703504 3.8939263 83.533203 5.0644531 C 82.362725 3.8939263 81.19197 2.7232616 80.021484 1.5527344 C 80.511375 1.0628547 81.000351 0.57385649 81.490234 0.083984375 C 82.170806 0.76436358 82.85262 1.4446246 83.533203 2.125 C 83.723691 1.9345118 83.913012 1.7432301 84.103516 1.5527344 C 83.232418 0.68186699 82.361332 -0.18967949 81.490234 -1.0605469 C 80.619322 -0.18967949 79.749819 0.68186699 78.878906 1.5527344 C 80.430183 3.1044723 81.981488 4.6557283 83.533203 6.2070312 C 86.355345 3.3847077 89.177867 0.56255939 92 -2.2597656 L 92 -3.4042969 C 90.538546 -1.9426028 89.076974 -0.48093675 87.615234 0.98046875 C 85.217661 -1.4170935 82.819446 -3.8133663 80.421875 -6.2109375 z M 77.701172 -4.8515625 L 76.527344 -4.2636719 C 76.140311 -3.8765858 75.754221 -3.4886435 75.367188 -3.1015625 C 75.237642 -3.231093 75.108061 -3.3607042 74.978516 -3.4902344 L 74.216797 -3.109375 C 74.600249 -2.7258639 74.983762 -2.3425225 75.367188 -1.9589844 C 76.238289 -2.8301314 77.109359 -3.701107 77.980469 -4.5722656 C 77.887333 -4.665374 77.794307 -4.7584542 77.701172 -4.8515625 z M 92 0.6796875 C 91.709045 0.97062975 91.417912 1.2617944 91.126953 1.5527344 C 91.417942 1.8438073 91.708997 2.1347235 92 2.4257812 L 92 0.6796875 z M 64.091797 1.9550781 L 63.330078 2.3359375 C 65.110418 4.1167394 66.89107 5.8974017 68.671875 7.6777344 L 58.464844 17.884766 C 60.016185 19.436379 61.567478 20.987778 63.119141 22.539062 C 63.990053 21.66818 64.859556 20.796649 65.730469 19.925781 C 64.859556 19.054615 63.990053 18.183662 63.119141 17.3125 C 62.928615 17.503102 62.737397 17.694191 62.546875 17.884766 C 63.227281 18.565338 63.907489 19.245221 64.587891 19.925781 C 64.098022 20.41565 63.609024 20.904663 63.119141 21.394531 C 61.948489 20.224256 60.777726 19.055391 59.607422 17.884766 C 60.777892 16.714439 61.948659 15.543366 63.119141 14.373047 C 64.970013 16.223938 66.821003 18.074894 68.671875 19.925781 C 66.82078 21.776459 64.969794 23.627401 63.119141 25.478516 C 59.716757 22.076087 56.314466 18.673928 52.912109 15.271484 C 52.721583 15.46201 52.530336 15.65129 52.339844 15.841797 C 53.70064 17.202827 55.061064 18.564762 56.421875 19.925781 C 54.570999 21.776671 52.720017 23.627629 50.869141 25.478516 C 47.110989 21.720334 43.353845 17.96132 39.595703 14.203125 L 38.832031 14.583984 C 40.612781 16.364374 42.393467 18.144976 44.173828 19.925781 C 42.322952 21.776671 40.471966 23.627629 38.621094 25.478516 C 36.223621 23.081027 33.827154 20.682649 31.429688 18.285156 L 30.666016 18.666016 C 31.085929 19.085933 31.505868 19.505865 31.925781 19.925781 C 30.074681 21.776459 28.223696 23.627402 26.373047 25.478516 C 25.336667 24.442132 24.300048 23.405525 23.263672 22.369141 L 22.5 22.75 C 23.600238 23.850252 24.700544 24.950535 25.800781 26.050781 C 24.630311 27.221042 23.461486 28.390284 22.291016 29.560547 C 21.120545 28.390284 19.949771 27.221042 18.779297 26.050781 C 19.26935 25.560894 19.757993 25.069962 20.248047 24.580078 C 20.928449 25.260454 21.610614 25.940713 22.291016 26.621094 C 22.481504 26.430606 22.670821 26.2413 22.861328 26.050781 C 22.088051 25.277293 21.314289 24.503959 20.541016 23.730469 L 19.371094 24.314453 C 18.792313 24.89327 18.213549 25.471967 17.634766 26.050781 C 19.186273 27.602222 20.73952 29.153635 22.291016 30.705078 C 25.693388 27.302747 29.095674 23.90039 32.498047 20.498047 C 34.348919 22.348936 36.199893 24.199894 38.050781 26.050781 C 36.88031 27.221041 35.709529 28.390284 34.539062 29.560547 C 33.368773 28.390284 32.197633 27.221041 31.027344 26.050781 C 31.517227 25.560909 32.008163 25.069946 32.498047 24.580078 C 33.178437 25.260454 33.858672 25.940713 34.539062 26.621094 C 34.729588 26.430606 34.918868 26.2413 35.109375 26.050781 C 34.238462 25.17963 33.368956 24.308651 32.498047 23.4375 C 31.627164 24.308874 30.75608 25.179853 29.884766 26.050781 C 32.797251 28.963267 35.708608 31.874651 38.621094 34.787109 C 39.492018 33.915879 40.363099 33.044722 41.234375 32.173828 C 40.363296 31.302693 39.492173 30.431694 38.621094 29.560547 C 38.430568 29.751224 38.241303 29.942154 38.050781 30.132812 C 38.731172 30.813287 39.411395 31.493351 40.091797 32.173828 C 39.601974 32.663697 39.110977 33.15466 38.621094 33.644531 C 37.450611 32.474186 36.279857 31.303158 35.109375 30.132812 C 36.279857 28.962399 37.450611 27.791523 38.621094 26.621094 C 40.47197 28.471996 42.322952 30.322937 44.173828 32.173828 C 40.771456 35.57617 37.369169 38.978514 33.966797 42.380859 C 35.518516 43.932159 37.069804 45.483422 38.621094 47.035156 C 39.492188 46.164005 40.363281 45.293041 41.234375 44.421875 C 40.363281 43.551008 39.492188 42.681429 38.621094 41.810547 C 38.430568 42.001035 38.241288 42.190352 38.050781 42.380859 C 38.731172 43.06122 39.411395 43.741515 40.091797 44.421875 C 39.601883 44.912068 39.110951 45.402343 38.621094 45.892578 C 37.450902 44.721715 36.280084 43.551201 35.109375 42.380859 C 36.280027 41.210597 37.450788 40.039766 38.621094 38.869141 C 40.47197 40.719945 42.322952 42.571071 44.173828 44.421875 C 42.32316 46.273001 40.472178 48.123941 38.621094 49.974609 C 35.218736 46.57232 31.816435 43.169879 28.414062 39.767578 C 28.223537 39.958255 28.034299 40.149182 27.84375 40.339844 C 29.204742 41.700579 30.564804 43.061139 31.925781 44.421875 C 30.074904 46.272778 28.223923 48.123733 26.373047 49.974609 C 22.480765 46.082407 18.589533 42.191042 14.697266 38.298828 C 16.548142 36.447927 18.397174 34.596996 20.248047 32.746094 C 21.418336 33.916538 22.589477 35.087384 23.759766 36.257812 C 22.589477 37.428143 21.418336 38.597232 20.248047 39.767578 C 19.757993 39.277664 19.26935 38.788727 18.779297 38.298828 C 19.459873 37.618367 20.139725 36.93826 20.820312 36.257812 C 20.629787 36.067324 20.438569 35.876039 20.248047 35.685547 C 19.376953 36.556486 18.505871 37.427875 17.634766 38.298828 C 18.505871 39.169881 19.376953 40.041042 20.248047 40.912109 C 21.799361 39.360598 23.351029 37.809322 24.902344 36.257812 C 21.99004 33.345339 19.078308 30.432005 16.166016 27.519531 C 14.614508 29.071069 13.063226 30.622287 11.511719 32.173828 C 12.382628 33.044892 13.254091 33.916061 14.125 34.787109 C 14.996109 33.916061 15.867172 33.044892 16.738281 32.173828 C 16.547755 31.98334 16.356511 31.794012 16.166016 31.603516 C 15.485417 32.28388 14.805576 32.964156 14.125 33.644531 C 13.635117 33.15466 13.144184 32.663697 12.654297 32.173828 C 13.824783 31.003301 14.995534 29.832633 16.166016 28.662109 C 17.336305 29.832633 18.507419 31.003313 19.677734 32.173828 C 16.275351 35.57617 12.871134 38.978514 9.46875 42.380859 C 11.020473 43.932159 12.573716 45.483422 14.125 47.035156 C 14.996317 46.164217 15.867399 45.293249 16.738281 44.421875 C 15.867172 43.551008 14.996109 42.681429 14.125 41.810547 L 13.552734 42.380859 C 14.233306 43.06122 14.913178 43.7415 15.59375 44.421875 C 15.103674 44.912027 14.61508 45.40243 14.125 45.892578 C 12.9547 44.72207 11.783585 43.551371 10.613281 42.380859 C 11.78357 41.21043 12.9547 40.03957 14.125 38.869141 C 15.975876 40.719945 17.826847 42.571071 19.677734 44.421875 C 17.827074 46.273001 15.976099 48.123941 14.125 49.974609 C 10.232733 46.082407 6.3395213 42.191042 2.4472656 38.298828 C 4.298138 36.447927 6.1491125 34.596996 8 32.746094 C 9.1704554 33.916538 10.34126 35.087372 11.511719 36.257812 C 10.34126 37.428158 9.1704554 38.597221 8 39.767578 C 7.5101014 39.277695 7.0211486 38.788712 6.53125 38.298828 C 7.211667 37.618382 7.89186 36.93826 8.5722656 36.257812 C 8.3817396 36.067324 8.190492 35.876038 8 35.685547 C 7.1290721 36.556486 6.2576277 37.427875 5.3867188 38.298828 C 6.2576277 39.169881 7.1290721 40.041042 8 40.912109 C 9.551496 39.360598 11.102789 37.809322 12.654297 36.257812 C 10.746386 34.349909 8.8395532 32.441105 6.9316406 30.533203 L 6.1699219 30.916016 C 6.5892731 31.335389 7.0083782 31.754457 7.4277344 32.173828 C 4.0253621 35.57617 0.62307535 38.978514 -2.7792969 42.380859 C -1.2275741 43.932159 0.32371561 45.483422 1.875 47.035156 C 2.7460942 46.164005 3.6171871 45.293041 4.4882812 44.421875 C 3.6171871 43.551008 2.7460942 42.681429 1.875 41.810547 C 1.684474 42.001035 1.4951946 42.190352 1.3046875 42.380859 C 1.985078 43.06122 2.6653164 43.741515 3.3457031 44.421875 C 2.8558083 44.912068 2.364857 45.402343 1.875 45.892578 C 0.70481293 44.721715 -0.46405698 43.551201 -1.6347656 42.380859 C -0.46411367 41.210597 0.70469955 40.039766 1.875 38.869141 C 3.7258762 40.719945 5.5768582 42.571071 7.4277344 44.421875 C 5.5770698 46.273001 3.7260878 48.123941 1.875 49.974609 C -1.2906944 46.808938 -4.4553955 43.644199 -7.6210938 40.478516 L -7.6210938 41.621094 C -6.6872972 42.554679 -5.754109 43.488275 -4.8203125 44.421875 C -5.7541241 45.355702 -6.6872972 46.290786 -7.6210938 47.224609 L -7.6210938 48.367188 C -6.4967901 47.242895 -5.3723618 46.118433 -4.2480469 44.994141 C -2.3971593 46.845142 -0.54620003 48.695878 1.3046875 50.546875 C 0.13420185 51.717209 -1.0365607 52.888263 -2.2070312 54.058594 C -3.3773204 52.888278 -4.5484609 51.717209 -5.71875 50.546875 C -5.2288363 50.056825 -4.7379568 49.566225 -4.2480469 49.076172 C -3.567645 49.756732 -2.8874331 50.438569 -2.2070312 51.119141 C -2.0165053 50.928652 -1.8252727 50.737382 -1.6347656 50.546875 C -2.5056746 49.675826 -3.3771379 48.804661 -4.2480469 47.933594 C -5.1191373 48.804661 -5.9902226 49.675826 -6.8613281 50.546875 C -5.309817 52.098205 -3.7585273 53.649827 -2.2070312 55.201172 C 1.195341 51.798826 4.5976127 48.396471 8 44.994141 C 9.8508724 46.845142 11.701862 48.695878 13.552734 50.546875 C 12.382434 51.717209 11.211305 52.888278 10.041016 54.058594 C 8.8705451 52.888263 7.7017357 51.717209 6.53125 50.546875 C 7.0211637 50.056825 7.5100712 49.566225 8 49.076172 C 8.680572 49.756744 9.3604285 50.438569 10.041016 51.119141 C 10.231504 50.928652 10.422763 50.737382 10.613281 50.546875 C 9.7423572 49.67563 8.8712605 48.80448 8 47.933594 C 7.1290721 48.804661 6.2576277 49.675826 5.3867188 50.546875 C 8.2992075 53.459043 11.212893 56.372599 14.125 59.285156 C 14.996109 58.414191 15.867172 57.542841 16.738281 56.671875 C 15.867353 55.800626 14.996276 54.929491 14.125 54.058594 C 13.934512 54.24912 13.743241 54.438399 13.552734 54.628906 C 14.233321 55.309467 14.913167 55.991318 15.59375 56.671875 C 15.1037 57.161758 14.615054 57.650742 14.125 58.140625 C 12.9547 56.970211 11.78357 55.79932 10.613281 54.628906 C 11.78357 53.458579 12.9547 52.289468 14.125 51.119141 C 15.975876 52.970028 17.826847 54.820972 19.677734 56.671875 C 16.275351 60.0743 12.871134 63.476466 9.46875 66.878906 C 11.020427 68.430153 12.573674 69.981609 14.125 71.533203 C 14.996109 70.662139 15.867172 69.790986 16.738281 68.919922 C 15.867172 68.048854 14.996109 67.177689 14.125 66.306641 C 13.934512 66.497356 13.743241 66.688195 13.552734 66.878906 C 14.233306 67.559274 14.913178 68.239546 15.59375 68.919922 C 15.1037 69.409817 14.615054 69.898773 14.125 70.388672 C 12.954715 69.218439 11.78357 68.049127 10.613281 66.878906 C 11.783585 65.708368 12.9547 64.5377 14.125 63.367188 C 15.975876 65.218075 17.826847 67.069034 19.677734 68.919922 C 17.826847 70.770836 15.975876 72.621742 14.125 74.472656 C 10.722628 71.070216 7.320341 67.668069 3.9179688 64.265625 C 3.7274806 64.456113 3.5362253 64.645442 3.3457031 64.835938 C 4.7066959 66.196983 6.0667568 67.558903 7.4277344 68.919922 C 5.5768582 70.770836 3.7258762 72.621742 1.875 74.472656 C -1.2906944 71.306947 -4.4553955 68.140308 -7.6210938 64.974609 L -7.6210938 66.119141 C -6.6872972 67.052922 -5.7541241 67.986137 -4.8203125 68.919922 C -5.754109 69.853563 -6.6872972 70.787073 -7.6210938 71.720703 L -7.6210938 72.863281 C -6.4967901 71.738978 -5.3723618 70.616491 -4.2480469 69.492188 C -2.3971707 71.34309 -0.54620003 73.192077 1.3046875 75.042969 C 0.13420185 76.213394 -1.0365456 77.384255 -2.2070312 78.554688 C -3.3773317 77.384255 -4.5484458 76.213394 -5.71875 75.042969 C -5.2288665 74.553097 -4.7379303 74.064091 -4.2480469 73.574219 C -3.5676563 74.254598 -2.8874218 74.934874 -2.2070312 75.615234 C -2.0165053 75.424746 -1.8252727 75.233461 -1.6347656 75.042969 C -2.5056746 74.171999 -3.3771379 73.302606 -4.2480469 72.431641 C -5.1191373 73.302606 -5.9902226 74.171999 -6.8613281 75.042969 C -5.309817 76.594393 -3.7585273 78.145845 -2.2070312 79.697266 C 1.195341 76.294946 4.5976127 72.894514 8 69.492188 C 9.8508724 71.34309 11.701862 73.192077 13.552734 75.042969 C 12.382434 76.213394 11.211305 77.384255 10.041016 78.554688 C 8.8705338 77.384255 7.7017357 76.213394 6.53125 75.042969 C 7.0211335 74.553097 7.5101014 74.064091 8 73.574219 C 8.680572 74.254598 9.3604285 74.934874 10.041016 75.615234 C 10.231504 75.424746 10.422763 75.233461 10.613281 75.042969 C 9.7421758 74.171999 8.8710904 73.302606 8 72.431641 C 7.1290721 73.302606 6.2576277 74.171999 5.3867188 75.042969 C 6.9380485 76.594578 8.4893382 78.146019 10.041016 79.697266 C 13.443388 76.294946 16.84566 72.894514 20.248047 69.492188 C 22.098923 71.34309 23.949909 73.192077 25.800781 75.042969 C 24.630144 76.213243 23.461316 77.384081 22.291016 78.554688 C 21.120715 77.384081 19.949937 76.213243 18.779297 75.042969 C 19.26935 74.55307 19.757993 74.064106 20.248047 73.574219 C 20.928449 74.254598 21.610614 74.934874 22.291016 75.615234 C 22.481504 75.424746 22.670821 75.233461 22.861328 75.042969 C 21.990415 74.171999 21.118956 73.302606 20.248047 72.431641 C 19.376953 73.302606 18.505871 74.171999 17.634766 75.042969 C 19.186095 76.594578 20.739338 78.146019 22.291016 79.697266 C 25.693388 76.294946 29.095674 72.894514 32.498047 69.492188 C 34.348919 71.34309 36.199893 73.192077 38.050781 75.042969 C 36.880294 76.213394 35.709548 77.384255 34.539062 78.554688 C 33.368773 77.384255 32.197644 76.213394 31.027344 75.042969 C 31.517227 74.553097 32.008163 74.064091 32.498047 73.574219 C 33.178437 74.254598 33.858672 74.934874 34.539062 75.615234 C 34.729588 75.424746 34.918868 75.233461 35.109375 75.042969 C 34.238462 74.171999 33.368956 73.302606 32.498047 72.431641 C 31.626953 73.302606 30.755857 74.171999 29.884766 75.042969 C 32.797251 77.955435 35.708608 80.868784 38.621094 83.78125 C 39.492188 82.910186 40.363281 82.039025 41.234375 81.167969 C 40.363281 80.296992 39.492188 79.425657 38.621094 78.554688 C 38.430568 78.745176 38.241288 78.936461 38.050781 79.126953 C 38.731172 79.807427 39.411395 80.487495 40.091797 81.167969 C 39.601883 81.658026 39.110992 82.148618 38.621094 82.638672 C 37.450611 81.468122 36.279857 80.297507 35.109375 79.126953 C 36.280027 77.956694 37.450788 76.785856 38.621094 75.615234 C 40.47197 77.466145 42.322952 79.317051 44.173828 81.167969 L 33.966797 91.375 C 34.175139 91.583347 34.383455 91.791652 34.591797 92 L 35.734375 92 C 35.526058 91.791674 35.317692 91.583326 35.109375 91.375 C 36.279846 90.204752 37.450622 89.035486 38.621094 87.865234 C 40.000015 89.243851 41.379079 90.621197 42.757812 92 L 43.900391 92 C 42.331245 90.4308 40.762502 88.862171 39.193359 87.292969 C 41.044232 85.44207 42.895206 83.591129 44.746094 81.740234 C 45.916394 82.910841 47.087161 84.079741 48.257812 85.25 C 47.087331 86.42052 45.916561 87.59121 44.746094 88.761719 C 44.25618 88.271684 43.765304 87.783015 43.275391 87.292969 C 43.955811 86.612518 44.636001 85.930462 45.316406 85.25 C 45.12588 85.059512 44.936601 84.870198 44.746094 84.679688 C 43.875181 85.550653 43.003725 86.421999 42.132812 87.292969 C 43.003725 88.164033 43.875181 89.035182 44.746094 89.90625 C 46.297798 88.35495 47.849121 86.801749 49.400391 85.25 C 45.998007 81.847666 42.595743 78.445311 39.193359 75.042969 C 41.044232 73.192081 42.895206 71.341133 44.746094 69.490234 L 44.765625 69.511719 L 44.787109 69.53125 C 46.624375 71.368527 48.461551 73.20568 50.298828 75.042969 C 49.128528 76.213398 47.957398 77.384255 46.787109 78.554688 C 45.616624 77.384255 44.445876 76.213398 43.275391 75.042969 C 43.765274 74.5531 44.256195 74.064091 44.746094 73.574219 C 45.426666 74.254598 46.106522 74.934874 46.787109 75.615234 C 46.977598 75.424746 47.168868 75.233461 47.359375 75.042969 C 46.48827 74.172003 45.617184 73.302606 44.746094 72.431641 L 42.132812 75.042969 C 43.684142 76.594578 45.235432 78.146019 46.787109 79.697266 C 50.189478 76.294946 53.591757 72.892561 56.994141 69.490234 C 58.845013 71.341133 60.695999 73.192081 62.546875 75.042969 C 61.376238 76.213243 60.205457 77.384081 59.035156 78.554688 C 57.864856 77.384081 56.694074 76.213243 55.523438 75.042969 C 56.013487 74.553074 56.504091 74.064106 56.994141 73.574219 C 57.674543 74.254598 58.354751 74.934874 59.035156 75.615234 C 59.225644 75.424746 59.416915 75.233461 59.607422 75.042969 C 58.736513 74.172003 57.86505 73.302606 56.994141 72.431641 C 56.12305 73.302606 55.251969 74.172003 54.380859 75.042969 C 55.932189 76.594578 57.483479 78.146019 59.035156 79.697266 C 62.437525 76.294946 65.839819 72.892561 69.242188 69.490234 C 71.093075 71.341133 72.944046 73.192081 74.794922 75.042969 C 73.624448 76.213398 72.453681 77.384255 71.283203 78.554688 C 70.11291 77.384255 68.943738 76.213398 67.773438 75.042969 C 68.263321 74.5531 68.752308 74.064091 69.242188 73.574219 C 69.922582 74.254598 70.602805 74.934874 71.283203 75.615234 C 71.473691 75.424746 71.664965 75.233461 71.855469 75.042969 C 70.984556 74.172003 70.1131 73.302606 69.242188 72.431641 C 68.371097 73.302606 67.5 74.172003 66.628906 75.042969 C 68.180406 76.594397 69.7317 78.145845 71.283203 79.697266 C 74.685583 76.294946 78.087851 72.892561 81.490234 69.490234 C 83.341111 71.341133 85.192093 73.192081 87.042969 75.042969 C 85.872676 76.213398 84.703492 77.384255 83.533203 78.554688 C 82.362725 77.384255 81.191959 76.213398 80.021484 75.042969 C 80.511375 74.5531 81.000351 74.064091 81.490234 73.574219 C 82.170806 74.254598 82.85262 74.934874 83.533203 75.615234 C 83.723691 75.424746 83.913012 75.233461 84.103516 75.042969 C 83.232418 74.172003 82.361332 73.302606 81.490234 72.431641 C 80.619322 73.302606 79.749819 74.172003 78.878906 75.042969 C 81.791206 77.955435 84.702931 80.868784 87.615234 83.78125 C 88.486506 82.91036 89.357592 82.039207 90.228516 81.167969 C 89.357418 80.296992 88.486332 79.425653 87.615234 78.554688 C 87.424708 78.745176 87.233483 78.936461 87.042969 79.126953 C 87.723594 79.807438 88.405324 80.487484 89.085938 81.167969 C 88.595585 81.657818 88.105095 82.148331 87.615234 82.638672 C 86.44493 81.468118 85.273816 80.297518 84.103516 79.126953 C 85.273816 77.956528 86.44493 76.785675 87.615234 75.615234 C 89.076792 77.076822 90.53844 78.538407 92 80 L 92 78.855469 C 90.729154 77.584637 89.458343 76.313801 88.1875 75.042969 C 89.458307 73.772152 90.729192 72.501294 92 71.230469 L 92 70.087891 L 87.615234 74.472656 C 83.722967 70.580348 79.829778 66.687215 75.9375 62.794922 C 77.788376 60.944019 79.639358 59.093075 81.490234 57.242188 C 82.660701 58.412518 83.831475 59.583579 85.001953 60.753906 C 83.831475 61.92435 82.660712 63.0952 81.490234 64.265625 C 81.000351 63.775757 80.511375 63.28479 80.021484 62.794922 C 80.701905 62.11435 81.382102 61.434478 82.0625 60.753906 C 81.872012 60.563418 81.680749 60.372133 81.490234 60.181641 C 80.619322 61.052708 79.749819 61.923843 78.878906 62.794922 C 79.749819 63.665789 80.619322 64.537321 81.490234 65.408203 C 83.041927 63.856945 84.595177 62.305546 86.146484 60.753906 C 83.233999 57.841561 80.320692 54.929935 77.408203 52.017578 C 75.856696 53.569101 74.30541 55.120349 72.753906 56.671875 C 73.625012 57.542841 74.49609 58.414191 75.367188 59.285156 C 76.238278 58.414191 77.109378 57.542829 77.980469 56.671875 C 77.789792 56.481387 77.59888 56.290116 77.408203 56.099609 C 76.727805 56.779973 76.047586 57.460261 75.367188 58.140625 C 74.877304 57.650753 74.386368 57.161743 73.896484 56.671875 C 75.066777 55.501457 76.23791 54.33057 77.408203 53.160156 C 78.578863 54.330389 79.749629 55.501265 80.919922 56.671875 C 77.517538 60.0743 74.115259 63.476466 70.712891 66.878906 C 72.264561 68.430149 73.815869 69.981609 75.367188 71.533203 C 76.238112 70.661958 77.109186 69.790804 77.980469 68.919922 C 77.109186 68.049039 76.238112 67.177886 75.367188 66.306641 C 75.176699 66.497356 74.985437 66.688188 74.794922 66.878906 C 75.47532 67.559255 76.155539 68.239562 76.835938 68.919922 C 76.346043 69.409805 75.857082 69.898804 75.367188 70.388672 C 74.196725 69.218439 73.025936 68.049135 71.855469 66.878906 C 73.025947 65.708364 74.196713 64.537715 75.367188 63.367188 C 77.218064 65.218079 79.069034 67.069034 80.919922 68.919922 C 79.069034 70.77084 77.218064 72.621742 75.367188 74.472656 C 71.474928 70.580348 67.581724 66.687215 63.689453 62.794922 C 65.540329 60.944019 67.391315 59.093075 69.242188 57.242188 C 70.41248 58.412503 71.583625 59.583591 72.753906 60.753906 C 71.583613 61.92435 70.412492 63.095211 69.242188 64.265625 C 68.752308 63.775757 68.263321 63.28479 67.773438 62.794922 C 68.453854 62.11435 69.134036 61.434478 69.814453 60.753906 C 69.623927 60.563418 69.43271 60.372133 69.242188 60.181641 C 68.371267 61.052886 67.500182 61.924039 66.628906 62.794922 C 67.5 63.665789 68.371097 64.537321 69.242188 65.408203 C 70.793695 63.856764 72.344977 62.305349 73.896484 60.753906 C 70.494101 57.351693 67.091825 53.949123 63.689453 50.546875 C 65.540329 48.695874 67.391315 46.845142 69.242188 44.994141 L 69.263672 45.013672 L 69.283203 45.035156 C 71.120469 46.872558 72.957656 48.709488 74.794922 50.546875 C 73.624448 51.717206 72.45367 52.888263 71.283203 54.058594 C 70.11291 52.888278 68.943738 51.717206 67.773438 50.546875 C 68.263351 50.056825 68.752278 49.566225 69.242188 49.076172 C 69.922593 49.756729 70.602805 50.438569 71.283203 51.119141 C 71.473691 50.928652 71.664965 50.737382 71.855469 50.546875 C 70.984556 49.675826 70.1131 48.804658 69.242188 47.933594 C 68.371097 48.804658 67.5 49.675826 66.628906 50.546875 C 68.180406 52.098205 69.7317 53.649831 71.283203 55.201172 C 74.685583 51.79883 78.087851 48.396471 81.490234 44.994141 C 83.341111 46.845142 85.192093 48.695874 87.042969 50.546875 C 85.872687 51.717206 84.703492 52.888278 83.533203 54.058594 C 82.362736 52.888263 81.191959 51.717206 80.021484 50.546875 C 80.511398 50.056825 81.000328 49.566225 81.490234 49.076172 C 82.170818 49.756744 82.85262 50.438569 83.533203 51.119141 C 83.723691 50.928652 83.913012 50.737382 84.103516 50.546875 C 83.232418 49.675826 82.361332 48.804658 81.490234 47.933594 C 80.619322 48.804658 79.749819 49.675826 78.878906 50.546875 C 80.430402 52.098205 81.981707 53.649831 83.533203 55.201172 C 86.355345 52.378908 89.177867 49.556633 92 46.734375 L 92 45.589844 C 90.538542 47.051524 89.076965 48.513219 87.615234 49.974609 C 84.212873 46.572324 80.810564 43.169879 77.408203 39.767578 C 77.217639 39.958255 77.02646 40.149185 76.835938 40.339844 C 78.196915 41.700583 79.55894 43.061135 80.919922 44.421875 C 79.069265 46.273001 77.218283 48.123949 75.367188 49.974609 C 71.474928 46.08241 67.581724 42.191042 63.689453 38.298828 C 65.540329 36.44793 67.391315 34.596996 69.242188 32.746094 C 70.412492 33.916534 71.583613 35.087384 72.753906 36.257812 C 71.583625 37.428143 70.41248 38.597232 69.242188 39.767578 C 68.752308 39.277691 68.263321 38.788715 67.773438 38.298828 C 68.453839 37.618386 69.134036 36.93826 69.814453 36.257812 C 69.623927 36.067324 69.43271 35.876039 69.242188 35.685547 C 68.371097 36.556486 67.5 37.427879 66.628906 38.298828 C 67.500182 39.169711 68.371267 40.040879 69.242188 40.912109 C 70.793695 39.360602 72.344977 37.809322 73.896484 36.257812 C 70.983996 33.345339 68.072641 30.432005 65.160156 27.519531 C 63.608672 29.071073 62.057355 30.622291 60.505859 32.173828 C 61.37695 33.044896 62.248035 33.91606 63.119141 34.787109 C 63.990053 33.91606 64.859556 33.044896 65.730469 32.173828 C 65.539981 31.98334 65.350675 31.794008 65.160156 31.603516 C 64.479762 32.283876 63.799531 32.964171 63.119141 33.644531 C 62.629061 33.154636 62.138517 32.663727 61.648438 32.173828 C 62.818934 31.003305 63.989655 29.832632 65.160156 28.662109 C 66.330638 29.832633 67.501393 31.003305 68.671875 32.173828 C 65.269491 35.57617 61.867212 38.978514 58.464844 42.380859 C 60.01634 43.932382 61.567629 45.483645 63.119141 47.035156 C 63.990053 46.164005 64.859556 45.293037 65.730469 44.421875 C 64.859556 43.551008 63.990053 42.681429 63.119141 41.810547 C 62.928615 42.001073 62.737397 42.190352 62.546875 42.380859 C 63.227281 43.06122 63.9075 43.741511 64.587891 44.421875 C 64.097981 44.912023 63.609054 45.402426 63.119141 45.892578 C 61.948659 44.72204 60.777908 43.551383 59.607422 42.380859 C 60.777908 41.21043 61.948659 40.039581 63.119141 38.869141 C 64.969832 40.720111 66.820821 42.571252 68.671875 44.421875 C 66.821003 46.272778 64.970013 48.123737 63.119141 49.974609 C 59.22687 46.08241 55.333673 42.191042 51.441406 38.298828 C 53.292294 36.44793 55.143264 34.596996 56.994141 32.746094 C 58.164426 33.916534 59.33557 35.087384 60.505859 36.257812 C 59.33557 37.428143 58.164426 38.597232 56.994141 39.767578 C 56.504091 39.277664 56.013487 38.78873 55.523438 38.298828 C 56.204009 37.618371 56.885819 36.93826 57.566406 36.257812 C 57.37588 36.067324 57.184663 35.876039 56.994141 35.685547 C 56.12305 36.556486 55.251969 37.427879 54.380859 38.298828 C 55.251969 39.169881 56.12305 40.041049 56.994141 40.912109 C 58.545455 39.360602 60.097108 37.809322 61.648438 36.257812 C 58.736134 33.345339 55.824402 30.432005 52.912109 27.519531 C 51.360598 29.071073 49.809309 30.622291 48.257812 32.173828 C 49.128725 33.044896 49.998232 33.91606 50.869141 34.787109 C 51.74025 33.91606 52.611313 33.044896 53.482422 32.173828 C 53.291896 31.98334 53.102605 31.794008 52.912109 31.603516 C 52.231526 32.283876 51.549716 32.964156 50.869141 33.644531 C 50.379257 33.154663 49.890278 32.663701 49.400391 32.173828 C 50.570876 31.003305 51.741628 29.832632 52.912109 28.662109 C 54.082414 29.832633 55.251571 31.003316 56.421875 32.173828 C 53.019488 35.57617 49.617227 38.978514 46.214844 42.380859 C 47.766567 43.932159 49.317856 45.483418 50.869141 47.035156 C 51.740458 46.164217 52.611539 45.293249 53.482422 44.421875 C 52.611313 43.551008 51.74025 42.681429 50.869141 41.810547 C 50.678652 42.001073 50.489335 42.190352 50.298828 42.380859 C 50.97943 43.06122 51.659257 43.7415 52.339844 44.421875 C 51.849597 44.911925 51.359024 45.402162 50.869141 45.892578 C 49.699078 44.721786 48.52983 43.551258 47.359375 42.380859 C 48.529679 41.21043 49.69884 40.039566 50.869141 38.869141 C 52.720017 40.719945 54.570999 42.571071 56.421875 44.421875 C 54.57121 46.273001 52.72024 48.123949 50.869141 49.974609 C 46.976874 46.08241 43.085615 42.191042 39.193359 38.298828 C 41.044232 36.44793 42.895206 34.596996 44.746094 32.746094 C 45.916394 33.916716 47.087161 35.087539 48.257812 36.257812 C 47.087342 37.428158 45.916549 38.597217 44.746094 39.767578 C 44.256195 39.277691 43.765289 38.788715 43.275391 38.298828 C 43.955811 37.618386 44.636001 36.93826 45.316406 36.257812 C 45.12588 36.067324 44.936601 35.876039 44.746094 35.685547 C 43.875181 36.556486 43.003725 37.427879 42.132812 38.298828 C 43.003725 39.169881 43.875181 40.041049 44.746094 40.912109 C 46.29759 39.360602 47.848895 37.809322 49.400391 36.257812 C 45.998007 32.855471 42.595743 29.453128 39.193359 26.050781 C 41.044232 24.199894 42.895206 22.348936 44.746094 20.498047 L 44.765625 20.517578 L 44.787109 20.539062 C 46.624598 22.37613 48.461777 24.213281 50.298828 26.050781 C 49.128543 27.221041 47.957398 28.390288 46.787109 29.560547 C 45.616639 28.390288 44.445861 27.221041 43.275391 26.050781 C 43.765274 25.560913 44.256195 25.069946 44.746094 24.580078 C 45.426666 25.260469 46.106522 25.940714 46.787109 26.621094 C 46.977598 26.430568 47.168868 26.241303 47.359375 26.050781 C 46.488058 25.179857 45.616961 24.308874 44.746094 23.4375 C 43.875181 24.308651 43.003725 25.179634 42.132812 26.050781 L 46.787109 30.705078 C 50.189478 27.302751 53.591757 23.900394 56.994141 20.498047 C 58.845013 22.348936 60.695999 24.199894 62.546875 26.050781 C 61.376404 27.221041 60.205627 28.390288 59.035156 29.560547 C 57.864686 28.390288 56.693908 27.221041 55.523438 26.050781 C 56.013487 25.560898 56.504091 25.069962 56.994141 24.580078 C 57.674543 25.260454 58.354751 25.940714 59.035156 26.621094 C 59.225644 26.430568 59.416915 26.241303 59.607422 26.050781 C 58.736513 25.179634 57.86505 24.308651 56.994141 23.4375 C 56.12305 24.308651 55.251969 25.179634 54.380859 26.050781 C 55.932374 27.602225 57.48366 29.153639 59.035156 30.705078 C 62.437525 27.302751 65.839819 23.900394 69.242188 20.498047 C 71.093075 22.348936 72.944046 24.199894 74.794922 26.050781 C 73.624459 27.221041 72.45367 28.390288 71.283203 29.560547 C 70.112922 28.390288 68.943727 27.221041 67.773438 26.050781 C 68.263321 25.560913 68.752308 25.069947 69.242188 24.580078 C 69.922582 25.260454 70.602805 25.940714 71.283203 26.621094 C 71.473691 26.430568 71.664965 26.241303 71.855469 26.050781 C 70.984556 25.179634 70.1131 24.308651 69.242188 23.4375 C 68.37132 24.308874 67.500223 25.179857 66.628906 26.050781 C 68.180599 27.60204 69.7319 29.153442 71.283203 30.705078 C 74.685583 27.302751 78.087851 23.900394 81.490234 20.498047 C 83.341326 22.348728 85.192312 24.199671 87.042969 26.050781 C 85.872687 27.221041 84.703492 28.390288 83.533203 29.560547 C 82.362736 28.390288 81.191959 27.221041 80.021484 26.050781 C 80.511375 25.560913 81.000351 25.069947 81.490234 24.580078 C 82.170806 25.260469 82.85262 25.940714 83.533203 26.621094 C 83.723691 26.430568 83.913012 26.241303 84.103516 26.050781 C 83.232198 25.179857 82.361113 24.308874 81.490234 23.4375 C 80.619322 24.308651 79.749819 25.179634 78.878906 26.050781 C 81.791206 28.96327 84.702931 31.874651 87.615234 34.787109 C 88.486332 33.91606 89.357418 33.044896 90.228516 32.173828 C 89.357437 31.302696 88.48631 30.431698 87.615234 29.560547 C 87.424708 29.751224 87.233502 29.942154 87.042969 30.132812 C 87.723571 30.813286 88.405328 31.493339 89.085938 32.173828 C 88.595869 32.663727 88.105303 33.154636 87.615234 33.644531 C 86.444941 32.474189 85.273816 31.303155 84.103516 30.132812 C 85.273816 28.962398 86.44493 27.791519 87.615234 26.621094 C 89.076792 28.082673 90.53844 29.544286 92 31.005859 L 92 29.863281 C 90.729154 28.592448 89.458343 27.321616 88.1875 26.050781 C 89.458307 24.779964 90.729192 23.509103 92 22.238281 L 92 21.09375 C 90.53844 22.555324 89.076792 24.016946 87.615234 25.478516 C 83.722967 21.586218 79.829778 17.693093 75.9375 13.800781 C 77.788376 11.949893 79.639358 10.098934 81.490234 8.2480469 C 82.660701 9.4183927 83.831475 10.589408 85.001953 11.759766 C 83.83129 12.929998 82.660516 14.100878 81.490234 15.271484 C 81.000351 14.781616 80.511375 14.290653 80.021484 13.800781 C 80.701905 13.120239 81.382102 12.440312 82.0625 11.759766 C 81.872012 11.569277 81.680749 11.378007 81.490234 11.1875 C 80.619322 12.058568 79.749819 12.929732 78.878906 13.800781 C 79.749819 14.671668 80.619322 15.543195 81.490234 16.414062 C 83.041916 14.862816 84.595166 13.31136 86.146484 11.759766 C 83.233999 8.8471941 80.320692 5.9340561 77.408203 3.0214844 C 75.856923 4.5732335 74.305629 6.1264349 72.753906 7.6777344 C 73.625012 8.5489117 74.49609 9.4198383 75.367188 10.291016 C 76.238278 9.4198648 77.109378 8.5488962 77.980469 7.6777344 C 77.789792 7.4872462 77.59888 7.2959872 77.408203 7.1054688 C 76.727794 7.7860256 76.047597 8.4659275 75.367188 9.1464844 C 74.877285 8.6564346 74.386391 8.1677992 73.896484 7.6777344 C 75.066766 6.5075057 76.23791 5.3362443 77.408203 4.1660156 C 78.57867 5.3362594 79.749455 6.5074906 80.919922 7.6777344 C 77.517538 11.080175 74.115259 14.48234 70.712891 17.884766 C 72.264387 19.436209 73.815691 20.987623 75.367188 22.539062 C 76.238289 21.66818 77.109359 20.796649 77.980469 19.925781 C 77.109359 19.054615 76.238289 18.183662 75.367188 17.3125 C 75.176699 17.503102 74.985437 17.694191 74.794922 17.884766 C 75.47532 18.565338 76.155528 19.245221 76.835938 19.925781 C 76.346043 20.41565 75.857082 20.904663 75.367188 21.394531 C 74.196713 20.224089 73.025947 19.055221 71.855469 17.884766 C 73.025947 16.714439 74.196725 15.543366 75.367188 14.373047 C 77.218283 16.223726 79.069265 18.074656 80.919922 19.925781 C 79.069034 21.776671 77.218064 23.627628 75.367188 25.478516 C 71.474928 21.586218 67.581724 17.693093 63.689453 13.800781 C 65.540329 11.949893 67.391315 10.098934 69.242188 8.2480469 C 70.41248 9.4183776 71.583625 10.58942 72.753906 11.759766 C 71.583613 12.930179 70.412492 14.101071 69.242188 15.271484 C 68.752308 14.781616 68.263321 14.290653 67.773438 13.800781 C 68.453854 13.120239 69.134036 12.440312 69.814453 11.759766 C 69.623927 11.569277 69.43271 11.378007 69.242188 11.1875 C 68.371097 12.058568 67.5 12.929732 66.628906 13.800781 C 67.5 14.671668 68.371097 15.543195 69.242188 16.414062 C 70.793695 14.86265 72.344977 13.31119 73.896484 11.759766 C 70.628217 8.4914546 67.360054 5.2233898 64.091797 1.9550781 z M 62.488281 2.7558594 L 60.199219 3.9003906 C 59.81123 4.288398 59.423147 4.6764476 59.035156 5.0644531 C 58.905609 4.9349009 58.776032 4.8053337 58.646484 4.6757812 L 57.884766 5.0566406 C 59.629398 6.8013126 61.374512 8.5463369 63.119141 10.291016 L 65.730469 7.6777344 L 63.119141 5.0644531 C 62.928615 5.2549413 62.737397 5.4462268 62.546875 5.6367188 C 63.227281 6.3170677 63.9075 6.9973737 64.587891 7.6777344 C 64.097992 8.1677992 63.609039 8.6564346 63.119141 9.1464844 C 61.948659 7.9760441 60.777908 6.8071477 59.607422 5.6367188 C 60.567637 4.6764602 61.528072 3.7161114 62.488281 2.7558594 z M 89.65625 3.0214844 C 88.104754 4.5730108 86.553449 6.126227 85.001953 7.6777344 L 87.615234 10.291016 L 90.228516 7.6777344 C 90.038027 7.4872462 89.846768 7.2959607 89.65625 7.1054688 C 88.975451 7.7858291 88.295655 8.4657575 87.615234 9.1464844 C 87.125317 8.6564346 86.636402 8.1677992 86.146484 7.6777344 C 87.316951 6.5074906 88.485783 5.3362594 89.65625 4.1660156 C 90.437306 4.9470359 91.218939 5.7287432 92 6.5097656 L 92 5.3652344 C 91.218873 4.5840365 90.437377 3.8026839 89.65625 3.0214844 z M 55.925781 6.0371094 L 55.164062 6.4179688 C 55.583676 6.8375597 56.002264 7.2581447 56.421875 7.6777344 C 53.019488 11.080175 49.617227 14.48234 46.214844 17.884766 C 47.76634 19.436209 49.317645 20.987623 50.869141 22.539062 C 51.74025 21.66818 52.611313 20.796649 53.482422 19.925781 C 52.611313 19.054615 51.74025 18.183662 50.869141 17.3125 C 50.678652 17.503102 50.489335 17.694191 50.298828 17.884766 C 50.979234 18.565576 51.658962 19.245448 52.339844 19.925781 C 51.849681 20.415608 51.359262 20.904633 50.869141 21.394531 C 49.69884 20.2241 48.529679 19.055209 47.359375 17.884766 C 50.57124 14.673044 53.782275 11.459787 56.994141 8.2480469 C 58.164426 9.4183776 59.33557 10.58942 60.505859 11.759766 C 59.33557 12.930179 58.164426 14.101071 56.994141 15.271484 C 56.504091 14.781605 56.013487 14.29068 55.523438 13.800781 C 56.20387 13.120069 56.885626 12.440111 57.566406 11.759766 C 57.37588 11.569277 57.184663 11.378007 56.994141 11.1875 C 56.122865 12.058386 55.251787 12.929551 54.380859 13.800781 C 55.251969 14.671668 56.12305 15.543195 56.994141 16.414062 C 58.545455 14.86265 60.097108 13.31119 61.648438 11.759766 C 59.740971 9.8521238 57.833245 7.9447468 55.925781 6.0371094 z M 53.203125 7.3984375 L 52.033203 7.9824219 C 51.645223 8.3703859 51.257117 8.7585164 50.869141 9.1464844 C 50.740148 9.0174553 50.611407 8.8888011 50.482422 8.7597656 L 49.71875 9.140625 C 50.102276 9.5242686 50.485615 9.907372 50.869141 10.291016 C 51.74025 9.4198383 52.611313 8.5489117 53.482422 7.6777344 C 53.389276 7.5846071 53.296264 7.4915671 53.203125 7.3984375 z M 92 8.8457031 C 88.986949 11.858807 85.973994 14.871673 82.960938 17.884766 C 84.512445 19.436209 86.063727 20.987623 87.615234 22.539062 C 88.486332 21.66818 89.357418 20.796649 90.228516 19.925781 C 89.357418 19.054615 88.486332 18.183662 87.615234 17.3125 C 87.424708 17.503102 87.233483 17.694191 87.042969 17.884766 C 87.723374 18.565576 88.405048 19.245447 89.085938 19.925781 C 88.595771 20.415608 88.105348 20.904633 87.615234 21.394531 C 86.44493 20.224101 85.273816 19.05521 84.103516 17.884766 C 85.273805 16.71445 86.444941 15.543366 87.615234 14.373047 C 89.076965 15.834452 90.538542 17.296136 92 18.757812 L 92 17.613281 C 90.729101 16.342431 89.458397 15.071634 88.1875 13.800781 C 89.458307 12.529964 90.729192 11.259103 92 9.9882812 L 92 8.8457031 z M 47.759766 10.119141 L 46.998047 10.5 C 47.417936 10.91984 47.837927 11.339921 48.257812 11.759766 C 47.087145 12.929998 45.916368 14.100878 44.746094 15.271484 C 44.256195 14.781616 43.765274 14.290653 43.275391 13.800781 C 43.955811 13.12024 44.636001 12.440311 45.316406 11.759766 C 45.223586 11.666963 45.131875 11.573286 45.039062 11.480469 L 43.867188 12.066406 C 43.289179 12.644511 42.710817 13.222686 42.132812 13.800781 C 43.003725 14.671668 43.875181 15.543195 44.746094 16.414062 C 46.29776 14.862816 47.849076 13.31136 49.400391 11.759766 C 48.853567 11.212926 48.306589 10.665979 47.759766 10.119141 z M 92 12.927734 C 91.709045 13.218738 91.417912 13.509781 91.126953 13.800781 C 91.417912 14.091728 91.709045 14.382885 92 14.673828 L 92 12.927734 z M 37.988281 15.005859 L 35.703125 16.148438 C 35.124344 16.727228 34.545578 17.305976 33.966797 17.884766 C 35.518293 19.436209 37.069578 20.987624 38.621094 22.539062 C 39.492184 21.66818 40.363281 20.796648 41.234375 19.925781 C 40.363281 19.054615 39.492184 18.183663 38.621094 17.3125 C 38.430568 17.503102 38.239335 17.69419 38.048828 17.884766 C 38.729219 18.565338 39.41138 19.24522 40.091797 19.925781 C 39.601902 20.41565 39.110973 20.904663 38.621094 21.394531 C 37.450607 20.224089 36.279861 19.055221 35.109375 17.884766 C 36.068939 16.925332 37.028724 15.965286 37.988281 15.005859 z M 28.707031 19.646484 L 27.535156 20.232422 C 27.147551 20.620019 26.760651 21.006936 26.373047 21.394531 C 26.244096 21.265622 26.115275 21.136726 25.986328 21.007812 L 25.222656 21.388672 C 25.606157 21.772118 25.989526 22.155636 26.373047 22.539062 C 27.243956 21.66818 28.11542 20.796648 28.986328 19.925781 C 28.893249 19.832675 28.80011 19.739591 28.707031 19.646484 z M 92 25.177734 C 91.709045 25.46877 91.417912 25.759748 91.126953 26.050781 C 91.417982 26.341799 91.708971 26.63281 92 26.923828 L 92 25.177734 z M 13.492188 27.253906 L 11.205078 28.398438 C 10.817369 28.786135 10.428725 29.172846 10.041016 29.560547 C 9.9120489 29.431603 9.7832641 29.302772 9.6542969 29.173828 L 8.890625 29.554688 C 9.2741057 29.938155 9.6575363 30.321612 10.041016 30.705078 C 11.191416 29.554692 12.341787 28.404295 13.492188 27.253906 z M 28.414062 27.519531 C 27.638413 28.295366 26.863552 29.071836 26.087891 29.847656 C 25.312056 30.623374 24.535612 31.398122 23.759766 32.173828 C 24.63086 33.044896 25.501938 33.91606 26.373047 34.787109 C 27.243956 33.91606 28.11542 33.044896 28.986328 32.173828 C 28.79584 31.98334 28.60458 31.794008 28.414062 31.603516 C 27.733672 32.283876 27.053434 32.964171 26.373047 33.644531 C 25.882967 33.154637 25.392424 32.663727 24.902344 32.173828 C 26.072841 31.003305 27.243562 29.832633 28.414062 28.662109 C 29.584547 29.832633 30.755296 31.003305 31.925781 32.173828 C 28.523408 35.57617 25.121122 38.978514 21.71875 42.380859 C 23.270246 43.932382 24.821532 45.483645 26.373047 47.035156 C 27.243956 46.164005 28.11542 45.293037 28.986328 44.421875 C 28.11542 43.551008 27.243956 42.681429 26.373047 41.810547 C 26.182521 42.001073 25.9913 42.190352 25.800781 42.380859 C 26.481183 43.06122 27.161406 43.741511 27.841797 44.421875 C 27.351887 44.912023 26.862957 45.402426 26.373047 45.892578 C 25.202561 44.72204 24.031814 43.551383 22.861328 42.380859 C 26.073208 39.169006 29.286181 35.957944 32.498047 32.746094 C 33.668351 33.916716 34.837161 35.087539 36.007812 36.257812 C 34.837357 37.428158 33.668517 38.597217 32.498047 39.767578 C 32.008163 39.277691 31.517227 38.788715 31.027344 38.298828 C 31.707749 37.618386 32.387942 36.93826 33.068359 36.257812 C 32.877833 36.067324 32.688569 35.876039 32.498047 35.685547 C 31.626956 36.556486 30.755857 37.427879 29.884766 38.298828 C 30.756038 39.169711 31.627123 40.040879 32.498047 40.912109 C 34.049558 39.360602 35.600848 37.809322 37.152344 36.257812 C 34.239844 33.345339 31.326547 30.432005 28.414062 27.519531 z M 77.408203 27.519531 C 76.632546 28.295366 75.857696 29.071836 75.082031 29.847656 C 74.306189 30.623374 73.529756 31.398122 72.753906 32.173828 C 73.625189 33.044726 74.496263 33.915875 75.367188 34.787109 C 76.238123 33.915936 77.109239 33.044726 77.980469 32.173828 C 77.789792 31.98334 77.59888 31.794037 77.408203 31.603516 C 76.727805 32.283876 76.047586 32.964171 75.367188 33.644531 C 74.877304 33.154663 74.386368 32.663701 73.896484 32.173828 C 75.066777 31.003316 76.237899 29.832632 77.408203 28.662109 C 78.578681 29.832633 79.749444 31.003305 80.919922 32.173828 C 77.517538 35.57617 74.115259 38.978514 70.712891 42.380859 C 72.264613 43.932159 73.815911 45.483418 75.367188 47.035156 C 76.238289 46.164005 77.109359 45.293037 77.980469 44.421875 C 77.109359 43.551008 76.238289 42.681429 75.367188 41.810547 C 75.176699 42.001073 74.985437 42.190352 74.794922 42.380859 C 75.47532 43.06122 76.155539 43.741511 76.835938 44.421875 C 76.34602 44.912065 75.857052 45.402343 75.367188 45.892578 C 74.196997 44.721715 73.026174 43.551201 71.855469 42.380859 C 75.067338 39.169006 78.278369 35.957944 81.490234 32.746094 C 82.660539 33.916716 83.831301 35.087539 85.001953 36.257812 C 83.831475 37.428158 82.660701 38.597217 81.490234 39.767578 C 81.00034 39.277691 80.511375 38.788715 80.021484 38.298828 C 80.701894 37.618386 81.382102 36.93826 82.0625 36.257812 C 81.872012 36.067324 81.680749 35.876039 81.490234 35.685547 C 80.619322 36.556486 79.749819 37.427879 78.878906 38.298828 C 79.749819 39.169881 80.619322 40.041049 81.490234 40.912109 C 83.04173 39.360602 84.594992 37.809322 86.146484 36.257812 C 83.233999 33.345339 80.320692 30.432005 77.408203 27.519531 z M 4.2089844 31.894531 L 3.0410156 32.478516 C 2.6524937 32.867015 2.2635156 33.256031 1.875 33.644531 C 1.7457758 33.515309 1.6175078 33.385081 1.4882812 33.255859 L 0.7265625 33.636719 C 1.1097643 34.019985 1.4918 34.403848 1.875 34.787109 C 2.7459279 33.915879 3.6170057 33.044722 4.4882812 32.173828 C 4.3948832 32.080541 4.3023733 31.987821 4.2089844 31.894531 z M 92 33.341797 C 88.986955 36.354814 85.973994 39.367837 82.960938 42.380859 C 84.512664 43.932159 86.063946 45.483418 87.615234 47.035156 C 88.486552 46.164217 89.357633 45.293249 90.228516 44.421875 C 89.357418 43.551008 88.486332 42.681429 87.615234 41.810547 C 87.424708 42.001073 87.233483 42.190352 87.042969 42.380859 C 87.723571 43.06122 88.405343 43.7415 89.085938 44.421875 C 88.59568 44.911925 88.105114 45.402162 87.615234 45.892578 C 86.445161 44.721786 85.273982 43.551258 84.103516 42.380859 C 85.273816 41.21043 86.44493 40.039566 87.615234 38.869141 C 89.076792 40.330645 90.53844 41.792406 92 43.253906 L 92 42.111328 C 90.728995 40.840404 89.458504 39.569755 88.1875 38.298828 C 89.458307 37.028004 90.729192 35.757151 92 34.486328 L 92 33.341797 z M -1.234375 34.617188 L -1.9960938 34.998047 C -1.5761895 35.417903 -1.1562784 35.837998 -0.73632812 36.257812 C -1.9067987 37.428158 -3.0775726 38.597217 -4.2480469 39.767578 C -4.7379266 39.277691 -5.2288665 38.788715 -5.71875 38.298828 C -5.0383481 37.618386 -4.35814 36.93826 -3.6777344 36.257812 C -3.7708801 36.164685 -3.8638952 36.071645 -3.9570312 35.978516 L -5.125 36.5625 C -5.7037805 37.141178 -6.2825443 37.720148 -6.8613281 38.298828 C -5.9900374 39.169711 -5.1189672 40.040879 -4.2480469 40.912109 C -2.6965319 39.360602 -1.1452309 37.809322 0.40625 36.257812 C -0.14062876 35.710925 -0.68749514 35.164074 -1.234375 34.617188 z M 92 37.425781 C 91.709045 37.716748 91.417912 38.007861 91.126953 38.298828 C 91.417912 38.58983 91.709045 38.880871 92 39.171875 L 92 37.425781 z M 20.248047 44.994141 L 20.269531 45.013672 L 20.289062 45.035156 C 22.12634 46.872558 23.963515 48.709488 25.800781 50.546875 C 24.630311 51.717206 23.459533 52.888263 22.289062 54.058594 C 21.118596 52.888263 19.949767 51.717206 18.779297 50.546875 C 19.269195 50.056629 19.757801 49.56607 20.248047 49.076172 C 20.928453 49.756729 21.608661 50.438569 22.289062 51.119141 C 22.479551 50.928652 22.670825 50.737382 22.861328 50.546875 C 21.990419 49.675826 21.118956 48.804658 20.248047 47.933594 C 19.37676 48.80448 18.50569 49.67563 17.634766 50.546875 C 19.186277 52.098205 20.737566 53.649831 22.289062 55.201172 C 25.691435 51.79883 29.095674 48.396471 32.498047 44.994141 C 34.348934 46.845142 36.197939 48.695874 38.048828 50.546875 C 36.878341 51.717206 35.709533 52.888263 34.539062 54.058594 C 33.368773 52.888278 32.197644 51.717206 31.027344 50.546875 C 31.517257 50.056825 32.008137 49.566225 32.498047 49.076172 C 33.178464 49.756729 33.858672 50.438569 34.539062 51.119141 C 34.729588 50.928652 34.918872 50.737382 35.109375 50.546875 C 34.238466 49.675826 33.368956 48.804658 32.498047 47.933594 C 31.626956 48.804658 30.755857 49.675826 29.884766 50.546875 C 31.436262 52.098205 32.987566 53.649831 34.539062 55.201172 C 37.941451 51.79883 41.343706 48.396471 44.746094 44.994141 C 46.596966 46.845142 48.447956 48.695874 50.298828 50.546875 C 49.128528 51.717206 47.957398 52.888278 46.787109 54.058594 C 45.616639 52.888263 44.445876 51.717206 43.275391 50.546875 C 43.765316 50.056825 44.256169 49.566225 44.746094 49.076172 C 45.426666 49.756744 46.106522 50.438569 46.787109 51.119141 C 46.977598 50.928652 47.168868 50.737382 47.359375 50.546875 C 46.48827 49.675826 45.617184 48.804658 44.746094 47.933594 C 43.875181 48.804658 43.003725 49.675826 42.132812 50.546875 C 43.684312 52.098205 45.235613 53.649831 46.787109 55.201172 C 50.189478 51.79883 53.591757 48.396471 56.994141 44.994141 C 58.845028 46.845142 60.695999 48.695874 62.546875 50.546875 C 61.376404 51.717206 60.205627 52.888263 59.035156 54.058594 C 57.864686 52.888263 56.693908 51.717206 55.523438 50.546875 C 56.013336 50.056629 56.503891 49.56607 56.994141 49.076172 C 57.674543 49.756729 58.354751 50.438569 59.035156 51.119141 C 59.225644 50.928652 59.416915 50.737382 59.607422 50.546875 C 58.736513 49.675826 57.86505 48.804658 56.994141 47.933594 C 56.122865 48.80448 55.251787 49.67563 54.380859 50.546875 C 57.293348 53.459235 60.206641 56.372796 63.119141 59.285156 C 63.990053 58.414191 64.859556 57.542841 65.730469 56.671875 C 64.859556 55.800822 63.990053 54.929658 63.119141 54.058594 C 62.928615 54.24912 62.737397 54.438399 62.546875 54.628906 C 63.227281 55.309467 63.907489 55.991329 64.587891 56.671875 C 64.098022 57.161743 63.609024 57.650753 63.119141 58.140625 C 61.948474 56.970393 60.777711 55.799517 59.607422 54.628906 C 60.777892 53.458564 61.948659 52.289486 63.119141 51.119141 C 64.970013 52.970028 66.821003 54.820972 68.671875 56.671875 C 65.269491 60.0743 61.867212 63.476466 58.464844 66.878906 C 60.01634 68.430315 61.567629 69.981775 63.119141 71.533203 C 63.990053 70.662139 64.859556 69.79099 65.730469 68.919922 C 64.859556 68.048858 63.990053 67.177689 63.119141 66.306641 C 62.928615 66.497356 62.737397 66.688188 62.546875 66.878906 C 63.227281 67.559255 63.9075 68.239562 64.587891 68.919922 C 64.098022 69.409805 63.609024 69.898804 63.119141 70.388672 C 61.94867 69.218439 60.777892 68.049135 59.607422 66.878906 C 60.777681 65.708156 61.948447 64.537488 63.119141 63.367188 C 64.970013 65.218079 66.821003 67.069034 68.671875 68.919922 C 66.82078 70.770602 64.969794 72.621504 63.119141 74.472656 C 59.716757 71.070216 56.314466 67.668065 52.912109 64.265625 C 52.721583 64.456113 52.530336 64.645449 52.339844 64.835938 C 53.70064 66.196972 55.061064 67.558903 56.421875 68.919922 C 54.570999 70.77084 52.720017 72.621742 50.869141 74.472656 C 46.976874 70.580348 43.085615 66.687215 39.193359 62.794922 C 41.044232 60.944019 42.895206 59.093075 44.746094 57.242188 C 45.916549 58.412518 47.087342 59.583579 48.257812 60.753906 C 47.087342 61.92435 45.916549 63.0952 44.746094 64.265625 C 44.256195 63.775757 43.765274 63.28479 43.275391 62.794922 C 43.955811 62.11435 44.636001 61.434478 45.316406 60.753906 C 45.12588 60.563418 44.936601 60.372133 44.746094 60.181641 C 43.875181 61.052708 43.003725 61.923843 42.132812 62.794922 C 43.003725 63.665789 43.875181 64.537321 44.746094 65.408203 C 46.297786 63.856945 47.849076 62.305546 49.400391 60.753906 C 46.487906 57.841561 43.574598 54.929935 40.662109 52.017578 C 39.11081 53.569101 37.559127 55.120349 36.007812 56.671875 C 36.87874 57.542841 37.75018 58.414191 38.621094 59.285156 C 39.492184 58.414191 40.363281 57.542841 41.234375 56.671875 C 41.043698 56.481387 40.852813 56.290101 40.662109 56.099609 C 39.981707 56.779973 39.301481 57.460261 38.621094 58.140625 C 38.131207 57.650753 37.642231 57.161743 37.152344 56.671875 C 38.322634 55.501457 39.491824 54.33057 40.662109 53.160156 C 41.832776 54.330389 43.003539 55.501265 44.173828 56.671875 C 40.771456 60.0743 37.369169 63.476466 33.966797 66.878906 C 35.518474 68.430149 37.069763 69.981609 38.621094 71.533203 C 39.492014 70.661958 40.363099 69.790804 41.234375 68.919922 C 40.363099 68.049039 39.492014 67.177886 38.621094 66.306641 C 38.430568 66.497356 38.239335 66.688188 38.048828 66.878906 L 40.091797 68.919922 C 39.601902 69.409805 39.110973 69.898804 38.621094 70.388672 C 37.450618 69.218439 36.279849 68.049135 35.109375 66.878906 C 36.279861 65.708364 37.450607 64.537715 38.621094 63.367188 C 40.471966 65.218079 42.322952 67.069034 44.173828 68.919922 L 38.621094 74.472656 C 34.728822 70.580348 30.83758 66.687215 26.945312 62.794922 C 28.796184 60.944019 30.647174 59.093075 32.498047 57.242188 C 33.668517 58.412518 34.837357 59.583579 36.007812 60.753906 C 34.837346 61.92435 33.668517 63.0952 32.498047 64.265625 C 32.008163 63.775757 31.517227 63.28479 31.027344 62.794922 C 31.707765 62.11435 32.387942 61.434478 33.068359 60.753906 C 32.877833 60.563418 32.688569 60.372133 32.498047 60.181641 C 31.627123 61.052886 30.756038 61.924039 29.884766 62.794922 C 30.755857 63.665789 31.626956 64.537321 32.498047 65.408203 C 34.049558 63.856764 35.600848 62.305349 37.152344 60.753906 C 34.239844 57.841561 31.326547 54.929935 28.414062 52.017578 C 26.862582 53.569101 25.311262 55.120349 23.759766 56.671875 C 24.63086 57.542841 25.501938 58.414191 26.373047 59.285156 C 27.243956 58.414191 28.11542 57.542841 28.986328 56.671875 C 28.79584 56.481387 28.60458 56.290101 28.414062 56.099609 C 27.733672 56.779973 27.053434 57.460261 26.373047 58.140625 C 25.882967 57.650726 25.392424 57.161758 24.902344 56.671875 C 26.072841 55.501446 27.243581 54.33057 28.414062 53.160156 C 29.584547 54.33057 30.755296 55.501446 31.925781 56.671875 C 28.523393 60.0743 25.121122 63.476466 21.71875 66.878906 C 23.270246 68.430315 24.821532 69.981775 26.373047 71.533203 C 27.243956 70.662139 28.11542 69.79099 28.986328 68.919922 C 28.11542 68.048858 27.243956 67.177689 26.373047 66.306641 C 26.182521 66.497356 25.9913 66.688188 25.800781 66.878906 C 26.481183 67.559255 27.161406 68.239562 27.841797 68.919922 C 27.351925 69.409805 26.862927 69.898804 26.373047 70.388672 C 25.202573 69.218439 24.031802 68.049135 22.861328 66.878906 C 24.031591 65.708156 25.202334 64.537488 26.373047 63.367188 C 28.223919 65.218079 30.074908 67.069034 31.925781 68.919922 C 30.07467 70.770602 28.223681 72.621504 26.373047 74.472656 C 22.480765 70.580348 18.587583 66.687215 14.695312 62.794922 C 16.546189 60.944019 18.397174 59.093075 20.248047 57.242188 C 21.418336 58.412503 22.58948 59.583591 23.759766 60.753906 C 22.58948 61.92435 21.418336 63.095211 20.248047 64.265625 C 19.757967 63.775726 19.269373 63.284805 18.779297 62.794922 C 19.460092 62.114516 20.139937 61.434716 20.820312 60.753906 C 20.629787 60.563418 20.438569 60.372133 20.248047 60.181641 C 19.376956 61.052708 18.505871 61.923843 17.634766 62.794922 C 18.505871 63.665789 19.376956 64.537321 20.248047 65.408203 C 21.799361 63.856764 23.351029 62.305349 24.902344 60.753906 C 21.500334 57.351511 18.09767 53.948926 14.695312 50.546875 C 16.5462 48.695874 18.397159 46.845142 20.248047 44.994141 z M 92 49.673828 C 91.709045 49.964832 91.417912 50.255874 91.126953 50.546875 C 91.417982 50.837871 91.708971 51.128925 92 51.419922 L 92 49.673828 z M 3.9160156 52.017578 C 3.1403508 52.793296 2.3655086 53.568028 1.5898438 54.34375 C 0.814194 55.119555 0.039336745 55.896067 -0.73632812 56.671875 C 0.13459596 57.542841 1.0040873 58.414191 1.875 59.285156 L 4.4882812 56.671875 C 4.2975663 56.481387 4.1067041 56.290101 3.9160156 56.099609 C 3.23561 56.779973 2.5553905 57.460261 1.875 58.140625 C 1.3851165 57.650753 0.89614857 57.161743 0.40625 56.671875 C 1.5765542 55.501457 2.7457152 54.33057 3.9160156 53.160156 C 5.0866827 54.330389 6.2574453 55.501265 7.4277344 56.671875 C 4.0253659 60.0743 0.62307158 63.476466 -2.7792969 66.878906 C -1.2276194 68.430149 0.32367026 69.981609 1.875 71.533203 C 2.7459241 70.661958 3.6170095 69.790804 4.4882812 68.919922 C 3.6170095 68.049039 2.7459241 67.177886 1.875 66.306641 C 1.684474 66.497356 1.4951946 66.688188 1.3046875 66.878906 C 1.9850818 67.559255 2.6653126 68.239562 3.3457031 68.919922 C 2.8558197 69.409805 2.3648835 69.898804 1.875 70.388672 C 0.70452947 69.218439 -0.46429509 68.049135 -1.6347656 66.878906 C 1.5770995 63.666984 4.7881349 60.454106 8 57.242188 C 9.1704592 58.412518 10.34126 59.583579 11.511719 60.753906 C 10.34143 61.924532 9.1706368 63.095366 8 64.265625 C 7.5101052 63.775757 7.0211335 63.28479 6.53125 62.794922 C 7.211667 62.11435 7.8918486 61.434478 8.5722656 60.753906 C 8.3817396 60.563418 8.190492 60.372133 8 60.181641 C 7.1290759 61.052708 6.2576277 61.923843 5.3867188 62.794922 L 8 65.408203 C 9.5516926 63.856945 11.102982 62.305546 12.654297 60.753906 C 9.7418081 57.841561 6.8285044 54.929935 3.9160156 52.017578 z M 52.912109 52.017578 C 52.136263 52.793296 51.359831 53.568028 50.583984 54.34375 C 49.808335 55.119555 49.033462 55.896067 48.257812 56.671875 C 49.128725 57.542841 49.998232 58.414191 50.869141 59.285156 C 51.74025 58.414191 52.611313 57.542841 53.482422 56.671875 C 53.291896 56.481387 53.102605 56.290101 52.912109 56.099609 C 52.231526 56.779973 51.549716 57.460246 50.869141 58.140625 C 50.379257 57.650753 49.890278 57.161743 49.400391 56.671875 C 50.57068 55.501265 51.741446 54.330389 52.912109 53.160156 C 54.082398 54.33057 55.251571 55.501457 56.421875 56.671875 C 53.019488 60.0743 49.617227 63.476466 46.214844 66.878906 C 47.766521 68.430149 49.317815 69.981609 50.869141 71.533203 C 51.74025 70.662139 52.611313 69.79099 53.482422 68.919922 C 52.611313 68.048858 51.74025 67.177689 50.869141 66.306641 C 50.678652 66.497356 50.489335 66.688188 50.298828 66.878906 C 50.97943 67.559267 51.659257 68.239546 52.339844 68.919922 C 51.849779 69.40982 51.359221 69.898773 50.869141 70.388672 C 49.698855 69.218439 48.529664 68.049124 47.359375 66.878906 C 50.57124 63.666984 53.782275 60.454106 56.994141 57.242188 C 58.164426 58.412503 59.33557 59.583591 60.505859 60.753906 C 59.33557 61.92435 58.164426 63.095211 56.994141 64.265625 C 56.504091 63.775742 56.013487 63.284805 55.523438 62.794922 C 56.204021 62.11435 56.885819 61.434478 57.566406 60.753906 C 57.37588 60.563418 57.184663 60.372133 56.994141 60.181641 C 56.12305 61.052708 55.251969 61.923843 54.380859 62.794922 C 55.251969 63.665789 56.12305 64.537321 56.994141 65.408203 C 58.545455 63.856764 60.097108 62.305349 61.648438 60.753906 C 58.736134 57.841561 55.824402 54.929935 52.912109 52.017578 z M 89.65625 52.017578 C 88.104754 53.569101 86.553449 55.120349 85.001953 56.671875 C 85.872866 57.542841 86.744322 58.414191 87.615234 59.285156 C 88.486332 58.414191 89.357418 57.542841 90.228516 56.671875 C 90.038027 56.481387 89.846768 56.290101 89.65625 56.099609 C 88.975667 56.779973 88.295806 57.460246 87.615234 58.140625 C 87.12534 57.650753 86.636372 57.161743 86.146484 56.671875 C 87.316777 55.501265 88.48559 54.330389 89.65625 53.160156 C 90.437313 53.9413 91.218941 54.722758 92 55.503906 L 92 54.361328 C 91.218785 53.580099 90.437465 52.798807 89.65625 52.017578 z M -7.6210938 52.726562 L -7.6210938 53.869141 C -6.6872972 54.802937 -5.7541204 55.73809 -4.8203125 56.671875 C -5.7541204 57.605672 -6.6872972 58.53886 -7.6210938 59.472656 L -7.6210938 60.615234 C -6.4967901 59.491127 -5.3723618 58.366295 -4.2480469 57.242188 C -3.0775726 58.412518 -1.9067873 59.583579 -0.73632812 60.753906 C -1.9067987 61.92435 -3.0775726 63.0952 -4.2480469 64.265625 C -4.7379266 63.775757 -5.2288665 63.28479 -5.71875 62.794922 C -5.038333 62.11435 -4.35814 61.434478 -3.6777344 60.753906 C -3.8682604 60.563418 -4.0575247 60.372133 -4.2480469 60.181641 C -5.1189672 61.052886 -5.9900374 61.924039 -6.8613281 62.794922 C -5.9902226 63.665789 -5.1191373 64.537321 -4.2480469 65.408203 C -2.6965319 63.856764 -1.1452309 62.305349 0.40625 60.753906 C -2.2695496 58.078277 -4.9452828 55.402196 -7.6210938 52.726562 z M 92 57.839844 C 88.986949 60.85294 85.973994 63.8658 82.960938 66.878906 C 84.512619 68.430149 86.063901 69.981609 87.615234 71.533203 C 88.486332 70.662139 89.357418 69.79099 90.228516 68.919922 C 89.357418 68.048858 88.486332 67.177689 87.615234 66.306641 C 87.424708 66.497356 87.233483 66.688188 87.042969 66.878906 C 87.723571 67.559267 88.405343 68.239546 89.085938 68.919922 C 88.595869 69.40982 88.105303 69.898773 87.615234 70.388672 C 86.444941 69.218439 85.273805 68.049124 84.103516 66.878906 C 85.273816 65.708364 86.44493 64.5377 87.615234 63.367188 C 89.076792 64.82876 90.53844 66.29038 92 67.751953 L 92 66.607422 C 90.729101 65.336574 89.458397 64.065769 88.1875 62.794922 C 89.458307 61.524095 90.729192 60.253244 92 58.982422 L 92 57.839844 z M 92 61.921875 L 91.126953 62.794922 C 91.417912 63.085862 91.709045 63.377028 92 63.667969 L 92 61.921875 z M 92 74.169922 C 91.708937 74.461006 91.418021 74.751887 91.126953 75.042969 C 91.41795 75.334018 91.708992 75.62498 92 75.916016 L 92 74.169922 z M 3.9179688 76.513672 C 2.3666541 78.065206 0.8149865 79.616431 -0.73632812 81.167969 C 0.13459218 82.039025 1.004091 82.910186 1.875 83.78125 C 2.7460942 82.910186 3.6171871 82.039025 4.4882812 81.167969 L 3.9179688 80.595703 C 3.2375669 81.276286 2.5554057 81.958092 1.875 82.638672 C 1.3850901 82.148618 0.89617503 81.658026 0.40625 81.167969 C 1.5765505 79.997623 2.7476834 78.826596 3.9179688 77.65625 C 5.0884431 78.826596 6.2572638 79.997612 7.4277344 81.167969 L -2.7792969 91.375 C -2.570955 91.583347 -2.3626388 91.791652 -2.1542969 92 L -1.0097656 92 C -1.2181405 91.791616 -1.4263899 91.583384 -1.6347656 91.375 C -0.46429509 90.204752 0.70452947 89.035486 1.875 87.865234 C 3.2539208 89.243851 4.632984 90.621197 6.0117188 92 L 7.1542969 92 C 5.5852823 90.430931 4.0162773 88.862041 2.4472656 87.292969 C 4.298138 85.44207 6.1491125 83.591129 8 81.740234 C 9.1704554 82.910667 10.34126 84.079567 11.511719 85.25 C 10.341244 86.42052 9.1704705 87.59121 8 88.761719 C 7.5100712 88.271684 7.0211637 87.783015 6.53125 87.292969 C 7.211667 86.612518 7.89186 85.930462 8.5722656 85.25 C 8.3817396 85.059512 8.190492 84.870202 8 84.679688 C 7.1290721 85.550653 6.2576277 86.422003 5.3867188 87.292969 C 6.2576277 88.164033 7.1290721 89.035186 8 89.90625 C 9.5517039 88.35495 11.103028 86.801749 12.654297 85.25 C 9.7418119 82.337534 6.8304575 79.426134 3.9179688 76.513672 z M 16.166016 76.513672 C 14.614508 78.065206 13.063226 79.616431 11.511719 81.167969 C 12.382628 82.039025 13.254091 82.910186 14.125 83.78125 C 14.996276 82.91036 15.867353 82.03921 16.738281 81.167969 C 16.547755 80.977443 16.356511 80.786206 16.166016 80.595703 C 15.485417 81.276264 14.805587 81.9581 14.125 82.638672 C 13.63509 82.148626 13.144211 81.658007 12.654297 81.167969 C 13.824767 79.997612 14.995534 78.826596 16.166016 77.65625 C 17.336305 78.826596 18.507434 79.997623 19.677734 81.167969 C 16.275351 84.570284 12.871134 87.972684 9.46875 91.375 C 9.6770482 91.583304 9.8854513 91.791696 10.09375 92 L 11.238281 92 C 11.029998 91.791674 10.821567 91.583324 10.613281 91.375 C 11.78357 90.204764 12.954715 89.035474 14.125 87.865234 C 15.503921 89.243851 16.882981 90.621197 18.261719 92 L 19.404297 92 C 17.835151 90.430799 16.266413 88.862173 14.697266 87.292969 C 16.548142 85.44207 18.397174 83.591129 20.248047 81.740234 C 21.418336 82.910667 22.589477 84.079567 23.759766 85.25 C 22.589461 86.420512 21.418336 87.591222 20.248047 88.761719 C 19.757812 88.271824 19.269211 87.783189 18.779297 87.292969 C 19.459873 86.612506 20.139725 85.930462 20.820312 85.25 C 20.629787 85.059512 20.438569 84.870202 20.248047 84.679688 C 19.376953 85.550653 18.505871 86.422003 17.634766 87.292969 C 18.50569 88.164207 19.376756 89.03536 20.248047 89.90625 C 21.799361 88.354724 23.351029 86.801519 24.902344 85.25 C 21.99004 82.337534 19.078308 79.426134 16.166016 76.513672 z M 28.414062 76.513672 C 27.638413 77.28948 26.863552 78.065992 26.087891 78.841797 C 25.312056 79.61753 24.535612 80.39224 23.759766 81.167969 C 24.63069 82.039207 25.501756 82.91036 26.373047 83.78125 C 27.243956 82.910186 28.11542 82.039021 28.986328 81.167969 C 28.79584 80.977481 28.60458 80.786203 28.414062 80.595703 C 27.733687 81.276328 27.053392 81.958002 26.373047 82.638672 C 25.88319 82.148267 25.39276 81.657784 24.902344 81.167969 C 26.07312 79.997861 27.24372 78.826781 28.414062 77.65625 C 29.584547 78.826596 30.755296 79.997612 31.925781 81.167969 L 21.71875 91.375 C 21.92706 91.583378 22.135431 91.79163 22.34375 92 L 23.486328 92 C 23.278011 91.791674 23.069646 91.583326 22.861328 91.375 C 26.073208 88.163165 29.286181 84.952054 32.498047 81.740234 C 33.668351 82.910841 34.837161 84.079741 36.007812 85.25 C 34.837346 86.42052 33.668517 87.59121 32.498047 88.761719 C 32.008137 88.271684 31.517257 87.783015 31.027344 87.292969 C 31.707749 86.612518 32.387942 85.930462 33.068359 85.25 C 32.877833 85.059512 32.688569 84.870198 32.498047 84.679688 C 31.626956 85.550653 30.755857 86.421999 29.884766 87.292969 C 30.755857 88.164033 31.626956 89.035182 32.498047 89.90625 L 37.152344 85.25 C 34.239844 82.337534 31.326547 79.426134 28.414062 76.513672 z M 52.912109 76.513672 C 51.360598 78.065209 49.809309 79.616431 48.257812 81.167969 C 49.128725 82.039021 49.998232 82.910186 50.869141 83.78125 C 51.740416 82.91036 52.611494 82.039207 53.482422 81.167969 C 53.291896 80.977481 53.102605 80.786203 52.912109 80.595703 C 52.231526 81.276264 51.549728 81.9581 50.869141 82.638672 C 50.379231 82.148626 49.890304 81.658003 49.400391 81.167969 C 50.570861 79.997612 51.741628 78.826596 52.912109 77.65625 C 54.082398 78.826596 55.251571 79.997623 56.421875 81.167969 C 53.019488 84.570284 49.617227 87.972684 46.214844 91.375 C 46.423186 91.583347 46.631501 91.791652 46.839844 92 L 47.984375 92 C 47.776034 91.791617 47.567718 91.583382 47.359375 91.375 C 48.529664 90.20476 49.698855 89.035474 50.869141 87.865234 C 52.248073 89.243851 53.627123 90.621197 55.005859 92 L 56.148438 92 C 54.579423 90.430931 53.010429 88.86204 51.441406 87.292969 C 53.292294 85.44207 55.143264 83.591129 56.994141 81.740234 C 58.164426 82.910667 59.33557 84.079567 60.505859 85.25 C 59.335555 86.420508 58.164426 87.591218 56.994141 88.761719 C 56.503906 88.271824 56.013347 87.783189 55.523438 87.292969 C 56.204009 86.612506 56.885819 85.930462 57.566406 85.25 C 57.37588 85.059512 57.184663 84.870198 56.994141 84.679688 C 56.12305 85.550653 55.251969 86.421999 54.380859 87.292969 C 55.251787 88.164207 56.122865 89.035356 56.994141 89.90625 C 58.545455 88.35472 60.097108 86.801515 61.648438 85.25 C 58.736134 82.337534 55.824402 79.426134 52.912109 76.513672 z M 65.160156 76.513672 C 63.608672 78.065209 62.057355 79.616431 60.505859 81.167969 C 61.376783 82.039207 62.247854 82.91036 63.119141 83.78125 C 63.990053 82.910186 64.859556 82.039021 65.730469 81.167969 C 65.539981 80.977481 65.350675 80.786203 65.160156 80.595703 C 64.479777 81.276328 63.79949 81.958002 63.119141 82.638672 C 62.629284 82.148267 62.138854 81.657784 61.648438 81.167969 C 62.819214 79.997861 63.98981 78.826781 65.160156 77.65625 C 66.330638 78.826596 67.501408 79.997612 68.671875 81.167969 C 65.269507 84.570284 61.867212 87.972684 58.464844 91.375 C 58.673154 91.583378 58.881525 91.79163 59.089844 92 L 60.232422 92 C 60.024105 91.791674 59.81574 91.583326 59.607422 91.375 C 60.777892 90.204752 61.94867 89.035486 63.119141 87.865234 C 64.497935 89.243983 65.877064 90.621261 67.255859 92 L 68.396484 92 C 66.82747 90.430931 65.258471 88.86204 63.689453 87.292969 C 65.540329 85.44207 67.391315 83.591129 69.242188 81.740234 C 70.412492 82.910667 71.583613 84.079567 72.753906 85.25 C 71.583613 86.420508 70.412492 87.591218 69.242188 88.761719 C 68.752278 88.271684 68.263351 87.783015 67.773438 87.292969 C 68.453839 86.612518 69.134036 85.930462 69.814453 85.25 C 69.623927 85.059512 69.43271 84.870198 69.242188 84.679688 C 68.371097 85.550653 67.5 86.421999 66.628906 87.292969 C 67.5 88.164033 68.371097 89.035182 69.242188 89.90625 C 70.793695 88.35472 72.344977 86.801515 73.896484 85.25 L 65.160156 76.513672 z M 77.408203 76.513672 C 76.632546 77.28948 75.857696 78.065992 75.082031 78.841797 C 74.306189 79.61753 73.529756 80.39224 72.753906 81.167969 C 73.625012 82.039021 74.49609 82.910186 75.367188 83.78125 C 76.238278 82.910209 77.109378 82.03901 77.980469 81.167969 C 77.789792 80.977443 77.59888 80.786225 77.408203 80.595703 C 76.727794 81.276286 76.047597 81.958089 75.367188 82.638672 C 74.877285 82.148615 74.386391 81.658026 73.896484 81.167969 C 75.066777 79.997623 76.23791 78.826596 77.408203 77.65625 C 78.57867 78.826596 79.749444 79.997612 80.919922 81.167969 C 77.517538 84.570284 74.115259 87.972684 70.712891 91.375 L 71.337891 92 L 72.480469 92 C 72.272152 91.791674 72.063785 91.583326 71.855469 91.375 C 75.067338 88.163165 78.278369 84.952054 81.490234 81.740234 C 82.660539 82.910841 83.831301 84.079741 85.001953 85.25 C 83.831475 86.42052 82.660712 87.59121 81.490234 88.761719 C 81.000328 88.271684 80.511398 87.783015 80.021484 87.292969 C 80.701894 86.612518 81.382102 85.930462 82.0625 85.25 C 81.872012 85.059512 81.680749 84.870198 81.490234 84.679688 C 80.619322 85.550653 79.749819 86.421999 78.878906 87.292969 C 79.749819 88.164033 80.619322 89.035182 81.490234 89.90625 C 83.041957 88.35495 84.595208 86.801749 86.146484 85.25 C 83.233999 82.337534 80.320692 79.426134 77.408203 76.513672 z M -7.6210938 77.222656 L -7.6210938 78.367188 C -6.6872972 79.300829 -5.754109 80.234327 -4.8203125 81.167969 C -5.7541204 82.101754 -6.6872972 83.034969 -7.6210938 83.96875 L -7.6210938 85.113281 C -6.4967901 83.988981 -5.3723618 82.864523 -4.2480469 81.740234 C -3.0777426 82.910841 -1.9069801 84.079741 -0.73632812 85.25 C -1.9067987 86.42052 -3.0775726 87.59121 -4.2480469 88.761719 C -4.7379568 88.271684 -5.2288401 87.783015 -5.71875 87.292969 C -5.0383481 86.612518 -4.35814 85.930462 -3.6777344 85.25 C -3.8682604 85.059512 -4.0575247 84.870198 -4.2480469 84.679688 C -5.1191373 85.550653 -5.9902226 86.421999 -6.8613281 87.292969 C -5.9902226 88.164033 -5.1191373 89.035182 -4.2480469 89.90625 C -2.6965319 88.35472 -1.1452309 86.801515 0.40625 85.25 C -2.2695496 82.574174 -4.9452828 79.898482 -7.6210938 77.222656 z M 92 82.335938 C 88.986955 85.348935 85.973994 88.362004 82.960938 91.375 C 83.169281 91.583347 83.377594 91.791652 83.585938 92 L 84.728516 92 C 84.520232 91.791675 84.3118 91.583324 84.103516 91.375 C 85.273805 90.20476 86.444941 89.035474 87.615234 87.865234 C 88.994152 89.243851 90.37322 90.621197 91.751953 92 L 92 92 L 92 91.105469 C 90.728996 89.834481 89.458504 88.563958 88.1875 87.292969 C 89.458307 86.022144 90.729192 84.751288 92 83.480469 L 92 82.335938 z M 92 86.419922 C 91.709045 86.710895 91.417912 87.001995 91.126953 87.292969 C 91.417912 87.583974 91.709045 87.87501 92 88.166016 L 92 86.419922 z M 28.414062 88.761719 C 28.223537 88.952207 28.034272 89.14347 27.84375 89.333984 C 28.732637 90.222818 29.620892 91.111162 30.509766 92 L 31.652344 92 C 30.572904 90.920574 29.493502 89.841144 28.414062 88.761719 z M 77.408203 88.761719 C 77.217715 88.952207 77.026441 89.14347 76.835938 89.333984 C 77.725054 90.222805 78.614959 91.11101 79.503906 92 L 80.646484 92 C 79.567047 90.920574 78.487642 89.841144 77.408203 88.761719 z M -7.6210938 89.472656 L -7.6210938 90.615234 C -7.159405 91.07694 -6.6980187 91.5383 -6.2363281 92 L -5.09375 92 C -5.9362869 91.157411 -6.778557 90.315244 -7.6210938 89.472656 z M 1.875 90.802734 C 1.684474 90.993223 1.4951946 91.184508 1.3046875 91.375 C 1.5130368 91.583405 1.7213379 91.791594 1.9296875 92 L 3.0722656 92 C 2.6731743 91.600927 2.2740887 91.201811 1.875 90.802734 z M 14.125 90.802734 C 13.934512 90.993223 13.743241 91.184508 13.552734 91.375 C 13.761144 91.583405 13.969325 91.791597 14.177734 92 L 15.322266 92 C 14.923166 91.600933 14.524172 91.201726 14.125 90.802734 z M 26.373047 90.802734 C 26.182521 90.993223 25.9913 91.184504 25.800781 91.375 C 26.009134 91.583405 26.21743 91.791594 26.425781 92 L 27.570312 92 C 27.171311 91.600927 26.772051 91.201809 26.373047 90.802734 z M 38.621094 90.802734 C 38.430568 90.993223 38.241288 91.184508 38.050781 91.375 C 38.259131 91.583405 38.467432 91.791594 38.675781 92 L 39.818359 92 C 39.419268 91.600927 39.020182 91.201811 38.621094 90.802734 z M 50.869141 90.802734 C 50.678652 90.993223 50.489335 91.184504 50.298828 91.375 C 50.507238 91.583405 50.715418 91.791597 50.923828 92 L 52.066406 92 C 51.667307 91.600932 51.268312 91.201724 50.869141 90.802734 z M 63.119141 90.802734 C 62.928615 90.993223 62.737397 91.184504 62.546875 91.375 C 62.755229 91.583405 62.963523 91.791594 63.171875 92 L 64.316406 92 L 63.119141 90.802734 z M 75.367188 90.802734 C 75.176699 90.993223 74.985437 91.184504 74.794922 91.375 C 75.003273 91.583405 75.21157 91.791594 75.419922 92 L 76.564453 92 C 76.165362 91.600927 75.76628 91.201809 75.367188 90.802734 z M 87.615234 90.802734 C 87.424708 90.993223 87.233483 91.184504 87.042969 91.375 C 87.25128 91.583305 87.459659 91.791696 87.667969 92 L 88.8125 92 C 88.413403 91.600932 88.014404 91.201724 87.615234 90.802734 z " + transform="scale(0.26458334)" /> + <path + style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0;filter:url(#filter975)" + d="M -3.1750001,14.816667 H 24.341667 l 0,9.525 H -3.1750001 Z" + id="path973" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:#37516b;fill-opacity:1;stroke:none;stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0" + d="M -3.1750001,14.816667 H 24.341667 l 0,9.525 H -3.1750001 Z" + id="path837" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:#000000;fill-opacity:1;stroke:#ff9933;stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0;opacity:0.5;filter:url(#filter981)" + d="M -1.0583333,5.2916667 15.875,22.225 v 1.058334 H -1.0583333 Z" + id="path979" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:#606060;fill-opacity:1;stroke:#ff9933;stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0" + d="M -1.0583333,5.2916667 15.875,22.225 v 1.058334 H -1.0583333 Z" + id="path839" + sodipodi:nodetypes="ccccc" /> + </g> +</svg> diff --git a/data/elementary/themes/img/gesture.svg b/data/elementary/themes/img/gesture.svg index a021fe7a36..893b17f8cc 100644 --- a/data/elementary/themes/img/gesture.svg +++ b/data/elementary/themes/img/gesture.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" @@ -13,7 +14,7 @@ height="80" viewBox="0 0 80 80" sodipodi:docname="gesture.svg" - inkscape:version="1.0 (4035a4fb49, 2020-05-01)" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/gesture-040.png" inkscape:export-xdpi="48" inkscape:export-ydpi="48"> @@ -31,6 +32,30 @@ </metadata> <defs id="defs6"> + <linearGradient + inkscape:collect="always" + id="linearGradient859"> + <stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0" + id="stop855" /> + <stop + style="stop-color:#ffffff;stop-opacity:0" + offset="1" + id="stop857" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient847"> + <stop + style="stop-color:#ff9933;stop-opacity:1" + offset="0" + id="stop843" /> + <stop + style="stop-color:#ff9933;stop-opacity:0" + offset="1" + id="stop845" /> + </linearGradient> <mask maskUnits="userSpaceOnUse" id="mask947"> @@ -42,6 +67,26 @@ x="10" y="5" /> </mask> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient847" + id="linearGradient849" + x1="21" + y1="24" + x2="36" + y2="56" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient859" + id="radialGradient853" + cx="43.598442" + cy="1.9460528" + fx="43.598442" + fy="1.9460528" + r="32" + gradientTransform="matrix(-0.99886814,-0.04756515,0.03125,-0.65625,85.48828,8.3508634)" + gradientUnits="userSpaceOnUse" /> </defs> <sodipodi:namedview inkscape:document-rotation="0" @@ -71,50 +116,27 @@ inkscape:snap-nodes="true"> <inkscape:grid type="xygrid" - id="grid837" /> + id="grid837" + empspacing="4" /> </sodipodi:namedview> <g inkscape:groupmode="layer" inkscape:label="Image" id="g10"> <path - id="path5039" - style="opacity:0.5;fill:#3399ff;fill-opacity:1;stroke-width:1.155;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - inkscape:transform-center-x="-12.073501" - inkscape:transform-center-y="5.2728684" - d="m 13.281233,20.020281 c -3.535534,3.535534 0,7.071068 0,7.071068 l 5.656854,5.656854 c 0,0 -3.535534,-3.535534 -7.071068,0 -3.535533,3.535534 0,7.071068 0,7.071068 l 14.151804,14.151803 c -0.05374,0.05297 -0.11264,0.09366 -0.164348,0.150536 -0.671387,0.738526 -1.157335,1.81283 -1.157334,3.375331 0,5 4.999466,4.999465 4.999466,4.999465 h 4.748111 c 28,0 30,-27 28.33399,-28.333989 l -8.485282,-8.485282 c 0,0 -3.535534,-3.535533 -7.071067,0 -3.535534,3.535534 0,7.071068 0,7.071068 L 32.373116,17.898961 c 0,0 -3.535534,-3.535534 -7.071068,0 -3.535534,3.535534 0,7.071068 0,7.071068 l -4.949747,-4.949748 c 0,0 -3.535534,-3.535534 -7.071068,0 z" - sodipodi:nodetypes="sccscccsccccsccsccs" /> + style="fill:none;fill-opacity:0;stroke:#3399ff;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 40,8 c -8,0 -24,4 -24,12 0,8 56,8 56,20 0,12 -32,11 -32,20 0,9 20,12 28,12" + id="path839" + sodipodi:nodetypes="czzzc" /> <path - sodipodi:nodetypes="sccscccsccccsccsccs" - d="m 16.343146,20.272078 c -3.535534,3.535534 0,7.071068 0,7.071068 L 22,33 c 0,0 -3.535534,-3.535534 -7.071068,0 -3.535533,3.535534 0,7.071068 0,7.071068 l 14.151804,14.151803 c -0.05374,0.05297 -0.11264,0.09366 -0.164348,0.150536 -0.671387,0.738526 -1.157335,1.81283 -1.157334,3.375331 0,5 4.999466,4.999465 4.999466,4.999465 h 4.748111 c 28,0 30,-27 28.33399,-28.333989 l -8.485282,-8.485282 c 0,0 -3.535534,-3.535533 -7.071067,0 -3.535534,3.535534 0,7.071068 0,7.071068 L 35.435029,18.150758 c 0,0 -3.535534,-3.535534 -7.071068,0 -3.535534,3.535534 0,7.071068 0,7.071068 l -4.949747,-4.949748 c 0,0 -3.535534,-3.535534 -7.071068,0 z" - inkscape:transform-center-y="5.2728684" - inkscape:transform-center-x="-12.073501" - style="opacity:0.5;fill:#3399ff;fill-opacity:1;stroke-width:1.155;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - id="path5041" /> + style="fill:none;fill-opacity:0;stroke:url(#linearGradient849);stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 40,8 c -8,0 -24,4 -24,12 0,8 56,8 56,20 0,12 -32,11 -32,20 0,9 20,12 28,12" + id="path841" + sodipodi:nodetypes="czzzc" /> <path - sodipodi:nodetypes="sccscccsccccsccsccs" - d="m 20.058874,20.272078 c -3.535534,3.535534 0,7.071068 0,7.071068 L 25.715728,33 c 0,0 -3.535534,-3.535534 -7.071068,0 -3.535533,3.535534 0,7.071068 0,7.071068 l 14.151804,14.151803 c -0.05374,0.05297 -0.11264,0.09366 -0.164348,0.150536 -0.671387,0.738526 -1.157335,1.81283 -1.157334,3.375331 0,5 4.999466,4.999465 4.999466,4.999465 h 4.748111 c 28,0 30,-27 28.33399,-28.333989 l -8.485282,-8.485282 c 0,0 -3.535534,-3.535533 -7.071067,0 C 50.464466,29.464466 54,33 54,33 L 39.150757,18.150758 c 0,0 -3.535534,-3.535534 -7.071068,0 -3.535534,3.535534 0,7.071068 0,7.071068 l -4.949747,-4.949748 c 0,0 -3.535534,-3.535534 -7.071068,0 z" - inkscape:transform-center-y="5.2728684" - inkscape:transform-center-x="-12.073501" - style="fill:#c8c8c8;fill-opacity:1;stroke-width:1.155;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - id="path5020" /> - <circle - r="5" - cy="23.505486" - cx="23.453703" - id="path5043" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:1.28333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> - <circle - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:1.28333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - id="circle5045" - cx="22" - cy="36" - r="5" /> - <circle - r="5" - cy="21.510441" - cx="35.539734" - id="circle5047" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:1.28333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + style="fill:none;fill-opacity:0;stroke:url(#radialGradient853);stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 40,8 c -8,0 -24,4 -24,12 0,8 56,8 56,20 0,12 -32,11 -32,20 0,9 20,12 28,12" + id="path851" + sodipodi:nodetypes="czzzc" /> </g> </svg> diff --git a/data/elementary/themes/img/ic/gesture-040.png b/data/elementary/themes/img/ic/gesture-040.png Binary files differindex acd7930074..2dab78dd3c 100644 --- a/data/elementary/themes/img/ic/gesture-040.png +++ b/data/elementary/themes/img/ic/gesture-040.png diff --git a/data/elementary/themes/img/ic/gesture-080.png b/data/elementary/themes/img/ic/gesture-080.png Binary files differindex 3e731eacb5..62218b379d 100644 --- a/data/elementary/themes/img/ic/gesture-080.png +++ b/data/elementary/themes/img/ic/gesture-080.png diff --git a/data/elementary/themes/img/ic/gesture-160.png b/data/elementary/themes/img/ic/gesture-160.png Binary files differindex d42811b192..06b7352470 100644 --- a/data/elementary/themes/img/ic/gesture-160.png +++ b/data/elementary/themes/img/ic/gesture-160.png diff --git a/data/elementary/themes/img/ic/keyboard-040.png b/data/elementary/themes/img/ic/keyboard-040.png Binary files differindex 17dad3a604..af3cebd54a 100644 --- a/data/elementary/themes/img/ic/keyboard-040.png +++ b/data/elementary/themes/img/ic/keyboard-040.png diff --git a/data/elementary/themes/img/ic/keyboard-080.png b/data/elementary/themes/img/ic/keyboard-080.png Binary files differindex 72401333f1..d7e269c2b3 100644 --- a/data/elementary/themes/img/ic/keyboard-080.png +++ b/data/elementary/themes/img/ic/keyboard-080.png diff --git a/data/elementary/themes/img/ic/keyboard-160.png b/data/elementary/themes/img/ic/keyboard-160.png Binary files differindex c6bfda05bb..0d2e632674 100644 --- a/data/elementary/themes/img/ic/keyboard-160.png +++ b/data/elementary/themes/img/ic/keyboard-160.png diff --git a/data/elementary/themes/img/ic/keyboard-hand-040.png b/data/elementary/themes/img/ic/keyboard-hand-040.png Binary files differindex 2b5fd3cfff..3d46565363 100644 --- a/data/elementary/themes/img/ic/keyboard-hand-040.png +++ b/data/elementary/themes/img/ic/keyboard-hand-040.png diff --git a/data/elementary/themes/img/ic/keyboard-hand-080.png b/data/elementary/themes/img/ic/keyboard-hand-080.png Binary files differindex f3ea2d75ff..13d2428158 100644 --- a/data/elementary/themes/img/ic/keyboard-hand-080.png +++ b/data/elementary/themes/img/ic/keyboard-hand-080.png diff --git a/data/elementary/themes/img/ic/keyboard-hand-160.png b/data/elementary/themes/img/ic/keyboard-hand-160.png Binary files differindex ba8daea113..d5113a4efd 100644 --- a/data/elementary/themes/img/ic/keyboard-hand-160.png +++ b/data/elementary/themes/img/ic/keyboard-hand-160.png diff --git a/data/elementary/themes/img/ic/phone-040.png b/data/elementary/themes/img/ic/phone-040.png Binary files differindex 75b3eca263..76fbd69de3 100644 --- a/data/elementary/themes/img/ic/phone-040.png +++ b/data/elementary/themes/img/ic/phone-040.png diff --git a/data/elementary/themes/img/ic/phone-080.png b/data/elementary/themes/img/ic/phone-080.png Binary files differindex f566ac01d4..359488e3ce 100644 --- a/data/elementary/themes/img/ic/phone-080.png +++ b/data/elementary/themes/img/ic/phone-080.png diff --git a/data/elementary/themes/img/ic/phone-160.png b/data/elementary/themes/img/ic/phone-160.png Binary files differindex bb350c4142..da68b282e3 100644 --- a/data/elementary/themes/img/ic/phone-160.png +++ b/data/elementary/themes/img/ic/phone-160.png diff --git a/data/elementary/themes/img/keyboard-hand.svg b/data/elementary/themes/img/keyboard-hand.svg index b814f6966a..f395a210a1 100644 --- a/data/elementary/themes/img/keyboard-hand.svg +++ b/data/elementary/themes/img/keyboard-hand.svg @@ -14,7 +14,7 @@ height="80" viewBox="0 0 80 80" sodipodi:docname="keyboard-hand.svg" - inkscape:version="1.0 (4035a4fb49, 2020-05-01)" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/keyboard-hand-040.png" inkscape:export-xdpi="48" inkscape:export-ydpi="48"> @@ -33,40 +33,16 @@ <defs id="defs6"> <linearGradient - id="linearGradient3410" - inkscape:collect="always"> - <stop - id="stop3406" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop3408" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient inkscape:collect="always" - id="linearGradient7654"> - <stop - style="stop-color:#808080;stop-opacity:1" - offset="0" - id="stop7650" /> + id="linearGradient983"> <stop - style="stop-color:#808080;stop-opacity:0" - offset="1" - id="stop7652" /> - </linearGradient> - <linearGradient - id="linearGradient3678" - inkscape:collect="always"> - <stop - id="stop3674" + style="stop-color:#dcbda1;stop-opacity:1" offset="0" - style="stop-color:#c8c8c8;stop-opacity:1;" /> + id="stop979" /> <stop - id="stop3676" + style="stop-color:#dcb99a;stop-opacity:0" offset="1" - style="stop-color:#c8c8c8;stop-opacity:0;" /> + id="stop981" /> </linearGradient> <mask maskUnits="userSpaceOnUse" @@ -89,68 +65,14 @@ sodipodi:nodetypes="zzzzz" /> </mask> <linearGradient - gradientUnits="userSpaceOnUse" - y2="40" - x2="70" - y1="40" - x1="50" - id="linearGradient3680" - xlink:href="#linearGradient3678" - inkscape:collect="always" - gradientTransform="matrix(1,0,0,0.93333333,0,0.66666667)" /> - <linearGradient inkscape:collect="always" - xlink:href="#linearGradient7654" - id="linearGradient7648" - gradientUnits="userSpaceOnUse" - x1="50" - y1="40" - x2="70" - y2="40" - gradientTransform="matrix(1,0,0,0.06666667,0,65.333333)" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="65" - x2="40" - y1="55" - x1="40" - id="linearGradient3412" - xlink:href="#linearGradient3410" - inkscape:collect="always" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3410-7" - id="linearGradient3412-9" + xlink:href="#linearGradient983" + id="linearGradient985" x1="40" - y1="55" - x2="40" - y2="65" + y1="48" + x2="48" + y2="64" gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3410-7"> - <stop - style="stop-color:#080808;stop-opacity:1" - offset="0" - id="stop3406-4" /> - <stop - style="stop-color:#000000;stop-opacity:0" - offset="1" - id="stop3408-3" /> - </linearGradient> - <filter - height="1.2130533" - y="-0.10652667" - width="1.191748" - x="-0.095874" - id="filter3557" - style="color-interpolation-filters:sRGB" - inkscape:collect="always"> - <feGaussianBlur - id="feGaussianBlur3559" - stdDeviation="1.997375" - inkscape:collect="always" /> - </filter> </defs> <sodipodi:namedview inkscape:document-rotation="0" @@ -162,16 +84,16 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1017" + inkscape:window-width="1354" + inkscape:window-height="1372" id="namedview4" showgrid="true" - inkscape:zoom="10.425" + inkscape:zoom="8.025" inkscape:cx="40" - inkscape:cy="40.143885" - inkscape:window-x="0" + inkscape:cy="40" + inkscape:window-x="1206" inkscape:window-y="0" - inkscape:window-maximized="1" + inkscape:window-maximized="0" inkscape:current-layer="g10" showguides="false" inkscape:snap-bbox="true" @@ -181,421 +103,52 @@ inkscape:bbox-paths="true"> <inkscape:grid type="xygrid" - id="grid837" /> + id="grid837" + empspacing="4" /> </sodipodi:namedview> <g inkscape:groupmode="layer" inkscape:label="Image" id="g10"> - <g - id="g3396"> - <rect - style="fill:url(#linearGradient3680);fill-opacity:1;stroke:none;stroke-width:1.93218;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3618" - width="60" - height="56" - x="10" - y="10" /> - <rect - y="12" - x="12" - height="10" - width="10" - id="rect3620" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3622" - width="10" - height="10" - x="26" - y="12" /> - <rect - y="12" - x="40" - height="10" - width="10" - id="rect3624" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3626" - width="10" - height="10" - x="54" - y="12" /> - <rect - y="26" - x="12" - height="10" - width="10" - id="rect3628" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3630" - width="17" - height="10" - x="12" - y="40" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3658" - width="10" - height="10" - x="26" - y="26" /> - <rect - y="26" - x="40" - height="10" - width="10" - id="rect3660" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3662" - width="10" - height="10" - x="54" - y="26" /> - <rect - y="40" - x="33" - height="10" - width="10" - id="rect3664" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3666" - width="10" - height="10" - x="47" - y="40" /> - <rect - y="54" - x="12" - height="10" - width="24" - id="rect3668" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3670" - width="10" - height="10" - x="40" - y="54" /> - <rect - y="54" - x="54" - height="10" - width="10" - id="rect3672" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - sodipodi:nodetypes="ccccc" - id="path4986" - d="m 13,21 v -8 l 1,-1 2.381944,6.361111 z" - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> - <path - sodipodi:nodetypes="ccccc" - id="path4988" - d="m 20,12 1,1 v 8 l -3.298611,-2.638889 z" - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> - <path - sodipodi:nodetypes="ccccc" - id="path4982" - d="m 13,21 1,-2 h 6 l 1,2 z" - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> - <path - sodipodi:nodetypes="ccccc" - id="path4990" - d="m 14,12 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 27,21 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-3" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 34,12 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-0" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 27,21 1,-2 h 6 l 1,2 z" - id="path4982-3" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 28,12 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-3" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,21 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-7" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 48,12 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-9" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,21 1,-2 h 6 l 1,2 z" - id="path4982-4" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 42,12 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-9" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,21 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-9" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 62,12 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-1" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,21 1,-2 h 6 l 1,2 z" - id="path4982-9" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 56,12 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-4" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 13,35 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-2" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 20,26 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-06" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 13,35 1,-2 h 6 l 1,2 z" - id="path4982-5" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 14,26 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-95" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 27,35 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-6" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 34,26 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-11" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 27,35 1,-2 h 6 l 1,2 z" - id="path4982-43" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 28,26 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-7" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,35 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-27" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 48,26 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-3" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,35 1,-2 h 6 l 1,2 z" - id="path4982-39" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 42,26 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-2" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,35 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-4" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 62,26 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-4" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,35 1,-2 h 6 l 1,2 z" - id="path4982-49" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 56,26 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-93" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 13,49 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-8" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 27,40 1,1 v 8 l -3,-3 z" - id="path4988-32" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 13,49 1,-2 h 13 l 1,2 z" - id="path4982-95" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 14,40 v 7 c 1.979166,0.395833 11.020833,0.395833 13,0 v -7 c -1.979167,0.263889 -11.020833,0.263889 -13,0 z" - id="path4990-43" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 34,49 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-94" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,40 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-95" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 34,49 1,-2 h 6 l 1,2 z" - id="path4982-57" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 35,40 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-39" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 48,49 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-0" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,40 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-7" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 48,49 1,-2 h 6 l 1,2 z" - id="path4982-2" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 49,40 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-72" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,63 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-90" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 48,54 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-5" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,63 1,-2 h 6 l 1,2 z" - id="path4982-0" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 42,54 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-41" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,63 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-79" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 62,54 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-36" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,63 1,-2 h 6 l 1,2 z" - id="path4982-21" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 56,54 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-25" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 13,63 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-39" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 34,54 1,1 v 8 l -3,-3 z" - id="path4988-18" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 13,63 1,-2 h 20 l 1,2 z" - id="path4982-8" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 14,54 v 7 c 1.979166,0.395833 18.020833,0.395833 20,0 v -7 c -1.979167,0.263889 -18.020833,0.263889 -20,0 z" - id="path4990-70" - sodipodi:nodetypes="ccccc" /> - <rect - y="66" - x="10" - height="4" - width="60" - id="rect7646" - style="fill:url(#linearGradient7648);fill-opacity:1;stroke:none;stroke-width:0.516398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> <path - sodipodi:nodetypes="cccccccccccccccc" - id="path3404" - d="M 25,45 V 25 c 0,-2 3,-5 5,-5 2,0 5,3 5,5 v 15 c 0,-2 3,-5 5,-5 2,0 5,3 5,5 0,-2 3,-5 5,-5 2,0 5,3 5,5 v 5 c 0,-2 3,-5 5,-5 2,0 5,3 5,5 V 65 H 25 C 20,60 15,57 15,55 15,50 20,45 25,45 Z" - style="fill:url(#linearGradient3412);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.49875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + d="M 4,54 V 27.818182 L 8,24 15.068181,45.363637 Z" + id="path4986-39" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:#808080;fill-opacity:1;stroke-width:0.49875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + d="m 72,24 4,3.818182 V 54 l -9.818182,-9.818182 z" + id="path4988-18" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:#606060;fill-opacity:1;stroke-width:0.49875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + d="m 4,54 4,-4 h 64 l 4,4 z" + id="path4982-8" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.49875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + d="m 8,24 v 26 c 6.477271,1.295453 57.522727,1.295453 64,0 V 24 c -6.477273,0.863637 -57.522726,0.863637 -64,0 z" + id="path4990-70" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:none;fill-opacity:1;stroke:#666666;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 64,32 v 8 H 32" + id="path915" + sodipodi:nodetypes="ccc" /> + <path + style="fill:none;fill-opacity:1;stroke:#666666;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 38,34 -6,6 6,6" + id="path917" + sodipodi:nodetypes="ccc" /> <path - style="fill:url(#linearGradient3412-9);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3557)" - d="M 25,45 V 25 c 0,-2 3,-5 5,-5 2,0 5,3 5,5 v 15 c 0,-2 3,-5 5,-5 2,0 5,3 5,5 0,-2 3,-5 5,-5 2,0 5,3 5,5 v 5 c 0,-2 3,-5 5,-5 2,0 5,3 5,5 V 65 H 25 C 20,60 15,57 15,55 15,50 20,45 25,45 Z" - id="path3404-5" - sodipodi:nodetypes="cccccccccccccccc" /> + style="fill:url(#linearGradient985);fill-opacity:1;stroke-width:3;stroke-linecap:round;stroke-linejoin:round" + d="M 44,76 28,44 c -4,-8 0,-16 8,-16 8,0 10,4 12,8 l 12,24 z" + id="path977" + sodipodi:nodetypes="cczccc" /> <path - style="fill:url(#linearGradient3412);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 25,45 V 25 c 0,-2 3,-5 5,-5 2,0 5,3 5,5 v 15 c 0,-2 3,-5 5,-5 2,0 5,3 5,5 0,-2 3,-5 5,-5 2,0 5,3 5,5 v 5 c 0,-2 3,-5 5,-5 2,0 5,3 5,5 V 65 H 25 C 20,60 15,57 15,55 15,50 20,45 25,45 Z" - id="path3414" - sodipodi:nodetypes="cccccccccccccccc" /> + style="fill:#ffffff;fill-opacity:1;stroke-width:3;stroke-linecap:round;stroke-linejoin:round" + d="m 36,30 c -4,0 -8,3 -8,8 0,5 4,6 8,6 4,0 8,-4 8,-8 0,-4 -4,-6 -8,-6 z" + id="path987" + sodipodi:nodetypes="zzzzz" /> </g> </svg> diff --git a/data/elementary/themes/img/keyboard.svg b/data/elementary/themes/img/keyboard.svg index 0694c99f36..8d6ff273d5 100644 --- a/data/elementary/themes/img/keyboard.svg +++ b/data/elementary/themes/img/keyboard.svg @@ -5,13 +5,12 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:export-ydpi="48" inkscape:export-xdpi="48" inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/keyboard-040.png" - inkscape:version="1.0 (4035a4fb49, 2020-05-01)" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" sodipodi:docname="keyboard.svg" viewBox="0 0 80 80" height="80" @@ -32,30 +31,6 @@ </metadata> <defs id="defs6"> - <linearGradient - id="linearGradient7654" - inkscape:collect="always"> - <stop - id="stop7650" - offset="0" - style="stop-color:#808080;stop-opacity:1" /> - <stop - id="stop7652" - offset="1" - style="stop-color:#808080;stop-opacity:0" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3678"> - <stop - style="stop-color:#c8c8c8;stop-opacity:1;" - offset="0" - id="stop3674" /> - <stop - style="stop-color:#c8c8c8;stop-opacity:0;" - offset="1" - id="stop3676" /> - </linearGradient> <mask id="mask947" maskUnits="userSpaceOnUse"> @@ -76,26 +51,6 @@ d="M 40,10 C 19,10 20,17.832395 20,30 20,42.167605 19,70 40,70 61,70 60,42.167605 60,30 60,17.832395 61,10 40,10 Z" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> </mask> - <linearGradient - gradientTransform="matrix(1,0,0,0.93333333,0,0.66666667)" - inkscape:collect="always" - xlink:href="#linearGradient3678" - id="linearGradient3680" - x1="50" - y1="40" - x2="70" - y2="40" - gradientUnits="userSpaceOnUse" /> - <linearGradient - gradientTransform="matrix(1,0,0,0.06666667,0,65.333333)" - y2="40" - x2="70" - y1="40" - x1="50" - gradientUnits="userSpaceOnUse" - id="linearGradient7648" - xlink:href="#linearGradient7654" - inkscape:collect="always" /> </defs> <sodipodi:namedview inkscape:bbox-paths="true" @@ -110,7 +65,7 @@ inkscape:window-x="1206" inkscape:cy="40" inkscape:cx="40" - inkscape:zoom="8.1375" + inkscape:zoom="8.025" showgrid="true" id="namedview4" inkscape:window-height="1372" @@ -126,403 +81,42 @@ inkscape:document-rotation="0"> <inkscape:grid id="grid837" - type="xygrid" /> + type="xygrid" + empspacing="4" /> </sodipodi:namedview> <g id="g10" inkscape:label="Image" inkscape:groupmode="layer"> - <rect - style="fill:url(#linearGradient3680);fill-opacity:1;stroke:none;stroke-width:1.93218;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3618" - width="60" - height="56" - x="10" - y="10" /> - <rect - y="12" - x="12" - height="10" - width="10" - id="rect3620" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3622" - width="10" - height="10" - x="26" - y="12" /> - <rect - y="12" - x="40" - height="10" - width="10" - id="rect3624" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3626" - width="10" - height="10" - x="54" - y="12" /> - <rect - y="26" - x="12" - height="10" - width="10" - id="rect3628" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3630" - width="17" - height="10" - x="12" - y="40" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3658" - width="10" - height="10" - x="26" - y="26" /> - <rect - y="26" - x="40" - height="10" - width="10" - id="rect3660" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3662" - width="10" - height="10" - x="54" - y="26" /> - <rect - y="40" - x="33" - height="10" - width="10" - id="rect3664" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3666" - width="10" - height="10" - x="47" - y="40" /> - <rect - y="54" - x="12" - height="10" - width="24" - id="rect3668" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <rect - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3670" - width="10" - height="10" - x="40" - y="54" /> - <rect - y="54" - x="54" - height="10" - width="10" - id="rect3672" - style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - sodipodi:nodetypes="ccccc" - id="path4986" - d="m 13,21 v -8 l 1,-1 2.381944,6.361111 z" - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> - <path - sodipodi:nodetypes="ccccc" - id="path4988" - d="m 20,12 1,1 v 8 l -3.298611,-2.638889 z" - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> - <path - sodipodi:nodetypes="ccccc" - id="path4982" - d="m 13,21 1,-2 h 6 l 1,2 z" - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> - <path - sodipodi:nodetypes="ccccc" - id="path4990" - d="m 14,12 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 27,21 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-3" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 34,12 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-0" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 27,21 1,-2 h 6 l 1,2 z" - id="path4982-3" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 28,12 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-3" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,21 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-7" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 48,12 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-9" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,21 1,-2 h 6 l 1,2 z" - id="path4982-4" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 42,12 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-9" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,21 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-9" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 62,12 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-1" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,21 1,-2 h 6 l 1,2 z" - id="path4982-9" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 56,12 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-4" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 13,35 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-2" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 20,26 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-06" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 13,35 1,-2 h 6 l 1,2 z" - id="path4982-5" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 14,26 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-95" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 27,35 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-6" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 34,26 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-11" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 27,35 1,-2 h 6 l 1,2 z" - id="path4982-43" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 28,26 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-7" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,35 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-27" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 48,26 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-3" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,35 1,-2 h 6 l 1,2 z" - id="path4982-39" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 42,26 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-2" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,35 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-4" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 62,26 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-4" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,35 1,-2 h 6 l 1,2 z" - id="path4982-49" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 56,26 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-93" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 13,49 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-8" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 27,40 1,1 v 8 l -3,-3 z" - id="path4988-32" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 13,49 1,-2 h 13 l 1,2 z" - id="path4982-95" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 14,40 v 7 c 1.979166,0.395833 11.020833,0.395833 13,0 v -7 c -1.979167,0.263889 -11.020833,0.263889 -13,0 z" - id="path4990-43" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 34,49 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-94" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,40 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-95" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 34,49 1,-2 h 6 l 1,2 z" - id="path4982-57" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 35,40 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-39" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 48,49 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-0" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,40 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-7" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 48,49 1,-2 h 6 l 1,2 z" - id="path4982-2" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 49,40 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-72" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,63 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-90" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 48,54 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-5" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 41,63 1,-2 h 6 l 1,2 z" - id="path4982-0" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 42,54 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-41" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,63 v -8 l 1,-1 2.381944,6.361111 z" - id="path4986-79" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 62,54 1,1 v 8 l -3.298611,-2.638889 z" - id="path4988-36" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 55,63 1,-2 h 6 l 1,2 z" - id="path4982-21" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 56,54 v 7 c 1.979166,0.395833 4.020833,0.395833 6,0 v -7 c -1.979167,0.263889 -4.020833,0.263889 -6,0 z" - id="path4990-25" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 13,63 v -8 l 1,-1 2.381944,6.361111 z" + style="fill:#c8c8c8;fill-opacity:1;stroke-width:0.49875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + d="M 4,54.02841 V 27.846592 l 4,-3.818182 7.068181,21.363637 z" id="path4986-39" sodipodi:nodetypes="ccccc" /> <path - style="fill:#808080;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 34,54 1,1 v 8 l -3,-3 z" + style="fill:#808080;fill-opacity:1;stroke-width:0.49875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + d="m 72,24.02841 4,3.818182 V 54.02841 l -9.818182,-9.818182 z" id="path4988-18" sodipodi:nodetypes="ccccc" /> <path - style="fill:#606060;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 13,63 1,-2 h 20 l 1,2 z" + style="fill:#606060;fill-opacity:1;stroke-width:0.49875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + d="m 4,54.02841 4,-4 h 64 l 4,4 z" id="path4982-8" sodipodi:nodetypes="ccccc" /> <path - style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.152396;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" - d="m 14,54 v 7 c 1.979166,0.395833 18.020833,0.395833 20,0 v -7 c -1.979167,0.263889 -18.020833,0.263889 -20,0 z" + style="fill:#a0a0a0;fill-opacity:1;stroke-width:0.49875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + d="m 8,24.02841 v 26 c 6.477271,1.295453 57.522727,1.295453 64,0 v -26 c -6.477273,0.863637 -57.522726,0.863637 -64,0 z" id="path4990-70" sodipodi:nodetypes="ccccc" /> - <rect - y="66" - x="10" - height="4" - width="60" - id="rect7646" - style="fill:url(#linearGradient7648);fill-opacity:1;stroke:none;stroke-width:0.516398;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-opacity:1;stroke:#666666;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 64,32 v 8 H 32" + id="path915" + sodipodi:nodetypes="ccc" /> + <path + style="fill:none;fill-opacity:1;stroke:#666666;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 38,34 -6,6 6,6" + id="path917" + sodipodi:nodetypes="ccc" /> </g> </svg> diff --git a/data/elementary/themes/img/phone.svg b/data/elementary/themes/img/phone.svg index 247322057b..3792c07f21 100644 --- a/data/elementary/themes/img/phone.svg +++ b/data/elementary/themes/img/phone.svg @@ -14,7 +14,7 @@ height="80" viewBox="0 0 80 80" sodipodi:docname="phone.svg" - inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/phone-040.png" inkscape:export-xdpi="48" inkscape:export-ydpi="48"> @@ -118,14 +118,6 @@ inkscape:label="Image" id="g10"> <rect - style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1235" - width="8" - height="8" - x="24" - y="16" - ry="2" /> - <rect style="fill:#202020;fill-opacity:1;stroke:none;stroke-width:2.48069;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" id="rect946" width="40" @@ -133,27 +125,16 @@ x="20" y="8" ry="8.3382845" /> - <rect - style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1237" - width="8" - height="8" - x="24" - y="16" - ry="2" /> + <path + style="fill:#4f6e8c;fill-opacity:1;stroke:none;stroke-width:12.0262;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" + d="m 35.986929,21.97381 c 6.013095,0 12.02619,6.013095 12.092791,12.498645 l -0.06663,11.553736 c 0,6.013095 -6.013095,12.02619 -12.02619,12.02619 V 46.026191 H 42 V 34 h -6.013095 z" + id="path1301" + sodipodi:nodetypes="ccccccccc" /> <path id="path958" style="fill:url(#radialGradient966);fill-opacity:1;stroke:none;stroke-width:2.85714;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" d="m 28,10 c -3,0 -6,3 -6,6 V 50 L 58,34 V 16 c 0,-3 -3,-6 -6,-6 z" sodipodi:nodetypes="ssccsss" /> - <rect - style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1239" - width="8" - height="8" - x="36" - y="16" - ry="2" /> <ellipse style="fill:#ffffff;fill-opacity:0;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" id="path988" @@ -162,196 +143,6 @@ rx="7" ry="3" /> <rect - style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1241" - width="8" - height="8" - x="48" - y="16" - ry="2" /> - <rect - style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1243" - width="8" - height="8" - x="24" - y="28" - ry="2" /> - <rect - style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1245" - width="8" - height="8" - x="36" - y="28" - ry="2" /> - <rect - style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1247" - width="8" - height="8" - x="48" - y="28" - ry="2" /> - <rect - style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1249" - width="8" - height="8" - x="24" - y="40" - ry="2" /> - <rect - style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1251" - width="8" - height="8" - x="36" - y="40" - ry="2" /> - <rect - style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1253" - width="8" - height="8" - x="48" - y="40" - ry="2" /> - <rect - style="fill:#80ce5d;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1255" - width="8" - height="8" - x="24" - y="52" - ry="2" /> - <rect - style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1257" - width="8" - height="8" - x="36" - y="52" - ry="2" /> - <rect - style="fill:#cb5d4c;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="rect1259" - width="8" - height="8" - x="48" - y="52" - ry="2" /> - <text - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - x="26.555664" - y="22.15625" - id="text1263"><tspan - sodipodi:role="line" - id="tspan1261" - x="26.555664" - y="22.15625">1</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - x="38.399158" - y="22.15625" - id="text1267"><tspan - sodipodi:role="line" - id="tspan1265" - x="38.399158" - y="22.15625">2</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - x="50.341797" - y="22.118164" - id="text1271"><tspan - sodipodi:role="line" - id="tspan1269" - x="50.341797" - y="22.118164">3</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - x="26.438477" - y="34.147461" - id="text1275"><tspan - sodipodi:role="line" - id="tspan1273" - x="26.438477" - y="34.147461">4</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - x="38.327148" - y="34.081543" - id="text1279"><tspan - sodipodi:role="line" - id="tspan1277" - x="38.327148" - y="34.081543">5</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - x="50.356445" - y="34.119629" - id="text1283"><tspan - sodipodi:role="line" - id="tspan1281" - x="50.356445" - y="34.119629">6</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - x="26.325684" - y="46.119629" - id="text1287"><tspan - sodipodi:role="line" - id="tspan1285" - x="26.325684" - y="46.119629">7</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - x="38.341797" - y="46.119629" - id="text1291"><tspan - sodipodi:role="line" - id="tspan1289" - x="38.341797" - y="46.119629">8</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - x="50.338867" - y="46.119629" - id="text1295"><tspan - sodipodi:role="line" - id="tspan1293" - x="50.338867" - y="46.119629">9</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6px;line-height:3.75px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - x="38.350586" - y="58.119629" - id="text1299"><tspan - sodipodi:role="line" - id="tspan1297" - x="38.350586" - y="58.119629">0</tspan></text> - <path - style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - d="m 26.994462,52.994462 c 1,0 2,1 2.011076,2.078571 l -0.01108,1.921429 c 0,1 -1,2 -2,2 v -2 h 1 v -2 h -1 z" - id="path1301" - sodipodi:nodetypes="ccccccccc" /> - <path - style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - d="m 49,57 c 0,-1 1,-2 2.078571,-2.011076 L 53,55 c 1,0 2,1 2,2 h -2 v -1 h -2 v 1 z" - id="path1303" - sodipodi:nodetypes="ccccccccc" /> - <rect style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.76383;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" id="rect1223" width="14" diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc index 8fe990d451..f34b71ddec 100644 --- a/data/elementary/themes/macros.edc +++ b/data/elementary/themes/macros.edc @@ -373,3 +373,103 @@ new m = get_int(btmode) & ~flag; \ set_int(btmode, m); eval_mode(m); \ } +#define BUTTONMODE_SCRIPT2 \ + public btmode; \ + public eval_mode(m) { \ + new m1 = m & MASK; \ + new d = m & DISABLE; \ + new p = m & PRESSED; \ + new bg = m & BACKGROUND; \ + if (bg) { \ + set_state(PART:"base", "hidden", 0.0); \ + set_state(PART:"efl.background", "visible", 0.0); \ + } else { \ + set_state(PART:"efl.background", "default", 0.0); \ + if (!d) { \ + if (!p) { \ + set_state(PART:"base", "default", 0.0); \ + set_state(PART:"shadow", "default", 0.0); \ + } else { \ + set_state(PART:"base", "pressed", 0.0); \ + set_state(PART:"shadow", "pressed", 0.0); \ + } \ + } else { \ + set_state(PART:"base", "disabled", 0.0); \ + set_state(PART:"shadow", "disabled", 0.0); \ + } \ + } \ + if (m1 == (ICON | LABEL)) { \ + if (!d) { \ + set_state(PART:"efl.content", "visible", 0.0); \ + set_state(PART:"sizer_content", "visible", 0.0); \ + set_state(PART:"event", "default", 0.0); \ + if (!p) { \ + set_state(PART:"efl.text", "visible", 0.0); \ + set_state(PART:"icon_clip", "default", 0.0); \ + } else { \ + set_state(PART:"efl.text", "pressed_visible", 0.0); \ + set_state(PART:"icon_clip", "pressed", 0.0); \ + } \ + } else { \ + set_state(PART:"efl.content", "visible", 0.0); \ + set_state(PART:"sizer_content", "visible", 0.0); \ + set_state(PART:"efl.text", "disabled_visible", 0.0); \ + set_state(PART:"icon_clip", "disabled", 0.0); \ + set_state(PART:"event", "disabled", 0.0); \ + } \ + } else if (m1 == (ICON)) { \ + if (!d) { \ + set_state(PART:"efl.content", "icononly", 0.0); \ + set_state(PART:"sizer_content", "icononly", 0.0); \ + set_state(PART:"event", "default", 0.0); \ + set_state(PART:"efl.text", "default", 0.0); \ + if (!p) \ + set_state(PART:"icon_clip", "default", 0.0); \ + else \ + set_state(PART:"icon_clip", "pressed", 0.0); \ + } else { \ + set_state(PART:"efl.content", "icononly", 0.0); \ + set_state(PART:"sizer_content", "icononly", 0.0); \ + set_state(PART:"efl.text", "default", 0.0); \ + set_state(PART:"icon_clip", "disabled", 0.0); \ + set_state(PART:"event", "disabled", 0.0); \ + } \ + } else if (m1 == (LABEL)) { \ + if (!d) { \ + set_state(PART:"efl.content", "default", 0.0); \ + set_state(PART:"sizer_content", "default", 0.0); \ + set_state(PART:"icon_clip", "default", 0.0); \ + set_state(PART:"event", "default", 0.0); \ + if (!p) \ + set_state(PART:"efl.text", "textonly", 0.0); \ + else \ + set_state(PART:"efl.text", "pressed_textonly", 0.0); \ + } else { \ + set_state(PART:"efl.content", "default", 0.0); \ + set_state(PART:"sizer_content", "default", 0.0); \ + set_state(PART:"efl.text", "disabled_textonly", 0.0); \ + set_state(PART:"icon_clip", "disabled", 0.0); \ + set_state(PART:"event", "disabled", 0.0); \ + } \ + } else { \ + if (!d) { \ + set_state(PART:"efl.content", "default", 0.0); \ + set_state(PART:"sizer_content", "default", 0.0); \ + set_state(PART:"icon_clip", "default", 0.0); \ + set_state(PART:"event", "default", 0.0); \ + } else { \ + set_state(PART:"efl.content", "default", 0.0); \ + set_state(PART:"sizer_content", "default", 0.0); \ + set_state(PART:"icon_clip", "disabled", 0.0); \ + set_state(PART:"event", "disabled", 0.0); \ + } \ + } \ + } \ + flag_set(flag) { \ + new m = get_int(btmode) | flag; \ + set_int(btmode, m); eval_mode(m); \ + } \ + flag_unset(flag) { \ + new m = get_int(btmode) & ~flag; \ + set_int(btmode, m); eval_mode(m); \ + } diff --git a/data/elementary/themes/snd/wood-tap.wav b/data/elementary/themes/snd/wood-tap.wav Binary files differindex 2c14203e2b..c6bd6544d1 100644 --- a/data/elementary/themes/snd/wood-tap.wav +++ b/data/elementary/themes/snd/wood-tap.wav diff --git a/data/elementary/themes/snd/wood-tap2.wav b/data/elementary/themes/snd/wood-tap2.wav Binary files differindex ff8b748a11..10402d9d76 100644 --- a/data/elementary/themes/snd/wood-tap2.wav +++ b/data/elementary/themes/snd/wood-tap2.wav |
