diff --git a/data/themes/default.edc b/data/themes/default.edc index 7ccd29f2d..21b6cf1f5 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -48,6 +48,7 @@ collections { #include "default_theme_about.edc" #include "default_entry.edc" #include "default_fileman.edc" +#include "default_filesel.edc" #include "default_scrollbar.edc" #include "default_check.edc" #include "default_radio.edc" diff --git a/data/themes/default_fileman.edc b/data/themes/default_fileman.edc index d471f5753..2b23b7c60 100644 --- a/data/themes/default_fileman.edc +++ b/data/themes/default_fileman.edc @@ -24,7 +24,7 @@ group { \ #define FILEMAN_ICON(TYPE) \ group { \ - name: "fileman/icons/"TYPE; \ + name: "icons/fileman/"TYPE; \ max: 64 64; \ parts { \ part { \ @@ -44,7 +44,7 @@ group { \ #define FILEMAN_ICON_CLICKABLE(TYPE) \ group { \ - name: "fileman/icons/"TYPE; \ + name: "icons/fileman/"TYPE; \ max: 64 64; \ parts { \ part { \ @@ -93,7 +93,9 @@ images image: "e17_icon_fileman_folder.png" COMP; image: "e17_icon_fileman_folder_clicked.png" COMP; image: "e17_icon_fileman_file.png" COMP; - image: "e17_icon_fileman_file_clicked.png" COMP; + image: "e17_icon_fileman_file_clicked.png" COMP; + image: "e17_icon_fileman_home.png" COMP; + image: "e17_icon_fileman_desktop.png" COMP; image: "e17_icon_fileman_pdf.png" COMP; image: "e17_icon_fileman_c.png" COMP; image: "e17_icon_fileman_h.png" COMP; @@ -400,6 +402,29 @@ group { } } +group { + name: "fileman/background"; + parts { + part { + name: "base"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 { + relative: 0.0 0.0; + offset: 1 1; + } + rel2 { + relative: 1.0 1.0; + offset: -1 -1; + } + color: 255 255 255 0; + } + } + } +} + group { name: "fileman/rubberband"; parts { @@ -429,6 +454,8 @@ group { FILEMAN_ICON_CLICKABLE("folder"); FILEMAN_ICON_CLICKABLE("file"); +FILEMAN_ICON("home"); +FILEMAN_ICON("desktop"); FILEMAN_ICON("pdf"); FILEMAN_ICON("c"); FILEMAN_ICON("h"); diff --git a/data/themes/default_filesel.edc b/data/themes/default_filesel.edc new file mode 100644 index 000000000..2f9ec0914 --- /dev/null +++ b/data/themes/default_filesel.edc @@ -0,0 +1,132 @@ +images { + image: "e17_ibar_bg_h.png" COMP; + image: "e17_ibar_over_h.png" COMP; +} +group { + name: "widgets/fileselector/main"; + parts { + part { + name: "background"; + mouse_events: 1; + description { + state: "default" 0.0; + rel1 { + to: "overlay"; + } + rel2 { + to: "overlay"; + } + image { + normal: "e17_ibar_bg_h.png"; + border: 6 6 6 6; + } + fill { + smooth: 0; + } + } + } + part { + name: "items_clip"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 { + to: "background"; + offset: 4 4; + } + rel2 { + to: "background"; + offset: -5 -5; + } + color: 255 255 255 255; + } + } + part { + name: "items"; + type: SWALLOW; + mouse_events: 0; + clip_to: "items_clip"; + description { + state: "default" 0.0; + rel1 { + offset: 4 4; + } + rel2 { + offset: -13 -5; + } + color: 0 0 0 0; + } + description { + state: "top" 0.0; + inherit: "default" 0.0; + } + description { + state: "left" 0.0; + inherit: "default" 0.0; + } + description { + state: "right" 0.0; + inherit: "default" 0.0; + } + } + part { + name: "vscrollbar"; + type: "SWALLOW"; + mouse_events: 1; + clip_to: "items_clip"; + description { + min: 16 40; + state: "default" 0.0; + rel1 { + relative: 1.0 0.0; + offset: -13 4; + } + rel2 { + relative: 1.0 1.0; + offset: -13 -5; + } + color: 0 0 0 255; + } + } + part { + name: "overlay"; + mouse_events: 0; + description { + state: "default" 0.0; + image { + normal: "e17_ibar_over_h.png"; + border: 13 13 13 13; + middle: 0; + } + fill { + smooth: 0; + } + } + description { + state: "top" 0.0; + inherit: "default" 0.0; + } + description { + state: "left" 0.0; + inherit: "default" 0.0; + } + description { + state: "right" 0.0; + inherit: "default" 0.0; + } + } + part { + name: "inn"; + type: RECT; + repeat_events: 1; + description { + state: "default" 0.0; + color: 0 0 0 0; + } + } + } + programs { + + } +} diff --git a/data/themes/default_scrollbar.edc b/data/themes/default_scrollbar.edc index 2e1909939..df2077073 100644 --- a/data/themes/default_scrollbar.edc +++ b/data/themes/default_scrollbar.edc @@ -1,5 +1,308 @@ +#define SCROLLBAR_BUTTON_SIZE 18 + +#define SCROLLBAR_DRAG(part_name, rx1, ry1, ox1, oy1, rx2, ry2, ox2, oy2, image_thumb) \ + part { \ + name: part_name"_shadow2"; \ + mouse_events: 0; \ + description { \ + state: "default" 0.0; \ + rel1 { \ + relative: 0.0 0.0; \ + offset: 0 0; \ + to: part_name; \ + } \ + rel2 { \ + relative: 1.0 1.0; \ + offset: -1 -1; \ + to: part_name; \ + } \ + image { \ + normal: "e17_scrollbar_button_shadow2.png"; \ + border: 8 8 8 8; \ + } \ + } \ + } \ + part { \ + name: part_name"_shadow1"; \ + mouse_events: 0; \ + description { \ + state: "default" 0.0; \ + rel1 { \ + relative: 0.0 0.0; \ + offset: 0 0; \ + to: part_name; \ + } \ + rel2 { \ + relative: 1.0 1.0; \ + offset: -1 -1; \ + to: part_name; \ + } \ + image { \ + normal: "e17_scrollbar_button_shadow1.png"; \ + border: 8 8 8 8; \ + } \ + } \ + } \ + part { \ + name: part_name; \ + description { \ + state: "default" 0.0; \ + rel1 { \ + relative: rx1 ry1; \ + offset: ox1 oy1; \ + } \ + rel2 { \ + relative: rx2 ry2; \ + offset: ox2 oy2; \ + } \ + image { \ + normal: "e17_scrollbar_button.png"; \ + border: 8 8 8 8; \ + } \ + } \ + } \ + part { \ + name: part_name"_thumb"; \ + mouse_events: 0; \ + description { \ + state: "default" 0.0; \ + rel1 { \ + relative: 0.5 0.5; \ + offset: -4 -4; \ + to: part_name; \ + } \ + rel2 { \ + relative: 0.5 0.5; \ + offset: 3 3; \ + to: part_name; \ + } \ + image { \ + normal: image_thumb; \ + } \ + } \ + } + +#define SCROLLBAR_BUTTON(button_name, rx1, ry1, ox1, oy1, arrow_image) \ + part { \ + name: button_name"_shadow2"; \ + mouse_events: 0; \ + description { \ + state: "default" 0.0; \ + rel1 { \ + relative: 0.0 0.0; \ + offset: 0 0; \ + to: button_name; \ + } \ + rel2 { \ + relative: 1.0 1.0; \ + offset: -1 -1; \ + to: button_name; \ + } \ + image { \ + normal: "e17_scrollbar_button_shadow2.png"; \ + border: 8 8 8 8; \ + } \ + } \ + description { \ + state: "active" 0.0; \ + inherit: "default" 0.0; \ + visible: 0; \ + color: 255 255 255 0; \ + } \ + description { \ + state: "hidden" 0.0; \ + inherit: "default" 0.0; \ + visible: 0; \ + color: 255 255 255 0; \ + } \ + } \ + part { \ + name: button_name"_shadow1"; \ + mouse_events: 0; \ + description { \ + state: "default" 0.0; \ + rel1 { \ + relative: 0.0 0.0; \ + offset: 0 0; \ + to: button_name; \ + } \ + rel2 { \ + relative: 1.0 1.0; \ + offset: -1 -1; \ + to: button_name; \ + } \ + image { \ + normal: "e17_scrollbar_button_shadow1.png"; \ + border: 8 8 8 8; \ + } \ + } \ + description { \ + state: "active" 0.0; \ + inherit: "default" 0.0; \ + visible: 0; \ + color: 255 255 255 0; \ + } \ + description { \ + state: "active" 0.0; \ + inherit: "default" 0.0; \ + visible: 0; \ + color: 255 255 255 0; \ + } \ + } \ + part { \ + name: button_name; \ + description { \ + state: "default" 0.0; \ + rel1 { \ + relative: rx1 ry1; \ + offset: ox1 oy1; \ + } \ + rel2 { \ + relative: rx1 ry1; \ + offset: (ox1 + SCROLLBAR_BUTTON_SIZE) (oy1 + SCROLLBAR_BUTTON_SIZE); \ + } \ + image { \ + normal: "e17_scrollbar_button.png"; \ + border: 8 8 8 8; \ + } \ + } \ + description { \ + state: "active" 0.0; \ + inherit: "default" 0.0; \ + rel1 { \ + offset: (ox1 + 1) (oy1 + 1); \ + } \ + rel2 { \ + offset: (ox1 + SCROLLBAR_BUTTON_SIZE + 1) (oy1 + SCROLLBAR_BUTTON_SIZE + 1); \ + } \ + } \ + description { \ + state: "hidden" 0.0; \ + inherit: "default" 0.0; \ + visible: 0; \ + color: 255 255 255 0; \ + } \ + } \ + part { \ + name: button_name"_arrow"; \ + mouse_events: 0; \ + description { \ + state: "default" 0.0; \ + max: 16 16; \ + rel1 { \ + relative: 0.0 0.0; \ + offset: 4 4; \ + to: button_name; \ + } \ + rel2 { \ + relative: 1.0 1.0; \ + offset: -5 -5; \ + to: button_name; \ + } \ + image { \ + normal: arrow_image; \ + } \ + } \ + description { \ + state: "hidden" 0.0; \ + inherit: "default" 0.0; \ + visible: 0; \ + color: 255 255 255 0; \ + } \ + } + +#define SCROLLBAR_BUTTON_PROG(button_name, dir) \ + program { \ + name: button_name"_active_pre"; \ + signal: "mouse,down,1"; \ + source: button_name; \ + action: STATE_SET "default" 0.0; \ + target: button_name"_shadow1"; \ + target: button_name"_shadow2"; \ + target: button_name; \ + target: button_name"_arrow"; \ + after: button_name"_active"; \ + after: button_name"_active_p"; \ + } \ + program { \ + name: button_name"_active"; \ + action: STATE_SET "active" 0.0; \ + target: button_name"_shadow2"; \ + transition: LINEAR 0.05; \ + after: button_name"_active2"; \ + } \ + program { \ + name: button_name"_active2"; \ + action: STATE_SET "active" 0.0; \ + target: button_name"_shadow1"; \ + transition: LINEAR 0.05; \ + } \ + program { \ + name: button_name"_active_p"; \ + action: STATE_SET "active" 0.0; \ + target: button_name; \ + target: button_name"_arrow"; \ + transition: LINEAR 0.1; \ + } \ + program { \ + name: button_name"_passive_pre"; \ + signal: "mouse,up,1"; \ + source: button_name; \ + action: STATE_SET "active" 0.0; \ + target: button_name"_shadow1"; \ + target: button_name"_shadow2"; \ + target: button_name; \ + target: button_name"_arrow"; \ + after: button_name"_passive"; \ + after: button_name"_passive_p"; \ + } \ + program { \ + name: button_name"_passive"; \ + action: STATE_SET "default" 0.0; \ + target: button_name"_shadow2"; \ + transition: LINEAR 0.1; \ + after: button_name"_passive2"; \ + } \ + program { \ + name: button_name"_passive2"; \ + action: STATE_SET "default" 0.0; \ + target: button_name"_shadow1"; \ + transition: LINEAR 0.1; \ + } \ + program { \ + name: button_name"_passive_p"; \ + action: STATE_SET "default" 0.0; \ + target: button_name; \ + target: button_name"_arrow"; \ + transition: LINEAR 0.2; \ + } \ + program { \ + name: button_name"_button_pressed"; \ + source: button_name; \ + signal: "mouse,down,1"; \ + action: SIGNAL_EMIT "scroll_"dir"_start" ""; \ + } \ + program { \ + name: button_name"_button_released"; \ + source: button_name; \ + signal: "mouse,up,1"; \ + action: SIGNAL_EMIT "scroll_stop" ""; \ + } + images { image: "e17_hscrollbar_trough.png" COMP; + image: "e17_vscrollbar_trough.png" COMP; + image: "e17_scrollbar_button_shadow1.png" COMP; + image: "e17_scrollbar_button_shadow2.png" COMP; + image: "e17_scrollbar_button.png" COMP; + image: "e17_scrollbar_arrow_left.png" COMP; + image: "e17_scrollbar_arrow_right.png" COMP; + image: "e17_scrollbar_arrow_up.png" COMP; + image: "e17_scrollbar_arrow_down.png" COMP; + image: "e17_scrollbar_hdrag_thumb.png" COMP; + image: "e17_scrollbar_vdrag_thumb.png" COMP; + +/* image: "e17_scrollbar_left_arrow.png" COMP; image: "e17_scrollbar_left_arrow_down.png" COMP; image: "e17_scrollbar_right_arrow.png" COMP; @@ -18,512 +321,123 @@ images { image: "e17_scrollbar_top_arrow_down.png" COMP; image: "e17_vhandle.png" COMP; image: "e17_vhandle_down.png" COMP; - image: "e17_vhandle_thumb.png" COMP; + image: "e17_vhandle_thumb.png" COMP; +*/ } group { name: "widgets/hscrollbar"; - min: 40 16; + min: 68 18; parts { part { - name: "trough"; - description { - state: "default" 0.0; - rel1 { - relative: 0.0 0.5; - offset: 0 -8; - } - rel2 { - relative: 1.0 0.5; - offset: -1 9; - } - image { - normal: "e17_hscrollbar_trough.png"; - border: 6 6 6 6; - } - } + name: "trough"; + description { + state: "default" 0.0; + rel1 { + relative: 0.0 0.5; + offset: 0 -8; + } + rel2 { + relative: 1.0 0.5; + offset: -1 9; + } + image { + normal: "e17_hscrollbar_trough.png"; + border: 8 8 8 8; + } + } } part { - name: "left_left_arrow"; - description { - state: "default" 0.0; - rel1 { - relative: 0.0 0.5; - offset: -1 -8; - } - rel2 { - relative: 0.0 0.5; - offset: 16 9; - } - image { - normal: "e17_scrollbar_left_arrow.png"; - } - } - description { - state: "down" 0.0; - inherit: "default" 0.0; - image { - normal: "e17_scrollbar_left_arrow_down.png"; - } - } - } - part { - name: "right_right_arrow"; - description { - state: "default" 0.0; - rel1 { - relative: 1.0 0.5; - offset: -17 -8; - } - rel2 { - relative: 1.0 0.5; - offset: 0 9; - } - image { - normal: "e17_scrollbar_right_arrow.png"; - } - } - description { - state: "down" 0.0; - inherit: "default" 0.0; - image { - normal: "e17_scrollbar_right_arrow_down.png"; - } - } - } - part { - name: "right_left_arrow"; - description { - state: "default" 0.0; - rel1 { - relative: 0.0 0.0; - offset: -18 0; - to: "right_right_arrow"; - } - rel2 { - relative: 0.0 1.0; - offset: -1 -1; - to: "right_right_arrow"; - } - image { - normal: "e17_scrollbar_left_arrow.png"; - } - } - description { - state: "down" 0.0; - inherit: "default" 0.0; - image { - normal: "e17_scrollbar_left_arrow_down.png"; - } - } - } - part { - name: "scrollbar_bar_confine"; - type: RECT; - description { - state: "default" 0.0; - visible: 0; - rel1 { - relative: 1.0 0.5; - offset: 0 9; - to_x: "left_left_arrow"; - } - rel2 { - relative: 0.0 0.5; - offset: 0 10; - to_x: "right_left_arrow"; - } - } - } - part { - name: "drag"; - dragable { - confine: "scrollbar_bar_confine"; - x: 1 1 1; - y: 0 0 0; - } - description { - state: "default" 0.0; - min: 58 18; - max: 58 18; - image { - normal: "e17_hhandle.png"; - border: 10 10 0 0; - } - } - description { - state: "down" 0.0; - inherit: "default" 0.0; - image { - normal: "e17_hhandle_down.png"; - } - } - } - part { - name: "drag_thumb"; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { - relative: 0.5 0.5; - offset: -9 -4; - to: "drag"; - } - rel2 { - relative: 0.5 0.5; - offset: 6 1; - to: "drag"; - } - image { - normal: "e17_hhandle_thumb.png"; - } - } - description { - state: "down" 0.0; - inherit: "default" 0.0; - rel1 { - offset: -8 -3; - } - rel2 { - offset: 7 2; - } - } + name: "confine"; + type: RECT; + description { + state: "default" 0.0; + visible: 0; + rel1 { + relative: 0.0 0.5; + offset: 18 -6; + } + rel2 { + relative: 1.0 0.5; + offset: -35 7; + } + } } + SCROLLBAR_BUTTON("left_left_arrow", 0.0, 0.5, -1, -8, "e17_scrollbar_arrow_left.png") + SCROLLBAR_BUTTON("right_left_arrow", 1.0, 0.5, -34, -8, "e17_scrollbar_arrow_left.png") + SCROLLBAR_BUTTON("right_right_arrow", 1.0, 0.5, -18, -8, "e17_scrollbar_arrow_right.png") } programs { - program { - name: "hscrollbar_drag_down"; - signal: "mouse,down,1"; - source: "drag"; - action: STATE_SET "down" 0.0; - target: "drag"; - target: "drag_thumb"; - } - program { - name: "hscrollbar_drag_up"; - signal: "mouse,up,1"; - source: "drag"; - action: STATE_SET "default" 0.0; - target: "drag"; - target: "drag_thumb"; - } - program { - name: "left_left_arrow_down"; - signal: "mouse,down,1"; - source: "left_left_arrow"; - action: STATE_SET "down" 0.0; - target: "left_left_arrow"; - after: "emit_scroll_left_start"; - } - program { - name: "left_left_arrow_up"; - signal: "mouse,up,1"; - source: "left_left_arrow"; - action: STATE_SET "default" 0.0; - target: "left_left_arrow"; - after: "emit_scroll_left_stop"; - } - program { - name: "right_left_arrow_down"; - signal: "mouse,down,1"; - source: "right_left_arrow"; - action: STATE_SET "down" 0.0; - target: "right_left_arrow"; - after: "emit_scroll_left_start"; - } - program { - name: "right_left_arrow_up"; - signal: "mouse,up,1"; - source: "right_left_arrow"; - action: STATE_SET "default" 0.0; - target: "right_left_arrow"; - after: "emit_scroll_left_stop"; - } - program { - name: "right_right_arrow_down"; - signal: "mouse,down,1"; - source: "right_right_arrow"; - action: STATE_SET "down" 0.0; - target: "right_right_arrow"; - after: "emit_scroll_right_start"; - } - program { - name: "right_right_arrow_up"; - signal: "mouse,up,1"; - source: "right_right_arrow"; - action: STATE_SET "default" 0.0; - target: "right_right_arrow"; - after: "emit_scroll_right_stop"; - } - program { - name: "emit_scroll_left_start"; - action: SIGNAL_EMIT "scroll_left_start" ""; - } - program { - name: "emit_scroll_left_stop"; - action: SIGNAL_EMIT "scroll_left_stop" ""; - } - program { - name: "emit_scroll_right_start"; - action: SIGNAL_EMIT "scroll_right_start" ""; - } - program { - name: "emit_scroll_right_stop"; - action: SIGNAL_EMIT "scroll_right_stop" ""; - } + SCROLLBAR_BUTTON_PROG("left_left_arrow", "left") + SCROLLBAR_BUTTON_PROG("right_left_arrow", "left") + SCROLLBAR_BUTTON_PROG("right_right_arrow", "right") + } +} +group { + name: "widgets/hscrollbar_drag"; + min: 14 0; + parts { + SCROLLBAR_DRAG("drag", 0.0, 0.0, -5, -2, 1.0, 1.0, 4, 1, "e17_scrollbar_hdrag_thumb.png") } } - - group { name: "widgets/vscrollbar"; - min: 16 40; + min: 18 68; parts { part { - name: "trough"; - description { - state: "default" 0.0; - rel1 { - relative: 0.5 0.0; - offset: -8 0; - } - rel2 { - relative: 0.5 1.0; - offset: 9 -1; - } - image { - normal: "e17_vscrollbar_trough.png"; - border: 6 6 6 6; - } - } + name: "trough"; + description { + state: "default" 0.0; + rel1 { + relative: 0.5 0.0; + offset: -8 0; + } + rel2 { + relative: 0.5 1.0; + offset: 9 -1; + } + image { + normal: "e17_vscrollbar_trough.png"; + border: 8 8 8 8; + } + } + description { + state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } } part { - name: "top_top_arrow"; - description { - state: "default" 0.0; - rel1 { - relative: 0.5 0.0; - offset: -8 -1; - } - rel2 { - relative: 0.5 0.0; - offset: 9 16; - } - image { - normal: "e17_scrollbar_top_arrow.png"; - } - } - description { - state: "down" 0.0; - inherit: "default" 0.0; - image { - normal: "e17_scrollbar_top_arrow_down.png"; - } - } - } - part { - name: "bottom_bottom_arrow"; - description { - state: "default" 0.0; - rel1 { - relative: 0.5 1.0; - offset: -8 -17; - } - rel2 { - relative: 0.5 1.0; - offset: 9 0; - } - image { - normal: "e17_scrollbar_bottom_arrow.png"; - } - } - description { - state: "down" 0.0; - inherit: "default" 0.0; - image { - normal: "e17_scrollbar_bottom_arrow_down.png"; - } - } - } - part { - name: "bottom_top_arrow"; - description { - state: "default" 0.0; - rel1 { - relative: 0.0 0.0; - offset: 0 -18; - to: "bottom_bottom_arrow"; - } - rel2 { - relative: 1.0 0.0; - offset: -1 -1; - to: "bottom_bottom_arrow"; - } - image { - normal: "e17_scrollbar_top_arrow.png"; - } - } - description { - state: "down" 0.0; - inherit: "default" 0.0; - image { - normal: "e17_scrollbar_top_arrow_down.png"; - } - } - } - part { - name: "scrollbar_bar_confine"; - type: RECT; - description { - state: "default" 0.0; - visible: 0; - rel1 { - relative: 0.5 1.0; - offset: 9 0; - to_y: "top_top_arrow"; - } - rel2 { - relative: 0.5 0.0; - offset: 10 0; - to_y: "bottom_top_arrow"; - } - } - } - part { - name: "drag"; - dragable { - confine: "scrollbar_bar_confine"; - x: 0 0 0; - y: 1 1 1; - } - description { - state: "default" 0.0; - min: 18 58; - max: 18 58; - image { - normal: "e17_vhandle.png"; - border: 0 0 10 10; - } - } - description { - state: "down" 0.0; - inherit: "default" 0.0; - image { - normal: "e17_vhandle_down.png"; - } - } - } - part { - name: "drag_thumb"; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { - relative: 0.5 0.5; - offset: -4 -9; - to: "drag"; - } - rel2 { - relative: 0.5 0.5; - offset: 1 6; - to: "drag"; - } - image { - normal: "e17_vhandle_thumb.png"; - } - } - description { - state: "down" 0.0; - inherit: "default" 0.0; - rel1 { - offset: -3 -8; - } - rel2 { - offset: 2 7; - } - } + name: "confine"; + type: RECT; + description { + state: "default" 0.0; + visible: 0; + rel1 { + relative: 0.5 0.0; + offset: -6 18; + } + rel2 { + relative: 0.5 1.0; + offset: 7 -35; + } + } } + SCROLLBAR_BUTTON("up_up_arrow", 0.5, 0.0, -8, -1, "e17_scrollbar_arrow_up.png") + SCROLLBAR_BUTTON("down_up_arrow", 0.5, 1.0, -8, -34, "e17_scrollbar_arrow_down.png") + SCROLLBAR_BUTTON("down_down_arrow", 0.5, 1.0, -8, -18, "e17_scrollbar_arrow_down.png") } programs { - program { - name: "vscrollbar_drag_down"; - signal: "mouse,down,1"; - source: "drag"; - action: STATE_SET "down" 0.0; - target: "drag"; - target: "drag_thumb"; - } - program { - name: "vscrollbar_drag_up"; - signal: "mouse,up,1"; - source: "drag"; - action: STATE_SET "default" 0.0; - target: "drag"; - target: "drag_thumb"; - } - program { - name: "top_top_arrow_down"; - signal: "mouse,down,1"; - source: "top_top_arrow"; - action: STATE_SET "down" 0.0; - target: "top_top_arrow"; - after: "emit_scroll_top_start"; - } - program { - name: "top_top_arrow_up"; - signal: "mouse,up,1"; - source: "top_top_arrow"; - action: STATE_SET "default" 0.0; - target: "top_top_arrow"; - after: "emit_scroll_top_stop"; - } - program { - name: "bottom_top_arrow_down"; - signal: "mouse,down,1"; - source: "bottom_top_arrow"; - action: STATE_SET "down" 0.0; - target: "bottom_top_arrow"; - after: "emit_scroll_top_start"; - } - program { - name: "bottom_top_arrow_up"; - signal: "mouse,up,1"; - source: "bottom_top_arrow"; - action: STATE_SET "default" 0.0; - target: "bottom_top_arrow"; - after: "emit_scroll_top_stop"; - } - program { - name: "bottom_bottom_arrow_down"; - signal: "mouse,down,1"; - source: "bottom_bottom_arrow"; - action: STATE_SET "down" 0.0; - target: "bottom_bottom_arrow"; - after: "emit_scroll_bottom_start"; - } - program { - name: "bottom_bottom_arrow_up"; - signal: "mouse,up,1"; - source: "bottom_bottom_arrow"; - action: STATE_SET "default" 0.0; - target: "bottom_bottom_arrow"; - after: "emit_scroll_bottom_stop"; - } - program { - name: "emit_scroll_top_start"; - action: SIGNAL_EMIT "scroll_top_start" ""; - } - program { - name: "emit_scroll_top_stop"; - action: SIGNAL_EMIT "scroll_top_stop" ""; - } - program { - name: "emit_scroll_bottom_start"; - action: SIGNAL_EMIT "scroll_bottom_start" ""; - } - program { - name: "emit_scroll_bottom_stop"; - action: SIGNAL_EMIT "scroll_bottom_stop" ""; - } + SCROLLBAR_BUTTON_PROG("up_up_arrow", "up") + SCROLLBAR_BUTTON_PROG("down_up_arrow", "up") + SCROLLBAR_BUTTON_PROG("down_down_arrow", "down") } } +group { + name: "widgets/vscrollbar_drag"; + min: 0 14; + parts { + SCROLLBAR_DRAG("drag", 0.0, 0.0, -2, -5, 1.0, 1.0, 1, 4, "e17_scrollbar_vdrag_thumb.png") + } +} + diff --git a/data/themes/images/e17_hscrollbar_trough.png b/data/themes/images/e17_hscrollbar_trough.png index 7c835a7ed..2c4b8c0d9 100644 Binary files a/data/themes/images/e17_hscrollbar_trough.png and b/data/themes/images/e17_hscrollbar_trough.png differ diff --git a/data/themes/images/e17_icon_fileman_desktop.png b/data/themes/images/e17_icon_fileman_desktop.png new file mode 100644 index 000000000..1d7724863 Binary files /dev/null and b/data/themes/images/e17_icon_fileman_desktop.png differ diff --git a/data/themes/images/e17_scrollbar_arrow_down.png b/data/themes/images/e17_scrollbar_arrow_down.png new file mode 100644 index 000000000..a1b5bd20c Binary files /dev/null and b/data/themes/images/e17_scrollbar_arrow_down.png differ diff --git a/data/themes/images/e17_scrollbar_arrow_left.png b/data/themes/images/e17_scrollbar_arrow_left.png new file mode 100644 index 000000000..015be4649 Binary files /dev/null and b/data/themes/images/e17_scrollbar_arrow_left.png differ diff --git a/data/themes/images/e17_scrollbar_arrow_right.png b/data/themes/images/e17_scrollbar_arrow_right.png new file mode 100644 index 000000000..67e1eb9f3 Binary files /dev/null and b/data/themes/images/e17_scrollbar_arrow_right.png differ diff --git a/data/themes/images/e17_scrollbar_arrow_up.png b/data/themes/images/e17_scrollbar_arrow_up.png new file mode 100644 index 000000000..e2519eb84 Binary files /dev/null and b/data/themes/images/e17_scrollbar_arrow_up.png differ diff --git a/data/themes/images/e17_scrollbar_button.png b/data/themes/images/e17_scrollbar_button.png new file mode 100644 index 000000000..47ef8ecbb Binary files /dev/null and b/data/themes/images/e17_scrollbar_button.png differ diff --git a/data/themes/images/e17_scrollbar_button_shadow1.png b/data/themes/images/e17_scrollbar_button_shadow1.png new file mode 100644 index 000000000..087c12261 Binary files /dev/null and b/data/themes/images/e17_scrollbar_button_shadow1.png differ diff --git a/data/themes/images/e17_scrollbar_button_shadow2.png b/data/themes/images/e17_scrollbar_button_shadow2.png new file mode 100644 index 000000000..2a800ab69 Binary files /dev/null and b/data/themes/images/e17_scrollbar_button_shadow2.png differ diff --git a/data/themes/images/e17_scrollbar_hdrag_thumb.png b/data/themes/images/e17_scrollbar_hdrag_thumb.png new file mode 100644 index 000000000..281a3f84c Binary files /dev/null and b/data/themes/images/e17_scrollbar_hdrag_thumb.png differ diff --git a/data/themes/images/e17_scrollbar_vdrag_thumb.png b/data/themes/images/e17_scrollbar_vdrag_thumb.png new file mode 100644 index 000000000..771987bc4 Binary files /dev/null and b/data/themes/images/e17_scrollbar_vdrag_thumb.png differ diff --git a/data/themes/images/e17_vscrollbar_trough.png b/data/themes/images/e17_vscrollbar_trough.png index c19c2bfba..3cf4280f0 100644 Binary files a/data/themes/images/e17_vscrollbar_trough.png and b/data/themes/images/e17_vscrollbar_trough.png differ