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

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
Reviewer Review Type Date Requested Status
Hrotkó Gábor Approve
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
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 :

many thanks for your work!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-01-20 06:14:40 +0000
+++ debian/changelog 2016-10-27 10:34:32 +0000
@@ -1,3 +1,22 @@
1indiv-screenlets (0.1.7) xenial; urgency=low
2
3 * Fix
4 - dependencies
5 - ConvertScreenlet
6 - GooglemapsScreenlet
7 - InfoPanelScreenlet
8 - ManometerScreenlet
9 - PidginScreenlet
10 - PlacesScreenlet
11 - SidebarScreenlet
12 - SmoothWeatherScreenlet
13 - TuxScreenlet
14 - TwitterScreenlet
15 - WeatherScreenlet
16 - WidescapeWeatherScreenlet
17
18 -- Hrotkó Gábor <roti@profi-media.com> Wed, 26 Oct 2016 21:00:15 +0100
19
1indiv-screenlets (0.1.6) oneiric; urgency=low20indiv-screenlets (0.1.6) oneiric; urgency=low
221
3 * Fix:22 * Fix:
423
=== modified file 'debian/control'
--- debian/control 2011-05-30 17:53:38 +0000
+++ debian/control 2016-10-27 10:34:32 +0000
@@ -2,32 +2,29 @@
2Section: gnome2Section: gnome
3Priority: optional3Priority: optional
4Maintainer: Guido Tabbernuk <boamaod@gmail.com>4Maintainer: Guido Tabbernuk <boamaod@gmail.com>
5Build-Depends: debhelper (>= 7), python-support5Build-Depends: debhelper (>= 7), dh-python
6Standards-Version: 3.7.26Standards-Version: 3.7.2
7XS-Python-Version: current7XS-Python-Version: current
88
9Package: screenlets-pack-all9Package: screenlets-pack-all
10Architecture: all10Architecture: all
11Depends: screenlets (>= 0.1.2-9),11Depends: screenlets (>= 0.1.7),
12 ${python:Depends}, 12 ${python:Depends},
13 ${misc:Depends}, 13 ${misc:Depends},
14Conflicts: screenlets-pack-basic14Conflicts: screenlets-pack-basic
15Recommends: gnome-keyring,15Recommends: gnome-keyring,
16 python-feedparser,16 python-feedparser,
17 python-gmenu,
18 python-numeric,
19 python-numpy,17 python-numpy,
20 python-gnome2-extras,
21 python-dateutil,18 python-dateutil,
22 python-tz,19 python-tz,
23 python-gdata (>= 2.0.10),20 python-gdata (>= 2.0.10),
24 python-twitter (>= 0.8),21 python-twitter (>= 0.8),
25 python-oauth2,22 python-oauth2client,
23 python-rsvg,
24 python-webkit,
26 iceweasel | firefox,25 iceweasel | firefox,
27 python-gtkmozembed | python-gnome2-extras (<< 2.19),
28 metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2)26 metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2)
29Suggests: python-dcop,27Suggests: evolution,
30 evolution,
31 tomboy,28 tomboy,
32 gnome-orca29 gnome-orca
33XB-Python-Version: ${python:Versions}30XB-Python-Version: ${python:Versions}
@@ -39,23 +36,19 @@
3936
40Package: screenlets-pack-basic37Package: screenlets-pack-basic
41Architecture: all38Architecture: all
42Depends: screenlets (>= 0.1.2-9),39Depends: screenlets (>= 0.1.7),
43 ${python:Depends}, 40 ${python:Depends},
44 ${misc:Depends}, 41 ${misc:Depends},
45Conflicts: screenlets-pack-all42Conflicts: screenlets-pack-all
46Recommends: gnome-keyring,43Recommends: gnome-keyring,
47 python-feedparser,44 python-feedparser,
48 python-gmenu,
49 python-numeric,
50 python-numpy,45 python-numpy,
51 python-gnome2-extras,
52 python-dateutil,46 python-dateutil,
53 python-tz,47 python-tz,
48 python-webkit,
54 iceweasel | firefox,49 iceweasel | firefox,
55 python-gtkmozembed | python-gnome2-extras (<< 2.19),
56 metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2)50 metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2)
57Suggests: python-dcop,51Suggests: tomboy | gnote
58 tomboy | gnote
59XB-Python-Version: ${python:Versions}52XB-Python-Version: ${python:Versions}
60Description: Widget-like mini-applications for GNOME53Description: Widget-like mini-applications for GNOME
61 Screenlets are small owner-drawn applications (written in Python, a 54 Screenlets are small owner-drawn applications (written in Python, a
6255
=== modified file 'debian/rules'
--- debian/rules 2011-07-26 21:06:29 +0000
+++ debian/rules 2016-10-27 10:34:32 +0000
@@ -6,8 +6,8 @@
66
7override_dh_auto_install:7override_dh_auto_install:
8 dh_auto_install --buildsystem=python_distutils8 dh_auto_install --buildsystem=python_distutils
9 find debian/tmp/usr/share/screenlets -name "*.svg" -perm 755 | xargs -r --delimiter=\\n chmod 6449# find debian/tmp/usr/share/screenlets -name "*.svg" -perm 755 | xargs -r --delimiter=\\n chmod 644
10 find debian/tmp/usr/share/screenlets -name "*.png" -perm 755 | xargs -r --delimiter=\\n chmod 64410# find debian/tmp/usr/share/screenlets -name "*.png" -perm 755 | xargs -r --delimiter=\\n chmod 644
1111
12override_dh_clean:12override_dh_clean:
13 rm -fR build/locale13 rm -fR build/locale
@@ -19,4 +19,11 @@
19get-orig-source:19get-orig-source:
20 dh_testdir20 dh_testdir
21 uscan --force-download --verbose --repack21 uscan --force-download --verbose --repack
22 22
23override_dh_fixperms:
24 dh_fixperms
25 find debian -name '*.html' -exec chmod 0666 {} +
26 find debian -name '*.svg' -exec chmod 0644 {} +
27 find debian -name '*.png' -exec chmod 0666 {} +
28
29
2330
=== modified file 'src/ClearRss/ClearRssScreenlet.py'
--- src/ClearRss/ClearRssScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/ClearRss/ClearRssScreenlet.py 2016-10-27 10:34:32 +0000
@@ -27,7 +27,13 @@
27from screenlets import DefaultMenuItem, utils27from screenlets import DefaultMenuItem, utils
28from screenlets.options import IntOption, BoolOption, StringOption, FontOption, ColorOption, FloatOption28from screenlets.options import IntOption, BoolOption, StringOption, FontOption, ColorOption, FloatOption
29import os29import os
30import feedparser30
31try:
32 import feedparser
33except:
34 print "Couldn't import feedparser."
35
36
31#use gettext for translation37#use gettext for translation
32import gettext38import gettext
3339
3440
=== modified file 'src/Convert/ConvertScreenlet.py'
--- src/Convert/ConvertScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Convert/ConvertScreenlet.py 2016-10-27 10:34:32 +0000
@@ -75,16 +75,16 @@
75 filelist = os.listdir(Plugins.PATH)75 filelist = os.listdir(Plugins.PATH)
7676
77 for filename in sorted(filelist):77 for filename in sorted(filelist):
78
79 if filename[-12:] == 'Converter.py':78 if filename[-12:] == 'Converter.py':
8079
81 classname = filename[:-3]80 classname = filename[:-3]
82 mod = Plugins.importAPI(classname)81 mod = Plugins.importAPI(classname)
83 classobj = getattr(mod, classname)82 classobj = getattr(mod, classname)
84 self.__conv_list.append(classobj)83 if hasattr(classobj, '__title__'):
85 # add a menu item for each84 self.__conv_list.append(classobj)
86 self.add_menuitem('conv:' + classobj.__name__, 85 # add a menu item for each
87 classobj.__title__)86 self.add_menuitem('conv:' + classobj.__name__, classobj.__title__)
87
88 # for sure88 # for sure
89 if len(self.__conv_list) == 0:89 if len(self.__conv_list) == 0:
90 # FIXME: how do I abort the initialization?90 # FIXME: how do I abort the initialization?
9191
=== modified file 'src/Dropbox/DropboxScreenlet.py'
--- src/Dropbox/DropboxScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Dropbox/DropboxScreenlet.py 2016-10-27 10:34:32 +0000
@@ -28,7 +28,14 @@
28from screenlets import DefaultMenuItem28from screenlets import DefaultMenuItem
29from screenlets.options import ColorOption, StringOption, FloatOption, FontOption29from screenlets.options import ColorOption, StringOption, FloatOption, FontOption
30from screenlets.utils import xdg_open30from screenlets.utils import xdg_open
31import cairo, rsvg, gtk, os, pango, subprocess, gobject, re31import cairo, gtk, os, pango, subprocess, gobject, re
32
33try:
34 import rsvg
35except:
36 print "Couldn't import rsvg."
37
38
3239
33#use gettext for translation40#use gettext for translation
34import gettext41import gettext
@@ -44,7 +51,7 @@
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."""
45 __name__ = 'DropboxScreenlet'52 __name__ = 'DropboxScreenlet'
46 __version__ = '0.4.1+++'53 __version__ = '0.4.1+++'
47 __requires__ = ['dropbox']54 __requires__ = ['dropbox','python-rsvg']
48 __author__ = 'spitfire23bc'55 __author__ = 'spitfire23bc'
49 __desc__ = __doc__56 __desc__ = __doc__
50 57
5158
=== modified file 'src/Execute/ExecuteScreenlet.py'
--- src/Execute/ExecuteScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Execute/ExecuteScreenlet.py 2016-10-27 10:34:32 +0000
@@ -41,6 +41,8 @@
41 __version__ = '0.3.1+++'41 __version__ = '0.3.1+++'
42 __author__ = 'Helder Fraga aka whise'42 __author__ = 'Helder Fraga aka whise'
43 __desc__ = __doc__43 __desc__ = __doc__
44 __requires__ = ['python-rsvg']
45
44 clipboard = gtk.clipboard_get()46 clipboard = gtk.clipboard_get()
45 47
46 __has_focus = False48 __has_focus = False
4749
=== modified file 'src/FeedReader/FeedReaderScreenlet.py'
--- src/FeedReader/FeedReaderScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/FeedReader/FeedReaderScreenlet.py 2016-10-27 10:34:32 +0000
@@ -25,7 +25,12 @@
25import gtk25import gtk
26import os26import os
2727
28import feedparser28try:
29 import feedparser
30except:
31 print "Couldn't import feedparser."
32
33
29#use gettext for translation34#use gettext for translation
30import gettext35import gettext
3136
3237
=== modified file 'src/FeedReaderPlus/FeedReaderPlusScreenlet.py'
--- src/FeedReaderPlus/FeedReaderPlusScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/FeedReaderPlus/FeedReaderPlusScreenlet.py 2016-10-27 10:34:32 +0000
@@ -28,7 +28,10 @@
28import time28import time
29import calendar29import calendar
3030
31import feedparser31try:
32 import feedparser
33except:
34 print "Couldn't import python-feedparser."
3235
33#use gettext for translation36#use gettext for translation
34import gettext37import gettext
3538
=== modified file 'src/FlipClock/FlipClockScreenlet.py'
--- src/FlipClock/FlipClockScreenlet.py 2012-03-24 22:35:36 +0000
+++ src/FlipClock/FlipClockScreenlet.py 2016-10-27 10:34:32 +0000
@@ -26,7 +26,12 @@
26import commands26import commands
27import sys27import sys
28import os28import os
29import webkit29
30try:
31 import webkit
32except:
33 print "Couldn't import python-webkit."
34
30from screenlets import sensors35from screenlets import sensors
3136
32class FlipClockScreenlet (screenlets.Screenlet):37class FlipClockScreenlet (screenlets.Screenlet):
@@ -67,8 +72,11 @@
67 pass72 pass
68 self.win.add(self.view)73 self.win.add(self.view)
6974
70 self.url = "file://" + self.get_screenlet_dir() + "/Source/index.html"75 self.url = str(self.mypath) + "/Source/index.html"
71 self.view.load_uri(self.url)76 settings = self.view.get_settings()
77 settings.set_property("enable-universal-access-from-file-uris", True)
78 self.view.set_settings(settings)
79 self.view.open(str(self.url))
72 self.win.connect('destroy', self.quitall)80 self.win.connect('destroy', self.quitall)
73 self.win.connect('configure-event', self.configure)81 self.win.connect('configure-event', self.configure)
74 self.view.connect('notify::title', self.update)82 self.view.connect('notify::title', self.update)
7583
=== modified file 'src/Googlemaps/GooglemapsScreenlet.py'
--- src/Googlemaps/GooglemapsScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Googlemaps/GooglemapsScreenlet.py 2016-10-27 10:34:32 +0000
@@ -28,30 +28,11 @@
28import sys28import sys
29import os29import os
3030
31
32#########WORKARROUND FOR GTKOZEMBED BUG################
33
34if sys.argv[0].endswith('GooglemapsScreenlet.py'):
35
36 if commands.getoutput("lsb_release -is") == 'Ubuntu':
37 mypath = sys.argv[0][:sys.argv[0].find('GooglemapsScreenlet.py')].strip()
38 if os.path.isfile(mypath + "running"):
39 os.system("rm -f " + mypath + "running")
40
41 else:
42 os.system ("export LD_LIBRARY_PATH=/usr/lib/firefox \n export MOZILLA_FIVE_HOME=/usr/lib/firefox \n python "+ sys.argv[0] + " &")
43 fileObj = open(mypath + "running","w") #// open for for write
44 fileObj.write('gtkmozembed bug workarround')
45
46 fileObj.close()
47 exit()
48else:
49 pass
50try:31try:
51 import gtkmozembed32 import webkit
52except:33except:
53 print 'You dont have gtkmozembed , please install python gnome extras'34 print "Couldn't import python-webkit."
54 35
55#use gettext for translation36#use gettext for translation
56import gettext37import gettext
5738
@@ -70,6 +51,7 @@
70 __version__ = '0.6.1+++'51 __version__ = '0.6.1+++'
71 __author__ = 'Helder Fraga aka Whise'52 __author__ = 'Helder Fraga aka Whise'
72 __desc__ = __doc__53 __desc__ = __doc__
54 __requires__ = [ 'python-webkit', 'python-rsvg' ]
73 width =42555 width =425
74 height = 47056 height = 470
75 box = None57 box = None
@@ -109,11 +91,13 @@
109 # create evntbox91 # create evntbox
110 92
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)))
112 self.moz = gtkmozembed.MozEmbed()94
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()
114 96 settings = self.moz.get_settings()
115 self.moz.load_url(str(self.url))97 settings.set_property("enable-universal-access-from-file-uris", True)
116 98 self.moz.set_settings(settings)
99 self.moz.open(str(self.url)) # load_uri(uri)
100
117 # add/show all inputs101 # add/show all inputs
118 102
119 103
@@ -144,7 +128,7 @@
144128
145 129
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:
147 self.moz.load_url(str(self.url))131 self.moz.load_uri(str(self.url))
148132
149133
150 self.redraw_canvas()134 self.redraw_canvas()
@@ -166,7 +150,7 @@
166 fh2.write(self.fh1)150 fh2.write(self.fh1)
167 fh2.close()151 fh2.close()
168 self.url = str(self.mypath)+'gtoload.html'152 self.url = str(self.mypath)+'gtoload.html'
169 self.moz.load_url(str(self.url))153 self.moz.load_uri(str(self.url))
170 def on_draw_shape (self, ctx):154 def on_draw_shape (self, ctx):
171 ctx.scale(self.scale, self.scale)155 ctx.scale(self.scale, self.scale)
172 ctx.set_source_rgba(0, 0, 0, 1)156 ctx.set_source_rgba(0, 0, 0, 1)
173157
=== modified file 'src/InfoPanel/InfoPanelScreenlet.py'
--- src/InfoPanel/InfoPanelScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/InfoPanel/InfoPanelScreenlet.py 2016-10-27 10:34:32 +0000
@@ -1353,7 +1353,7 @@
1353 try:1353 try:
1354 # download data1354 # download data
1355 self.debug( 'Download weather' )1355 self.debug( 'Download weather' )
1356 data = urllib.urlopen( 'http://xoap.weather.com/weather/local/'+weatherZips[key]+1356 data = urllib.urlopen( 'http://wxdata.weather.com/weather/local/'+weatherZips[key]+
1357 '?cc=*&dayf=10&prod=xoap&par=1003666583&key=4128909340a9b2fc&unit='+weatherUnit+1357 '?cc=*&dayf=10&prod=xoap&par=1003666583&key=4128909340a9b2fc&unit='+weatherUnit+
1358 '&link=xoap' ).read()1358 '&link=xoap' ).read()
13591359
13601360
=== modified file 'src/Launcher/LauncherScreenlet.py'
--- src/Launcher/LauncherScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Launcher/LauncherScreenlet.py 2016-10-27 10:34:32 +0000
@@ -37,6 +37,7 @@
37import os37import os
38import urllib38import urllib
39import gnomevfs39import gnomevfs
40import sys
40#use gettext for translation41#use gettext for translation
41import gettext42import gettext
4243
@@ -77,6 +78,8 @@
77 icon = ''78 icon = ''
78 label = ''79 label = ''
79 80
81 mypath = sys.argv[0][:sys.argv[0].find('LauncherScreenlet.py')].strip()
82
80 # constructor/internals83 # constructor/internals
81 84
82 def __init__ (self, **keyword_args):85 def __init__ (self, **keyword_args):
@@ -85,7 +88,7 @@
85 # add default menu items88 # add default menu items
8689
87 # set default icon and action90 # set default icon and action
88 self.icon = self.get_screenlet_dir() + '/default-icon.svg'91 self.icon = str(self.mypath) + '/default-icon.svg'
89 # add editable settings92 # add editable settings
90 self.add_options_group(_('Starter'), 93 self.add_options_group(_('Starter'),
91 _('Some options related to the Launcher-Screenlet.'))94 _('Some options related to the Launcher-Screenlet.'))
9295
=== modified file 'src/Lipik/LipikScreenlet.py'
--- src/Lipik/LipikScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Lipik/LipikScreenlet.py 2016-10-27 10:34:32 +0000
@@ -33,7 +33,12 @@
33from screenlets.options import FontOption, ColorOption33from screenlets.options import FontOption, ColorOption
3434
35import gtk35import gtk
36import Image36
37try:
38 import Image
39except:
40 print "Couldn't import python-imaging."
41
37import os42import os
38from gtk import gdk43from gtk import gdk
39import cairo44import cairo
4045
=== modified file 'src/Manometer/ManometerScreenlet.py'
--- src/Manometer/ManometerScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Manometer/ManometerScreenlet.py 2016-10-27 10:34:32 +0000
@@ -446,7 +446,7 @@
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
447 def get_network_load(self, download,card, maxSpeed, Mb, use_bit):447 def get_network_load(self, download,card, maxSpeed, Mb, use_bit):
448 data = commands.getoutput("cat /proc/net/dev")448 data = commands.getoutput("cat /proc/net/dev")
449 data = data[data.find(card + ":")+5:]449 data = data[data.find(card + ":")+6:]
450 if(download):450 if(download):
451 newNet = float( data.split()[0] )451 newNet = float( data.split()[0] )
452 else:452 else:
453453
=== modified file 'src/NVidia/NVidiaScreenlet.py'
--- src/NVidia/NVidiaScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/NVidia/NVidiaScreenlet.py 2016-10-27 10:34:32 +0000
@@ -92,6 +92,7 @@
92 __version__ = '0.5.1+++'92 __version__ = '0.5.1+++'
93 __author__ = 'Rene Jansen'93 __author__ = 'Rene Jansen'
94 __desc__ = __doc__94 __desc__ = __doc__
95 __requires__ = ['python-rsvg']
9596
96 # internals97 # internals
97 __updateTimer = None98 __updateTimer = None
9899
=== modified file 'src/Netmonitor/NetmonitorScreenlet.py'
--- src/Netmonitor/NetmonitorScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Netmonitor/NetmonitorScreenlet.py 2016-10-27 10:34:32 +0000
@@ -48,7 +48,7 @@
48 __version__ = '0.9.2+++'48 __version__ = '0.9.2+++'
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'
50 __desc__ =__doc__50 __desc__ =__doc__
5151 __requires__ = [ 'python-rsvg' ]
52 __timeout = None52 __timeout = None
53 p_layout = None53 p_layout = None
54 update_interval = 154 update_interval = 1
5555
=== modified file 'src/Pager/PagerScreenlet.py'
--- src/Pager/PagerScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Pager/PagerScreenlet.py 2016-10-27 10:34:32 +0000
@@ -49,6 +49,7 @@
49 __version__ = '0.2.2+++'49 __version__ = '0.2.2+++'
50 __author__ = 'Whise , original version by RYX'50 __author__ = 'Whise , original version by RYX'
51 __desc__ = __doc__51 __desc__ = __doc__
52 __requires__ = ['python-rsvg']
52 53
53 # internals54 # internals
54 __windows = [] 55 __windows = []
5556
=== modified file 'src/Picframe/PicframeScreenlet.py'
--- src/Picframe/PicframeScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Picframe/PicframeScreenlet.py 2016-10-27 10:34:32 +0000
@@ -44,7 +44,7 @@
44 __name__ = 'PicframeScreenlet'44 __name__ = 'PicframeScreenlet'
45 __version__ = '0.3++'45 __version__ = '0.3++'
46 __author__ = 'Whise aka Helder Fraga'46 __author__ = 'Whise aka Helder Fraga'
47 __requires__ = [ 'python-imaging' ]47 __requires__ = [ 'python-imaging', 'python-rsvg' ]
48 __desc__ = __doc__48 __desc__ = __doc__
49 49
50 # attributes50 # attributes
5151
=== modified file 'src/Pidgin/PidginScreenlet.py'
--- src/Pidgin/PidginScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Pidgin/PidginScreenlet.py 2016-10-27 10:34:32 +0000
@@ -743,6 +743,8 @@
743 # Do not initialize a new buffer if the size required is smaller that current743 # Do not initialize a new buffer if the size required is smaller that current
744 # buffer size744 # buffer size
745 self.__buffer = None745 self.__buffer = None
746 if self.window is None or self.window.window is None:
747 return
746 self.__buffer = gtk.gdk.Pixmap(self.window.window, 748 self.__buffer = gtk.gdk.Pixmap(self.window.window,
747 int(self.width * self.scale), int(self.height * self.scale), -1)749 int(self.width * self.scale), int(self.height * self.scale), -1)
748 750
749751
=== modified file 'src/Places/PlacesScreenlet.py'
--- src/Places/PlacesScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Places/PlacesScreenlet.py 2016-10-27 10:34:32 +0000
@@ -123,8 +123,11 @@
123 self.places = [(os.environ['HOME'], _('Home')),123 self.places = [(os.environ['HOME'], _('Home')),
124 (utils.get_desktop_dir(),_('Desktop'))]124 (utils.get_desktop_dir(),_('Desktop'))]
125 bookmarks = utils.LoadBookmarks()125 bookmarks = utils.LoadBookmarks()
126 for bookmark in bookmarks:126 for bookmark in bookmarks:
127 if gnomevfs.exists(bookmark[0]):127 if bookmark[0].startswith("file:///"):
128 if gnomevfs.exists(bookmark[0]):
129 self.places = self.places + [bookmark]
130 else:
128 self.places = self.places + [bookmark]131 self.places = self.places + [bookmark]
129132
130 if bookmarks is None:133 if bookmarks is None:
131134
=== modified file 'src/SearchTorrent/SearchTorrentScreenlet.py'
--- src/SearchTorrent/SearchTorrentScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/SearchTorrent/SearchTorrentScreenlet.py 2016-10-27 10:34:32 +0000
@@ -51,6 +51,8 @@
51 __version__ = '0.4.test+++'51 __version__ = '0.4.test+++'
52 __author__ = 'JR build on GoogleMapScreenlet by Helder Fraga aka Whise'52 __author__ = 'JR build on GoogleMapScreenlet by Helder Fraga aka Whise'
53 __desc__ = __doc__53 __desc__ = __doc__
54 __requires__ = ['python-rsvg']
55
54 width =42556 width =425
55 height = 12057 height = 120
56 result = None58 result = None
5759
=== modified file 'src/Sensors/SensorsScreenlet.py'
--- src/Sensors/SensorsScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Sensors/SensorsScreenlet.py 2016-10-27 10:34:32 +0000
@@ -41,6 +41,7 @@
41 __version__ = '0.1.2+++'41 __version__ = '0.1.2+++'
42 __author__ = 'Helder Fraga aka Whise'42 __author__ = 'Helder Fraga aka Whise'
43 __desc__ = __doc__43 __desc__ = __doc__
44 __requires__ = ['python-rsvg']
4445
45 # internals46 # internals
46 __timeout = None47 __timeout = None
4748
=== modified file 'src/Slideshow/SlideshowScreenlet.py'
--- src/Slideshow/SlideshowScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Slideshow/SlideshowScreenlet.py 2016-10-27 10:34:32 +0000
@@ -399,7 +399,6 @@
399 __name__ = 'SlideshowScreenlet'399 __name__ = 'SlideshowScreenlet'
400 __version__ = '1.3.10+++'400 __version__ = '1.3.10+++'
401 __author__ = 'Guido Tabbernuk <boamaod@gmail.com>'401 __author__ = 'Guido Tabbernuk <boamaod@gmail.com>'
402 __requires__ = ['python-imaging']
403 __desc__ = __doc__402 __desc__ = __doc__
404 403
405 # attributes404 # attributes
406405
=== modified file 'src/SmoothWeather/SmoothWeatherScreenlet.py'
--- src/SmoothWeather/SmoothWeatherScreenlet.py 2012-04-04 15:31:57 +0000
+++ src/SmoothWeather/SmoothWeatherScreenlet.py 2016-10-27 10:34:32 +0000
@@ -52,6 +52,7 @@
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'
53 __category__ = 'Weather'53 __category__ = 'Weather'
54 __desc__ = __doc__54 __desc__ = __doc__
55 __requires__ = ['python-rsvg']
5556
56 # internals57 # internals
57 __timeout = None58 __timeout = None
@@ -182,7 +183,7 @@
182 unit = 'm'183 unit = 'm'
183 else:184 else:
184 unit = 's'185 unit = 's'
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()
186 forecast = []187 forecast = []
187188
188 dcstart = data.find('<loc ')189 dcstart = data.find('<loc ')
@@ -204,7 +205,7 @@
204 unit = 'm'205 unit = 'm'
205 else:206 else:
206 unit = 's'207 unit = 's'
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()
208 hforecast = []209 hforecast = []
209210
210 for x in range(8):211 for x in range(8):
@@ -496,7 +497,7 @@
496 ctx.translate(25 , 50) ####Location of location name on screenlet ie.) New York497 ctx.translate(25 , 50) ####Location of location name on screenlet ie.) New York
497 if self.p_layout1 == None :498 if self.p_layout1 == None :
498 499
499 self.p_layout = ctx.create_layout()500 self.p_layout1 = ctx.create_layout()
500 else:501 else:
501 502
502 ctx.update_layout(self.p_layout)503 ctx.update_layout(self.p_layout)
@@ -643,11 +644,17 @@
643 ### Might need to add elif statement for radar = true and mini = true644 ### Might need to add elif statement for radar = true and mini = true
644 ##degree = unichr(176)645 ##degree = unichr(176)
645 if self.p_layout == None :646 if self.p_layout == None :
646
647 self.p_layout = ctx.create_layout()647 self.p_layout = ctx.create_layout()
648 else:648 else:
649
650 ctx.update_layout(self.p_layout)649 ctx.update_layout(self.p_layout)
650 if self.p_layout1 == None :
651 self.p_layout1 = ctx.create_layout()
652 else:
653 ctx.update_layout(self.p_layout1)
654 if self.p_layout2 == None :
655 self.p_layout2 = ctx.create_layout()
656 else:
657 ctx.update_layout(self.p_layout2)
651 p_fdesc = pango.FontDescription()658 p_fdesc = pango.FontDescription()
652 p_fdesc.set_family_static("Sans")659 p_fdesc.set_family_static("Sans")
653 p_fdesc.set_size(3 * pango.SCALE)660 p_fdesc.set_size(3 * pango.SCALE)
654661
=== modified file 'src/Sticker/StickerScreenlet.py'
--- src/Sticker/StickerScreenlet.py 2012-03-24 22:35:36 +0000
+++ src/Sticker/StickerScreenlet.py 2016-10-27 10:34:32 +0000
@@ -37,6 +37,7 @@
37 __author__ = 'Whise'37 __author__ = 'Whise'
38 __category__ = 'Fun and amusement'38 __category__ = 'Fun and amusement'
39 __desc__ = __doc__39 __desc__ = __doc__
40 __requires__ = ['python-rsvg']
4041
41 xx = 042 xx = 0
4243
4344
=== modified file 'src/Terminal/TerminalScreenlet.py'
--- src/Terminal/TerminalScreenlet.py 2012-07-26 11:49:18 +0000
+++ src/Terminal/TerminalScreenlet.py 2016-10-27 10:34:32 +0000
@@ -20,7 +20,12 @@
20import gobject20import gobject
21import gtk21import gtk
22import cairo22import cairo
23import vte23
24try:
25 import vte
26except:
27 print "Couldn't import python-vte."
28
24import gconf29import gconf
25import os30import os
2631
2732
=== modified file 'src/Tux/TuxScreenlet.py'
--- src/Tux/TuxScreenlet.py 2012-03-24 22:35:36 +0000
+++ src/Tux/TuxScreenlet.py 2016-10-27 10:34:32 +0000
@@ -72,12 +72,14 @@
72 # internal vars72 # internal vars
7373
74 # hacky way to get screenlets own path74 # hacky way to get screenlets own path
75 cut_path_here = __file__.rfind('/')75 #cut_path_here = __file__.rfind('/')
76 if cut_path_here > 0:76 #if cut_path_here > 0:
77 screenlet_dir = __file__[0:cut_path_here]77 # screenlet_dir = __file__[0:cut_path_here]
78 else:78 #else:
79 screenlet_dir = os.getcwd()79 # screenlet_dir = os.getcwd()
80 80
81 screenlet_dir = sys.argv[0][:sys.argv[0].find('TuxScreenlet.py')].strip()
82
81 # editable options83 # editable options
82 # editable options (options that are editable through the UI)84 # editable options (options that are editable through the UI)
8385
@@ -114,18 +116,19 @@
114 _offset = 30116 _offset = 30
115 offset = _offset117 offset = _offset
116118
117
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")
119
120 ojo_i_ = ojo_i120 ojo_i_ = ojo_i
121121
122
123 # constructor122 # constructor
124 def __init__ (self, parent_window=None,**keyword_args):123 def __init__ (self, parent_window=None,**keyword_args):
125 124
126 """Create a new TuxScreenlet instance."""125 """Create a new TuxScreenlet instance."""
126
127 # call super (we define to use our own service here)127 # call super (we define to use our own service here)
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)
129
130 #
131
129 self.add_default_menuitems()132 self.add_default_menuitems()
130 self.scale=.5133 self.scale=.5
131 # set default theme for this Screenlet (causes redraw)134 # set default theme for this Screenlet (causes redraw)
@@ -169,6 +172,8 @@
169172
170 def init_buffers (self):173 def init_buffers (self):
171 """(Re-)Create back-/foreground buffers"""174 """(Re-)Create back-/foreground buffers"""
175 if self.window is None or self.window.window is None:
176 return
172 self.__buffer_back = gtk.gdk.Pixmap(self.window.window, 177 self.__buffer_back = gtk.gdk.Pixmap(self.window.window,
173 int(self.width * self.scale), int(self.height * self.scale), -1)178 int(self.width * self.scale), int(self.height * self.scale), -1)
174 self.__buffer_fore = gtk.gdk.Pixmap(self.window.window, 179 self.__buffer_fore = gtk.gdk.Pixmap(self.window.window,
175180
=== modified file 'src/Twitter/TwitterScreenlet.py'
--- src/Twitter/TwitterScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/Twitter/TwitterScreenlet.py 2016-10-27 10:34:32 +0000
@@ -94,7 +94,7 @@
94 __name__ = 'TwitterScreenlet'94 __name__ = 'TwitterScreenlet'
95 __version__ = '0.9.8+++'95 __version__ = '0.9.8+++'
96 __author__ = 'Guido Tabbernuk <boamaod@gmail.com>'96 __author__ = 'Guido Tabbernuk <boamaod@gmail.com>'
97 __requires__ = ['python-twitter (>= 0.8~)', 'python-oauth2']97 __requires__ = ['python-twitter (>= 0.8~)', 'python-oauth2client']
98 __desc__ = __doc__ # set description to docstring of class98 __desc__ = __doc__ # set description to docstring of class
9999
100 __timeout = None100 __timeout = None
101101
=== modified file 'src/VolumeControl/VolumeControlScreenlet.py'
--- src/VolumeControl/VolumeControlScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/VolumeControl/VolumeControlScreenlet.py 2016-10-27 10:34:32 +0000
@@ -51,6 +51,7 @@
51 __name__ = 'VolumeControlScreenlet'51 __name__ = 'VolumeControlScreenlet'
52 __version__ = '0.1.9+++'52 __version__ = '0.1.9+++'
53 __author__ = 'DeathCarrot'53 __author__ = 'DeathCarrot'
54 __requires__ = ['python-rsvg']
54 __desc__ = _('A basic screenlet for controlling the volume.'55 __desc__ = _('A basic screenlet for controlling the volume.'
55 'Use the mousewheel to raise and lower the volume,'56 'Use the mousewheel to raise and lower the volume,'
56 'middle click to activate/deactivate mute or '57 'middle click to activate/deactivate mute or '
@@ -115,7 +116,7 @@
115 self.add_option(StringOption(_('Device'), 'control', _('Master'), _('Control'), 116 self.add_option(StringOption(_('Device'), 'control', _('Master'), _('Control'),
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)
117 self.add_option(IntOption(_('Device'), 'step', 2, _('Scroll Step'),118 self.add_option(IntOption(_('Device'), 'step', 2, _('Scroll Step'),
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))
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')))
120121
121 def on_control_update(self, option, option2):122 def on_control_update(self, option, option2):
@@ -124,6 +125,7 @@
124 if line[22:]==self.cardName: 125 if line[22:]==self.cardName:
125 self.cardNo=line[1:2]126 self.cardNo=line[1:2]
126 # find the maximum volume and update127 # find the maximum volume and update
128 print "amixer dbg: %s, %s" %(self.cardNo, self.control)
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)))
128 print _("Max vol: ") + str(self.__maxVol) + "; "+self.control130 print _("Max vol: ") + str(self.__maxVol) + "; "+self.control
129 self.updateBar()131 self.updateBar()
130132
=== modified file 'src/WallpaperClock/WallpaperClockScreenlet.py'
--- src/WallpaperClock/WallpaperClockScreenlet.py 2012-03-24 22:35:36 +0000
+++ src/WallpaperClock/WallpaperClockScreenlet.py 2016-10-27 10:34:32 +0000
@@ -34,9 +34,7 @@
34try:34try:
35 import Image35 import Image
36except:36except:
37 import sys37 print "Couldn't import python-imaging."
38 screenlets.show_error(None, _("Please install the python image module"))
39 sys.exit()
4038
41import gtk39import gtk
42import gobject40import gobject
4341
=== modified file 'src/Weather/WeatherScreenlet.py'
--- src/Weather/WeatherScreenlet.py 2012-08-21 19:19:51 +0000
+++ src/Weather/WeatherScreenlet.py 2016-10-27 10:34:32 +0000
@@ -20,7 +20,12 @@
20from urllib import urlopen20from urllib import urlopen
21import screenlets21import screenlets
22from screenlets.options import StringOption, BoolOption22from screenlets.options import StringOption, BoolOption
23from numpy import *23
24try:
25 from numpy import *
26except:
27 print "Couldn't import numpy."
28
24import pygtk29import pygtk
25pygtk.require('2.0')30pygtk.require('2.0')
26import cairo31import cairo
@@ -52,7 +57,7 @@
52 __version__ = '0.5.3'57 __version__ = '0.5.3'
53 __author__ = 'by Helder Fraga (Whise), robgig1088, and blackhawk'58 __author__ = 'by Helder Fraga (Whise), robgig1088, and blackhawk'
54 __category__ = 'Weather'59 __category__ = 'Weather'
55 __requires__ = ['python-numpy']60 __requires__ = ['python-numpy', 'python-rsvg']
56 __desc__ = __doc__61 __desc__ = __doc__
5762
58 # internals63 # internals
@@ -157,7 +162,7 @@
157162
158 forecast = []163 forecast = []
159 try:164 try:
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()
161166
162 dcstart = data.find('<loc ')167 dcstart = data.find('<loc ')
163 dcstop = data.find('</cc>') ###### current conditions168 dcstop = data.find('</cc>') ###### current conditions
@@ -183,7 +188,7 @@
183188
184 hforecast = []189 hforecast = []
185 try:190 try:
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()
187 for x in range(8):192 for x in range(8):
188 dcstart = data.find('<hour h=\"'+str(x))193 dcstart = data.find('<hour h=\"'+str(x))
189 dcstop = data.find('</hour>',dcstart) ####hourly forecast194 dcstop = data.find('</hour>',dcstart) ####hourly forecast
@@ -417,7 +422,7 @@
417 p_fdesc.set_weight(300) ##### render the days of the week422 p_fdesc.set_weight(300) ##### render the days of the week
418 p_fdesc.set_style(pango.STYLE_NORMAL)423 p_fdesc.set_style(pango.STYLE_NORMAL)
419 self.p_layout.set_font_description(p_fdesc)424 self.p_layout.set_font_description(p_fdesc)
420 ctx.translate(10,-13)425 ctx.translate(-80,-13)
421 self.p_layout.set_markup('<b>' +weather[1]["day"][:3] + '</b>')426 self.p_layout.set_markup('<b>' +weather[1]["day"][:3] + '</b>')
422 ctx.show_layout(self.p_layout)427 ctx.show_layout(self.p_layout)
423 ctx.translate(37, 0)428 ctx.translate(37, 0)
@@ -464,7 +469,8 @@
464 469
465 if self.show_daytemp == True:470 if self.show_daytemp == True:
466 ctx.save()471 ctx.save()
467 ctx.translate(18,97)472 #ctx.translate(18,97)
473 ctx.translate(-70,97)
468 self.p_layout.set_markup('<b>' + weather[1]["high"]+degree+'</b>')474 self.p_layout.set_markup('<b>' + weather[1]["high"]+degree+'</b>')
469 ctx.show_layout(self.p_layout)475 ctx.show_layout(self.p_layout)
470 ctx.translate(0,12)476 ctx.translate(0,12)
@@ -501,9 +507,9 @@
501 ctx.restore()507 ctx.restore()
502 ctx.save()508 ctx.save()
503 509
504 def on_mouse_down(self,event):510 def on_mouse_up(self,event):
505 if event.button == 1:511 if event.button == 1:
506 os.system('xdg-open weather.com')512 os.system('xdg-open http://weather.com')
507 #x = event.x / self.scale513 #x = event.x / self.scale
508 #y = event.y / self.scale514 #y = event.y / self.scale
509 #if y >= 75 and x <= 132 and x >= 110:515 #if y >= 75 and x <= 132 and x >= 110:
510516
=== modified file 'src/WidescapeWeather/WidescapeWeatherScreenlet.py'
--- src/WidescapeWeather/WidescapeWeatherScreenlet.py 2012-04-04 15:31:57 +0000
+++ src/WidescapeWeather/WidescapeWeatherScreenlet.py 2016-10-27 10:34:32 +0000
@@ -403,7 +403,7 @@
403 unit = 'm'403 unit = 'm'
404 else:404 else:
405 unit = 's'405 unit = 's'
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()
407 forecast = []407 forecast = []
408408
409 dcstart = data.find('<loc ')409 dcstart = data.find('<loc ')
410410
=== modified file 'src/WorldClock/WorldClockScreenlet.py'
--- src/WorldClock/WorldClockScreenlet.py 2012-03-24 22:35:36 +0000
+++ src/WorldClock/WorldClockScreenlet.py 2016-10-27 10:34:32 +0000
@@ -63,10 +63,16 @@
63from datetime import datetime63from datetime import datetime
64import gobject64import gobject
6565
66# jsf additional imports needed for tzinfo support
67from datetime import *66from datetime import *
68from dateutil.tz import *67
69from dateutil import zoneinfo68try:
69 # jsf additional imports needed for tzinfo support
70 from dateutil.tz import *
71 from dateutil import zoneinfo
72except:
73 print "Couldn't import dateutil."
74
75
70import os76import os
71# use gettext for translation77# use gettext for translation
72import gettext78import gettext
@@ -142,6 +148,7 @@
142 __author__ = 'jsf (aka Joe Forbes)'148 __author__ = 'jsf (aka Joe Forbes)'
143 __category__ = 'Date and time'149 __category__ = 'Date and time'
144 __desc__ = __doc__150 __desc__ = __doc__
151 __requires__ = [ 'python-dateutil', 'python-rsvg' ]
145 152
146 # internal vars153 # internal vars
147 __timeout = None154 __timeout = None
148155
=== modified file 'src/dayNight/dayNightScreenlet.py'
--- src/dayNight/dayNightScreenlet.py 2012-01-27 21:52:49 +0000
+++ src/dayNight/dayNightScreenlet.py 2016-10-27 10:34:32 +0000
@@ -32,7 +32,12 @@
32import pango32import pango
33import math33import math
34import os34import os
35import Image35
36try:
37 import Image
38except:
39 print "Couldn't import python-imaging."
40
36import time41import time
37import datetime42import datetime
38import Sun43import Sun

Subscribers

People subscribed via source and target branches