Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xGnomeMoonActivity.py59
-rw-r--r--Moonwidgets.py29
-rw-r--r--SugarMoonActivity.py58
3 files changed, 105 insertions, 41 deletions
diff --git a/GnomeMoonActivity.py b/GnomeMoonActivity.py
index e284b8f..82dbcf8 100755
--- a/GnomeMoonActivity.py
+++ b/GnomeMoonActivity.py
@@ -227,48 +227,73 @@ class MoonActivity(Gtk.Window):
information = ""
information += "%s:\n\n" % (_("Today's Moon Information"))
information += "%s\n\n" % (MG.get_date_time())
- information += "%s:\n%s\n\n" % (_("Phase"), self.luna_hoy.data_model.moon_phase_name(self.luna_hoy.data_model.phase_of_moon))
- information += "%s:\n%.2f (%s)\n\n" % (_("Julian Date"), self.luna_hoy.data_model.julian_date, _("astronomical"))
+
+ information += "%s:\n%s\n\n" % (_("Phase"),
+ self.luna_hoy.data_model.moon_phase_name(
+ self.luna_hoy.data_model.phase_of_moon))
+
+ information += "%s:\n%.2f (%s)\n\n" % (_("Julian Date"),
+ self.luna_hoy.data_model.julian_date, _("astronomical"))
information += "%s:\n" % (_("Age"))
dias = self.luna_hoy.data_model.days_old
horas = self.luna_hoy.data_model.hours_old
minutos = self.luna_hoy.data_model.minutes_old
- information += "%i %s, %i %s, %i %s.\n\n" % (dias, _("days"), horas, _("hours"), minutos, _("minutes"))
+
+ information += "%i %s, %i %s, %i %s.\n\n" % (
+ dias, _("days"), horas, _("hours"), minutos, _("minutes"))
phase = self.luna_hoy.data_model.phase_of_moon * 100
lunation = self.luna_hoy.data_model.lunation
information += "%s:\n" % (_("Lunation"))
- information += "%.2f%s %s %d.\n\n" % (phase, "%", _("through lunation"), lunation)
+
+ information += "%.2f%s %s %d.\n\n" % (
+ phase, "%", _("through lunation"), lunation)
information += "%s:\n" % (_("Surface Visibility"))
- information += "%.0f%s (%s)\n\n" % (self.luna_hoy.data_model.percent_of_full_moon * 100, "%", _("estimated"))
+ information += "%.0f%s (%s)\n\n" % (
+ self.luna_hoy.data_model.percent_of_full_moon * 100,
+ "%", _("estimated"))
- #information += _("Surface Visibility:\n%.0f%% (estimated)\n\n") % (self.luna_hoy.data_model.percent_of_full_moon * 100)
+ #information += _("Surface Visibility:\n%.0f%% (estimated)\n\n") %
+ #(self.luna_hoy.data_model.percent_of_full_moon * 100)
- selen = {'deg':self.luna_hoy.data_model.selenographic_deg, 'westOrEast':self.luna_hoy.data_model.west_or_east,
- 'riseOrSet':self.luna_hoy.data_model.rise_or_set}
+ selen = {'deg':self.luna_hoy.data_model.selenographic_deg,
+ 'westOrEast':self.luna_hoy.data_model.west_or_east,
+ 'riseOrSet':self.luna_hoy.data_model.rise_or_set}
+
information += _(u"Selenographic Terminator Longitude:\n%(deg).1f\u00b0%(westOrEast)s (%(riseOrSet)s)\n\n") % selen
- full = {'date':time.strftime(MG.LOCALE_DATE_FORMAT, time.localtime(self.luna_hoy.data_model.next_full_moon_date)),
- 'days':self.luna_hoy.data_model.days_until_full_moon}
+ full = {'date':time.strftime(MG.LOCALE_DATE_FORMAT,
+ time.localtime(self.luna_hoy.data_model.next_full_moon_date)),
+ 'days':self.luna_hoy.data_model.days_until_full_moon}
+
information += _("Next Full Moon:\n%(date)s in %(days).0f days\n\n") % full
- new = {'date':time.strftime(MG.LOCALE_DATE_FORMAT, time.localtime(self.luna_hoy.data_model.next_new_moon_date)),
- 'days':self.luna_hoy.data_model.days_until_new_moon}
+ new = {'date':time.strftime(MG.LOCALE_DATE_FORMAT,
+ time.localtime(self.luna_hoy.data_model.next_new_moon_date)),
+ 'days':self.luna_hoy.data_model.days_until_new_moon}
+
information += _("Next New Moon:\n%(date)s in %(days).0f days\n\n") % new
- lunare = {'date':time.strftime(MG.LOCALE_DATE_FORMAT, time.localtime(self.luna_hoy.data_model.next_lunar_eclipse_date)),
- 'days':self.luna_hoy.data_model.days_until_lunar_eclipse}
+ lunare = {'date':time.strftime(MG.LOCALE_DATE_FORMAT,
+ time.localtime(self.luna_hoy.data_model.next_lunar_eclipse_date)),
+ 'days':self.luna_hoy.data_model.days_until_lunar_eclipse}
+
information += _("Next Lunar eclipse:\n%(date)s in %(days).0f days\n\n") % lunare
- solare = {'date':time.strftime(MG.LOCALE_DATE_FORMAT, time.localtime(self.luna_hoy.data_model.next_solar_eclipse_date)),
- 'days':self.luna_hoy.data_model.days_until_solar_eclipse}
+ solare = {'date':time.strftime(MG.LOCALE_DATE_FORMAT,
+ time.localtime(self.luna_hoy.data_model.next_solar_eclipse_date)),
+ 'days':self.luna_hoy.data_model.days_until_solar_eclipse}
+
information += _("Next Solar eclipse:\n%(date)s in %(days).0f days") % solare
self.bufferinfo.set_text(information)
- self.label_emisferio.set_text( " %s: %s" % (_("Vista Hemisferio"),_(self.luna_hoy.hemisphere_view)) )
+
+ self.label_emisferio.set_text( " %s: %s" % (
+ _("Vista Hemisferio"),_(self.luna_hoy.hemisphere_view)) )
if __name__=="__main__":
+
MoonActivity()
Gtk.main()
diff --git a/Moonwidgets.py b/Moonwidgets.py
index 05e38cc..adfd6aa 100644
--- a/Moonwidgets.py
+++ b/Moonwidgets.py
@@ -25,10 +25,8 @@
# Febrero 2012
# Correcciones, Simplificación y Reestructuración Modular:
# Desarrollo de CalendarButton + MoonCalendar:
-# Instalador y Portado a gnome:
+# Instalador y Portado a gnome y Gtk 3:
# Flavio Danesse <fdanesse@gmail.com> CeibalJAM! - Uruguay - Activity Central
-# Traducciones a Español:
-# Ana Cichero <ana.cichero@gmail.com> CeibalJAM! - Uruguay
import math
import time
@@ -156,6 +154,7 @@ class CalendarButton(Gtk.EventBox):
def actualizar(self):
pass
+ # FIXME: Reimplementar.
'''
if self.dia <= 0: return
@@ -226,6 +225,7 @@ class CalendarButton(Gtk.EventBox):
def draw_grid(self, compass_text):
pass
+ # FIXME: Reimplementar.
'''
# Draw Selenographic grid line data.
rgc = self.image_pixmap.new_gc(foreground=MG.RED)
@@ -298,6 +298,7 @@ class CalendarButton(Gtk.EventBox):
def draw_fase_moon(self, mask_pixmap, kgc, wgc):
pass
+ # FIXME: Reimplementar.
'''
if self.data_model.phase_of_moon <= .25:
#print "New Moon to First Quarter"
@@ -485,7 +486,8 @@ class MoonCalendar(Gtk.AspectFrame):
boton = Gtk.ToggleToolButton()
boton.connect('clicked', self.anterior)
- pixbuf= GdkPixbuf.Pixbuf.new_from_file_at_size(os.path.join(MG.ICONOS,'flecha-ico.svg'), 32, 32)
+ pixbuf= GdkPixbuf.Pixbuf.new_from_file_at_size(
+ os.path.join(MG.ICONOS,'flecha-ico.svg'), 32, 32)
imagen = Gtk.Image()
imagen.set_from_pixbuf(pixbuf)
boton.set_icon_widget(imagen)
@@ -508,8 +510,9 @@ class MoonCalendar(Gtk.AspectFrame):
boton = Gtk.ToggleToolButton()
boton.connect('clicked', self.siguiente)
- pixbuf= GdkPixbuf.Pixbuf.new_from_file_at_size(os.path.join(MG.ICONOS,'flecha-ico.svg'), 32, 32)
- pixbuf= pixbuf.flip(1)
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
+ os.path.join(MG.ICONOS,'flecha-ico.svg'), 32, 32)
+ pixbuf = pixbuf.flip(1)
imagen = Gtk.Image()
imagen.set_from_pixbuf(pixbuf)
boton.set_icon_widget(imagen)
@@ -569,7 +572,9 @@ class MoonCalendar(Gtk.AspectFrame):
for d in calendar.day_name:
if d: dias.append(d)
- self.hoy = "%s-%s-%s %s" % (self.matriz.anio, self.matriz.mes, self.matriz.fecha, self.matriz.hora)
+ self.hoy = "%s-%s-%s %s" % (self.matriz.anio,
+ self.matriz.mes, self.matriz.fecha, self.matriz.hora)
+
meses= []
for m in calendar.month_name:
@@ -621,22 +626,28 @@ class MatrizMoonCalendar(Gtk.EventBox):
def repaint(self, widget= None, event= None):
if not self.fixes: return
+
rect = self.get_allocation()
anchoboton = rect.width/len(self.fixes[0])
altoboton = rect.height/len(self.fixes)
tamanioboton = min( [anchoboton,altoboton] )
+
if self.tamanioboton != tamanioboton:
self.tamanioboton = tamanioboton
posy = 0
+
for fixed in self.fixes:
self.fixed.move(fixed, 0, posy)
posy += self.tamanioboton
+
posx = 0
+
for fixed in self.fixes:
for boton in self.calendarbuttons[self.fixes.index(fixed)]:
fixed.move(boton, posx, 0)
boton.repaint(self.tamanioboton)
posx += self.tamanioboton
+
posx = 0
def set_mes(self, anio, mes, fecha, hora):
@@ -645,17 +656,21 @@ class MatrizMoonCalendar(Gtk.EventBox):
self.fixes = []
self.calendarbuttons = []
self.semanas = MG.get_semanas_del_mes(anio, mes)
+
for child in self.fixed.get_children():
self.fixed.remove(child)
child.destroy()
+
for sem in self.semanas:
listadias = []
fixed = Gtk.Fixed()
self.fixes.append(fixed)
self.fixed.put(fixed, 0,0)
+
for dia in sem:
boton = CalendarButton(self.anio, self.mes, dia, self.hora)
listadias.append(boton)
fixed.put(boton, 0,0)
+
self.calendarbuttons.append(listadias)
\ No newline at end of file
diff --git a/SugarMoonActivity.py b/SugarMoonActivity.py
index 6afb611..d49ea96 100644
--- a/SugarMoonActivity.py
+++ b/SugarMoonActivity.py
@@ -248,47 +248,71 @@ class MoonActivity(activity.Activity):
information = ""
information += "%s:\n\n" % (_("Today's Moon Information"))
information += "%s\n\n" % (MG.get_date_time())
- information += "%s:\n%s\n\n" % (_("Phase"), self.luna_hoy.data_model.moon_phase_name(self.luna_hoy.data_model.phase_of_moon))
- information += "%s:\n%.2f (%s)\n\n" % (_("Julian Date"), self.luna_hoy.data_model.julian_date, _("astronomical"))
+
+ information += "%s:\n%s\n\n" % (_("Phase"),
+ self.luna_hoy.data_model.moon_phase_name(
+ self.luna_hoy.data_model.phase_of_moon))
+
+ information += "%s:\n%.2f (%s)\n\n" % (_("Julian Date"),
+ self.luna_hoy.data_model.julian_date, _("astronomical"))
information += "%s:\n" % (_("Age"))
dias = self.luna_hoy.data_model.days_old
horas = self.luna_hoy.data_model.hours_old
minutos = self.luna_hoy.data_model.minutes_old
- information += "%i %s, %i %s, %i %s.\n\n" % (dias, _("days"), horas, _("hours"), minutos, _("minutes"))
+
+ information += "%i %s, %i %s, %i %s.\n\n" % (
+ dias, _("days"), horas, _("hours"), minutos, _("minutes"))
phase = self.luna_hoy.data_model.phase_of_moon * 100
lunation = self.luna_hoy.data_model.lunation
information += "%s:\n" % (_("Lunation"))
- information += "%.2f%s %s %d.\n\n" % (phase, "%", _("through lunation"), lunation)
+
+ information += "%.2f%s %s %d.\n\n" % (
+ phase, "%", _("through lunation"), lunation)
information += "%s:\n" % (_("Surface Visibility"))
- information += "%.0f%s (%s)\n\n" % (self.luna_hoy.data_model.percent_of_full_moon * 100, "%", _("estimated"))
+ information += "%.0f%s (%s)\n\n" % (
+ self.luna_hoy.data_model.percent_of_full_moon * 100,
+ "%", _("estimated"))
- #information += _("Surface Visibility:\n%.0f%% (estimated)\n\n") % (self.luna_hoy.data_model.percent_of_full_moon * 100)
+ #information += _("Surface Visibility:\n%.0f%% (estimated)\n\n") %
+ #(self.luna_hoy.data_model.percent_of_full_moon * 100)
- selen = {'deg':self.luna_hoy.data_model.selenographic_deg, 'westOrEast':self.luna_hoy.data_model.west_or_east,
- 'riseOrSet':self.luna_hoy.data_model.rise_or_set}
+ selen = {'deg':self.luna_hoy.data_model.selenographic_deg,
+ 'westOrEast':self.luna_hoy.data_model.west_or_east,
+ 'riseOrSet':self.luna_hoy.data_model.rise_or_set}
+
information += _(u"Selenographic Terminator Longitude:\n%(deg).1f\u00b0%(westOrEast)s (%(riseOrSet)s)\n\n") % selen
- full = {'date':time.strftime(MG.LOCALE_DATE_FORMAT, time.localtime(self.luna_hoy.data_model.next_full_moon_date)),
- 'days':self.luna_hoy.data_model.days_until_full_moon}
+ full = {'date':time.strftime(MG.LOCALE_DATE_FORMAT,
+ time.localtime(self.luna_hoy.data_model.next_full_moon_date)),
+ 'days':self.luna_hoy.data_model.days_until_full_moon}
+
information += _("Next Full Moon:\n%(date)s in %(days).0f days\n\n") % full
- new = {'date':time.strftime(MG.LOCALE_DATE_FORMAT, time.localtime(self.luna_hoy.data_model.next_new_moon_date)),
- 'days':self.luna_hoy.data_model.days_until_new_moon}
+ new = {'date':time.strftime(MG.LOCALE_DATE_FORMAT,
+ time.localtime(self.luna_hoy.data_model.next_new_moon_date)),
+ 'days':self.luna_hoy.data_model.days_until_new_moon}
+
information += _("Next New Moon:\n%(date)s in %(days).0f days\n\n") % new
- lunare = {'date':time.strftime(MG.LOCALE_DATE_FORMAT, time.localtime(self.luna_hoy.data_model.next_lunar_eclipse_date)),
- 'days':self.luna_hoy.data_model.days_until_lunar_eclipse}
+ lunare = {'date':time.strftime(MG.LOCALE_DATE_FORMAT,
+ time.localtime(self.luna_hoy.data_model.next_lunar_eclipse_date)),
+ 'days':self.luna_hoy.data_model.days_until_lunar_eclipse}
+
information += _("Next Lunar eclipse:\n%(date)s in %(days).0f days\n\n") % lunare
- solare = {'date':time.strftime(MG.LOCALE_DATE_FORMAT, time.localtime(self.luna_hoy.data_model.next_solar_eclipse_date)),
- 'days':self.luna_hoy.data_model.days_until_solar_eclipse}
+ solare = {'date':time.strftime(MG.LOCALE_DATE_FORMAT,
+ time.localtime(self.luna_hoy.data_model.next_solar_eclipse_date)),
+ 'days':self.luna_hoy.data_model.days_until_solar_eclipse}
+
information += _("Next Solar eclipse:\n%(date)s in %(days).0f days") % solare
self.bufferinfo.set_text(information)
- self.label_emisferio.set_text( " %s: %s" % (_("Vista Hemisferio"),_(self.luna_hoy.hemisphere_view)) )
+
+ self.label_emisferio.set_text( " %s: %s" % (
+ _("Vista Hemisferio"),_(self.luna_hoy.hemisphere_view)) )
def read_and_parse_prefs(self, file_path):