theme - the great flattening of terminology

match new elm flat theme... yay!
pull/4/head
Carsten Haitzler 10 months ago
parent f44725fcbc
commit 58c718d1f5
  1. 2
      data/colorschemes/Belafonte Day.ini
  2. 2
      data/colorschemes/PaperColor.ini
  3. 2
      data/colorschemes/Soft Era.ini
  4. 4
      data/colorschemes/Solarized Light.ini
  5. 2
      data/colorschemes/Tango Light.ini
  6. 196
      data/themes/default.edc
  7. 41
      data/themes/default/about.edc
  8. 1734
      data/themes/default/background.edc
  9. 492
      data/themes/default/base.edc
  10. 37
      data/themes/default/color_preview.edc
  11. 51
      data/themes/default/colors.edc
  12. 3
      data/themes/default/core.edc
  13. 1034
      data/themes/default/cursor.edc
  14. 40
      data/themes/default/fontpreview.edc
  15. 18
      data/themes/default/icon.edc
  16. 23
      data/themes/default/keybinding.edc
  17. 104
      data/themes/default/link.edc
  18. 167
      data/themes/default/media.edc
  19. 90
      data/themes/default/miniview.edc
  20. 391
      data/themes/default/sel.edc
  21. 216
      data/themes/default/selection.edc
  22. 256
      data/themes/default/tab_drag_thumb.edc
  23. 166
      data/themes/default/tabbar_back.edc
  24. BIN
      data/themes/images/arrow-d-015.png
  25. BIN
      data/themes/images/arrow-d-030.png
  26. BIN
      data/themes/images/arrow-d-060.png
  27. BIN
      data/themes/images/arrow-l-015.png
  28. BIN
      data/themes/images/arrow-l-030.png
  29. BIN
      data/themes/images/arrow-l-060.png
  30. BIN
      data/themes/images/arrow-r-015.png
  31. BIN
      data/themes/images/arrow-r-030.png
  32. BIN
      data/themes/images/arrow-r-060.png
  33. BIN
      data/themes/images/arrow-u-015.png
  34. BIN
      data/themes/images/arrow-u-030.png
  35. BIN
      data/themes/images/arrow-u-060.png
  36. BIN
      data/themes/images/bg_bevel.png
  37. BIN
      data/themes/images/bg_glint.png
  38. BIN
      data/themes/images/bg_glow_in.png
  39. BIN
      data/themes/images/bg_led.png
  40. BIN
      data/themes/images/bg_led_base.png
  41. BIN
      data/themes/images/bg_led_glow.png
  42. BIN
      data/themes/images/bg_led_strobe.png
  43. BIN
      data/themes/images/bg_shadow.png
  44. BIN
      data/themes/images/bg_shadow2.png
  45. BIN
      data/themes/images/bg_shadow3.png
  46. BIN
      data/themes/images/bg_shine.png
  47. BIN
      data/themes/images/bg_shine2.png
  48. BIN
      data/themes/images/bg_shine3.png
  49. BIN
      data/themes/images/bg_shine4.png
  50. BIN
      data/themes/images/bg_shine5.png
  51. BIN
      data/themes/images/checks.png
  52. BIN
      data/themes/images/circle-1200.png
  53. BIN
      data/themes/images/close-015.png
  54. BIN
      data/themes/images/close-030.png
  55. BIN
      data/themes/images/close-060.png
  56. BIN
      data/themes/images/cr_bar_glow.png
  57. BIN
      data/themes/images/cr_bar_out.png
  58. BIN
      data/themes/images/cr_bar_pulse.png
  59. BIN
      data/themes/images/cr_glow.png
  60. BIN
      data/themes/images/cr_key.png
  61. BIN
      data/themes/images/cr_out.png
  62. BIN
      data/themes/images/cr_pulse.png
  63. BIN
      data/themes/images/cr_underline_glow.png
  64. BIN
      data/themes/images/cr_underline_out.png
  65. BIN
      data/themes/images/cr_underline_pulse.png
  66. BIN
      data/themes/images/fn_shadow.png
  67. BIN
      data/themes/images/grad-h-1.png
  68. BIN
      data/themes/images/grad-h-2.png
  69. BIN
      data/themes/images/grad-v-1.png
  70. BIN
      data/themes/images/grad-v-2.png
  71. BIN
      data/themes/images/icon-split-h-015.png
  72. BIN
      data/themes/images/icon-split-h-030.png
  73. BIN
      data/themes/images/icon-split-h-060.png
  74. BIN
      data/themes/images/icon-split-v-015.png
  75. BIN
      data/themes/images/icon-split-v-030.png
  76. BIN
      data/themes/images/icon-split-v-060.png
  77. BIN
      data/themes/images/icon-tab-btn-060.png
  78. 320
      data/themes/images/icon_split_h.svg
  79. 337
      data/themes/images/icon_split_v.svg
  80. BIN
      data/themes/images/inset_shadow.png
  81. BIN
      data/themes/images/lk_bottom.png
  82. BIN
      data/themes/images/lk_left.png
  83. BIN
      data/themes/images/lk_right.png
  84. BIN
      data/themes/images/media_busy_knob.png
  85. BIN
      data/themes/images/media_busy_progress.png
  86. BIN
      data/themes/images/media_busy_spinner.png
  87. BIN
      data/themes/images/pm_fill.png
  88. BIN
      data/themes/images/pm_overlay.png
  89. BIN
      data/themes/images/pm_shadow.png
  90. BIN
      data/themes/images/ringa1.png
  91. BIN
      data/themes/images/ringa2.png
  92. BIN
      data/themes/images/ringa3.png
  93. BIN
      data/themes/images/ringa4.png
  94. BIN
      data/themes/images/ringa5.png
  95. BIN
      data/themes/images/ringb1.png
  96. BIN
      data/themes/images/ringb2.png
  97. BIN
      data/themes/images/ringb3.png
  98. BIN
      data/themes/images/ringb4.png
  99. BIN
      data/themes/images/ringb5.png
  100. BIN
      data/themes/images/ringc1.png
  101. Some files were not shown because too many files have changed in this diff Show More

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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"
}

@ -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.<br>This is <b>Terminology</b>, your friendly neighbourhood terminal.<br><br>This needs more text to test vertical scrolling to see if the animation works right.<br>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";

File diff suppressed because it is too large Load Diff

@ -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";
}
}

@ -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;
}
}
}

@ -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"; 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_SENDFILE"; color: 64 64 64 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; }

@ -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;
}
}
}
}

File diff suppressed because it is too large Load Diff

@ -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;
}
}
}

@ -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

@ -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;
}

@ -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;
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;
min: 20 1;
rel1.offset: -1 -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";
}
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";
}
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";
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: 9 -1;
rel2.offset: 9 -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: 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";
}
}
}

@ -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 {