raster pushed a commit to branch master.
commit 66afbb7e4ae8e3db6710ac0add4f7184065ae7ea
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Tue Sep 10 18:27:47 2013 +0900
elm dark theme - panel done!
---
edje/dark.edc | 3 +-
edje/edc/elm/frame.edc | 4 +-
edje/edc/elm/panel.edc | 355 +++++++++++++++++++++++++++++++++++++++++++++++++
mock-18.xcf.gz | Bin 612340 -> 613251 bytes
4 files changed, 358 insertions(+), 4 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index 53de886..e1d5a8e 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -57,8 +57,7 @@ collections {
#include "edc/elm/progress.edc"
// i think needs some design work
//#include "edc/elm/naviframe.edc"
-// needs design work
-//#include "edc/elm/panel.edc"
+#include "edc/elm/panel.edc"
// needs design work, but edc needs to also scale up and down but not be so
fat when scale is down/finger size smaller
//#include "edc/elm/popup.edc"
#include "edc/elm/border.edc"
diff --git a/edje/edc/elm/frame.edc b/edje/edc/elm/frame.edc
index 7ce6523..42e495a 100644
--- a/edje/edc/elm/frame.edc
+++ b/edje/edc/elm/frame.edc
@@ -123,13 +123,13 @@ group { name: "elm/frame/base/default";
program { name: "collapse";
action: STATE_SET "collapsed" 0.0;
target: "elm.swallow.content";
- transition: BOUNCE 0.5 1.0 3;
+ transition: ACCELERATE 0.3;
after: "signal";
}
program { name: "expand";
action: STATE_SET "default" 0.0;
target: "elm.swallow.content";
- transition: BOUNCE 0.5 1.0 3;
+ transition: DECELERATE 0.3;
after: "signal";
}
program {
diff --git a/edje/edc/elm/panel.edc b/edje/edc/elm/panel.edc
new file mode 100644
index 0000000..ccf9734
--- /dev/null
+++ b/edje/edc/elm/panel.edc
@@ -0,0 +1,355 @@
+group { name: "elm/panel/left/default";
+ images.image: "bevel_out.png" COMP;
+ images.image: "shine.png" COMP;
+ images.image: "shadow_square_tiny.png" COMP;
+ images.image: "holes_tiny_glow_vert.png" COMP;
+ images.image: "holes_tiny_glow_horiz.png" COMP;
+ images.image: "win_glow.png" COMP;
+ images.image: "icon_arrow_right.png" COMP;
+ images.image: "icon_arrow_left.png" COMP;
+ images.image: "icon_arrow_up.png" COMP;
+ images.image: "icon_arrow_down.png" COMP;
+ data.item: "focus_highlight" "on";
+ parts {
+ part { name: "shadow"; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.offset: -3 -2;
+ rel1.to: "base";
+ rel2.offset: 2 4;
+ rel2.to: "base";
+ image.normal: "shadow_square_tiny.png";
+ image.border: 6 6 6 6;
+ fill.smooth: 0;
+ }
+ }
+ part { name: "glow"; mouse_events: 0;
+ description { state: "default" 0.0;
+ image.normal: "win_glow.png";
+ image.border: 9 9 9 9;
+ image.middle: 0;
+ rel1.offset: -5 -5;
+ rel1.to: "base";
+ rel2.offset: 4 4;
+ rel2.to: "base";
+ fill.smooth: 0;
+ color: 255 255 255 0;
+ visible: 0;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ visible: 1;
+ }
+ }
+ part { name: "all"; type: SPACER;
+ description { state: "default" 0.0;
+ }
+ }
+ part { name: "base"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.to_x: "all";
+ rel2.to_x: "elm.swallow.handle";
+ rel2.relative: 0.0 1.0;
+ rel2.offset: -4 -1;
+ color: 64 64 64 255;
+ }
+ }
+ part { name: "elm.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ rel1.offset: 4 4;
+ rel1.to: "base";
+ rel2.offset: -5 -5;
+ rel2.to: "base";
+ }
+ }
+ part { name: "bevel"; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ image.normal: "bevel_out.png";
+ image.border: 1 1 1 1;
+ image.middle: 0;
+ fill.smooth: 0;
+ }
+ }
+ part { name: "shine"; mouse_events: 0;
+ description { state: "default" 0.0;
+ image.normal: "shine.png";
+ rel1.offset: 0 -2;
+ rel1.to: "base";
+ rel2.relative: 1.0 0.0;
+ rel2.offset: -1 2;
+ rel2.to: "base";
+ FIXED_SIZE(69, 5)
+ }
+ }
+ part { name: "elm.swallow.handle"; type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 20 20;
+ max: 20 20;
+ align: 1.0 0.5;
+ rel1.relative: 1.0 0.0;
+ rel2.relative: 1.0 1.0;
+ color: 0 0 0 0;
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ align: 0.0 0.5;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 0.0 1.0;
+ }
+ }
+ part { name: "btn"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.to: "elm.swallow.handle";
+ rel2.to: "elm.swallow.handle";
+ color: 0 0 0 0;
+ }
+ }
+ part { name: "dots"; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "icn";
+ rel2.to: "icn";
+ align: 0.0 0.5;
+ image.normal: "holes_tiny_glow_vert.png";
+ FIXED_SIZE(11, 17)
+ }
+ }
+ part { name: "icn"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 20 20;
+ max: 20 20;
+ rel1.to: "btn";
+ rel2.to: "btn";
+ image.normal: "icon_arrow_left.png";
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ image.normal: "icon_arrow_right.png";
+ }
+ }
+ }
+ programs {
+ program {
+ signal: "mouse,clicked,1"; source: "btn";
+ action: SIGNAL_EMIT "elm,action,panel,toggle" "";
+ }
+ program {
+ signal: "elm,action,show"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.3;
+ target: "elm.swallow.handle";
+ target: "base";
+ target: "icn";
+ }
+ program {
+ signal: "elm,action,hide"; source: "elm";
+ action: STATE_SET "hidden" 0.0;
+ transition: ACCELERATE 0.3;
+ target: "elm.swallow.handle";
+ target: "icn";
+ }
+ program { name: "hide1";
+ signal: "elm,action,hide"; source: "elm";
+ script {
+ new x, y, w, h;
+
+ custom_state(PART:"base", "default", 0.0);
+ set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
+ get_geometry(PART:"elm.swallow.handle", x, y, w, h);
+ set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0);
+ }
+ after: "hide2";
+ }
+ program { name: "hide2";
+ action: STATE_SET "custom" 0.0;
+ transition: ACCELERATE 0.3;
+ target: "base";
+ }
+ program {
+ signal: "elm,action,focus_highlight,show"; source: "elm";
+ action: STATE_SET "focused" 0.0;
+ transition: ACCELERATE 0.2;
+ target: "glow";
+ }
+ program {
+ signal: "elm,action,focus_highlight,hide"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.5;
+ target: "glow";
+ }
+ }
+}
+
+group { name: "elm/panel/right/default";
+ inherit: "elm/panel/left/default";
+ parts {
+ part { name: "base";
+ description { state: "default" 0.0;
+ rel1.relative: 1.0 0.0;
+ rel1.to_x: "elm.swallow.handle";
+ rel1.offset: 3 0;
+ rel2.relative: 1.0 1.0;
+ rel2.to_x: "all";
+ rel2.offset: -1 -1;
+ }
+ }
+ part { name: "elm.swallow.handle";
+ description { state: "default" 0.0;
+ align: 0.0 0.5;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 0.0 1.0;
+ }
+ description { state: "hidden" 0.0;
+ align: 1.0 0.5;
+ rel1.relative: 1.0 0.0;
+ rel2.relative: 1.0 1.0;
+ }
+ }
+ part { name: "dots";
+ description { state: "default" 0.0;
+ align: 1.0 0.5;
+ }
+ }
+ part { name: "icn";
+ description { state: "default" 0.0;
+ image.normal: "icon_arrow_right.png";
+ }
+ description { state: "hidden" 0.0;
+ image.normal: "icon_arrow_left.png";
+ }
+ }
+ }
+ programs {
+ program { name: "hide1";
+ script {
+ new x, y, w, h;
+
+ custom_state(PART:"base", "default", 0.0);
+ set_state_val(PART:"base", STATE_REL1, 1.0, 0.0);
+ set_state_val(PART:"base", STATE_REL2, 2.0, 1.0);
+ get_geometry(PART:"elm.swallow.handle", x, y, w, h);
+ set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0);
+ }
+ }
+ }
+}
+
+group { name: "elm/panel/top/default";
+ inherit: "elm/panel/left/default";
+ parts {
+ part { name: "base";
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 0.0;
+ rel1.to_x: "all";
+ rel1.to_y: "all";
+ rel1.offset: 0 0;
+ rel2.relative: 1.0 0.0;
+ rel2.to_x: "all";
+ rel2.to_y: "elm.swallow.handle";
+ rel2.offset: -1 -4;
+ }
+ }
+ part { name: "elm.swallow.handle";
+ description { state: "default" 0.0;
+ align: 0.5 1.0;
+ rel1.relative: 0.0 1.0;
+ rel2.relative: 1.0 1.0;
+ }
+ description { state: "hidden" 0.0;
+ align: 0.5 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 0.0;
+ }
+ }
+ part { name: "dots";
+ description { state: "default" 0.0;
+ align: 0.5 0.0;
+ image.normal: "holes_tiny_glow_horiz.png";
+ FIXED_SIZE(17, 11)
+ }
+ }
+ part { name: "icn";
+ description { state: "default" 0.0;
+ image.normal: "icon_arrow_up.png";
+ }
+ description { state: "hidden" 0.0;
+ image.normal: "icon_arrow_down.png";
+ }
+ }
+ }
+ programs {
+ program { name: "hide1";
+ script {
+ new x, y, w, h;
+
+ custom_state(PART:"base", "default", 0.0);
+ set_state_val(PART:"base", STATE_REL1, 0.0, -1.0);
+ set_state_val(PART:"base", STATE_REL2, 1.0, 0.0);
+ get_geometry(PART:"elm.swallow.handle", x, y, w, h);
+ set_state_val(PART:"base", STATE_REL1_OFFSET, 0, h);
+ }
+ }
+ }
+}
+
+group { name: "elm/panel/bottom/default";
+ inherit: "elm/panel/left/default";
+ parts {
+ part { name: "base";
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 1.0;
+ rel1.to_x: "all";
+ rel1.to_y: "elm.swallow.handle";
+ rel1.offset: 0 3;
+ rel2.relative: 1.0 1.0;
+ rel2.to_x: "all";
+ rel2.to_y: "all";
+ rel2.offset: -1 -1;
+ }
+ }
+ part { name: "elm.swallow.handle";
+ description { state: "default" 0.0;
+ align: 0.5 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 0.0;
+ }
+ description { state: "hidden" 0.0;
+ align: 0.5 1.0;
+ rel1.relative: 0.0 1.0;
+ rel2.relative: 1.0 1.0;
+ }
+ }
+ part { name: "dots";
+ description { state: "default" 0.0;
+ align: 0.5 0.0;
+ image.normal: "holes_tiny_glow_horiz.png";
+ FIXED_SIZE(17, 11)
+ }
+ }
+ part { name: "icn";
+ description { state: "default" 0.0;
+ image.normal: "icon_arrow_down.png";
+ }
+ description { state: "hidden" 0.0;
+ image.normal: "icon_arrow_up.png";
+ }
+ }
+ }
+ programs {
+ program { name: "hide1";
+ script {
+ new x, y, w, h;
+
+ custom_state(PART:"base", "default", 0.0);
+ set_state_val(PART:"base", STATE_REL1, 0.0, 1.0);
+ set_state_val(PART:"base", STATE_REL2, 1.0, 2.0);
+ get_geometry(PART:"elm.swallow.handle", x, y, w, h);
+ set_state_val(PART:"base", STATE_REL2_OFFSET, 0, -h);
+ }
+ }
+ }
+}
diff --git a/mock-18.xcf.gz b/mock-18.xcf.gz
index f8d6849..18b23e6 100644
Binary files a/mock-18.xcf.gz and b/mock-18.xcf.gz differ
--
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=51271111&iu=/4140/ostg.clktrk
