diff --git a/data/elementary/themes/edc/luncher.edc b/data/elementary/themes/edc/luncher.edc index 8d4db80941..61af2578fb 100644 --- a/data/elementary/themes/edc/luncher.edc +++ b/data/elementary/themes/edc/luncher.edc @@ -184,15 +184,11 @@ group { name: "e/gadget/luncher/icon"; description { state: "default" 0.0; visible: 0; align: 0.6 0.6; - rel1.to: "sizer"; - rel2.to: "sizer"; color: 255 255 255 0; } description { state: "on_left" 0.0; inherit: "default" 0.0; visible: 1; - rel1.to_y: "e.swallow.icon"; - rel2.to_y: "e.swallow.icon"; rel1.relative: 0.0 0.025; rel2.relative: 0.05 0.975; color: 51 153 255 255; @@ -200,8 +196,6 @@ group { name: "e/gadget/luncher/icon"; description { state: "on_top" 0.0; inherit: "default" 0.0; visible: 1; - rel1.to_x: "e.swallow.icon"; - rel2.to_x: "e.swallow.icon"; rel1.relative: 0.025 0.0; rel2.relative: 0.975 0.05; color: 51 153 255 255; @@ -209,8 +203,6 @@ group { name: "e/gadget/luncher/icon"; description { state: "on_right" 0.0; inherit: "default" 0.0; visible: 1; - rel1.to_y: "e.swallow.icon"; - rel2.to_y: "e.swallow.icon"; rel1.relative: 0.95 0.025; rel2.relative: 1.0 0.975; color: 51 153 255 255; @@ -218,8 +210,6 @@ group { name: "e/gadget/luncher/icon"; description { state: "on_bottom" 0.0; inherit: "default" 0.0; visible: 1; - rel1.to_x: "e.swallow.icon"; - rel2.to_x: "e.swallow.icon"; rel1.relative: 0.025 0.95; rel2.relative: 0.975 1.0; color: 51 153 255 255; diff --git a/data/elementary/themes/edc/pager.edc b/data/elementary/themes/edc/pager.edc index 74af167908..218fbe9b24 100644 --- a/data/elementary/themes/edc/pager.edc +++ b/data/elementary/themes/edc/pager.edc @@ -356,7 +356,7 @@ group { name: "e/modules/pager/desk"; } } -group { name: "e/gadget/pager/desk"; +group { name: "e/gadget/pager/plain/desk"; images.image: "vgrad_med_darker.png" COMP; images.image: "bevel_out.png" COMP; images.image: "bevel_in.png" COMP; @@ -412,6 +412,18 @@ group { name: "e/gadget/pager/desk"; rel2.to: "base"; } } + part { name: "e.swallow.drop"; type: SWALLOW; + clip_to: "clip"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + rel2.offset: -2 -1; + link.base: "e,state,visible" "e"; + } + desc { "hid"; inherit; hid; + link.base: "e,state,hidden" "e"; + } + } part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clip"; description { state: "default" 0.0; @@ -694,8 +706,331 @@ group { name: "e/gadget/pager/desk"; } } +group { name: "e/gadget/pager/default/desk"; + images.image: "vgrad_med_darker.png" COMP; + images.image: "bevel_out.png" COMP; + images.image: "bevel_in.png" COMP; + images.image: "inset_shadow.png" COMP; + images.image: "mini_blue_glow_arrow_0.png" COMP; + images.image: "mini_blue_glow_arrow_1.png" COMP; + images.image: "mini_blue_glow_arrow_2.png" COMP; + images.image: "mini_blue_glow_arrow_3.png" COMP; + parts { + part { name: "base"; type: SPACER; + description { state: "default" 0.0; + rel1.to: "inset"; + rel1.offset: 1 1; + rel2.to: "inset"; + rel2.offset: -2 -2; + } + } + part { name: "bevel"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "bevel_out.png"; + image.border: 1 1 1 1; + image.middle: 0; + rel1.to: "base"; + rel2.to: "base"; + fill.smooth: 0; + } + } + part { name: "clip"; type: RECT; mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + } + } + part { name: "e.swallow.drop"; type: SWALLOW; + clip_to: "clip"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + rel2.offset: -2 -1; + link.base: "e,state,visible" "e"; + } + desc { "hid"; inherit; hid; + link.base: "e,state,hidden" "e"; + } + } + part { name: "e.swallow.content"; type: SWALLOW; + clip_to: "clip"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + rel2.offset: -2 -1; + link.base: "e,state,visible" "e"; + } + desc { "hid"; inherit; hid; + link.base: "e,state,hidden" "e"; + } + } + part { name: "shadow"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "inset_shadow.png"; + image.border: 5 5 7 3; + image.middle: 0; + rel1.to: "base"; + rel2.to: "base"; + fill.smooth: 0; + } + } + part { name: "inset"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "bevel_in.png"; + image.border: 1 1 1 1; + image.middle: 0; + rel1.offset: 1 2; + rel2.offset: -2 -3; + fill.smooth: 0; + } + } + part { name: "glow"; mouse_events: 0; + type: RECT; + description { state: "default" 0.0; + visible: 0; + color: 255 255 255 0; + } + description { state: "on_left" 0.0; + inherit: "default" 0.0; + visible: 1; + rel1.relative: 0.0 0.025; + rel1.offset: 0 1; + rel2.relative: 0.05 0.975; + rel2.offset: -1 -1; + color: 51 153 255 255; + } + description { state: "on_top" 0.0; + inherit: "default" 0.0; + visible: 1; + rel1.relative: 0.025 0.0; + rel1.offset: 1 0; + rel2.relative: 0.975 0.05; + rel2.offset: -1 -1; + color: 51 153 255 255; + } + description { state: "on_right" 0.0; + inherit: "default" 0.0; + visible: 1; + rel1.relative: 0.95 0.025; + rel1.offset: 1 1; + rel2.relative: 1.0 0.975; + rel2.offset: 0 -1; + color: 51 153 255 255; + } + description { state: "on_bottom" 0.0; + inherit: "default" 0.0; + visible: 1; + rel1.relative: 0.025 0.95; + rel1.offset: 0 1; + rel2.relative: 0.975 1.0; + rel2.offset: -1 0; + color: 51 153 255 255; + } + } + part { name: "e.text.label"; type: TEXT; mouse_events: 0; + scale: 1; + effect: SHADOW BOTTOM; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + color_class: "module_label_invisible"; + color3: 255 255 255 255; + text { font: "Sans"; size: 10; + text_class: "module_small"; + align: 0.5 0.5; + } + visible: 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + color_class: "module_label"; + color3: 255 255 255 255; + visible: 1; + } + } + part { name: "drop0"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "mini_blue_glow_arrow_0.png"; + rel1.to: "base"; + rel1.offset: -1 -1; + rel1.relative: 0.0 0.0; + rel2.to: "base"; + rel2.relative: 0.0 0.0; + rel2.offset: -1 -1; + align: 0.0 0.0; + min: 10 10; + fixed: 1 1; + visible: 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + visible: 1; + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + rel1.offset: 11 11; + rel2.offset: 11 11; + min: 1 1; + color: 255 255 255 0; + } + } + part { name: "drop1"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "mini_blue_glow_arrow_1.png"; + rel1.to: "base"; + rel1.offset: 0 -1; + rel1.relative: 1.0 0.0; + rel2.to: "base"; + rel2.relative: 1.0 0.0; + rel2.offset: 0 -1; + align: 1.0 0.0; + min: 10 10; + fixed: 1 1; + visible: 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + visible: 1; + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + rel1.offset: -12 11; + rel2.offset: -12 11; + min: 1 1; + color: 255 255 255 0; + } + } + part { name: "drop2"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "mini_blue_glow_arrow_2.png"; + rel1.to: "base"; + rel1.offset: 0 0; + rel1.relative: 1.0 1.0; + rel2.to: "base"; + rel2.relative: 1.0 1.0; + rel2.offset: 0 0; + align: 1.0 1.0; + min: 10 10; + fixed: 1 1; + visible: 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + visible: 1; + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + rel1.offset: -12 -12; + rel2.offset: -12 -12; + min: 1 1; + color: 255 255 255 0; + } + } + part { name: "drop3"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "mini_blue_glow_arrow_3.png"; + rel1.to: "base"; + rel1.offset: -1 0; + rel1.relative: 0.0 1.0; + rel2.to: "base"; + rel2.relative: 0.0 1.0; + rel2.offset: -1 0; + align: 0.0 1.0; + min: 10 10; + fixed: 1 1; + visible: 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + visible: 1; + } + description { state: "hidden" 0.0; + inherit: "default" 0.0; + rel1.offset: 11 -12; + rel2.offset: 11 -12; + min: 1 1; + color: 255 255 255 0; + } + } + part { name: "e.eventarea"; type: RECT; mouse_events: 1; + repeat_events: 1; + description { state: "default" 0.0; + color: 255 255 255 0; + } + } + } + programs { + program { name: "sel_left"; + signal: "e,state,selected,left"; source: "e"; + action: STATE_SET "on_left" 0.0; + transition: ACCELERATE 0.2; + target: "glow"; + } + program { name: "sel_top"; + signal: "e,state,selected,top"; source: "e"; + action: STATE_SET "on_top" 0.0; + transition: ACCELERATE 0.2; + target: "glow"; + } + program { name: "sel_right"; + signal: "e,state,selected,right"; source: "e"; + action: STATE_SET "on_right" 0.0; + transition: ACCELERATE 0.2; + target: "glow"; + } + program { name: "sel_bottom"; + signal: "e,state,selected,bottom"; source: "e"; + action: STATE_SET "on_bottom" 0.0; + transition: ACCELERATE 0.2; + target: "glow"; + } + program { + signal: "e,state,unselected"; source: "e"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.2; + target: "glow"; + } + program { name: "drop1"; + signal: "e,action,drag,in"; source: "e"; + action: STATE_SET "active" 0.0; + target: "drop0"; + target: "drop1"; + target: "drop2"; + target: "drop3"; + after: "drop2"; + } + program { name: "drop2"; + action: STATE_SET "hidden" 0.0; + transition: LINEAR 0.5; + target: "drop0"; + target: "drop1"; + target: "drop2"; + target: "drop3"; + after: "drop1"; + } + program { + signal: "e,action,drag,out"; source: "e"; + action: STATE_SET "default" 0.0; + target: "drop0"; + target: "drop1"; + target: "drop2"; + target: "drop3"; + } + program { + signal: "e,name,show"; source: "e"; + action: STATE_SET "active" 0.0; + target: "e.text.label"; + } + program { + signal: "e,name,hide"; source: "e"; + action: STATE_SET "default" 0.0; + target: "e.text.label"; + } + } +} + group { name: "e/modules/pager/window"; - alias: "e/gadget/pager/window"; + alias: "e/gadget/pager/plain/window"; images.image: "mini_box_bevel_shadow.png" COMP; images.image: "mini_box_glow.png" COMP; parts { diff --git a/data/elementary/themes/edc/pager16.edc b/data/elementary/themes/edc/pager16.edc index c27f6e2b90..454c405515 100644 --- a/data/elementary/themes/edc/pager16.edc +++ b/data/elementary/themes/edc/pager16.edc @@ -1,5 +1,4 @@ group { name: "e/modules/pager16/popup"; - alias: "e/gadget/pager16/popup"; images.image: "vgrad_tall.png" COMP; images.image: "bevel_out.png" COMP; images.image: "shine.png" COMP; @@ -340,326 +339,3 @@ group { name: "e/modules/pager16/desk"; } } } - -group { name: "e/gadget/pager16/desk"; - images.image: "vgrad_med_darker.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "bevel_in.png" COMP; - images.image: "inset_shadow.png" COMP; - images.image: "mini_blue_glow_arrow_0.png" COMP; - images.image: "mini_blue_glow_arrow_1.png" COMP; - images.image: "mini_blue_glow_arrow_2.png" COMP; - images.image: "mini_blue_glow_arrow_3.png" COMP; - parts { - part { name: "base"; type: SPACER; - description { state: "default" 0.0; - rel1.to: "inset"; - rel1.offset: 1 1; - rel2.to: "inset"; - rel2.offset: -2 -2; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.to: "base"; - rel2.to: "base"; - fill.smooth: 0; - } - } - part { name: "clip"; type: RECT; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - } - } - part { name: "e.swallow.drop"; type: SWALLOW; - clip_to: "clip"; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - rel2.offset: -2 -1; - link.base: "e,state,visible" "e"; - } - desc { "hid"; inherit; hid; - link.base: "e,state,hidden" "e"; - } - } - part { name: "e.swallow.content"; type: SWALLOW; - clip_to: "clip"; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - rel2.offset: -2 -1; - link.base: "e,state,visible" "e"; - } - desc { "hid"; inherit; hid; - link.base: "e,state,hidden" "e"; - } - } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow.png"; - image.border: 5 5 7 3; - image.middle: 0; - rel1.to: "base"; - rel2.to: "base"; - fill.smooth: 0; - } - } - part { name: "inset"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_in.png"; - image.border: 1 1 1 1; - image.middle: 0; - rel1.offset: 1 2; - rel2.offset: -2 -3; - fill.smooth: 0; - } - } - part { name: "glow"; mouse_events: 0; - type: RECT; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - } - description { state: "on_left" 0.0; - inherit: "default" 0.0; - visible: 1; - rel1.relative: 0.0 0.025; - rel1.offset: 0 1; - rel2.relative: 0.05 0.975; - rel2.offset: -1 -1; - color: 51 153 255 255; - } - description { state: "on_top" 0.0; - inherit: "default" 0.0; - visible: 1; - rel1.relative: 0.025 0.0; - rel1.offset: 1 0; - rel2.relative: 0.975 0.05; - rel2.offset: -1 -1; - color: 51 153 255 255; - } - description { state: "on_right" 0.0; - inherit: "default" 0.0; - visible: 1; - rel1.relative: 0.95 0.025; - rel1.offset: 1 1; - rel2.relative: 1.0 0.975; - rel2.offset: 0 -1; - color: 51 153 255 255; - } - description { state: "on_bottom" 0.0; - inherit: "default" 0.0; - visible: 1; - rel1.relative: 0.025 0.95; - rel1.offset: 0 1; - rel2.relative: 0.975 1.0; - rel2.offset: -1 0; - color: 51 153 255 255; - } - } - part { name: "e.text.label"; type: TEXT; mouse_events: 0; - scale: 1; - effect: SHADOW BOTTOM; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - color_class: "module_label_invisible"; - color3: 255 255 255 255; - text { font: "Sans"; size: 10; - text_class: "module_small"; - align: 0.5 0.5; - } - visible: 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - color_class: "module_label"; - color3: 255 255 255 255; - visible: 1; - } - } - part { name: "drop0"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "mini_blue_glow_arrow_0.png"; - rel1.to: "base"; - rel1.offset: -1 -1; - rel1.relative: 0.0 0.0; - rel2.to: "base"; - rel2.relative: 0.0 0.0; - rel2.offset: -1 -1; - align: 0.0 0.0; - min: 10 10; - fixed: 1 1; - visible: 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - rel1.offset: 11 11; - rel2.offset: 11 11; - min: 1 1; - color: 255 255 255 0; - } - } - part { name: "drop1"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "mini_blue_glow_arrow_1.png"; - rel1.to: "base"; - rel1.offset: 0 -1; - rel1.relative: 1.0 0.0; - rel2.to: "base"; - rel2.relative: 1.0 0.0; - rel2.offset: 0 -1; - align: 1.0 0.0; - min: 10 10; - fixed: 1 1; - visible: 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - rel1.offset: -12 11; - rel2.offset: -12 11; - min: 1 1; - color: 255 255 255 0; - } - } - part { name: "drop2"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "mini_blue_glow_arrow_2.png"; - rel1.to: "base"; - rel1.offset: 0 0; - rel1.relative: 1.0 1.0; - rel2.to: "base"; - rel2.relative: 1.0 1.0; - rel2.offset: 0 0; - align: 1.0 1.0; - min: 10 10; - fixed: 1 1; - visible: 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - rel1.offset: -12 -12; - rel2.offset: -12 -12; - min: 1 1; - color: 255 255 255 0; - } - } - part { name: "drop3"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "mini_blue_glow_arrow_3.png"; - rel1.to: "base"; - rel1.offset: -1 0; - rel1.relative: 0.0 1.0; - rel2.to: "base"; - rel2.relative: 0.0 1.0; - rel2.offset: -1 0; - align: 0.0 1.0; - min: 10 10; - fixed: 1 1; - visible: 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - rel1.offset: 11 -12; - rel2.offset: 11 -12; - min: 1 1; - color: 255 255 255 0; - } - } - part { name: "e.eventarea"; type: RECT; mouse_events: 1; - repeat_events: 1; - description { state: "default" 0.0; - color: 255 255 255 0; - } - } - } - programs { - program { name: "sel_left"; - signal: "e,state,selected,left"; source: "e"; - action: STATE_SET "on_left" 0.0; - transition: ACCELERATE 0.2; - target: "glow"; - } - program { name: "sel_top"; - signal: "e,state,selected,top"; source: "e"; - action: STATE_SET "on_top" 0.0; - transition: ACCELERATE 0.2; - target: "glow"; - } - program { name: "sel_right"; - signal: "e,state,selected,right"; source: "e"; - action: STATE_SET "on_right" 0.0; - transition: ACCELERATE 0.2; - target: "glow"; - } - program { name: "sel_bottom"; - signal: "e,state,selected,bottom"; source: "e"; - action: STATE_SET "on_bottom" 0.0; - transition: ACCELERATE 0.2; - target: "glow"; - } - program { - signal: "e,state,unselected"; source: "e"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.2; - target: "glow"; - } - program { name: "drop1"; - signal: "e,action,drag,in"; source: "e"; - action: STATE_SET "active" 0.0; - target: "drop0"; - target: "drop1"; - target: "drop2"; - target: "drop3"; - after: "drop2"; - } - program { name: "drop2"; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "drop0"; - target: "drop1"; - target: "drop2"; - target: "drop3"; - after: "drop1"; - } - program { - signal: "e,action,drag,out"; source: "e"; - action: STATE_SET "default" 0.0; - target: "drop0"; - target: "drop1"; - target: "drop2"; - target: "drop3"; - } - program { - signal: "e,name,show"; source: "e"; - action: STATE_SET "active" 0.0; - target: "e.text.label"; - } - program { - signal: "e,name,hide"; source: "e"; - action: STATE_SET "default" 0.0; - target: "e.text.label"; - } - } -}