diff --git a/data/themes/default_start.edc b/data/themes/default_start.edc index 38ca9534d..223fee09e 100644 --- a/data/themes/default_start.edc +++ b/data/themes/default_start.edc @@ -1,5 +1,23 @@ images { image: "e17_logo_small.png" COMP; + image: "e17_logo_small_p1.png" COMP; + image: "e17_logo_small_p2.png" COMP; + image: "e17_logo_small_p3.png" COMP; + image: "e17_logo_small_p4.png" COMP; + image: "e17_logo_small_p5.png" COMP; + image: "e17_logo_small_p6.png" COMP; + image: "e17_logo_small_p7.png" COMP; + image: "e17_logo_small_p8.png" COMP; + image: "e17_logo_small_p9.png" COMP; + image: "e17_logo_small_p21.png" COMP; + image: "e17_logo_small_p22.png" COMP; + image: "e17_logo_small_p23.png" COMP; + image: "e17_logo_small_p24.png" COMP; + image: "e17_logo_small_p25.png" COMP; + image: "e17_logo_small_p26.png" COMP; + image: "e17_logo_small_p27.png" COMP; + image: "e17_logo_small_p28.png" COMP; + image: "e17_logo_small_p29.png" COMP; } group { name: "e/modules/start/main"; @@ -9,325 +27,72 @@ group { public is_hilited; } parts { - part { - name: "title_shadow2"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - image { - normal: "e17_titlebar_shadow2.png"; - border: 8 8 8 8; - } - fill { - smooth: 0; - } - color: 255 255 255 0; - } - description { - state: "active" 0.0; - visible: 1; - image { - normal: "e17_titlebar_shadow2.png"; - border: 8 8 8 8; - } - fill { - smooth: 0; - } - color: 255 255 255 255; - } - } - part { - name: "title_shadow1"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - image { - normal: "e17_titlebar_shadow1.png"; - border: 8 8 8 8; - } - fill { - smooth: 0; - } - color: 255 255 255 0; - } - description { - state: "active" 0.0; - visible: 1; - image { - normal: "e17_titlebar_shadow1.png"; - border: 8 8 8 8; - } - fill { - smooth: 0; - } - color: 255 255 255 255; - } - } - part { - name: "title_bar"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - image { - normal: "e17_titlebar.png"; - border: 8 8 8 8; - } - color: 255 255 255 0; - } - description { - state: "active" 0.0; - visible: 1; - image { - normal: "e17_titlebar.png"; - border: 8 8 8 8; - } - color: 255 255 255 255; - } - } - part { name: "logo"; + mouse_events: 0; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - rel1 { - to: "title_bar"; - offset: 0 0; - } - rel2 { - to: "title_bar"; - offset: -1 -1; - } image { normal: "e17_logo_small.png"; } } - description { - state: "active" 0.0; - inherit: "default" 0.0; - rel1 { - to: "title_bar"; - offset: 7 7; - } - rel2 { - to: "title_bar"; - offset: -8 -8; - } - } } - - part { - name: "title_glint_clip"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { - offset: 3 3; - to: "title_bar"; - } - rel2 { - offset: -4 -4; - to: "title_bar"; - } - color: 255 255 255 255; - } - } - part { - name: "title_glint_1"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - align: 0.0 0.0; - max: 34 13; - rel1 { - relative: 0.0 0.0; - offset: 2 2; - to: "title_bar"; - } - rel2 { - relative: 1.0 1.0; - offset: -3 -3; - to: "title_bar"; - } - image { - normal: "e17_titlebar_glint1.png"; - border: 5 0 5 0; - } - fill { - smooth: 0; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { - name: "title_glint_2"; - mouse_events: 0; - clip_to: "title_glint_clip"; - description { - state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - max: 0 0; - align: 1.0 0.5; - rel1 { - relative: 0.0 0.0; - offset: 3 3; - to: "title_bar"; - } - rel2 { - relative: 0.0 1.0; - offset: 0 -4; - to: "title_bar"; - } - image { - normal: "e17_titlebar_glint2.png"; - border: 0 0 5 5; - } - fill { - smooth: 0; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - max: 169 9999; - min: 169 8; - align: 0.5 0.5; - rel1 { - relative: 0.0 0.0; - offset: 3 3; - } - rel2 { - relative: 0.0 1.0; - offset: 3 -4; - } - } - description { - state: "active2" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 128; - max: 169 9999; - min: 169 8; - align: 0.5 0.5; - rel1 { - relative: 1.0 0.0; - offset: -4 3; - } - rel2 { - relative: 1.0 1.0; - offset: -4 -4; - } - } - description { - state: "active3" 0.0; - inherit: "default" 0.0; - visible: 0; - color: 255 255 255 0; - max: 169 9999; - min: 169 8; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - offset: -4 3; - } - rel2 { - relative: 1.0 1.0; - offset: -4 -4; - } - } - } - part { - name: "title_glint_3"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - align: 1.0 1.0; - max: 34 13; - rel1 { - relative: 0.0 0.0; - offset: 2 2; - to: "title_bar"; - } - rel2 { - relative: 1.0 1.0; - offset: -3 -3; - to: "title_bar"; - } - image { - normal: "e17_titlebar_glint3.png"; - border: 0 5 0 5; - } - fill { - smooth: 0; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - - part { - name: "logo2"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - rel1 { - to: "logo"; - relative: 0.0 0.0; - offset: 0 0; - } - rel2 { - to: "logo"; - relative: 1.0 1.0; - offset: -1 -1; - } - image { - normal: "e17_logo_small.png"; - } - color: 255 255 255 0; - } - description { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - description { - state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 1; - rel1 { - relative: -0.5 -0.5; - offset: 0 0; - } - rel2 { - relative: 1.5 1.5; - offset: -1 -1; - } - color: 255 255 255 0; - } +#define PT(_name, _p1, _p2, _p3, _p4) \ + part { \ + name: _name; \ + mouse_events: 0; \ + description { \ + state: "default" 0.0; \ + visible: 0; \ + rel1 { \ + to: "logo"; \ + relative: _p1 _p2; \ + } \ + rel2 { \ + to: "logo"; \ + relative: _p3 _p4; \ + } \ + image { \ + normal: "e17_logo_small_"_name".png"; \ + } \ + color: 255 255 255 0; \ + } \ + description { \ + state: "active" 0.0; \ + inherit: "default" 0.0; \ + rel1 { \ + to: "logo"; \ + relative: _p1 _p2; \ + } \ + rel2 { \ + to: "logo"; \ + relative: _p3 _p4; \ + } \ + visible: 1; \ + color: 255 255 255 255; \ + } \ } + PT("p1", 0.1328125, 0.1640625, 0.3359375, 0.3593750); + PT("p2", 0.1953125, 0.1093750, 0.3906250, 0.3125000); + PT("p3", 0.2656250, 0.0625000, 0.4531250, 0.2734375); + PT("p4", 0.3359375, 0.0312500, 0.5234375, 0.2500000); + PT("p5", 0.4062500, 0.0234375, 0.5937500, 0.2421875); + PT("p6", 0.4765625, 0.0312500, 0.6640625, 0.2500000); + PT("p7", 0.5468750, 0.0625000, 0.7343750, 0.2734375); + PT("p8", 0.6093750, 0.1093750, 0.8046875, 0.3125000); + PT("p9", 0.6640625, 0.1640625, 0.8671875, 0.3593750); + + PT("p21", 0.1328125, 0.6406250, 0.3359375, 0.8359375); + PT("p22", 0.1953125, 0.6875000, 0.3906250, 0.8906250); + PT("p23", 0.2656250, 0.7265625, 0.4531250, 0.9375000); + PT("p24", 0.3359375, 0.7500000, 0.5234375, 0.9687500); + PT("p25", 0.4062500, 0.7578125, 0.5937500, 0.9765625); + PT("p26", 0.4765625, 0.7500000, 0.6640625, 0.9687500); + PT("p27", 0.5468750, 0.7265625, 0.7343750, 0.9375000); + PT("p28", 0.6093750, 0.6875000, 0.8046875, 0.8906250); + PT("p29", 0.6640625, 0.6406250, 0.8671875, 0.8359375); part { name: "inout"; @@ -413,158 +178,125 @@ group { program { name: "go_active_pre"; - signal: ""; - source: ""; action: STATE_SET "default" 0.0; - target: "title_bar"; - target: "title_shadow1"; - target: "title_shadow2"; - after: "go_active"; - } - program { - name: "go_active"; - action: STATE_SET "active" 0.0; - target: "title_bar"; target: "logo"; - transition: LINEAR 0.05; + after: "go_active1"; after: "go_active2"; - } - program { - name: "go_active2"; - action: STATE_SET "active" 0.0; - target: "title_shadow1"; - transition: LINEAR 0.05; after: "go_active3"; - after: "go_active3b"; - } - program { - name: "go_active3"; - action: STATE_SET "active" 0.0; - target: "title_shadow2"; - transition: LINEAR 0.05; - } - program { - name: "go_active3b"; - action: STATE_SET "active" 0.0; - target: "title_glint_1"; - target: "title_glint_2"; - transition: LINEAR 0.05; after: "go_active4"; - after: "go_active4b"; - } - program { - name: "go_active4"; - action: STATE_SET "active2" 0.0; - target: "title_glint_2"; - transition: LINEAR 0.2; after: "go_active5"; - after: "go_active5b"; - } - program { - name: "go_active4b"; - action: STATE_SET "active" 0.0; - target: "title_glint_3"; - transition: LINEAR 0.2; - } - program { - name: "go_active5"; - action: STATE_SET "active3" 0.0; - target: "title_glint_2"; - transition: LINEAR 0.05; - } - program { - name: "go_active5b"; - action: STATE_SET "default" 0.0; - target: "title_glint_3"; - transition: LINEAR 0.1; after: "go_active6"; + after: "go_active7"; + after: "go_active8"; + after: "go_active9"; + after: "go_active21"; + after: "go_active22"; + after: "go_active23"; + after: "go_active24"; + after: "go_active25"; + after: "go_active26"; + after: "go_active27"; + after: "go_active28"; + after: "go_active29"; } - program { - name: "go_active6"; - action: STATE_SET "default" 0.0; - target: "title_glint_1"; - target: "title_glint_2"; - target: "title_glint_3"; - } - - program { - name: "logo_go_active"; - signal: ""; - source: ""; - after: "hover_go_active"; - } - program { - name: "hover_go_active"; - signal: ""; - source: ""; - action: STATE_SET "visible" 0.0; - target: "logo2"; - after: "hover_go_active2"; - } - program { - name: "hover_go_active2"; - signal: ""; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "logo2"; - after: "hover_go_active"; +#define PR(_name, _delay, _part) \ + program { \ + name: "go_active"_name; \ + in: _delay 0.0; \ + after: "go_activeb"_name; \ + } \ + program { \ + name: "go_activeb"_name; \ + action: STATE_SET "active" 0.0; \ + target: _part; \ + transition: LINEAR 0.5; \ + after: "go_activec"_name; \ + } \ + program { \ + name: "go_activec"_name; \ + action: STATE_SET "default" 0.0; \ + target: _part; \ + transition: LINEAR 1.2; \ + after: "go_activeb"_name; \ } + PR("1", 0.0, "p1"); + PR("2", 0.2, "p2"); + PR("3", 0.4, "p3"); + PR("4", 0.6, "p4"); + PR("5", 0.8, "p5"); + PR("6", 1.0, "p6"); + PR("7", 1.2, "p7"); + PR("8", 1.4, "p8"); + PR("9", 1.6, "p9"); + PR("21", 1.6, "p21"); + PR("22", 1.4, "p22"); + PR("23", 1.2, "p23"); + PR("24", 1.0, "p24"); + PR("25", 0.8, "p25"); + PR("26", 0.6, "p26"); + PR("27", 0.4, "p27"); + PR("28", 0.2, "p28"); + PR("29", 0.0, "p29"); program { name: "go_passive_pre"; - signal: ""; - source: ""; - action: STATE_SET "active" 0.0; - target: "title_bar"; - target: "title_shadow1"; - target: "title_shadow2"; + action: ACTION_STOP; +#define PG(_name) \ + target: "go_active"_name; \ + target: "go_activeb"_name; \ + target: "go_activec"_name; + PG("1"); + PG("2"); + PG("3"); + PG("4"); + PG("5"); + PG("6"); + PG("7"); + PG("8"); + PG("9"); + PG("21"); + PG("22"); + PG("23"); + PG("24"); + PG("25"); + PG("26"); + PG("27"); + PG("28"); + PG("29"); after: "go_passive"; } program { name: "go_passive"; - action: STATE_SET "default" 0.0; - target: "title_shadow2"; - target: "logo"; - transition: LINEAR 0.1; - after: "go_passive2"; + action: STATE_SET "default" 0.0; \ + target: "p1"; + target: "p2"; + target: "p3"; + target: "p4"; + target: "p5"; + target: "p6"; + target: "p7"; + target: "p8"; + target: "p9"; + target: "p21"; + target: "p22"; + target: "p23"; + target: "p24"; + target: "p25"; + target: "p26"; + target: "p27"; + target: "p28"; + target: "p29"; } + program { - name: "go_passive2"; - action: STATE_SET "default" 0.0; - target: "title_shadow1"; - transition: LINEAR 0.1; - after: "go_passive3"; - } - program { - name: "go_passive3"; - action: STATE_SET "default" 0.0; - target: "title_bar"; - transition: LINEAR 0.1; + name: "logo_go_active"; +// after: "hover_go_active"; } program { name: "logo_go_passive"; - signal: ""; - source: ""; - after: "hover_go_passive"; +// after: "hover_go_active"; } - program { - name: "hover_go_passive"; - signal: ""; - source: ""; - action: ACTION_STOP; - target: "hover_go_active"; - target: "hover_go_active2"; - after: "hover_go_passive2"; - } - program { - name: "hover_go_passive2"; - signal: ""; - source: ""; - action: STATE_SET "default" 0.0; - target: "logo2"; - } } } diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index cb8abbf0e..447c39051 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -277,6 +277,24 @@ e17_gadman_indicator.png \ e17_gadman_overlay.png \ e17_logo.png \ e17_logo_small.png \ +e17_logo_small_p1.png \ +e17_logo_small_p2.png \ +e17_logo_small_p3.png \ +e17_logo_small_p4.png \ +e17_logo_small_p5.png \ +e17_logo_small_p6.png \ +e17_logo_small_p7.png \ +e17_logo_small_p8.png \ +e17_logo_small_p9.png \ +e17_logo_small_p21.png \ +e17_logo_small_p22.png \ +e17_logo_small_p23.png \ +e17_logo_small_p24.png \ +e17_logo_small_p25.png \ +e17_logo_small_p26.png \ +e17_logo_small_p27.png \ +e17_logo_small_p28.png \ +e17_logo_small_p29.png \ e17_cpufreq_freq00.png \ e17_cpufreq_freq01.png \ e17_cpufreq_freq02.png \ diff --git a/data/themes/images/e17_logo_small_p1.png b/data/themes/images/e17_logo_small_p1.png new file mode 100644 index 000000000..cbb3ac30b Binary files /dev/null and b/data/themes/images/e17_logo_small_p1.png differ diff --git a/data/themes/images/e17_logo_small_p2.png b/data/themes/images/e17_logo_small_p2.png new file mode 100644 index 000000000..d25bb200a Binary files /dev/null and b/data/themes/images/e17_logo_small_p2.png differ diff --git a/data/themes/images/e17_logo_small_p21.png b/data/themes/images/e17_logo_small_p21.png new file mode 100644 index 000000000..d6b61b4dc Binary files /dev/null and b/data/themes/images/e17_logo_small_p21.png differ diff --git a/data/themes/images/e17_logo_small_p22.png b/data/themes/images/e17_logo_small_p22.png new file mode 100644 index 000000000..c59f5e466 Binary files /dev/null and b/data/themes/images/e17_logo_small_p22.png differ diff --git a/data/themes/images/e17_logo_small_p23.png b/data/themes/images/e17_logo_small_p23.png new file mode 100644 index 000000000..76bf5dfa6 Binary files /dev/null and b/data/themes/images/e17_logo_small_p23.png differ diff --git a/data/themes/images/e17_logo_small_p24.png b/data/themes/images/e17_logo_small_p24.png new file mode 100644 index 000000000..ced2b4f3e Binary files /dev/null and b/data/themes/images/e17_logo_small_p24.png differ diff --git a/data/themes/images/e17_logo_small_p25.png b/data/themes/images/e17_logo_small_p25.png new file mode 100644 index 000000000..423213e07 Binary files /dev/null and b/data/themes/images/e17_logo_small_p25.png differ diff --git a/data/themes/images/e17_logo_small_p26.png b/data/themes/images/e17_logo_small_p26.png new file mode 100644 index 000000000..fe76a040a Binary files /dev/null and b/data/themes/images/e17_logo_small_p26.png differ diff --git a/data/themes/images/e17_logo_small_p27.png b/data/themes/images/e17_logo_small_p27.png new file mode 100644 index 000000000..44b1e0075 Binary files /dev/null and b/data/themes/images/e17_logo_small_p27.png differ diff --git a/data/themes/images/e17_logo_small_p28.png b/data/themes/images/e17_logo_small_p28.png new file mode 100644 index 000000000..c15d3f076 Binary files /dev/null and b/data/themes/images/e17_logo_small_p28.png differ diff --git a/data/themes/images/e17_logo_small_p29.png b/data/themes/images/e17_logo_small_p29.png new file mode 100644 index 000000000..165f84d9a Binary files /dev/null and b/data/themes/images/e17_logo_small_p29.png differ diff --git a/data/themes/images/e17_logo_small_p3.png b/data/themes/images/e17_logo_small_p3.png new file mode 100644 index 000000000..056290761 Binary files /dev/null and b/data/themes/images/e17_logo_small_p3.png differ diff --git a/data/themes/images/e17_logo_small_p4.png b/data/themes/images/e17_logo_small_p4.png new file mode 100644 index 000000000..9e7c2d1cc Binary files /dev/null and b/data/themes/images/e17_logo_small_p4.png differ diff --git a/data/themes/images/e17_logo_small_p5.png b/data/themes/images/e17_logo_small_p5.png new file mode 100644 index 000000000..851254a22 Binary files /dev/null and b/data/themes/images/e17_logo_small_p5.png differ diff --git a/data/themes/images/e17_logo_small_p6.png b/data/themes/images/e17_logo_small_p6.png new file mode 100644 index 000000000..c3f85a670 Binary files /dev/null and b/data/themes/images/e17_logo_small_p6.png differ diff --git a/data/themes/images/e17_logo_small_p7.png b/data/themes/images/e17_logo_small_p7.png new file mode 100644 index 000000000..e12ba8a04 Binary files /dev/null and b/data/themes/images/e17_logo_small_p7.png differ diff --git a/data/themes/images/e17_logo_small_p8.png b/data/themes/images/e17_logo_small_p8.png new file mode 100644 index 000000000..977b0d646 Binary files /dev/null and b/data/themes/images/e17_logo_small_p8.png differ diff --git a/data/themes/images/e17_logo_small_p9.png b/data/themes/images/e17_logo_small_p9.png new file mode 100644 index 000000000..ecba20b5f Binary files /dev/null and b/data/themes/images/e17_logo_small_p9.png differ