raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=b32afb8c55d89d51b2a2603b8f70a7f182dc39e1
commit b32afb8c55d89d51b2a2603b8f70a7f182dc39e1
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Fri Aug 15 21:27:23 2014 +0900
make theme a bit nicer for video mode and file list
---
TODO | 4 +-
data/themes/default.edc | 87 ++++++++++++++++++----------
data/themes/images/Makefile.mk | 3 +-
data/themes/images/vgrad-dark-inv-trans.png | Bin 0 -> 4246 bytes
4 files changed, 60 insertions(+), 34 deletions(-)
diff --git a/TODO b/TODO
index 944721a..93104dd 100644
--- a/TODO
+++ b/TODO
@@ -10,6 +10,6 @@
* add subtitle file cmdline
* loop all option
* show busy anim until opened cb or failure
-* add button/control top-left next to audio to do fullscreen/normal toggle
-* detect letterboxing and auto-crop
* thumbnail picker show all thumbs for video in a grid to select position
+* fix initial sizing in audio mode to account for scaling
+* add title/album/artis/file display inside window in music mode (at pos?)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index bdf2ab8..f1a3a65 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -35,6 +35,7 @@ collections {
images.image: "bg_glint.png" COMP;
images.image: "vgrad-dark-inv.png" COMP;
+ images.image: "vgrad-dark-inv-trans.png" COMP;
images.image: "posglow.png" COMP;
images.image: "speaker-base.png" COMP;
@@ -237,9 +238,17 @@ collections {
description { state: "default" 0.0;
}
}
- part { name: "controlbar_shadow"; mouse_events: 0;
+
+ part { name: "controlbar_shadow_clip"; type: RECT;
clip_to: "controlbar_clip";
description { state: "default" 0.0;
+ rel2.relative: 1.0 0.0;
+ rel2.to_y: "controlbar";
+ }
+ }
+ part { name: "controlbar_shadow"; mouse_events: 0;
+ clip_to: "controlbar_shadow_clip";
+ description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "controlbar";
rel2.to: "controlbar";
@@ -466,6 +475,37 @@ collections {
}
}
+ part { name: "rage.list"; type: SWALLOW;
+ description { state: "default" 0.0;
+ align: 0.0 0.5;
+ rel1.relative: 1.0 0.0;
+ rel2.relative: 1.0 0.0;
+ rel2.to_y: "controlbar";
+ fixed: 1 1;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ align: 1.0 0.5;
+ visible: 1;
+ }
+ }
+ program {
+ signal: "list,state,visible"; source: "rage";
+ action: STATE_SET "visible" 0.0;
+ transition: DECELERATE 0.3;
+ target: "rage.list";
+ }
+ program {
+ signal: "list,state,hidden"; source: "rage";
+ action: STATE_SET "default" 0.0;
+ transition: ACCELERATE 0.5;
+ target: "rage.list";
+ after: "list_hidden";
+ }
+ program { name: "list_hidden";
+ action: SIGNAL_EMIT "list,state,hidden,finished" "rage";
+ }
+
part { name: "controlbar_clip"; type: RECT;
description { state: "default" 0.0;
color: 255 255 255 0;
@@ -479,7 +519,7 @@ collections {
part { name: "controlbar"; mouse_events: 0;
clip_to: "controlbar_clip";
description { state: "default" 0.0;
- image.normal: "vgrad-dark-inv.png";
+ image.normal: "vgrad-dark-inv-trans.png";
fill {
smooth: 0;
size.relative: 0.0 1.0;
@@ -487,6 +527,20 @@ collections {
}
rel1.to: "rage.pos.prev.swallow";
}
+ description { state: "novideo" 0.0;
+ inherit: "default" 0.0;
+ image.normal: "vgrad-dark-inv.png";
+ }
+ }
+ program {
+ signal: "state,novideo"; source: "rage";
+ action: STATE_SET "novideo" 0.0;
+ target: "controlbar";
+ }
+ program {
+ signal: "state,video"; source: "rage";
+ action: STATE_SET "default" 0.0;
+ target: "controlbar";
}
part { name: "posclip"; type: RECT;
@@ -963,35 +1017,6 @@ collections {
}
}
- part { name: "rage.list"; type: SWALLOW;
- description { state: "default" 0.0;
- align: 0.0 0.5;
- rel1.relative: 1.0 0.0;
- fixed: 1 1;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- align: 1.0 0.5;
- visible: 1;
- }
- }
- program {
- signal: "list,state,visible"; source: "rage";
- action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.3;
- target: "rage.list";
- }
- program {
- signal: "list,state,hidden"; source: "rage";
- action: STATE_SET "default" 0.0;
- transition: ACCELERATE 0.5;
- target: "rage.list";
- after: "list_hidden";
- }
- program { name: "list_hidden";
- action: SIGNAL_EMIT "list,state,hidden,finished" "rage";
- }
-
#define STATE_FADE_PROG(_name) \
program { \
signal: "action,"_name; source: "rage"; \
diff --git a/data/themes/images/Makefile.mk b/data/themes/images/Makefile.mk
index 8af6326..f29153e 100644
--- a/data/themes/images/Makefile.mk
+++ b/data/themes/images/Makefile.mk
@@ -47,6 +47,7 @@ data/themes/images/speaker-bevel-hi.png \
data/themes/images/speaker-bevel-lo.png \
data/themes/images/speaker-over.png \
data/themes/images/speaker-shadow.png \
-data/themes/images/vgrad-dark-inv.png
+data/themes/images/vgrad-dark-inv.png \
+data/themes/images/vgrad-dark-inv-trans.png
EXTRA_DIST += $(THEME_IMGS)
diff --git a/data/themes/images/vgrad-dark-inv-trans.png
b/data/themes/images/vgrad-dark-inv-trans.png
new file mode 100644
index 0000000..571e7c3
Binary files /dev/null and b/data/themes/images/vgrad-dark-inv-trans.png differ
--
