Merge lp:~roti-al/indiv-screenlets/s1604 into lp:indiv-screenlets
- s1604
- Merge into trunk
Proposed by
Hrotkó Gábor
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Hrotkó Gábor | ||||
Approved revision: | 1270 | ||||
Merged at revision: | 1269 | ||||
Proposed branch: | lp:~roti-al/indiv-screenlets/s1604 | ||||
Merge into: | lp:indiv-screenlets | ||||
Diff against target: |
893 lines (+189/-102) 35 files modified
debian/changelog (+19/-0) debian/control (+9/-16) debian/rules (+10/-3) src/ClearRss/ClearRssScreenlet.py (+7/-1) src/Convert/ConvertScreenlet.py (+5/-5) src/Dropbox/DropboxScreenlet.py (+9/-2) src/Execute/ExecuteScreenlet.py (+2/-0) src/FeedReader/FeedReaderScreenlet.py (+6/-1) src/FeedReaderPlus/FeedReaderPlusScreenlet.py (+4/-1) src/FlipClock/FlipClockScreenlet.py (+11/-3) src/Googlemaps/GooglemapsScreenlet.py (+13/-29) src/InfoPanel/InfoPanelScreenlet.py (+1/-1) src/Launcher/LauncherScreenlet.py (+4/-1) src/Lipik/LipikScreenlet.py (+6/-1) src/Manometer/ManometerScreenlet.py (+1/-1) src/NVidia/NVidiaScreenlet.py (+1/-0) src/Netmonitor/NetmonitorScreenlet.py (+1/-1) src/Pager/PagerScreenlet.py (+1/-0) src/Picframe/PicframeScreenlet.py (+1/-1) src/Pidgin/PidginScreenlet.py (+2/-0) src/Places/PlacesScreenlet.py (+5/-2) src/SearchTorrent/SearchTorrentScreenlet.py (+2/-0) src/Sensors/SensorsScreenlet.py (+1/-0) src/Slideshow/SlideshowScreenlet.py (+0/-1) src/SmoothWeather/SmoothWeatherScreenlet.py (+12/-5) src/Sticker/StickerScreenlet.py (+1/-0) src/Terminal/TerminalScreenlet.py (+6/-1) src/Tux/TuxScreenlet.py (+13/-8) src/Twitter/TwitterScreenlet.py (+1/-1) src/VolumeControl/VolumeControlScreenlet.py (+3/-1) src/WallpaperClock/WallpaperClockScreenlet.py (+1/-3) src/Weather/WeatherScreenlet.py (+14/-8) src/WidescapeWeather/WidescapeWeatherScreenlet.py (+1/-1) src/WorldClock/WorldClockScreenlet.py (+10/-3) src/dayNight/dayNightScreenlet.py (+6/-1) |
||||
To merge this branch: | bzr merge lp:~roti-al/indiv-screenlets/s1604 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Hrotkó Gábor | Approve | ||
Review via email: mp+309452@code.launchpad.net |
Commit message
Description of the change
fixes for ubuntu 16.04
To post a comment you must log in.
- 1270. By Hrotkó Gábor
-
changelog fomrat fix
Revision history for this message
Hrotkó Gábor (roti-al) : | # |
review:
Approve
Revision history for this message
Nicolas Krzywinski (nsk7even) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2012-01-20 06:14:40 +0000 | |||
3 | +++ debian/changelog 2016-10-27 10:34:32 +0000 | |||
4 | @@ -1,3 +1,22 @@ | |||
5 | 1 | indiv-screenlets (0.1.7) xenial; urgency=low | ||
6 | 2 | |||
7 | 3 | * Fix | ||
8 | 4 | - dependencies | ||
9 | 5 | - ConvertScreenlet | ||
10 | 6 | - GooglemapsScreenlet | ||
11 | 7 | - InfoPanelScreenlet | ||
12 | 8 | - ManometerScreenlet | ||
13 | 9 | - PidginScreenlet | ||
14 | 10 | - PlacesScreenlet | ||
15 | 11 | - SidebarScreenlet | ||
16 | 12 | - SmoothWeatherScreenlet | ||
17 | 13 | - TuxScreenlet | ||
18 | 14 | - TwitterScreenlet | ||
19 | 15 | - WeatherScreenlet | ||
20 | 16 | - WidescapeWeatherScreenlet | ||
21 | 17 | |||
22 | 18 | -- Hrotkó Gábor <roti@profi-media.com> Wed, 26 Oct 2016 21:00:15 +0100 | ||
23 | 19 | |||
24 | 1 | indiv-screenlets (0.1.6) oneiric; urgency=low | 20 | indiv-screenlets (0.1.6) oneiric; urgency=low |
25 | 2 | 21 | ||
26 | 3 | * Fix: | 22 | * Fix: |
27 | 4 | 23 | ||
28 | === modified file 'debian/control' | |||
29 | --- debian/control 2011-05-30 17:53:38 +0000 | |||
30 | +++ debian/control 2016-10-27 10:34:32 +0000 | |||
31 | @@ -2,32 +2,29 @@ | |||
32 | 2 | Section: gnome | 2 | Section: gnome |
33 | 3 | Priority: optional | 3 | Priority: optional |
34 | 4 | Maintainer: Guido Tabbernuk <boamaod@gmail.com> | 4 | Maintainer: Guido Tabbernuk <boamaod@gmail.com> |
36 | 5 | Build-Depends: debhelper (>= 7), python-support | 5 | Build-Depends: debhelper (>= 7), dh-python |
37 | 6 | Standards-Version: 3.7.2 | 6 | Standards-Version: 3.7.2 |
38 | 7 | XS-Python-Version: current | 7 | XS-Python-Version: current |
39 | 8 | 8 | ||
40 | 9 | Package: screenlets-pack-all | 9 | Package: screenlets-pack-all |
41 | 10 | Architecture: all | 10 | Architecture: all |
43 | 11 | Depends: screenlets (>= 0.1.2-9), | 11 | Depends: screenlets (>= 0.1.7), |
44 | 12 | ${python:Depends}, | 12 | ${python:Depends}, |
45 | 13 | ${misc:Depends}, | 13 | ${misc:Depends}, |
46 | 14 | Conflicts: screenlets-pack-basic | 14 | Conflicts: screenlets-pack-basic |
47 | 15 | Recommends: gnome-keyring, | 15 | Recommends: gnome-keyring, |
48 | 16 | python-feedparser, | 16 | python-feedparser, |
49 | 17 | python-gmenu, | ||
50 | 18 | python-numeric, | ||
51 | 19 | python-numpy, | 17 | python-numpy, |
52 | 20 | python-gnome2-extras, | ||
53 | 21 | python-dateutil, | 18 | python-dateutil, |
54 | 22 | python-tz, | 19 | python-tz, |
55 | 23 | python-gdata (>= 2.0.10), | 20 | python-gdata (>= 2.0.10), |
56 | 24 | python-twitter (>= 0.8), | 21 | python-twitter (>= 0.8), |
58 | 25 | python-oauth2, | 22 | python-oauth2client, |
59 | 23 | python-rsvg, | ||
60 | 24 | python-webkit, | ||
61 | 26 | iceweasel | firefox, | 25 | iceweasel | firefox, |
62 | 27 | python-gtkmozembed | python-gnome2-extras (<< 2.19), | ||
63 | 28 | metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2) | 26 | metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2) |
66 | 29 | Suggests: python-dcop, | 27 | Suggests: evolution, |
65 | 30 | evolution, | ||
67 | 31 | tomboy, | 28 | tomboy, |
68 | 32 | gnome-orca | 29 | gnome-orca |
69 | 33 | XB-Python-Version: ${python:Versions} | 30 | XB-Python-Version: ${python:Versions} |
70 | @@ -39,23 +36,19 @@ | |||
71 | 39 | 36 | ||
72 | 40 | Package: screenlets-pack-basic | 37 | Package: screenlets-pack-basic |
73 | 41 | Architecture: all | 38 | Architecture: all |
75 | 42 | Depends: screenlets (>= 0.1.2-9), | 39 | Depends: screenlets (>= 0.1.7), |
76 | 43 | ${python:Depends}, | 40 | ${python:Depends}, |
77 | 44 | ${misc:Depends}, | 41 | ${misc:Depends}, |
78 | 45 | Conflicts: screenlets-pack-all | 42 | Conflicts: screenlets-pack-all |
79 | 46 | Recommends: gnome-keyring, | 43 | Recommends: gnome-keyring, |
80 | 47 | python-feedparser, | 44 | python-feedparser, |
81 | 48 | python-gmenu, | ||
82 | 49 | python-numeric, | ||
83 | 50 | python-numpy, | 45 | python-numpy, |
84 | 51 | python-gnome2-extras, | ||
85 | 52 | python-dateutil, | 46 | python-dateutil, |
86 | 53 | python-tz, | 47 | python-tz, |
87 | 48 | python-webkit, | ||
88 | 54 | iceweasel | firefox, | 49 | iceweasel | firefox, |
89 | 55 | python-gtkmozembed | python-gnome2-extras (<< 2.19), | ||
90 | 56 | metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2) | 50 | metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2) |
93 | 57 | Suggests: python-dcop, | 51 | Suggests: tomboy | gnote |
92 | 58 | tomboy | gnote | ||
94 | 59 | XB-Python-Version: ${python:Versions} | 52 | XB-Python-Version: ${python:Versions} |
95 | 60 | Description: Widget-like mini-applications for GNOME | 53 | Description: Widget-like mini-applications for GNOME |
96 | 61 | Screenlets are small owner-drawn applications (written in Python, a | 54 | Screenlets are small owner-drawn applications (written in Python, a |
97 | 62 | 55 | ||
98 | === modified file 'debian/rules' | |||
99 | --- debian/rules 2011-07-26 21:06:29 +0000 | |||
100 | +++ debian/rules 2016-10-27 10:34:32 +0000 | |||
101 | @@ -6,8 +6,8 @@ | |||
102 | 6 | 6 | ||
103 | 7 | override_dh_auto_install: | 7 | override_dh_auto_install: |
104 | 8 | dh_auto_install --buildsystem=python_distutils | 8 | dh_auto_install --buildsystem=python_distutils |
107 | 9 | find debian/tmp/usr/share/screenlets -name "*.svg" -perm 755 | xargs -r --delimiter=\\n chmod 644 | 9 | # find debian/tmp/usr/share/screenlets -name "*.svg" -perm 755 | xargs -r --delimiter=\\n chmod 644 |
108 | 10 | find debian/tmp/usr/share/screenlets -name "*.png" -perm 755 | xargs -r --delimiter=\\n chmod 644 | 10 | # find debian/tmp/usr/share/screenlets -name "*.png" -perm 755 | xargs -r --delimiter=\\n chmod 644 |
109 | 11 | 11 | ||
110 | 12 | override_dh_clean: | 12 | override_dh_clean: |
111 | 13 | rm -fR build/locale | 13 | rm -fR build/locale |
112 | @@ -19,4 +19,11 @@ | |||
113 | 19 | get-orig-source: | 19 | get-orig-source: |
114 | 20 | dh_testdir | 20 | dh_testdir |
115 | 21 | uscan --force-download --verbose --repack | 21 | uscan --force-download --verbose --repack |
117 | 22 | 22 | ||
118 | 23 | override_dh_fixperms: | ||
119 | 24 | dh_fixperms | ||
120 | 25 | find debian -name '*.html' -exec chmod 0666 {} + | ||
121 | 26 | find debian -name '*.svg' -exec chmod 0644 {} + | ||
122 | 27 | find debian -name '*.png' -exec chmod 0666 {} + | ||
123 | 28 | |||
124 | 29 | |||
125 | 23 | 30 | ||
126 | === modified file 'src/ClearRss/ClearRssScreenlet.py' | |||
127 | --- src/ClearRss/ClearRssScreenlet.py 2012-01-27 21:52:49 +0000 | |||
128 | +++ src/ClearRss/ClearRssScreenlet.py 2016-10-27 10:34:32 +0000 | |||
129 | @@ -27,7 +27,13 @@ | |||
130 | 27 | from screenlets import DefaultMenuItem, utils | 27 | from screenlets import DefaultMenuItem, utils |
131 | 28 | from screenlets.options import IntOption, BoolOption, StringOption, FontOption, ColorOption, FloatOption | 28 | from screenlets.options import IntOption, BoolOption, StringOption, FontOption, ColorOption, FloatOption |
132 | 29 | import os | 29 | import os |
134 | 30 | import feedparser | 30 | |
135 | 31 | try: | ||
136 | 32 | import feedparser | ||
137 | 33 | except: | ||
138 | 34 | print "Couldn't import feedparser." | ||
139 | 35 | |||
140 | 36 | |||
141 | 31 | #use gettext for translation | 37 | #use gettext for translation |
142 | 32 | import gettext | 38 | import gettext |
143 | 33 | 39 | ||
144 | 34 | 40 | ||
145 | === modified file 'src/Convert/ConvertScreenlet.py' | |||
146 | --- src/Convert/ConvertScreenlet.py 2012-01-27 21:52:49 +0000 | |||
147 | +++ src/Convert/ConvertScreenlet.py 2016-10-27 10:34:32 +0000 | |||
148 | @@ -75,16 +75,16 @@ | |||
149 | 75 | filelist = os.listdir(Plugins.PATH) | 75 | filelist = os.listdir(Plugins.PATH) |
150 | 76 | 76 | ||
151 | 77 | for filename in sorted(filelist): | 77 | for filename in sorted(filelist): |
152 | 78 | |||
153 | 79 | if filename[-12:] == 'Converter.py': | 78 | if filename[-12:] == 'Converter.py': |
154 | 80 | 79 | ||
155 | 81 | classname = filename[:-3] | 80 | classname = filename[:-3] |
156 | 82 | mod = Plugins.importAPI(classname) | 81 | mod = Plugins.importAPI(classname) |
157 | 83 | classobj = getattr(mod, classname) | 82 | classobj = getattr(mod, classname) |
162 | 84 | self.__conv_list.append(classobj) | 83 | if hasattr(classobj, '__title__'): |
163 | 85 | # add a menu item for each | 84 | self.__conv_list.append(classobj) |
164 | 86 | self.add_menuitem('conv:' + classobj.__name__, | 85 | # add a menu item for each |
165 | 87 | classobj.__title__) | 86 | self.add_menuitem('conv:' + classobj.__name__, classobj.__title__) |
166 | 87 | |||
167 | 88 | # for sure | 88 | # for sure |
168 | 89 | if len(self.__conv_list) == 0: | 89 | if len(self.__conv_list) == 0: |
169 | 90 | # FIXME: how do I abort the initialization? | 90 | # FIXME: how do I abort the initialization? |
170 | 91 | 91 | ||
171 | === modified file 'src/Dropbox/DropboxScreenlet.py' | |||
172 | --- src/Dropbox/DropboxScreenlet.py 2012-01-27 21:52:49 +0000 | |||
173 | +++ src/Dropbox/DropboxScreenlet.py 2016-10-27 10:34:32 +0000 | |||
174 | @@ -28,7 +28,14 @@ | |||
175 | 28 | from screenlets import DefaultMenuItem | 28 | from screenlets import DefaultMenuItem |
176 | 29 | from screenlets.options import ColorOption, StringOption, FloatOption, FontOption | 29 | from screenlets.options import ColorOption, StringOption, FloatOption, FontOption |
177 | 30 | from screenlets.utils import xdg_open | 30 | from screenlets.utils import xdg_open |
179 | 31 | import cairo, rsvg, gtk, os, pango, subprocess, gobject, re | 31 | import cairo, gtk, os, pango, subprocess, gobject, re |
180 | 32 | |||
181 | 33 | try: | ||
182 | 34 | import rsvg | ||
183 | 35 | except: | ||
184 | 36 | print "Couldn't import rsvg." | ||
185 | 37 | |||
186 | 38 | |||
187 | 32 | 39 | ||
188 | 33 | #use gettext for translation | 40 | #use gettext for translation |
189 | 34 | import gettext | 41 | import gettext |
190 | @@ -44,7 +51,7 @@ | |||
191 | 44 | """A Screenlet to monitor the current Dropbox status and quickly add files to your Dropbox folder.""" | 51 | """A Screenlet to monitor the current Dropbox status and quickly add files to your Dropbox folder.""" |
192 | 45 | __name__ = 'DropboxScreenlet' | 52 | __name__ = 'DropboxScreenlet' |
193 | 46 | __version__ = '0.4.1+++' | 53 | __version__ = '0.4.1+++' |
195 | 47 | __requires__ = ['dropbox'] | 54 | __requires__ = ['dropbox','python-rsvg'] |
196 | 48 | __author__ = 'spitfire23bc' | 55 | __author__ = 'spitfire23bc' |
197 | 49 | __desc__ = __doc__ | 56 | __desc__ = __doc__ |
198 | 50 | 57 | ||
199 | 51 | 58 | ||
200 | === modified file 'src/Execute/ExecuteScreenlet.py' | |||
201 | --- src/Execute/ExecuteScreenlet.py 2012-01-27 21:52:49 +0000 | |||
202 | +++ src/Execute/ExecuteScreenlet.py 2016-10-27 10:34:32 +0000 | |||
203 | @@ -41,6 +41,8 @@ | |||
204 | 41 | __version__ = '0.3.1+++' | 41 | __version__ = '0.3.1+++' |
205 | 42 | __author__ = 'Helder Fraga aka whise' | 42 | __author__ = 'Helder Fraga aka whise' |
206 | 43 | __desc__ = __doc__ | 43 | __desc__ = __doc__ |
207 | 44 | __requires__ = ['python-rsvg'] | ||
208 | 45 | |||
209 | 44 | clipboard = gtk.clipboard_get() | 46 | clipboard = gtk.clipboard_get() |
210 | 45 | 47 | ||
211 | 46 | __has_focus = False | 48 | __has_focus = False |
212 | 47 | 49 | ||
213 | === modified file 'src/FeedReader/FeedReaderScreenlet.py' | |||
214 | --- src/FeedReader/FeedReaderScreenlet.py 2012-01-27 21:52:49 +0000 | |||
215 | +++ src/FeedReader/FeedReaderScreenlet.py 2016-10-27 10:34:32 +0000 | |||
216 | @@ -25,7 +25,12 @@ | |||
217 | 25 | import gtk | 25 | import gtk |
218 | 26 | import os | 26 | import os |
219 | 27 | 27 | ||
221 | 28 | import feedparser | 28 | try: |
222 | 29 | import feedparser | ||
223 | 30 | except: | ||
224 | 31 | print "Couldn't import feedparser." | ||
225 | 32 | |||
226 | 33 | |||
227 | 29 | #use gettext for translation | 34 | #use gettext for translation |
228 | 30 | import gettext | 35 | import gettext |
229 | 31 | 36 | ||
230 | 32 | 37 | ||
231 | === modified file 'src/FeedReaderPlus/FeedReaderPlusScreenlet.py' | |||
232 | --- src/FeedReaderPlus/FeedReaderPlusScreenlet.py 2012-01-27 21:52:49 +0000 | |||
233 | +++ src/FeedReaderPlus/FeedReaderPlusScreenlet.py 2016-10-27 10:34:32 +0000 | |||
234 | @@ -28,7 +28,10 @@ | |||
235 | 28 | import time | 28 | import time |
236 | 29 | import calendar | 29 | import calendar |
237 | 30 | 30 | ||
239 | 31 | import feedparser | 31 | try: |
240 | 32 | import feedparser | ||
241 | 33 | except: | ||
242 | 34 | print "Couldn't import python-feedparser." | ||
243 | 32 | 35 | ||
244 | 33 | #use gettext for translation | 36 | #use gettext for translation |
245 | 34 | import gettext | 37 | import gettext |
246 | 35 | 38 | ||
247 | === modified file 'src/FlipClock/FlipClockScreenlet.py' | |||
248 | --- src/FlipClock/FlipClockScreenlet.py 2012-03-24 22:35:36 +0000 | |||
249 | +++ src/FlipClock/FlipClockScreenlet.py 2016-10-27 10:34:32 +0000 | |||
250 | @@ -26,7 +26,12 @@ | |||
251 | 26 | import commands | 26 | import commands |
252 | 27 | import sys | 27 | import sys |
253 | 28 | import os | 28 | import os |
255 | 29 | import webkit | 29 | |
256 | 30 | try: | ||
257 | 31 | import webkit | ||
258 | 32 | except: | ||
259 | 33 | print "Couldn't import python-webkit." | ||
260 | 34 | |||
261 | 30 | from screenlets import sensors | 35 | from screenlets import sensors |
262 | 31 | 36 | ||
263 | 32 | class FlipClockScreenlet (screenlets.Screenlet): | 37 | class FlipClockScreenlet (screenlets.Screenlet): |
264 | @@ -67,8 +72,11 @@ | |||
265 | 67 | pass | 72 | pass |
266 | 68 | self.win.add(self.view) | 73 | self.win.add(self.view) |
267 | 69 | 74 | ||
270 | 70 | self.url = "file://" + self.get_screenlet_dir() + "/Source/index.html" | 75 | self.url = str(self.mypath) + "/Source/index.html" |
271 | 71 | self.view.load_uri(self.url) | 76 | settings = self.view.get_settings() |
272 | 77 | settings.set_property("enable-universal-access-from-file-uris", True) | ||
273 | 78 | self.view.set_settings(settings) | ||
274 | 79 | self.view.open(str(self.url)) | ||
275 | 72 | self.win.connect('destroy', self.quitall) | 80 | self.win.connect('destroy', self.quitall) |
276 | 73 | self.win.connect('configure-event', self.configure) | 81 | self.win.connect('configure-event', self.configure) |
277 | 74 | self.view.connect('notify::title', self.update) | 82 | self.view.connect('notify::title', self.update) |
278 | 75 | 83 | ||
279 | === modified file 'src/Googlemaps/GooglemapsScreenlet.py' | |||
280 | --- src/Googlemaps/GooglemapsScreenlet.py 2012-01-27 21:52:49 +0000 | |||
281 | +++ src/Googlemaps/GooglemapsScreenlet.py 2016-10-27 10:34:32 +0000 | |||
282 | @@ -28,30 +28,11 @@ | |||
283 | 28 | import sys | 28 | import sys |
284 | 29 | import os | 29 | import os |
285 | 30 | 30 | ||
286 | 31 | |||
287 | 32 | #########WORKARROUND FOR GTKOZEMBED BUG################ | ||
288 | 33 | |||
289 | 34 | if sys.argv[0].endswith('GooglemapsScreenlet.py'): | ||
290 | 35 | |||
291 | 36 | if commands.getoutput("lsb_release -is") == 'Ubuntu': | ||
292 | 37 | mypath = sys.argv[0][:sys.argv[0].find('GooglemapsScreenlet.py')].strip() | ||
293 | 38 | if os.path.isfile(mypath + "running"): | ||
294 | 39 | os.system("rm -f " + mypath + "running") | ||
295 | 40 | |||
296 | 41 | else: | ||
297 | 42 | os.system ("export LD_LIBRARY_PATH=/usr/lib/firefox \n export MOZILLA_FIVE_HOME=/usr/lib/firefox \n python "+ sys.argv[0] + " &") | ||
298 | 43 | fileObj = open(mypath + "running","w") #// open for for write | ||
299 | 44 | fileObj.write('gtkmozembed bug workarround') | ||
300 | 45 | |||
301 | 46 | fileObj.close() | ||
302 | 47 | exit() | ||
303 | 48 | else: | ||
304 | 49 | pass | ||
305 | 50 | try: | 31 | try: |
307 | 51 | import gtkmozembed | 32 | import webkit |
308 | 52 | except: | 33 | except: |
311 | 53 | print 'You dont have gtkmozembed , please install python gnome extras' | 34 | print "Couldn't import python-webkit." |
312 | 54 | 35 | ||
313 | 55 | #use gettext for translation | 36 | #use gettext for translation |
314 | 56 | import gettext | 37 | import gettext |
315 | 57 | 38 | ||
316 | @@ -70,6 +51,7 @@ | |||
317 | 70 | __version__ = '0.6.1+++' | 51 | __version__ = '0.6.1+++' |
318 | 71 | __author__ = 'Helder Fraga aka Whise' | 52 | __author__ = 'Helder Fraga aka Whise' |
319 | 72 | __desc__ = __doc__ | 53 | __desc__ = __doc__ |
320 | 54 | __requires__ = [ 'python-webkit', 'python-rsvg' ] | ||
321 | 73 | width =425 | 55 | width =425 |
322 | 74 | height = 470 | 56 | height = 470 |
323 | 75 | box = None | 57 | box = None |
324 | @@ -109,11 +91,13 @@ | |||
325 | 109 | # create evntbox | 91 | # create evntbox |
326 | 110 | 92 | ||
327 | 111 | self.box.set_size_request(int(1*self.scale),int((self.height-77)*(self.scale)-(self.scale*5))) | 93 | self.box.set_size_request(int(1*self.scale),int((self.height-77)*(self.scale)-(self.scale*5))) |
333 | 112 | self.moz = gtkmozembed.MozEmbed() | 94 | |
334 | 113 | self.moz.set_size_request(int(1*self.scale),int((self.height-77)*(self.scale)-(self.scale*5))) | 95 | self.moz = webkit.WebView()#gtkmozembed.MozEmbed() |
335 | 114 | 96 | settings = self.moz.get_settings() | |
336 | 115 | self.moz.load_url(str(self.url)) | 97 | settings.set_property("enable-universal-access-from-file-uris", True) |
337 | 116 | 98 | self.moz.set_settings(settings) | |
338 | 99 | self.moz.open(str(self.url)) # load_uri(uri) | ||
339 | 100 | |||
340 | 117 | # add/show all inputs | 101 | # add/show all inputs |
341 | 118 | 102 | ||
342 | 119 | 103 | ||
343 | @@ -144,7 +128,7 @@ | |||
344 | 144 | 128 | ||
345 | 145 | 129 | ||
346 | 146 | if y >= 48 and y <= 60 and x >= 71 and x <= 247: | 130 | if y >= 48 and y <= 60 and x >= 71 and x <= 247: |
348 | 147 | self.moz.load_url(str(self.url)) | 131 | self.moz.load_uri(str(self.url)) |
349 | 148 | 132 | ||
350 | 149 | 133 | ||
351 | 150 | self.redraw_canvas() | 134 | self.redraw_canvas() |
352 | @@ -166,7 +150,7 @@ | |||
353 | 166 | fh2.write(self.fh1) | 150 | fh2.write(self.fh1) |
354 | 167 | fh2.close() | 151 | fh2.close() |
355 | 168 | self.url = str(self.mypath)+'gtoload.html' | 152 | self.url = str(self.mypath)+'gtoload.html' |
357 | 169 | self.moz.load_url(str(self.url)) | 153 | self.moz.load_uri(str(self.url)) |
358 | 170 | def on_draw_shape (self, ctx): | 154 | def on_draw_shape (self, ctx): |
359 | 171 | ctx.scale(self.scale, self.scale) | 155 | ctx.scale(self.scale, self.scale) |
360 | 172 | ctx.set_source_rgba(0, 0, 0, 1) | 156 | ctx.set_source_rgba(0, 0, 0, 1) |
361 | 173 | 157 | ||
362 | === modified file 'src/InfoPanel/InfoPanelScreenlet.py' | |||
363 | --- src/InfoPanel/InfoPanelScreenlet.py 2012-01-27 21:52:49 +0000 | |||
364 | +++ src/InfoPanel/InfoPanelScreenlet.py 2016-10-27 10:34:32 +0000 | |||
365 | @@ -1353,7 +1353,7 @@ | |||
366 | 1353 | try: | 1353 | try: |
367 | 1354 | # download data | 1354 | # download data |
368 | 1355 | self.debug( 'Download weather' ) | 1355 | self.debug( 'Download weather' ) |
370 | 1356 | data = urllib.urlopen( 'http://xoap.weather.com/weather/local/'+weatherZips[key]+ | 1356 | data = urllib.urlopen( 'http://wxdata.weather.com/weather/local/'+weatherZips[key]+ |
371 | 1357 | '?cc=*&dayf=10&prod=xoap&par=1003666583&key=4128909340a9b2fc&unit='+weatherUnit+ | 1357 | '?cc=*&dayf=10&prod=xoap&par=1003666583&key=4128909340a9b2fc&unit='+weatherUnit+ |
372 | 1358 | '&link=xoap' ).read() | 1358 | '&link=xoap' ).read() |
373 | 1359 | 1359 | ||
374 | 1360 | 1360 | ||
375 | === modified file 'src/Launcher/LauncherScreenlet.py' | |||
376 | --- src/Launcher/LauncherScreenlet.py 2012-01-27 21:52:49 +0000 | |||
377 | +++ src/Launcher/LauncherScreenlet.py 2016-10-27 10:34:32 +0000 | |||
378 | @@ -37,6 +37,7 @@ | |||
379 | 37 | import os | 37 | import os |
380 | 38 | import urllib | 38 | import urllib |
381 | 39 | import gnomevfs | 39 | import gnomevfs |
382 | 40 | import sys | ||
383 | 40 | #use gettext for translation | 41 | #use gettext for translation |
384 | 41 | import gettext | 42 | import gettext |
385 | 42 | 43 | ||
386 | @@ -77,6 +78,8 @@ | |||
387 | 77 | icon = '' | 78 | icon = '' |
388 | 78 | label = '' | 79 | label = '' |
389 | 79 | 80 | ||
390 | 81 | mypath = sys.argv[0][:sys.argv[0].find('LauncherScreenlet.py')].strip() | ||
391 | 82 | |||
392 | 80 | # constructor/internals | 83 | # constructor/internals |
393 | 81 | 84 | ||
394 | 82 | def __init__ (self, **keyword_args): | 85 | def __init__ (self, **keyword_args): |
395 | @@ -85,7 +88,7 @@ | |||
396 | 85 | # add default menu items | 88 | # add default menu items |
397 | 86 | 89 | ||
398 | 87 | # set default icon and action | 90 | # set default icon and action |
400 | 88 | self.icon = self.get_screenlet_dir() + '/default-icon.svg' | 91 | self.icon = str(self.mypath) + '/default-icon.svg' |
401 | 89 | # add editable settings | 92 | # add editable settings |
402 | 90 | self.add_options_group(_('Starter'), | 93 | self.add_options_group(_('Starter'), |
403 | 91 | _('Some options related to the Launcher-Screenlet.')) | 94 | _('Some options related to the Launcher-Screenlet.')) |
404 | 92 | 95 | ||
405 | === modified file 'src/Lipik/LipikScreenlet.py' | |||
406 | --- src/Lipik/LipikScreenlet.py 2012-01-27 21:52:49 +0000 | |||
407 | +++ src/Lipik/LipikScreenlet.py 2016-10-27 10:34:32 +0000 | |||
408 | @@ -33,7 +33,12 @@ | |||
409 | 33 | from screenlets.options import FontOption, ColorOption | 33 | from screenlets.options import FontOption, ColorOption |
410 | 34 | 34 | ||
411 | 35 | import gtk | 35 | import gtk |
413 | 36 | import Image | 36 | |
414 | 37 | try: | ||
415 | 38 | import Image | ||
416 | 39 | except: | ||
417 | 40 | print "Couldn't import python-imaging." | ||
418 | 41 | |||
419 | 37 | import os | 42 | import os |
420 | 38 | from gtk import gdk | 43 | from gtk import gdk |
421 | 39 | import cairo | 44 | import cairo |
422 | 40 | 45 | ||
423 | === modified file 'src/Manometer/ManometerScreenlet.py' | |||
424 | --- src/Manometer/ManometerScreenlet.py 2012-01-27 21:52:49 +0000 | |||
425 | +++ src/Manometer/ManometerScreenlet.py 2016-10-27 10:34:32 +0000 | |||
426 | @@ -446,7 +446,7 @@ | |||
427 | 446 | #Pour recuperer la charge reseau. Si c'est pour l'upload, downlaod doit etre True | 446 | #Pour recuperer la charge reseau. Si c'est pour l'upload, downlaod doit etre True |
428 | 447 | def get_network_load(self, download,card, maxSpeed, Mb, use_bit): | 447 | def get_network_load(self, download,card, maxSpeed, Mb, use_bit): |
429 | 448 | data = commands.getoutput("cat /proc/net/dev") | 448 | data = commands.getoutput("cat /proc/net/dev") |
431 | 449 | data = data[data.find(card + ":")+5:] | 449 | data = data[data.find(card + ":")+6:] |
432 | 450 | if(download): | 450 | if(download): |
433 | 451 | newNet = float( data.split()[0] ) | 451 | newNet = float( data.split()[0] ) |
434 | 452 | else: | 452 | else: |
435 | 453 | 453 | ||
436 | === modified file 'src/NVidia/NVidiaScreenlet.py' | |||
437 | --- src/NVidia/NVidiaScreenlet.py 2012-01-27 21:52:49 +0000 | |||
438 | +++ src/NVidia/NVidiaScreenlet.py 2016-10-27 10:34:32 +0000 | |||
439 | @@ -92,6 +92,7 @@ | |||
440 | 92 | __version__ = '0.5.1+++' | 92 | __version__ = '0.5.1+++' |
441 | 93 | __author__ = 'Rene Jansen' | 93 | __author__ = 'Rene Jansen' |
442 | 94 | __desc__ = __doc__ | 94 | __desc__ = __doc__ |
443 | 95 | __requires__ = ['python-rsvg'] | ||
444 | 95 | 96 | ||
445 | 96 | # internals | 97 | # internals |
446 | 97 | __updateTimer = None | 98 | __updateTimer = None |
447 | 98 | 99 | ||
448 | === modified file 'src/Netmonitor/NetmonitorScreenlet.py' | |||
449 | --- src/Netmonitor/NetmonitorScreenlet.py 2012-01-27 21:52:49 +0000 | |||
450 | +++ src/Netmonitor/NetmonitorScreenlet.py 2016-10-27 10:34:32 +0000 | |||
451 | @@ -48,7 +48,7 @@ | |||
452 | 48 | __version__ = '0.9.2+++' | 48 | __version__ = '0.9.2+++' |
453 | 49 | __author__ = 'Jovicic Nemanja aka drxnele based on Netmonitor 0.6 by Helder Fraga' | 49 | __author__ = 'Jovicic Nemanja aka drxnele based on Netmonitor 0.6 by Helder Fraga' |
454 | 50 | __desc__ =__doc__ | 50 | __desc__ =__doc__ |
456 | 51 | 51 | __requires__ = [ 'python-rsvg' ] | |
457 | 52 | __timeout = None | 52 | __timeout = None |
458 | 53 | p_layout = None | 53 | p_layout = None |
459 | 54 | update_interval = 1 | 54 | update_interval = 1 |
460 | 55 | 55 | ||
461 | === modified file 'src/Pager/PagerScreenlet.py' | |||
462 | --- src/Pager/PagerScreenlet.py 2012-01-27 21:52:49 +0000 | |||
463 | +++ src/Pager/PagerScreenlet.py 2016-10-27 10:34:32 +0000 | |||
464 | @@ -49,6 +49,7 @@ | |||
465 | 49 | __version__ = '0.2.2+++' | 49 | __version__ = '0.2.2+++' |
466 | 50 | __author__ = 'Whise , original version by RYX' | 50 | __author__ = 'Whise , original version by RYX' |
467 | 51 | __desc__ = __doc__ | 51 | __desc__ = __doc__ |
468 | 52 | __requires__ = ['python-rsvg'] | ||
469 | 52 | 53 | ||
470 | 53 | # internals | 54 | # internals |
471 | 54 | __windows = [] | 55 | __windows = [] |
472 | 55 | 56 | ||
473 | === modified file 'src/Picframe/PicframeScreenlet.py' | |||
474 | --- src/Picframe/PicframeScreenlet.py 2012-01-27 21:52:49 +0000 | |||
475 | +++ src/Picframe/PicframeScreenlet.py 2016-10-27 10:34:32 +0000 | |||
476 | @@ -44,7 +44,7 @@ | |||
477 | 44 | __name__ = 'PicframeScreenlet' | 44 | __name__ = 'PicframeScreenlet' |
478 | 45 | __version__ = '0.3++' | 45 | __version__ = '0.3++' |
479 | 46 | __author__ = 'Whise aka Helder Fraga' | 46 | __author__ = 'Whise aka Helder Fraga' |
481 | 47 | __requires__ = [ 'python-imaging' ] | 47 | __requires__ = [ 'python-imaging', 'python-rsvg' ] |
482 | 48 | __desc__ = __doc__ | 48 | __desc__ = __doc__ |
483 | 49 | 49 | ||
484 | 50 | # attributes | 50 | # attributes |
485 | 51 | 51 | ||
486 | === modified file 'src/Pidgin/PidginScreenlet.py' | |||
487 | --- src/Pidgin/PidginScreenlet.py 2012-01-27 21:52:49 +0000 | |||
488 | +++ src/Pidgin/PidginScreenlet.py 2016-10-27 10:34:32 +0000 | |||
489 | @@ -743,6 +743,8 @@ | |||
490 | 743 | # Do not initialize a new buffer if the size required is smaller that current | 743 | # Do not initialize a new buffer if the size required is smaller that current |
491 | 744 | # buffer size | 744 | # buffer size |
492 | 745 | self.__buffer = None | 745 | self.__buffer = None |
493 | 746 | if self.window is None or self.window.window is None: | ||
494 | 747 | return | ||
495 | 746 | self.__buffer = gtk.gdk.Pixmap(self.window.window, | 748 | self.__buffer = gtk.gdk.Pixmap(self.window.window, |
496 | 747 | int(self.width * self.scale), int(self.height * self.scale), -1) | 749 | int(self.width * self.scale), int(self.height * self.scale), -1) |
497 | 748 | 750 | ||
498 | 749 | 751 | ||
499 | === modified file 'src/Places/PlacesScreenlet.py' | |||
500 | --- src/Places/PlacesScreenlet.py 2012-01-27 21:52:49 +0000 | |||
501 | +++ src/Places/PlacesScreenlet.py 2016-10-27 10:34:32 +0000 | |||
502 | @@ -123,8 +123,11 @@ | |||
503 | 123 | self.places = [(os.environ['HOME'], _('Home')), | 123 | self.places = [(os.environ['HOME'], _('Home')), |
504 | 124 | (utils.get_desktop_dir(),_('Desktop'))] | 124 | (utils.get_desktop_dir(),_('Desktop'))] |
505 | 125 | bookmarks = utils.LoadBookmarks() | 125 | bookmarks = utils.LoadBookmarks() |
508 | 126 | for bookmark in bookmarks: | 126 | for bookmark in bookmarks: |
509 | 127 | if gnomevfs.exists(bookmark[0]): | 127 | if bookmark[0].startswith("file:///"): |
510 | 128 | if gnomevfs.exists(bookmark[0]): | ||
511 | 129 | self.places = self.places + [bookmark] | ||
512 | 130 | else: | ||
513 | 128 | self.places = self.places + [bookmark] | 131 | self.places = self.places + [bookmark] |
514 | 129 | 132 | ||
515 | 130 | if bookmarks is None: | 133 | if bookmarks is None: |
516 | 131 | 134 | ||
517 | === modified file 'src/SearchTorrent/SearchTorrentScreenlet.py' | |||
518 | --- src/SearchTorrent/SearchTorrentScreenlet.py 2012-01-27 21:52:49 +0000 | |||
519 | +++ src/SearchTorrent/SearchTorrentScreenlet.py 2016-10-27 10:34:32 +0000 | |||
520 | @@ -51,6 +51,8 @@ | |||
521 | 51 | __version__ = '0.4.test+++' | 51 | __version__ = '0.4.test+++' |
522 | 52 | __author__ = 'JR build on GoogleMapScreenlet by Helder Fraga aka Whise' | 52 | __author__ = 'JR build on GoogleMapScreenlet by Helder Fraga aka Whise' |
523 | 53 | __desc__ = __doc__ | 53 | __desc__ = __doc__ |
524 | 54 | __requires__ = ['python-rsvg'] | ||
525 | 55 | |||
526 | 54 | width =425 | 56 | width =425 |
527 | 55 | height = 120 | 57 | height = 120 |
528 | 56 | result = None | 58 | result = None |
529 | 57 | 59 | ||
530 | === modified file 'src/Sensors/SensorsScreenlet.py' | |||
531 | --- src/Sensors/SensorsScreenlet.py 2012-01-27 21:52:49 +0000 | |||
532 | +++ src/Sensors/SensorsScreenlet.py 2016-10-27 10:34:32 +0000 | |||
533 | @@ -41,6 +41,7 @@ | |||
534 | 41 | __version__ = '0.1.2+++' | 41 | __version__ = '0.1.2+++' |
535 | 42 | __author__ = 'Helder Fraga aka Whise' | 42 | __author__ = 'Helder Fraga aka Whise' |
536 | 43 | __desc__ = __doc__ | 43 | __desc__ = __doc__ |
537 | 44 | __requires__ = ['python-rsvg'] | ||
538 | 44 | 45 | ||
539 | 45 | # internals | 46 | # internals |
540 | 46 | __timeout = None | 47 | __timeout = None |
541 | 47 | 48 | ||
542 | === modified file 'src/Slideshow/SlideshowScreenlet.py' | |||
543 | --- src/Slideshow/SlideshowScreenlet.py 2012-01-27 21:52:49 +0000 | |||
544 | +++ src/Slideshow/SlideshowScreenlet.py 2016-10-27 10:34:32 +0000 | |||
545 | @@ -399,7 +399,6 @@ | |||
546 | 399 | __name__ = 'SlideshowScreenlet' | 399 | __name__ = 'SlideshowScreenlet' |
547 | 400 | __version__ = '1.3.10+++' | 400 | __version__ = '1.3.10+++' |
548 | 401 | __author__ = 'Guido Tabbernuk <boamaod@gmail.com>' | 401 | __author__ = 'Guido Tabbernuk <boamaod@gmail.com>' |
549 | 402 | __requires__ = ['python-imaging'] | ||
550 | 403 | __desc__ = __doc__ | 402 | __desc__ = __doc__ |
551 | 404 | 403 | ||
552 | 405 | # attributes | 404 | # attributes |
553 | 406 | 405 | ||
554 | === modified file 'src/SmoothWeather/SmoothWeatherScreenlet.py' | |||
555 | --- src/SmoothWeather/SmoothWeatherScreenlet.py 2012-04-04 15:31:57 +0000 | |||
556 | +++ src/SmoothWeather/SmoothWeatherScreenlet.py 2016-10-27 10:34:32 +0000 | |||
557 | @@ -52,6 +52,7 @@ | |||
558 | 52 | __author__ = 'Casey Trader aka Swiftfeet based on screenlet by Helder Fraga aka Whise' | 52 | __author__ = 'Casey Trader aka Swiftfeet based on screenlet by Helder Fraga aka Whise' |
559 | 53 | __category__ = 'Weather' | 53 | __category__ = 'Weather' |
560 | 54 | __desc__ = __doc__ | 54 | __desc__ = __doc__ |
561 | 55 | __requires__ = ['python-rsvg'] | ||
562 | 55 | 56 | ||
563 | 56 | # internals | 57 | # internals |
564 | 57 | __timeout = None | 58 | __timeout = None |
565 | @@ -182,7 +183,7 @@ | |||
566 | 182 | unit = 'm' | 183 | unit = 'm' |
567 | 183 | else: | 184 | else: |
568 | 184 | unit = 's' | 185 | unit = 's' |
570 | 185 | data = urlopen('http://xoap.weather.com/weather/local/'+self.ZIP+'?cc=*&dayf=10&prod=xoap&par=1003666583&key=4128909340a9b2fc&unit='+unit).read() | 186 | data = urlopen('http://wxdata.weather.com/weather/local/'+self.ZIP+'?cc=*&dayf=10&prod=xoap&par=1003666583&key=4128909340a9b2fc&unit='+unit).read() |
571 | 186 | forecast = [] | 187 | forecast = [] |
572 | 187 | 188 | ||
573 | 188 | dcstart = data.find('<loc ') | 189 | dcstart = data.find('<loc ') |
574 | @@ -204,7 +205,7 @@ | |||
575 | 204 | unit = 'm' | 205 | unit = 'm' |
576 | 205 | else: | 206 | else: |
577 | 206 | unit = 's' | 207 | unit = 's' |
579 | 207 | data = urlopen('http://xoap.weather.com/weather/local/'+self.ZIP+'?cc=*&dayf=10&prod=xoap&par=1003666583&key=4128909340a9b2fc&unit='+unit+'&hbhf=12').read() | 208 | data = urlopen('http://wxdata.weather.com/weather/local/'+self.ZIP+'?cc=*&dayf=10&prod=xoap&par=1003666583&key=4128909340a9b2fc&unit='+unit+'&hbhf=12').read() |
580 | 208 | hforecast = [] | 209 | hforecast = [] |
581 | 209 | 210 | ||
582 | 210 | for x in range(8): | 211 | for x in range(8): |
583 | @@ -496,7 +497,7 @@ | |||
584 | 496 | ctx.translate(25 , 50) ####Location of location name on screenlet ie.) New York | 497 | ctx.translate(25 , 50) ####Location of location name on screenlet ie.) New York |
585 | 497 | if self.p_layout1 == None : | 498 | if self.p_layout1 == None : |
586 | 498 | 499 | ||
588 | 499 | self.p_layout = ctx.create_layout() | 500 | self.p_layout1 = ctx.create_layout() |
589 | 500 | else: | 501 | else: |
590 | 501 | 502 | ||
591 | 502 | ctx.update_layout(self.p_layout) | 503 | ctx.update_layout(self.p_layout) |
592 | @@ -643,11 +644,17 @@ | |||
593 | 643 | ### Might need to add elif statement for radar = true and mini = true | 644 | ### Might need to add elif statement for radar = true and mini = true |
594 | 644 | ##degree = unichr(176) | 645 | ##degree = unichr(176) |
595 | 645 | if self.p_layout == None : | 646 | if self.p_layout == None : |
596 | 646 | |||
597 | 647 | self.p_layout = ctx.create_layout() | 647 | self.p_layout = ctx.create_layout() |
598 | 648 | else: | 648 | else: |
599 | 649 | |||
600 | 650 | ctx.update_layout(self.p_layout) | 649 | ctx.update_layout(self.p_layout) |
601 | 650 | if self.p_layout1 == None : | ||
602 | 651 | self.p_layout1 = ctx.create_layout() | ||
603 | 652 | else: | ||
604 | 653 | ctx.update_layout(self.p_layout1) | ||
605 | 654 | if self.p_layout2 == None : | ||
606 | 655 | self.p_layout2 = ctx.create_layout() | ||
607 | 656 | else: | ||
608 | 657 | ctx.update_layout(self.p_layout2) | ||
609 | 651 | p_fdesc = pango.FontDescription() | 658 | p_fdesc = pango.FontDescription() |
610 | 652 | p_fdesc.set_family_static("Sans") | 659 | p_fdesc.set_family_static("Sans") |
611 | 653 | p_fdesc.set_size(3 * pango.SCALE) | 660 | p_fdesc.set_size(3 * pango.SCALE) |
612 | 654 | 661 | ||
613 | === modified file 'src/Sticker/StickerScreenlet.py' | |||
614 | --- src/Sticker/StickerScreenlet.py 2012-03-24 22:35:36 +0000 | |||
615 | +++ src/Sticker/StickerScreenlet.py 2016-10-27 10:34:32 +0000 | |||
616 | @@ -37,6 +37,7 @@ | |||
617 | 37 | __author__ = 'Whise' | 37 | __author__ = 'Whise' |
618 | 38 | __category__ = 'Fun and amusement' | 38 | __category__ = 'Fun and amusement' |
619 | 39 | __desc__ = __doc__ | 39 | __desc__ = __doc__ |
620 | 40 | __requires__ = ['python-rsvg'] | ||
621 | 40 | 41 | ||
622 | 41 | xx = 0 | 42 | xx = 0 |
623 | 42 | 43 | ||
624 | 43 | 44 | ||
625 | === modified file 'src/Terminal/TerminalScreenlet.py' | |||
626 | --- src/Terminal/TerminalScreenlet.py 2012-07-26 11:49:18 +0000 | |||
627 | +++ src/Terminal/TerminalScreenlet.py 2016-10-27 10:34:32 +0000 | |||
628 | @@ -20,7 +20,12 @@ | |||
629 | 20 | import gobject | 20 | import gobject |
630 | 21 | import gtk | 21 | import gtk |
631 | 22 | import cairo | 22 | import cairo |
633 | 23 | import vte | 23 | |
634 | 24 | try: | ||
635 | 25 | import vte | ||
636 | 26 | except: | ||
637 | 27 | print "Couldn't import python-vte." | ||
638 | 28 | |||
639 | 24 | import gconf | 29 | import gconf |
640 | 25 | import os | 30 | import os |
641 | 26 | 31 | ||
642 | 27 | 32 | ||
643 | === modified file 'src/Tux/TuxScreenlet.py' | |||
644 | --- src/Tux/TuxScreenlet.py 2012-03-24 22:35:36 +0000 | |||
645 | +++ src/Tux/TuxScreenlet.py 2016-10-27 10:34:32 +0000 | |||
646 | @@ -72,12 +72,14 @@ | |||
647 | 72 | # internal vars | 72 | # internal vars |
648 | 73 | 73 | ||
649 | 74 | # hacky way to get screenlets own path | 74 | # hacky way to get screenlets own path |
655 | 75 | cut_path_here = __file__.rfind('/') | 75 | #cut_path_here = __file__.rfind('/') |
656 | 76 | if cut_path_here > 0: | 76 | #if cut_path_here > 0: |
657 | 77 | screenlet_dir = __file__[0:cut_path_here] | 77 | # screenlet_dir = __file__[0:cut_path_here] |
658 | 78 | else: | 78 | #else: |
659 | 79 | screenlet_dir = os.getcwd() | 79 | # screenlet_dir = os.getcwd() |
660 | 80 | 80 | ||
661 | 81 | screenlet_dir = sys.argv[0][:sys.argv[0].find('TuxScreenlet.py')].strip() | ||
662 | 82 | |||
663 | 81 | # editable options | 83 | # editable options |
664 | 82 | # editable options (options that are editable through the UI) | 84 | # editable options (options that are editable through the UI) |
665 | 83 | 85 | ||
666 | @@ -114,18 +116,19 @@ | |||
667 | 114 | _offset = 30 | 116 | _offset = 30 |
668 | 115 | offset = _offset | 117 | offset = _offset |
669 | 116 | 118 | ||
670 | 117 | |||
671 | 118 | ojo_i=Image.open(screenlet_dir + "/themes/"+str(theme_)+"/_ojo_i.png") | 119 | ojo_i=Image.open(screenlet_dir + "/themes/"+str(theme_)+"/_ojo_i.png") |
672 | 119 | |||
673 | 120 | ojo_i_ = ojo_i | 120 | ojo_i_ = ojo_i |
674 | 121 | 121 | ||
675 | 122 | |||
676 | 123 | # constructor | 122 | # constructor |
677 | 124 | def __init__ (self, parent_window=None,**keyword_args): | 123 | def __init__ (self, parent_window=None,**keyword_args): |
678 | 125 | 124 | ||
679 | 126 | """Create a new TuxScreenlet instance.""" | 125 | """Create a new TuxScreenlet instance.""" |
680 | 126 | |||
681 | 127 | # call super (we define to use our own service here) | 127 | # call super (we define to use our own service here) |
682 | 128 | Screenlet.__init__(self, uses_theme=True, width=self._width, height=self._height, **keyword_args) | 128 | Screenlet.__init__(self, uses_theme=True, width=self._width, height=self._height, **keyword_args) |
683 | 129 | |||
684 | 130 | # | ||
685 | 131 | |||
686 | 129 | self.add_default_menuitems() | 132 | self.add_default_menuitems() |
687 | 130 | self.scale=.5 | 133 | self.scale=.5 |
688 | 131 | # set default theme for this Screenlet (causes redraw) | 134 | # set default theme for this Screenlet (causes redraw) |
689 | @@ -169,6 +172,8 @@ | |||
690 | 169 | 172 | ||
691 | 170 | def init_buffers (self): | 173 | def init_buffers (self): |
692 | 171 | """(Re-)Create back-/foreground buffers""" | 174 | """(Re-)Create back-/foreground buffers""" |
693 | 175 | if self.window is None or self.window.window is None: | ||
694 | 176 | return | ||
695 | 172 | self.__buffer_back = gtk.gdk.Pixmap(self.window.window, | 177 | self.__buffer_back = gtk.gdk.Pixmap(self.window.window, |
696 | 173 | int(self.width * self.scale), int(self.height * self.scale), -1) | 178 | int(self.width * self.scale), int(self.height * self.scale), -1) |
697 | 174 | self.__buffer_fore = gtk.gdk.Pixmap(self.window.window, | 179 | self.__buffer_fore = gtk.gdk.Pixmap(self.window.window, |
698 | 175 | 180 | ||
699 | === modified file 'src/Twitter/TwitterScreenlet.py' | |||
700 | --- src/Twitter/TwitterScreenlet.py 2012-01-27 21:52:49 +0000 | |||
701 | +++ src/Twitter/TwitterScreenlet.py 2016-10-27 10:34:32 +0000 | |||
702 | @@ -94,7 +94,7 @@ | |||
703 | 94 | __name__ = 'TwitterScreenlet' | 94 | __name__ = 'TwitterScreenlet' |
704 | 95 | __version__ = '0.9.8+++' | 95 | __version__ = '0.9.8+++' |
705 | 96 | __author__ = 'Guido Tabbernuk <boamaod@gmail.com>' | 96 | __author__ = 'Guido Tabbernuk <boamaod@gmail.com>' |
707 | 97 | __requires__ = ['python-twitter (>= 0.8~)', 'python-oauth2'] | 97 | __requires__ = ['python-twitter (>= 0.8~)', 'python-oauth2client'] |
708 | 98 | __desc__ = __doc__ # set description to docstring of class | 98 | __desc__ = __doc__ # set description to docstring of class |
709 | 99 | 99 | ||
710 | 100 | __timeout = None | 100 | __timeout = None |
711 | 101 | 101 | ||
712 | === modified file 'src/VolumeControl/VolumeControlScreenlet.py' | |||
713 | --- src/VolumeControl/VolumeControlScreenlet.py 2012-01-27 21:52:49 +0000 | |||
714 | +++ src/VolumeControl/VolumeControlScreenlet.py 2016-10-27 10:34:32 +0000 | |||
715 | @@ -51,6 +51,7 @@ | |||
716 | 51 | __name__ = 'VolumeControlScreenlet' | 51 | __name__ = 'VolumeControlScreenlet' |
717 | 52 | __version__ = '0.1.9+++' | 52 | __version__ = '0.1.9+++' |
718 | 53 | __author__ = 'DeathCarrot' | 53 | __author__ = 'DeathCarrot' |
719 | 54 | __requires__ = ['python-rsvg'] | ||
720 | 54 | __desc__ = _('A basic screenlet for controlling the volume.' | 55 | __desc__ = _('A basic screenlet for controlling the volume.' |
721 | 55 | 'Use the mousewheel to raise and lower the volume,' | 56 | 'Use the mousewheel to raise and lower the volume,' |
722 | 56 | 'middle click to activate/deactivate mute or ' | 57 | 'middle click to activate/deactivate mute or ' |
723 | @@ -115,7 +116,7 @@ | |||
724 | 115 | self.add_option(StringOption(_('Device'), 'control', _('Master'), _('Control'), | 116 | self.add_option(StringOption(_('Device'), 'control', _('Master'), _('Control'), |
725 | 116 | _('Which control should be utilised for your device'), ctlList), self.on_control_update) | 117 | _('Which control should be utilised for your device'), ctlList), self.on_control_update) |
726 | 117 | self.add_option(IntOption(_('Device'), 'step', 2, _('Scroll Step'), | 118 | self.add_option(IntOption(_('Device'), 'step', 2, _('Scroll Step'), |
728 | 118 | _('How much the volume changes on each mouse wheel click'), 0, 100)) | 119 | _('How much the volume changes on each mouse wheel click'), min=0, max=100)) |
729 | 119 | self.add_option(StringOption(_('Device'), 'mixer', 'xfce4-mixer', _('Mixer Command'), _('The command to be run when mixer is launched'))) | 120 | self.add_option(StringOption(_('Device'), 'mixer', 'xfce4-mixer', _('Mixer Command'), _('The command to be run when mixer is launched'))) |
730 | 120 | 121 | ||
731 | 121 | def on_control_update(self, option, option2): | 122 | def on_control_update(self, option, option2): |
732 | @@ -124,6 +125,7 @@ | |||
733 | 124 | if line[22:]==self.cardName: | 125 | if line[22:]==self.cardName: |
734 | 125 | self.cardNo=line[1:2] | 126 | self.cardNo=line[1:2] |
735 | 126 | # find the maximum volume and update | 127 | # find the maximum volume and update |
736 | 128 | print "amixer dbg: %s, %s" %(self.cardNo, self.control) | ||
737 | 127 | self.__maxVol = int(commands.getoutput("amixer -c %s sget %s | awk '/^ Limits/{print $5}'" %(self.cardNo, self.control))) | 129 | self.__maxVol = int(commands.getoutput("amixer -c %s sget %s | awk '/^ Limits/{print $5}'" %(self.cardNo, self.control))) |
738 | 128 | print _("Max vol: ") + str(self.__maxVol) + "; "+self.control | 130 | print _("Max vol: ") + str(self.__maxVol) + "; "+self.control |
739 | 129 | self.updateBar() | 131 | self.updateBar() |
740 | 130 | 132 | ||
741 | === modified file 'src/WallpaperClock/WallpaperClockScreenlet.py' | |||
742 | --- src/WallpaperClock/WallpaperClockScreenlet.py 2012-03-24 22:35:36 +0000 | |||
743 | +++ src/WallpaperClock/WallpaperClockScreenlet.py 2016-10-27 10:34:32 +0000 | |||
744 | @@ -34,9 +34,7 @@ | |||
745 | 34 | try: | 34 | try: |
746 | 35 | import Image | 35 | import Image |
747 | 36 | except: | 36 | except: |
751 | 37 | import sys | 37 | print "Couldn't import python-imaging." |
749 | 38 | screenlets.show_error(None, _("Please install the python image module")) | ||
750 | 39 | sys.exit() | ||
752 | 40 | 38 | ||
753 | 41 | import gtk | 39 | import gtk |
754 | 42 | import gobject | 40 | import gobject |
755 | 43 | 41 | ||
756 | === modified file 'src/Weather/WeatherScreenlet.py' | |||
757 | --- src/Weather/WeatherScreenlet.py 2012-08-21 19:19:51 +0000 | |||
758 | +++ src/Weather/WeatherScreenlet.py 2016-10-27 10:34:32 +0000 | |||
759 | @@ -20,7 +20,12 @@ | |||
760 | 20 | from urllib import urlopen | 20 | from urllib import urlopen |
761 | 21 | import screenlets | 21 | import screenlets |
762 | 22 | from screenlets.options import StringOption, BoolOption | 22 | from screenlets.options import StringOption, BoolOption |
764 | 23 | from numpy import * | 23 | |
765 | 24 | try: | ||
766 | 25 | from numpy import * | ||
767 | 26 | except: | ||
768 | 27 | print "Couldn't import numpy." | ||
769 | 28 | |||
770 | 24 | import pygtk | 29 | import pygtk |
771 | 25 | pygtk.require('2.0') | 30 | pygtk.require('2.0') |
772 | 26 | import cairo | 31 | import cairo |
773 | @@ -52,7 +57,7 @@ | |||
774 | 52 | __version__ = '0.5.3' | 57 | __version__ = '0.5.3' |
775 | 53 | __author__ = 'by Helder Fraga (Whise), robgig1088, and blackhawk' | 58 | __author__ = 'by Helder Fraga (Whise), robgig1088, and blackhawk' |
776 | 54 | __category__ = 'Weather' | 59 | __category__ = 'Weather' |
778 | 55 | __requires__ = ['python-numpy'] | 60 | __requires__ = ['python-numpy', 'python-rsvg'] |
779 | 56 | __desc__ = __doc__ | 61 | __desc__ = __doc__ |
780 | 57 | 62 | ||
781 | 58 | # internals | 63 | # internals |
782 | @@ -157,7 +162,7 @@ | |||
783 | 157 | 162 | ||
784 | 158 | forecast = [] | 163 | forecast = [] |
785 | 159 | try: | 164 | try: |
787 | 160 | data = urlopen('http://xoap.weather.com/weather/local/'+self.ZIP+'?cc=*&dayf=10&prod=xoap&par=1003666583&key=4128909340a9b2fc&unit='+unit + '&link=xoap').read() | 165 | data = urlopen('http://wxdata.weather.com/weather/local/'+self.ZIP+'?cc=*&dayf=10&prod=wxdata&par=1003666583&key=4128909340a9b2fc&unit='+unit + '&link=wxdata').read() |
788 | 161 | 166 | ||
789 | 162 | dcstart = data.find('<loc ') | 167 | dcstart = data.find('<loc ') |
790 | 163 | dcstop = data.find('</cc>') ###### current conditions | 168 | dcstop = data.find('</cc>') ###### current conditions |
791 | @@ -183,7 +188,7 @@ | |||
792 | 183 | 188 | ||
793 | 184 | hforecast = [] | 189 | hforecast = [] |
794 | 185 | try: | 190 | try: |
796 | 186 | data = urlopen('http://xoap.weather.com/weather/local/'+self.ZIP+'?cc=*&dayf=10&prod=xoap&par=1003666583&key=4128909340a9b2fc&unit='+unit+'&hbhf=12&link=xoap').read() | 191 | data = urlopen('http://wxdata.weather.com/weather/local/'+self.ZIP+'?cc=*&dayf=10&prod=wxdata&par=1003666583&key=4128909340a9b2fc&unit='+unit+'&hbhf=12&link=wxdata').read() |
797 | 187 | for x in range(8): | 192 | for x in range(8): |
798 | 188 | dcstart = data.find('<hour h=\"'+str(x)) | 193 | dcstart = data.find('<hour h=\"'+str(x)) |
799 | 189 | dcstop = data.find('</hour>',dcstart) ####hourly forecast | 194 | dcstop = data.find('</hour>',dcstart) ####hourly forecast |
800 | @@ -417,7 +422,7 @@ | |||
801 | 417 | p_fdesc.set_weight(300) ##### render the days of the week | 422 | p_fdesc.set_weight(300) ##### render the days of the week |
802 | 418 | p_fdesc.set_style(pango.STYLE_NORMAL) | 423 | p_fdesc.set_style(pango.STYLE_NORMAL) |
803 | 419 | self.p_layout.set_font_description(p_fdesc) | 424 | self.p_layout.set_font_description(p_fdesc) |
805 | 420 | ctx.translate(10,-13) | 425 | ctx.translate(-80,-13) |
806 | 421 | self.p_layout.set_markup('<b>' +weather[1]["day"][:3] + '</b>') | 426 | self.p_layout.set_markup('<b>' +weather[1]["day"][:3] + '</b>') |
807 | 422 | ctx.show_layout(self.p_layout) | 427 | ctx.show_layout(self.p_layout) |
808 | 423 | ctx.translate(37, 0) | 428 | ctx.translate(37, 0) |
809 | @@ -464,7 +469,8 @@ | |||
810 | 464 | 469 | ||
811 | 465 | if self.show_daytemp == True: | 470 | if self.show_daytemp == True: |
812 | 466 | ctx.save() | 471 | ctx.save() |
814 | 467 | ctx.translate(18,97) | 472 | #ctx.translate(18,97) |
815 | 473 | ctx.translate(-70,97) | ||
816 | 468 | self.p_layout.set_markup('<b>' + weather[1]["high"]+degree+'</b>') | 474 | self.p_layout.set_markup('<b>' + weather[1]["high"]+degree+'</b>') |
817 | 469 | ctx.show_layout(self.p_layout) | 475 | ctx.show_layout(self.p_layout) |
818 | 470 | ctx.translate(0,12) | 476 | ctx.translate(0,12) |
819 | @@ -501,9 +507,9 @@ | |||
820 | 501 | ctx.restore() | 507 | ctx.restore() |
821 | 502 | ctx.save() | 508 | ctx.save() |
822 | 503 | 509 | ||
824 | 504 | def on_mouse_down(self,event): | 510 | def on_mouse_up(self,event): |
825 | 505 | if event.button == 1: | 511 | if event.button == 1: |
827 | 506 | os.system('xdg-open weather.com') | 512 | os.system('xdg-open http://weather.com') |
828 | 507 | #x = event.x / self.scale | 513 | #x = event.x / self.scale |
829 | 508 | #y = event.y / self.scale | 514 | #y = event.y / self.scale |
830 | 509 | #if y >= 75 and x <= 132 and x >= 110: | 515 | #if y >= 75 and x <= 132 and x >= 110: |
831 | 510 | 516 | ||
832 | === modified file 'src/WidescapeWeather/WidescapeWeatherScreenlet.py' | |||
833 | --- src/WidescapeWeather/WidescapeWeatherScreenlet.py 2012-04-04 15:31:57 +0000 | |||
834 | +++ src/WidescapeWeather/WidescapeWeatherScreenlet.py 2016-10-27 10:34:32 +0000 | |||
835 | @@ -403,7 +403,7 @@ | |||
836 | 403 | unit = 'm' | 403 | unit = 'm' |
837 | 404 | else: | 404 | else: |
838 | 405 | unit = 's' | 405 | unit = 's' |
840 | 406 | data = urlopen('http://xoap.weather.com/weather/local/'+self.ZIP+'?cc=*&dayf=10&prod=xoap&par=1003666583&key=4128909340a9b2fc&unit='+unit + '&link=xoap').read() | 406 | data = urlopen('http://wxdata.weather.com/weather/local/'+self.ZIP+'?cc=*&dayf=10&prod=wxdata&par=1003666583&key=4128909340a9b2fc&unit='+unit + '&link=wxdata').read() |
841 | 407 | forecast = [] | 407 | forecast = [] |
842 | 408 | 408 | ||
843 | 409 | dcstart = data.find('<loc ') | 409 | dcstart = data.find('<loc ') |
844 | 410 | 410 | ||
845 | === modified file 'src/WorldClock/WorldClockScreenlet.py' | |||
846 | --- src/WorldClock/WorldClockScreenlet.py 2012-03-24 22:35:36 +0000 | |||
847 | +++ src/WorldClock/WorldClockScreenlet.py 2016-10-27 10:34:32 +0000 | |||
848 | @@ -63,10 +63,16 @@ | |||
849 | 63 | from datetime import datetime | 63 | from datetime import datetime |
850 | 64 | import gobject | 64 | import gobject |
851 | 65 | 65 | ||
852 | 66 | # jsf additional imports needed for tzinfo support | ||
853 | 67 | from datetime import * | 66 | from datetime import * |
856 | 68 | from dateutil.tz import * | 67 | |
857 | 69 | from dateutil import zoneinfo | 68 | try: |
858 | 69 | # jsf additional imports needed for tzinfo support | ||
859 | 70 | from dateutil.tz import * | ||
860 | 71 | from dateutil import zoneinfo | ||
861 | 72 | except: | ||
862 | 73 | print "Couldn't import dateutil." | ||
863 | 74 | |||
864 | 75 | |||
865 | 70 | import os | 76 | import os |
866 | 71 | # use gettext for translation | 77 | # use gettext for translation |
867 | 72 | import gettext | 78 | import gettext |
868 | @@ -142,6 +148,7 @@ | |||
869 | 142 | __author__ = 'jsf (aka Joe Forbes)' | 148 | __author__ = 'jsf (aka Joe Forbes)' |
870 | 143 | __category__ = 'Date and time' | 149 | __category__ = 'Date and time' |
871 | 144 | __desc__ = __doc__ | 150 | __desc__ = __doc__ |
872 | 151 | __requires__ = [ 'python-dateutil', 'python-rsvg' ] | ||
873 | 145 | 152 | ||
874 | 146 | # internal vars | 153 | # internal vars |
875 | 147 | __timeout = None | 154 | __timeout = None |
876 | 148 | 155 | ||
877 | === modified file 'src/dayNight/dayNightScreenlet.py' | |||
878 | --- src/dayNight/dayNightScreenlet.py 2012-01-27 21:52:49 +0000 | |||
879 | +++ src/dayNight/dayNightScreenlet.py 2016-10-27 10:34:32 +0000 | |||
880 | @@ -32,7 +32,12 @@ | |||
881 | 32 | import pango | 32 | import pango |
882 | 33 | import math | 33 | import math |
883 | 34 | import os | 34 | import os |
885 | 35 | import Image | 35 | |
886 | 36 | try: | ||
887 | 37 | import Image | ||
888 | 38 | except: | ||
889 | 39 | print "Couldn't import python-imaging." | ||
890 | 40 | |||
891 | 36 | import time | 41 | import time |
892 | 37 | import datetime | 42 | import datetime |
893 | 38 | import Sun | 43 | import Sun |
many thanks for your work!