diff --git a/epydial/data/db/my.sqlite b/epydial/data/db/my.sqlite
index 036191b..400af49 100755
Binary files a/epydial/data/db/my.sqlite and b/epydial/data/db/my.sqlite differ
diff --git a/epydial/data/themes/blackwhite/weather_screen.edc b/epydial/data/themes/blackwhite/weather_screen.edc
index d67c1f5..583e1f9 100755
--- a/epydial/data/themes/blackwhite/weather_screen.edc
+++ b/epydial/data/themes/blackwhite/weather_screen.edc
@@ -166,6 +166,25 @@ collections {
}
}
}
+ part {
+ name: "clipper";
+ type: RECT;
+ description {
+ rel1 { relative: 17/20 5/20; offset: -48 -48; }
+ rel2 { relative: 17/20 5/20; offset: 48 48; }
+ }
+ }
+ part {
+ name: "icon";
+ type: SWALLOW;
+ mouse_events: 0;
+ clip_to: "clipper";
+ description {
+ /*fixed: 1 1;*/
+ rel1 { relative: 17/20 5/20; offset: -48 -48; }
+ rel2 { relative: 17/20 5/20; offset: 48 48; }
+ }
+ } /*end icon swallow */
part {
name: "current";
type: TEXTBLOCK;
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/0.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/0.png
new file mode 100644
index 0000000..3d8c6b4
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/0.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/1.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/1.png
new file mode 100644
index 0000000..623e19f
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/1.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/10.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/10.png
new file mode 100644
index 0000000..a6ffa43
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/10.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/11.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/11.png
new file mode 100644
index 0000000..c655869
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/11.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/12.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/12.png
new file mode 100644
index 0000000..47677fb
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/12.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/13.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/13.png
new file mode 100644
index 0000000..3b0a2b2
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/13.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/14.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/14.png
new file mode 100644
index 0000000..3d44078
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/14.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/15.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/15.png
new file mode 100644
index 0000000..2c4746d
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/15.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/16.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/16.png
new file mode 100644
index 0000000..04ebaa5
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/16.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/17.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/17.png
new file mode 100644
index 0000000..b828449
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/17.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/18.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/18.png
new file mode 100644
index 0000000..850d972
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/18.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/19.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/19.png
new file mode 100644
index 0000000..864b928
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/19.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/2.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/2.png
new file mode 100644
index 0000000..623e19f
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/2.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/20.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/20.png
new file mode 100644
index 0000000..31a93f2
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/20.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/21.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/21.png
new file mode 100644
index 0000000..c476e95
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/21.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/22.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/22.png
new file mode 100644
index 0000000..cee5033
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/22.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/23.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/23.png
new file mode 100644
index 0000000..dad9aba
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/23.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/24.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/24.png
new file mode 100644
index 0000000..74d0087
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/24.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/25.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/25.png
new file mode 100644
index 0000000..f0f8d70
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/25.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/26.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/26.png
new file mode 100644
index 0000000..2caad27
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/26.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/27.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/27.png
new file mode 100644
index 0000000..4cbe3b9
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/27.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/28.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/28.png
new file mode 100644
index 0000000..c1eb46a
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/28.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/29.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/29.png
new file mode 100644
index 0000000..c8b27b3
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/29.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/3.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/3.png
new file mode 100644
index 0000000..3d8c6b4
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/3.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/30.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/30.png
new file mode 100644
index 0000000..edf4f22
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/30.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/31.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/31.png
new file mode 100644
index 0000000..dbfbf60
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/31.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/32.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/32.png
new file mode 100644
index 0000000..adf7561
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/32.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/3200.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/3200.png
new file mode 100644
index 0000000..116ba1a
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/3200.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/33.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/33.png
new file mode 100644
index 0000000..b86b58b
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/33.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/34.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/34.png
new file mode 100644
index 0000000..6e68f01
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/34.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/35.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/35.png
new file mode 100644
index 0000000..1ec73d2
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/35.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/36.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/36.png
new file mode 100644
index 0000000..30affeb
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/36.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/37.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/37.png
new file mode 100644
index 0000000..9fbc83b
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/37.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/38.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/38.png
new file mode 100644
index 0000000..3ba20eb
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/38.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/39.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/39.png
new file mode 100644
index 0000000..7dc38d8
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/39.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/4.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/4.png
new file mode 100644
index 0000000..3d8c6b4
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/4.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/40.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/40.png
new file mode 100644
index 0000000..921b43b
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/40.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/41.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/41.png
new file mode 100644
index 0000000..9c1f2f9
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/41.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/42.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/42.png
new file mode 100644
index 0000000..9c1f2f9
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/42.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/43.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/43.png
new file mode 100644
index 0000000..0e5c264
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/43.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/44.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/44.png
new file mode 100644
index 0000000..edf4f22
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/44.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/45.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/45.png
new file mode 100644
index 0000000..61e165d
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/45.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/46.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/46.png
new file mode 100644
index 0000000..8b576ea
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/46.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/47.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/47.png
new file mode 100644
index 0000000..7c8f0cf
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/47.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/5.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/5.png
new file mode 100644
index 0000000..cf5e92f
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/5.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/6.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/6.png
new file mode 100644
index 0000000..1e75173
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/6.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/7.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/7.png
new file mode 100644
index 0000000..db55fba
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/7.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/8.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/8.png
new file mode 100644
index 0000000..884723f
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/8.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/9.png b/epydial/data/themes_data/blackwhite/images/stardock_weather/9.png
new file mode 100644
index 0000000..a00cbff
Binary files /dev/null and b/epydial/data/themes_data/blackwhite/images/stardock_weather/9.png differ
diff --git a/epydial/data/themes_data/blackwhite/images/stardock_weather/permission.txt b/epydial/data/themes_data/blackwhite/images/stardock_weather/permission.txt
new file mode 100644
index 0000000..318c70f
--- /dev/null
+++ b/epydial/data/themes_data/blackwhite/images/stardock_weather/permission.txt
@@ -0,0 +1,14 @@
+These weather images are (c) 2003 by Stardock Corporation. All rights reserved.
+
+Permission:
+Stardock gives you permission to distribute these images and or icons freely as long as this permission document is included.
+
+Allowed Uses:
+You may use these images with any Stardock related product (such as creating DesktopX objects or ObjectDock or plugins).
+
+In addition, Stardock licenses this for use with content that is provided free of charge and is not connected to a commercial software product. You may use these images for skins, themes, and other content for freeware software even if it is competitive in nature with Stardock's offerings as long as the copyright notices are included. You may not, however, bundle these images in any way with any software product without Stardock's express permission.
+
+You may use these images in your website or product as long as this permission.txt is linked somewhere along with Stardock's copyright notice with a link to Stardock's homepage: http://www.stardock.com.
+
+Designed Use:
+These weather images are designed to provide the various weather conditions reported by weather services. It was created for use with Stardock DesktopX (http://www.desktopx.net) and Stardock ObjectDock (http://www.objectdock.com) both of which allow users to monitor the weather conditions from their desktop.
\ No newline at end of file
diff --git a/epydial/epydial.py b/epydial/epydial.py
index ae5561a..15e2872 100755
--- a/epydial/epydial.py
+++ b/epydial/epydial.py
@@ -20,6 +20,7 @@ EDJE_FILE_PATH = "data/themes/blackwhite/"
PIX_FILE_PATH = "/media/card/hon/"
TRACK_FILE_PATH = "/media/card/track/"
DB_FILE_PATH = "data/db/my.sqlite"
+PIX_WEATHER_FILE_PATH = "data/themes_data/blackwhite/images/stardock_weather/"
DIALER_SCREEN_NAME = "pyneo/dialer/main"
INCALL_SCREEN_NAME = "pyneo/dialer/incall"
@@ -245,7 +246,6 @@ class PyneoController(object):
@classmethod
def gsm_accept(class_):
os.system('alsactl -f /usr/share/openmoko/scenarios/gsmhandset.state restore')
-# class_.call = object_by_url('dbus:///org/pyneo/gsmdevice/Call/1')
class_.call.Accept(dbus_interface=DIN_CALL)
@classmethod
@@ -271,19 +271,7 @@ class PyneoController(object):
class_.notify_callbacks("gsm_reg_denied")
elif nw_status == 4:
raise NotImplementedError("GSM registration has unknown state")
-
-# if status.has_key('phone_activity_status'):
-# ph_status = status['phone_activity_status']
-#
-# if class_.call_type != 'outgoing':
-# if ph_status == 0:
-# class_.notify_callbacks("gsm_phone_call_end")
-# os.system('alsactl -f /usr/share/openmoko/scenarios/stereoout.state restore')
-# if ph_status == 3:
-# class_.notify_callbacks("gsm_phone_ringing")
-# if ph_status == 4:
-# class_.notify_callbacks("gsm_phone_call_start")
-
+
if status.has_key('rssi'):
class_.notify_callbacks("gsm_signal_strength_change", status['rssi'])
diff --git a/epydial/weather_screen.py b/epydial/weather_screen.py
index bbf0006..1cf3a09 100644
--- a/epydial/weather_screen.py
+++ b/epydial/weather_screen.py
@@ -20,6 +20,25 @@ class WeatherScreen(EdjeGroup):
EdjeGroup.__init__(self, screen_manager, WEATHER_SCREEN_NAME)
self.weather_for_zip(ZIP_CODE, TEMP_UNIT)
+ def on_get_pix(self, icon):
+ self.image = self.evas.Image(file=PIX_WEATHER_FILE_PATH + icon + '.png')
+ x, y = self.image.image_size
+ dx, dy = self.part_size_get('clipper')
+ print 'x, y, dx, dy: ', x, y, dx, dy
+ if x * dy > y * dx:
+ y = y * dx / x
+ x = dx
+ else:
+ x = x * dy / y
+ y = dy
+ print 'x, y, dx, dy: ', x, y, dx, dy
+ self.image.fill = 0, 0, x, y
+ self.part_swallow('icon', self.image)
+ self.obj = self.part_object_get('clipper')
+ self.obj.size = x, y
+ self.obj.show()
+ print 'obj: ', self.obj
+
def weather_for_zip(self, zip_code, unit):
url = WEATHER_URL % (zip_code, unit)
dom = minidom.parse(urllib.urlopen(url))
@@ -29,26 +48,22 @@ class WeatherScreen(EdjeGroup):
'date': node.getAttribute('date'),
'low': node.getAttribute('low'),
'high': node.getAttribute('high'),
- 'condition': node.getAttribute('text')
+ 'condition': node.getAttribute('text'),
+ 'code': node.getAttribute('code'),
})
ycondition = dom.getElementsByTagNameNS(WEATHER_NS, 'condition')[0]
- self.part_text_set("location", "dom.getElementsByTagName('title')[0].firstChild.data[17:]")
-
+ self.on_get_pix(ycondition.getAttribute('code'))
+ self.part_text_set("location", dom.getElementsByTagName('title')[0].firstChild.data[17:])
self.part_text_set("current", "current condition: %s
current temp: %s" % (ycondition.getAttribute('text'), ycondition.getAttribute('temp')))
- #print forecasts.pop(1)['date']
-
self.part_text_set("forecasts", "forecasts:
date: %s
low: %s
high: %s
condition: %s" % (forecasts[1]['date'], forecasts[1]['low'], forecasts[1]['high'], forecasts[1]['condition']))
-# return {
-# 'current_condition': ycondition.getAttribute('text'),
-# 'current_temp': ycondition.getAttribute('temp'),
-# 'forecasts': forecasts,
-# 'title': dom.getElementsByTagName('title')[0].firstChild.data
-# }
-
@edje.decorators.signal_callback("mouse,up,1", "*")
def on_edje_signal_dialer_status_triggered(self, emission, source):
if source == "button_12":
+ self.image.delete()
PyneoController.show_dialer_screen()
+ if source == "headline":
+ self.image.delete()
+ self.weather_for_zip(ZIP_CODE, TEMP_UNIT)
print 'source: ', source