add descriptions to the forecasts in 'gadman' mode
SVN revision: 36920
This commit is contained in:
parent
ad2830223b
commit
f04f604e7e
|
@ -239,8 +239,8 @@ _gc_orient(E_Gadcon_Client * gcc)
|
||||||
{
|
{
|
||||||
case E_GADCON_ORIENT_FLOAT:
|
case E_GADCON_ORIENT_FLOAT:
|
||||||
edje_object_signal_emit(inst->forecasts_obj, "e,state,orientation,float", "e");
|
edje_object_signal_emit(inst->forecasts_obj, "e,state,orientation,float", "e");
|
||||||
e_gadcon_client_aspect_set(gcc, 64, 32);
|
e_gadcon_client_aspect_set(gcc, 240, 120);
|
||||||
e_gadcon_client_min_size_set(gcc, 64, 32);
|
e_gadcon_client_min_size_set(gcc, 240, 120);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
edje_object_signal_emit(inst->forecasts_obj, "e,state,orientation,default", "e");
|
edje_object_signal_emit(inst->forecasts_obj, "e,state,orientation,default", "e");
|
||||||
|
@ -921,7 +921,7 @@ _forecasts_display_set(Instance * inst, int ok)
|
||||||
snprintf(name, sizeof(name), "e.text.day%d.date", i);
|
snprintf(name, sizeof(name), "e.text.day%d.date", i);
|
||||||
edje_object_part_text_set(inst->forecasts->forecasts_obj, name, inst->forecast[i].date);
|
edje_object_part_text_set(inst->forecasts->forecasts_obj, name, inst->forecast[i].date);
|
||||||
|
|
||||||
snprintf(name, sizeof(name), "e.text.day%d.desc", i);
|
snprintf(name, sizeof(name), "e.text.day%d.description", i);
|
||||||
edje_object_part_text_set(inst->forecasts->forecasts_obj, name, inst->forecast[i].desc);
|
edje_object_part_text_set(inst->forecasts->forecasts_obj, name, inst->forecast[i].desc);
|
||||||
|
|
||||||
snprintf(name, sizeof(name), "e.text.day%d.high", i);
|
snprintf(name, sizeof(name), "e.text.day%d.high", i);
|
||||||
|
|
128
forecasts.edc
128
forecasts.edc
|
@ -10,14 +10,16 @@ fonts {
|
||||||
target: "e.text.location"; \
|
target: "e.text.location"; \
|
||||||
target: "e.text.temp"; \
|
target: "e.text.temp"; \
|
||||||
target: "e.text.description"; \
|
target: "e.text.description"; \
|
||||||
target: "e.text.day0.date"; \
|
|
||||||
target: "e.swallow.day0.icon"; \
|
target: "e.swallow.day0.icon"; \
|
||||||
target: "e.text.day0.high"; \
|
target: "e.text.day0.date"; \
|
||||||
|
target: "e.text.day0.description"; \
|
||||||
target: "e.text.day0.low"; \
|
target: "e.text.day0.low"; \
|
||||||
target: "e.text.day1.date"; \
|
target: "e.text.day0.high"; \
|
||||||
target: "e.swallow.day1.icon"; \
|
target: "e.swallow.day1.icon"; \
|
||||||
target: "e.text.day1.high"; \
|
target: "e.text.day1.date"; \
|
||||||
|
target: "e.text.day1.description"; \
|
||||||
target: "e.text.day1.low"; \
|
target: "e.text.day1.low"; \
|
||||||
|
target: "e.text.day1.high"; \
|
||||||
|
|
||||||
#define FORECASTS_ICON(icon_code, minw, minh, maxw, maxh, a) \
|
#define FORECASTS_ICON(icon_code, minw, minh, maxw, maxh, a) \
|
||||||
images { \
|
images { \
|
||||||
|
@ -239,6 +241,25 @@ collections {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
part {
|
||||||
|
name: "e.swallow.day0.icon";
|
||||||
|
type: SWALLOW;
|
||||||
|
mouse_events: 0;
|
||||||
|
description {
|
||||||
|
state: "default" 0.0;
|
||||||
|
visible: 0;
|
||||||
|
}
|
||||||
|
description {
|
||||||
|
state: "float" 0.0;
|
||||||
|
visible: 1;
|
||||||
|
rel1 {
|
||||||
|
to: "day0";
|
||||||
|
}
|
||||||
|
rel2 {
|
||||||
|
to: "day0";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
part {
|
part {
|
||||||
name: "e.text.day0.date";
|
name: "e.text.day0.date";
|
||||||
type: TEXT;
|
type: TEXT;
|
||||||
|
@ -257,8 +278,8 @@ collections {
|
||||||
to: "day0";
|
to: "day0";
|
||||||
}
|
}
|
||||||
rel2 {
|
rel2 {
|
||||||
relative: 1.0 0.0;
|
relative: 1.0 1.0;
|
||||||
offset: 1 30;
|
offset: -1 -1;
|
||||||
to: "day0";
|
to: "day0";
|
||||||
}
|
}
|
||||||
color: 255 255 255 255;
|
color: 255 255 255 255;
|
||||||
|
@ -266,7 +287,7 @@ collections {
|
||||||
color3: 0 0 0 32;
|
color3: 0 0 0 32;
|
||||||
color_class: "module_label";
|
color_class: "module_label";
|
||||||
text {
|
text {
|
||||||
text: "DATE0";
|
text: "Date0";
|
||||||
font: "Vera Bold";
|
font: "Vera Bold";
|
||||||
size: 10;
|
size: 10;
|
||||||
min: 1 1;
|
min: 1 1;
|
||||||
|
@ -276,8 +297,9 @@ collections {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
part {
|
part {
|
||||||
name: "e.swallow.day0.icon";
|
name: "e.text.day0.description";
|
||||||
type: SWALLOW;
|
type: TEXT;
|
||||||
|
effect: OUTLINE_SOFT_SHADOW;
|
||||||
mouse_events: 0;
|
mouse_events: 0;
|
||||||
description {
|
description {
|
||||||
state: "default" 0.0;
|
state: "default" 0.0;
|
||||||
|
@ -287,10 +309,28 @@ collections {
|
||||||
state: "float" 0.0;
|
state: "float" 0.0;
|
||||||
visible: 1;
|
visible: 1;
|
||||||
rel1 {
|
rel1 {
|
||||||
to: "day0";
|
relative: 0.0 0.0;
|
||||||
|
offset: 1 -14;
|
||||||
|
to_x: "day0";
|
||||||
|
to_y: "e.text.day0.low";
|
||||||
}
|
}
|
||||||
rel2 {
|
rel2 {
|
||||||
to: "day0";
|
relative: 1.0 0.0;
|
||||||
|
offset: -1 -1;
|
||||||
|
to_x: "day0";
|
||||||
|
to_y: "e.text.day0.low";
|
||||||
|
}
|
||||||
|
color: 255 255 255 255;
|
||||||
|
color2: 0 0 0 96;
|
||||||
|
color3: 0 0 0 32;
|
||||||
|
color_class: "module_label";
|
||||||
|
text {
|
||||||
|
text: "Description0";
|
||||||
|
font: "Vera Bold";
|
||||||
|
size: 10;
|
||||||
|
min: 1 1;
|
||||||
|
align: 0.5 0.0;
|
||||||
|
text_class: "module_normal";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -312,7 +352,7 @@ collections {
|
||||||
to: "day0";
|
to: "day0";
|
||||||
}
|
}
|
||||||
rel2 {
|
rel2 {
|
||||||
relative: 0.0 1.0;
|
relative: 1.0 1.0;
|
||||||
offset: -1 -1;
|
offset: -1 -1;
|
||||||
to: "day0";
|
to: "day0";
|
||||||
}
|
}
|
||||||
|
@ -321,7 +361,7 @@ collections {
|
||||||
color3: 0 0 0 32;
|
color3: 0 0 0 32;
|
||||||
color_class: "module_label";
|
color_class: "module_label";
|
||||||
text {
|
text {
|
||||||
text: "LOW0";
|
text: "Low0";
|
||||||
font: "Vera Bold";
|
font: "Vera Bold";
|
||||||
size: 8;
|
size: 8;
|
||||||
min: 1 1;
|
min: 1 1;
|
||||||
|
@ -356,7 +396,7 @@ collections {
|
||||||
color3: 0 0 0 32;
|
color3: 0 0 0 32;
|
||||||
color_class: "module_label";
|
color_class: "module_label";
|
||||||
text {
|
text {
|
||||||
text: "HIGH0";
|
text: "High0";
|
||||||
font: "Vera Bold";
|
font: "Vera Bold";
|
||||||
size: 8;
|
size: 8;
|
||||||
min: 1 1;
|
min: 1 1;
|
||||||
|
@ -387,6 +427,25 @@ collections {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
part {
|
||||||
|
name: "e.swallow.day1.icon";
|
||||||
|
type: SWALLOW;
|
||||||
|
mouse_events: 0;
|
||||||
|
description {
|
||||||
|
state: "default" 0.0;
|
||||||
|
visible: 0;
|
||||||
|
}
|
||||||
|
description {
|
||||||
|
state: "float" 0.0;
|
||||||
|
visible: 1;
|
||||||
|
rel1 {
|
||||||
|
to: "day1";
|
||||||
|
}
|
||||||
|
rel1 {
|
||||||
|
to: "day1";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
part {
|
part {
|
||||||
name: "e.text.day1.date";
|
name: "e.text.day1.date";
|
||||||
type: TEXT;
|
type: TEXT;
|
||||||
|
@ -405,8 +464,8 @@ collections {
|
||||||
to: "day1";
|
to: "day1";
|
||||||
}
|
}
|
||||||
rel2 {
|
rel2 {
|
||||||
relative: 1.0 0.0;
|
relative: 1.0 1.0;
|
||||||
offset: 1 1;
|
offset: -1 -1;
|
||||||
to: "day1";
|
to: "day1";
|
||||||
}
|
}
|
||||||
color: 255 255 255 255;
|
color: 255 255 255 255;
|
||||||
|
@ -414,7 +473,7 @@ collections {
|
||||||
color3: 0 0 0 32;
|
color3: 0 0 0 32;
|
||||||
color_class: "module_label";
|
color_class: "module_label";
|
||||||
text {
|
text {
|
||||||
text: "DATE1";
|
text: "Date1";
|
||||||
font: "Vera Bold";
|
font: "Vera Bold";
|
||||||
size: 10;
|
size: 10;
|
||||||
min: 1 1;
|
min: 1 1;
|
||||||
|
@ -424,8 +483,9 @@ collections {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
part {
|
part {
|
||||||
name: "e.swallow.day1.icon";
|
name: "e.text.day1.description";
|
||||||
type: SWALLOW;
|
type: TEXT;
|
||||||
|
effect: OUTLINE_SOFT_SHADOW;
|
||||||
mouse_events: 0;
|
mouse_events: 0;
|
||||||
description {
|
description {
|
||||||
state: "default" 0.0;
|
state: "default" 0.0;
|
||||||
|
@ -435,10 +495,28 @@ collections {
|
||||||
state: "float" 0.0;
|
state: "float" 0.0;
|
||||||
visible: 1;
|
visible: 1;
|
||||||
rel1 {
|
rel1 {
|
||||||
to: "day1";
|
relative: 0.0 0.0;
|
||||||
|
offset: 1 -14;
|
||||||
|
to_x: "day1";
|
||||||
|
to_y: "e.text.day1.low";
|
||||||
}
|
}
|
||||||
rel1 {
|
rel2 {
|
||||||
to: "day1";
|
relative: 1.0 0.0;
|
||||||
|
offset: -1 -1;
|
||||||
|
to_x: "day1";
|
||||||
|
to_y: "e.text.day1.low";
|
||||||
|
}
|
||||||
|
color: 255 255 255 255;
|
||||||
|
color2: 0 0 0 96;
|
||||||
|
color3: 0 0 0 32;
|
||||||
|
color_class: "module_label";
|
||||||
|
text {
|
||||||
|
text: "Description1";
|
||||||
|
font: "Vera Bold";
|
||||||
|
size: 10;
|
||||||
|
min: 1 1;
|
||||||
|
align: 0.5 0.0;
|
||||||
|
text_class: "module_normal";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -460,7 +538,7 @@ collections {
|
||||||
to: "day1";
|
to: "day1";
|
||||||
}
|
}
|
||||||
rel2 {
|
rel2 {
|
||||||
relative: 0.0 1.0;
|
relative: 1.0 1.0;
|
||||||
offset: -1 -1;
|
offset: -1 -1;
|
||||||
to: "day1";
|
to: "day1";
|
||||||
}
|
}
|
||||||
|
@ -469,7 +547,7 @@ collections {
|
||||||
color3: 0 0 0 32;
|
color3: 0 0 0 32;
|
||||||
color_class: "module_label";
|
color_class: "module_label";
|
||||||
text {
|
text {
|
||||||
text: "LOW0";
|
text: "Low1";
|
||||||
font: "Vera Bold";
|
font: "Vera Bold";
|
||||||
size: 8;
|
size: 8;
|
||||||
min: 1 1;
|
min: 1 1;
|
||||||
|
@ -504,7 +582,7 @@ collections {
|
||||||
color3: 0 0 0 32;
|
color3: 0 0 0 32;
|
||||||
color_class: "module_label";
|
color_class: "module_label";
|
||||||
text {
|
text {
|
||||||
text: "HIGH0";
|
text: "High1";
|
||||||
font: "Vera Bold";
|
font: "Vera Bold";
|
||||||
size: 8;
|
size: 8;
|
||||||
min: 1 1;
|
min: 1 1;
|
||||||
|
|
Loading…
Reference in New Issue