diff --git a/data/colorschemes/Belafonte Day.ini b/data/colorschemes/Belafonte Day.ini
index 5308a8ea..50cbe407 100644
--- a/data/colorschemes/Belafonte Day.ini
+++ b/data/colorschemes/Belafonte Day.ini
@@ -11,7 +11,7 @@ license = CC-BY-SA-4.0
[Colors]
bg = #d5ccba
main = #964700
-hl = #ffffff
+hl = #332211
end_sel = #ff3300
tab_missed_1 = #ff9933
tab_missed_2 = #ff3300
diff --git a/data/colorschemes/PaperColor.ini b/data/colorschemes/PaperColor.ini
index 76c46cff..adb29a43 100644
--- a/data/colorschemes/PaperColor.ini
+++ b/data/colorschemes/PaperColor.ini
@@ -11,7 +11,7 @@ license = MIT
[Colors]
bg = #eeeeee
main = #b7141e
-hl = #ffffff
+hl = #222222
end_sel = #88003d
tab_missed_1 = #ff9933
tab_missed_2 = #ff3300
diff --git a/data/colorschemes/Soft Era.ini b/data/colorschemes/Soft Era.ini
index 15dae3a9..3b4c12b1 100644
--- a/data/colorschemes/Soft Era.ini
+++ b/data/colorschemes/Soft Era.ini
@@ -11,7 +11,7 @@ license = MIT
[Colors]
bg = #f7f2f2
main = #e796b0
-hl = #ffffff
+hl = #222222
end_sel = #ff3300
tab_missed_1 = #ff9933
tab_missed_2 = #ff3300
diff --git a/data/colorschemes/Solarized Light.ini b/data/colorschemes/Solarized Light.ini
index 26a24de9..78b9caee 100644
--- a/data/colorschemes/Solarized Light.ini
+++ b/data/colorschemes/Solarized Light.ini
@@ -10,8 +10,8 @@ license = MIT
[Colors]
bg = #fdf6e3
-main = #3399ff
-hl = #ffffff
+main = #aa9966
+hl = #222222
end_sel = #ff0000
tab_missed_1 = #ff9933
tab_missed_2 = #ff3300
diff --git a/data/colorschemes/Tango Light.ini b/data/colorschemes/Tango Light.ini
index f42b1589..8cab38b9 100644
--- a/data/colorschemes/Tango Light.ini
+++ b/data/colorschemes/Tango Light.ini
@@ -11,7 +11,7 @@ license = Public Domain
[Colors]
bg = #eeeeec
main = #ce5c00
-hl = #ffffff
+hl = #222222
end_sel = #ff3300
tab_missed_1 = #ff9933
tab_missed_2 = #ff3300
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 217d0ba8..d942178a 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -16,7 +16,202 @@ color_classes {
efl_version: 1 20;
+#define IMAGE_RING(x, sz) \
+ set { name: x; \
+ image { image: x"1.png" COMP; size: (sz/2) (sz/2) 99999 99999; } \
+ image { image: x"2.png" COMP; size: (sz/4) (sz/4) (sz/2) (sz/2); } \
+ image { image: x"3.png" COMP; size: (sz/8) (sz/8) (sz/4) (sz/4); } \
+ image { image: x"4.png" COMP; size: (sz/16) (sz/16) (sz/8) (sz/8); } \
+ image { image: x"5.png" COMP; size: 0 0 (sz/16) (sz/16); } \
+ }
+
+#define BUSY(x, start1, start2, stop1, stop2) \
+ program { signal: start1; source: start2; \
+ action: STATE_SET "visible" 0.0; \
+ transition: SINUSOIDAL 1.0 USE_DURATION_FACTOR 1; \
+ target: "busy"; } \
+ program { signal: start1; source: start2; \
+ action: STATE_SET "default" 0.0; \
+ target: "busy1"; \
+ target: "busy2"; \
+ target: "busy3"; \
+ after: "busy-p11"; \
+ after: "busy-p21"; \
+ after: "busy-p31"; } \
+ program { signal: stop1; source: stop2; \
+ action: STATE_SET "default" 0.0; \
+ transition: SINUSOIDAL 1.0 USE_DURATION_FACTOR 1; \
+ target: "busy"; \
+ after: "busy_stop2"; } \
+ program { name: "busy_stop2"; \
+ action: ACTION_STOP; \
+ target: "busy-p11"; \
+ target: "busy-p12"; \
+ target: "busy-p21"; \
+ target: "busy-p22"; \
+ target: "busy-p31"; \
+ target: "busy-p32"; } \
+ part { name: "busy"; type: RECT; \
+ description { state: "default" 0.0; \
+ rel1.to: x; rel2.to: x; \
+ color: 255 255 255 0; /* no cc */ visible: 0; } \
+ description { state: "visible" 0.0; \
+ inherit: "default" 0.0; \
+ color: 255 255 255 255; /* no cc */ visible: 1; } } \
+ part { name: "busy1"; mouse_events: 0; \
+ clip_to: "busy"; \
+ description { state: "default" 0.0; \
+ rel1.to: "busy"; rel2.to: "busy"; \
+ aspect: 1.0 1.0; aspect_preference: BOTH; \
+ image.normal: "ringa"; \
+ color_class: "/fg/normal/progress/busy/1"; \
+ map.on: 1; \
+ map.smooth: 1; \
+ map.rotation.center: "busy"; \
+ map.rotation.z: 0; } \
+ description { state: "default" 1.0; \
+ inherit: "default" 0.0; \
+ map.rotation.z: 360; } } \
+ program { name: "busy-p11"; \
+ action: STATE_SET "default" 1.0; \
+ transition: LINEAR 1.0; \
+ target: "busy1"; \
+ after: "busy-p12"; } \
+ program { name: "busy-p12"; \
+ action: STATE_SET "default" 0.0; \
+ target: "busy1"; \
+ after: "busy-p11"; } \
+ part { name: "busy2"; mouse_events: 0; \
+ clip_to: "busy"; \
+ description { state: "default" 0.0; \
+ rel1.to: "busy"; rel2.to: "busy"; \
+ aspect: 1.0 1.0; aspect_preference: BOTH; \
+ image.normal: "ringb"; \
+ color_class: "/fg/normal/progress/busy/2"; \
+ map.on: 1; \
+ map.smooth: 1; \
+ map.rotation.center: "busy"; \
+ map.rotation.z: 420; } \
+ description { state: "default" 1.0; \
+ inherit: "default" 0.0; \
+ map.rotation.z: 80; } } \
+ program { name: "busy-p21"; \
+ action: STATE_SET "default" 1.0; \
+ transition: LINEAR 0.7; \
+ target: "busy2"; \
+ after: "busy-p22"; } \
+ program { name: "busy-p22"; \
+ action: STATE_SET "default" 0.0; \
+ target: "busy2"; \
+ after: "busy-p21"; } \
+ part { name: "busy3"; mouse_events: 0; \
+ clip_to: "busy"; \
+ description { state: "default" 0.0; \
+ rel1.to: "busy"; rel2.to: "busy"; \
+ aspect: 1.0 1.0; aspect_preference: BOTH; \
+ image.normal: "ringc"; \
+ color_class: "/fg/normal/progress/busy/3"; \
+ map.on: 1; \
+ map.smooth: 1; \
+ map.rotation.center: "busy"; \
+ map.rotation.z: 170; } \
+ description { state: "default" 1.0; \
+ inherit: "default" 0.0; \
+ map.rotation.z: 530; } } \
+ program { name: "busy-p31"; \
+ action: STATE_SET "default" 1.0; \
+ transition: LINEAR 1.4; \
+ target: "busy3"; \
+ after: "busy-p32"; } \
+ program { name: "busy-p32"; \
+ action: STATE_SET "default" 0.0; \
+ target: "busy3"; \
+ after: "busy-p31"; }
+
+#define I060(_NAME, _FILE) \
+ set { name: _NAME; \
+ image { image: _FILE"-060.png" COMP; size: 31 31 60000 60000; } \
+ image { image: _FILE"-030.png" COMP; size: 16 16 30 30; } \
+ image { image: _FILE"-015.png" COMP; size: 0 0 15 15; } \
+ }
+
collections {
+ color_tree {
+ ":bg" {
+ "/bg/normal/tab";
+ "/bg/normal/background";
+ }
+ ":bg-dark" {
+ "/bg/selected/titlebar";
+ "/bg/normal/term/font_preview";
+ }
+ ":dim-dark" {
+ "/bg/normal/term/keybinding";
+ }
+ ":fg" {
+ "/fg/normal/term/tab/title/text";
+ "/fg/normal/tab/term/icon/grouped";
+ "/fg/normal/term/tab_button";
+ "/fg/pressed/term/miniview/close";
+ "/fg/normal/term/sel/title/text";
+ "/fg/normal/term/drag/target";
+ }
+ ":fg-light" {
+ "/fg/normal/progress/busy/1";
+ "/fg/normal/term/tabcount";
+ "/fg/selected/term/tab/title/close";
+ "/fg/selected/term/tab/title/text";
+ "/fg/pressed/term/tab_button";
+ "/fg/normal/term/keybinding";
+ "/fg/normal/term/miniview/close";
+ "/fg/normal/term/selection/arrow/left";
+ "/fg/normal/term/selection/arrow/up";
+ "/fg/normal/term/selection/arrow/right";
+ "/fg/normal/term/selection/arrow/down";
+ "/fg/selected/term/sel/title/text";
+ "/bg/normal/term/drag/target";
+ "/fg/selected/term/drag/target";
+ }
+ ":light-medium" {
+ "/fg/normal/progress/busy/2";
+ }
+ ":selected-medium" {
+ "/fg/normal/progress/busy/3";
+ }
+ ":bg-dark" {
+ "/bg-dark/normal/background";
+ }
+ ":bg-dark-alt" {
+ "/bg-dark-alt/normal/background";
+ };
+ ":selected" {
+ "/bg/selected/tab/hilight";
+ "/fg/normal/term/text/tabcount";
+ "/bg/selected/media/position";
+ "/fg/selected/term/miniview/screen";
+ "/bg/selected/term/text";
+ };
+ ":selected-alt" {
+ "/fg/normal/term/text/tabcount/missed";
+ "/fg/selected/term/tab/title/text/bell";
+ "/fg/disabled/term/miniview/screen";
+ "/bg/selected/term/drag/target";
+ };
+ ":shadow" {
+ "/shadow/normal/tab";
+ "/shadow/normal/term/sel/item";
+ "/shadow/normal/term/drag_thumb";
+ }
+ ":shadow-selected" {
+ "/shadow/selected/tab";
+ "/shadow/selected/term/sel/item";
+ }
+ }
+
+ IMAGE_RING("ringa", 160)
+ IMAGE_RING("ringb", 160)
+ IMAGE_RING("ringc", 160)
+
#include "default/keybinding.edc"
#include "default/miniview.edc"
#include "default/core.edc"
@@ -34,3 +229,4 @@ collections {
#include "default/tab_drag_thumb.edc"
#include "default/color_preview.edc"
}
+
diff --git a/data/themes/default/about.edc b/data/themes/default/about.edc
index aae49bca..7b786a1f 100644
--- a/data/themes/default/about.edc
+++ b/data/themes/default/about.edc
@@ -1,10 +1,8 @@
///////////////////////////////////////////////////////////////////////////
//// the about box content image
group { name: "terminology/about";
- images {
- image: "ab_base.png" COMP;
- image: "ab_shell.png" COMP;
- }
+ images.image: "ab_base.png" COMP;
+ images.image: "ab_shell.png" COMP;
styles {
style { name: "aboutstyle";
base: "font=Sans font_size=8 color=#3f1 style=glow glow2_color=#3f13 glow_color=#3f11 wrap=word";
@@ -12,43 +10,29 @@ group { name: "terminology/about";
}
}
parts {
- part { name: "base";
- mouse_events: 0;
+ part { name: "base"; mouse_events: 0;
description { state: "default" 0.0;
- rel1 {
- relative: (39/198) (27/198);
- to: "shell";
- }
- rel2 {
- relative: (151/198) (115/198);
- to: "shell";
- }
+ rel.to: "shell";
+ rel1.relative: (39/198) (27/198);
+ rel2.relative: (151/198) (115/198);
image.normal: "ab_base.png";
}
}
part { name: "baseclip"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 255;
- rel1.to: "base";
- rel2.to: "base";
+ rel.to: "base";
}
}
part { name: "terminology.text"; type: TEXTBLOCK;
- clip_to: "baseclip";
- mouse_events: 1;
scale: 1;
+ clip_to: "baseclip";
description { state: "default" 0.0;
fixed: 1 1;
align: 0.5 0.0;
max: 10000 10000;
- rel1 {
- to: "base";
- relative: 0.08 1.0;
- }
- rel2 {
- to: "base";
- relative: 0.97 1.0;
- }
+ rel.to: "base";
+ rel1.relative: 0.08 1.0;
+ rel2.relative: 0.97 1.0;
text {
style: "aboutstyle";
text: "Hello world.
This is Terminology, your friendly neighbourhood terminal.
This needs more text to test vertical scrolling to see if the animation works right.
I hope this will be enough now.";
@@ -73,8 +57,7 @@ group { name: "terminology/about";
}
}
programs {
- program {
- signal: "begin"; source: "terminology";
+ program { signal: "begin"; source: "terminology";
action: ACTION_STOP;
target: "show";
target: "show2";
diff --git a/data/themes/default/background.edc b/data/themes/default/background.edc
index db43e35e..ef532f15 100644
--- a/data/themes/default/background.edc
+++ b/data/themes/default/background.edc
@@ -1,63 +1,25 @@
//// the background and general container for the terminal
group { name: "terminology/background";
images {
- image: "bg_bevel.png" COMP;
- image: "bg_glint.png" COMP;
- image: "bg_glow_in.png" COMP;
- image: "bg_led_glow.png" COMP;
- image: "bg_led_base.png" COMP;
- image: "bg_led.png" COMP;
- image: "bg_led_strobe.png" COMP;
image: "pm_shadow.png" COMP;
- image: "pm_overlay.png" COMP;
- image: "pm_fill.png" COMP;
- image: "cr_glow.png" COMP;
- image: "cr_pulse.png" COMP;
- image: "tab_base_bottom.png" COMP;
- image: "tab_base_l0.png" COMP;
- image: "tab_base_l1.png" COMP;
- image: "tab_base_m.png" COMP;
- image: "tab_base_r0.png" COMP;
- image: "tab_base_r1.png" COMP;
- image: "tab_bg_l0.png" COMP;
- image: "tab_bg_l1.png" COMP;
- image: "tab_bg_r0.png" COMP;
- image: "tab_bg_r1.png" COMP;
- image: "tab_shad_l0.png" COMP;
- image: "tab_shad_l1.png" COMP;
- image: "tab_shad_r0.png" COMP;
- image: "tab_shad_r1.png" COMP;
- image: "media_busy_knob.png" COMP;
- image: "media_busy_spinner.png" COMP;
- image: "icon_split_h.png" COMP;
- image: "icon_split_v.png" COMP;
- }
- set { name: "bg_shadow";
- image { image: "bg_shadow.png" COMP; size: 0 0 200 150; }
- image { image: "bg_shadow2.png" COMP; size: 200 150 400 300; }
- image { image: "bg_shadow3.png" COMP; size: 400 300 99999 99999; }
- }
- set { name: "bg_shine";
- image { image: "bg_shine5.png" COMP; size: 0 0 256 120; }
- image { image: "bg_shine4.png" COMP; size: 256 120 512 240; }
- image { image: "bg_shine3.png" COMP; size: 512 240 1024 480; }
- image { image: "bg_shine2.png" COMP; size: 1024 480 2048 960; }
- image { image: "bg_shine.png" COMP; size: 2048 960 99999 99999; }
- }
- set { name: "tab_close";
- image { image: "tab_close_8.png" COMP; size: 0 0 8 8; }
- image { image: "tab_close_16.png" COMP; size: 8 8 99999 99999; }
+ image: "icon-tab-btn-060.png" COMP;
}
set { name: "tab_grouped";
image { image: "tab_grouped_8.png" COMP; size: 0 0 8 8; }
image { image: "tab_grouped_16.png" COMP; size: 8 8 16 16; }
image { image: "tab_grouped_32.png" COMP; size: 16 16 99999 99999; }
}
+ I060("tab_close", "close")
+ I060("arrow-l", "arrow-l")
+ I060("arrow-r", "arrow-r")
+ I060("arrow-u", "arrow-u")
+ I060("arrow-d", "arrow-d")
sounds {
sample { name: "bell" LOSSY 64;
source: "bell.wav";
}
}
+
script {
public message(Msg_Type:type, id, ...) {
new r, g, b, a, v;
@@ -67,11 +29,6 @@ group { name: "terminology/background";
if (id == 1) {
v = (getarg(2) * 255) / 100;
- custom_state(PART:"shadow", "default", 0.0);
- get_state_val(PART:"shadow", STATE_COLOR, r, g, b, a);
- set_state_val(PART:"shadow", STATE_COLOR, r, g, b, v);
- set_state(PART:"shadow", "custom", 0.0);
-
custom_state(PART:"base", "default", 0.0);
get_state_val(PART:"base", STATE_COLOR, r, g, b, a);
set_state_val(PART:"base", STATE_COLOR, r, g, b, v);
@@ -79,30 +36,22 @@ group { name: "terminology/background";
} else if (id == 2) {
v = getarg(2);
- custom_state(PART:"shine_focused", "focused", 0.0);
- get_state_val(PART:"shine_focused", STATE_COLOR, r, g, b, a);
- set_state_val(PART:"shine_focused", STATE_COLOR, r, g, b, v);
- set_state(PART:"shine_focused", "custom", 0.0);
-
- custom_state(PART:"shine_unfocused", "default", 0.0);
- get_state_val(PART:"shine_unfocused", STATE_COLOR, r, g, b, a);
- set_state_val(PART:"shine_unfocused", STATE_COLOR, r, g, b, v/8);
- set_state(PART:"shine_unfocused", "custom", 0.0);
+// custom_state(PART:"shine_focused", "focused", 0.0);
+// get_state_val(PART:"shine_focused", STATE_COLOR, r, g, b, a);
+// set_state_val(PART:"shine_focused", STATE_COLOR, r, g, b, v);
+// set_state(PART:"shine_focused", "custom", 0.0);
+//
+// custom_state(PART:"shine_unfocused", "default", 0.0);
+// get_state_val(PART:"shine_unfocused", STATE_COLOR, r, g, b, a);
+// set_state_val(PART:"shine_unfocused", STATE_COLOR, r, g, b, v/8);
+// set_state(PART:"shine_unfocused", "custom", 0.0);
}
}
}
parts {
////////////////////////////////////////////////////////////////////
// background handling
- part { name: "shadow";
- mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bg_shadow";
- fill.smooth: 0;
- }
- }
part { name: "base"; type: RECT;
- mouse_events: 1;
description { state: "default" 0.0;
color_class: "BG";
}
@@ -120,30 +69,27 @@ group { name: "terminology/background";
// indicator of other tabs and control {{{
part { name: "tabcount_clip"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 0;
+ color: 255 255 255 0; // mo cc
visible: 0;
}
description { state: "on" 0.0;
inherit: "default" 0.0;
+ color: 255 255 255 255; // no cc
visible: 1;
- color: 255 255 255 255;
}
}
part { name: "terminology.tabmissed.label"; type: TEXT; mouse_events: 0;
- effect: GLOW;
scale: 1;
clip_to: "tabcount_clip";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "terminology.tabcount.label";
- rel2.to: "terminology.tabcount.label";
- rel1.offset: -4 0;
+ rel.to: "terminology.tabcount.label";
+ rel1.offset: -9 0;
rel2.relative: 0.0 1.0;
- rel2.offset: -5 -1;
- color: 255 255 255 64;
- color2: 255 255 255 18;
- color3: 255 255 255 8;
- color_class: "TAB_MISSED";
+ rel2.offset: -9 -1;
+ offscale;
+ color: 255 255 255 160; // no cc
+ color_class: "/fg/normal/term/text/tabcount/missed";
align: 1.0 0.5;
text { font: "Sans"; size: 8;
align: 1.0 0.5;
@@ -154,25 +100,20 @@ group { name: "terminology/background";
description { state: "over" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color2: 255 255 255 128;
- color3: 255 255 255 20;
- color_class: "TAB_MISSED_OVER";
}
}
part { name: "terminology.tabcount.label"; type: TEXT; mouse_events: 0;
- effect: GLOW;
scale: 1;
clip_to: "tabcount_clip";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "terminology.tabcount.control";
- rel2.to: "terminology.tabcount.control";
- rel1.relative: -0.2 0.0;
- rel2.relative: -0.2 1.0;
- color: 255 255 255 64;
- color2: 255 255 255 18;
- color3: 255 255 255 8;
- color_class: "GLOW_TXT";
+ rel.to: "terminology.tabcount.control";
+ rel2.offset: -5 0;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: -5 -1;
+ offscale;
+ color: 255 255 255 160; // no cc
+ color_class: "/fg/normal/term/text/tabcount";
align: 1.0 0.5;
text { font: "Sans"; size: 8;
align: 1.0 0.5;
@@ -182,185 +123,46 @@ group { name: "terminology/background";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color2: 255 255 255 128;
- color3: 255 255 255 20;
- color_class: "GLOW_TXT_HIGHLIGHT";
+ color: 255 255 255 255; // no cc
}
}
- part { name: "tabcount_glow_r0";
+ part { name: "tabcount_bg"; mouse_events: 0;
clip_to: "tabcount_clip";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "tabcount_r0";
- rel2.to: "tabcount_r0";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 32;
- color_class: "GLOW";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
- part { name: "tabcount_glow_r1";
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
+ rel.to: "terminology.tabcount.control";
+ image.normal: "icon-tab-btn-060.png";
+ color: 255 255 255 160; // no cc
+ color_class: "/fg/normal/term/tabcount";
fixed: 1 1;
- rel1.to: "tabcount_r1";
- rel2.to: "tabcount_r1";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 32;
- color_class: "GLOW";
}
description { state: "over" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
- part { name: "tabcount_glow_r2";
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "tabcount_r2";
- rel2.to: "tabcount_r2";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 32;
- color_class: "GLOW";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
- part { name: "tabcount_glow_r3";
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "tabcount_r3";
- rel2.to: "tabcount_r3";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 32;
- color_class: "GLOW";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
- part { name: "tabcount_r0"; type: RECT;
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tabcount.control";
- rel2.to: "terminology.tabcount.control";
- rel1.relative: 0.05 0.05;
- rel2.relative: 0.45 0.45;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tabcount_r1"; type: RECT;
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tabcount.control";
- rel2.to: "terminology.tabcount.control";
- rel1.relative: 0.55 0.05;
- rel2.relative: 0.95 0.45;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tabcount_r2"; type: RECT;
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tabcount.control";
- rel2.to: "terminology.tabcount.control";
- rel1.relative: 0.05 0.55;
- rel2.relative: 0.45 0.95;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tabcount_r3"; type: RECT;
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tabcount.control";
- rel2.to: "terminology.tabcount.control";
- rel1.relative: 0.55 0.55;
- rel2.relative: 0.95 0.95;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
+ color: 255 255 255 255; // no cc
}
}
+
part { name: "terminology.tabcount.control"; type: SWALLOW;
clip_to: "tabcount_clip";
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
+ rel.to: "viewregion";
rel1.relative: 1.0 0.0;
- rel1.offset: -3 2;
- rel1.to: "viewregion";
+ rel1.offset: -5 4;
rel2.relative: 1.0 0.0;
- rel2.offset: -3 2;
- rel2.to: "viewregion";
+ rel2.offset: -5 4;
align: 1.0 0.0;
- min: 16 16;
+ min: 15 15;
+ offscale;
}
}
part { name: "tabcount_ev"; type: RECT; repeat_events: 1;
clip_to: "tabcount_clip";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "terminology.tabcount.control";
- rel2.to: "terminology.tabcount.control";
- color: 0 0 0 0;
+ rel.to: "terminology.tabcount.control";
+ color: 0 0 0 0; // no cc
}
}
@@ -373,84 +175,62 @@ group { name: "terminology/background";
}
}
part { name: "viewregion"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
+ rel.to: "terminology.content";
+ offscale;
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
rel1.to_y: "tabmiddle";
rel1.relative: 0.0 1.0;
+ rel1.offset: 0 1;
}
}
- program {
- signal: "mouse,in"; source: "tabcount_ev";
+ program { signal: "mouse,in"; source: "tabcount_ev";
action: STATE_SET "over" 0.0;
- transition: DECELERATE 0.5;
- target: "tabcount_r0";
- target: "tabcount_r1";
- target: "tabcount_r2";
- target: "tabcount_r3";
- target: "tabcount_glow_r0";
- target: "tabcount_glow_r1";
- target: "tabcount_glow_r2";
- target: "tabcount_glow_r3";
+ transition: DECELERATE 0.2;
+ target: "tabcount_bg";
target: "terminology.tabcount.label";
target: "terminology.tabmissed.label";
}
- program {
- signal: "mouse,out"; source: "tabcount_ev";
+ program { signal: "mouse,out"; source: "tabcount_ev";
action: STATE_SET "default" 0.0;
transition: DECELERATE 2.0;
- target: "tabcount_r0";
- target: "tabcount_r1";
- target: "tabcount_r2";
- target: "tabcount_r3";
- target: "tabcount_glow_r0";
- target: "tabcount_glow_r1";
- target: "tabcount_glow_r2";
- target: "tabcount_glow_r3";
+ target: "tabcount_bg";
target: "terminology.tabcount.label";
target: "terminology.tabmissed.label";
}
- program {
- signal: "mouse,clicked,1"; source: "tabcount_ev";
+ program { signal: "mouse,clicked,1"; source: "tabcount_ev";
action: SIGNAL_EMIT "tab,go" "terminology";
}
- program {
- signal: "mouse,clicked,3"; source: "tabcount_ev";
+ program { signal: "mouse,clicked,3"; source: "tabcount_ev";
action: SIGNAL_EMIT "tab,new" "terminology";
}
- program {
- signal: "mouse,wheel,0,1"; source: "tabcount_ev";
+ program { signal: "mouse,wheel,0,1"; source: "tabcount_ev";
action: SIGNAL_EMIT "tab,prev" "terminology";
}
- program {
- signal: "mouse,wheel,0,-1"; source: "tabcount_ev";
+ program { signal: "mouse,wheel,0,-1"; source: "tabcount_ev";
action: SIGNAL_EMIT "tab,next" "terminology";
}
- program {
- signal: "tabcount,off"; source: "terminology";
+ program { signal: "tabcount,off"; source: "terminology";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "tabcount_clip";
}
- program {
- signal: "tabcount,on"; source: "terminology";
+ program { signal: "tabcount,on"; source: "terminology";
action: STATE_SET "on" 0.0;
transition: DECELERATE 0.5;
target: "tabcount_clip";
}
- program {
- signal: "tabmissed,off"; source: "terminology";
+ program { signal: "tabmissed,off"; source: "terminology";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "terminology.tabmissed.label";
}
- program {
- signal: "tabmissed,on"; source: "terminology";
+ program { signal: "tabmissed,on"; source: "terminology";
action: STATE_SET "over" 0.0;
transition: DECELERATE 0.2;
target: "terminology.tabmissed.label";
@@ -466,6 +246,7 @@ group { name: "terminology/background";
////////////////////////////////////////////////////////////////////
// sendfile request {{{
+ // XXX: make this a swallow
part { name: "sendfile_request_clip"; type: RECT;
description { state: "default" 0.0;
color: 255 255 255 0;
@@ -513,9 +294,7 @@ group { name: "terminology/background";
rel.to: "sendfile_request_bg";
rel1.offset: 4 4;
rel2.offset: -5 -5;
- #if HAS_OFFSCALE
offscale;
- #endif
}
description { state: "on" 0.0;
inherit: "default" 0.0;
@@ -523,14 +302,12 @@ group { name: "terminology/background";
rel2.relative: 1.0 1.0;
}
}
- program {
- signal: "sendfile,request,on"; source: "terminology";
+ program { signal: "sendfile,request,on"; source: "terminology";
action: ACTION_STOP;
target: "sendfile_request_on";
target: "sendfile_request_off";
}
- program {
- signal: "sendfile,request,off"; source: "terminology";
+ program { signal: "sendfile,request,off"; source: "terminology";
action: ACTION_STOP;
target: "sendfile_request_on";
target: "sendfile_request_off";
@@ -587,9 +364,7 @@ group { name: "terminology/background";
rel.to: "terminology.sendfile.progress";
rel1.offset: -4 -4;
rel2.offset: 4 4;
- #if HAS_OFFSCALE
offscale;
- #endif
}
}
part { name: "terminology.sendfile.progress"; type: SWALLOW;
@@ -602,9 +377,7 @@ group { name: "terminology/background";
rel2.relative: 1.0 0.0;
rel2.offset: -5 -5;
align: 0.5 1.0;
- #if HAS_OFFSCALE
offscale;
- #endif
}
description { state: "on" 0.0;
inherit: "default" 0.0;
@@ -613,14 +386,12 @@ group { name: "terminology/background";
align: 0.5 0.0;
}
}
- program {
- signal: "sendfile,progress,on"; source: "terminology";
+ program { signal: "sendfile,progress,on"; source: "terminology";
action: ACTION_STOP;
target: "sendfile_progress_on";
target: "sendfile_progress_off";
}
- program {
- signal: "sendfile,progress,off"; source: "terminology";
+ program { signal: "sendfile,progress,off"; source: "terminology";
action: ACTION_STOP;
target: "sendfile_progress_on";
target: "sendfile_progress_off";
@@ -657,13 +428,11 @@ group { name: "terminology/background";
visible: 1;
}
}
- program {
- signal: "miniview,off"; source: "terminology";
+ program { signal: "miniview,off"; source: "terminology";
action: STATE_SET "default" 0.0;
target: "terminology.miniview";
}
- program {
- signal: "miniview,on"; source: "terminology";
+ program { signal: "miniview,on"; source: "terminology";
action: STATE_SET "on" 0.0;
target: "terminology.miniview";
}
@@ -671,42 +440,8 @@ group { name: "terminology/background";
////////////////////////////////////////////////////////////////////
// overlayed prettiness {{{
- part { name: "glow";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "bg_glow_in.png";
- image.border: 7 7 7 7;
- image.middle: 0;
- fill.smooth: 0;
- color: 255 255 255 0;
- color_class: "GLOW";
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- description { state: "focused2" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 16;
- color_class: "GLOW";
- }
- }
- part { name: "bevel";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "bg_bevel.png";
- image.border: 3 3 3 3;
- image.middle: 0;
- fill.smooth: 0;
- }
- description { state: "tab" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
+/* leave this here for docs - can have shine overlay that settings can
+ * change color of via HIGHLIGHT color class
part { name: "shine_focused";
mouse_events: 0;
description { state: "default" 0.0;
@@ -727,376 +462,265 @@ group { name: "terminology/background";
color_class: "HIGHLIGHT";
}
}
- part { name: "shine_unfocused";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.offset: 0 0;
- rel2.offset: -1 -1;
- image.normal: "bg_shine";
- fill.smooth: 0;
- align: 0.5 0.0;
- aspect: (256/120) (256/120);
- aspect_preference: HORIZONTAL;
- color: 255 255 255 64;
- color_class: "HIGHLIGHT";
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "glintclip"; type: RECT;
- description { state: "default" 0.0;
- }
- description { state: "tab" 0.0;
- inherit: "default" 0.0;
- }
- }
- part { name: "glint";
- mouse_events: 0;
- clip_to: "glintclip";
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 79 5;
- max: 79 5;
- rel1 {
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- relative: 1.0 0.0;
- offset: -1 0;
- }
- image.normal: "bg_glint.png";
- color: 255 255 255 128;
- color_class: "HIGHLIGHT";
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
+ */
// }}}
////////////////////////////////////////////////////////////////////
// tabs {{{
- part { name: "tab_bevel_bottom";
- mouse_events: 0;
+ part { name: "tab_clip"; type: RECT;
description { state: "default" 0.0;
- rel1.to_y: "tabmiddle";
- rel1.relative: 0.0 1.0;
- image.normal: "tab_base_bottom.png";
- image.border: 2 2 0 2;
- image.middle: 0;
- fill.smooth: 0;
- visible: 0;
fixed: 1 1;
+ visible: 0;
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
- part { name: "tab_bevel_top0";
- mouse_events: 0;
+ part { name: "tab_base_l"; type: RECT; mouse_events: 0;
+ clip_to: "tab_clip";
+ description { state: "default" 0.0;
+ rel1.to: "tab_bevel_top0";
+ rel2.to: "tab_bevel_top1";
+ color_class: "/bg/normal/background";
+ fixed: 1 1;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color_class: "/bg/selected/titlebar";
+ }
+ }
+ part { name: "tab_base_r"; type: RECT; mouse_events: 0;
+ clip_to: "tab_clip";
+ description { state: "default" 0.0;
+ rel1.to: "tab_bevel_top3";
+ rel2.to_y: "tab_bevel_top4";
+ color_class: "/bg/normal/background";
+ fixed: 1 1;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color_class: "/bg/selected/titlebar";
+ }
+ }
+ part { name: "tab_bevel_top0"; type: SPACER; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "tableft";
rel2.to_y: "tableft";
rel2.to_x: "tab_bevel_top1";
rel2.relative: 0.0 1.0;
- image.normal: "tab_base_l0.png";
- image.border: 0 0 0 4;
- fill.smooth: 0;
- visible: 0;
fixed: 1 1;
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
- visible: 1;
}
}
- part { name: "tab_bevel_top1";
- mouse_events: 0;
+ part { name: "tab_bevel_top1"; type: SPACER; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "tabmiddle";
- rel1.offset: -4 0;
- rel2.to: "tabmiddle";
+ rel.to: "tabmiddle";
align: 0.0 0.0;
- max: 12 99999;
- min: 12 0;
- image.normal: "tab_base_l1.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- visible: 0;
+ max: 5 99999;
+ min: 5 0;
fixed: 1 1;
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
- visible: 1;
}
}
- part { name: "tab_bevel_top2";
- mouse_events: 0;
+ part { name: "tab_bevel_top2"; type: RECT; mouse_events: 0;
+ clip_to: "tab_clip";
+ scale: 1;
description { state: "default" 0.0;
+ fixed: 1 1;
rel1.to: "tab_bevel_top1";
- rel1.relative: 1.0 0.0;
rel2.to: "tab_bevel_top3";
+ rel1.relative: 1.0 0.0;
rel2.relative: 0.0 1.0;
- image.normal: "tab_base_m.png";
- image.border: 0 0 4 0;
- fill.smooth: 0;
+ align: 0.5 0.0;
+ min: 0 0; max: 99999 0;
visible: 0;
- fixed: 1 1;
+ color_class: "/bg/selected/tab/hilight";
}
- description { state: "tab" 0.0;
+ description { state: "focused" 0.0;
inherit: "default" 0.0;
+ min: 0 5; max: 99999 5;
visible: 1;
}
}
- part { name: "tab_bevel_top3";
- mouse_events: 0;
+ part { name: "tab_bevel_top3"; type: SPACER; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "tabmiddle";
- rel2.to: "tabmiddle";
- rel2.offset: 3 -1;
+ rel.to: "tabmiddle";
align: 1.0 0.0;
- max: 12 99999;
- min: 12 0;
- image.normal: "tab_base_r1.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- visible: 0;
+ max: 5 99999;
+ min: 5 0;
fixed: 1 1;
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
- visible: 1;
}
}
- part { name: "tab_bevel_top4";
- mouse_events: 0;
+ part { name: "tab_bevel_top4"; type: SPACER; mouse_events: 0;
description { state: "default" 0.0;
rel1.to_y: "tabright";
rel1.to_x: "tab_bevel_top3";
rel1.relative: 1.0 0.0;
- rel2.to: "tabright";
- image.normal: "tab_base_r0.png";
- image.border: 0 0 0 4;
- fill.smooth: 0;
- visible: 0;
+ rel2.to_y: "tabright";
fixed: 1 1;
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
- visible: 1;
}
}
- part { name: "tab_bevel_bg0";
- mouse_events: 0;
+ part { name: "tab_bevel_bg0"; type: SPACER; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "tab_bevel_top0";
- rel2.to: "tab_bevel_top0";
- image.normal: "tab_bg_l0.png";
- image.border: 2 0 4 4;
- fill.smooth: 0;
- visible: 0;
+ rel.to: "tab_bevel_top0";
fixed: 1 1;
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
- visible: 1;
}
}
- part { name: "tab_bevel_bg1";
- mouse_events: 0;
+ part { name: "tab_bevel_bg1"; type: SPACER; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "tab_bevel_top1";
- rel2.to: "tab_bevel_top1";
- image.normal: "tab_bg_l1.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- visible: 0;
+ rel.to: "tab_bevel_top1";
fixed: 1 1;
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
- visible: 1;
}
}
- part { name: "tab_bevel_bg3";
- mouse_events: 0;
+ part { name: "tab_bevel_bg3"; type: SPACER; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "tab_bevel_top3";
- rel2.to: "tab_bevel_top3";
- image.normal: "tab_bg_r1.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- visible: 0;
+ rel.to: "tab_bevel_top3";
fixed: 1 1;
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
- visible: 1;
}
}
- part { name: "tab_bevel_bg4";
- mouse_events: 0;
+ part { name: "tab_bevel_bg4"; type: SPACER; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "tab_bevel_top4";
- rel2.to: "tab_bevel_top4";
- image.normal: "tab_bg_r0.png";
- image.border: 0 2 4 4;
- fill.smooth: 0;
- visible: 0;
+ rel.to: "tab_bevel_top4";
fixed: 1 1;
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
- visible: 1;
}
}
part { name: "terminology.tabl.content"; type: SWALLOW;
description { state: "default" 0.0;
- rel1.to: "tableft";
- rel2.to: "tableft";
+ rel.to: "tableft";
fixed: 1 1;
}
}
part { name: "terminology.tabr.content"; type: SWALLOW;
description { state: "default" 0.0;
- rel1.to: "tabright";
- rel2.to: "tabright";
+ rel.to: "tabright";
fixed: 1 1;
}
}
- part { name: "tab_bevel_shad0";
- mouse_events: 0;
+ images.image: "tab_shad.png" COMP;
+ part { name: "tab_bevel_shad0"; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "tab_bevel_top0";
- rel2.to: "tab_bevel_top0";
- image.normal: "tab_shad_l0.png";
- image.border: 0 0 0 10;
+ rel.to: "tab_bevel_top0";
+ image.normal: "tab_shad.png";
+ image.border: 0 0 5 15;
+ image.border_scale_by: 0.25;
+ image.border_scale: 1;
fill.smooth: 0;
visible: 0;
fixed: 1 1;
+ color_class: "/shadow/selected/tab";
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
- part { name: "tab_bevel_shad1";
- mouse_events: 0;
+ images.image: "tab_shad_l.png" COMP;
+ part { name: "tab_bevel_shad1"; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "tab_bevel_top1";
- rel2.to: "tab_bevel_top1";
- image.normal: "tab_shad_l1.png";
- image.border: 0 0 10 10;
+ rel.to: "tab_bevel_top1";
+ image.normal: "tab_shad_l.png";
+ image.border: 0 20 5 15;
+ image.border_scale_by: 0.25;
+ image.border_scale: 1;
fill.smooth: 0;
visible: 0;
fixed: 1 1;
+ color_class: "/shadow/selected/tab";
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
- part { name: "tab_bevel_shad3";
- mouse_events: 0;
+ images.image: "tab_shad_r.png" COMP;
+ part { name: "tab_bevel_shad3"; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "tab_bevel_top3";
- rel2.to: "tab_bevel_top3";
- image.normal: "tab_shad_r1.png";
- image.border: 0 0 10 10;
+ rel.to: "tab_bevel_top3";
+ image.normal: "tab_shad_r.png";
+ image.border: 20 0 5 15;
+ image.border_scale_by: 0.25;
+ image.border_scale: 1;
fill.smooth: 0;
visible: 0;
fixed: 1 1;
+ color_class: "/shadow/selected/tab";
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
- part { name: "tab_bevel_shad4";
- mouse_events: 0;
+ part { name: "tab_bevel_shad4"; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "tab_bevel_top4";
- rel2.to: "tab_bevel_top4";
- image.normal: "tab_shad_r0.png";
- image.border: 0 0 0 10;
+ rel.to: "tab_bevel_top4";
+ image.normal: "tab_shad.png";
+ image.border: 0 0 5 15;
+ image.border_scale_by: 0.25;
+ image.border_scale: 1;
fill.smooth: 0;
visible: 0;
fixed: 1 1;
+ color_class: "/shadow/selected/tab";
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
- program {
- signal: "focus,in"; source: "terminology";
+ program { signal: "focus,in"; source: "terminology";
action: STATE_SET "focused" 0.0;
- target: "glint";
- target: "glow";
- target: "shine_unfocused";
- target: "shine_focused";
- after: "focus_in2";
- sequence {
- action: STATE_SET "custom" 0.0;
- target: "shine_focused";
- }
+ target: "tab_base_l";
+ target: "tab_base_r";
+ target: "tab_bevel_top2";
}
- program {
- signal: "focused,set"; source: "terminology";
+ program { signal: "focused,set"; source: "terminology";
action: STATE_SET "focused" 0.0;
- target: "glint";
- target: "shine_focused";
- target: "shine_unfocused";
- sequence {
- action: STATE_SET "focused2" 0.0;
- target: "glow";
- }
- sequence {
- action: STATE_SET "custom" 0.0;
- target: "shine_focused";
- }
+ target: "tab_base_l";
+ target: "tab_base_r";
+ target: "tab_bevel_top2";
}
- program { name: "focus_in2";
- action: STATE_SET "focused2" 0.0;
- transition: DECELERATE 0.5;
- target: "glow";
- }
- program {
- signal: "focus,out"; source: "terminology";
+ program { signal: "focus,out"; source: "terminology";
action: STATE_SET "default" 0.0;
- target: "glint";
- target: "glow";
- target: "shine_focused";
- target: "shine_unfocused";
- sequence {
- action: STATE_SET "custom" 0.0;
- target: "shine_unfocused";
- }
+ target: "tab_base_l";
+ target: "tab_base_r";
+ target: "tab_bevel_top2";
}
- program {
- signal: "tabbar,on"; source: "terminology";
+ program { signal: "tabbar,on"; source: "terminology";
action: STATE_SET "tab" 0.0;
target: "viewregion";
target: "tableft";
target: "tabmiddle";
target: "tabright";
- target: "bevel";
- target: "glintclip";
- target: "tab_bevel_bottom";
target: "tab_bevel_top0";
target: "tab_bevel_top1";
- target: "tab_bevel_top2";
target: "tab_bevel_top3";
target: "tab_bevel_top4";
target: "tab_bevel_bg0";
@@ -1107,22 +731,18 @@ group { name: "terminology/background";
target: "tab_bevel_shad1";
target: "tab_bevel_shad3";
target: "tab_bevel_shad4";
+ target: "tab_clip";
target: "tabtitle";
target: "tabclose";
}
- program {
- signal: "tabbar,off"; source: "terminology";
+ program { signal: "tabbar,off"; source: "terminology";
action: STATE_SET "default" 0.0;
target: "viewregion";
target: "tableft";
target: "tabmiddle";
target: "tabright";
- target: "bevel";
- target: "glintclip";
- target: "tab_bevel_bottom";
target: "tab_bevel_top0";
target: "tab_bevel_top1";
- target: "tab_bevel_top2";
target: "tab_bevel_top3";
target: "tab_bevel_top4";
target: "tab_bevel_bg0";
@@ -1133,217 +753,61 @@ group { name: "terminology/background";
target: "tab_bevel_shad1";
target: "tab_bevel_shad3";
target: "tab_bevel_shad4";
+ target: "tab_clip";
target: "tabtitle";
target: "tabclose";
}
- program {
- signal: "tab_btn,on"; source: "terminology";
+ program { signal: "tab_btn,on"; source: "terminology";
action: STATE_SET "on" 0.0;
target: "tab_btn_clip";
- target: "tab_btn_bg";
target: "terminology.tab_btn";
}
- program {
- signal: "tab_btn,off"; source: "terminology";
+ program { signal: "tab_btn,off"; source: "terminology";
action: STATE_SET "default" 0.0;
target: "tab_btn_clip";
- target: "tab_btn_bg";
target: "terminology.tab_btn";
}
part { name: "tab_btn_clip"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 0;
visible: 0;
}
description { state: "on" 0.0;
inherit: "default" 0.0;
visible: 1;
- color: 255 255 255 255;
}
}
- part { name: "tab_btn_bg";
- mouse_events: 0;
+ part { name: "tab_btn_bg"; mouse_events: 0;
clip_to: "tab_btn_clip";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "terminology.tab_btn";
- rel2.to: "terminology.tab_btn";
- image.normal: "tab_bg_r0.png";
- image.border: 0 2 4 4;
- fill.smooth: 0;
- visible: 0;
+ rel.to: "terminology.tab_btn";
+ image.normal: "icon-tab-btn-060.png";
+ color_class: "/fg/normal/term/tab_button";
fixed: 1 1;
}
- description { state: "on" 0.0;
+ description { state: "pressed" 0.0;
inherit: "default" 0.0;
- visible: 1;
+ color_class: "/fg/pressed/term/tab_button";
}
}
- part { name: "tab_btn_glow_r0";
+ part { name: "terminology.tab_btn"; type: SWALLOW; mouse_events: 0;
clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "tab_btn_r0";
- rel2.to: "tab_btn_r0";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 32;
- color_class: "GLOW";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
- part { name: "tab_btn_glow_r1";
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "tab_btn_r1";
- rel2.to: "tab_btn_r1";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 32;
- color_class: "GLOW";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
- part { name: "tab_btn_glow_r2";
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "tab_btn_r2";
- rel2.to: "tab_btn_r2";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 32;
- color_class: "GLOW";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
- part { name: "tab_btn_glow_r3";
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "tab_btn_r3";
- rel2.to: "tab_btn_r3";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 32;
- color_class: "GLOW";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
- part { name: "tab_btn_r0"; type: RECT;
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tab_btn";
- rel2.to: "terminology.tab_btn";
- rel1.relative: 0.05 0.05;
- rel2.relative: 0.45 0.45;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tab_btn_r1"; type: RECT;
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tab_btn";
- rel2.to: "terminology.tab_btn";
- rel1.relative: 0.55 0.05;
- rel2.relative: 0.95 0.45;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tab_btn_r2"; type: RECT;
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tab_btn";
- rel2.to: "terminology.tab_btn";
- rel1.relative: 0.05 0.55;
- rel2.relative: 0.45 0.95;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tab_btn_r3"; type: RECT;
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tab_btn";
- rel2.to: "terminology.tab_btn";
- rel1.relative: 0.55 0.55;
- rel2.relative: 0.95 0.95;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "terminology.tab_btn"; type: SWALLOW;
- clip_to: "tab_btn_clip";
- mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
rel1.relative: 1.0 0.0;
rel2.to_y: "tabmiddle";
+ rel1.offset: 3 3;
+ rel2.offset: -4 -4;
visible: 0;
- align: 1.0 0.0;
+ align: 1.0 0.5;
+ max: 0 0;
fixed: 1 1;
+ offscale;
}
description { state: "on" 0.0;
inherit: "default" 0.0;
- min: 16 16;
+ min: 15 15;
+ max: 15 15;
visible: 1;
}
}
@@ -1351,53 +815,31 @@ group { name: "terminology/background";
clip_to: "tab_btn_clip";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "terminology.tab_btn";
- rel2.to: "terminology.tab_btn";
- color: 0 0 0 0;
+ rel.to: "terminology.tab_btn";
+ color: 0 0 0 0; // no cc
}
}
- program {
- signal: "mouse,in"; source: "tab_btn_ev";
- action: STATE_SET "over" 0.0;
- transition: DECELERATE 0.5;
- target: "tab_btn_r0";
- target: "tab_btn_r1";
- target: "tab_btn_r2";
- target: "tab_btn_r3";
- target: "tab_btn_glow_r0";
- target: "tab_btn_glow_r1";
- target: "tab_btn_glow_r2";
- target: "tab_btn_glow_r3";
- }
- program {
- signal: "mouse,out"; source: "tab_btn_ev";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 2.0;
- target: "tab_btn_r0";
- target: "tab_btn_r1";
- target: "tab_btn_r2";
- target: "tab_btn_r3";
- target: "tab_btn_glow_r0";
- target: "tab_btn_glow_r1";
- target: "tab_btn_glow_r2";
- target: "tab_btn_glow_r3";
- }
- program {
- signal: "mouse,clicked,1"; source: "tab_btn_ev";
+ program { signal: "mouse,clicked,1"; source: "tab_btn_ev";
action: SIGNAL_EMIT "tab,go" "terminology";
}
- program {
- signal: "mouse,clicked,3"; source: "tab_btn_ev";
+ program { signal: "mouse,clicked,3"; source: "tab_btn_ev";
action: SIGNAL_EMIT "tab,new" "terminology";
}
- program {
- signal: "mouse,wheel,0,1"; source: "tab_btn_ev";
+ program { signal: "mouse,wheel,0,1"; source: "tab_btn_ev";
action: SIGNAL_EMIT "tab,prev" "terminology";
}
- program {
- signal: "mouse,wheel,0,-1"; source: "tab_btn_ev";
+ program { signal: "mouse,wheel,0,-1"; source: "tab_btn_ev";
action: SIGNAL_EMIT "tab,next" "terminology";
}
+ program { signal: "mouse,down,*"; source: "tab_btn_ev";
+ action: STATE_SET "pressed" 0.0;
+ target: "tab_btn_bg";
+ }
+ program { signal: "mouse,up,*"; source: "tab_btn_ev";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.3;
+ target: "tab_btn_bg";
+ }
part { name: "terminology.tab"; type: SWALLOW;
mouse_events: 0;
@@ -1428,89 +870,44 @@ group { name: "terminology/background";
rel2.relative: 0.7 0.0;
}
}
- program {
- name: "drag_over_tabs,on";
+ program { name: "drag_over_tabs,on";
signal: "drag_over_tabs,on"; source: "terminology";
action: STATE_SET "drag_over" 0.0;
target: "tabdrag";
after: "drag_over_tabs,pulse";
}
- program {
- name: "drag_over_tabs,pulse";
+ program { name: "drag_over_tabs,pulse";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "tabdrag";
after: "drag_over_tabs,pulse2";
}
- program {
- name: "drag_over_tabs,pulse2";
+ program { name: "drag_over_tabs,pulse2";
transition: ACCELERATE 0.5;
action: STATE_SET "drag_over" 0.0;
target: "tabdrag";
after: "drag_over_tabs,pulse";
}
- program {
- signal: "drag_over_tabs,off"; source: "terminology";
+ program { signal: "drag_over_tabs,off"; source: "terminology";
action: ACTION_STOP;
target: "drag_over_tabs,on";
target: "drag_over_tabs,pulse";
target: "drag_over_tabs,pulse2";
after: "drag_over_tabs,off2";
}
- program {
- name: "drag_over_tabs,off2";
+ program { name: "drag_over_tabs,off2";
action: STATE_SET "default" 0.0;
target: "tabdrag";
}
- program {
- signal: "hdrag,on"; source: "terminology";
+ program { signal: "hdrag,on"; source: "terminology";
action: STATE_SET "default" 0.0;
target: "tabdrag";
- target: "drag_left_pulse";
- target: "drag_left_outline";
- target: "drag_left_glow";
- target: "drag_left_icon";
- target: "drag_left_rect";
- target: "drag_right_pulse";
- target: "drag_right_outline";
- target: "drag_right_glow";
- target: "drag_right_icon";
- target: "drag_right_rect";
- target: "drag_top_pulse";
- target: "drag_top_outline";
- target: "drag_top_glow";
- target: "drag_top_icon";
- target: "drag_top_rect";
- target: "drag_bottom_pulse";
- target: "drag_bottom_outline";
- target: "drag_bottom_glow";
- target: "drag_bottom_icon";
- target: "drag_bottom_rect";
+ target: "drag_clip";
}
- program {
- signal: "hdrag,off"; source: "terminology";
+ program { signal: "hdrag,off"; source: "terminology";
action: STATE_SET "hdrag,off" 0.0;
target: "tabdrag";
- target: "drag_left_pulse";
- target: "drag_left_outline";
- target: "drag_left_glow";
- target: "drag_left_rect";
- target: "drag_left_icon";
- target: "drag_right_pulse";
- target: "drag_right_outline";
- target: "drag_right_glow";
- target: "drag_right_rect";
- target: "drag_right_icon";
- target: "drag_top_pulse";
- target: "drag_top_outline";
- target: "drag_top_rect";
- target: "drag_top_glow";
- target: "drag_top_icon";
- target: "drag_bottom_pulse";
- target: "drag_bottom_outline";
- target: "drag_bottom_glow";
- target: "drag_bottom_rect";
- target: "drag_bottom_icon";
+ target: "drag_clip";
}
// left boundary of the active tab (dragable 0.0 -> 1.0)
part { name: "terminology.tabl"; type: SPACER;
@@ -1534,89 +931,67 @@ group { name: "terminology/background";
}
}
- part { name: "tabgrouped"; type: IMAGE;
+ part { name: "tabgrouped";
scale: 1;
description { state: "default" 0.0;
- aspect: 1.0 1.0; aspect_preference: BOTH;
align: 0.0 0.5;
- min: 0 0;
- max: 0 0;
fixed: 1 1;
+ max: 0 0;
rel1 {
to_x: "tab_bevel_top2";
to_y: "tabmiddle";
- relative: 0.0 0.3;
+ relative: 0.0 0.0;
+ offset: 4 4;
}
rel2 {
to_x: "tab_bevel_top2";
to_y: "tabmiddle";
- relative: 1.0 0.7;
+ relative: 0.0 1.0;
+ offset: 4 -5;
}
+ image.normal: "tab_grouped";
+ color_class: "FG";
visible: 0;
+ offscale;
}
description { state: "grouped" 0.0;
inherit: "default" 0.0;
- min: 8 8;
- max: 32 32;
- image.normal: "tab_grouped";
- rel1 {
- to_y: "tabmiddle";
- to_x: "tab_bevel_top2";
- relative: 0.0 0.3;
- }
- rel2 {
- to_y: "tabmiddle";
- to_x: "tab_bevel_top2";
- relative: 1.0 0.7;
- }
- color: 255 255 255 255;
- color_class: "FG";
+ min: 15 15;
+ max: 15 15;
visible: 1;
}
}
- program {
- signal: "grouped,on"; source: "terminology";
+ program { signal: "grouped,on"; source: "terminology";
action: STATE_SET "grouped" 0.0;
target: "tabgrouped";
}
- program {
- signal: "grouped,off"; source: "terminology";
+ program { signal: "grouped,off"; source: "terminology";
action: STATE_SET "default" 0.0;
target: "tabgrouped";
}
part { name: "terminology.tab.title"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: SOFT_SHADOW BOTTOM;
- mouse_events: 0;
description { state: "default" 0.0;
- color: 255 255 255 255;
- color3: 0 0 0 18;
text { font: "Sans:style=Bold"; size: 10;
align: 0.5 0.0;
min: 0 1;
}
align: 0.5 0.0;
- rel1.to_x: "tab_bevel_top2";
- rel1.offset: 0 2;
- rel2.to_x: "tab_bevel_top2";
- rel2.offset: -1 2;
+ rel1.to_x: "tabgrouped";
+ rel1.offset: 4 4;
+ rel2.to_x: "tabclose";
+ rel2.offset: -5 4;
rel2.relative: 1.0 0.0;
visible: 0;
fixed: 1 1;
+ offscale;
}
}
- part {
- name: "tabtitle";
- type: TEXT;
- mouse_events: 0;
+ part { name: "tabtitle"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: SOFT_SHADOW BOTTOM;
description { state: "default" 0.0;
- color: 255 255 255 255;
- color2: 255 255 255 255;
- color3: 255 255 255 18;
- color_class: "TAB_TITLE";
+ color_class: "/fg/selected/term/tab/title/text";
text { font: "Sans:style=Bold"; size: 10;
align: 0.5 0.5;
min: 0 1;
@@ -1656,22 +1031,24 @@ group { name: "terminology/background";
target: "tabtitle";
}
part { name: "tablimit0"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
rel1.to_y: "terminology.tab";
rel1.relative: 0.0 1.0;
rel2.to_y: "terminology.tab.title";
+ rel2.offset: -1 7;
align: 0.0 0.0;
fixed: 1 1;
+ offscale;
}
}
- part { name: "tableft"; type: RECT;
- mouse_events: 0;
+ part { name: "tableft"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
rel2.to_x: "terminology.tab";
rel2.to_y: "tabmiddle";
rel2.relative: 0.0 1.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
visible: 0;
fixed: 1 1;
}
@@ -1680,15 +1057,14 @@ group { name: "terminology/background";
visible: 1;
}
}
- part { name: "tabright"; type: RECT;
- mouse_events: 0;
+ part { name: "tabright"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "terminology.tab";
rel1.relative: 1.0 0.0;
- //rel2.to_x: "terminology.tab_btn";
+ rel2.to_x: "terminology.tab_btn";
rel2.to_y: "tabmiddle";
- //rel2.relative: 0.0 1.0;
- color: 0 0 0 0;
+ rel2.relative: 0.0 1.0;
+ color: 0 0 0 0; // no cc
visible: 0;
fixed: 1 1;
}
@@ -1703,7 +1079,7 @@ group { name: "terminology/background";
rel2.to_x: "terminology.tab";
rel2.to_y: "tablimit0";
rel2.offset: -1 0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
align: 0.0 0.0;
visible: 0;
fixed: 1 1;
@@ -1713,7 +1089,7 @@ group { name: "terminology/background";
visible: 1;
}
}
- part { name: "tabclose"; type: IMAGE;
+ part { name: "tabclose";
scale: 1;
description { state: "default" 0.0;
aspect: 1.0 1.0; aspect_preference: BOTH;
@@ -1723,47 +1099,45 @@ group { name: "terminology/background";
to_y: "tabmiddle";
to_x: "tab_bevel_top3";
relative: 0.0 0.3;
+ offset: -9 0;
}
rel2 {
to_y: "tabmiddle";
to_x: "tab_bevel_top3";
relative: 0.0 0.7;
+ offset: -9 -1;
}
- min: 8 8;
- max: 16 16;
+ min: 15 15;
+ max: 15 15;
fixed: 1 1;
+ color_class: "/fg/selected/term/tab/title/close";
visible: 0;
+ offscale;
}
description { state: "tab" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 80;
- color_class: "FG";
+ color: 255 255 255 160; // no cc
visible: 1;
}
description { state: "over" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "FG";
+ color: 255 255 255 255; // no cc
visible: 1;
}
}
- program {
- signal: "mouse,in"; source: "tabclose";
+ program { signal: "mouse,in"; source: "tabclose";
action: STATE_SET "over" 0.0;
target: "tabclose";
}
- program {
- signal: "mouse,out"; source: "tabclose";
+ program { signal: "mouse,out"; source: "tabclose";
action: STATE_SET "tab" 0.0;
target: "tabclose";
}
- program {
- signal: "mouse,clicked,1"; source: "tabclose";
+ program { signal: "mouse,clicked,1"; source: "tabclose";
action: SIGNAL_EMIT "tab,close" "terminology";
}
- program {
- signal: "mouse,move"; source: "tabmiddle";
+ program { signal: "mouse,move"; source: "tabmiddle";
script {
new y, h, drag_x, drag_w;
new state[31]; \
@@ -1799,78 +1173,64 @@ group { name: "terminology/background";
}
}
}
- program {
- signal: "mouse,down,1,double"; source: "tabmiddle";
+ program { signal: "mouse,down,1,double"; source: "tabmiddle";
action: SIGNAL_EMIT "tab,title" "terminology";
}
- program {
- signal: "mouse,down,1"; source: "tabmiddle";
+ program { signal: "mouse,down,1"; source: "tabmiddle";
action: SIGNAL_EMIT "tab,mouse,down" "terminology";
}
- program {
- signal: "mouse,up,1"; source: "tabmiddle";
+ program { signal: "mouse,up,1"; source: "tabmiddle";
action: SIGNAL_EMIT "tab,drag,stop" "terminology";
}
// }}}
////////////////////////////////////////////////////////////////////
// visual bell - spinning red siren light {{{
- part { name: "bell_glow";
- mouse_events: 0;
+ // XXX: make this a swallow
+ images.image: "circle-1200.png" COMP;
+ images.image: "strobe-600.png" COMP;
+ part { name: "bell_glow"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell_base";
- rel2.to: "bell_base";
- min: 1600 1600;
- fill.smooth: 0;
- image.normal: "bg_led_glow.png";
+ color: 255 80 60 0; // no cc
+ rel.to: "bell";
+ min: 1200 1200;
+ image.normal: "circle-1200.png";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- color: 255 255 255 255;
+ color: 255 80 60 128;
}
description { state: "done" 0.0;
inherit: "default" 0.0;
visible: 0;
- color: 255 255 255 0;
+ color: 255 80 60 0;
min: 0 0;
}
}
- part { name: "bell_base";
- mouse_events: 0;
+ part { name: "bell_glow2"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- color: 255 255 255 0;
- min: 32 32;
- max: 32 32;
- rel2.offset: -1 -1;
- align: 1.0 1.0;
- image.normal: "bg_led_base.png";
+ color: 255 240 160 0; // no cc
+ rel.to: "bell";
+ min: 400 400;
+ image.normal: "circle-1200.png";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- color: 255 255 255 255;
+ color: 255 220 120 128;
}
- }
- part { name: "bell";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell_base";
- rel2.to: "bell_base";
- image.normal: "bg_led.png";
- }
- description { state: "visible" 0.0;
+ description { state: "done" 0.0;
inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
+ visible: 0;
+ color: 255 220 120 0;
+ min: 0 0;
}
}
part { name: "bell_strobe";
@@ -1878,10 +1238,11 @@ group { name: "terminology/background";
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell";
- rel2.to: "bell";
- image.normal: "bg_led_strobe.png";
+ color: 255 255 200 0;
+ rel.to: "bell_glow2";
+ image.normal: "strobe-600.png";
+ rel1.relative: -0.5 -0.5;
+ rel2.relative: 1.5 1.5;
map {
on: 1;
smooth: 1;
@@ -1891,7 +1252,7 @@ group { name: "terminology/background";
description { state: "spin" 0.0;
inherit: "default" 0.0;
visible: 1;
- color: 255 255 255 255;
+ color: 255 255 200 255;
map.rotation.z: 36.0;
}
description { state: "spin_done" 0.0;
@@ -1899,30 +1260,48 @@ group { name: "terminology/background";
map.rotation.z: 720.0;
}
}
- program {
- signal: "bell,ring"; source: "terminology";
+ part { name: "bell";
+ mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ visible: 0;
+ color: 255 255 255 0;
+ max: 20 20;
+ min: 20 20;
+ align: 1.0 1.0;
+ rel1.offset: 15 15;
+ rel2.offset: -16 -16;
+ image.normal: "circle-1200.png";
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ color: 255 255 255 255;
+ }
+ }
+ program { signal: "bell,ring"; source: "terminology";
action: PLAY_SAMPLE "bell" 1.0 ALERT;
}
- program {
- signal: "bell"; source: "terminology";
+ program { signal: "bell"; source: "terminology";
action: STATE_SET "default" 0.0;
- target: "bell_base";
target: "bell";
target: "bell_strobe";
target: "bell_glow";
+ target: "bell_glow2";
after: "bell";
}
program { name: "bell";
action: STATE_SET "visible" 0.0;
- target: "bell_base";
target: "bell_glow";
+ target: "bell_glow2";
after: "bell2";
}
program { name: "bell2";
action: STATE_SET "visible" 0.0;
transition: DECELERATE 0.1;
target: "bell";
- target: "bell_glow";
after: "bell3";
after: "bell3.1";
}
@@ -1932,12 +1311,12 @@ group { name: "terminology/background";
target: "bell_strobe";
after: "bell4.0";
after: "bell4.1";
- after: "bell4.2";
}
program { name: "bell3.1";
action: STATE_SET "done" 0.0;
transition: DECELERATE 0.5;
target: "bell_glow";
+ target: "bell_glow2";
}
program { name: "bell4.0";
action: STATE_SET "default" 0.0;
@@ -1945,11 +1324,6 @@ group { name: "terminology/background";
target: "bell";
}
program { name: "bell4.1";
- action: STATE_SET "default" 0.0;
- transition: ACCELERATE 1.6;
- target: "bell_base";
- }
- program { name: "bell4.2";
action: STATE_SET "spin_done" 0.0;
transition: LINEAR 0.9;
target: "bell_strobe";
@@ -1958,224 +1332,120 @@ group { name: "terminology/background";
////////////////////////////////////////////////////////////////////
// Drag target areas {{{
- #define DRAG_TARGET(DIR, ICON, REL_ONE, REL_TWO) \
- part { name: "drag_"##DIR##"_rect"; \
- type: RECT; \
- description { state: "default" 0.0; \
- rel1.to: "drag_"##DIR##"_outline"; \
- rel2.to: "drag_"##DIR##"_outline"; \
- color: 255 255 255 40; \
- color_class: "FG"; \
- visible: 0; \
- } \
- description { state: "hdrag,off" 0.0; \
- inherit: "default" 0.0; \
- visible: 1; \
- } \
- } \
- part { name: "drag_"##DIR##"_pulse"; \
+ part { name: "drag_clip"; type: RECT;
+ description { state: "default" 0.0;
+ visible: 0;
+ fixed: 1 1;
+ }
+ description { state: "hdrag,off" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+#define DRAG_TARGET(DIR, ICON, REL_ONE, REL_TWO, ALIGN, OFF_ONE, OFF_TWO, MIN) \
+ part { name: "drag_"##DIR##"_outline"; type: RECT; \
mouse_events: 0; \
+ scale: 1; \
+ clip_to: "drag_clip"; \
description { state: "default" 0.0; \
- rel1.offset: -4 -4; \
- rel1.to: "drag_"##DIR##"_outline"; \
- rel2.offset: 3 3; \
- rel2.to: "drag_"##DIR##"_outline"; \
- image { \
- normal: "cr_pulse.png"; \
- border: 4 4 4 4; \
- } \
- color: 255 255 255 0; \
- color_class: "GLOW"; \
- visible: 0; \
- } \
- description { state: "hdrag,off" 0.0; \
- inherit: "default" 0.0; \
- } \
- description { state: "on" 0.0; \
- inherit: "default" 0.0; \
- color: 255 255 255 255; \
- color_class: "GLOW"; \
- visible: 1; \
- } \
- description { state: "out" 0.0; \
- inherit: "default" 0.0; \
- color: 255 255 255 0; \
- color_class: "GLOW"; \
- rel1.offset: -8 -8; \
- rel2.offset: 7 7; \
- visible: 1; \
- } \
- } \
- part { name: "drag_"##DIR##"_glow"; \
- mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.offset: -4 -4; \
- rel1.to: "drag_"##DIR##"_outline"; \
- rel2.offset: 3 3; \
- rel2.to: "drag_"##DIR##"_outline"; \
- image { \
- normal: "cr_glow.png"; \
- border: 9 9 9 9; \
- } \
- color: 255 255 255 40; \
- color_class: "GLOW"; \
- visible: 0; \
- } \
- description { state: "hdrag,off" 0.0; \
- inherit: "default" 0.0; \
- visible: 1; \
- } \
- description { state: "active" 0.0; \
- inherit: "default" 0.0; \
- color: 255 255 255 255; \
- color_class: "GLOW"; \
- visible: 1; \
- } \
- } \
- part { name: "drag_"##DIR##"_outline"; \
- mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "viewregion"; \
+ rel.to: "viewregion"; \
rel1.relative: REL_ONE; \
- rel2.to: "viewregion"; \
+ rel1.offset: OFF_ONE; \
rel2.relative: REL_TWO; \
- image { \
- normal: "cr_out.png"; \
- border: 3 3 3 3; \
- } \
- color: 255 255 255 80; \
- color_class: "GLOW"; \
- visible: 0; \
- } \
- description { state: "hdrag,off" 0.0; \
- inherit: "default" 0.0; \
- visible: 1; \
+ rel2.offset: OFF_TWO; \
+ align: ALIGN; \
+ min: MIN; \
+ color: 255 255 255 20; /* no cc */ \
+ color_class: "/bg/normal/term/drag/target"; \
+ offscale; \
+ fixed: 1 1; \
} \
description { state: "active" 0.0; \
inherit: "default" 0.0; \
- color: 255 255 255 255; \
- color_class: "HIGHLIGHT"; \
- visible: 1; \
+ color: 255 255 255 80; /* no cc */ \
+ color_class: "/bg/selected/term/drag/target"; \
} \
} \
part { name: "drag_"##DIR##"_icon"; \
+ scale: 1; \
+ clip_to: "drag_clip"; \
description { state: "default" 0.0; \
- aspect: 1.0 1.0; aspect_preference: BOTH; \
- align: 0.5 0.5; \
- rel1.to: "drag_"##DIR##"_outline"; \
- rel2.to: "drag_"##DIR##"_outline"; \
- max: 80 80; \
- image.normal: "icon_split_"##ICON##".png"; \
- visible: 0; \
+ rel.to: "drag_"##DIR##"_outline"; \
+ min: 15 15; \
+ max: 15 15; \
+ image.normal: "icon-split-"##ICON##"-060.png"; \
+ color_class: "/fg/normal/term/drag/target"; \
+ fixed: 1 1; \
} \
- description { state: "hdrag,off" 0.0; \
+ description { state: "active" 0.0; \
inherit: "default" 0.0; \
- visible: 1; \
+ color_class: "/fg/selected/term/drag/target"; \
} \
} \
- program { \
- name: "drag_"##DIR##",on"; \
- signal: "drag_"##DIR##",on"; source: "terminology"; \
+ program { signal: "drag_"##DIR##",on"; source: "terminology"; \
action: STATE_SET "active" 0.0; \
- target: "drag_"##DIR##"_glow"; \
+ transition: LINEAR 0.2; \
target: "drag_"##DIR##"_outline"; \
- after: "drag_"##DIR##",on2"; \
- after: "drag_"##DIR##"_pulse"; \
+ target: "drag_"##DIR##"_icon"; \
} \
- program { name: "drag_"##DIR##",on2"; \
- in: 0.5 0.0; \
+ program { signal: "drag_"##DIR##",off"; source: "terminology"; \
action: STATE_SET "default" 0.0; \
- transition: DECELERATE 0.2; \
- target: "drag_"##DIR##"_glow"; \
- target: "drag_"##DIR##"_outline"; \
- after: "drag_"##DIR##",on3"; \
- } \
- program { name: "drag_"##DIR##",on3"; \
- in: 0.5 0.0; \
- action: STATE_SET "active" 0.0; \
- target: "drag_"##DIR##"_glow"; \
- target: "drag_"##DIR##"_outline"; \
- after: "drag_"##DIR##",on2"; \
- after: "drag_"##DIR##"_pulse"; \
- } \
- program { name: "drag_"##DIR##"_pulse"; \
- action: STATE_SET "on" 0.0; \
- target: "drag_"##DIR##"_pulse"; \
- after: "drag_"##DIR##"_pulse2"; \
- } \
- program { name: "drag_"##DIR##"_pulse2"; \
- action: STATE_SET "out" 0.0; \
- transition: DECELERATE 0.4; \
- target: "drag_"##DIR##"_pulse"; \
- } \
- program { \
- signal: "drag_"##DIR##",off"; source: "terminology"; \
- action: ACTION_STOP; \
- target: "drag_"##DIR##",on"; \
- target: "drag_"##DIR##",on2"; \
- target: "drag_"##DIR##",on3"; \
- target: "drag_"##DIR##"_pulse"; \
- target: "drag_"##DIR##"_pulse2"; \
- after: "drag_"##DIR##",off2"; \
- } \
- program { name: "drag_"##DIR##",off2"; \
- action: STATE_SET "default" 0.0; \
- target: "drag_"##DIR##"_glow"; \
+ transition: LINEAR 0.3; \
target: "drag_"##DIR##"_outline"; \
+ target: "drag_"##DIR##"_icon"; \
}
- DRAG_TARGET(left, v, 0.0 0.2, 0.15 0.8)
- DRAG_TARGET(right, v, 0.85 0.2, 1.0 0.8)
- DRAG_TARGET(top, h, 0.2 0.0, 0.8 0.2)
- DRAG_TARGET(bottom, h, 0.2 0.8, 0.8 1.0)
+ DRAG_TARGET(left, v, 0.0 0.0, 0.0 1.0, 0.0 0.5, 4 34, 4 -35, 25 25)
+ DRAG_TARGET(right, v, 1.0 0.0, 1.0 1.0, 1.0 0.5, -5 34, -5 -35, 25 25)
+ DRAG_TARGET(top, h, 0.0 0.0, 1.0 0.0, 0.5 0.0, 34 4, -35 4, 25 25)
+ DRAG_TARGET(bottom, h, 0.0 1.0, 1.0 1.0, 0.5 1.0, 34 -5, -35 -5, 25 25)
// }}}
////////////////////////////////////////////////////////////////////
// popup media over the terminal (until dismissed) {{{
+ // XXX: make this a swallow in the middle
part { name: "popmedia_clip"; type: RECT;
- mouse_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
}
part { name: "popmedia_shadow";
mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "terminology.popmedia";
- rel2.to: "terminology.popmedia";
+ rel.to: "terminology.popmedia";
image.normal: "pm_shadow.png";
image.border: 64 64 64 64;
- image.border_scale_by: 0.1;
- fill.smooth: 0;
+ image.border_scale_by: 0.2;
+ image.border_scale: 1;
+ rel1.offset: -12 -12;
+ rel2.offset: 11 11;
+ color: 0 0 0 128;
visible: 0;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- rel1.offset: -32 -32;
- rel2.offset: 31 31;
+ rel1.offset: -64 -64;
+ rel2.offset: 63 63;
image.border_scale_by: 1.0;
visible: 1;
}
}
- part { name: "popmedia_fill";
+ part { name: "popmedia_fill"; type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "terminology.popmedia";
- rel2.to: "terminology.popmedia";
- image.normal: "pm_fill.png";
- fill {
- size.relative: 0.0 0.0;
- size.offset: 64 64;
- }
+ rel.to: "terminology.popmedia";
+ color: 48 48 48 255;
}
}
part { name: "terminology.popmedia"; type: SWALLOW;
@@ -2211,97 +1481,11 @@ group { name: "terminology/background";
visible: 1;
}
}
- part { name: "popmedia_overlay";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.popmedia";
- rel2.to: "terminology.popmedia";
- image.normal: "pm_overlay.png";
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "popmedia_bevel";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.popmedia";
- rel2.to: "terminology.popmedia";
- image.normal: "bg_bevel.png";
- image.border: 3 3 3 3;
- image.middle: 0;
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "popmedia_glintclip"; type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "popmedia_glint";
- mouse_events: 0;
- clip_to: "popmedia_glintclip";
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 79 5;
- max: 79 5;
- rel1 {
- to: "terminology.popmedia";
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- to: "terminology.popmedia";
- relative: 1.0 0.0;
- offset: -1 0;
- }
- image.normal: "bg_glint.png";
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "popmedia_shine";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.popmedia";
- rel2.to: "terminology.popmedia";
- image.normal: "bg_shine";
- fill.smooth: 0;
- align: 0.5 0.0;
- aspect: (256/120) (256/120);
- aspect_preference: HORIZONTAL;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
part { name: "popmedia_dismiss"; type: RECT;
mouse_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
visible: 0;
}
description { state: "visible" 0.0;
@@ -2309,186 +1493,90 @@ group { name: "terminology/background";
visible: 1;
}
}
- program {
- signal: "mouse,clicked,*"; source: "popmedia_dismiss";
+ program { signal: "mouse,clicked,*"; source: "popmedia_dismiss";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
+ transition: DECELERATE 0.3 USE_DURATION_FACTOR 1;
target: "terminology.popmedia";
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
- target: "popmedia_overlay";
- target: "popmedia_bevel";
- target: "popmedia_glint";
- target: "popmedia_glintclip";
- target: "popmedia_shine";
after: "popmedia_dismiss2";
}
program { name: "popmedia_dismiss2";
action: SIGNAL_EMIT "popmedia,done" "terminology";
}
- program {
- signal: "popmedia,off"; source: "terminology";
+ program { signal: "popmedia,off"; source: "terminology";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.2;
+ transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
target: "terminology.popmedia";
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
- target: "popmedia_overlay";
- target: "popmedia_bevel";
- target: "popmedia_glint";
- target: "popmedia_glintclip";
- target: "popmedia_shine";
after: "popmedia_dismiss2";
}
- program {
- signal: "popmedia,image"; source: "terminology";
+ program { signal: "popmedia,image"; source: "terminology";
action: STATE_SET "image" 0.0;
- transition: DECELERATE 0.2;
+ transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
target: "terminology.popmedia";
}
- program {
- signal: "popmedia,scale"; source: "terminology";
+ program { signal: "popmedia,scale"; source: "terminology";
action: STATE_SET "scale" 0.0;
- transition: DECELERATE 0.2;
+ transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
target: "terminology.popmedia";
}
- program {
- signal: "popmedia,edje"; source: "terminology";
+ program { signal: "popmedia,edje"; source: "terminology";
action: STATE_SET "edje" 0.0;
- transition: DECELERATE 0.2;
+ transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
target: "terminology.popmedia";
}
- program {
- signal: "popmedia,movie"; source: "terminology";
+ program { signal: "popmedia,movie"; source: "terminology";
action: STATE_SET "movie" 0.0;
- transition: DECELERATE 0.2;
+ transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
target: "terminology.popmedia";
}
- program {
- signal: "popmedia,image"; source: "terminology";
+ program { signal: "popmedia,image"; source: "terminology";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.2;
+ transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
- target: "popmedia_overlay";
- target: "popmedia_bevel";
- target: "popmedia_glint";
- target: "popmedia_glintclip";
- target: "popmedia_shine";
}
- program {
- signal: "popmedia,scale"; source: "terminology";
+ program { signal: "popmedia,scale"; source: "terminology";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.2;
+ transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
- target: "popmedia_overlay";
- target: "popmedia_bevel";
- target: "popmedia_glint";
- target: "popmedia_glintclip";
- target: "popmedia_shine";
}
- program {
- signal: "popmedia,edje"; source: "terminology";
+ program { signal: "popmedia,edje"; source: "terminology";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.2;
+ transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
- target: "popmedia_overlay";
- target: "popmedia_bevel";
- target: "popmedia_glint";
- target: "popmedia_glintclip";
- target: "popmedia_shine";
}
- program {
- signal: "popmedia,movie"; source: "terminology";
+ program { signal: "popmedia,movie"; source: "terminology";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.2;
+ transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
- target: "popmedia_overlay";
- target: "popmedia_bevel";
- target: "popmedia_glint";
- target: "popmedia_glintclip";
- target: "popmedia_shine";
}
/* media busy */
- part { name: "media"; type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "knob";
- clip_to: "media";
- mouse_events: 0;
+ // XXX: make this a swallow bottom-right
+ part { name: "busy_base"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- image.normal: "media_busy_knob.png";
- min: 40 40;
- max: 40 40;
+ min: 40 40; max: 40 40;
align: 1.0 1.0;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
}
- part { name: "knob_spinner";
- clip_to: "media";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- color: 255 255 255 255;
- color_class: "GLOW";
- rel1.to: "knob";
- rel2.to: "knob";
- image.normal: "media_busy_spinner.png";
- map {
- on: 1;
- smooth: 1;
- rotation.center: "knob";
- }
- }
- description { state: "spin" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- map.rotation.z: 360;
- }
- }
- program {
- signal: "busy"; source: "terminology";
- action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.5;
- target: "media";
- }
- program { name: "spin1";
- signal: "busy"; source: "terminology";
- action: STATE_SET "spin" 0.0;
- transition: LINEAR 0.5;
- target: "knob_spinner";
- after: "spin2";
- }
- program { name: "spin2";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- after: "spin1";
- }
- program {
- signal: "done"; source: "terminology";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 1.5;
- target: "media";
- }
+ BUSY("busy_base", "busy", "terminology", "done", "terminology")
// }}}
}
}
diff --git a/data/themes/default/base.edc b/data/themes/default/base.edc
index efeeab07..44d6515f 100644
--- a/data/themes/default/base.edc
+++ b/data/themes/default/base.edc
@@ -1,12 +1,4 @@
group { name: "terminology/base";
- images {
- image: "pm_shadow.png" COMP;
- image: "bg_bevel.png" COMP;
- image: "bg_glint.png" COMP;
- image: "lk_bottom.png" COMP;
- image: "lk_left.png" COMP;
- image: "lk_right.png" COMP;
- }
parts {
part { name: "terminology.content"; type: SWALLOW;
description { state: "default" 0.0;
@@ -20,39 +12,29 @@ group { name: "terminology/base";
rel1.offset: -100 -100;
rel2.to: "terminology.cmdbox";
rel2.offset: 99 99;
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
visible: 1;
}
}
- part { name: "cmdshadow"; mouse_events: 0;
- clip_to: "cmdclip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "cmdback";
- rel1.offset: -32 -32;
- rel2.to: "cmdback";
- rel2.offset: 31 31;
- image.normal: "pm_shadow.png";
- image.border: 64 64 64 64;
- fill.smooth: 0;
- }
- }
part { name: "cmdback"; type: RECT;
+ scale: 1;
clip_to: "cmdclip";
description { state: "default" 0.0;
color: 48 48 48 255;
rel1.to: "terminology.cmdbox";
- rel1.offset: -2 -2;
+ rel1.offset: -4 -4;
rel2.to: "terminology.cmdbox";
- rel2.offset: 1 1;
+ rel2.offset: 3 3;
+ offscale;
}
}
part { name: "terminology.cmdbox"; type: SWALLOW;
+ scale: 1;
clip_to: "cmdclip";
description { state: "default" 0.0;
fixed: 1 1;
@@ -61,6 +43,7 @@ group { name: "terminology/base";
rel1.offset: 8 9;
rel2.offset: -9 9;
align: 0.5 0.0;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -69,53 +52,19 @@ group { name: "terminology/base";
align: 0.5 1.0;
}
}
- part { name: "cmdbevel"; mouse_events: 0;
- clip_to: "cmdclip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "cmdback";
- rel2.to: "cmdback";
- image.normal: "bg_bevel.png";
- image.border: 3 3 3 3;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "cmdglint"; mouse_events: 0;
- clip_to: "cmdclip";
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 79 5;
- max: 79 5;
- rel1 {
- to: "cmdback";
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- to: "cmdback";
- relative: 1.0 0.0;
- offset: -1 0;
- }
- image.normal: "bg_glint.png";
- }
- }
- program {
- signal: "cmdbox,show"; source: "terminology";
+ program { signal: "cmdbox,show"; source: "terminology";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.4;
+ transition: DECELERATE 0.2;
target: "cmdclip";
}
- program {
- signal: "cmdbox,show"; source: "terminology";
+ program { signal: "cmdbox,show"; source: "terminology";
action: STATE_SET "visible" 0.0;
- transition: SPRING 0.4 0.5 4;
+ transition: SPRING 0.2 0.2 4;
target: "terminology.cmdbox";
}
- program {
- signal: "cmdbox,hide"; source: "terminology";
+ program { signal: "cmdbox,hide"; source: "terminology";
action: STATE_SET "default" 0.0;
- transition: ACCELERATE 0.5;
+ transition: ACCELERATE 0.3;
target: "terminology.cmdbox";
target: "cmdclip";
}
@@ -183,7 +132,7 @@ group { name: "terminology/base";
color2: 136 255 136 40;
color3: 136 255 136 8;
text {
- font: "Sans"; size: 11;
+ font: "Sans"; size: 10;
text: "Twitter: @_Terminology_";
align: 1.0 0.5;
min: 1 1;
@@ -194,191 +143,10 @@ group { name: "terminology/base";
visible: 1;
}
}
- part { name: "twitter.bottom";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "lk_bottom.png";
- image.border: 9 9 0 0;
- align: 0.5 1.0;
- min: 20 8;
- rel1 {
- to: "twitter.txt";
- offset: -6 -2;
- relative: 0.0 1.0;
- }
- rel2 {
- to: "twitter.txt";
- offset: 5 -1;
- }
- color: 51 255 17 255;
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default";
- visible: 1;
- }
- }
- part { name: "twitter.l";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "lk_left.png";
- align: 0.0 1.0;
- min: 4 4;
- rel1 {
- to: "twitter.txt";
- offset: 6 -2;
- relative: 0.0 1.0;
- }
- rel2 {
- to: "twitter.txt";
- offset: 6 -2;
- relative: 0.0 1.0;
- }
- color: 51 255 17 255;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default";
- visible: 1;
- }
- description { state: "out" 0.0;
- fixed: 1 1;
- inherit: "visible" 0.0;
- min: 16 16;
- rel1 {
- to: "twitter.txt";
- offset: -10 -2;
- }
- rel2 {
- to: "twitter.txt";
- offset: -10 -2;
- }
- color: 51 255 17 255;
- }
- description { state: "out2" 0.0;
- fixed: 1 1;
- inherit: "visible" 0.0;
- min: 32 32;
- rel1 {
- to: "twitter.txt";
- offset: -26 -2;
- }
- rel2 {
- to: "twitter.txt";
- offset: -26 -2;
- }
- color: 51 255 17 0;
- }
- }
- part { name: "twitter.r";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "lk_right.png";
- align: 1.0 1.0;
- min: 4 4;
- rel1 {
- to: "twitter.txt";
- offset: -5 -1;
- relative: 1.0 1.0;
- }
- rel2 {
- to: "twitter.txt";
- offset: -5 -1;
- relative: 1.0 1.0;
- }
- color: 51 255 17 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default";
- visible: 1;
- }
- description { state: "out" 0.0;
- fixed: 1 1;
- inherit: "visible" 0.0;
- min: 16 16;
- rel1 {
- to: "twitter.txt";
- offset: 9 -2;
- }
- rel2 {
- to: "twitter.txt";
- offset: 9 -2;
- }
- color: 51 255 17 255;
- }
- description { state: "out2" 0.0;
- fixed: 1 1;
- inherit: "visible" 0.0;
- min: 32 32;
- rel1 {
- to: "twitter.txt";
- offset: 25 -2;
- }
- rel2 {
- to: "twitter.txt";
- offset: 25 -2;
- }
- color: 51 255 17 0;
- }
- }
- program { name: "twitter.show2";
- action: STATE_SET "out2" 0.0;
- transition: LINEAR 0.3;
- target: "twitter.l";
- target: "twitter.r";
- after: "twitter.show3";
- }
- program { name: "twitter.show3";
- action: STATE_SET "default" 0.0;
- target: "twitter.l";
- target: "twitter.r";
- after: "twitter.show";
- }
- program {
- name: "twitter.show_bottom";
- signal: "mouse,in"; source: "twitter.txt";
- action: STATE_SET "visible" 0.0;
- target: "twitter.bottom";
- }
- program {
- name: "twitter.show";
- signal: "mouse,in"; source: "twitter.txt";
- action: STATE_SET "out" 0.0;
- transition: LINEAR 0.3;
- target: "twitter.l";
- target: "twitter.r";
- after: "twitter.show2";
- }
- program {
- signal: "mouse,out"; source: "twitter.txt";
- action: STATE_SET "visible" 0.0;
- target: "twitter.txt";
- }
- program {
- signal: "mouse,out"; source: "twitter.txt";
- action: ACTION_STOP;
- target: "twitter.show";
- target: "twitter.show2";
- target: "twitter.show3";
- }
- program {
- signal: "mouse,out"; source: "twitter.txt";
- action: STATE_SET "default" 0.0;
- target: "twitter.bottom";
- target: "twitter.l";
- target: "twitter.r";
- }
- program {
- signal: "mouse,clicked,1"; source: "twitter.txt";
+ program { signal: "mouse,clicked,1"; source: "twitter.txt";
action: SIGNAL_EMIT "about,twitter" "terminology";
}
- program {
- signal: "mouse,clicked,3"; source: "twitter.txt";
+ program { signal: "mouse,clicked,3"; source: "twitter.txt";
action: SIGNAL_EMIT "about,twitter,ctx" "terminology";
}
@@ -417,7 +185,7 @@ group { name: "terminology/base";
color2: 136 255 136 40;
color3: 136 255 136 8;
text {
- font: "Sans"; size: 11;
+ font: "Sans"; size: 10;
text: "YouTube channel";
align: 0.0 0.5;
min: 1 1;
@@ -428,204 +196,21 @@ group { name: "terminology/base";
visible: 1;
}
}
- part { name: "youtube.bottom";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "lk_bottom.png";
- image.border: 9 9 0 0;
- align: 0.5 1.0;
- min: 20 8;
- rel1 {
- to: "youtube.txt";
- offset: -6 -2;
- relative: 0.0 1.0;
- }
- rel2 {
- to: "youtube.txt";
- offset: 5 -1;
- }
- color: 51 255 17 255;
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default";
- visible: 1;
- }
- }
- part { name: "youtube.l";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "lk_left.png";
- align: 0.0 1.0;
- min: 4 4;
- rel1 {
- to: "youtube.txt";
- offset: 6 -2;
- relative: 0.0 1.0;
- }
- rel2 {
- to: "youtube.txt";
- offset: 6 -2;
- relative: 0.0 1.0;
- }
- color: 51 255 17 255;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default";
- visible: 1;
- }
- description { state: "out" 0.0;
- fixed: 1 1;
- inherit: "visible" 0.0;
- min: 16 16;
- rel1 {
- to: "youtube.txt";
- offset: -10 -2;
- }
- rel2 {
- to: "youtube.txt";
- offset: -10 -2;
- }
- color: 51 255 17 255;
- }
- description { state: "out2" 0.0;
- fixed: 1 1;
- inherit: "visible" 0.0;
- min: 32 32;
- rel1 {
- to: "youtube.txt";
- offset: -26 -2;
- }
- rel2 {
- to: "youtube.txt";
- offset: -26 -2;
- }
- color: 51 255 17 0;
- }
- }
- part { name: "youtube.r";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "lk_right.png";
- align: 1.0 1.0;
- min: 4 4;
- rel1 {
- to: "youtube.txt";
- offset: -5 -1;
- relative: 1.0 1.0;
- }
- rel2 {
- to: "youtube.txt";
- offset: -5 -1;
- relative: 1.0 1.0;
- }
- color: 51 255 17 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default";
- visible: 1;
- }
- description { state: "out" 0.0;
- fixed: 1 1;
- inherit: "visible" 0.0;
- min: 16 16;
- rel1 {
- to: "youtube.txt";
- offset: 9 -2;
- }
- rel2 {
- to: "youtube.txt";
- offset: 9 -2;
- }
- color: 51 255 17 255;
- }
- description { state: "out2" 0.0;
- fixed: 1 1;
- inherit: "visible" 0.0;
- min: 32 32;
- rel1 {
- to: "youtube.txt";
- offset: 25 -2;
- }
- rel2 {
- to: "youtube.txt";
- offset: 25 -2;
- }
- color: 51 255 17 0;
- }
- }
- program { name: "youtube.show2";
- action: STATE_SET "out2" 0.0;
- transition: LINEAR 0.3;
- target: "youtube.l";
- target: "youtube.r";
- after: "youtube.show3";
- }
- program { name: "youtube.show3";
- action: STATE_SET "default" 0.0;
- target: "youtube.l";
- target: "youtube.r";
- after: "youtube.show";
- }
- program {
- name: "youtube.show_bottom";
- signal: "mouse,in"; source: "youtube.txt";
- action: STATE_SET "visible" 0.0;
- target: "youtube.bottom";
- }
- program {
- name: "youtube.show";
- signal: "mouse,in"; source: "youtube.txt";
- action: STATE_SET "out" 0.0;
- transition: LINEAR 0.3;
- target: "youtube.l";
- target: "youtube.r";
- after: "youtube.show2";
- }
- program {
- signal: "mouse,out"; source: "youtube.txt";
- action: STATE_SET "visible" 0.0;
- target: "youtube.txt";
- }
- program {
- signal: "mouse,out"; source: "youtube.txt";
- action: ACTION_STOP;
- target: "youtube.show";
- target: "youtube.show2";
- target: "youtube.show3";
- }
- program {
- signal: "mouse,out"; source: "youtube.txt";
- action: STATE_SET "default" 0.0;
- target: "youtube.bottom";
- target: "youtube.l";
- target: "youtube.r";
- }
- program {
- signal: "mouse,clicked,1"; source: "youtube.txt";
+ program { signal: "mouse,clicked,1"; source: "youtube.txt";
action: SIGNAL_EMIT "about,youtube" "terminology";
}
- program {
- signal: "mouse,clicked,3"; source: "youtube.txt";
+ program { signal: "mouse,clicked,3"; source: "youtube.txt";
action: SIGNAL_EMIT "about,youtube,ctx" "terminology";
}
- program {
- signal: "about,show"; source: "terminology";
+ program { signal: "about,show"; source: "terminology";
action: STATE_SET "visible" 0.0;
transition: SPRING 1.2 2.0 6;
target: "terminology.about";
target: "twitter.txt";
target: "youtube.txt";
}
- program {
- signal: "about,hide"; source: "terminology";
+ program { signal: "about,hide"; source: "terminology";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.6;
target: "terminology.about";
@@ -651,6 +236,7 @@ group { name: "terminology/base";
relative: 1.0 0.98;
offset: 8 -9;
}
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -667,16 +253,14 @@ group { name: "terminology/base";
}
}
}
- program {
- signal: "optdetails,show"; source: "terminology";
+ program { signal: "optdetails,show"; source: "terminology";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.4;
+ transition: DECELERATE 0.2;
target: "terminology.optdetails";
}
- program {
- signal: "optdetails,hide"; source: "terminology";
+ program { signal: "optdetails,hide"; source: "terminology";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.2;
+ transition: DECELERATE 0.3;
target: "terminology.optdetails";
after: "opdt_hide2";
}
@@ -698,6 +282,7 @@ group { name: "terminology/base";
relative: 1.0 0.98;
offset: 8 -9;
}
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -711,16 +296,14 @@ group { name: "terminology/base";
}
}
}
- program {
- signal: "options,show"; source: "terminology";
+ program { signal: "options,show"; source: "terminology";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.4;
+ transition: DECELERATE 0.2;
target: "terminology.options";
}
- program {
- signal: "options,hide"; source: "terminology";
+ program { signal: "options,hide"; source: "terminology";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.6;
+ transition: DECELERATE 0.3;
target: "terminology.options";
}
@@ -739,6 +322,7 @@ group { name: "terminology/base";
relative: 1.0 0.5;
offset: 8 -9;
}
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -753,16 +337,14 @@ group { name: "terminology/base";
}
}
}
- program {
- signal: "controls,show"; source: "terminology";
+ program { signal: "controls,show"; source: "terminology";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.3;
+ transition: DECELERATE 0.2;
target: "terminology.controls";
}
- program {
- signal: "controls,hide"; source: "terminology";
+ program { signal: "controls,hide"; source: "terminology";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
+ transition: DECELERATE 0.3;
target: "terminology.controls";
}
}
diff --git a/data/themes/default/color_preview.edc b/data/themes/default/color_preview.edc
index 67f0be98..de1f14a3 100644
--- a/data/themes/default/color_preview.edc
+++ b/data/themes/default/color_preview.edc
@@ -1,29 +1,31 @@
group { name: "terminology/color_preview";
- images.image: "pm_overlay.png" COMP;
- images.image: "tiles.png" COMP;
+ images.image: "checks.png" COMP;
parts {
- part { name: "tiles";
- mouse_events: 0;
+ part { name: "base"; type: RECT;
+ description { state: "default" 0.0;
+ color_class: "/bg-dark/normal/background";
+ }
+ }
+ part { name: "checks"; mouse_events: 0;
description { state: "default" 0.0;
fixed: 1 1;
- image.normal: "tiles.png";
+ image.normal: "checks.png";
+ color_class: "/bg-dark-alt/normal/background";
fill.type: TILE;
}
}
part { name: "preview"; type: RECT;
- mouse_events: 1;
description { state: "default" 0.0;
color_class: "color_preview";
}
}
- part { name: "name"; type: TEXT;
- mouse_events: 0;
+ part { name: "name"; type: TEXT; mouse_events: 0;
effect: OUTLINE_SOFT_SHADOW;
scale: 1;
description { state: "default" 0.0;
color: 255 255 255 255;
- color2: 0 0 0 128;
- color3: 0 0 0 20;
+ color2: 0 0 0 64;
+ color3: 0 0 0 16;
align: 0.5 0.0;
text { font: "monospace"; size: 10;
align: 0.5 0.0;
@@ -31,27 +33,22 @@ group { name: "terminology/color_preview";
}
}
}
- part { name: "overlay";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "pm_overlay.png";
- fill.smooth: 0;
- }
- }
}
}
group { name: "terminology/colorscheme_preview";
parts {
- part { name: "bg"; type: RECT;
- mouse_events: 0;
+ part { name: "bg"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
color_class: "BG";
}
}
part { name: "terminology.content"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
+ rel1.offset: 1 1;
+ rel2.offset: -2 -2;
+ offscale;
}
}
}
diff --git a/data/themes/default/colors.edc b/data/themes/default/colors.edc
index c55e22c4..4edfb558 100644
--- a/data/themes/default/colors.edc
+++ b/data/themes/default/colors.edc
@@ -1,36 +1,21 @@
-color_class { name: "BG"; color: BG_COLOR ; }
-color_class { name: "FG"; color: FG_COLOR ; }
-#ifndef PROVIDE_CURSOR
-color_class { name: "CURSOR"; color: 51 153 255 255; }
-#endif
-color_class { name: "GLOW"; color: 51 153 255 255; }
+
color_class { name: "HIGHLIGHT"; color: 255 255 255 255; }
-color_class { name: "GLOW_TXT";
- color: 51 153 255 255;
- color2: 51 153 255 255;
- color3: 51 153 255 255;
-}
-color_class { name: "GLOW_TXT_HIGHLIGHT";
- color: 255 255 255 255;
- color2: 51 153 255 255;
- color3: 51 153 255 255;
-}
-color_class { name: "END_SELECTION"; color: 255 0 0 255; }
-color_class { name: "TAB_MISSED";
- color: 255 153 51 255;
- color2: 255 51 0 255;
- color3: 255 0 0 255;
-}
-color_class { name: "TAB_MISSED_OVER";
- color: 255 255 64 255;
- color2: 255 153 51 255;
- color3: 255 0 0 255;
-}
-color_class { name: "TAB_TITLE";
- color: FG_COLOR_NO_ALPHA 255;
- color2: 0 0 0 0;
- color3: BG_COLOR_NO_ALPHA 255;
-}
+color_class { name: "BG_SENDFILE"; color: 64 64 64 255; }
-color_class { name: "BG_SENDFILE"; color: 64 64 64 255; }
+color_class { name: "BG"; color: 32 32 32 255; }
+color_class { name: "FG"; color: 170 170 170 255; }
+color_class { name: "CURSOR"; color: 255 255 255 255; }
+color_class { name: "GLOW"; color: 51 153 255 255; }
+
+color_class { name: ":bg"; color: 64 64 64 255; }
+color_class { name: ":bg-dark"; color: 32 32 32 255; }
+color_class { name: ":dim-dark"; color: 0 0 0 200; }
+color_class { name: ":fg"; color: 160 160 160 255; }
+color_class { name: ":fg-light"; color: 255 255 255 255; }
+color_class { name: ":light-medium"; color: 255 255 255 128; }
+color_class { name: ":selected-medium"; color: 51 153 255 128; }
+color_class { name: ":selected"; color: 51 153 255 255; }
+color_class { name: ":selected-alt"; color: 255 153 51 255; }
+color_class { name: ":shadow"; color: 0 0 0 128; }
+color_class { name: ":shadow-selected"; color: 0 0 0 255; }
diff --git a/data/themes/default/core.edc b/data/themes/default/core.edc
index 5bec3d89..ab0d2e9a 100644
--- a/data/themes/default/core.edc
+++ b/data/themes/default/core.edc
@@ -78,13 +78,14 @@ group { name: "terminology/core";
////////////////////////////////////////////////////////////////////
// actual text grid for chars, cursors, selectiond etc. goes here
part { name: "terminology.content"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
rel1.offset: 1 0;
rel1.relative: 0.0 1.0;
rel1.to_y: "terminology.tabregion";
rel2.offset: -2 -2;
+ offscale;
}
}
-
}
}
diff --git a/data/themes/default/cursor.edc b/data/themes/default/cursor.edc
index af586f94..68506aa4 100644
--- a/data/themes/default/cursor.edc
+++ b/data/themes/default/cursor.edc
@@ -1,220 +1,385 @@
///////////////////////////////////////////////////////////////////////////
//// the cursor to show where text is typed
+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";
+ }
+}
+#define KEY_RESPONSE(_to) \
+ part { name: "k0"; type: RECT; \
+ scale: 1; \
+ description { state: "default" 0.0; \
+ color: 255 255 255 0; /* no cc */ \
+ color_class: "GLOW"; \
+ rel.to: _to; \
+ rel1.relative: 0.0 0.0; \
+ rel1.offset: 0 0; \
+ rel2.relative: 1.0 0.0; \
+ rel2.offset: -1 0; \
+ align: 0.0 0.0; \
+ min: 1 1; \
+ offscale; \
+ } \
+ description { state: "on" 0.0; \
+ inherit: "default" 0.0; \
+ color: 255 255 255 255; /* no cc */ \
+ } \
+ description { state: "out" 0.0; \
+ inherit: "default" 0.0; \
+ color: 255 255 255 0; /* no cc */ \
+ rel1.relative: -1.0 -0.5; \
+ rel2.relative: 2.0 -0.5; \
+ } \
+ } \
+ part { name: "k1"; type: RECT; \
+ scale: 1; \
+ description { state: "default" 0.0; \
+ color: 255 255 255 0; /* no ccc */ \
+ color_class: "GLOW"; \
+ rel.to: _to; \
+ rel1.relative: 0.0 1.0; \
+ rel1.offset: 0 0; \
+ rel2.relative: 1.0 1.0; \
+ rel2.offset: -1 0; \
+ align: 0.0 0.0; \
+ min: 1 1; \
+ offscale; \
+ } \
+ description { state: "on" 0.0; \
+ inherit: "default" 0.0; \
+ color: 255 255 255 255; /* no cc */ \
+ } \
+ description { state: "out" 0.0; \
+ inherit: "default" 0.0; \
+ color: 255 255 255 0; /* no cc */ \
+ rel1.relative: -1.0 1.5; \
+ rel2.relative: 2.0 1.5; \
+ } \
+ } \
+ program { signal: "key,down"; source: "terminology"; \
+ script { \
+ new buf[32]; \
+ snprintf(buf, 31, "key-down%i", (rand() % 5) + 1); \
+ run_program(get_program_id(buf)); \
+ } \
+ } \
+ program { name: "key-down1"; \
+ action: PLAY_SAMPLE "key-tap1" 1.0 INPUT; \
+ } \
+ program { name: "key-down2"; \
+ action: PLAY_SAMPLE "key-tap2" 1.0 INPUT; \
+ } \
+ program { name: "key-down3"; \
+ action: PLAY_SAMPLE "key-tap3" 1.0 INPUT; \
+ } \
+ program { name: "key-down4"; \
+ action: PLAY_SAMPLE "key-tap4" 1.0 INPUT; \
+ } \
+ program { name: "key-down5"; \
+ action: PLAY_SAMPLE "key-tap5" 1.0 INPUT; \
+ } \
+ program { signal: "key,down"; source: "terminology"; \
+ action: STATE_SET "default" 0.0; \
+ target: "k0"; \
+ target: "k1"; \
+ after: "key2"; \
+ } \
+ program { name: "key2"; \
+ action: STATE_SET "on" 0.0; \
+ target: "k0"; \
+ target: "k1"; \
+ after: "key3"; \
+ } \
+ program { name: "key3"; \
+ action: STATE_SET "out" 0.0; \
+ transition: DECELERATE 0.2; \
+ target: "k0"; \
+ target: "k1"; \
+ }
+
group { name: "terminology/cursor";
- images {
- image: "cr_key.png" COMP;
- image: "cr_out.png" COMP;
- image: "cr_pulse.png" COMP;
- image: "cr_glow.png" COMP;
- }
- 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";
- }
- }
+ images.image: "grad-v-1.png" COMP;
+ images.image: "grad-v-2.png" COMP;
parts {
- part { name: "key";
- mouse_events: 0;
+ // key "things" that fly out above/below
+ part { name: "base"; type: SPACER;
description { state: "default" 0.0;
- rel1 {
- to: "outline";
- offset: -5 -5;
- }
- rel2 {
- to: "outline";
- offset: 4 4;
- }
- image {
- normal: "cr_key.png";
- border: 4 4 4 4;
- }
- color: 255 255 255 0;
- color_class: "CURSOR";
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
- }
- description { state: "out" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- color_class: "CURSOR";
- rel1.offset: -7 -15;
- rel2.offset: 6 14;
}
}
- part { name: "pulse";
- mouse_events: 0;
+ KEY_RESPONSE("base")
+ // base colored rect block always there
+ part { name: "b0"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1 {
- to: "outline";
- offset: -4 -4;
- }
- rel2 {
- to: "outline";
- offset: 3 3;
- }
- image {
- normal: "cr_pulse.png";
- border: 4 4 4 4;
- }
- color: 255 255 255 0;
- color_class: "CURSOR";
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
- }
- description { state: "out" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- color_class: "CURSOR";
- rel1.offset: -8 -8;
- rel2.offset: 7 7;
+ color: 255 255 255 128; // no cc
+ color_class: "GLOW";
+ rel1.relative: 0.0 0.0;
+ rel1.offset: 0 0;
+ rel2.relative: 1.0 0.0;
+ rel2.offset: -1 0;
+ align: 0.0 0.0;
+ min: 1 1;
+ offscale;
}
}
- part { name: "glow";
- mouse_events: 0;
+ part { name: "b1"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 40;
- color_class: "CURSOR";
+ color: 255 255 255 128; // no cc
+ color_class: "GLOW";
+ rel1.relative: 0.0 1.0;
+ rel1.offset: 0 -1;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -1 -1;
+ align: 0.0 1.0;
+ min: 1 1;
+ offscale;
+ }
+ }
+ part { name: "b2"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 255 255 255 128; // no cc
+ color_class: "GLOW";
+ rel1.relative: 0.0 0.0;
+ rel1.offset: 0 1;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 0 -2;
+ align: 0.0 0.0;
+ min: 1 1;
+ offscale;
+ }
+ }
+ part { name: "b3"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 255 255 255 128; // no cc
+ color_class: "GLOW";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: -1 1;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -1 -2;
+ align: 1.0 0.0;
+ min: 1 1;
+ offscale;
+ }
+ }
+ // light layered top + bottom lines and 2 gradient lines on left + right
+ part { name: "r0"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 255 255 255 0; // no cc
+ color_class: "CURSOR";
+ visible: 0;
+ rel1.relative: 0.0 0.0;
+ rel1.offset: 0 0;
+ rel2.relative: 1.0 0.0;
+ rel2.offset: -1 0;
+ align: 0.0 0.0;
+ min: 1 1;
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
+ color: 255 255 255 255; // no cc
+ visible: 1;
}
}
- part { name: "outline";
- mouse_events: 0;
+ part { name: "r01";
+ scale: 1;
description { state: "default" 0.0;
- image {
- normal: "cr_out.png";
- border: 3 3 3 3;
- }
- color: 255 255 255 80;
- color_class: "CURSOR";
+ color: 255 255 255 0; // no cc
+ color_class: "CURSOR";
+ visible: 0;
+ rel1.relative: 0.0 0.0;
+ rel1.offset: 0 0;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 0 -1;
+ align: 0.0 0.0;
+ min: 1 0;
+ max: 1 0;
+ image.normal: "grad-v-1.png";
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
+ max: 1 0;
+ max: 1 99999;
+ color: 255 255 255 255; // no cc
+ visible: 1;
+ }
+ }
+ part { name: "r02";
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 255 255 255 0; // no cc
+ color_class: "CURSOR";
+ visible: 0;
+ rel1.relative: 1.0 0.0;
+ rel1.offset: -1 0;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -1 -1;
+ align: 1.0 0.0;
+ min: 1 0;
+ max: 1 0;
+ image.normal: "grad-v-1.png";
+ offscale;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ max: 1 99999;
+ color: 255 255 255 255; // no cc
+ visible: 1;
+ }
+ }
+ part { name: "r1"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 255 255 255 0; // no cc
+ color_class: "CURSOR";
+ visible: 0;
+ rel1.relative: 0.0 1.0;
+ rel1.offset: 0 -1;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -1 -1;
+ align: 0.0 1.0;
+ min: 1 1;
+ offscale;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255; // no cc
+ visible: 1;
+ }
+ }
+ part { name: "r11";
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 255 255 255 0; // no cc
+ color_class: "CURSOR";
+ visible: 0;
+ rel1.relative: 0.0 0.0;
+ rel1.offset: 0 0;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 0 -1;
+ align: 0.0 1.0;
+ min: 1 1;
+ max: 1 0;
+ image.normal: "grad-v-2.png";
+ offscale;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ max: 1 99999;
+ color: 255 255 255 255; // no cc
+ visible: 1;
+ }
+ }
+ part { name: "r12";
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 255 255 255 0; // no cc
+ color_class: "CURSOR";
+ visible: 0;
+ rel1.relative: 1.0 0.0;
+ rel1.offset: -1 0;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -1 -1;
+ align: 1.0 1.0;
+ min: 1 1;
+ max: 1 0;
+ image.normal: "grad-v-2.png";
+ offscale;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ max: 1 99999;
+ color: 255 255 255 255; // no cc
+ visible: 1;
}
}
programs {
- program {
- signal: "focus,in,noblink"; source: "terminology";
+ program { signal: "focus,in,noblink"; source: "terminology";
action: STATE_SET "focused" 0.0;
- target: "glow";
- target: "outline";
+ target: "r0";
+ target: "r01";
+ target: "r02";
+ target: "r1";
+ target: "r11";
+ target: "r12";
}
program { name: "focus_in";
signal: "focus,in"; source: "terminology";
action: STATE_SET "focused" 0.0;
- target: "glow";
- target: "outline";
+ transition: LINEAR 0.05 USE_DURATION_FACTOR 1;
+ target: "r0";
+ target: "r1";
after: "focus2";
- after: "pulse";
}
program { name: "focus2";
- in: 0.5 0.0;
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.2;
- target: "glow";
- target: "outline";
+ action: STATE_SET "focused" 0.0;
+ transition: LINEAR 0.1 USE_DURATION_FACTOR 1;
+ target: "r01";
+ target: "r02";
+ target: "r11";
+ target: "r12";
after: "focus3";
}
program { name: "focus3";
+ in: 0.5 0.0;
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.1 USE_DURATION_FACTOR 1;
+ target: "r01";
+ target: "r02";
+ target: "r11";
+ target: "r12";
+ after: "focus4";
+ }
+ program { name: "focus4";
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.05 USE_DURATION_FACTOR 1;
+ target: "r0";
+ target: "r1";
+ after: "focus5";
+ }
+ program { name: "focus5";
in: 0.5 0.0;
action: STATE_SET "focused" 0.0;
- target: "glow";
- target: "outline";
+ transition: LINEAR 0.1 USE_DURATION_FACTOR 1;
+ target: "r0";
+ target: "r1";
after: "focus2";
- after: "pulse";
}
- program { name: "pulse";
- action: STATE_SET "on" 0.0;
- target: "pulse";
- after: "pulse2";
- }
- program { name: "pulse2";
- action: STATE_SET "out" 0.0;
- transition: DECELERATE 0.4;
- target: "pulse";
- }
- program {
- signal: "focus,out"; source: "terminology";
+ program { signal: "focus,out"; source: "terminology";
action: ACTION_STOP;
target: "focus_in";
target: "focus2";
target: "focus3";
- target: "pulse";
- target: "pulse2";
+ target: "focus4";
+ target: "focus5";
after: "focus_out2";
}
program { name: "focus_out2";
action: STATE_SET "default" 0.0;
- target: "glow";
- target: "outline";
- }
- program {
- signal: "key,down"; source: "terminology";
- script {
- new buf[32];
- snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
- run_program(get_program_id(buf));
- }
- }
- program { name: "key-down1";
- action: PLAY_SAMPLE "key-tap1" 1.0 INPUT;
- }
- program { name: "key-down2";
- action: PLAY_SAMPLE "key-tap2" 1.0 INPUT;
- }
- program { name: "key-down3";
- action: PLAY_SAMPLE "key-tap3" 1.0 INPUT;
- }
- program { name: "key-down4";
- action: PLAY_SAMPLE "key-tap4" 1.0 INPUT;
- }
- program { name: "key-down5";
- action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
- }
- program {
- signal: "key,down"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "key";
- after: "key2";
- }
- program { name: "key2";
- action: STATE_SET "on" 0.0;
- target: "key";
- after: "key3";
- }
- program { name: "key3";
- action: STATE_SET "out" 0.0;
- transition: DECELERATE 0.3;
- target: "key";
+ transition: LINEAR 0.1 USE_DURATION_FACTOR 1;
+ target: "r0";
+ target: "r01";
+ target: "r02";
+ target: "r1";
+ target: "r11";
+ target: "r12";
}
}
}
@@ -223,219 +388,158 @@ group { name: "terminology/cursor";
///////////////////////////////////////////////////////////////////////////
//// the cursor as a bar to show where text is typed
group { name: "terminology/cursor_bar";
- images {
- image: "cr_key.png" COMP;
- image: "cr_bar_out.png" COMP;
- image: "cr_bar_pulse.png" COMP;
- image: "cr_bar_glow.png" COMP;
- }
- 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";
- }
- }
+ images.image: "grad-v-1.png" COMP;
+ images.image: "grad-v-2.png" COMP;
parts {
- part { name: "key";
- mouse_events: 0;
+ // key "things" that fly out above/below
+ part { name: "base"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
- rel1 {
- to: "outline";
- offset: -5 -5;
- }
- rel2 {
- to: "outline";
- offset: 4 4;
- }
- image {
- normal: "cr_key.png";
- border: 4 4 4 4;
- }
- color: 255 255 255 0;
- color_class: "CURSOR";
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- color: 51 153 255 255;
- }
- description { state: "out" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- color_class: "CURSOR";
- rel1.offset: -7 -15;
- rel2.offset: 6 14;
+ min: 3 0;
+ rel.to: "b0";
}
}
- part { name: "pulse";
- mouse_events: 0;
+ KEY_RESPONSE("base")
+
+ // base colored rect block always there
+ part { name: "b0"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1 {
- to: "outline";
- offset: -4 -4;
- }
- rel2 {
- to: "outline";
- offset: 3 3;
- }
- image {
- normal: "cr_bar_pulse.png";
- border: 4 4 4 4;
- }
- color: 255 255 255 0;
- color_class: "CURSOR";
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
- }
- description { state: "out" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- color_class: "CURSOR";
- rel1.offset: -8 -8;
- rel2.offset: 7 7;
+ color: 255 255 255 128; // no cc
+ color_class: "GLOW";
+ rel1.relative: 0.0 0.0;
+ rel1.offset: 0 0;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 0 -1;
+ align: 0.0 0.0;
+ min: 1 0;
+ offscale;
}
}
- part { name: "glow";
- mouse_events: 0;
+ // light layered top + bottom lines and 2 gradient lines on left + right
+ part { name: "r0"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_bar_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 40;
- color_class: "CURSOR";
+ color: 255 255 255 255; // no cc
+ color_class: "CURSOR";
+ rel1.relative: 0.0 0.5;
+ rel1.offset: 0 0;
+ rel2.relative: 0.0 0.5;
+ rel2.offset: 0 -1;
+ align: 0.0 0.5;
+ min: 1 0;
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 0.0 1.0;
}
}
- part { name: "outline";
- mouse_events: 0;
+ part { name: "r01";
+ scale: 1;
description { state: "default" 0.0;
- image {
- normal: "cr_bar_out.png";
- border: 3 3 3 3;
- }
- color: 255 255 255 80;
- color_class: "CURSOR";
+ color: 255 255 255 0; // no cc
+ color_class: "CURSOR";
+ visible: 0;
+ rel1.relative: 0.0 0.5;
+ rel1.offset: 0 0;
+ rel2.to: "r0";
+ rel2.relative: 0.0 0.5;
+ rel2.offset: 0 -1;
+ align: 0.0 1.0;
+ min: 1 0;
+ image.normal: "grad-v-2.png";
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
+ color: 255 255 255 255; // no cc
+ rel1.relative: 0.0 0.0;
+ visible: 1;
+ }
+ }
+ part { name: "r02";
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 255 255 255 0; // no cc
+ color_class: "CURSOR";
+ visible: 0;
+ rel1.to: "r0";
+ rel1.relative: 0.0 1.0;
+ rel1.offset: 0 0;
+ rel2.relative: 0.0 0.5;
+ rel2.offset: 0 -1;
+ align: 0.0 0.0;
+ min: 1 0;
+ image.normal: "grad-v-1.png";
+ offscale;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255; // no cc
+ rel2.relative: 0.0 1.0;
+ visible: 1;
}
}
programs {
- program {
- signal: "focus,in,noblink"; source: "terminology";
+ program { signal: "focus,in,noblink"; source: "terminology";
action: STATE_SET "focused" 0.0;
- target: "glow";
- target: "outline";
+ target: "r0";
+ target: "r01";
+ target: "r02";
}
program { name: "focus_in";
signal: "focus,in"; source: "terminology";
action: STATE_SET "focused" 0.0;
- target: "glow";
- target: "outline";
+ transition: LINEAR 0.05 USE_DURATION_FACTOR 1;
+ target: "r01";
+ target: "r02";
after: "focus2";
- after: "pulse";
}
program { name: "focus2";
- in: 0.5 0.0;
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.2;
- target: "glow";
- target: "outline";
+ action: STATE_SET "focused" 0.0;
+ transition: LINEAR 0.1 USE_DURATION_FACTOR 1;
+ target: "r0";
after: "focus3";
}
program { name: "focus3";
+ in: 0.5 0.0;
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.1 USE_DURATION_FACTOR 1;
+ target: "r0";
+ after: "focus4";
+ }
+ program { name: "focus4";
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.05 USE_DURATION_FACTOR 1;
+ target: "r01";
+ target: "r02";
+ after: "focus5";
+ }
+ program { name: "focus5";
in: 0.5 0.0;
action: STATE_SET "focused" 0.0;
- target: "glow";
- target: "outline";
+ transition: LINEAR 0.1 USE_DURATION_FACTOR 1;
+ target: "r01";
+ target: "r02";
after: "focus2";
- after: "pulse";
}
- program { name: "pulse";
- action: STATE_SET "on" 0.0;
- target: "pulse";
- after: "pulse2";
- }
- program { name: "pulse2";
- action: STATE_SET "out" 0.0;
- transition: DECELERATE 0.4;
- target: "pulse";
- }
- program {
- signal: "focus,out"; source: "terminology";
+ program { signal: "focus,out"; source: "terminology";
action: ACTION_STOP;
target: "focus_in";
target: "focus2";
target: "focus3";
- target: "pulse";
- target: "pulse2";
+ target: "focus4";
+ target: "focus5";
after: "focus_out2";
}
program { name: "focus_out2";
action: STATE_SET "default" 0.0;
- target: "glow";
- target: "outline";
- }
- program {
- signal: "key,down"; source: "terminology";
- script {
- new buf[32];
- snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
- run_program(get_program_id(buf));
- }
- }
- program { name: "key-down1";
- action: PLAY_SAMPLE "key-tap1" 1.0 INPUT;
- }
- program { name: "key-down2";
- action: PLAY_SAMPLE "key-tap2" 1.0 INPUT;
- }
- program { name: "key-down3";
- action: PLAY_SAMPLE "key-tap3" 1.0 INPUT;
- }
- program { name: "key-down4";
- action: PLAY_SAMPLE "key-tap4" 1.0 INPUT;
- }
- program { name: "key-down5";
- action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
- }
- program {
- signal: "key,down"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "key";
- after: "key2";
- }
- program { name: "key2";
- action: STATE_SET "on" 0.0;
- target: "key";
- after: "key3";
- }
- program { name: "key3";
- action: STATE_SET "out" 0.0;
- transition: DECELERATE 0.3;
- target: "key";
+ transition: LINEAR 0.1 USE_DURATION_FACTOR 1;
+ target: "r0";
+ target: "r01";
+ target: "r02";
}
}
}
@@ -444,220 +548,158 @@ group { name: "terminology/cursor_bar";
///////////////////////////////////////////////////////////////////////////
//// the cursor as an underline to show where text is typed
group { name: "terminology/cursor_underline";
- images {
- image: "cr_key.png" COMP;
- image: "cr_underline_out.png" COMP;
- image: "cr_underline_pulse.png" COMP;
- image: "cr_underline_glow.png" COMP;
- }
- 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";
- }
- }
+ images.image: "grad-h-1.png" COMP;
+ images.image: "grad-h-2.png" COMP;
parts {
- part { name: "key";
- mouse_events: 0;
+ // key "things" that fly out above/below
+ part { name: "base"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
- rel1 {
- to: "outline";
- offset: -5 -5;
- }
- rel2 {
- to: "outline";
- offset: 4 4;
- }
- image {
- normal: "cr_key.png";
- border: 4 4 4 4;
- }
- color: 255 255 255 0;
- color_class: "CURSOR";
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
- }
- description { state: "out" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- color_class: "CURSOR";
- rel1.offset: -7 -15;
- rel2.offset: 6 14;
+ min: 3 0;
+ rel.to: "b0";
}
}
- part { name: "pulse";
- mouse_events: 0;
+ KEY_RESPONSE("base")
+
+ // base colored rect block always there
+ part { name: "b0"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1 {
- to: "outline";
- offset: -4 -4;
- }
- rel2 {
- to: "outline";
- offset: 3 3;
- }
- image {
- normal: "cr_underline_pulse.png";
- border: 4 4 4 4;
- }
- color: 255 255 255 0;
- color_class: "CURSOR";
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
- }
- description { state: "out" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- color_class: "CURSOR";
- rel1.offset: -8 -8;
- rel2.offset: 7 7;
+ color: 255 255 255 128; // no cc
+ color_class: "GLOW";
+ rel1.relative: 0.0 1.0;
+ rel1.offset: 0 -1;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -1 -1;
+ align: 0.0 0.0;
+ min: 0 1;
+ offscale;
}
}
- part { name: "glow";
- mouse_events: 0;
+ // light layered top + bottom lines and 2 gradient lines on left + right
+ part { name: "r0"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_underline_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 40;
- color_class: "CURSOR";
+ color: 255 255 255 255; // no cc
+ color_class: "CURSOR";
+ rel1.relative: 0.5 1.0;
+ rel1.offset: 0 -1;
+ rel2.relative: 0.5 1.0;
+ rel2.offset: -1 -1;
+ align: 0.5 1.0;
+ min: 0 1;
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
+ rel1.relative: 0.0 1.0;
+ rel2.relative: 1.0 1.0;
}
}
- part { name: "outline";
- mouse_events: 0;
+ part { name: "r01";
+ scale: 1;
description { state: "default" 0.0;
- image {
- normal: "cr_underline_out.png";
- border: 3 3 3 3;
- }
- color: 255 255 255 80;
- color_class: "CURSOR";
+ color: 255 255 255 0; // no cc
+ color_class: "CURSOR";
+ visible: 0;
+ rel1.relative: 0.5 1.0;
+ rel1.offset: 0 -1;
+ rel2.to: "r0";
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 0 -1;
+ align: 0.0 1.0;
+ min: 0 1;
+ image.normal: "grad-h-2.png";
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
+ color: 255 255 255 255; // no cc
+ rel1.relative: 0.0 1.0;
+ visible: 1;
+ }
+ }
+ part { name: "r02";
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 255 255 255 0; // no cc
+ color_class: "CURSOR";
+ visible: 0;
+ rel1.to: "r0";
+ rel1.relative: 1.0 1.0;
+ rel1.offset: 0 -1;
+ rel2.relative: 0.5 1.0;
+ rel2.offset: -1 -1;
+ align: 0.0 0.0;
+ min: 1 0;
+ image.normal: "grad-h-1.png";
+ offscale;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255; // no cc
+ rel2.relative: 1.0 1.0;
+ visible: 1;
}
}
programs {
- program {
- signal: "focus,in,noblink"; source: "terminology";
+ program { signal: "focus,in,noblink"; source: "terminology";
action: STATE_SET "focused" 0.0;
- target: "glow";
- target: "outline";
+ target: "r0";
+ target: "r01";
+ target: "r02";
}
program { name: "focus_in";
signal: "focus,in"; source: "terminology";
action: STATE_SET "focused" 0.0;
- target: "glow";
- target: "outline";
+ transition: LINEAR 0.05 USE_DURATION_FACTOR 1;
+ target: "r01";
+ target: "r02";
after: "focus2";
- after: "pulse";
}
program { name: "focus2";
- in: 0.5 0.0;
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.2;
- target: "glow";
- target: "outline";
+ action: STATE_SET "focused" 0.0;
+ transition: LINEAR 0.1 USE_DURATION_FACTOR 1;
+ target: "r0";
after: "focus3";
}
program { name: "focus3";
+ in: 0.5 0.0;
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.1 USE_DURATION_FACTOR 1;
+ target: "r0";
+ after: "focus4";
+ }
+ program { name: "focus4";
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.05 USE_DURATION_FACTOR 1;
+ target: "r01";
+ target: "r02";
+ after: "focus5";
+ }
+ program { name: "focus5";
in: 0.5 0.0;
action: STATE_SET "focused" 0.0;
- target: "glow";
- target: "outline";
+ transition: LINEAR 0.1 USE_DURATION_FACTOR 1;
+ target: "r01";
+ target: "r02";
after: "focus2";
- after: "pulse";
}
- program { name: "pulse";
- action: STATE_SET "on" 0.0;
- target: "pulse";
- after: "pulse2";
- }
- program { name: "pulse2";
- action: STATE_SET "out" 0.0;
- transition: DECELERATE 0.4;
- target: "pulse";
- }
- program {
- signal: "focus,out"; source: "terminology";
+ program { signal: "focus,out"; source: "terminology";
action: ACTION_STOP;
target: "focus_in";
target: "focus2";
target: "focus3";
- target: "pulse";
- target: "pulse2";
+ target: "focus4";
+ target: "focus5";
after: "focus_out2";
}
program { name: "focus_out2";
action: STATE_SET "default" 0.0;
- target: "glow";
- target: "outline";
- }
- program {
- signal: "key,down"; source: "terminology";
- script {
- new buf[32];
- snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
- run_program(get_program_id(buf));
- }
- }
- program { name: "key-down1";
- action: PLAY_SAMPLE "key-tap1" 1.0 INPUT;
- }
- program { name: "key-down2";
- action: PLAY_SAMPLE "key-tap2" 1.0 INPUT;
- }
- program { name: "key-down3";
- action: PLAY_SAMPLE "key-tap3" 1.0 INPUT;
- }
- program { name: "key-down4";
- action: PLAY_SAMPLE "key-tap4" 1.0 INPUT;
- }
- program { name: "key-down5";
- action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
- }
- program {
- signal: "key,down"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "key";
- after: "key2";
- }
- program { name: "key2";
- action: STATE_SET "on" 0.0;
- target: "key";
- after: "key3";
- }
- program { name: "key3";
- action: STATE_SET "out" 0.0;
- transition: DECELERATE 0.3;
- target: "key";
+ transition: LINEAR 0.1 USE_DURATION_FACTOR 1;
+ target: "r0";
+ target: "r01";
+ target: "r02";
}
}
}
diff --git a/data/themes/default/fontpreview.edc b/data/themes/default/fontpreview.edc
index 70ed4a34..13ab21be 100644
--- a/data/themes/default/fontpreview.edc
+++ b/data/themes/default/fontpreview.edc
@@ -2,54 +2,34 @@
//// used in the font selection dialog to give a base for black text
//// previews so they are always visible
group { name: "terminology/fontpreview";
- images {
- image: "fn_shadow.png" COMP;
- }
parts {
- part { name: "shadow";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1 {
- offset: -2 -1;
- to: "base";
- }
- rel2 {
- offset: 1 2;
- to: "base";
- }
- image {
- normal: "fn_shadow.png";
- border: 5 5 5 5;
- }
- fill.smooth: 0;
- }
- }
part { name: "base"; type: RECT;
- mouse_events: 1;
+ scale: 1;
description { state: "default" 0.0;
- color_class: "BG";
- rel1.offset: 2 2;
- rel2.offset: -3 -3;
+ color_class: "/bg/normal/term/font_preview";
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
}
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- color: 255 255 255 255;
+ rel.to: "base";
}
}
part { name: "terminology.text.preview"; type: SWALLOW;
clip_to: "clip";
+ scale: 1;
description { state: "default" 0.0;
rel1 {
to: "base";
- offset: 1 1;
+ offset: 4 4;
}
rel2 {
to: "base";
- offset: -2 -2;
+ offset: -5 -5;
}
+ offscale;
}
}
}
diff --git a/data/themes/default/icon.edc b/data/themes/default/icon.edc
index 29df53d6..32d76fe0 100644
--- a/data/themes/default/icon.edc
+++ b/data/themes/default/icon.edc
@@ -4,13 +4,13 @@
parts { part { name: "base"; description { state: "default" 0.0; \
aspect: 1.0 1.0; aspect_preference: BOTH; image.normal: Img; \
} } } }
- ICON("new", "icon_new.png");
- ICON("split-h", "icon_split_h.png");
- ICON("split-v", "icon_split_v.png");
- ICON("mini-view", "icon_miniview.png");
- ICON("close", "icon_close.png");
- ICON("copy", "icon_copy.png");
- ICON("paste", "icon_paste.png");
- ICON("settings", "icon_settings.png");
- ICON("about", "icon_about.png");
+ ICON("new", "icon_new.png");
+ ICON("split-h", "icon-split-h-060.png");
+ ICON("split-v", "icon-split-v-060.png");
+ ICON("mini-view", "icon_miniview.png");
+ ICON("close", "icon_close.png");
+ ICON("copy", "icon_copy.png");
+ ICON("paste", "icon_paste.png");
+ ICON("settings", "icon_settings.png");
+ ICON("about", "icon_about.png");
#undef ICON
diff --git a/data/themes/default/keybinding.edc b/data/themes/default/keybinding.edc
index 37235854..46931144 100644
--- a/data/themes/default/keybinding.edc
+++ b/data/themes/default/keybinding.edc
@@ -1,27 +1,20 @@
group { name: "terminology/keybinding";
parts {
part { name: "shadow"; type: RECT;
- mouse_events: 1;
description { state: "default" 0.0;
- color: 0 0 0 196;
+ color_class: "/bg/normal/term/keybinding";
}
}
- part { name: "label"; type: TEXT;
- mouse_events: 0;
- effect: SOFT_SHADOW BOTTOM;
+ part { name: "label"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "shadow";
- rel2.to: "shadow";
- rel1.relative: 0.5 0.5;
- rel1.offset: 0 0;
- rel2.relative: 0.5 0.5;
- rel2.offset: 0 0;
- color: 255 255 255 255;
- color3: 0 0 0 18;
- align: 0.5 0.5;
- text { font: "Sans"; size: 12;
+ rel.to: "shadow";
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
+ color_class: "/fg/normal/term/keybinding";
+ text { font: "Sans"; size: 10;
min: 1 1;
ellipsis: 0;
}
diff --git a/data/themes/default/link.edc b/data/themes/default/link.edc
index fe9fd051..04c01b74 100644
--- a/data/themes/default/link.edc
+++ b/data/themes/default/link.edc
@@ -1,122 +1,54 @@
///////////////////////////////////////////////////////////////////////////
//// an object overlayd on text that is a link
group { name: "terminology/link";
- images {
- image: "lk_bottom.png" COMP;
- image: "lk_left.png" COMP;
- image: "lk_right.png" COMP;
- }
parts {
- part { name: "bottom";
+ part { name: "bottom"; type: RECT;
mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- image.normal: "lk_bottom.png";
- image.border: 9 9 0 0;
align: 0.5 1.0;
- min: 20 8;
- rel1.offset: -6 0;
+ min: 20 1;
+ rel1.offset: -1 -1;
rel1.relative: 0.0 1.0;
- rel2.offset: 5 0;
- color: 255 255 255 255;
- color_class: "GLOW";
- fill.smooth: 0;
- }
- }
- part { name: "l";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "lk_left.png";
- align: 0.0 1.0;
- min: 4 4;
- rel1.offset: 16 -1;
- rel1.relative: 0.0 1.0;
- rel2.offset: 16 -1;
- rel2.relative: 0.0 1.0;
- color: 255 255 255 0;
- color_class: "GLOW";
+ rel2.offset: 0 -1;
+ color: 51 153 255 255;
+ offscale;
}
description { state: "out" 0.0;
- fixed: 1 1;
inherit: "default" 0.0;
- min: 16 16;
- rel1.offset: -10 -1;
- rel2.offset: -10 -1;
- color: 255 255 255 255;
- color_class: "GLOW";
+ rel1.offset: -5 -1;
+ rel2.offset: 4 -1;
}
description { state: "out2" 0.0;
- fixed: 1 1;
inherit: "default" 0.0;
- min: 32 32;
- rel1.offset: -26 -1;
- rel2.offset: -26 -1;
- color: 255 255 255 0;
- color_class: "GLOW";
- }
- }
- part { name: "r";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "lk_right.png";
- align: 1.0 1.0;
- min: 4 4;
- rel1.offset: -15 0;
- rel1.relative: 1.0 1.0;
- rel2.offset: -15 0;
- rel2.relative: 1.0 1.0;
- color: 255 255 255 0;
- color_class: "GLOW";
- }
- description { state: "out" 0.0;
- fixed: 1 1;
- inherit: "default" 0.0;
- min: 16 16;
- rel1.offset: 9 -1;
- rel2.offset: 9 -1;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- description { state: "out2" 0.0;
- fixed: 1 1;
- inherit: "default" 0.0;
- min: 32 32;
- rel1.offset: 25 -1;
- rel2.offset: 25 -1;
- color: 255 255 255 0;
- color_class: "GLOW";
}
}
part { name: "event"; type: RECT;
- mouse_events: 1;
repeat_events: 1;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
programs {
program { name: "show";
signal: "show"; source: "";
action: STATE_SET "out" 0.0;
- transition: LINEAR 0.3;
- target: "l";
- target: "r";
+ transition: SINUSOIDAL 0.5;
+ target: "bottom";
after: "show2";
}
program { name: "show2";
action: STATE_SET "out2" 0.0;
- transition: LINEAR 0.3;
- target: "l";
- target: "r";
+ transition: SINUSOIDAL 0.2;
+ target: "bottom";
after: "show3";
}
program { name: "show3";
- action: STATE_SET "default" 0.0;
- target: "l";
- target: "r";
- after: "show";
+ action: STATE_SET "out" 0.0;
+ transition: SINUSOIDAL 0.2;
+ target: "bottom";
+ after: "show2";
}
}
}
diff --git a/data/themes/default/media.edc b/data/themes/default/media.edc
index 43755e19..d7817b7b 100644
--- a/data/themes/default/media.edc
+++ b/data/themes/default/media.edc
@@ -1,11 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//// the multimedia controls
group { name: "terminology/mediabusy";
- images {
- image: "media_busy_knob.png" COMP;
- image: "media_busy_spinner.png" COMP;
- image: "media_busy_progress.png" COMP;
- }
script {
public message(Msg_Type:type, id, ...) {
if ((type == MSG_FLOAT) && (id == 1)) {
@@ -23,103 +18,56 @@ group { name: "terminology/mediabusy";
mouse_events: 0;
description { state: "default" 0.0;
fixed: 1 1;
- rel2.to_x: "knob";
- rel2.relative: 0.0 1.0;
- min: 10 40;
- max: 99999 40;
+ min: 0 5;
+ max: 99999 5;
align: 0.0 1.0;
}
}
- part { name: "progress";
- mouse_events: 0;
+ part { name: "progress"; type: RECT; mouse_events: 0;
clip_to: "fade";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "progress_area";
- rel2.to: "progress_area";
+ rel.to: "progress_area";
rel2.relative: 0.0 1.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- image.normal: "media_busy_progress.png";
- image.border: 5 5 0 0;
- min: 10 40;
+ color_class: "/bg/selected/media/position";
+ min: 0 5;
align: 0.0 1.0;
}
}
part { name: "fade"; type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
+ color: 255 255 255 255; // no cc
}
}
- part { name: "knob";
- clip_to: "fade";
- mouse_events: 0;
+ part { name: "busy_base"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- image.normal: "media_busy_knob.png";
- min: 40 40;
- max: 40 40;
+ min: 40 40; max: 40 40;
align: 1.0 1.0;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
}
- part { name: "knob_spinner";
- clip_to: "fade";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- color: 51 153 255 255;
- rel1.to: "knob";
- rel2.to: "knob";
- image.normal: "media_busy_spinner.png";
- map {
- on: 1;
- smooth: 1;
- rotation.center: "knob";
- }
- }
- description { state: "spin" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- map.rotation.z: 360;
- }
- }
+ BUSY("busy_base", "busy", "terminology", "done", "terminology")
}
programs {
- program {
- signal: "busy"; source: "terminology";
+ program { signal: "busy"; source: "terminology";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.5;
+ transition: DECELERATE 0.2 USE_DURATION_FACTOR 1 CURRENT;
target: "fade";
}
- program { name: "spin1";
- signal: "busy"; source: "terminology";
- action: STATE_SET "spin" 0.0;
- transition: LINEAR 0.5;
- target: "knob_spinner";
- after: "spin2";
- }
- program { name: "spin2";
+ program { signal: "done"; source: "terminology";
action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- after: "spin1";
- }
- // program { name: "downloading";
- // signal: "busy";
- // source: "terminology";
- // action: STATE_SET "default" 0.0;
- // }
- program {
- signal: "done"; source: "terminology";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 1.5;
+ transition: DECELERATE 1.5 USE_DURATION_FACTOR 1 CURRENT;
target: "fade";
}
}
@@ -140,8 +88,7 @@ group { name: "terminology/mediactrl";
part { name: "media_clip"; type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "media_bg";
- rel2.to: "media_bg";
+ rel.to: "media_bg";
}
}
part { name: "media_bg";
@@ -151,7 +98,7 @@ group { name: "terminology/mediactrl";
image.border: 11 11 11 11;
min: 24 24;
max: 24 24;
- align: 1.0 0.0;
+ align: 1.0 1.0;
}
description { state: "expanded" 0.0;
inherit: "default" 0.0;
@@ -164,6 +111,7 @@ group { name: "terminology/mediactrl";
repeat_events: 1;
clip_to: "media_clip";
description { state: "default" 0.0;
+ rel.to: "media_bg";
image.normal: "media_pause.png";
max: 24 24;
align: 1.0 0.0;
@@ -195,8 +143,7 @@ group { name: "terminology/mediactrl";
image.border: 15 15 0 0;
min: 90 14;
max: 90 14;
- rel1.to: "stop";
- rel2.to: "stop";
+ rel.to: "stop";
rel1.offset: -25 0;
rel2.offset: -90 0;
}
@@ -259,54 +206,46 @@ group { name: "terminology/mediactrl";
}
}
programs {
- program {
- signal: "mouse,in"; source: "media_bg";
+ program { signal: "pause,set"; source: "terminology";
+ action: STATE_SET "paused" 0.0;
+ target: "play";
+ }
+ program { signal: "play,set"; source: "terminology";
+ action: STATE_SET "default" 0.0;
+ target: "play";
+ }
+ program { signal: "mute,set"; source: "terminology";
+ action: STATE_SET "muted" 0.0;
+ target: "terminology.voldrag";
+ }
+ program { signal: "mute,unset"; source: "terminology";
+ action: STATE_SET "default" 0.0;
+ target: "terminology.voldrag";
+ }
+
+ program { signal: "mouse,in"; source: "media_bg";
action: STATE_SET "expanded" 0.0;
transition: SINUSOIDAL 0.4 CURRENT;
target: "media_bg";
}
- program {
- signal: "mouse,out"; source: "media_bg";
+ program { signal: "mouse,out"; source: "media_bg";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.4 CURRENT;
target: "media_bg";
}
- program {
- signal: "mouse,up,*"; source: "play";
+ program { signal: "mouse,up,*"; source: "play";
filter: "play" "default";
action: SIGNAL_EMIT "pause" "";
}
- program {
- signal: "mouse,up,1"; source: "play";
+ program { signal: "mouse,up,1"; source: "play";
filter: "play" "paused";
action: SIGNAL_EMIT "play" "";
}
- program {
- signal: "mouse,up,1"; source: "stop";
+ program { signal: "mouse,up,1"; source: "stop";
action: SIGNAL_EMIT "stop" "";
}
- program {
- signal: "pause,set"; source: "terminology";
- action: STATE_SET "paused" 0.0;
- target: "play";
- }
- program {
- signal: "play,set"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "play";
- }
- program {
- signal: "mute,set"; source: "terminology";
- action: STATE_SET "muted" 0.0;
- target: "terminology.voldrag";
- }
- program {
- signal: "mute,unset"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "terminology.voldrag";
- }
- program {
- signal: "mouse,down,1"; source: "posline";
+
+ program { signal: "mouse,down,1"; source: "posline";
filter: "terminology.posdrag" "default";
script {
new x, y, w, h, m_x, m_y;
@@ -321,12 +260,10 @@ group { name: "terminology/mediactrl";
}
}
- program {
- signal: "mouse,up,1"; source: "posline";
+ program { signal: "mouse,up,1"; source: "posline";
action: SIGNAL_EMIT "pos,drag,stop" "";
}
- program {
- signal: "mouse,move"; source: "posline";
+ program { signal: "mouse,move"; source: "posline";
script {
new x, y, w, h, m_x, m_y;
new Float:pos;
@@ -341,8 +278,7 @@ group { name: "terminology/mediactrl";
emit("pos,drag", "");
}
}
- program {
- signal: "mouse,down,1"; source: "volline";
+ program { signal: "mouse,down,1"; source: "volline";
filter: "terminology.voldrag" "default";
script {
new x, y, w, h, m_x, m_y;
@@ -357,8 +293,7 @@ group { name: "terminology/mediactrl";
}
}
- program {
- signal: "mouse,move"; source: "volline";
+ program { signal: "mouse,move"; source: "volline";
script {
new x, y, w, h, m_x, m_y;
new Float:pos;
diff --git a/data/themes/default/miniview.edc b/data/themes/default/miniview.edc
index 601fc9fa..ce87f859 100644
--- a/data/themes/default/miniview.edc
+++ b/data/themes/default/miniview.edc
@@ -1,97 +1,83 @@
group { name: "terminology/miniview";
- images {
- image: "icon_close.png" COMP;
- image: "fn_shadow.png" COMP;
- }
- set { name: "bg_shadow";
- image { image: "bg_shadow.png" COMP; size: 0 0 200 150; }
- image { image: "bg_shadow2.png" COMP; size: 200 150 400 300; }
- image { image: "bg_shadow3.png" COMP; size: 400 300 99999 99999; }
- }
parts {
- part { name: "miniview.bg"; type: RECT;
- //mouse_events: 1;
+ part { name: "miniview_bg"; type: RECT;
description { state: "default" 0.0;
color_class: "BG";
}
}
- part { name: "shadow";
- mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bg_shadow";
- fill.smooth: 0;
- }
- }
part { name: "miniview.img"; type: SWALLOW;
description { state: "default" 0.0;
- visible: 1;
rel1 {
- to: "miniview.bg";
+ to: "miniview_bg";
relative: 0.0 0.0;
offset: 0 0;
}
rel2 {
- to: "miniview.bg";
+ to: "miniview_bg";
relative: 1.0 1.0;
offset: -1 -1;
}
}
}
part { name: "miniview_screen"; type: RECT;
- mouse_events: 1;
dragable {
confine: "miniview.img";
x: 0 0 0;
y: 1 1 0;
}
description { state: "default" 0.0;
- color: 255 255 255 40;
- fixed:1 1;
+ rel.to: "miniview.img";
+ color_class: "/fg/selected/term/miniview/screen";
+ color: 255 255 255 40; // no cc
+ fixed: 1 1;
}
description { state: "outbounds" 0.0;
- color: 255 25 35 40;
- fixed:1 1;
+ inherit : "default" 0.0;
+ color_class: "/fg/disabled/term/miniview/screen";
}
}
- part { name: "miniview.close_shadow"; type: IMAGE;
+ part { name: "miniview_close";
+ scale: 1;
description { state: "default" 0.0;
- image {
- normal: "fn_shadow.png";
- };
- rel1 {
- to: "miniview.bg";
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- to: "miniview.bg";
- relative: 0.0 0.0;
- offset: 16 16;
- }
+ image.normal: "tab_close";
+ rel.to: "miniview_ev";
+ color_class: "/fg/normal/term/miniview/close";
+ min: 15 15;
+ max: 15 15;
+ }
+ description { state: "pressed" 0.0;
+ inherit: "default" 0.0;
+ color_class: "/fg/pressed/term/miniview/close";
}
}
- part { name: "miniview.close"; type: IMAGE;
+ part { name: "miniview_ev"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- image {
- normal: "icon_close.png";
- };
- rel1.to: "miniview.close_shadow";
- rel2.to: "miniview.close_shadow";
+ color: 0 0 0 0; // no cc
+ rel.to: "miniview_bg";
+ min: 25 25;
+ max: 25 25;
+ align: 1.0 0.0;
}
}
};
programs {
- program {
- signal: "mouse,clicked,1"; source: "miniview.close";
+ program { signal: "mouse,down,1"; source: "miniview_ev";
+ action: STATE_SET "pressed" 0.0;
+ target: "miniview_close";
+ }
+ program { signal: "mouse,up,1"; source: "miniview_ev";
+ action: STATE_SET "default" 0.0;
+ target: "miniview_close";
+ }
+ program { signal: "mouse,clicked,1"; source: "miniview_ev";
action: SIGNAL_EMIT "miniview,close" "terminology";
}
- program {
- signal: "miniview_screen,inbounds"; source: "miniview";
+ program { signal: "miniview_screen,inbounds"; source: "miniview";
action: STATE_SET "default" 0.0;
target: "miniview_screen";
}
- program {
- signal: "miniview_screen,outbounds"; source: "miniview";
+ program { signal: "miniview_screen,outbounds"; source: "miniview";
action: STATE_SET "outbounds" 0.0;
target: "miniview_screen";
}
diff --git a/data/themes/default/sel.edc b/data/themes/default/sel.edc
index 84d1d63d..b4908519 100644
--- a/data/themes/default/sel.edc
+++ b/data/themes/default/sel.edc
@@ -2,53 +2,33 @@
//// an object to contain the selection tool used for selecting tabs (with
//// a glow grid of terms
group { name: "terminology/sel/base";
- images {
- image: "pm_overlay.png" COMP;
- image: "pm_fill.png" COMP;
- image: "inset_shadow.png" COMP;
- }
- set { name: "bg_shadow";
- image { image: "bg_shadow.png" COMP; size: 0 0 200 150; }
- image { image: "bg_shadow2.png" COMP; size: 200 150 400 300; }
- image { image: "bg_shadow3.png" COMP; size: 400 300 99999 99999; }
- }
script {
public message(Msg_Type:type, id, ...) {
- new r, g, b, a, v;
+// new r, g, b, a;
+ new v;
if ((type != MSG_INT) || (id != 1)) return;
v = (getarg(2) * 255) / 100;
- custom_state(PART:"shadow", "default", 0.0);
- get_state_val(PART:"shadow", STATE_COLOR, r, g, b, a);
- set_state_val(PART:"shadow", STATE_COLOR, r, g, b, v);
- set_state(PART:"shadow", "custom", 0.0);
+// custom_state(PART:"shadow", "default", 0.0);
+// get_state_val(PART:"shadow", STATE_COLOR, r, g, b, a);
+// set_state_val(PART:"shadow", STATE_COLOR, r, g, b, v);
+// set_state(PART:"shadow", "custom", 0.0);
if (v < 255)
- set_state(PART:"fill", "translucent", 0.0);
+ set_state(PART:"fill", "translucent", 0.0);
else
- set_state(PART:"fill", "default", 0.0);
+ set_state(PART:"fill", "default", 0.0);
}
}
parts {
- ////////////////////////////////////////////////////////////////////
- // background and shadows
- part { name: "shadow";
+ ////////////////////////////////////////////////////////////////////
+ // background and shadows
+ part { name: "fill"; type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "bg_shadow";
- fill.smooth: 0;
- }
- }
- part { name: "fill";
- mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "pm_fill.png";
- fill {
- size.relative: 0.0 0.0;
- size.offset: 64 64;
- }
+ color: 32 32 32 255;
}
description { state: "translucent" 0.0;
inherit: "default" 0.0;
@@ -70,120 +50,57 @@ group { name: "terminology/sel/base";
////////////////////////////////////////////////////////////////////
// fancy stuff on top
- part { name: "overlay";
- mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "pm_overlay.png";
- color: 255 255 255 0;
- fill.smooth: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "overlay_shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- fill.smooth: 0;
- color: 255 255 255 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- program {
- signal: "begin"; source: "terminology";
- action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.3;
- target: "overlay";
- target: "overlay_shadow";
- }
- program {
- signal: "end"; source: "terminology";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.3 CURRENT;
- target: "overlay";
- target: "overlay_shadow";
- }
+// program { signal: "begin"; source: "terminology";
+// action: STATE_SET "visible" 0.0;
+// transition: DECELERATE 0.3;
+// target: "overlay";
+// }
+// program { signal: "end"; source: "terminology";
+// action: STATE_SET "default" 0.0;
+// transition: DECELERATE 0.3 CURRENT;
+// target: "overlay";
+// target: "overlay_shadow";
+// }
}
}
group { name: "terminology/sel/item";
- images {
- image: "bg_bevel.png" COMP;
- image: "bg_glint.png" COMP;
- image: "pm_shadow.png" COMP;
- image: "cr_glow.png" COMP;
- image: "bg_led_glow.png" COMP;
- image: "bg_led_base.png" COMP;
- image: "bg_led.png" COMP;
- image: "bg_led_strobe.png" COMP;
- }
- set { name: "bg_shine";
- image { image: "bg_shine5.png" COMP; size: 0 0 256 120; }
- image { image: "bg_shine4.png" COMP; size: 256 120 512 240; }
- image { image: "bg_shine3.png" COMP; size: 512 240 1024 480; }
- image { image: "bg_shine2.png" COMP; size: 1024 480 2048 960; }
- image { image: "bg_shine.png" COMP; size: 2048 960 99999 99999; }
- }
+ images.image: "pm_shadow.png" COMP;
parts {
- ////////////////////////////////////////////////////////////////////
- // base background and selection image
+ ////////////////////////////////////////////////////////////////////
+ // base background and selection image
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- color: 128 128 128 255;
+ rel.to: "terminology.content";
+ color: 192 192 192 255; // no cc
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
}
part { name: "shadow";
mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- rel1.offset: -5 -5;
- rel2.offset: 4 4;
+ rel.to: "terminology.content";
+ rel1.offset: -32 -32;
+ rel2.offset: 31 31;
image.normal: "pm_shadow.png";
image.border: 64 64 64 64;
- image.border_scale_by: 0.1;
- color: 255 255 255 128;
+ image.border_scale_by: 0.5;
+ image.border_scale: 1;
+ color_class: "/shadow/normal/term/sel/item";
fill.smooth: 0;
+ offscale;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- rel1.offset: -40 -40;
- rel2.offset: 39 39;
+ rel1.offset: -64 -64;
+ rel2.offset: 63 63;
image.border_scale_by: 1.0;
- color: 255 255 255 255;
- }
- }
- part { name: "glow";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 0;
- color_class: "GLOW";
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
+ color_class: "/shadow/selected/term/sel/item";
}
}
@@ -193,8 +110,7 @@ group { name: "terminology/sel/item";
clip_to: "clip";
description { state: "default" 0.0;
color_class: "BG";
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
+ rel.to: "terminology.content";
}
}
part { name: "terminology.content"; type: SWALLOW;
@@ -209,257 +125,160 @@ group { name: "terminology/sel/item";
rel2.relative: 1.0 1.0;
}
}
- program {
- signal: "selected"; source: "terminology";
+ program { signal: "selected"; source: "terminology";
action: STATE_SET "selected" 0.0;
transition: DECELERATE 0.2 CURRENT;
target: "terminology.content";
target: "terminology.label";
target: "shadow";
target: "clip";
- target: "glow";
}
- program {
- signal: "selected,start"; source: "terminology";
+ program { signal: "selected,start"; source: "terminology";
action: STATE_SET "selected" 0.0;
target: "terminology.content";
target: "terminology.label";
target: "shadow";
target: "clip";
- target: "glow";
}
- program {
- signal: "unselected"; source: "terminology";
+ program { signal: "unselected"; source: "terminology";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.4 CURRENT;
target: "terminology.content";
target: "terminology.label";
target: "shadow";
target: "clip";
- target: "glow";
}
////////////////////////////////////////////////////////////////////
// fancy stuff over the top of the terminal for shading and labelling
- part { name: "overlay";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- image.normal: "pm_overlay.png";
- fill.smooth: 0;
- }
- }
- part { name: "bevel";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- image.normal: "bg_bevel.png";
- image.border: 3 3 3 3;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
part { name: "terminology.label"; type: TEXT; mouse_events: 0;
- effect: GLOW;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- color: 255 255 255 255;
- color2: 255 255 255 24;
- color3: 255 255 255 18;
- color_class: "GLOW_TXT";
- align: 0.5 1.0;
+ rel.to: "terminology.content";
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
+ color_class: "/fg/normal/term/sel/title/text";
+ align: 0.5 0.0;
text { font: "Sans"; size: 10;
- align: 0.5 1.0;
+ align: 0.5 0.0;
min: 0 1;
}
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color2: 255 255 255 128;
- color3: 255 255 255 20;
- color_class: "GLOW_TXT_HIGHLIGHT";
- }
- }
- part { name: "clip2"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- }
- }
-
- ////////////////////////////////////////////////////////////////////
- // fancy stuff on top
- part { name: "glint";
- mouse_events: 0;
- clip_to: "clip2";
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 79 5;
- max: 79 5;
- rel1 {
- to: "terminology.content";
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- to: "terminology.content";
- relative: 1.0 0.0;
- offset: -1 0;
- }
- image.normal: "bg_glint.png";
- }
- }
- part { name: "shine";
- mouse_events: 0;
- clip_to: "clip2";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- image.normal: "bg_shine";
- fill.smooth: 0;
- align: 0.5 0.0;
- aspect: (256/120) (256/120);
- aspect_preference: HORIZONTAL;
+ color_class: "/fg/selected/term/sel/title/text";
}
}
////////////////////////////////////////////////////////////////////
// visual bell - spinning red siren light
- part { name: "bell_glow";
- mouse_events: 0;
+ images.image: "circle-1200.png" COMP;
+ images.image: "strobe-600.png" COMP;
+ part { name: "bell_glow"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell_base";
- rel2.to: "bell_base";
- min: 200 200;
- fill.smooth: 0;
- image.normal: "bg_led_glow.png";
+ color: 255 80 60 0; // no cc
+ rel.to: "bell";
+ min: 100 100;
+ image.normal: "circle-1200.png";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- color: 255 255 255 255;
+ color: 255 80 60 32;
}
}
- part { name: "bell_base";
- mouse_events: 0;
+ part { name: "bell_glow2"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- color: 255 255 255 0;
- min: 32 32;
- max: 32 32;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- align: 1.0 1.0;
- image.normal: "bg_led_base.png";
+ color: 255 240 160 0; // no cc
+ rel.to: "bell";
+ min: 50 50;
+ image.normal: "circle-1200.png";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "bell";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell_base";
- rel2.to: "bell_base";
- image.normal: "bg_led.png";
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
+ color: 255 220 120 32;
}
}
part { name: "bell_strobe";
mouse_events: 0;
description { state: "default" 0.0;
fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell";
- rel2.to: "bell";
- image.normal: "bg_led_strobe.png";
+ color: 255 255 200 255;
+ rel.to: "bell_glow2";
+ image.normal: "strobe-600.png";
+ rel1.relative: -0.5 -0.5;
+ rel2.relative: 1.5 1.5;
map {
on: 1;
smooth: 1;
rotation.center: "bell";
}
+ visible: 0;
}
description { state: "spin" 0.0;
inherit: "default" 0.0;
+ map.rotation.z: 0.0;
visible: 1;
- color: 255 255 255 255;
- map.rotation.z: 36.0;
}
description { state: "spin_done" 0.0;
- inherit: "spin" 0.0;
+ inherit: "default" 0.0;
map.rotation.z: 720.0;
- }
- description { state: "spin_done2" 0.0;
- inherit: "spin" 0.0;
- map.rotation.z: 1440.0;
+ visible: 1;
}
}
- program {
- signal: "bell"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "bell_base";
- target: "bell";
- target: "bell_strobe";
- target: "bell_glow";
- after: "bell";
+ part { name: "bell";
+ mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ visible: 0;
+ color: 255 255 255 0;
+ max: 20 20;
+ min: 20 20;
+ align: 1.0 1.0;
+ rel1.offset: 15 15;
+ rel2.offset: -16 -16;
+ rel.to: "terminology.content";
+ image.normal: "circle-1200.png";
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ color: 255 255 255 255;
+ }
}
- program { name: "bell";
+ program { signal: "bell"; source: "terminology";
action: STATE_SET "visible" 0.0;
- target: "bell_base";
- target: "bell_glow";
- after: "bell2";
- }
- program { name: "bell2";
- action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.1;
target: "bell";
target: "bell_glow";
+ target: "bell_glow2";
after: "bell3";
}
program { name: "bell3";
action: STATE_SET "spin" 0.0;
transition: LINEAR 0.1;
target: "bell_strobe";
+ after: "bell4.1";
+ }
+ program { name: "bell4.1";
+ action: STATE_SET "spin" 0.0;
+ target: "bell_strobe";
after: "bell4.2";
}
program { name: "bell4.2";
action: STATE_SET "spin_done" 0.0;
transition: LINEAR 0.9;
target: "bell_strobe";
- after: "bell4.3";
- }
- program { name: "bell4.3";
- action: STATE_SET "spin_done2" 0.0;
- transition: LINEAR 1.0;
- target: "bell_strobe";
- after: "bell4.4";
- }
- program { name: "bell4.4";
- action: STATE_SET "spin_done" 0.0;
- target: "bell_strobe";
- after: "bell4.3";
+ after: "bell4.1";
}
}
}
diff --git a/data/themes/default/selection.edc b/data/themes/default/selection.edc
index a7c927be..25df15d0 100644
--- a/data/themes/default/selection.edc
+++ b/data/themes/default/selection.edc
@@ -22,49 +22,31 @@
// |##############|
group { name: "terminology/selection";
- images {
- image: "sl_stripe.png" COMP;
- image: "sl_left.png" COMP;
- image: "sl_right.png" COMP;
- image: "sl_top.png" COMP;
- image: "sl_bottom.png" COMP;
- image: "sl_htop.png" COMP;
- image: "sl_hbottom.png" COMP;
- }
parts {
- // background pattern. duplicated because clips cut out regions of
- // it to see and clips don't overlap
- part { name: "background_top";
+ // background pattern. duplicated because clips cut out regions of
+ // it to see and clips don't overlap
+ part { name: "background_top"; type: RECT;
mouse_events: 0;
clip_to: "top_clip";
description { state: "default" 0.0;
- color: 255 255 255 25;
+ color: 255 255 255 128; // no cc
color_class: "GLOW";
- image.normal: "sl_stripe.png";
- fill.size.relative: 0.0 0.0;
- fill.size.offset: 240 240;
}
}
- part { name: "background_middle";
+ part { name: "background_middle"; type: RECT;
mouse_events: 0;
clip_to: "middle_clip";
description { state: "default" 0.0;
- color: 255 255 255 25;
+ color: 255 255 255 128; // no cc
color_class: "GLOW";
- image.normal: "sl_stripe.png";
- fill.size.relative: 0.0 0.0;
- fill.size.offset: 240 240;
}
}
- part { name: "background_bottom";
+ part { name: "background_bottom"; type: RECT;
mouse_events: 0;
clip_to: "bottom_clip";
description { state: "default" 0.0;
- color: 255 255 255 25;
+ color: 255 255 255 128; // no cc
color_class: "GLOW";
- image.normal: "sl_stripe.png";
- fill.size.relative: 0.0 0.0;
- fill.size.offset: 240 240;
}
}
@@ -137,7 +119,7 @@ group { name: "terminology/selection";
inherit: "default" 0.0;
}
}
-
+/*
// the outline around the selection...
#define TARGETS \
target: "top_clip"; target: "middle_clip"; target: "bottom_clip"; \
@@ -186,6 +168,7 @@ group { name: "terminology/selection";
// oneline (also multiple lines but all fill the row):
// | ######### |
+
part { name: "0.left";
mouse_events: 0;
clip_to: "0.clip";
@@ -875,6 +858,7 @@ group { name: "terminology/selection";
action: STATE_SET "bottomfull" 0.0;
TARGETS;
}
+*/
// top and bottom swallows used to coimmunicate via min/max size the
// size of the top and bottom lines
@@ -896,123 +880,177 @@ group { name: "terminology/selection";
}
// blinky cursors indicating you can drag the ends of the selection
- part { name: "cursor.top_left"; type: RECT;
- mouse_events: 0;
+ part { name: "cursor.top_left"; type: SPACER;
description { state: "default" 0.0;
- rel1.to: "terminology.top_left";
+ rel.to: "terminology.top_left";
rel1.relative: 1.0 0.0;
- rel2.to: "terminology.top_left";
rel2.relative: 1.0 1.0;
- rel2.offset: 0 -1;
- color: 255 255 255 128;
- color_class: "END_SELECTION";
+ max: 0 99999;
}
}
- part { name: "cursor_blink.top_left"; type: RECT;
- mouse_events: 0;
+ part { name: "cursor.top_left_arrow_l";
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "cursor.top_left";
- rel2.to: "cursor.top_left";
- visible: 0;
+ image.normal: "arrow-l";
+ color_class: "/fg/normal/term/selection/arrow/left";
+ rel.to: "cursor.top_left";
+ min: 15 15;
+ max: 15 15;
+ align: 1.0 0.5;
+ rel1.offset: -5 0;
+ rel2.offset: -5 -1;
+ rel2.relative: 0.0 1.0;
+ offscale;
}
description { state: "fading" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "END_SELECTION";
- visible: 1;
}
description { state: "fading" 1.0;
- inherit: "fading" 0.0;
- color: 255 255 255 64;
- color_class: "END_SELECTION";
- rel1.offset: -5 0;
+ inherit: "default" 0.0;
+ rel1.offset: -15 0;
+ rel2.offset: -15 -1;
+ color: 255 255 255 0; // no cc
+ }
+ }
+ part { name: "cursor.top_left_arrow_u";
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "arrow-u";
+ color_class: "/fg/normal/term/selection/arrow/up";
+ rel.to: "cursor.top_left";
+ min: 15 15;
+ max: 15 15;
+ align: 0.5 1.0;
+ rel1.offset: 0 -5;
+ rel2.offset: -1 -5;
+ rel2.relative: 1.0 0.0;
+ offscale;
+ }
+ description { state: "fading" 0.0;
+ inherit: "default" 0.0;
+ }
+ description { state: "fading" 1.0;
+ inherit: "default" 0.0;
+ rel1.offset: 0 -15;
+ rel2.offset: -1 -15;
+ color: 255 255 255 0; // no cc
}
}
part { name: "zone.top_left"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "cursor.top_left";
- rel1.offset: -15 0;
- rel2.to: "cursor.top_left";
- rel2.offset: 15 0;
color: 0 0 0 0;
+ rel.to: "cursor.top_left";
+ min: 30 30;
+ rel1.offset: -15 -15;
+ rel2.offset: 14 -1;
+ offscale;
}
program { name: "top_left.blink";
- signal: "mouse,in";
- source: "zone.top_left";
+ signal: "mouse,in"; source: "zone.top_left";
action: STATE_SET "fading" 0.0;
- target: "cursor_blink.top_left";
+ target: "cursor.top_left_arrow_l";
+ target: "cursor.top_left_arrow_u";
after: "top_left.fade";
}
program { name: "top_left.fade";
action: STATE_SET "fading" 1.0;
- transition: LINEAR 0.3;
- target: "cursor_blink.top_left";
+ transition: LINEAR 0.5;
+ target: "cursor.top_left_arrow_l";
+ target: "cursor.top_left_arrow_u";
after: "top_left.blink";
}
- program { name: "top_left.stop";
- signal: "mouse,out";
- source: "zone.top_left";
+ program { signal: "mouse,out"; source: "zone.top_left";
action: STATE_SET "default" 0.0;
- target: "cursor_blink.top_left";
+ target: "cursor.top_left_arrow_l";
+ target: "cursor.top_left_arrow_u";
}
}
- part { name: "cursor.bottom_right"; type: RECT;
- mouse_events: 0;
+
+ part { name: "cursor.bottom_right"; type: SPACER;
description { state: "default" 0.0;
- rel1.to: "terminology.bottom_right";
+ rel.to: "terminology.bottom_right";
rel1.relative: 0.0 0.0;
- rel1.offset: -1 0;
- rel2.to: "terminology.bottom_right";
rel2.relative: 0.0 1.0;
- rel2.offset: -1 -1;
- color: 255 255 255 128;
- color_class: "END_SELECTION";
+ max: 0 99999;
}
}
- part { name: "cursor_blink.bottom_right"; type: RECT;
- mouse_events: 0;
+ part { name: "cursor.top_left_arrow_r";
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "cursor.bottom_right";
- rel2.to: "cursor.bottom_right";
- visible: 0;
+ image.normal: "arrow-r";
+ color_class: "/fg/normal/term/selection/arrow/left";
+ rel.to: "cursor.bottom_right";
+ min: 15 15;
+ max: 15 15;
+ align: 0.0 0.5;
+ rel1.offset: 4 0;
+ rel2.offset: 4 -1;
+ rel1.relative: 1.0 0.0;
+ offscale;
}
description { state: "fading" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "END_SELECTION";
- visible: 1;
}
description { state: "fading" 1.0;
- inherit: "fading" 0.0;
- color: 255 255 255 64;
- color_class: "END_SELECTION";
- rel2.offset: +5 0;
+ inherit: "default" 0.0;
+ rel1.offset: 14 0;
+ rel2.offset: 14 -1;
+ color: 255 255 255 0; // no cc
+ }
+ }
+ part { name: "cursor.top_left_arrow_d";
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "arrow-d";
+ color_class: "/fg/normal/term/selection/arrow/down";
+ rel.to: "cursor.bottom_right";
+ min: 15 15;
+ max: 15 15;
+ align: 0.5 0.0;
+ rel1.offset: 0 4;
+ rel2.offset: -1 4;
+ rel1.relative: 0.0 1.0;
+ offscale;
+ }
+ description { state: "fading" 0.0;
+ inherit: "default" 0.0;
+ }
+ description { state: "fading" 1.0;
+ inherit: "default" 0.0;
+ rel1.offset: 0 14;
+ rel2.offset: -1 14;
+ color: 255 255 255 0; // no cc
}
}
part { name: "zone.bottom_right"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "cursor.bottom_right";
- rel1.offset: -15 0;
- rel2.to: "cursor.bottom_right";
- rel2.offset: 15 0;
color: 0 0 0 0;
+ rel.to: "cursor.bottom_right";
+ min: 30 30;
+ rel1.offset: -15 0;
+ rel2.offset: 14 14;
+ offscale;
}
program { name: "bottom_right.blink";
signal: "mouse,in"; source: "zone.bottom_right";
action: STATE_SET "fading" 0.0;
- target: "cursor_blink.bottom_right";
+ target: "cursor.top_left_arrow_r";
+ target: "cursor.top_left_arrow_d";
after: "bottom_right.fade";
}
program { name: "bottom_right.fade";
action: STATE_SET "fading" 1.0;
- transition: LINEAR 0.3;
- target: "cursor_blink.bottom_right";
+ transition: LINEAR 0.5;
+ target: "cursor.top_left_arrow_r";
+ target: "cursor.top_left_arrow_d";
after: "bottom_right.blink";
}
- program { name: "bottom_right.stop";
- signal: "mouse,out"; source: "zone.bottom_right";
+ program { signal: "mouse,out"; source: "zone.bottom_right";
action: STATE_SET "default" 0.0;
- target: "cursor_blink.bottom_right";
+ target: "cursor.top_left_arrow_r";
+ target: "cursor.top_left_arrow_d";
}
}
}
diff --git a/data/themes/default/tab_drag_thumb.edc b/data/themes/default/tab_drag_thumb.edc
index 57a21ba0..a0c773f5 100644
--- a/data/themes/default/tab_drag_thumb.edc
+++ b/data/themes/default/tab_drag_thumb.edc
@@ -1,28 +1,11 @@
group { name: "terminology/tab_drag_thumb";
- images {
- image: "bg_bevel.png" COMP;
- image: "bg_glint.png" COMP;
- image: "pm_shadow.png" COMP;
- image: "cr_glow.png" COMP;
- image: "bg_led_glow.png" COMP;
- image: "bg_led_base.png" COMP;
- image: "bg_led.png" COMP;
- image: "bg_led_strobe.png" COMP;
- }
- set { name: "bg_shine";
- image { image: "bg_shine5.png" COMP; size: 0 0 256 120; }
- image { image: "bg_shine4.png" COMP; size: 256 120 512 240; }
- image { image: "bg_shine3.png" COMP; size: 512 240 1024 480; }
- image { image: "bg_shine2.png" COMP; size: 1024 480 2048 960; }
- image { image: "bg_shine.png" COMP; size: 2048 960 99999 99999; }
- }
+ images.image: "pm_shadow.png" COMP;
parts {
////////////////////////////////////////////////////////////////////
// base background and selection image
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
+ rel.to: "terminology.content";
color: 255 255 255 255;
}
}
@@ -30,29 +13,16 @@ group { name: "terminology/tab_drag_thumb";
mouse_events: 0;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- rel1.offset: -40 -40;
- rel2.offset: 39 39;
+ rel.to: "terminology.content";
+ rel1.offset: -32 -32;
+ rel2.offset: 31 31;
image.normal: "pm_shadow.png";
image.border: 64 64 64 64;
- image.border_scale_by: 1.0;
- color: 255 255 255 255;
+ image.border_scale_by: 0.5;
+ image.border_scale: 1;
+ color_class: "/shadow/normal/term/drag_thumb";
fill.smooth: 0;
- }
- }
- part { name: "glow";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color_class: "GLOW";
+ offscale;
}
}
@@ -62,53 +32,24 @@ group { name: "terminology/tab_drag_thumb";
clip_to: "clip";
description { state: "default" 0.0;
color_class: "BG";
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
+ rel.to: "terminology.content";
}
}
part { name: "terminology.content"; type: SWALLOW;
clip_to: "clip";
description { state: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
}
}
- ////////////////////////////////////////////////////////////////////
- // fancy stuff over the top of the terminal for shading and title
- part { name: "overlay";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- image.normal: "pm_overlay.png";
- fill.smooth: 0;
- }
- }
- part { name: "bevel";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- image.normal: "bg_bevel.png";
- image.border: 3 3 3 3;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
part { name: "terminology.title"; type: TEXT; mouse_events: 0;
- effect: GLOW;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- color: 255 255 255 255;
- color2: 255 255 255 128;
- color3: 255 255 255 20;
- color_class: "GLOW_TXT_HIGHLIGHT";
- align: 0.5 1.0;
+ rel.to: "terminology.content";
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ color_class: "/fg/normal/term/sel/title/text";
+ align: 0.5 0.0;
+ offscale;
text { font: "Sans"; size: 10;
align: 0.5 1.0;
min: 0 1;
@@ -116,173 +57,114 @@ group { name: "terminology/tab_drag_thumb";
}
}
- ////////////////////////////////////////////////////////////////////
- // fancy stuff on top
- part { name: "glint";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 79 5;
- max: 79 5;
- rel1 {
- to: "terminology.content";
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- to: "terminology.content";
- relative: 1.0 0.0;
- offset: -1 0;
- }
- image.normal: "bg_glint.png";
- }
- }
- part { name: "shine";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- image.normal: "bg_shine";
- fill.smooth: 0;
- align: 0.5 0.0;
- aspect: (256/120) (256/120);
- aspect_preference: HORIZONTAL;
- }
- }
-
////////////////////////////////////////////////////////////////////
// visual bell - spinning red siren light
- part { name: "bell_glow";
- mouse_events: 0;
- clip_to: "clip";
+ images.image: "circle-1200.png" COMP;
+ images.image: "strobe-600.png" COMP;
+ part { name: "bell_glow"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell_base";
- rel2.to: "bell_base";
- min: 200 200;
- fill.smooth: 0;
- image.normal: "bg_led_glow.png";
+ color: 255 80 60 0; // no cc
+ rel.to: "bell";
+ min: 100 100;
+ image.normal: "circle-1200.png";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- color: 255 255 255 255;
+ color: 255 80 60 32;
}
}
- part { name: "bell_base";
- mouse_events: 0;
+ part { name: "bell_glow2"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
- color: 255 255 255 0;
- min: 32 32;
- max: 32 32;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- align: 1.0 1.0;
- image.normal: "bg_led_base.png";
+ color: 255 240 160 0; // no cc
+ rel.to: "bell";
+ min: 50 50;
+ image.normal: "circle-1200.png";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "bell";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell_base";
- rel2.to: "bell_base";
- image.normal: "bg_led.png";
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
+ color: 255 220 120 32;
}
}
part { name: "bell_strobe";
mouse_events: 0;
description { state: "default" 0.0;
fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell";
- rel2.to: "bell";
- image.normal: "bg_led_strobe.png";
+ color: 255 255 200 255;
+ rel.to: "bell_glow2";
+ image.normal: "strobe-600.png";
+ rel1.relative: -0.5 -0.5;
+ rel2.relative: 1.5 1.5;
map {
on: 1;
smooth: 1;
rotation.center: "bell";
}
+ visible: 0;
}
description { state: "spin" 0.0;
inherit: "default" 0.0;
+ map.rotation.z: 0.0;
visible: 1;
- color: 255 255 255 255;
- map.rotation.z: 36.0;
}
description { state: "spin_done" 0.0;
- inherit: "spin" 0.0;
+ inherit: "default" 0.0;
map.rotation.z: 720.0;
- }
- description { state: "spin_done2" 0.0;
- inherit: "spin" 0.0;
- map.rotation.z: 1440.0;
+ visible: 1;
}
}
- program {
- signal: "bell"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "bell_base";
- target: "bell";
- target: "bell_strobe";
- target: "bell_glow";
- after: "bell";
+ part { name: "bell";
+ mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ visible: 0;
+ color: 255 255 255 0;
+ max: 20 20;
+ min: 20 20;
+ align: 1.0 1.0;
+ rel1.offset: 15 15;
+ rel2.offset: -16 -16;
+ rel.to: "terminology.content";
+ image.normal: "circle-1200.png";
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ color: 255 255 255 255;
+ }
}
- program { name: "bell";
+ program { signal: "bell"; source: "terminology";
action: STATE_SET "visible" 0.0;
- target: "bell_base";
- target: "bell_glow";
- after: "bell2";
- }
- program { name: "bell2";
- action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.1;
target: "bell";
target: "bell_glow";
+ target: "bell_glow2";
after: "bell3";
}
program { name: "bell3";
action: STATE_SET "spin" 0.0;
transition: LINEAR 0.1;
target: "bell_strobe";
+ after: "bell4.1";
+ }
+ program { name: "bell4.1";
+ action: STATE_SET "spin" 0.0;
+ target: "bell_strobe";
after: "bell4.2";
}
program { name: "bell4.2";
action: STATE_SET "spin_done" 0.0;
transition: LINEAR 0.9;
target: "bell_strobe";
- after: "bell4.3";
- }
- program { name: "bell4.3";
- action: STATE_SET "spin_done2" 0.0;
- transition: LINEAR 1.0;
- target: "bell_strobe";
- after: "bell4.4";
- }
- program { name: "bell4.4";
- action: STATE_SET "spin_done" 0.0;
- target: "bell_strobe";
- after: "bell4.3";
+ after: "bell4.1";
}
}
}
diff --git a/data/themes/default/tabbar_back.edc b/data/themes/default/tabbar_back.edc
index de41b53c..6ec38b37 100644
--- a/data/themes/default/tabbar_back.edc
+++ b/data/themes/default/tabbar_back.edc
@@ -1,210 +1,130 @@
group { name: "terminology/tabbar_back";
- images {
- image: "tab_base_l1.png" COMP;
- image: "tab_base_m.png" COMP;
- image: "tab_base_r1.png" COMP;
- image: "tab_other_l.png" COMP;
- image: "tab_other_m.png" COMP;
- image: "tab_other_r.png" COMP;
- image: "tab_shad_l2.png" COMP;
- image: "tab_shad_r2.png" COMP;
- }
set { name: "tab_grouped";
image { image: "tab_grouped_8.png" COMP; size: 0 0 8 8; }
image { image: "tab_grouped_16.png" COMP; size: 8 8 16 16; }
image { image: "tab_grouped_32.png" COMP; size: 16 16 99999 99999; }
}
parts {
- part { name: "tab_bevel_shad1";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.to: "tab_bevel_top1";
- rel2.to: "tab_bevel_top1";
- image.normal: "tab_shad_l2.png";
- image.border: 0 0 10 10;
- fill.smooth: 0;
- }
- }
- part { name: "tab_bevel_shad3";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.to: "tab_bevel_top3";
- rel2.to: "tab_bevel_top3";
- image.normal: "tab_shad_r2.png";
- image.border: 0 0 10 10;
- fill.smooth: 0;
- }
- }
- part { name: "tab_base_top1";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.to: "tab_bevel_top1";
- rel2.to: "tab_bevel_top1";
- image.normal: "tab_other_l.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- }
- }
- part { name: "tab_base_top2";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.to: "tab_bevel_top2";
- rel2.to: "tab_bevel_top2";
- image.normal: "tab_other_m.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- }
- }
- part { name: "tab_base_top3";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.to: "tab_bevel_top3";
- rel2.to: "tab_bevel_top3";
- image.normal: "tab_other_r.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- }
- }
- part { name: "tab_bevel_top1";
- mouse_events: 0;
+ images.image: "tab_shad_l.png" COMP;
+ part { name: "tab_bevel_top1"; mouse_events: 0;
clip_to: "clip";
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.0;
- rel1.offset: -4 0;
- max: 12 99999;
- min: 12 0;
- image.normal: "tab_base_l1.png";
- image.border: 0 0 4 4;
+ max: 5 99999;
+ min: 5 0;
+ image.normal: "tab_shad_l.png";
+ image.border: 0 20 5 15;
+ image.border_scale_by: 0.25;
+ image.border_scale: 1;
fill.smooth: 0;
fixed: 1 0;
+ color_class: "/shadow/normal/tab";
}
}
- part { name: "tab_bevel_top2";
- mouse_events: 0;
+ part { name: "tab_bevel_top2"; type: RECT; mouse_events: 0;
clip_to: "clip";
description { state: "default" 0.0;
rel1.to: "tab_bevel_top1";
rel1.relative: 1.0 0.0;
rel2.to: "tab_bevel_top3";
rel2.relative: 0.0 1.0;
- image.normal: "tab_base_m.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
+ color_class: "/bg/normal/tab";
}
}
- part { name: "tab_bevel_top3";
- mouse_events: 0;
+ images.image: "tab_shad_r.png" COMP;
+ part { name: "tab_bevel_top3"; mouse_events: 0;
clip_to: "clip";
- description { state: "default" 0.0;
- align: 1.0 0.0;
- rel2.offset: 3 -1;
- max: 12 99999;
- min: 12 0;
- image.normal: "tab_base_r1.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- fixed: 1 0;
- }
- }
- part { name: "tabgrouped"; type: IMAGE;
scale: 1;
description { state: "default" 0.0;
- aspect: 1.0 1.0; aspect_preference: BOTH;
+ align: 1.0 0.0;
+ max: 5 99999;
+ min: 5 0;
+ image.normal: "tab_shad_r.png";
+ image.border: 20 0 5 15;
+ image.border_scale_by: 0.25;
+ image.border_scale: 1;
+ fill.smooth: 0;
+ fixed: 1 0;
+ color_class: "/shadow/normal/tab";
+ }
+ }
+ part { name: "tabgrouped";
+ scale: 1;
+ description { state: "default" 0.0;
align: 0.0 0.5;
- min: 0 0;
- max: 0 0;
fixed: 1 1;
+ max: 0 0;
rel1 {
to: "tab_bevel_top2";
- relative: 0.0 0.3;
- offset: -1 0;
+ relative: 0.0 0.0;
+ offset: 3 3;
}
rel2 {
to: "tab_bevel_top2";
- relative: 1.0 0.7;
+ relative: 0.0 1.0;
+ offset: 3 -4;
}
+ image.normal: "tab_grouped";
+ color_class: "/fg/normal/tab/term/icon/grouped";
visible: 0;
+ offscale;
}
description { state: "grouped" 0.0;
inherit: "default" 0.0;
- min: 8 8;
- max: 32 32;
- image.normal: "tab_grouped";
- rel1 {
- to: "tab_bevel_top2";
- relative: 0.0 0.3;
- }
- rel2 {
- to: "tab_bevel_top2";
- relative: 1.0 0.7;
- }
- color: 180 180 180 255;
+ min: 15 15;
+ max: 15 15;
visible: 1;
}
}
- program {
- signal: "grouped,on"; source: "terminology";
+ program { signal: "grouped,on"; source: "terminology";
action: STATE_SET "grouped" 0.0;
target: "tabgrouped";
}
- program {
- signal: "grouped,off"; source: "terminology";
+ program { signal: "grouped,off"; source: "terminology";
action: STATE_SET "default" 0.0;
target: "tabgrouped";
}
part { name: "terminology.title"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: OUTLINE_SOFT_SHADOW;
description { state: "default" 0.0;
text { font: "Sans:style=Bold"; size: 10;
align: 0.5 0.5;
min: 0 1;
}
- align: 0.5 0.5;
- color: 180 180 180 255;
- color3: 0 0 0 18;
rel1 {
to_x: "tabgrouped";
to_y: "tab_bevel_top2";
relative: 1.0 0.0;
- offset: 2 0;
}
rel2.to: "tab_bevel_top2";
+ rel2.offset: -19 -1;
+ offscale;
+ color_class: "/fg/selected/term/tab/title/text";
}
description { state: "bell" 0.0;
inherit: "default" 0.0;
- color: 255 219 0 96;
- color2: 255 51 0 48;
- color3: 255 51 0 8;
+ color_class: "/fg/selected/term/tab/title/text/bell";
}
}
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
- rel2.offset: -1 -2;
}
}
part { name: "event"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
programs {
- program {
- signal: "mouse,clicked,1"; source: "event";
+ program { signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "tab,activate" "terminology";
}
- program { name: "bell";
- signal: "bell"; source: "terminology";
+ program { signal: "bell"; source: "terminology";
action: STATE_SET "bell" 0.0;
target: "terminology.title";
}
- program { name: "bell,off";
- signal: "bell,off"; source: "terminology";
+ program { signal: "bell,off"; source: "terminology";
action: STATE_SET "default" 0.0;
target: "terminology.title";
}
diff --git a/data/themes/images/arrow-d-015.png b/data/themes/images/arrow-d-015.png
new file mode 100644
index 00000000..15070f31
Binary files /dev/null and b/data/themes/images/arrow-d-015.png differ
diff --git a/data/themes/images/arrow-d-030.png b/data/themes/images/arrow-d-030.png
new file mode 100644
index 00000000..83993d8c
Binary files /dev/null and b/data/themes/images/arrow-d-030.png differ
diff --git a/data/themes/images/arrow-d-060.png b/data/themes/images/arrow-d-060.png
new file mode 100644
index 00000000..d009ff85
Binary files /dev/null and b/data/themes/images/arrow-d-060.png differ
diff --git a/data/themes/images/arrow-l-015.png b/data/themes/images/arrow-l-015.png
new file mode 100644
index 00000000..3e9b75f5
Binary files /dev/null and b/data/themes/images/arrow-l-015.png differ
diff --git a/data/themes/images/arrow-l-030.png b/data/themes/images/arrow-l-030.png
new file mode 100644
index 00000000..3159f1bf
Binary files /dev/null and b/data/themes/images/arrow-l-030.png differ
diff --git a/data/themes/images/arrow-l-060.png b/data/themes/images/arrow-l-060.png
new file mode 100644
index 00000000..c94bf403
Binary files /dev/null and b/data/themes/images/arrow-l-060.png differ
diff --git a/data/themes/images/arrow-r-015.png b/data/themes/images/arrow-r-015.png
new file mode 100644
index 00000000..3a64dd58
Binary files /dev/null and b/data/themes/images/arrow-r-015.png differ
diff --git a/data/themes/images/arrow-r-030.png b/data/themes/images/arrow-r-030.png
new file mode 100644
index 00000000..d0a519ae
Binary files /dev/null and b/data/themes/images/arrow-r-030.png differ
diff --git a/data/themes/images/arrow-r-060.png b/data/themes/images/arrow-r-060.png
new file mode 100644
index 00000000..6e2e9522
Binary files /dev/null and b/data/themes/images/arrow-r-060.png differ
diff --git a/data/themes/images/arrow-u-015.png b/data/themes/images/arrow-u-015.png
new file mode 100644
index 00000000..6925c828
Binary files /dev/null and b/data/themes/images/arrow-u-015.png differ
diff --git a/data/themes/images/arrow-u-030.png b/data/themes/images/arrow-u-030.png
new file mode 100644
index 00000000..3faddb71
Binary files /dev/null and b/data/themes/images/arrow-u-030.png differ
diff --git a/data/themes/images/arrow-u-060.png b/data/themes/images/arrow-u-060.png
new file mode 100644
index 00000000..2617e395
Binary files /dev/null and b/data/themes/images/arrow-u-060.png differ
diff --git a/data/themes/images/bg_bevel.png b/data/themes/images/bg_bevel.png
deleted file mode 100644
index 61c6105b..00000000
Binary files a/data/themes/images/bg_bevel.png and /dev/null differ
diff --git a/data/themes/images/bg_glint.png b/data/themes/images/bg_glint.png
deleted file mode 100644
index 0fe17c0c..00000000
Binary files a/data/themes/images/bg_glint.png and /dev/null differ
diff --git a/data/themes/images/bg_glow_in.png b/data/themes/images/bg_glow_in.png
deleted file mode 100644
index d4a83d1e..00000000
Binary files a/data/themes/images/bg_glow_in.png and /dev/null differ
diff --git a/data/themes/images/bg_led.png b/data/themes/images/bg_led.png
deleted file mode 100644
index 1d994302..00000000
Binary files a/data/themes/images/bg_led.png and /dev/null differ
diff --git a/data/themes/images/bg_led_base.png b/data/themes/images/bg_led_base.png
deleted file mode 100644
index 75fe30d0..00000000
Binary files a/data/themes/images/bg_led_base.png and /dev/null differ
diff --git a/data/themes/images/bg_led_glow.png b/data/themes/images/bg_led_glow.png
deleted file mode 100644
index 7b526206..00000000
Binary files a/data/themes/images/bg_led_glow.png and /dev/null differ
diff --git a/data/themes/images/bg_led_strobe.png b/data/themes/images/bg_led_strobe.png
deleted file mode 100644
index a6ae8ed2..00000000
Binary files a/data/themes/images/bg_led_strobe.png and /dev/null differ
diff --git a/data/themes/images/bg_shadow.png b/data/themes/images/bg_shadow.png
deleted file mode 100644
index f0fc89d8..00000000
Binary files a/data/themes/images/bg_shadow.png and /dev/null differ
diff --git a/data/themes/images/bg_shadow2.png b/data/themes/images/bg_shadow2.png
deleted file mode 100644
index 50721681..00000000
Binary files a/data/themes/images/bg_shadow2.png and /dev/null differ
diff --git a/data/themes/images/bg_shadow3.png b/data/themes/images/bg_shadow3.png
deleted file mode 100644
index a20e2762..00000000
Binary files a/data/themes/images/bg_shadow3.png and /dev/null differ
diff --git a/data/themes/images/bg_shine.png b/data/themes/images/bg_shine.png
deleted file mode 100644
index e3adcb76..00000000
Binary files a/data/themes/images/bg_shine.png and /dev/null differ
diff --git a/data/themes/images/bg_shine2.png b/data/themes/images/bg_shine2.png
deleted file mode 100644
index 77286793..00000000
Binary files a/data/themes/images/bg_shine2.png and /dev/null differ
diff --git a/data/themes/images/bg_shine3.png b/data/themes/images/bg_shine3.png
deleted file mode 100644
index ba84dc06..00000000
Binary files a/data/themes/images/bg_shine3.png and /dev/null differ
diff --git a/data/themes/images/bg_shine4.png b/data/themes/images/bg_shine4.png
deleted file mode 100644
index d125257f..00000000
Binary files a/data/themes/images/bg_shine4.png and /dev/null differ
diff --git a/data/themes/images/bg_shine5.png b/data/themes/images/bg_shine5.png
deleted file mode 100644
index eb97946e..00000000
Binary files a/data/themes/images/bg_shine5.png and /dev/null differ
diff --git a/data/themes/images/checks.png b/data/themes/images/checks.png
new file mode 100644
index 00000000..e9840ff6
Binary files /dev/null and b/data/themes/images/checks.png differ
diff --git a/data/themes/images/circle-1200.png b/data/themes/images/circle-1200.png
new file mode 100644
index 00000000..5f1f8d06
Binary files /dev/null and b/data/themes/images/circle-1200.png differ
diff --git a/data/themes/images/close-015.png b/data/themes/images/close-015.png
new file mode 100644
index 00000000..8f33967d
Binary files /dev/null and b/data/themes/images/close-015.png differ
diff --git a/data/themes/images/close-030.png b/data/themes/images/close-030.png
new file mode 100644
index 00000000..e504e147
Binary files /dev/null and b/data/themes/images/close-030.png differ
diff --git a/data/themes/images/close-060.png b/data/themes/images/close-060.png
new file mode 100644
index 00000000..8b2e4aaf
Binary files /dev/null and b/data/themes/images/close-060.png differ
diff --git a/data/themes/images/cr_bar_glow.png b/data/themes/images/cr_bar_glow.png
deleted file mode 100644
index 74b8f731..00000000
Binary files a/data/themes/images/cr_bar_glow.png and /dev/null differ
diff --git a/data/themes/images/cr_bar_out.png b/data/themes/images/cr_bar_out.png
deleted file mode 100644
index 3d308eef..00000000
Binary files a/data/themes/images/cr_bar_out.png and /dev/null differ
diff --git a/data/themes/images/cr_bar_pulse.png b/data/themes/images/cr_bar_pulse.png
deleted file mode 100644
index fa31f6da..00000000
Binary files a/data/themes/images/cr_bar_pulse.png and /dev/null differ
diff --git a/data/themes/images/cr_glow.png b/data/themes/images/cr_glow.png
deleted file mode 100644
index 6ddeb015..00000000
Binary files a/data/themes/images/cr_glow.png and /dev/null differ
diff --git a/data/themes/images/cr_key.png b/data/themes/images/cr_key.png
deleted file mode 100644
index 980e9c71..00000000
Binary files a/data/themes/images/cr_key.png and /dev/null differ
diff --git a/data/themes/images/cr_out.png b/data/themes/images/cr_out.png
deleted file mode 100644
index e2644e0b..00000000
Binary files a/data/themes/images/cr_out.png and /dev/null differ
diff --git a/data/themes/images/cr_pulse.png b/data/themes/images/cr_pulse.png
deleted file mode 100644
index 14dd8976..00000000
Binary files a/data/themes/images/cr_pulse.png and /dev/null differ
diff --git a/data/themes/images/cr_underline_glow.png b/data/themes/images/cr_underline_glow.png
deleted file mode 100644
index 482a643c..00000000
Binary files a/data/themes/images/cr_underline_glow.png and /dev/null differ
diff --git a/data/themes/images/cr_underline_out.png b/data/themes/images/cr_underline_out.png
deleted file mode 100644
index e9a41d18..00000000
Binary files a/data/themes/images/cr_underline_out.png and /dev/null differ
diff --git a/data/themes/images/cr_underline_pulse.png b/data/themes/images/cr_underline_pulse.png
deleted file mode 100644
index 2086a305..00000000
Binary files a/data/themes/images/cr_underline_pulse.png and /dev/null differ
diff --git a/data/themes/images/fn_shadow.png b/data/themes/images/fn_shadow.png
deleted file mode 100644
index f982f9c0..00000000
Binary files a/data/themes/images/fn_shadow.png and /dev/null differ
diff --git a/data/themes/images/grad-h-1.png b/data/themes/images/grad-h-1.png
new file mode 100644
index 00000000..428371aa
Binary files /dev/null and b/data/themes/images/grad-h-1.png differ
diff --git a/data/themes/images/grad-h-2.png b/data/themes/images/grad-h-2.png
new file mode 100644
index 00000000..0b2faf2e
Binary files /dev/null and b/data/themes/images/grad-h-2.png differ
diff --git a/data/themes/images/grad-v-1.png b/data/themes/images/grad-v-1.png
new file mode 100644
index 00000000..1da185f1
Binary files /dev/null and b/data/themes/images/grad-v-1.png differ
diff --git a/data/themes/images/grad-v-2.png b/data/themes/images/grad-v-2.png
new file mode 100644
index 00000000..4fd26011
Binary files /dev/null and b/data/themes/images/grad-v-2.png differ
diff --git a/data/themes/images/icon-split-h-015.png b/data/themes/images/icon-split-h-015.png
new file mode 100644
index 00000000..2a30f0cd
Binary files /dev/null and b/data/themes/images/icon-split-h-015.png differ
diff --git a/data/themes/images/icon-split-h-030.png b/data/themes/images/icon-split-h-030.png
new file mode 100644
index 00000000..8a3a3162
Binary files /dev/null and b/data/themes/images/icon-split-h-030.png differ
diff --git a/data/themes/images/icon-split-h-060.png b/data/themes/images/icon-split-h-060.png
new file mode 100644
index 00000000..9c23a412
Binary files /dev/null and b/data/themes/images/icon-split-h-060.png differ
diff --git a/data/themes/images/icon-split-v-015.png b/data/themes/images/icon-split-v-015.png
new file mode 100644
index 00000000..b54258a3
Binary files /dev/null and b/data/themes/images/icon-split-v-015.png differ
diff --git a/data/themes/images/icon-split-v-030.png b/data/themes/images/icon-split-v-030.png
new file mode 100644
index 00000000..3264acef
Binary files /dev/null and b/data/themes/images/icon-split-v-030.png differ
diff --git a/data/themes/images/icon-split-v-060.png b/data/themes/images/icon-split-v-060.png
new file mode 100644
index 00000000..6d9e259e
Binary files /dev/null and b/data/themes/images/icon-split-v-060.png differ
diff --git a/data/themes/images/icon-tab-btn-060.png b/data/themes/images/icon-tab-btn-060.png
new file mode 100644
index 00000000..a2b83e34
Binary files /dev/null and b/data/themes/images/icon-tab-btn-060.png differ
diff --git a/data/themes/images/icon_split_h.svg b/data/themes/images/icon_split_h.svg
deleted file mode 100644
index b0087a74..00000000
--- a/data/themes/images/icon_split_h.svg
+++ /dev/null
@@ -1,320 +0,0 @@
-
-
-
-
diff --git a/data/themes/images/icon_split_v.svg b/data/themes/images/icon_split_v.svg
deleted file mode 100644
index 745a221f..00000000
--- a/data/themes/images/icon_split_v.svg
+++ /dev/null
@@ -1,337 +0,0 @@
-
-
-
-
diff --git a/data/themes/images/inset_shadow.png b/data/themes/images/inset_shadow.png
deleted file mode 100644
index dad255c6..00000000
Binary files a/data/themes/images/inset_shadow.png and /dev/null differ
diff --git a/data/themes/images/lk_bottom.png b/data/themes/images/lk_bottom.png
deleted file mode 100644
index 7b7007de..00000000
Binary files a/data/themes/images/lk_bottom.png and /dev/null differ
diff --git a/data/themes/images/lk_left.png b/data/themes/images/lk_left.png
deleted file mode 100644
index 3db09dcd..00000000
Binary files a/data/themes/images/lk_left.png and /dev/null differ
diff --git a/data/themes/images/lk_right.png b/data/themes/images/lk_right.png
deleted file mode 100644
index 715bdc36..00000000
Binary files a/data/themes/images/lk_right.png and /dev/null differ
diff --git a/data/themes/images/media_busy_knob.png b/data/themes/images/media_busy_knob.png
deleted file mode 100644
index 93780efa..00000000
Binary files a/data/themes/images/media_busy_knob.png and /dev/null differ
diff --git a/data/themes/images/media_busy_progress.png b/data/themes/images/media_busy_progress.png
deleted file mode 100644
index 0f5f23e0..00000000
Binary files a/data/themes/images/media_busy_progress.png and /dev/null differ
diff --git a/data/themes/images/media_busy_spinner.png b/data/themes/images/media_busy_spinner.png
deleted file mode 100644
index 1091bb0a..00000000
Binary files a/data/themes/images/media_busy_spinner.png and /dev/null differ
diff --git a/data/themes/images/pm_fill.png b/data/themes/images/pm_fill.png
deleted file mode 100644
index 8ef098f1..00000000
Binary files a/data/themes/images/pm_fill.png and /dev/null differ
diff --git a/data/themes/images/pm_overlay.png b/data/themes/images/pm_overlay.png
deleted file mode 100644
index 3c25c730..00000000
Binary files a/data/themes/images/pm_overlay.png and /dev/null differ
diff --git a/data/themes/images/pm_shadow.png b/data/themes/images/pm_shadow.png
index cde4f73b..7c06c86a 100644
Binary files a/data/themes/images/pm_shadow.png and b/data/themes/images/pm_shadow.png differ
diff --git a/data/themes/images/ringa1.png b/data/themes/images/ringa1.png
new file mode 100644
index 00000000..a9a3e61a
Binary files /dev/null and b/data/themes/images/ringa1.png differ
diff --git a/data/themes/images/ringa2.png b/data/themes/images/ringa2.png
new file mode 100644
index 00000000..b0456583
Binary files /dev/null and b/data/themes/images/ringa2.png differ
diff --git a/data/themes/images/ringa3.png b/data/themes/images/ringa3.png
new file mode 100644
index 00000000..8dbb9ea3
Binary files /dev/null and b/data/themes/images/ringa3.png differ
diff --git a/data/themes/images/ringa4.png b/data/themes/images/ringa4.png
new file mode 100644
index 00000000..29eaa0ac
Binary files /dev/null and b/data/themes/images/ringa4.png differ
diff --git a/data/themes/images/ringa5.png b/data/themes/images/ringa5.png
new file mode 100644
index 00000000..569ac2f0
Binary files /dev/null and b/data/themes/images/ringa5.png differ
diff --git a/data/themes/images/ringb1.png b/data/themes/images/ringb1.png
new file mode 100644
index 00000000..11afdd5b
Binary files /dev/null and b/data/themes/images/ringb1.png differ
diff --git a/data/themes/images/ringb2.png b/data/themes/images/ringb2.png
new file mode 100644
index 00000000..4d23247b
Binary files /dev/null and b/data/themes/images/ringb2.png differ
diff --git a/data/themes/images/ringb3.png b/data/themes/images/ringb3.png
new file mode 100644
index 00000000..ef66c874
Binary files /dev/null and b/data/themes/images/ringb3.png differ
diff --git a/data/themes/images/ringb4.png b/data/themes/images/ringb4.png
new file mode 100644
index 00000000..cfe321eb
Binary files /dev/null and b/data/themes/images/ringb4.png differ
diff --git a/data/themes/images/ringb5.png b/data/themes/images/ringb5.png
new file mode 100644
index 00000000..c5af9653
Binary files /dev/null and b/data/themes/images/ringb5.png differ
diff --git a/data/themes/images/ringc1.png b/data/themes/images/ringc1.png
new file mode 100644
index 00000000..11afdd5b
Binary files /dev/null and b/data/themes/images/ringc1.png differ
diff --git a/data/themes/images/ringc2.png b/data/themes/images/ringc2.png
new file mode 100644
index 00000000..f753af2b
Binary files /dev/null and b/data/themes/images/ringc2.png differ
diff --git a/data/themes/images/ringc3.png b/data/themes/images/ringc3.png
new file mode 100644
index 00000000..a5c246b0
Binary files /dev/null and b/data/themes/images/ringc3.png differ
diff --git a/data/themes/images/ringc4.png b/data/themes/images/ringc4.png
new file mode 100644
index 00000000..e4aaa5df
Binary files /dev/null and b/data/themes/images/ringc4.png differ
diff --git a/data/themes/images/ringc5.png b/data/themes/images/ringc5.png
new file mode 100644
index 00000000..216f3db8
Binary files /dev/null and b/data/themes/images/ringc5.png differ
diff --git a/data/themes/images/sl_bottom.png b/data/themes/images/sl_bottom.png
deleted file mode 100644
index 93c8db7d..00000000
Binary files a/data/themes/images/sl_bottom.png and /dev/null differ
diff --git a/data/themes/images/sl_hbottom.png b/data/themes/images/sl_hbottom.png
deleted file mode 100644
index 7433736a..00000000
Binary files a/data/themes/images/sl_hbottom.png and /dev/null differ
diff --git a/data/themes/images/sl_htop.png b/data/themes/images/sl_htop.png
deleted file mode 100644
index c4333ec0..00000000
Binary files a/data/themes/images/sl_htop.png and /dev/null differ
diff --git a/data/themes/images/sl_left.png b/data/themes/images/sl_left.png
deleted file mode 100644
index 34635f39..00000000
Binary files a/data/themes/images/sl_left.png and /dev/null differ
diff --git a/data/themes/images/sl_right.png b/data/themes/images/sl_right.png
deleted file mode 100644
index 668edade..00000000
Binary files a/data/themes/images/sl_right.png and /dev/null differ
diff --git a/data/themes/images/sl_stripe.png b/data/themes/images/sl_stripe.png
deleted file mode 100644
index 7a80357a..00000000
Binary files a/data/themes/images/sl_stripe.png and /dev/null differ
diff --git a/data/themes/images/sl_top.png b/data/themes/images/sl_top.png
deleted file mode 100644
index cc0644e3..00000000
Binary files a/data/themes/images/sl_top.png and /dev/null differ
diff --git a/data/themes/images/strobe-600.png b/data/themes/images/strobe-600.png
new file mode 100644
index 00000000..4bee1f75
Binary files /dev/null and b/data/themes/images/strobe-600.png differ
diff --git a/data/themes/images/icon_about.svg b/data/themes/images/svg/icon_about.svg
similarity index 100%
rename from data/themes/images/icon_about.svg
rename to data/themes/images/svg/icon_about.svg
diff --git a/data/themes/images/icon_close.svg b/data/themes/images/svg/icon_close.svg
similarity index 100%
rename from data/themes/images/icon_close.svg
rename to data/themes/images/svg/icon_close.svg
diff --git a/data/themes/images/icon_copy.svg b/data/themes/images/svg/icon_copy.svg
similarity index 100%
rename from data/themes/images/icon_copy.svg
rename to data/themes/images/svg/icon_copy.svg
diff --git a/data/themes/images/icon_new.svg b/data/themes/images/svg/icon_new.svg
similarity index 100%
rename from data/themes/images/icon_new.svg
rename to data/themes/images/svg/icon_new.svg
diff --git a/data/themes/images/icon_paste.svg b/data/themes/images/svg/icon_paste.svg
similarity index 100%
rename from data/themes/images/icon_paste.svg
rename to data/themes/images/svg/icon_paste.svg
diff --git a/data/themes/images/icon_settings.svg b/data/themes/images/svg/icon_settings.svg
similarity index 100%
rename from data/themes/images/icon_settings.svg
rename to data/themes/images/svg/icon_settings.svg
diff --git a/data/themes/images/svg/icon_split_h.svg b/data/themes/images/svg/icon_split_h.svg
new file mode 100644
index 00000000..3a9333c6
--- /dev/null
+++ b/data/themes/images/svg/icon_split_h.svg
@@ -0,0 +1,545 @@
+
+
diff --git a/data/themes/images/svg/icon_split_tab_btn.svg b/data/themes/images/svg/icon_split_tab_btn.svg
new file mode 100644
index 00000000..35b79472
--- /dev/null
+++ b/data/themes/images/svg/icon_split_tab_btn.svg
@@ -0,0 +1,543 @@
+
+
diff --git a/data/themes/images/svg/icon_split_v.svg b/data/themes/images/svg/icon_split_v.svg
new file mode 100644
index 00000000..e998c8a1
--- /dev/null
+++ b/data/themes/images/svg/icon_split_v.svg
@@ -0,0 +1,544 @@
+
+
diff --git a/data/themes/images/tab.xcf b/data/themes/images/tab.xcf
deleted file mode 100644
index e4de69b1..00000000
Binary files a/data/themes/images/tab.xcf and /dev/null differ
diff --git a/data/themes/images/tab_base_bottom.png b/data/themes/images/tab_base_bottom.png
deleted file mode 100644
index 96ded379..00000000
Binary files a/data/themes/images/tab_base_bottom.png and /dev/null differ
diff --git a/data/themes/images/tab_base_l0.png b/data/themes/images/tab_base_l0.png
deleted file mode 100644
index 0e4398f9..00000000
Binary files a/data/themes/images/tab_base_l0.png and /dev/null differ
diff --git a/data/themes/images/tab_base_l1.png b/data/themes/images/tab_base_l1.png
deleted file mode 100644
index 19f633c0..00000000
Binary files a/data/themes/images/tab_base_l1.png and /dev/null differ
diff --git a/data/themes/images/tab_base_m.png b/data/themes/images/tab_base_m.png
deleted file mode 100644
index 8329c853..00000000
Binary files a/data/themes/images/tab_base_m.png and /dev/null differ
diff --git a/data/themes/images/tab_base_r0.png b/data/themes/images/tab_base_r0.png
deleted file mode 100644
index f37a9337..00000000
Binary files a/data/themes/images/tab_base_r0.png and /dev/null differ
diff --git a/data/themes/images/tab_base_r1.png b/data/themes/images/tab_base_r1.png
deleted file mode 100644
index 74ab7c24..00000000
Binary files a/data/themes/images/tab_base_r1.png and /dev/null differ
diff --git a/data/themes/images/tab_bg_l0.png b/data/themes/images/tab_bg_l0.png
deleted file mode 100644
index 9c05cad0..00000000
Binary files a/data/themes/images/tab_bg_l0.png and /dev/null differ
diff --git a/data/themes/images/tab_bg_l1.png b/data/themes/images/tab_bg_l1.png
deleted file mode 100644
index 594b5339..00000000
Binary files a/data/themes/images/tab_bg_l1.png and /dev/null differ
diff --git a/data/themes/images/tab_bg_r0.png b/data/themes/images/tab_bg_r0.png
deleted file mode 100644
index cdeaf402..00000000
Binary files a/data/themes/images/tab_bg_r0.png and /dev/null differ
diff --git a/data/themes/images/tab_bg_r1.png b/data/themes/images/tab_bg_r1.png
deleted file mode 100644
index c5f6fc60..00000000
Binary files a/data/themes/images/tab_bg_r1.png and /dev/null differ
diff --git a/data/themes/images/tab_close_16.png b/data/themes/images/tab_close_16.png
deleted file mode 100644
index ac0a207b..00000000
Binary files a/data/themes/images/tab_close_16.png and /dev/null differ
diff --git a/data/themes/images/tab_close_8.png b/data/themes/images/tab_close_8.png
deleted file mode 100644
index 656bb479..00000000
Binary files a/data/themes/images/tab_close_8.png and /dev/null differ
diff --git a/data/themes/images/tab_other_l.png b/data/themes/images/tab_other_l.png
deleted file mode 100644
index b02388ac..00000000
Binary files a/data/themes/images/tab_other_l.png and /dev/null differ
diff --git a/data/themes/images/tab_other_m.png b/data/themes/images/tab_other_m.png
deleted file mode 100644
index 87141cb7..00000000
Binary files a/data/themes/images/tab_other_m.png and /dev/null differ
diff --git a/data/themes/images/tab_other_r.png b/data/themes/images/tab_other_r.png
deleted file mode 100644
index 80fd2165..00000000
Binary files a/data/themes/images/tab_other_r.png and /dev/null differ
diff --git a/data/themes/images/tab_shad.png b/data/themes/images/tab_shad.png
new file mode 100644
index 00000000..fea35928
Binary files /dev/null and b/data/themes/images/tab_shad.png differ
diff --git a/data/themes/images/tab_shad_l.png b/data/themes/images/tab_shad_l.png
new file mode 100644
index 00000000..3f2b7bec
Binary files /dev/null and b/data/themes/images/tab_shad_l.png differ
diff --git a/data/themes/images/tab_shad_r.png b/data/themes/images/tab_shad_r.png
new file mode 100644
index 00000000..b6a2689d
Binary files /dev/null and b/data/themes/images/tab_shad_r.png differ
diff --git a/data/themes/images/tiles.png b/data/themes/images/tiles.png
deleted file mode 100644
index 7e92bd15..00000000
Binary files a/data/themes/images/tiles.png and /dev/null differ
diff --git a/data/themes/images/mediactrl.xcf b/data/themes/images/xcf/mediactrl.xcf
similarity index 100%
rename from data/themes/images/mediactrl.xcf
rename to data/themes/images/xcf/mediactrl.xcf
diff --git a/data/themes/images/mediactrl2.xcf b/data/themes/images/xcf/mediactrl2.xcf
similarity index 100%
rename from data/themes/images/mediactrl2.xcf
rename to data/themes/images/xcf/mediactrl2.xcf
diff --git a/data/themes/meson.build b/data/themes/meson.build
index 1ef73d1c..0d92ef5c 100644
--- a/data/themes/meson.build
+++ b/data/themes/meson.build
@@ -28,7 +28,6 @@ default_deps = [
]
edje_to_compile = [
['default', default_deps],
- ['mild',['mild.edc', 'default/colors.edc'] ],
]
edje_install_dir = join_paths(get_option('datadir'),
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
deleted file mode 100644
index 55aa4df4..00000000
--- a/data/themes/mild.edc
+++ /dev/null
@@ -1,3246 +0,0 @@
-/* overlay to default to make theme easier on the eyes, less effects */
-
-
-#ifndef BG_COLOR_NO_ALPHA
-#define BG_COLOR_NO_ALPHA 48 48 48
-#endif
-#ifndef BG_COLOR
-#define BG_COLOR BG_COLOR_NO_ALPHA 255
-#endif
-#ifndef FG_COLOR_NO_ALPHA
-#define FG_COLOR_NO_ALPHA 170 170 170
-#endif
-#ifndef FG_COLOR
-#define FG_COLOR FG_COLOR_NO_ALPHA 255
-#endif
-#ifndef BG_COLOR_TRANSLUCENT
-#define BG_COLOR_TRANSLUCENT BG_COLOR_NO_ALPHA 200
-#endif
-#ifndef BG_COLOR_BELL_NO_ALPHA
-#define BG_COLOR_BELL_NO_ALPHA BG_COLOR_NO_ALPHA
-#endif
-#ifndef FG_COLOR_BELL_NO_ALPHA
-#define FG_COLOR_BELL_NO_ALPHA 255 153 51
-#endif
-
-
-collections {
- group { name: "terminology/background";
-
-#ifndef INHERIT_PROVIDE_OWN_COLORS
- color_classes {
-#define PROVIDE_CURSOR
- color_class { name: "CURSOR"; color: 220 220 220 255; }
-#include "default/colors.edc"
-#undef PROVIDE_CURSOR
- }
-#endif
-
- images {
- image: "bg_bevel.png" COMP;
- image: "bg_shine.png" COMP;
- image: "bg_glint.png" COMP;
- image: "bg_led_base.png" COMP;
- image: "bg_led.png" COMP;
- image: "bg_led_strobe.png" COMP;
- image: "cr_out.png" COMP;
- image: "pm_shadow.png" COMP;
- image: "pm_overlay.png" COMP;
- image: "pm_fill.png" COMP;
- image: "tab_bg_l0.png" COMP;
- image: "tab_bg_l1.png" COMP;
- image: "tab_bg_r0.png" COMP;
- image: "tab_bg_r1.png" COMP;
- image: "cr_glow.png" COMP;
- image: "cr_pulse.png" COMP;
- }
- set { name: "tab_close";
- image { image: "tab_close_8.png" COMP; size: 0 0 8 8; }
- image { image: "tab_close_16.png" COMP; size: 8 8 99999 99999; }
- }
- set { name: "tab_grouped";
- image { image: "tab_grouped_8.png" COMP; size: 0 0 8 8; }
- image { image: "tab_grouped_16.png" COMP; size: 8 8 16 16; }
- image { image: "tab_grouped_32.png" COMP; size: 16 16 99999 99999; }
- }
- sounds {
- sample { name: "bell" LOSSY 64;
- source: "bell.wav";
- }
- }
-
- script {
- public message(Msg_Type:type, id, ...) {
- new r, g, b, a, v;
-
- if ((type != MSG_INT) || (id != 1)) return;
-
- v = (getarg(2) * 255) / 100;
-
- custom_state(PART:"base", "default", 0.0);
- get_state_val(PART:"base", STATE_COLOR, r, g, b, a);
- set_state_val(PART:"base", STATE_COLOR, r, g, b, v);
- set_state(PART:"base", "custom", 0.0);
- }
- }
-
- parts {
- ////////////////////////////////////////////////////////////////////
- // background handling
-
- part { name: "focusclip"; type: RECT;
- clip_to: "bellclip";
- description { state: "default" 0.0;
- }
- description { state: "unfocused" 0.0;
- color: 255 255 255 240;
- color_class: "BG";
- }
- }
- program {
- signal: "focus,in";
- source: "terminology";
- action: STATE_SET "default" 0.0;
- transition: ACCELERATE 0.1;
- target: "focusclip";
- }
- program {
- signal: "focused,set";
- source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "focusclip";
- }
- program {
- signal: "focus,out";
- source: "terminology";
- action: STATE_SET "unfocused" 0.0;
- transition: ACCELERATE 0.1;
- target: "focusclip";
- }
-
- part { name: "base"; type: RECT;
- mouse_events: 1;
- clip_to: "focusclip";
- description { state: "default" 0.0;
- color: 255 255 255 255;
- color_class: "BG";
- }
- }
-
- ////////////////////////////////////////////////////////////////////
- // actual text grid for chars, cursors, selectiond etc. goes here
- part { name: "terminology.content"; type: SWALLOW;
- description { state: "default" 0.0;
- }
- }
-
- ////////////////////////////////////////////////////////////////////
- // indicator of other tabs and control {{{
- part { name: "tabcount_clip"; type: RECT;
- description { state: "default" 0.0;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "terminology.tabmissed.label"; type: TEXT; mouse_events: 0;
- effect: GLOW;
- scale: 1;
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tabcount.label";
- rel2.to: "terminology.tabcount.label";
- rel1.offset: -4 0;
- rel2.relative: 0.0 1.0;
- rel2.offset: -5 -1;
- color: 255 255 255 64;
- color2: 255 255 255 18;
- color3: 255 255 255 8;
- color_class: "TAB_MISSED";
- align: 1.0 0.5;
- text { font: "Sans"; size: 8;
- align: 1.0 0.5;
- min: 1 1;
- ellipsis: 0;
- }
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color2: 255 255 255 128;
- color3: 255 255 255 20;
- color_class: "TAB_MISSED_OVER";
- }
- }
- part { name: "terminology.tabcount.label"; type: TEXT; mouse_events: 0;
- scale: 1;
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tabcount.control";
- rel2.to: "terminology.tabcount.control";
- rel1.relative: -0.2 0.0;
- rel2.relative: -0.2 1.0;
- color: 255 255 255 64;
- color_class: "HIGHLIGHT";
- align: 1.0 0.5;
- text { font: "Sans"; size: 8;
- align: 1.0 0.5;
- min: 1 1;
- ellipsis: 0;
- }
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tabcount_r0"; type: RECT;
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- rel1.to: "terminology.tabcount.control";
- rel2.to: "terminology.tabcount.control";
- rel1.relative: 0.05 0.05;
- rel2.relative: 0.45 0.45;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tabcount_r1"; type: RECT;
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- rel1.to: "terminology.tabcount.control";
- rel2.to: "terminology.tabcount.control";
- rel1.relative: 0.55 0.05;
- rel2.relative: 0.95 0.45;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tabcount_r2"; type: RECT;
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- rel1.to: "terminology.tabcount.control";
- rel2.to: "terminology.tabcount.control";
- rel1.relative: 0.05 0.55;
- rel2.relative: 0.45 0.95;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tabcount_r3"; type: RECT;
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- rel1.to: "terminology.tabcount.control";
- rel2.to: "terminology.tabcount.control";
- rel1.relative: 0.55 0.55;
- rel2.relative: 0.95 0.95;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "terminology.tabcount.control"; type: SWALLOW;
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.relative: 1.0 0.0;
- rel1.offset: -3 2;
- rel1.to: "viewregion";
- rel2.relative: 1.0 0.0;
- rel2.offset: -3 2;
- rel2.to: "viewregion";
- align: 1.0 0.0;
- min: 16 16;
- }
- }
- part { name: "tabcount_ev"; type: RECT; repeat_events: 1;
- clip_to: "tabcount_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tabcount.control";
- rel2.to: "terminology.tabcount.control";
- color: 0 0 0 0;
- }
- }
-
- part { name: "terminology.tabregion"; type: SWALLOW;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "viewregion";
- rel2.relative: 1.0 0.0;
- }
- }
- part { name: "viewregion"; type: SWALLOW;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- }
- description { state: "tab" 0.0;
- inherit: "default" 0.0;
- rel1.to_y: "tabmiddle";
- rel1.relative: 0.0 1.0;
- }
- }
-
- program {
- signal: "mouse,in"; source: "tabcount_ev";
- action: STATE_SET "over" 0.0;
- transition: DECELERATE 0.5;
- target: "tabcount_r0";
- target: "tabcount_r1";
- target: "tabcount_r2";
- target: "tabcount_r3";
- target: "terminology.tabcount.label";
- target: "terminology.tabmissed.label";
- }
- program {
- signal: "mouse,out"; source: "tabcount_ev";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 2.0;
- target: "tabcount_r0";
- target: "tabcount_r1";
- target: "tabcount_r2";
- target: "tabcount_r3";
- target: "terminology.tabcount.label";
- target: "terminology.tabmissed.label";
- }
- program {
- signal: "mouse,clicked,1"; source: "tabcount_ev";
- action: SIGNAL_EMIT "tab,go" "terminology";
- }
- program {
- signal: "mouse,clicked,3"; source: "tabcount_ev";
- action: SIGNAL_EMIT "tab,new" "terminology";
- }
- program {
- signal: "mouse,wheel,0,1"; source: "tabcount_ev";
- action: SIGNAL_EMIT "tab,prev" "terminology";
- }
- program {
- signal: "mouse,wheel,0,-1"; source: "tabcount_ev";
- action: SIGNAL_EMIT "tab,next" "terminology";
- }
- program {
- signal: "tabcount,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
- target: "tabcount_clip";
- }
- program {
- signal: "tabcount,on"; source: "terminology";
- action: STATE_SET "on" 0.0;
- transition: DECELERATE 0.5;
- target: "tabcount_clip";
- }
- program {
- signal: "tabmissed,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
- target: "terminology.tabmissed.label";
- }
- program {
- signal: "tabmissed,on"; source: "terminology";
- action: STATE_SET "over" 0.0;
- transition: DECELERATE 0.2;
- target: "terminology.tabmissed.label";
- after: "tabmissed2";
- }
- program { name: "tabmissed2";
- signal: "tabmissed,on"; source: "terminology";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 3.0;
- target: "terminology.tabmissed.label";
- }
- // }}}
-
- ////////////////////////////////////////////////////////////////////
- // sendfile request {{{
- part { name: "sendfile_request_clip"; type: RECT;
- description { state: "default" 0.0;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "sendfile_request_shadow";
- mouse_events: 0;
- clip_to: "sendfile_request_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel.to: "sendfile_request_bg";
- rel1.offset: -32 -32;
- rel2.offset: 31 31;
- image.normal: "pm_shadow.png";
- image.border: 64 64 64 64;
- fill.smooth: 0;
- }
- }
- part { name: "sendfile_request_bg"; type: RECT;
- clip_to: "sendfile_request_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- color: 255 255 255 255;
- color_class: "BG_SENDFILE";
- rel1.relative: 0.0 -1.0;
- rel2.relative: 1.0 0.0;
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- }
- }
- part { name: "terminology.sendfile.request"; type: SWALLOW;
- clip_to: "sendfile_request_clip";
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel.to: "sendfile_request_bg";
- rel1.offset: 4 4;
- rel2.offset: -5 -5;
- #if HAS_OFFSCALE
- offscale;
- #endif
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- }
- }
- program {
- signal: "sendfile,request,on"; source: "terminology";
- action: ACTION_STOP;
- target: "sendfile_request_on";
- target: "sendfile_request_off";
- }
- program {
- signal: "sendfile,request,off"; source: "terminology";
- action: ACTION_STOP;
- target: "sendfile_request_on";
- target: "sendfile_request_off";
- }
- program { name: "sendfile_request_on";
- signal: "sendfile,request,on"; source: "terminology";
- in: 0.5 0.0;
- action: STATE_SET "on" 0.0;
- transition: DECELERATE 0.5;
- target: "sendfile_request_clip";
- target: "sendfile_request_bg";
- }
- program { name: "sendfile_request_off";
- signal: "sendfile,request,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
- target: "sendfile_request_clip";
- target: "sendfile_request_bg";
- }
- // }}}
- ////////////////////////////////////////////////////////////////////
- // sendfile progress {{{
- part { name: "sendfile_progress_clip"; type: RECT;
- description { state: "default" 0.0;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "sendfile_progress_shadow";
- mouse_events: 0;
- clip_to: "sendfile_progress_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel.to: "sendfile_progress_bg";
- rel1.offset: -32 -32;
- rel2.offset: 31 31;
- image.normal: "pm_shadow.png";
- image.border: 64 64 64 64;
- fill.smooth: 0;
- }
- }
- part { name: "sendfile_progress_bg"; type: RECT;
- clip_to: "sendfile_progress_clip";
- scale : 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- color: 255 255 255 255;
- color_class: "BG_SENDFILE";
- rel.to: "terminology.sendfile.progress";
- rel1.offset: -4 -4;
- rel2.offset: 4 4;
- #if HAS_OFFSCALE
- offscale;
- #endif
- }
- }
- part { name: "terminology.sendfile.progress"; type: SWALLOW;
- clip_to: "sendfile_progress_clip";
- scale : 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.relative: 0.0 0.0;
- rel1.offset: 4 -5;
- rel2.relative: 1.0 0.0;
- rel2.offset: -5 -5;
- align: 0.5 1.0;
- #if HAS_OFFSCALE
- offscale;
- #endif
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- rel1.offset: 4 4;
- rel2.offset: -5 4;
- align: 0.5 0.0;
- }
- }
- program {
- signal: "sendfile,progress,on"; source: "terminology";
- action: ACTION_STOP;
- target: "sendfile_progress_on";
- target: "sendfile_progress_off";
- }
- program {
- signal: "sendfile,progress,off"; source: "terminology";
- action: ACTION_STOP;
- target: "sendfile_progress_on";
- target: "sendfile_progress_off";
- }
- program { name: "sendfile_progress_on";
- signal: "sendfile,progress,on"; source: "terminology";
- in: 0.5 0.0;
- action: STATE_SET "on" 0.0;
- transition: DECELERATE 0.5;
- target: "sendfile_progress_clip";
- target: "terminology.sendfile.progress";
- }
- program { name: "sendfile_progress_off";
- signal: "sendfile,progress,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
- target: "sendfile_progress_clip";
- target: "terminology.sendfile.progress";
- }
- // }}}
-
- ////////////////////////////////////////////////////////////////////
- // miniview {{{
- part { name: "terminology.miniview"; type: SWALLOW;
- description { state: "default" 0.0;
- rel1.to_x: "terminology.content";
- rel1.to_y: "viewregion";
- rel2.to: "terminology.content";
- visible: 0;
- fixed: 1 1;
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- program {
- signal: "miniview,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "terminology.miniview";
- }
- program {
- signal: "miniview,on"; source: "terminology";
- action: STATE_SET "on" 0.0;
- target: "terminology.miniview";
- }
- // }}}
-
- ////////////////////////////////////////////////////////////////////
- // tabs {{{
- part { name: "tab_bevel_bg0";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "tableft";
- rel2.to_y: "tableft";
- rel2.to_x: "tab_bevel_bg1";
- rel2.relative: 0.0 1.0;
- image.normal: "tab_bg_l0.png";
- image.border: 2 0 4 4;
- fill.smooth: 0;
- visible: 0;
- fixed: 1 1;
- }
- description { state: "tab" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "tab_bevel_bg1";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "tabmiddle";
- rel1.offset: -4 0;
- rel2.to: "tabmiddle";
- align: 0.0 0.0;
- max: 12 99999;
- min: 12 0;
- image.normal: "tab_bg_l1.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- visible: 0;
- fixed: 1 1;
- }
- description { state: "tab" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "tab_bevel_bg2"; type: SPACER;
- description { state: "default" 0.0;
- rel1.to: "tab_bevel_bg1";
- rel1.relative: 1.0 0.0;
- rel2.to: "tab_bevel_bg3";
- rel2.relative: 0.0 1.0;
- fixed: 1 1;
- }
- }
- part { name: "tab_bevel_bg3";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "tabmiddle";
- rel2.to: "tabmiddle";
- rel2.offset: 3 -1;
- align: 1.0 0.0;
- max: 12 99999;
- min: 12 0;
- image.normal: "tab_bg_r1.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- visible: 0;
- fixed: 1 1;
- }
- description { state: "tab" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "tab_bevel_bg4";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to_y: "tabright";
- rel1.to_x: "tab_bevel_bg3";
- rel1.relative: 1.0 0.0;
- rel2.to: "tabright";
- image.normal: "tab_bg_r0.png";
- image.border: 0 2 4 4;
- fill.smooth: 0;
- visible: 0;
- fixed: 1 1;
- }
- description { state: "tab" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
-
- part { name: "terminology.tabl.content"; type: SWALLOW;
- description { state: "default" 0.0;
- rel1.to: "tableft";
- rel2.to: "tableft";
- fixed: 1 1;
- }
- }
- part { name: "terminology.tabr.content"; type: SWALLOW;
- description { state: "default" 0.0;
- rel1.to: "tabright";
- rel2.to: "tabright";
- fixed: 1 1;
- }
- }
-
- program {
- signal: "tabbar,on"; source: "terminology";
- action: STATE_SET "tab" 0.0;
- target: "viewregion";
- target: "tableft";
- target: "tabmiddle";
- target: "tabright";
- target: "tab_bevel_bg0";
- target: "tab_bevel_bg1";
- target: "tab_bevel_bg3";
- target: "tab_bevel_bg4";
- target: "tabtitle";
- target: "tabclose";
- }
- program {
- signal: "tabbar,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "viewregion";
- target: "tableft";
- target: "tabmiddle";
- target: "tabright";
- target: "tab_bevel_bg0";
- target: "tab_bevel_bg1";
- target: "tab_bevel_bg3";
- target: "tab_bevel_bg4";
- target: "tabtitle";
- target: "tabclose";
- }
-
- program {
- signal: "tab_btn,on"; source: "terminology";
- action: STATE_SET "on" 0.0;
- target: "tab_btn_clip";
- target: "tab_btn_bg";
- target: "terminology.tab_btn";
- }
- program {
- signal: "tab_btn,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "tab_btn_clip";
- target: "tab_btn_bg";
- target: "terminology.tab_btn";
- }
- part { name: "tab_btn_clip"; type: RECT;
- description { state: "default" 0.0;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "tab_btn_bg";
- mouse_events: 0;
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tab_btn";
- rel2.to: "terminology.tab_btn";
- image.normal: "tab_bg_r0.png";
- image.border: 0 2 4 4;
- fill.smooth: 0;
- visible: 0;
- fixed: 1 1;
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "tab_btn_glow_r0";
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "tab_btn_r0";
- rel2.to: "tab_btn_r0";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 32;
- color_class: "GLOW";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
- part { name: "tab_btn_glow_r1";
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "tab_btn_r1";
- rel2.to: "tab_btn_r1";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 32;
- color_class: "GLOW";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
- part { name: "tab_btn_glow_r2";
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "tab_btn_r2";
- rel2.to: "tab_btn_r2";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 32;
- color_class: "GLOW";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
- part { name: "tab_btn_glow_r3";
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "tab_btn_r3";
- rel2.to: "tab_btn_r3";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 32;
- color_class: "GLOW";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
- part { name: "tab_btn_r0"; type: RECT;
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tab_btn";
- rel2.to: "terminology.tab_btn";
- rel1.relative: 0.05 0.05;
- rel2.relative: 0.45 0.45;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tab_btn_r1"; type: RECT;
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tab_btn";
- rel2.to: "terminology.tab_btn";
- rel1.relative: 0.55 0.05;
- rel2.relative: 0.95 0.45;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tab_btn_r2"; type: RECT;
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tab_btn";
- rel2.to: "terminology.tab_btn";
- rel1.relative: 0.05 0.55;
- rel2.relative: 0.45 0.95;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "tab_btn_r3"; type: RECT;
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tab_btn";
- rel2.to: "terminology.tab_btn";
- rel1.relative: 0.55 0.55;
- rel2.relative: 0.95 0.95;
- color: 255 255 255 32;
- color_class: "HIGHLIGHT";
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "HIGHLIGHT";
- }
- }
- part { name: "terminology.tab_btn"; type: SWALLOW;
- clip_to: "tab_btn_clip";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.relative: 1.0 0.0;
- rel2.to_y: "tabmiddle";
- color: 250 0 250 255;
- visible: 0;
- align: 1.0 0.0;
- fixed: 1 1;
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- min: 16 16;
- visible: 1;
- }
- }
- part { name: "tab_btn_ev"; type: RECT; repeat_events: 1;
- clip_to: "tab_btn_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.tab_btn";
- rel2.to: "terminology.tab_btn";
- color: 0 0 0 0;
- }
- }
- program {
- signal: "mouse,in"; source: "tab_btn_ev";
- action: STATE_SET "over" 0.0;
- transition: DECELERATE 0.5;
- target: "tab_btn_r0";
- target: "tab_btn_r1";
- target: "tab_btn_r2";
- target: "tab_btn_r3";
- target: "tab_btn_glow_r0";
- target: "tab_btn_glow_r1";
- target: "tab_btn_glow_r2";
- target: "tab_btn_glow_r3";
- }
- program {
- signal: "mouse,out"; source: "tab_btn_ev";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 2.0;
- target: "tab_btn_r0";
- target: "tab_btn_r1";
- target: "tab_btn_r2";
- target: "tab_btn_r3";
- target: "tab_btn_glow_r0";
- target: "tab_btn_glow_r1";
- target: "tab_btn_glow_r2";
- target: "tab_btn_glow_r3";
- }
- program {
- signal: "mouse,clicked,1"; source: "tab_btn_ev";
- action: SIGNAL_EMIT "tab,go" "terminology";
- }
- program {
- signal: "mouse,clicked,3"; source: "tab_btn_ev";
- action: SIGNAL_EMIT "tab,new" "terminology";
- }
- program {
- signal: "mouse,wheel,0,1"; source: "tab_btn_ev";
- action: SIGNAL_EMIT "tab,prev" "terminology";
- }
- program {
- signal: "mouse,wheel,0,-1"; source: "tab_btn_ev";
- action: SIGNAL_EMIT "tab,next" "terminology";
- }
-
- part { name: "terminology.tab"; type: SWALLOW;
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.relative: 1.0 0.0;
- rel1.to_x: "terminology.tabl";
- rel2.relative: 0.0 0.0;
- rel2.to_x: "terminology.tabr";
- align: 0.5 0.0;
- visible: 0;
- fixed: 1 1;
- }
- }
- // some slot for dragable parts to stayt in along top edge of bg
- part { name: "tabdrag"; type: SPACER;
- description { state: "default" 0.0;
- rel2.relative: 0.0 0.0;
- rel2.to_x: "terminology.tab_btn";
- fixed: 1 1;
- }
- description { state: "hdrag,off" 0.0;
- inherit: "default" 0.0;
- }
- description { state: "drag_over" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.2 0.0;
- rel2.to_x: "terminology.tabregion";
- rel2.relative: 0.8 0.0;
- }
- }
- program {
- name: "drag_over_tabs,on";
- signal: "drag_over_tabs,on"; source: "terminology";
- action: STATE_SET "drag_over" 0.0;
- target: "tabdrag";
- after: "drag_over_tabs,pulse";
- }
- program {
- name: "drag_over_tabs,pulse";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.6;
- target: "tabdrag";
- after: "drag_over_tabs,pulse2";
- }
- program {
- name: "drag_over_tabs,pulse2";
- transition: ACCELERATE 0.6;
- action: STATE_SET "drag_over" 0.0;
- target: "tabdrag";
- after: "drag_over_tabs,pulse";
- }
- program {
- signal: "drag_over_tabs,off"; source: "terminology";
- action: ACTION_STOP;
- target: "drag_over_tabs,on";
- target: "drag_over_tabs,pulse";
- target: "drag_over_tabs,pulse2";
- after: "drag_over_tabs,off2";
- }
- program {
- name: "drag_over_tabs,off2";
- action: STATE_SET "default" 0.0;
- target: "tabdrag";
- }
- program {
- signal: "hdrag,on"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "tabdrag";
- target: "drag_left_pulse";
- target: "drag_left_outline";
- target: "drag_left_rect";
- target: "drag_right_pulse";
- target: "drag_right_outline";
- target: "drag_right_rect";
- target: "drag_top_pulse";
- target: "drag_top_outline";
- target: "drag_top_rect";
- target: "drag_bottom_pulse";
- target: "drag_bottom_outline";
- target: "drag_bottom_rect";
- }
- program {
- signal: "hdrag,off"; source: "terminology";
- action: STATE_SET "hdrag,off" 0.0;
- target: "tabdrag";
- target: "drag_left_pulse";
- target: "drag_left_outline";
- target: "drag_left_rect";
- target: "drag_right_pulse";
- target: "drag_right_outline";
- target: "drag_right_rect";
- target: "drag_top_pulse";
- target: "drag_top_outline";
- target: "drag_top_rect";
- target: "drag_bottom_pulse";
- target: "drag_bottom_outline";
- target: "drag_bottom_rect";
- }
- // left boundary of the active tab (dragable 0.0 -> 1.0)
- part { name: "terminology.tabl"; type: SPACER;
- dragable.x: 1 1 0;
- dragable.confine: "tabdrag";
- description { state: "default" 0.0;
- rel2.relative: 1.0 0.0;
- max: 1 1;
- fixed: 1 1;
- }
- }
- // right boundary of the active tab (dragable 0.0 -> 1.0)
- part { name: "terminology.tabr"; type: SPACER;
- dragable.x: 1 1 0;
- dragable.confine: "tabdrag";
- description { state: "default" 0.0;
- rel2.relative: 0.0 0.0;
- rel2.to_x: "tabdrag";
- max: 1 1;
- fixed: 1 1;
- }
- }
-
- part { name: "tabgrouped"; type: IMAGE;
- scale: 1;
- description { state: "default" 0.0;
- aspect: 1.0 1.0; aspect_preference: BOTH;
- align: 0.0 0.5;
- min: 0 0;
- max: 0 0;
- fixed: 1 1;
- rel1 {
- to_x: "tab_bevel_bg2";
- to_y: "tabmiddle";
- relative: 0.0 0.3;
- offset: -1 0;
- }
- rel2 {
- to_x: "tab_bevel_bg2";
- to_y: "tabmiddle";
- relative: 1.0 0.7;
- }
- visible: 0;
- }
- description { state: "grouped" 0.0;
- inherit: "default" 0.0;
- min: 8 8;
- max: 32 32;
- image.normal: "tab_grouped";
- rel1 {
- to_y: "tabmiddle";
- to_x: "tab_bevel_bg2";
- relative: 0.0 0.3;
- }
- rel2 {
- to_y: "tabmiddle";
- to_x: "tab_bevel_bg2";
- relative: 1.0 0.7;
- }
- color: 255 255 255 255;
- color_class: "FG";
- visible: 1;
- }
- }
- program {
- signal: "grouped,on"; source: "terminology";
- action: STATE_SET "grouped" 0.0;
- target: "tabgrouped";
- }
- program {
- signal: "grouped,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "tabgrouped";
- }
-
- part { name: "terminology.tab.title"; type: TEXT; mouse_events: 0;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- text { font: "Sans:style=Bold"; size: 10;
- align: 0.5 0.0;
- min: 0 1;
- }
- align: 0.5 0.0;
- rel1.to_x: "tabgrouped";
- rel1.offset: 2 2;
- rel1.relative: 1.0 0.0;
- rel2.to_x: "tabgrouped";
- rel2.offset: -1 2;
- rel2.relative: 1.0 0.0;
- visible: 0;
- fixed: 1 1;
- }
- }
- part { name: "tabtitle"; type: TEXT; mouse_events: 0;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- color: 255 255 255 255;
- color_class: "FG";
- text { font: "Sans:style=Bold"; size: 10;
- align: 0.5 0.5;
- min: 0 1;
- text_source: "terminology.tab.title";
- }
- align: 0.5 0.5;
- rel1.to_x: "tabgrouped";
- rel1.to_y: "tabmiddle";
- rel1.relative: 1.0 0.0;
- rel1.offset: 2 0;
- rel2.to_x: "tabclose";
- rel2.to_y: "tabmiddle";
- rel2.relative: 0.0 1.0;
- visible: 0;
- fixed: 1 1;
- }
- description { state: "tab" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description { state: "bell" 0.0;
- inherit: "tab" 0.0;
- }
- }
- program { name: "tab,bell,on";
- signal: "tab,bell,on"; source: "terminology";
- action: STATE_SET "bell" 0.0;
- target: "tabtitle";
- }
- program { name: "tab,bell,off";
- signal: "tab,bell,off"; source: "terminology";
- action: STATE_SET "tab" 0.0;
- target: "tabtitle";
- }
- part { name: "tablimit0"; type: SPACER;
- description { state: "default" 0.0;
- rel1.to_y: "terminology.tab";
- rel1.relative: 0.0 1.0;
- rel2.to_y: "terminology.tab.title";
- align: 0.0 0.0;
- fixed: 1 1;
- }
- }
-
- part { name: "tableft"; type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- rel2.to_x: "terminology.tab";
- rel2.to_y: "tabmiddle";
- rel2.relative: 0.0 1.0;
- color: 0 0 0 0;
- visible: 0;
- fixed: 1 1;
- }
- description { state: "tab" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "tabright"; type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "terminology.tab";
- rel1.relative: 1.0 0.0;
- rel2.to_y: "tabmiddle";
- color: 0 0 0 0;
- visible: 0;
- fixed: 1 1;
- }
- description { state: "tab" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "tabmiddle"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "terminology.tab";
- rel2.to_x: "terminology.tab";
- rel2.to_y: "tablimit0";
- rel2.offset: -1 0;
- color: 0 0 0 0;
- align: 0.0 0.0;
- visible: 0;
- fixed: 1 1;
- }
- description { state: "tab" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "tabclose"; type: IMAGE;
- scale: 1;
- description { state: "default" 0.0;
- aspect: 1.0 1.0; aspect_preference: BOTH;
- align: 1.0 0.5;
- image.normal: "tab_close";
- rel1 {
- to_y: "tabmiddle";
- to_x: "tab_bevel_bg3";
- relative: 0.0 0.3;
- }
- rel2 {
- to_y: "tabmiddle";
- to_x: "tab_bevel_bg3";
- relative: 0.0 0.7;
- }
- min: 8 8;
- max: 16 16;
- fixed: 1 1;
- visible: 0;
- }
- description { state: "tab" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 80;
- color_class: "FG";
- visible: 1;
- }
- description { state: "over" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "FG";
- visible: 1;
- }
- }
- program {
- signal: "mouse,in"; source: "tabclose";
- action: STATE_SET "over" 0.0;
- target: "tabclose";
- }
- program {
- signal: "mouse,out"; source: "tabclose";
- action: STATE_SET "tab" 0.0;
- target: "tabclose";
- }
- program {
- signal: "mouse,clicked,1"; source: "tabclose";
- action: SIGNAL_EMIT "tab,close" "terminology";
- }
-
- program {
- signal: "mouse,up,1"; source: "tabmiddle";
- action: SIGNAL_EMIT "tab,drag,stop" "terminology";
- }
- program {
- signal: "mouse,move"; source: "tabmiddle";
- script {
- new y, h, drag_x, drag_w;
- new state[31]; \
- new Float:vl;
-
- if (!get_mouse_buttons())
- return;
- get_state(PART:"tabdrag", state, 30, vl);
- if (!strcmp(state, "hdrag,off")) {
- emit("tab,drag,move", "terminology");
- return
- }
- get_geometry(PART:"tabdrag", drag_x, y, drag_w, h);
- if (drag_w > 0) {
- new m_x, m_y;
- new Float:mid;
- new Float:d;
- new Float:v1;
- new Float:v2;
- new Float:n;
-
- get_mouse(m_x, m_y);
- mid = m_x - drag_x;
- mid = mid / drag_w;
-
- get_drag(PART:"terminology.tabl", v1, n);
- get_drag(PART:"terminology.tabr", v2, n);
-
- d = (v2 - v1) / 2;
- set_drag(PART:"terminology.tabl", mid - d, 0.0);
- set_drag(PART:"terminology.tabr", mid + d, 0.0);
- emit("tab,hdrag", "terminology");
- }
- }
- }
-
- program {
- signal: "mouse,down,1,double"; source: "tabmiddle";
- action: SIGNAL_EMIT "tab,title" "terminology";
- }
- program {
- signal: "mouse,down,1"; source: "tabmiddle";
- action: SIGNAL_EMIT "tab,mouse,down" "terminology";
- }
- program {
- signal: "mouse,up,1"; source: "tabmiddle";
- action: SIGNAL_EMIT "tab,mouse,up" "terminology";
- }
- // }}}
-
- ////////////////////////////////////////////////////////////////////
- // visual bell - spinning red siren light {{{
- part { name: "bellclip"; type: RECT;
- description { state: "default" 0.0;
- }
- description { state: "pulse1" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 220;
- color_class: "BG";
- }
- description { state: "pulse2" 0.0;
- inherit: "default" 0.0;
- }
- }
- part { name: "belloverlay"; type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "pulse1" 0.0;
- inherit: "default" 0.0;
- }
- description { state: "pulse2" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 32;
- color_class: "BG";
- visible: 1;
- }
- }
-
- part { name: "bell_base";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- min: 32 32;
- max: 32 32;
- rel2.offset: -1 -1;
- align: 1.0 1.0;
- image.normal: "bg_led_base.png";
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "bell";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell_base";
- rel2.to: "bell_base";
- image.normal: "bg_led.png";
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "bell_strobe";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell";
- rel2.to: "bell";
- image.normal: "bg_led_strobe.png";
- map {
- on: 1;
- smooth: 1;
- rotation.center: "bell";
- }
- }
- description { state: "spin" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- map.rotation.z: 36.0;
- }
- description { state: "spin_done" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- color: 255 255 255 0;
- map.rotation.z: 684.0;
- }
- }
- program {
- signal: "bell,ring"; source: "terminology";
- action: PLAY_SAMPLE "bell" 1.0 ALERT;
- }
- program {
- signal: "bell";
- source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "bellclip";
- target: "belloverlay";
- after: "bellclip_bell.2";
- }
- program {
- name: "bellclip_bell.2";
- action: STATE_SET "pulse1" 0.0;
- transition: ACCELERATE 0.2;
- target: "bellclip";
- target: "belloverlay";
- after: "bellclip_bell.3";
- }
- program {
- name: "bellclip_bell.3";
- action: STATE_SET "pulse2" 0.0;
- transition: ACCELERATE 0.2;
- target: "bellclip";
- target: "belloverlay";
- after: "bellclip_bell.4";
- }
- program {
- name: "bellclip_bell.4";
- action: STATE_SET "default" 0.0;
- transition: ACCELERATE 0.2;
- target: "bellclip";
- target: "belloverlay";
- }
- program { name: "bell0";
- signal: "bell";
- source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "bell_base";
- target: "bell";
- target: "bell_strobe";
- after: "bell";
- }
- program { name: "bell";
- action: STATE_SET "visible" 0.0;
- target: "bell_base";
- after: "bell2";
- }
- program { name: "bell2";
- action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.1;
- target: "bell";
- after: "bell3";
- }
- program { name: "bell3";
- action: STATE_SET "spin" 0.0;
- transition: LINEAR 0.1;
- target: "bell_strobe";
- after: "bell4.0";
- after: "bell4.1";
- after: "bell4.2";
- }
- program { name: "bell4.0";
- action: STATE_SET "default" 0.0;
- transition: ACCELERATE 1.2;
- target: "bell";
- }
- program { name: "bell4.1";
- action: STATE_SET "default" 0.0;
- transition: ACCELERATE 1.6;
- target: "bell_base";
- }
- program { name: "bell4.2";
- action: STATE_SET "spin_done" 0.0;
- transition: LINEAR 0.9;
- target: "bell_strobe";
- }
- // }}}
-
- ////////////////////////////////////////////////////////////////////
- // Drag target areas {{{
- #define DRAG_TARGET(DIR, REL_ONE, REL_TWO) \
- part { name: "drag_"##DIR##"_rect"; \
- type: RECT; \
- description { state: "default" 0.0; \
- rel1.to: "drag_"##DIR##"_outline"; \
- rel2.to: "drag_"##DIR##"_outline"; \
- color: 255 255 255 40; \
- color_class: "FG"; \
- visible: 0; \
- } \
- description { state: "hdrag,off" 0.0; \
- inherit: "default" 0.0; \
- visible: 1; \
- } \
- } \
- part { name: "drag_"##DIR##"_pulse"; \
- mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.offset: -4 -4; \
- rel1.to: "drag_"##DIR##"_outline"; \
- rel2.offset: 3 3; \
- rel2.to: "drag_"##DIR##"_outline"; \
- image { \
- normal: "cr_pulse.png"; \
- border: 4 4 4 4; \
- } \
- color: 255 255 255 64; \
- color_class: "HIGHLIGHT"; \
- visible: 0; \
- } \
- description { state: "hdrag,off" 0.0; \
- inherit: "default" 0.0; \
- } \
- description { state: "on" 0.0; \
- inherit: "default" 0.0; \
- color: 255 255 255 255; \
- color_class: "HIGHLIGHT"; \
- visible: 1; \
- } \
- description { state: "out" 0.0; \
- inherit: "default" 0.0; \
- color: 255 255 255 0; \
- color_class: "HIGHLIGHT"; \
- rel1.offset: -8 -8; \
- rel2.offset: 7 7; \
- visible: 1; \
- } \
- } \
- part { name: "drag_"##DIR##"_outline"; \
- mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "viewregion"; \
- rel1.relative: REL_ONE; \
- rel2.to: "viewregion"; \
- rel2.relative: REL_TWO; \
- image { \
- normal: "cr_out.png"; \
- border: 3 3 3 3; \
- } \
- color: 255 255 255 80; \
- color_class: "HIGHLIGHT"; \
- visible: 0; \
- } \
- description { state: "hdrag,off" 0.0; \
- inherit: "default" 0.0; \
- visible: 1; \
- } \
- description { state: "active" 0.0; \
- inherit: "default" 0.0; \
- color: 255 255 255 255; \
- color_class: "HIGHLIGHT"; \
- visible: 1; \
- } \
- } \
- program { \
- name: "drag_"##DIR##",on"; \
- signal: "drag_"##DIR##",on"; source: "terminology"; \
- action: STATE_SET "active" 0.0; \
- target: "drag_"##DIR##"_outline"; \
- after: "drag_"##DIR##",on2"; \
- after: "drag_"##DIR##"_pulse"; \
- } \
- program { name: "drag_"##DIR##",on2"; \
- in: 0.5 0.0; \
- action: STATE_SET "default" 0.0; \
- transition: DECELERATE 0.5; \
- target: "drag_"##DIR##"_outline"; \
- after: "drag_"##DIR##",on3"; \
- } \
- program { name: "drag_"##DIR##",on3"; \
- in: 0.5 0.0; \
- action: STATE_SET "active" 0.0; \
- target: "drag_"##DIR##"_outline"; \
- after: "drag_"##DIR##",on2"; \
- after: "drag_"##DIR##"_pulse"; \
- } \
- program { name: "drag_"##DIR##"_pulse"; \
- action: STATE_SET "on" 0.0; \
- target: "drag_"##DIR##"_pulse"; \
- after: "drag_"##DIR##"_pulse2"; \
- } \
- program { name: "drag_"##DIR##"_pulse2"; \
- action: STATE_SET "out" 0.0; \
- transition: DECELERATE 0.5; \
- target: "drag_"##DIR##"_pulse"; \
- } \
- program { \
- signal: "drag_"##DIR##",off"; source: "terminology"; \
- action: ACTION_STOP; \
- target: "drag_"##DIR##",on"; \
- target: "drag_"##DIR##",on2"; \
- target: "drag_"##DIR##",on3"; \
- target: "drag_"##DIR##"_pulse"; \
- target: "drag_"##DIR##"_pulse2"; \
- after: "drag_"##DIR##",off2"; \
- } \
- program { name: "drag_"##DIR##",off2"; \
- action: STATE_SET "default" 0.0; \
- target: "drag_"##DIR##"_outline"; \
- }
-
- DRAG_TARGET(left, 0.0 0.2, 0.15 0.8)
- DRAG_TARGET(right, 0.85 0.2, 1.0 0.8)
- DRAG_TARGET(top, 0.2 0.0, 0.8 0.2)
- DRAG_TARGET(bottom, 0.2 0.8, 0.8 1.0)
- // }}}
-
- ////////////////////////////////////////////////////////////////////
- // popup media over the terminal (until dismissed) {{{
- part { name: "popmedia_clip"; type: RECT;
- mouse_events: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "popmedia_shadow";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1 {
- to: "terminology.popmedia";
- }
- rel2 {
- to: "terminology.popmedia";
- }
- image.normal: "pm_shadow.png";
- image.border: 64 64 64 64;
- image.border_scale_by: 0.1;
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.offset: -32 -32;
- rel2.offset: 31 31;
- image.border_scale_by: 1.0;
- visible: 1;
- }
- }
- part { name: "popmedia_fill";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.popmedia";
- rel2.to: "terminology.popmedia";
- image.normal: "pm_fill.png";
- fill {
- size.relative: 0.0 0.0;
- size.offset: 64 64;
- }
- }
- }
- part { name: "terminology.popmedia"; type: SWALLOW;
- clip_to: "popmedia_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.relative: 0.5 0.5;
- rel2.relative: 0.5 0.5;
- visible: 0;
- }
- description { state: "image" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.1 0.1;
- rel2.relative: 0.9 0.9;
- visible: 1;
- }
- description { state: "scale" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.1 0.1;
- rel2.relative: 0.9 0.9;
- visible: 1;
- }
- description { state: "edje" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.1 0.1;
- rel2.relative: 0.9 0.9;
- visible: 1;
- }
- description { state: "movie" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.1 0.1;
- rel2.relative: 0.9 0.9;
- visible: 1;
- }
- }
- part { name: "popmedia_overlay";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.popmedia";
- rel2.to: "terminology.popmedia";
- image.normal: "pm_overlay.png";
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "popmedia_bevel";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.popmedia";
- rel2.to: "terminology.popmedia";
- image.normal: "bg_bevel.png";
- image.border: 3 3 5 3;
- image.middle: 0;
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "popmedia_glintclip"; type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "popmedia_glint";
- mouse_events: 0;
- clip_to: "popmedia_glintclip";
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 79 5;
- max: 79 5;
- rel1 {
- to: "terminology.popmedia";
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- to: "terminology.popmedia";
- relative: 1.0 0.0;
- offset: -1 0;
- }
- image.normal: "bg_glint.png";
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "popmedia_shine";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.popmedia";
- rel2.to: "terminology.popmedia";
- image.normal: "bg_shine.png";
- fill.smooth: 0;
- align: 0.5 0.0;
- aspect: (255/120) (255/120);
- aspect_preference: HORIZONTAL;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "popmedia_dismiss"; type: RECT;
- mouse_events: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- color: 0 0 0 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- program { name: "popmedia_dismiss";
- signal: "mouse,clicked,*";
- source: "popmedia_dismiss";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
- target: "terminology.popmedia";
- target: "popmedia_clip";
- target: "popmedia_dismiss";
- target: "popmedia_shadow";
- target: "popmedia_fill";
- target: "popmedia_overlay";
- target: "popmedia_bevel";
- target: "popmedia_glint";
- target: "popmedia_glintclip";
- target: "popmedia_shine";
- after: "popmedia_dismiss2";
- }
- program { name: "popmedia_dismiss2";
- action: SIGNAL_EMIT "popmedia,done" "terminology";
- }
- program { name: "popmedia_off";
- signal: "popmedia,off";
- source: "terminology";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.2;
- target: "terminology.popmedia";
- target: "popmedia_clip";
- target: "popmedia_dismiss";
- target: "popmedia_shadow";
- target: "popmedia_fill";
- target: "popmedia_overlay";
- target: "popmedia_bevel";
- target: "popmedia_glint";
- target: "popmedia_glintclip";
- target: "popmedia_shine";
- after: "popmedia_dismiss2";
- }
- program { name: "popmedia_img";
- signal: "popmedia,image";
- source: "terminology";
- action: STATE_SET "image" 0.0;
- transition: DECELERATE 0.2;
- target: "terminology.popmedia";
- }
- program { name: "popmedia_scale";
- signal: "popmedia,scale";
- source: "terminology";
- action: STATE_SET "scale" 0.0;
- transition: DECELERATE 0.2;
- target: "terminology.popmedia";
- }
- program { name: "popmedia_edje";
- signal: "popmedia,edje";
- source: "terminology";
- action: STATE_SET "edje" 0.0;
- transition: DECELERATE 0.2;
- target: "terminology.popmedia";
- }
- program { name: "popmedia_mov";
- signal: "popmedia,movie";
- source: "terminology";
- action: STATE_SET "movie" 0.0;
- transition: DECELERATE 0.2;
- target: "terminology.popmedia";
- }
- program { name: "popmedia_img2";
- signal: "popmedia,image";
- source: "terminology";
- action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.2;
- target: "popmedia_clip";
- target: "popmedia_dismiss";
- target: "popmedia_shadow";
- target: "popmedia_overlay";
- target: "popmedia_bevel";
- target: "popmedia_glint";
- target: "popmedia_glintclip";
- target: "popmedia_shine";
- }
- program { name: "popmedia_scale2";
- signal: "popmedia,scale";
- source: "terminology";
- action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.2;
- target: "popmedia_clip";
- target: "popmedia_dismiss";
- target: "popmedia_shadow";
- target: "popmedia_overlay";
- target: "popmedia_bevel";
- target: "popmedia_glint";
- target: "popmedia_glintclip";
- target: "popmedia_shine";
- }
- program { name: "popmedia_edje2";
- signal: "popmedia,edje";
- source: "terminology";
- action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.2;
- target: "popmedia_clip";
- target: "popmedia_dismiss";
- target: "popmedia_shadow";
- target: "popmedia_overlay";
- target: "popmedia_bevel";
- target: "popmedia_glint";
- target: "popmedia_glintclip";
- target: "popmedia_shine";
- }
- program { name: "popmedia_mov2";
- signal: "popmedia,movie";
- source: "terminology";
- action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.2;
- target: "popmedia_clip";
- target: "popmedia_dismiss";
- target: "popmedia_shadow";
- target: "popmedia_overlay";
- target: "popmedia_bevel";
- target: "popmedia_glint";
- target: "popmedia_glintclip";
- target: "popmedia_shine";
- }
- // }}}
- }
- }
-
- group { name: "terminology/tabbar_back"; // {{{
- images {
- image: "tab_other_l.png" COMP;
- image: "tab_other_m.png" COMP;
- image: "tab_other_r.png" COMP;
- image: "tab_shad_l2.png" COMP;
- image: "tab_shad_r2.png" COMP;
- }
- set { name: "tab_grouped";
- image { image: "tab_grouped_8.png" COMP; size: 0 0 8 8; }
- image { image: "tab_grouped_16.png" COMP; size: 8 8 16 16; }
- image { image: "tab_grouped_32.png" COMP; size: 16 16 99999 99999; }
- }
- parts {
- part { name: "tab_bevel_shad1";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.to: "tab_base_top1";
- rel2.to: "tab_base_top1";
- image.normal: "tab_shad_l2.png";
- image.border: 0 0 10 10;
- fill.smooth: 0;
- }
- }
- part { name: "tab_bevel_shad3";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.to: "tab_base_top3";
- rel2.to: "tab_base_top3";
- image.normal: "tab_shad_r2.png";
- image.border: 0 0 10 10;
- fill.smooth: 0;
- }
- }
- part { name: "tab_base_top1";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- align: 0.0 0.0;
- rel1.offset: -4 0;
- max: 12 99999;
- min: 12 0;
- image.normal: "tab_other_l.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- }
- }
- part { name: "tab_base_top2";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.to: "tab_base_top1";
- rel1.relative: 1.0 0.0;
- rel2.to: "tab_base_top3";
- rel2.relative: 0.0 1.0;
- image.normal: "tab_other_m.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- }
- }
- part { name: "tab_base_top3";
- mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- align: 1.0 0.0;
- rel2.offset: 3 -1;
- max: 12 99999;
- min: 12 0;
- image.normal: "tab_base_r1.png";
- image.normal: "tab_other_r.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- }
- }
- part { name: "tabgrouped"; type: IMAGE;
- scale: 1;
- description { state: "default" 0.0;
- aspect: 1.0 1.0; aspect_preference: BOTH;
- align: 0.0 0.5;
- min: 0 0;
- max: 0 0;
- fixed: 1 1;
- rel1 {
- to: "tab_base_top2";
- relative: 0.0 0.3;
- offset: -1 0;
- }
- rel2 {
- to: "tab_base_top2";
- relative: 1.0 0.7;
- }
- visible: 0;
- }
- description { state: "grouped" 0.0;
- inherit: "default" 0.0;
- min: 8 8;
- max: 32 32;
- image.normal: "tab_grouped";
- rel1 {
- to: "tab_base_top2";
- relative: 0.0 0.3;
- }
- rel2 {
- to: "tab_base_top2";
- relative: 1.0 0.7;
- }
- color: 255 255 255 255;
- color_class: "FG";
- visible: 1;
- }
- }
- program {
- signal: "grouped,on"; source: "terminology";
- action: STATE_SET "grouped" 0.0;
- target: "tabgrouped";
- }
- program {
- signal: "grouped,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "tabgrouped";
- }
- part { name: "terminology.title"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- text { font: "Sans:style=Bold"; size: 10;
- align: 0.5 0.5;
- min: 0 1;
- }
- align: 0.5 0.5;
- color: 255 255 255 255;
- color_class: "TAB_TITLE";
- rel1 {
- to_x: "tabgrouped";
- to_y: "tab_base_top2";
- relative: 1.0 0.0;
- offset: 2 0;
- }
- rel2.to: "tab_base_top2";
- }
- description { state: "bell" 0.0;
- inherit: "default" 0.0;
- }
- }
- part { name: "clip"; type: RECT;
- description { state: "default" 0.0;
- rel2.offset: -1 -2;
- }
- }
- part { name: "event"; type: RECT;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- program {
- signal: "mouse,clicked,1"; source: "event";
- action: SIGNAL_EMIT "tab,activate" "terminology";
- }
- program { name: "bell";
- signal: "bell"; source: "terminology";
- action: STATE_SET "bell" 0.0;
- target: "terminology.title";
- }
- program { name: "bell,off";
- signal: "bell,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "terminology.title";
- }
- }
- } // }}}
-
- //////////////////////////////////////////////////////////////////////////////
- //// the cursor to show where text is typed
- group { name: "terminology/cursor"; // {{{
- images {
- image: "cr_key.png" COMP;
- image: "cr_out.png" COMP;
- }
- 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";
- }
- }
- parts {
- part { name: "pulsclip"; type: RECT;
- description { state: "default" 0.0;
- }
- description { state: "pulse" 0.0;
- color: 255 255 255 80;
- color_class: "CURSOR";
- }
- }
- part { name: "key";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1 {
- to: "outline";
- offset: -5 -5;
- }
- rel2 {
- to: "outline";
- offset: 4 4;
- }
- image {
- normal: "cr_key.png";
- border: 4 4 4 4;
- }
- color: 255 255 255 0;
- color_class: "CURSOR";
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
- }
- description { state: "out" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- color_class: "CURSOR";
- }
- }
- part { name: "outline";
- mouse_events: 0;
- clip_to: "pulsclip";
- description { state: "default" 0.0;
- image {
- normal: "cr_out.png";
- border: 3 3 3 3;
- }
- color: 255 255 255 64;
- color_class: "CURSOR";
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
- }
- }
- programs {
- program { name: "focus_in_noblink";
- signal: "focus,in,noblink";
- source: "terminology";
- action: STATE_SET "focused" 0.0;
- target: "outline";
- }
- program { name: "focus_in";
- signal: "focus,in";
- source: "terminology";
- action: STATE_SET "focused" 0.0;
- target: "outline";
- after: "pulse-prepare";
- }
- program { name: "pulse-prepare";
- action: STATE_SET "default" 0.0;
- target: "pulsclip";
- after: "pulse";
- }
- program { name: "pulse";
- action: STATE_SET "pulse" 0.0;
- transition: DECELERATE 0.5;
- target: "pulsclip";
- after: "pulse2";
- }
- program { name: "pulse2";
- action: STATE_SET "default" 0.0;
- in: 1.5 0.0;
- transition: DECELERATE 0.5;
- target: "pulsclip";
- after: "pulse";
- }
-
- program { name: "focus_out";
- signal: "focus,out";
- source: "terminology";
- action: ACTION_STOP;
- target: "focus_in";
- target: "pulse";
- target: "pulse2";
- after: "focus_out2";
- }
- program { name: "focus_out2";
- action: STATE_SET "default" 0.0;
- target: "outline";
- target: "pulsclip";
- }
- program {
- signal: "key,down"; source: "terminology";
- script {
- new buf[32];
- snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
- run_program(get_program_id(buf));
- }
- }
- program { name: "key-down1";
- action: PLAY_SAMPLE "key-tap1" 1.0;
- }
- program { name: "key-down2";
- action: PLAY_SAMPLE "key-tap2" 1.0;
- }
- program { name: "key-down3";
- action: PLAY_SAMPLE "key-tap3" 1.0;
- }
- program { name: "key-down4";
- action: PLAY_SAMPLE "key-tap4" 1.0;
- }
- program { name: "key-down5";
- action: PLAY_SAMPLE "key-tap5" 1.0;
- }
- program { name: "key";
- signal: "key,down";
- source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "key";
- after: "key2";
- }
- program { name: "key2";
- action: STATE_SET "on" 0.0;
- target: "key";
- after: "key3";
- }
- program { name: "key3";
- action: STATE_SET "out" 0.0;
- transition: DECELERATE 0.3;
- target: "key";
- }
- }
- }
- } // }}}
-
- //////////////////////////////////////////////////////////////////////////////
- //// the cursor as an underline to show where text is typed
- group { name: "terminology/cursor_underline"; // {{{
- images {
- image: "cr_key.png" COMP;
- image: "cr_underline_out.png" COMP;
- }
- 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";
- }
- }
- parts {
- part { name: "pulsclip"; type: RECT;
- description { state: "default" 0.0;
- }
- description { state: "pulse" 0.0;
- color: 255 255 255 80;
- color_class: "CURSOR";
- }
- }
- part { name: "key";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1 {
- to: "outline";
- offset: -5 -5;
- }
- rel2 {
- to: "outline";
- offset: 4 4;
- }
- image {
- normal: "cr_key.png";
- border: 4 4 4 4;
- }
- color: 255 255 255 0;
- color_class: "CURSOR";
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
- }
- description { state: "out" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- color_class: "CURSOR";
- }
- }
- part { name: "outline";
- mouse_events: 0;
- clip_to: "pulsclip";
- description { state: "default" 0.0;
- image {
- normal: "cr_underline_out.png";
- border: 3 3 3 3;
- }
- color: 255 255 255 64;
- color_class: "CURSOR";
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
- }
- }
- programs {
- program { name: "focus_in_noblink";
- signal: "focus,in,noblink";
- source: "terminology";
- action: STATE_SET "focused" 0.0;
- target: "outline";
- }
- program { name: "focus_in";
- signal: "focus,in";
- source: "terminology";
- action: STATE_SET "focused" 0.0;
- target: "outline";
- after: "pulse-prepare";
- }
- program { name: "pulse-prepare";
- action: STATE_SET "default" 0.0;
- target: "pulsclip";
- after: "pulse";
- }
- program { name: "pulse";
- action: STATE_SET "pulse" 0.0;
- transition: DECELERATE 0.5;
- target: "pulsclip";
- after: "pulse2";
- }
- program { name: "pulse2";
- action: STATE_SET "default" 0.0;
- in: 1.5 0.0;
- transition: DECELERATE 0.5;
- target: "pulsclip";
- after: "pulse";
- }
-
- program { name: "focus_out";
- signal: "focus,out";
- source: "terminology";
- action: ACTION_STOP;
- target: "focus_in";
- target: "pulse";
- target: "pulse2";
- after: "focus_out2";
- }
- program { name: "focus_out2";
- action: STATE_SET "default" 0.0;
- target: "outline";
- target: "pulsclip";
- }
- program {
- signal: "key,down"; source: "terminology";
- script {
- new buf[32];
- snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
- run_program(get_program_id(buf));
- }
- }
- program { name: "key-down1";
- action: PLAY_SAMPLE "key-tap1" 1.0;
- }
- program { name: "key-down2";
- action: PLAY_SAMPLE "key-tap2" 1.0;
- }
- program { name: "key-down3";
- action: PLAY_SAMPLE "key-tap3" 1.0;
- }
- program { name: "key-down4";
- action: PLAY_SAMPLE "key-tap4" 1.0;
- }
- program { name: "key-down5";
- action: PLAY_SAMPLE "key-tap5" 1.0;
- }
- program { name: "key";
- signal: "key,down";
- source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "key";
- after: "key2";
- }
- program { name: "key2";
- action: STATE_SET "on" 0.0;
- target: "key";
- after: "key3";
- }
- program { name: "key3";
- action: STATE_SET "out" 0.0;
- transition: DECELERATE 0.3;
- target: "key";
- }
- }
- }
- } // }}}
-
- //////////////////////////////////////////////////////////////////////////////
- //// the cursor as a bar to show where text is typed
- group { name: "terminology/cursor_bar"; // {{{
- images {
- image: "cr_key.png" COMP;
- image: "cr_bar_out.png" COMP;
- }
- 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";
- }
- }
- parts {
- part { name: "pulsclip"; type: RECT;
- description { state: "default" 0.0;
- }
- description { state: "pulse" 0.0;
- color: 255 255 255 80;
- color_class: "CURSOR";
- }
- }
- part { name: "key";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1 {
- to: "outline";
- offset: -5 -5;
- }
- rel2 {
- to: "outline";
- offset: 4 4;
- }
- image {
- normal: "cr_key.png";
- border: 4 4 4 4;
- }
- color: 255 255 255 0;
- color_class: "CURSOR";
- }
- description { state: "on" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
- }
- description { state: "out" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 0;
- color_class: "CURSOR";
- }
- }
- part { name: "outline";
- mouse_events: 0;
- clip_to: "pulsclip";
- description { state: "default" 0.0;
- image {
- normal: "cr_bar_out.png";
- border: 3 3 3 3;
- }
- color: 255 255 255 64;
- color_class: "CURSOR";
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "CURSOR";
- }
- }
- programs {
- program { name: "focus_in_noblink";
- signal: "focus,in,noblink";
- source: "terminology";
- action: STATE_SET "focused" 0.0;
- target: "outline";
- }
- program { name: "focus_in";
- signal: "focus,in";
- source: "terminology";
- action: STATE_SET "focused" 0.0;
- target: "outline";
- after: "pulse-prepare";
- }
- program { name: "pulse-prepare";
- action: STATE_SET "default" 0.0;
- target: "pulsclip";
- after: "pulse";
- }
- program { name: "pulse";
- action: STATE_SET "pulse" 0.0;
- transition: DECELERATE 0.5;
- target: "pulsclip";
- after: "pulse2";
- }
- program { name: "pulse2";
- action: STATE_SET "default" 0.0;
- in: 1.5 0.0;
- transition: DECELERATE 0.5;
- target: "pulsclip";
- after: "pulse";
- }
-
- program { name: "focus_out";
- signal: "focus,out";
- source: "terminology";
- action: ACTION_STOP;
- target: "focus_in";
- target: "pulse";
- target: "pulse2";
- after: "focus_out2";
- }
- program { name: "focus_out2";
- action: STATE_SET "default" 0.0;
- target: "outline";
- target: "pulsclip";
- }
- program {
- signal: "key,down"; source: "terminology";
- script {
- new buf[32];
- snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
- run_program(get_program_id(buf));
- }
- }
- program { name: "key-down1";
- action: PLAY_SAMPLE "key-tap1" 1.0;
- }
- program { name: "key-down2";
- action: PLAY_SAMPLE "key-tap2" 1.0;
- }
- program { name: "key-down3";
- action: PLAY_SAMPLE "key-tap3" 1.0;
- }
- program { name: "key-down4";
- action: PLAY_SAMPLE "key-tap4" 1.0;
- }
- program { name: "key-down5";
- action: PLAY_SAMPLE "key-tap5" 1.0;
- }
- program { name: "key";
- signal: "key,down";
- source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "key";
- after: "key2";
- }
- program { name: "key2";
- action: STATE_SET "on" 0.0;
- target: "key";
- after: "key3";
- }
- program { name: "key3";
- action: STATE_SET "out" 0.0;
- transition: DECELERATE 0.3;
- target: "key";
- }
- }
- }
- } // }}}
-
- //////////////////////////////////////////////////////////////////////////////
- //// an object to contain the selection tool used for selecting tabs (with
- //// a glow grid of terms
- group { name: "terminology/sel/base"; // {{{
- images {
- image: "pm_fill.png" COMP;
- }
- script {
- public message(Msg_Type:type, id, ...) {
- if ((type != MSG_INT) || (id != 1)) return;
-
- if (getarg(2) < 100)
- set_state(PART:"fill", "translucent", 0.0);
- else
- set_state(PART:"fill", "default", 0.0);
- }
- }
- parts {
- ////////////////////////////////////////////////////////////////////
- // background and shadows
- part { name: "fill";
- mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "pm_fill.png";
- fill {
- size.relative: 0.0 0.0;
- size.offset: 64 64;
- }
- }
- description { state: "translucent" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- program {
- signal: "translucent,on"; source: "terminology";
- action: STATE_SET "translucent" 0.0;
- target: "fill";
- }
- program {
- signal: "translucent,off"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "fill";
- }
-
- ////////////////////////////////////////////////////////////////////
- // content (where the grid of terms goes)
- part { name: "clip"; type: RECT;
- description { state: "default" 0.0;
- }
- }
- part { name: "terminology.content"; type: SWALLOW;
- clip_to: "clip";
- description { state: "default" 0.0;
- }
- }
- }
- } // }}}
-
- group { name: "terminology/sel/item"; // {{{
- images {
- image: "bg_bevel.png" COMP;
- image: "pm_shadow.png" COMP;
- image: "cr_glow.png" COMP;
- image: "bg_led_base.png" COMP;
- image: "bg_led.png" COMP;
- image: "bg_led_strobe.png" COMP;
- }
- parts {
- ////////////////////////////////////////////////////////////////////
- // base background and selection image
- part { name: "clip"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- color: 128 128 128 255;
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "shadow";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- rel1.offset: -5 -5;
- rel2.offset: 4 4;
- image.normal: "pm_shadow.png";
- image.border: 64 64 64 64;
- image.border_scale_by: 0.1;
- color: 255 255 255 128;
- fill.smooth: 0;
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- rel1.offset: -40 -40;
- rel2.offset: 39 39;
- image.border_scale_by: 1.0;
- color: 255 255 255 255;
- }
- }
-
- part { name: "glow";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 0;
- color_class: "GLOW";
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
-
- ////////////////////////////////////////////////////////////////////
- // swallowed terminal content + bg inside it
- part { name: "base"; type: RECT;
- clip_to: "clip";
- description { state: "default" 0.0;
- color_class: "BG";
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- }
- }
- part { name: "terminology.content"; type: SWALLOW;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.relative: 0.1 0.1;
- rel2.relative: 0.9 0.9;
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- }
- }
- program {
- signal: "selected"; source: "terminology";
- action: STATE_SET "selected" 0.0;
- transition: DECELERATE 0.2 CURRENT;
- target: "terminology.content";
- target: "terminology.label";
- target: "shadow";
- target: "clip";
- target: "glow";
- }
- program {
- signal: "selected,start"; source: "terminology";
- action: STATE_SET "selected" 0.0;
- target: "terminology.content";
- target: "terminology.label";
- target: "shadow";
- target: "clip";
- target: "glow";
- }
- program {
- signal: "unselected"; source: "terminology";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.4 CURRENT;
- target: "terminology.content";
- target: "terminology.label";
- target: "shadow";
- target: "clip";
- target: "glow";
- }
-
- ////////////////////////////////////////////////////////////////////
- // fancy stuff over the top of the terminal for shading and labelling
- part { name: "bevel";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- image.normal: "bg_bevel.png";
- image.border: 3 3 5 3;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "terminology.label"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- color: 255 255 255 255;
- color_class: "GLOW_TXT_HIGHLIGHT";
- align: 0.5 1.0;
- text { font: "Sans"; size: 10;
- align: 0.5 1.0;
- min: 0 1;
- }
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW_TXT_HIGHLIGHT";
- text { font:"Sans:style=Bold"; }
- }
- }
-
- ////////////////////////////////////////////////////////////////////
- // visual bell - spinning red siren light
- part { name: "bell_base";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- color_class: "FG";
- min: 32 32;
- max: 32 32;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- align: 1.0 1.0;
- image.normal: "bg_led_base.png";
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- color_class: "FG";
- }
- }
- part { name: "bell";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- color_class: "FG";
- rel1.to: "bell_base";
- rel2.to: "bell_base";
- image.normal: "bg_led.png";
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- color_class: "FG";
- }
- }
- part { name: "bell_strobe";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell";
- rel2.to: "bell";
- image.normal: "bg_led_strobe.png";
- map {
- on: 1;
- smooth: 1;
- rotation.center: "bell";
- }
- }
- description { state: "spin" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- color_class: "FG";
- map.rotation.z: 36.0;
- }
- description { state: "spin_done" 0.0;
- inherit: "spin" 0.0;
- map.rotation.z: 720.0;
- }
- description { state: "spin_done2" 0.0;
- inherit: "spin" 0.0;
- map.rotation.z: 1440.0;
- }
- }
- program {
- signal: "bell"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "bell_base";
- target: "bell";
- target: "bell_strobe";
- after: "bell";
- }
- program { name: "bell";
- action: STATE_SET "visible" 0.0;
- target: "bell_base";
- after: "bell2";
- }
- program { name: "bell2";
- action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.1;
- target: "bell";
- after: "bell3";
- }
- program { name: "bell3";
- action: STATE_SET "spin" 0.0;
- transition: LINEAR 0.1;
- target: "bell_strobe";
- after: "bell4.2";
- }
- program { name: "bell4.2";
- action: STATE_SET "spin_done" 0.0;
- transition: LINEAR 0.9;
- target: "bell_strobe";
- after: "bell4.3";
- }
- program { name: "bell4.3";
- action: STATE_SET "spin_done2" 0.0;
- transition: LINEAR 1.0;
- target: "bell_strobe";
- after: "bell4.4";
- }
- program { name: "bell4.4";
- action: STATE_SET "spin_done" 0.0;
- target: "bell_strobe";
- after: "bell4.3";
- }
- }
- } // }}}
-
-
- //////////////////////////////////////////////////////////////////////////////
- //// an object overlayd on text that is a link
- group { name: "terminology/link"; // {{{
- images {
- image: "lk_bottom.png" COMP;
- }
- parts {
- part { name: "bottom";
- mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "lk_bottom.png";
- image.border: 9 9 0 0;
- align: 0.5 1.0;
- min: 20 8;
- rel1.offset: -6 0;
- rel1.relative: 0.0 1.0;
- rel2.offset: 5 0;
- color: 255 255 255 255;
- color_class: "GLOW";
- fill.smooth: 0;
- }
- }
- part { name: "event"; type: RECT;
- mouse_events: 1;
- repeat_events: 1;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- }
- } // }}}
-
- group { name: "terminology/tab_drag_thumb"; // {{{
- images {
- image: "bg_bevel.png" COMP;
- image: "pm_shadow.png" COMP;
- image: "cr_glow.png" COMP;
- image: "bg_led_base.png" COMP;
- image: "bg_led.png" COMP;
- image: "bg_led_strobe.png" COMP;
- }
- parts {
- ////////////////////////////////////////////////////////////////////
- // base background and selection image
- part { name: "clip"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- color: 255 255 255 255;
- }
- }
- part { name: "shadow";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- image.normal: "pm_shadow.png";
- image.border: 64 64 64 64;
- fill.smooth: 0;
- rel1.offset: -40 -40;
- rel2.offset: 39 39;
- image.border_scale_by: 1.0;
- color: 255 255 255 255;
- }
- }
-
- part { name: "glow";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image {
- normal: "cr_glow.png";
- border: 9 9 9 9;
- }
- color: 255 255 255 255;
- color_class: "GLOW";
- }
- }
-
- ////////////////////////////////////////////////////////////////////
- // swallowed terminal content + bg inside it
- part { name: "base"; type: RECT;
- clip_to: "clip";
- description { state: "default" 0.0;
- color_class: "BG";
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- }
- }
- part { name: "terminology.content"; type: SWALLOW;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- }
- }
-
- ////////////////////////////////////////////////////////////////////
- // fancy stuff over the top of the terminal for shading and title
- part { name: "bevel";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- image.normal: "bg_bevel.png";
- image.border: 3 3 5 3;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "terminology.title"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- color: 255 255 255 255;
- color_class: "GLOW_TXT_HIGHLIGHT";
- align: 0.5 1.0;
- text { font: "Sans"; size: 10;
- align: 0.5 1.0;
- min: 0 1;
- }
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color_class: "GLOW_TXT_HIGHLIGHT";
- text { font:"Sans:style=Bold"; }
- }
- }
-
- ////////////////////////////////////////////////////////////////////
- // visual bell - spinning red siren light
- part { name: "bell_base";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- min: 32 32;
- max: 32 32;
- rel1.to: "terminology.content";
- rel2.to: "terminology.content";
- align: 1.0 1.0;
- image.normal: "bg_led_base.png";
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "bell";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell_base";
- rel2.to: "bell_base";
- image.normal: "bg_led.png";
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "bell_strobe";
- mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 0;
- rel1.to: "bell";
- rel2.to: "bell";
- image.normal: "bg_led_strobe.png";
- map {
- on: 1;
- smooth: 1;
- rotation.center: "bell";
- }
- }
- description { state: "spin" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- map.rotation.z: 36.0;
- }
- description { state: "spin_done" 0.0;
- inherit: "spin" 0.0;
- map.rotation.z: 720.0;
- }
- description { state: "spin_done2" 0.0;
- inherit: "spin" 0.0;
- map.rotation.z: 1440.0;
- }
- }
- program {
- signal: "bell"; source: "terminology";
- action: STATE_SET "default" 0.0;
- target: "bell_base";
- target: "bell";
- target: "bell_strobe";
- after: "bell";
- }
- program { name: "bell";
- action: STATE_SET "visible" 0.0;
- target: "bell_base";
- after: "bell2";
- }
- program { name: "bell2";
- action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.1;
- target: "bell";
- after: "bell3";
- }
- program { name: "bell3";
- action: STATE_SET "spin" 0.0;
- transition: LINEAR 0.1;
- target: "bell_strobe";
- after: "bell4.2";
- }
- program { name: "bell4.2";
- action: STATE_SET "spin_done" 0.0;
- transition: LINEAR 0.9;
- target: "bell_strobe";
- after: "bell4.3";
- }
- program { name: "bell4.3";
- action: STATE_SET "spin_done2" 0.0;
- transition: LINEAR 1.0;
- target: "bell_strobe";
- after: "bell4.4";
- }
- program { name: "bell4.4";
- action: STATE_SET "spin_done" 0.0;
- target: "bell_strobe";
- after: "bell4.3";
- }
- }
- } // }}}
-}
diff --git a/src/bin/colors.c b/src/bin/colors.c
index 03072cad..01037eb1 100644
--- a/src/bin/colors.c
+++ b/src/bin/colors.c
@@ -631,7 +631,7 @@ color_scheme_apply(Evas_Object *edje,
CS_SET("BG", bg);
CS_SET("FG", normal.def);
- CS_SET("CURSOR", main);
+ CS_SET("CURSOR", hl);
CS_SET("GLOW", main);
CS_SET("HIGHLIGHT", hl);
CS_SET("GLOW_TXT", main);
diff --git a/src/bin/main.c b/src/bin/main.c
index 4957b4e9..854753a0 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1047,7 +1047,7 @@ elm_main(int argc, char **argv)
}
elm_theme_extension_add(NULL, theme_path_get("default.edj"));
- elm_theme_overlay_add(NULL, config_theme_path_get(instance.config));
+ elm_theme_extension_add(NULL, config_theme_path_get(instance.config));
if (instance.login_shell == IPC_INSTANCE_OPT_UNSET)
instance.login_shell = instance.config->login_shell;
diff --git a/src/bin/win.c b/src/bin/win.c
index 3512a8ed..608596c2 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -5954,10 +5954,10 @@ void change_theme(Evas_Object *win, Config *config)
termio_config_set(term->termio, config);
}
- l = elm_theme_overlay_list_get(NULL);
+ l = elm_theme_extension_list_get(NULL);
if (l) l = eina_list_last(l);
- if (l) elm_theme_overlay_del(NULL, l->data);
- elm_theme_overlay_add(NULL, config_theme_path_get(config));
+ if (l) elm_theme_extension_del(NULL, l->data);
+ elm_theme_extension_add(NULL, config_theme_path_get(config));
main_trans_update();
}