cairo-dock-team team mailing list archive
-
cairo-dock-team team
-
Mailing list archive
-
Message #03092
[Merge] lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Moon into lp:cairo-dock-plug-ins-extras
Eduardo Mucelli Rezende Oliveira has proposed merging lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Moon into lp:cairo-dock-plug-ins-extras.
Requested reviews:
Cairo-Dock Team (cairo-dock-team)
For more details, see:
https://code.launchpad.net/~eduardo-mucelli/cairo-dock-plug-ins-extras/Moon/+merge/62144
Fixing a non sub-icons cleaning problem. Adding moon00b.gif that I forgot. Changing the whole icon set, using the icons created by Presto-X -- http://presto-x.deviantart.com/art/Presto-s-Moon-Phases-53625689
--
https://code.launchpad.net/~eduardo-mucelli/cairo-dock-plug-ins-extras/Moon/+merge/62144
Your team Cairo-Dock Team is requested to review the proposed merge of lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Moon into lp:cairo-dock-plug-ins-extras.
=== modified file 'Moon/ChangeLog'
--- Moon/ChangeLog 2011-05-21 22:27:47 +0000
+++ Moon/ChangeLog 2011-05-24 14:47:03 +0000
@@ -1,2 +1,3 @@
+0.0.3: (May/24/2011): Fixing a non sub-icons cleaning problem. Adding moon00b.gif that I forgot. Changing the whole icon set, using the icons created by Presto-X -- http://presto-x.deviantart.com/art/Presto-s-Moon-Phases-53625689
0.0.2: (May/22/2011): Able to show the moon informations for all the current week. Using the FancyURLopener opener instead of urllib2, I do not know why I was using urllib2.
0.0.1: (May/12/2011): Moon applet was created with the possibility to show the moon phases as its own icon, and to show some informations. The service used in this applet was created by Brian Casey -- http://www.briancasey.org/artifacts/astro/moon.cgi
=== modified file 'Moon/Moon'
--- Moon/Moon 2011-05-21 22:27:47 +0000
+++ Moon/Moon 2011-05-24 14:47:03 +0000
@@ -66,16 +66,20 @@
def clean(self, string):
return re.sub("\s+\n\s+" , " \n", string) # " ".join(information.split())
+
+ def clean_week_icons(self):
+ self.sub_icons.RemoveSubIcon("any")
def get_moon_from_web(self):
self.inform_start_of_waiting_process()
-
+
+ self.clean_week_icons()
# TODO: Remove code duplication
if self.show_week_moon: # week information
today = datetime.date.today()
tomorrow = datetime.timedelta(days=1)
end_of_the_week = datetime.date.today() + datetime.timedelta(days=6)
- week = []
+ week = [] # ['namesubicon1','imagesubicon1','idsubicon1', 'namesubicon2' ...]
self.week_information = []
id = 0
while today <= end_of_the_week:
@@ -84,15 +88,13 @@
image, information = interface.fetch()
self.week_information.append(self.clean(information))
day_of_the_week = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
- day = []
- day.append(day_of_the_week[datetime.date.weekday(today)]) # name of the icon is the week day name
- day.append(os.path.abspath("./data/%s" % image)) # icon image is the moon image
- day.append(str(id)) # id is a sequential from today (0) until end of the week (6)
- week.append(day)
+ week.append(day_of_the_week[datetime.date.weekday(today)]) # name of the icon is the week day name
+ week.append(os.path.abspath("./data/%s" % image)) # icon image is the moon image
+ week.append(str(id)) # id is a sequential from today (0) until end of the week (6)
id += 1
today += tomorrow
# log(week)
- self.sub_icons.AddSubIcons(self.flatten(week))
+ self.sub_icons.AddSubIcons(week)
else: # todays information
ye, mo, da = datetime.date.today().timetuple()[:3]
interface = Interface(ye, mo, da)
=== modified file 'Moon/Moon.conf'
--- Moon/Moon.conf 2011-05-21 22:27:47 +0000
+++ Moon/Moon.conf 2011-05-24 14:47:03 +0000
@@ -1,4 +1,4 @@
-#!en;0.0.2
+#!en;0.0.3
#[gtk-about]
[Icon]
=== modified file 'Moon/auto-load.conf'
--- Moon/auto-load.conf 2011-05-21 22:27:47 +0000
+++ Moon/auto-load.conf 2011-05-24 14:47:03 +0000
@@ -10,7 +10,7 @@
category = 5
# Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
-version = 0.0.2
+version = 0.0.3
# Whether the applet can be instanciated several times or not.
multi-instance = true
=== modified file 'Moon/copyright'
--- Moon/copyright 2011-05-12 09:43:46 +0000
+++ Moon/copyright 2011-05-24 14:47:03 +0000
@@ -2,4 +2,4 @@
Copyright: 2011 Eduardo Mucelli Rezende Oliveira
Files: data/*
-Copyright Brian Casey <bcnote@xxxxxxxxxxxxxx>
+Copyright: Presto-X http://presto-x.deviantart.com
=== modified file 'Moon/data/moon00a.gif'
Binary files Moon/data/moon00a.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon00a.gif 2011-05-24 14:47:03 +0000 differ
=== added file 'Moon/data/moon00b.gif'
Binary files Moon/data/moon00b.gif 1970-01-01 00:00:00 +0000 and Moon/data/moon00b.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon01a.gif'
Binary files Moon/data/moon01a.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon01a.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon01b.gif'
Binary files Moon/data/moon01b.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon01b.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon02a.gif'
Binary files Moon/data/moon02a.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon02a.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon02b.gif'
Binary files Moon/data/moon02b.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon02b.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon03a.gif'
Binary files Moon/data/moon03a.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon03a.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon03b.gif'
Binary files Moon/data/moon03b.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon03b.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon04a.gif'
Binary files Moon/data/moon04a.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon04a.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon04b.gif'
Binary files Moon/data/moon04b.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon04b.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon05a.gif'
Binary files Moon/data/moon05a.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon05a.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon05b.gif'
Binary files Moon/data/moon05b.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon05b.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon06a.gif'
Binary files Moon/data/moon06a.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon06a.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon06b.gif'
Binary files Moon/data/moon06b.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon06b.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon07a.gif'
Binary files Moon/data/moon07a.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon07a.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon07b.gif'
Binary files Moon/data/moon07b.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon07b.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon08a.gif'
Binary files Moon/data/moon08a.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon08a.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon08b.gif'
Binary files Moon/data/moon08b.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon08b.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon09a.gif'
Binary files Moon/data/moon09a.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon09a.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon09b.gif'
Binary files Moon/data/moon09b.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon09b.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon10a.gif'
Binary files Moon/data/moon10a.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon10a.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/data/moon10b.gif'
Binary files Moon/data/moon10b.gif 2011-05-12 07:24:49 +0000 and Moon/data/moon10b.gif 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/icon'
Binary files Moon/icon 2011-05-12 07:24:49 +0000 and Moon/icon 2011-05-24 14:47:03 +0000 differ
=== modified file 'Moon/preview'
Binary files Moon/preview 2011-05-22 09:27:35 +0000 and Moon/preview 2011-05-24 14:47:03 +0000 differ
Follow ups