Merge lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Moon into lp:~cairo-dock-team/cairo-dock-plug-ins-extras/third-party

Proposed by Eduardo Mucelli Rezende Oliveira
Status: Merged
Merged at revision: 177
Proposed branch: lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Moon
Merge into: lp:~cairo-dock-team/cairo-dock-plug-ins-extras/third-party
Diff against target: 136 lines (+14/-11)
5 files modified
Moon/ChangeLog (+1/-0)
Moon/Moon (+10/-8)
Moon/Moon.conf (+1/-1)
Moon/auto-load.conf (+1/-1)
Moon/copyright (+1/-1)
To merge this branch: bzr merge lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Moon
Reviewer Review Type Date Requested Status
Matthieu Baerts Approve
Review via email: mp+62144@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Matthieu Baerts (matttbe) wrote :

@Eduardo, Thank you for this new version!

Just one thing: is it possible to not include a "preview" file which is bigger than 300*300px?

review: Approve
Revision history for this message
Eduardo Mucelli Rezende Oliveira (eduardo-mucelli) wrote :

Sure, Matttbe. I will provide a new image soon!

On Tue, May 24, 2011 at 4:56 PM, Matthieu Baerts <email address hidden> wrote:

> Review: Approve
> @Eduardo, Thank you for this new version!
>
> Just one thing: is it possible to not include a "preview" file which is
> bigger than 300*300px?
> --
>
> https://code.launchpad.net/~eduardo-mucelli/cairo-dock-plug-ins-extras/Moon/+merge/62144
> You are the owner of lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/Moon.
>

--
Eduardo Mucelli R. Oliveira ~
Launchpad<https://launchpad.net/%7Eeduardo-mucelli>

Revision history for this message
Matthieu Baerts (matttbe) wrote :

Sorry, I would say: We prefer to not include "preview" files which are bigger than 300*300px (because it's useless and it increase the size of the tarball and the traffic on our server :-/ )

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Moon/ChangeLog'
2--- Moon/ChangeLog 2011-05-21 22:27:47 +0000
3+++ Moon/ChangeLog 2011-05-24 14:47:03 +0000
4@@ -1,2 +1,3 @@
5+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
6 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.
7 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
8
9=== modified file 'Moon/Moon'
10--- Moon/Moon 2011-05-21 22:27:47 +0000
11+++ Moon/Moon 2011-05-24 14:47:03 +0000
12@@ -66,16 +66,20 @@
13
14 def clean(self, string):
15 return re.sub("\s+\n\s+" , " \n", string) # " ".join(information.split())
16+
17+ def clean_week_icons(self):
18+ self.sub_icons.RemoveSubIcon("any")
19
20 def get_moon_from_web(self):
21 self.inform_start_of_waiting_process()
22-
23+
24+ self.clean_week_icons()
25 # TODO: Remove code duplication
26 if self.show_week_moon: # week information
27 today = datetime.date.today()
28 tomorrow = datetime.timedelta(days=1)
29 end_of_the_week = datetime.date.today() + datetime.timedelta(days=6)
30- week = []
31+ week = [] # ['namesubicon1','imagesubicon1','idsubicon1', 'namesubicon2' ...]
32 self.week_information = []
33 id = 0
34 while today <= end_of_the_week:
35@@ -84,15 +88,13 @@
36 image, information = interface.fetch()
37 self.week_information.append(self.clean(information))
38 day_of_the_week = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
39- day = []
40- day.append(day_of_the_week[datetime.date.weekday(today)]) # name of the icon is the week day name
41- day.append(os.path.abspath("./data/%s" % image)) # icon image is the moon image
42- day.append(str(id)) # id is a sequential from today (0) until end of the week (6)
43- week.append(day)
44+ week.append(day_of_the_week[datetime.date.weekday(today)]) # name of the icon is the week day name
45+ week.append(os.path.abspath("./data/%s" % image)) # icon image is the moon image
46+ week.append(str(id)) # id is a sequential from today (0) until end of the week (6)
47 id += 1
48 today += tomorrow
49 # log(week)
50- self.sub_icons.AddSubIcons(self.flatten(week))
51+ self.sub_icons.AddSubIcons(week)
52 else: # todays information
53 ye, mo, da = datetime.date.today().timetuple()[:3]
54 interface = Interface(ye, mo, da)
55
56=== modified file 'Moon/Moon.conf'
57--- Moon/Moon.conf 2011-05-21 22:27:47 +0000
58+++ Moon/Moon.conf 2011-05-24 14:47:03 +0000
59@@ -1,4 +1,4 @@
60-#!en;0.0.2
61+#!en;0.0.3
62
63 #[gtk-about]
64 [Icon]
65
66=== modified file 'Moon/auto-load.conf'
67--- Moon/auto-load.conf 2011-05-21 22:27:47 +0000
68+++ Moon/auto-load.conf 2011-05-24 14:47:03 +0000
69@@ -10,7 +10,7 @@
70 category = 5
71
72 # 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.
73-version = 0.0.2
74+version = 0.0.3
75
76 # Whether the applet can be instanciated several times or not.
77 multi-instance = true
78
79=== modified file 'Moon/copyright'
80--- Moon/copyright 2011-05-12 09:43:46 +0000
81+++ Moon/copyright 2011-05-24 14:47:03 +0000
82@@ -2,4 +2,4 @@
83 Copyright: 2011 Eduardo Mucelli Rezende Oliveira
84
85 Files: data/*
86-Copyright Brian Casey <bcnote@briancasey.org>
87+Copyright: Presto-X http://presto-x.deviantart.com
88
89=== modified file 'Moon/data/moon00a.gif'
90Binary 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
91=== added file 'Moon/data/moon00b.gif'
92Binary 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
93=== modified file 'Moon/data/moon01a.gif'
94Binary 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
95=== modified file 'Moon/data/moon01b.gif'
96Binary 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
97=== modified file 'Moon/data/moon02a.gif'
98Binary 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
99=== modified file 'Moon/data/moon02b.gif'
100Binary 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
101=== modified file 'Moon/data/moon03a.gif'
102Binary 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
103=== modified file 'Moon/data/moon03b.gif'
104Binary 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
105=== modified file 'Moon/data/moon04a.gif'
106Binary 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
107=== modified file 'Moon/data/moon04b.gif'
108Binary 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
109=== modified file 'Moon/data/moon05a.gif'
110Binary 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
111=== modified file 'Moon/data/moon05b.gif'
112Binary 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
113=== modified file 'Moon/data/moon06a.gif'
114Binary 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
115=== modified file 'Moon/data/moon06b.gif'
116Binary 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
117=== modified file 'Moon/data/moon07a.gif'
118Binary 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
119=== modified file 'Moon/data/moon07b.gif'
120Binary 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
121=== modified file 'Moon/data/moon08a.gif'
122Binary 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
123=== modified file 'Moon/data/moon08b.gif'
124Binary 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
125=== modified file 'Moon/data/moon09a.gif'
126Binary 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
127=== modified file 'Moon/data/moon09b.gif'
128Binary 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
129=== modified file 'Moon/data/moon10a.gif'
130Binary 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
131=== modified file 'Moon/data/moon10b.gif'
132Binary 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
133=== modified file 'Moon/icon'
134Binary files Moon/icon 2011-05-12 07:24:49 +0000 and Moon/icon 2011-05-24 14:47:03 +0000 differ
135=== modified file 'Moon/preview'
136Binary files Moon/preview 2011-05-22 09:27:35 +0000 and Moon/preview 2011-05-24 14:47:03 +0000 differ

Subscribers

People subscribed via source and target branches