From 5decef171b3e3c50a42fd2090e7732faa5270177 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Thu, 13 Sep 2012 10:15:46 +0000 Subject: [PATCH] E: Remove duplicated illume-kbd-toggle group. Next step, un-junkify this group. SVN revision: 76595 --- data/themes/default.edc | 934 ++++++++++++++++++++++++++++++++-------- 1 file changed, 766 insertions(+), 168 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 70015f63a..cb8d7e989 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -33994,6 +33994,772 @@ CONNMAN_ICON(ethernet) } } + group { + name: "e/conf/randr/main/scrollframe"; + images { + image: "arrow_left.png" COMP; + image: "arrow_right.png" COMP; + image: "arrow_up.png" COMP; + image: "arrow_down.png" COMP; + image: "bt_sm_base1.png" COMP; + image: "bt_sm_base2.png" COMP; + image: "bt_sm_shine.png" COMP; + image: "bt_sm_hilight.png" COMP; + image: "sb_runnerh.png" COMP; + image: "sb_runnerv.png" COMP; + } + parts { + part { + name: "bg"; + type: RECT; + mouse_events: 1; + description { + state: "default" 0.0; + rel1.offset: 1 1; + rel2.offset: -2 -2; + color: 255 255 255 255; + color_class: "scrollframe_base"; + } + } + part { + name: "clipper"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; + } + } + part { + name: "e.swallow.content"; + clip_to: "clipper"; + type: SWALLOW; + description { + state: "default" 0.0; + rel1.offset: 0 0; + rel2 { + relative: 0.0 0.0; + offset: -1 -1; + to_x: "sb_vbar"; + to_y: "sb_hbar"; + } + } + } + /* + part { name: "tst"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + rel2.relative: 1.0 0.2; + color: 0 0 255 128; + } + } + part { + name: "conf_over"; + mouse_events: 0; + description { + state: "default" 0.0; + image { + normal: "inset_sunk.png"; + border: 7 7 7 7; + middle: 0; + } + fill.smooth : 0; + } + } +*/ + part { + name: "sb_vbar"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + min: 17 17; + align: 1.0 0.0; + rel1 { + to: "bg"; + relative: 1.0 0.0; + offset: -2 1; + } + rel2 { + to: "bg"; + relative: 1.0 0.0; + offset: -2 -1; + to_y: "sb_hbar"; + } + } + description { + state: "hidden" 0.0; + visible: 0; + max: 0 99999; + rel1 { + to: "bg"; + relative: 1.0 0.0; + offset: -1 0; + } + rel2 { + to: "bg"; + relative: 1.0 0.0; + offset: -1 -1; + to_y: "sb_hbar"; + } + } + } + part { + name: "sb_vbar_base"; + type: RECT; + clip_to: "sb_vbar"; + mouse_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + rel1 { + relative: 0.0 1.0; + offset: 0 -2; + to: "sb_vbar_a1"; + } + rel2 { + relative: 1.0 0.0; + offset: -1 1; + to: "sb_vbar_a2"; + } + } + } + part { + name: "sb_vbar_runner"; + clip_to: "sb_vbar"; + mouse_events: 0; + description { + state: "default" 0.0; + max: 3 99999; + rel1.to: "sb_vbar_base"; + rel1.offset: 1 0; + rel2.to: "sb_vbar_base"; + image { + normal: "sb_runnerv.png"; + border: 0 0 4 4; + } + fill.smooth: 0; + } + } + part { + name: "sb_vbar_p1"; + type: RECT; + clip_to: "sb_vbar"; + mouse_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + rel1 { + relative: 0.0 1.0; + to: "sb_vbar_a1"; + } + rel2 { + relative: 1.0 0.0; + to: "e.dragable.vbar"; + } + } + } + part { + name: "sb_vbar_p2"; + type: RECT; + clip_to: "sb_vbar"; + mouse_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + rel1 { + relative: 0.0 1.0; + to: "e.dragable.vbar"; + } + rel2 { + relative: 1.0 0.0; + to: "sb_vbar_a2"; + } + } + } + part { + name: "e.dragable.vbar"; + clip_to: "sb_vbar"; + mouse_events: 1; + scale: 1; + dragable { + x: 0 0 0; + y: 1 1 0; + confine: "sb_vbar_base"; + } + description { + state: "default" 0.0; + min: 17 17; + rel1 { + relative: 0.5 0.5; + offset: 0 0; + to: "sb_vbar_base"; + } + rel2 { + relative: 0.5 0.5; + offset: 0 0; + to: "sb_vbar_base"; + } + image { + normal: "bt_sm_base2.png"; + border: 6 6 6 6; + } + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + image.normal: "bt_sm_base1.png"; + } + } + part { + name: "sb_vbar_over1"; + clip_to: "sb_vbar"; + mouse_events: 0; + description { + state: "default" 0.0; + rel1.to: "e.dragable.vbar"; + rel2.relative: 1.0 0.5; + rel2.to: "e.dragable.vbar"; + image { + normal: "bt_sm_hilight.png"; + border: 6 6 6 0; + } + } + } + part { + name: "sb_vbar_over2"; + clip_to: "sb_vbar"; + mouse_events: 0; + description { + state: "default" 0.0; + rel1.to: "e.dragable.vbar"; + rel2.to: "e.dragable.vbar"; + image { + normal: "bt_sm_shine.png"; + border: 6 6 6 0; + } + } + } + part { + name: "sb_vbar_a1"; + type: RECT; + clip_to: "sb_vbar"; + mouse_events: 1; + description { + state: "default" 0.0; + min: 17 17; + align: 0.5 0.0; + aspect: 1.0 1.0; + aspect_preference: HORIZONTAL; + color: 0 0 0 0; + rel1 { + to: "sb_vbar"; + relative: 0.0 0.0; + offset: 0 0; + } + rel2 { + to: "sb_vbar"; + relative: 1.0 0.0; + offset: -1 0; + } + } + } + part { + name: "sb_vbar_a1_arrow"; + mouse_events: 0; + clip_to: "sb_vbar"; + description { + state: "default" 0.0; + max: 9 9; + rel1.to: "sb_vbar_a1"; + rel2.to: "sb_vbar_a1"; + image.normal: "arrow_up.png"; + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + rel1.offset: 0 -1; + rel2.offset: -1 -2; + } + } + part { + name: "sb_vbar_a2"; + type: RECT; + clip_to: "sb_vbar"; + mouse_events: 1; + description { + state: "default" 0.0; + min: 17 17; + align: 0.5 1.0; + aspect: 1.0 1.0; + aspect_preference: HORIZONTAL; + color: 0 0 0 0; + rel1 { + to: "sb_vbar"; + relative: 0.0 1.0; + offset: 0 0; + } + rel2 { + to: "sb_vbar"; + relative: 1.0 1.0; + offset: -1 0; + } + } + } + part { + name: "sb_vbar_a2_arrow"; + type: IMAGE; + mouse_events: 0; + clip_to: "sb_vbar"; + description { + state: "default" 0.0; + max: 9 9; + rel1.to: "sb_vbar_a2"; + rel2.to: "sb_vbar_a2"; + image.normal: "arrow_down.png"; + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + rel1.offset: 0 1; + rel2.offset: -1 0; + } + } + part { + name: "sb_hbar"; + type: RECT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + min: 17 17; + align: 0.0 1.0; + rel1 { + to: "bg"; + relative: 0.0 1.0; + offset: 1 -2; + } + rel2 { + to: "bg"; + relative: 0.0 1.0; + offset: -1 -2; + to_x: "sb_vbar"; + } + } + description { + state: "hidden" 0.0; + visible: 0; + rel1 { + to: "bg"; + relative: 0.0 1.0; + offset: 0 -1; + } + rel2 { + to: "bg"; + relative: 0.0 1.0; + offset: -1 -1; + to_x: "sb_vbar"; + } + } + } + part { + name: "sb_hbar_base"; + type: RECT; + clip_to: "sb_hbar"; + mouse_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + rel1 { + relative: 1.0 0.0; + offset: -2 0; + to: "sb_hbar_a1"; + } + rel2 { + relative: 0.0 1.0; + offset: 1 -1; + to: "sb_hbar_a2"; + } + } + } + part { + name: "sb_hbar_runner"; + clip_to: "sb_hbar"; + mouse_events: 0; + description { + state: "default" 0.0; + max: 99999 2; + rel1.to: "sb_hbar_base"; + rel1.offset: 0 1; + rel2.to: "sb_hbar_base"; + image { + normal: "sb_runnerh.png"; + border: 4 4 0 0; + } + fill.smooth: 0; + } + } + part { + name: "sb_hbar_p1"; + type: RECT; + clip_to: "sb_hbar"; + mouse_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + rel1 { + relative: 1.0 0.0; + to: "sb_hbar_a1"; + } + rel2 { + relative: 0.0 1.0; + to: "e.dragable.hbar"; + } + } + } + part { + name: "sb_hbar_p2"; + type: RECT; + clip_to: "sb_hbar"; + mouse_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + rel1 { + relative: 1.0 0.0; + to: "e.dragable.hbar"; + } + rel2 { + relative: 0.0 1.0; + to: "sb_hbar_a2"; + } + } + } + part { + name: "e.dragable.hbar"; + clip_to: "sb_hbar"; + mouse_events: 1; + scale: 1; + dragable { + x: 1 1 0; + y: 0 0 0; + confine: "sb_hbar_base"; + } + description { + state: "default" 0.0; + min: 17 17; + rel1 { + relative: 0.5 0.5; + offset: 0 0; + to: "sb_hbar_base"; + } + rel2 { + relative: 0.5 0.5; + offset: 0 0; + to: "sb_hbar_base"; + } + image { + normal: "bt_sm_base2.png"; + border: 6 6 6 6; + } + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + image.normal: "bt_sm_base1.png"; + } + } + part { + name: "sb_hbar_over1"; + clip_to: "sb_hbar"; + mouse_events: 0; + description { + state: "default" 0.0; + rel1.to: "e.dragable.hbar"; + rel2.relative: 1.0 0.5; + rel2.to: "e.dragable.hbar"; + image { + normal: "bt_sm_hilight.png"; + border: 6 6 6 0; + } + } + } + part { + name: "sb_hbar_over2"; + clip_to: "sb_hbar"; + mouse_events: 0; + description { + state: "default" 0.0; + rel1.to: "e.dragable.hbar"; + rel2.to: "e.dragable.hbar"; + image { + normal: "bt_sm_shine.png"; + border: 6 6 6 0; + } + } + } + part { + name: "sb_hbar_a1"; + type: RECT; + clip_to: "sb_hbar"; + mouse_events: 1; + description { + state: "default" 0.0; + min: 17 17; + align: 0.0 0.5; + aspect: 1.0 1.0; + aspect_preference: VERTICAL; + color: 0 0 0 0; + rel1 { + to: "sb_hbar"; + relative: 0.0 0.0; + offset: 0 0; + } + rel2 { + to: "sb_hbar"; + relative: 0.0 1.0; + offset: 0 -1; + } + } + } + part { + name: "sb_hbar_a1_arrow"; + type: IMAGE; + mouse_events: 0; + clip_to: "sb_hbar"; + description { + state: "default" 0.0; + max: 9 9; + rel1.to: "sb_hbar_a1"; + rel2.to: "sb_hbar_a1"; + image.normal: "arrow_left.png"; + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + rel1.offset: -1 0; + rel2.offset: -2 -1; + } + } + part { + name: "sb_hbar_a2"; + type: RECT; + clip_to: "sb_hbar"; + mouse_events: 1; + description { + state: "default" 0.0; + min: 17 17; + align: 1.0 0.5; + aspect: 1.0 1.0; + aspect_preference: VERTICAL; + color: 0 0 0 0; + rel1 { + to: "sb_hbar"; + relative: 1.0 0.0; + offset: -1 0; + } + rel2 { + to: "sb_hbar"; + relative: 1.0 1.0; + offset: -1 -1; + } + } + } + part { + name: "sb_hbar_a2_arrow"; + type: IMAGE; + mouse_events: 0; + clip_to: "sb_hbar"; + description { + state: "default" 0.0; + max: 9 9; + rel1.to: "sb_hbar_a2"; + rel2.to: "sb_hbar_a2"; + image.normal: "arrow_right.png"; + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + rel1.offset: 1 0; + rel2.offset: 0 -1; + } + } + } + programs { + program { + name: "sb_vbar_show"; + signal: "e,action,show,vbar"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "sb_vbar"; + } + program { + name: "sb_vbar_hide"; + signal: "e,action,hide,vbar"; + source: "e"; + action: STATE_SET "hidden" 0.0; + target: "sb_vbar"; + } + program { + name: "sb_hbar_show"; + signal: "e,action,show,hbar"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "sb_hbar"; + } + program { + name: "sb_hbar_hide"; + signal: "e,action,hide,hbar"; + source: "e"; + action: STATE_SET "hidden" 0.0; + target: "sb_hbar"; + } + program { + name: "sb_vbar_a1_down"; + signal: "mouse,down,1"; + source: "sb_vbar_a1"; + action: STATE_SET "clicked" 0.0; + target: "sb_vbar_a1_arrow"; + } + program { + name: "sb_vbar_a1_down2"; + signal: "mouse,down,1"; + source: "sb_vbar_a1"; + action: DRAG_VAL_STEP 0.0 -1.0; + target: "e.dragable.vbar"; + } + program { + name: "sb_vbar_a1_up"; + signal: "mouse,up,1"; + source: "sb_vbar_a1"; + action: STATE_SET "default" 0.0; + target: "sb_vbar_a1_arrow"; + } + program { + name: "sb_vbar_a2_down"; + signal: "mouse,down,1"; + source: "sb_vbar_a2"; + action: STATE_SET "clicked" 0.0; + target: "sb_vbar_a2_arrow"; + } + program { + name: "sb_vbar_a2_down2"; + signal: "mouse,down,1"; + source: "sb_vbar_a2"; + action: DRAG_VAL_STEP 0.0 1.0; + target: "e.dragable.vbar"; + } + program { + name: "sb_vbar_a2_up"; + signal: "mouse,up,1"; + source: "sb_vbar_a2"; + action: STATE_SET "default" 0.0; + target: "sb_vbar_a2_arrow"; + } + program { + name: "sb_vbar_p1_down"; + signal: "mouse,down,1"; + source: "sb_vbar_p1"; + action: DRAG_VAL_PAGE 0.0 -1.0; + target: "e.dragable.vbar"; + } + program { + name: "sb_vbar_p2_down"; + signal: "mouse,down,1"; + source: "sb_vbar_p2"; + action: DRAG_VAL_PAGE 0.0 1.0; + target: "e.dragable.vbar"; + } + program { + name: "sb_vbar_down"; + signal: "mouse,down,1"; + source: "e.dragable.vbar"; + action: STATE_SET "clicked" 0.0; + target: "e.dragable.vbar"; + } + program { + name: "sb_vbar_up"; + signal: "mouse,up,1"; + source: "e.dragable.vbar"; + action: STATE_SET "default" 0.0; + target: "e.dragable.vbar"; + } + program { + name: "sb_hbar_a1_down"; + signal: "mouse,down,1"; + source: "sb_hbar_a1"; + action: STATE_SET "clicked" 0.0; + target: "sb_hbar_a1_arrow"; + } + program { + name: "sb_hbar_a1_down2"; + signal: "mouse,down,1"; + source: "sb_hbar_a1"; + action: DRAG_VAL_STEP -1.0 0.0; + target: "e.dragable.hbar"; + } + program { + name: "sb_hbar_a1_up"; + signal: "mouse,up,1"; + source: "sb_hbar_a1"; + action: STATE_SET "default" 0.0; + target: "sb_hbar_a1_arrow"; + } + program { + name: "sb_hbar_a2_down"; + signal: "mouse,down,1"; + source: "sb_hbar_a2"; + action: STATE_SET "clicked" 0.0; + target: "sb_hbar_a2_arrow"; + } + program { + name: "sb_hbar_a2_down2"; + signal: "mouse,down,1"; + source: "sb_hbar_a2"; + action: DRAG_VAL_STEP 1.0 0.0; + target: "e.dragable.hbar"; + } + program { + name: "sb_hbar_a2_up"; + signal: "mouse,up,1"; + source: "sb_hbar_a2"; + action: STATE_SET "default" 0.0; + target: "sb_hbar_a2_arrow"; + } + program { + name: "sb_hbar_p1_down"; + signal: "mouse,down,1"; + source: "sb_hbar_p1"; + action: DRAG_VAL_PAGE -1.0 0.0; + target: "e.dragable.hbar"; + } + program { + name: "sb_hbar_p2_down"; + signal: "mouse,down,1"; + source: "sb_hbar_p2"; + action: DRAG_VAL_PAGE 1.0 0.0; + target: "e.dragable.hbar"; + } + program { + name: "sb_hbar_down"; + signal: "mouse,down,1"; + source: "e.dragable.hbar"; + action: STATE_SET "clicked" 0.0; + target: "e.dragable.hbar"; + } + program { + name: "sb_hbar_up"; + signal: "mouse,up,1"; + source: "e.dragable.hbar"; + action: STATE_SET "default" 0.0; + target: "e.dragable.hbar"; + } + } + } + ///////////////////////////////////////////////////////////////////////////// /*** MOD: EVERYTHING ***/ @@ -36971,174 +37737,6 @@ CONNMAN_ICON(ethernet) } } -///////////////////////////////////////////////////////////////////////////// -/*** MOD: ILLUME-KBD-TOGGLE ***/ - - group { - name: "e/modules/illume_kbd_toggle/main"; - images.image: "illume-kbd.png" COMP; - images.image: "illume-kbd-on.png" COMP; - images { - image: "bt_base1.png" COMP; - image: "bt_base2.png" COMP; - image: "bt_hilight.png" COMP; - image: "bt_shine.png" COMP; - image: "bt_glow.png" COMP; - } - min: 16 16; - max: 128 128; - parts { - part { - name: "button_image"; - mouse_events: 1; - scale: 1; - description { - state: "default" 0.0; - fixed: 1 1; - align: 0.5 0.5; - min: 32 16; - image { - normal: "bt_base2.png"; - border: 7 7 7 7; - } - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "bt_base1.png"; - } - program { - name: "button_down"; - signal: "mouse,down,1"; - source: "button_image"; - action: STATE_SET "clicked" 0.0; - target: "button_image"; - target: "over3"; - } - program { - name: "button_up"; - signal: "mouse,up,1"; - source: "button_image"; - action: STATE_SET "default" 0.0; - target: "button_image"; - target: "over3"; - } - program { - name: "enable"; - signal: "mouse,clicked,1"; - source: "button_image"; - action: SIGNAL_EMIT "e,action,vkbd,enable" ""; - } - } - part { - name: "icon"; - mouse_events: 0; - description { - state: "default" 0.0; - aspect: 1.0 1.0; - aspect_preference: BOTH; - image.normal: "illume-kbd.png"; - rel1 { - to: "button_image"; - relative: 0.0 0.0; - offset: 3 3; - } - rel2 { - relative: 1.0 1.0; - offset: -4 -4; - to: "button_image"; - } - } - description { state: "on" 0.0; - inherit: "default" 0.0; - image.normal: "illume-kbd-on.png"; - } - program { name: "state_on"; - signal: "e,state,vkbd,on"; - source: "e"; - action: STATE_SET "on" 0.0; - target: "icon"; - target: "on"; - } - program { name: "state_off"; - signal: "e,state,vkbd,off"; - source: "e"; - action: STATE_SET "default" 0.0; - target: "icon"; - target: "on"; - } - } - part { name: "on"; - type: RECT; - mouse_events: 1; - description { state: "default" 0.0; - visible: 0; - color: 0 0 0 0; - rel1.to: "button_image"; - rel2.to: "button_image"; - } - description { state: "on" 0.0; - inherit: "default" 0.0; - visible: 1; - } - program { name: "disable"; - signal: "mouse,clicked,1"; - source: "on"; - action: SIGNAL_EMIT "e,action,vkbd,disable" ""; - } - } - part { - name: "over1"; - mouse_events: 0; - description { - state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - rel2.relative: 1.0 0.5; - image { - normal: "bt_hilight.png"; - border: 7 7 7 0; - } - } - } - part { - name: "over2"; - mouse_events: 0; - description { - state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - image { - normal: "bt_shine.png"; - border: 7 7 7 7; - } - } - } - part { - name: "over3"; - mouse_events: 0; - description { - state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - visible: 0; - color: 255 255 255 0; - image { - normal: "bt_glow.png"; - border: 12 12 12 12; - } - fill.smooth : 0; - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - } - } - ///////////////////////////////////////////////////////////////////////////// /*** MOD: ILLUME-MODE-TOGGLE ***/