summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-07-20 14:16:17 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-07-20 14:16:17 +0000
commit50d86f6d9c8bc458b4538d60de3ce14e96cb98c2 (patch)
tree5f3af461899ad98b6cbe8ffa1d3484390fddd693
parentf17f98ac56077e5b7f8c6199da1b8b26c7da33b7 (diff)
fix darkness syscon to suck a little less and have a working cancel button; still an annoying warning to fix though
SVN revision: 74251
-rw-r--r--modules/syscon.edc35
-rw-r--r--widgets/button.edc2
2 files changed, 10 insertions, 27 deletions
diff --git a/modules/syscon.edc b/modules/syscon.edc
index 94dcd44..7cdad72 100644
--- a/modules/syscon.edc
+++ b/modules/syscon.edc
@@ -75,34 +75,17 @@
75 rel1.offset: 0 -13; 75 rel1.offset: 0 -13;
76 rel2.relative: 0.5 1.0; 76 rel2.relative: 0.5 1.0;
77 rel2.offset: 0 -13; 77 rel2.offset: 0 -13;
78 min: 64 32;
79 max: 64 32;
78 } 80 }
79 } 81 }
80 part { 82 }
81 name: "e.text.label"; 83 programs {
82 type: TEXT; 84 program {
83 effect: SOFT_SHADOW; 85 name: "cancel";
84 mouse_events: 0; 86 signal: "e,action,click";
85 scale: 1; 87 source: "*";
86 description { 88 action: SIGNAL_EMIT "e,action,close" "";
87 state: "default" 0.0;
88 rel1 {
89 to: "button";
90 relative: 0.0 0.0;
91 offset: 3 3;
92 }
93 rel2 {
94 relative: 1.0 1.0;
95 offset: -4 -4;
96 to: "button";
97 }
98 text {
99 text: "Cancel";
100 font: "Sans";
101 size: 10;
102 min: 1 1;
103 align: 0.5 0.5;
104 }
105 }
106 } 89 }
107 } 90 }
108 } 91 }
diff --git a/widgets/button.edc b/widgets/button.edc
index 6f2cb5b..d6fe3c1 100644
--- a/widgets/button.edc
+++ b/widgets/button.edc
@@ -150,7 +150,7 @@ group {
150 color2: DARKNESS_DARK_BLUE 255; 150 color2: DARKNESS_DARK_BLUE 255;
151 color_class: "button_text"; 151 color_class: "button_text";
152 text { 152 text {
153 text: "OK"; 153 text: "Cancel";
154 font: "Sans:style=Bold"; 154 font: "Sans:style=Bold";
155 size: 10; 155 size: 10;
156 min: 1 1; 156 min: 1 1;