Merge lp:~roti-al/indiv-screenlets/s1604 into lp:indiv-screenlets

Proposed by Hrotkó Gábor on 2016-10-27
Status: Merged
Approved by: Hrotkó Gábor on 2017-01-30
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
Reviewer Review Type Date Requested Status
Hrotkó Gábor Approve on 2017-01-30
Review via email: mp+309452@code.launchpad.net

Description of the change

fixes for ubuntu 16.04

To post a comment you must log in.
lp:~roti-al/indiv-screenlets/s1604 updated on 2016-10-27
1270. By Hrotkó Gábor on 2016-10-27

changelog fomrat fix

Hrotkó Gábor (roti-al) :
review: Approve
Nicolas Krzywinski (nsk7even) wrote :

many thanks for your work!

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

Subscribers

People subscribed via source and target branches