raster pushed a commit to branch master.
commit 8a4421552b33ba59b2e85fe6fd0164a3d99746db
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Fri Aug 30 19:28:27 2013 +0900
map - finished making it dark pretty.
---
edje/dark.edc | 3 +-
edje/edc/elm/map.edc | 208 +++++++++++++++++++++++++++++++++++++++++++++++
edje/img/bub_base_b0.png | Bin 0 -> 333 bytes
edje/img/bub_base_b1.png | Bin 0 -> 315 bytes
edje/img/bub_base_b2.png | Bin 0 -> 362 bytes
edje/img/map_circle.png | Bin 0 -> 28715 bytes
edje/img/map_marker.png | Bin 0 -> 1806 bytes
edje/img/map_scale.png | Bin 0 -> 365 bytes
mock-18.xcf.gz | Bin 612340 -> 612340 bytes
9 files changed, 210 insertions(+), 1 deletion(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index 65a58e0..2e88678 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -8,6 +8,7 @@ collections {
#include "edc/elm/bg.edc"
#include "edc/elm/button.edc"
#include "edc/elm/scroller.edc"
+// XXX: need to do magnifier etc...
#include "edc/elm/entry.edc"
#include "edc/elm/frame.edc"
#include "edc/elm/label.edc"
@@ -49,7 +50,7 @@ collections {
#include "edc/elm/flipselector.edc"
#include "edc/elm/notify.edc"
// needs some design work for markers (but busy etc. are done already)
-//#include "edc/elm/map.edc"
+#include "edc/elm/map.edc"
#include "edc/elm/index.edc"
#include "edc/elm/calendar.edc"
// XXX: review layouts
diff --git a/edje/edc/elm/map.edc b/edje/edc/elm/map.edc
new file mode 100644
index 0000000..90b3fe4
--- /dev/null
+++ b/edje/edc/elm/map.edc
@@ -0,0 +1,208 @@
+group { name: "elm/map/base/default";
+ inherit: "elm/photocam/base/default";
+}
+
+group { name: "elm/map/marker/radio/default";
+ data.item: "size_w" 35;
+ data.item: "size_h" 35;
+ data.item: "size_max_w" 35;
+ data.item: "size_max_h" 35;
+ images.image: "map_marker.png" COMP;
+ parts {
+ part { name: "mark";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.relative: 0.5 0.5;
+ rel1.offset: 0 3;
+ rel2.relative: 0.5 0.5;
+ rel2.offset: 0 3;
+ align: 0.5 1.0;
+ min: 65 35;
+ max: 65 35;
+ image.normal: "map_marker.png";
+ }
+ }
+ part { name: "elm.icon"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "mark";
+ rel1.relative: (25/65) (5/35);
+ rel2.to: "mark";
+ rel2.relative: (40/65) (20/35);
+ rel2.offset: 0 0;
+ }
+ }
+ part { name: "elm.text"; type: TEXT;
+ effect: SHADOW BOTTOM;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "elm.icon";
+ rel2.to: "elm.icon";
+ color_class: "map_radio";
+ color: 21 21 21 255;
+ color3: 255 255 255 192;
+ text { font: FNBD; size: 10;
+ text_class: "map_radio";
+ min: 1 1;
+ }
+ }
+ }
+ }
+}
+
+group { name: "elm/map/marker/empty/default";
+ data.item: "size_w" 16;
+ data.item: "size_h" 16;
+ data.item: "size_max_w" 24;
+ data.item: "size_max_h" 24;
+ parts {
+ part { name: "knob"; type: SPACER;
+ description { state: "default" 0.0;
+ min: 16 16;
+ max: 24 24;
+ }
+ }
+ part { name: "elm.icon"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "knob";
+ rel2.to: "knob";
+ }
+ }
+ part { name: "elm.text"; type: TEXT;
+ effect: SHADOW BOTTOM;
+ description { state: "default" 0.0;
+ rel1.to: "knob";
+ rel2.to: "knob";
+ color_class: "map_empty";
+ color: 255 255 255 255;
+ color3: 0 0 0 128;
+ text { font: FNBD; size: 10;
+ text_class: "map_empty";
+ min: 1 1;
+ }
+ }
+ }
+ }
+}
+
+group { name: "elm/map/circle/base/default";
+ images.image: "map_circle.png" COMP;
+ parts {
+ part { name: "base";
+ ignore_flags: ON_HOLD;
+ description { state: "default" 0.0;
+ image.normal: "map_circle.png";
+ }
+ }
+ }
+}
+
+group { name: "elm/map/scale/base/default";
+ data.item: "size_w" 100;
+ data.item: "size_h" 22;
+ images.image: "map_scale.png" COMP;
+ parts {
+ part { name: "scale";
+ description { state: "default" 0.0;
+ min: 16 16;
+ image.border: 6 6 5 5;
+ image.normal: "map_scale.png";
+ }
+ }
+ part { name: "elm.text"; type: TEXT;
+ effect: SHADOW BOTTOM;
+ description { state: "default" 0.0;
+ rel1.offset: 6 5;
+ rel2.offset: -7 -5;
+ color_class: "map_scale";
+ color: 255 255 255 255;
+ color3: 0 0 0 128;
+ text { font: FNBD; size: 10;
+ text_class: "map_scale";
+ min: 1 1;
+ align: 0.0 0.0;
+ }
+ }
+ }
+ }
+}
+
+group { name: "elm/map/marker_bubble/default";
+ data.item: "size_w" 320;
+ data.item: "size_h" 160;
+ images.image: "bub_base_b0.png" COMP;
+ images.image: "bub_base_b1.png" COMP;
+ images.image: "bub_base_b2.png" COMP;
+ images.image: "bub_over_bot.png" COMP;
+ images.image: "shine.png" COMP;
+ parts {
+ part { name: "base0";
+ description { state: "default" 0.0;
+ image.normal: "bub_base_b0.png";
+ image.border: 12 0 8 13;
+ image.middle: SOLID;
+ fill.smooth: 0;
+ rel2.relative: 0.0 1.0;
+ rel2.to: "base1";
+ }
+ }
+ part { name: "base1";
+ description { state: "default" 0.0;
+ image.normal: "bub_base_b1.png";
+ image.border: 0 0 8 13;
+ image.middle: SOLID;
+ fill.smooth: 0;
+ max: 17 99999;
+ min: 17 22;
+ }
+ }
+ part { name: "base2";
+ description { state: "default" 0.0;
+ image.normal: "bub_base_b2.png";
+ image.border: 0 12 8 13;
+ image.middle: SOLID;
+ fill.smooth: 0;
+ rel1.relative: 1.0 0.0;
+ rel1.to: "base1";
+ }
+ }
+ part { name: "elm.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ rel1.to: "base0";
+ rel1.offset: 5 4;
+ rel2.to: "base2";
+ rel2.offset: -6 -12;
+ }
+ }
+ part { name: "over"; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "base0";
+ rel1.offset: 2 1;
+ rel2.to: "base2";
+ rel2.offset: -3 1;
+ rel2.relative: 1.0 0.4;
+ image.normal: "bub_over_bot.png";
+ fill.smooth: 0;
+ }
+ }
+ part { name: "shine_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.to: "over";
+ rel1.offset: 0 -10;
+ rel2.to: "over";
+ }
+ }
+ part { name: "shine"; mouse_events: 0;
+ clip_to: "shine_clip";
+ description { state: "default" 0.0;
+ image.normal: "shine.png";
+ rel1.offset: 0 -2;
+ rel1.to: "over";
+ rel2.relative: 1.0 0.0;
+ rel2.offset: -1 2;
+ rel2.to: "over";
+ FIXED_SIZE(69, 5)
+ }
+ }
+ }
+}
+
diff --git a/edje/img/bub_base_b0.png b/edje/img/bub_base_b0.png
new file mode 100644
index 0000000..f63247a
Binary files /dev/null and b/edje/img/bub_base_b0.png differ
diff --git a/edje/img/bub_base_b1.png b/edje/img/bub_base_b1.png
new file mode 100644
index 0000000..e9dd16b
Binary files /dev/null and b/edje/img/bub_base_b1.png differ
diff --git a/edje/img/bub_base_b2.png b/edje/img/bub_base_b2.png
new file mode 100644
index 0000000..f739858
Binary files /dev/null and b/edje/img/bub_base_b2.png differ
diff --git a/edje/img/map_circle.png b/edje/img/map_circle.png
new file mode 100644
index 0000000..1641097
Binary files /dev/null and b/edje/img/map_circle.png differ
diff --git a/edje/img/map_marker.png b/edje/img/map_marker.png
new file mode 100644
index 0000000..0e545a5
Binary files /dev/null and b/edje/img/map_marker.png differ
diff --git a/edje/img/map_scale.png b/edje/img/map_scale.png
new file mode 100644
index 0000000..35215c1
Binary files /dev/null and b/edje/img/map_scale.png differ
diff --git a/mock-18.xcf.gz b/mock-18.xcf.gz
index 8c2ef6c..f8d6849 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
