Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
e_mod_main.c weather.edc
Log Message:
Simple mode fixes (still needs a little work)
New N/A icon...looks better imho.
===================================================================
RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_mod_main.c 28 Mar 2006 18:26:32 -0000 1.13
+++ e_mod_main.c 28 Mar 2006 18:59:48 -0000 1.14
@@ -224,17 +224,10 @@
wf->degrees = 'C';
break;
}
- switch (wf->conf->display)
- {
- case 0:
- edje_object_signal_emit(wf->weather_obj, "set_style",
"simple");
- break;
- case 1:
- edje_object_signal_emit(wf->weather_obj, "set_style",
"detailed");
- break;
- }
-
- edje_object_signal_emit(wf->weather_obj, "set_style", "detailed");
+ if (wf->conf->display == DETAILED_DISPLAY)
+ edje_object_signal_emit(wf->weather_obj, "set_style",
"detailed");
+ else
+ edje_object_signal_emit(wf->weather_obj, "set_style", "simple");
wf->loc_set = 0;
wf->check_timer = ecore_timer_add((double)wf->conf->poll_time,
_weather_face_cb_check, wf->weather);
@@ -335,7 +328,7 @@
edje_object_part_text_set(o, "location", "");
wf->icon_obj = e_icon_add(wf->evas);
- e_icon_file_set(wf->icon_obj, PACKAGE_DATA_DIR"/images/na.png");
+ e_icon_file_set(wf->icon_obj, PACKAGE_DATA_DIR"/images/unknown.png");
edje_object_part_swallow(wf->weather_obj, "icon", wf->icon_obj);
o = evas_object_rectangle_add(wf->evas);
@@ -799,7 +792,7 @@
if (!ok)
{
- snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR"/images/na.png");
+ snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR"/images/unknown.png");
e_icon_file_set(wf->icon_obj, buf);
edje_object_part_swallow(wf->weather_obj, "icon", wf->icon_obj);
edje_object_part_text_set(wf->weather_obj, "location", "");
===================================================================
RCS file: /cvs/e/e_modules/weather/weather.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- weather.edc 28 Mar 2006 18:26:32 -0000 1.5
+++ weather.edc 28 Mar 2006 18:59:48 -0000 1.6
@@ -3,10 +3,6 @@
font: "vera.ttf" "Vera";
font: "VeraBd.ttf" "Vera Bold";
}
-images
-{
- image: "suncloud.png" COMP;
-}
collections
{
@@ -48,6 +44,22 @@
}
color: 0 0 0 0;
}
+ description
+ {
+ state: "simple" 0.0;
+ align: 0.5 0.5;
+ //aspect: 1.0 1.0;
+ rel1
+ {
+ relative: 0.0 0.0;
+ offset: 0.0 0.0;
+ }
+ rel2
+ {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ }
}
part
{
@@ -119,27 +131,6 @@
{
state: "simple" 0.0;
visible: 0;
- rel1
- {
- relative: 0.0 1.0;
- offset: 0 -2;
- to_y: "temp";
- }
- rel2
- {
- relative: 1.0 1.0;
- offset: -1 -1;
- }
- color: 255 255 255 255;
- color3: 0 0 0 60;
- text
- {
- text: "Taunton";
- font: "Vera";
- size: 10;
- min: 1 1;
- align: 0.5 0.5;
- }
}
}
part
@@ -170,7 +161,7 @@
}
description
{
- state: "hidden" 0.0;
+ state: "simple" 0.0;
visible: 0;
}
}
@@ -209,7 +200,7 @@
}
description
{
- state: "hidden" 0.0;
+ state: "simple" 0.0;
visible: 0;
text
{
@@ -230,8 +221,8 @@
if (!strcmp(src, "simple"))
{
set_state(PART:"location", "simple", 0.0);
- set_state(PART:"conditions", "hidden", 0.0);
- set_state(PART:"line", "hidden", 0.0);
+ set_state(PART:"conditions", "simple", 0.0);
+ set_state(PART:"line", "simple", 0.0);
}
else
{
@@ -243,28 +234,4 @@
}
}
}
-
- group
- {
- name: "modules/weather/icon";
- parts
- {
- part
- {
- name: "weather";
- mouse_events: 0;
- description
- {
- state: "default" 0.0;
- aspect: 1.0 1.0;
- max: 64 64;
- image
- {
- normal: "suncloud.png";
- }
- }
- }
- }
- }
-
}
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
