From d5172676e40c6f2852a3dae19f7379637b05dbda Mon Sep 17 00:00:00 2001
From: Nostalghia <b.vehikel@googlemail.com>
Date: Thu, 21 Jun 2012 19:00:09 +0000
Subject: Updating news. Clean up before release.

---
diff --git a/MANIFEST b/MANIFEST
index fb8a6fa..73896c2 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,7 +1,7 @@
 activity/activity.info
 activity/activity-kandid.svg
-activity/application-x-kandid-project.svg
 activity/mimetypes.xml
+activity/application-x-kandid-project.svg
 locale/de/activity.linfo
 locale/de/intro.html
 locale/de/LC_MESSAGES/net.sourceforge.kandid.mo
@@ -22,6 +22,7 @@ locale/vi/activity.linfo
 locale/vi/LC_MESSAGES/net.sourceforge.kandid.mo
 po/Kandid.pot
 po/af.po
+po/ak.po
 po/am.po
 po/ar.po
 po/ay.po
@@ -32,10 +33,13 @@ po/bn_IN.po
 po/ca.po
 po/cpp.po
 po/cs.po
+po/da.po
 po/de.po
 po/dz.po
 po/el.po
 po/en.po
+po/en_GB.po
+po/en_US.po
 po/es.po
 po/fa.po
 po/fa_AF.po
@@ -48,6 +52,9 @@ po/he.po
 po/hi.po
 po/ht.po
 po/hu.po
+po/hus.po
+po/hy.po
+po/id.po
 po/ig.po
 po/is.po
 po/it.po
@@ -55,6 +62,8 @@ po/ja.po
 po/km.po
 po/ko.po
 po/kos.po
+po/ku.po
+po/lt.po
 po/mg.po
 po/mk.po
 po/ml.po
@@ -63,6 +72,7 @@ po/mr.po
 po/ms.po
 po/mvo.po
 po/na.po
+po/nah.po
 po/nb.po
 po/ne.po
 po/nl.po
@@ -74,6 +84,7 @@ po/ps.po
 po/pt.po
 po/pt_BR.po
 po/qu.po
+po/quz.po
 po/ro.po
 po/ru.po
 po/rw.po
@@ -81,7 +92,9 @@ po/sd.po
 po/si.po
 po/sk.po
 po/sl.po
+po/son.po
 po/sq.po
+po/sr.po
 po/sv.po
 po/sw.po
 po/ta.po
@@ -90,6 +103,8 @@ po/th.po
 po/tpi.po
 po/tr.po
 po/tvl.po
+po/tyv.po
+po/tzm.po
 po/tzo.po
 po/ug.po
 po/ur.po
@@ -97,6 +112,7 @@ po/vi.po
 po/wa.po
 po/yo.po
 po/zh_CN.po
+po/zh_HK.po
 po/zh_TW.po
 intro/button_breed-colormap.png
 intro/evolved-population-colormap.png
diff --git a/NEWS b/NEWS
index ab98e30..3036804 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 An introduction to Kandid can be found at sugarlabs.org .
 http://wiki.sugarlabs.org/go/Activities/Kandid
 
+v10: June 2012
+Fixing activity.info to be conform with Sugar 0.96. Now the tags 'bundle_id' and 'exec' are used.
+
 v9: January 2011
 Fixing bug #2144: Kandid SVG activity icon now did not use fill_color and stroke_color.
 Bug fixing to be compatible with Sugar 0.90.
diff --git a/ep_exporter_png.py b/ep_exporter_png.py
index caaf585..1a31613 100644
--- a/ep_exporter_png.py
+++ b/ep_exporter_png.py
@@ -114,3 +114,20 @@ class PngExporter(object):
         file_dsobject.set_file_path(export_path)
         datastore.write(file_dsobject)
         file_dsobject.destroy()
+
+#        ftp, export_file = None, None
+#        try:
+#            import ftplib
+#            ftp = ftplib.FTP('192.168.0.10')
+#            ftp.login()
+#            ftp.cwd('kandid')
+#            export_file = open(export_path, 'rb')
+#            ftp.storbinary('STOR ' + export_filename, export_file)
+#        except:
+#            ka_debug.err('export: failed uploading image [%s] [%s] [%s]' % \
+#                   (thumb_path, sys.exc_info()[0], sys.exc_info()[1]))
+#        if export_file is not None:
+#            export_file.close()
+#        if ftp is not None:
+#            ftp.quit()
+            
diff --git a/ep_page_status.py b/ep_page_status.py
index 171988a..67c7ec5 100644
--- a/ep_page_status.py
+++ b/ep_page_status.py
@@ -59,6 +59,7 @@ class StatusController(object):
         cb.append_text('400 * 400')
         cb.append_text('600 * 600')
         cb.append_text('1000 * 1000')
+#        cb.append_text('3300 * 3300')
         preference = ka_preference.Preference.instance()
         export_size = preference.get(ka_preference.EXPORT_SIZE)
         if export_size[0] == 400:
@@ -67,6 +68,8 @@ class StatusController(object):
             cb.set_active(2)
         elif export_size[0] == 1000:
             cb.set_active(3)
+#        elif export_size[0] == 3300:
+#            cb.set_active(4)
         else:
             cb.set_active(0)
         param_panel.pack_start(cb, expand=False, fill=False)
@@ -141,5 +144,7 @@ class StatusController(object):
             preference.set(ka_preference.EXPORT_SIZE, (600, 600))
         elif index == 3:
             preference.set(ka_preference.EXPORT_SIZE, (1000, 1000))
+#        elif index == 4:
+#            preference.set(ka_preference.EXPORT_SIZE, (3300, 3300))
         preference.store()
         
--
cgit v0.9.1