Merge lp:~chrisccoulson/screenlets/webkit-port into lp:screenlets
- webkit-port
- Merge into trunk
Proposed by
Chris Coulson
Status: | Merged |
---|---|
Merge reported by: | Märt Põder |
Merged at revision: | not available |
Proposed branch: | lp:~chrisccoulson/screenlets/webkit-port |
Merge into: | lp:screenlets |
Diff against target: |
280 lines (+23/-127) 5 files modified
debian/control (+1/-1) setup.py (+0/-1) src/share/screenlets-manager/WebappScreenlet.py (+9/-60) src/share/screenlets-manager/WidgetScreenlet.py (+13/-63) src/share/screenlets-manager/screenlets-manager.py (+0/-2) |
To merge this branch: | bzr merge lp:~chrisccoulson/screenlets/webkit-port |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Märt Põder | Approve | ||
Review via email: mp+63787@code.launchpad.net |
Commit message
Description of the change
Hi,
We're planning to drop xulrunner from Ubuntu in Oneiric, and Mozilla have dropped support for GtkMozEmbed anyway. Here is a first cut at porting the gtkmozembed parts of screenlets to webkit
(see https:/
To post a comment you must log in.
- 679. By Chris Coulson
-
import webkit in a try/except clause, as python-webkit is only a recommend
Revision history for this message
Märt Põder (boamaod) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/control' | |||
2 | --- debian/control 2011-04-25 12:40:42 +0000 | |||
3 | +++ debian/control 2011-06-08 20:36:52 +0000 | |||
4 | @@ -28,7 +28,7 @@ | |||
5 | 28 | python-xdg, | 28 | python-xdg, |
6 | 29 | python-gconf, | 29 | python-gconf, |
7 | 30 | python-beautifulsoup, | 30 | python-beautifulsoup, |
9 | 31 | Recommends: python-gtkmozembed | python-gnome2-extras (<< 2.19), | 31 | Recommends: python-webkit, |
10 | 32 | python-evolution | python-gnome2-desktop, | 32 | python-evolution | python-gnome2-desktop, |
11 | 33 | python-rsvg | python-gnome2-desktop, | 33 | python-rsvg | python-gnome2-desktop, |
12 | 34 | metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2) | mutter, | 34 | metacity (>= 2.21.4) | xcompmgr | compiz | xfwm4 (>= 4.2) | mutter, |
13 | 35 | 35 | ||
14 | === modified file 'setup.py' | |||
15 | --- setup.py 2011-03-26 19:27:07 +0000 | |||
16 | +++ setup.py 2011-06-08 20:36:52 +0000 | |||
17 | @@ -81,7 +81,6 @@ | |||
18 | 81 | 'src/share/screenlets-manager/KarambaScreenlet.py', | 81 | 'src/share/screenlets-manager/KarambaScreenlet.py', |
19 | 82 | 'src/share/screenlets-manager/widget.png', | 82 | 'src/share/screenlets-manager/widget.png', |
20 | 83 | 'src/share/screenlets-manager/WidgetScreenlet.py', | 83 | 'src/share/screenlets-manager/WidgetScreenlet.py', |
21 | 84 | 'src/share/screenlets-manager/prefs.js', | ||
22 | 85 | 'src/share/screenlets-manager/webapp.png', | 84 | 'src/share/screenlets-manager/webapp.png', |
23 | 86 | 'src/share/screenlets-manager/WebappScreenlet.py', | 85 | 'src/share/screenlets-manager/WebappScreenlet.py', |
24 | 87 | 'src/share/screenlets-manager/karamba.png'])) | 86 | 'src/share/screenlets-manager/karamba.png'])) |
25 | 88 | 87 | ||
26 | === modified file 'src/share/screenlets-manager/WebappScreenlet.py' | |||
27 | --- src/share/screenlets-manager/WebappScreenlet.py 2008-04-10 15:10:23 +0000 | |||
28 | +++ src/share/screenlets-manager/WebappScreenlet.py 2011-06-08 20:36:52 +0000 | |||
29 | @@ -22,59 +22,13 @@ | |||
30 | 22 | import os | 22 | import os |
31 | 23 | from screenlets import sensors | 23 | from screenlets import sensors |
32 | 24 | 24 | ||
33 | 25 | #########WORKARROUND FOR GTKOZEMBED BUG BY WHISE################ | ||
34 | 26 | myfile = 'WebappScreenlet.py' | 25 | myfile = 'WebappScreenlet.py' |
78 | 27 | mypath = sys.argv[0][:sys.argv[0].find('myfile')].strip() | 26 | |
36 | 28 | |||
37 | 29 | if sys.argv[0].endswith(myfile): # Makes Shure its not the manager running... | ||
38 | 30 | # First workarround | ||
39 | 31 | c = None | ||
40 | 32 | workarround = "python "+ sys.argv[0] + " &" | ||
41 | 33 | a = str(commands.getoutput('whereis firefox')).replace('firefox: ','').split(' ') | ||
42 | 34 | for b in a: | ||
43 | 35 | if os.path.isfile(b + '/run-mozilla.sh'): | ||
44 | 36 | c = b + '/run-mozilla.sh' | ||
45 | 37 | workarround = c + " " + sys.argv[0] + " &" | ||
46 | 38 | |||
47 | 39 | if c == None: | ||
48 | 40 | # Second workarround | ||
49 | 41 | print 'First workarround didnt work let run a second manual workarround' | ||
50 | 42 | if str(sensors.sys_get_distrib_name()).lower().find('ubuntu') != -1: # Works for ubuntu 32 | ||
51 | 43 | workarround = "export LD_LIBRARY_PATH=/usr/lib/firefox \n export MOZILLA_FIVE_HOME=/usr/lib/firefox \n python "+ sys.argv[0] + " &" | ||
52 | 44 | elif str(sensors.sys_get_distrib_name()).lower().find('debian') != -1: # Works for debian 32 with iceweasel installed | ||
53 | 45 | workarround = "export LD_LIBRARY_PATH=/usr/lib/iceweasel \n export MOZILLA_FIVE_HOME=/usr/lib/iceweasel \n python " + sys.argv[0] + " &" | ||
54 | 46 | elif str(sensors.sys_get_distrib_name()).lower().find('suse') != -1: # Works for suse 32 with seamonkey installed | ||
55 | 47 | workarround = "export LD_LIBRARY_PATH=/usr/lib/seamonkey \n export MOZILLA_FIVE_HOME=/usr/lib/seamonkey \n python "+ sys.argv[0] + " &" | ||
56 | 48 | print 'Your running suse , make shure you have seamonkey installed' | ||
57 | 49 | elif str(sensors.sys_get_distrib_name()).lower().find('fedora') != -1: # Works for fedora 32 with seamonkey installed | ||
58 | 50 | workarround = "export LD_LIBRARY_PATH=/usr/lib/seamonkey \n export MOZILLA_FIVE_HOME=/usr/lib/seamonkey \n python "+ sys.argv[0] + " &" | ||
59 | 51 | print 'Your running fedora , make shure you have seamonkey installed' | ||
60 | 52 | |||
61 | 53 | |||
62 | 54 | if os.path.isfile("/tmp/"+ myfile+"running"): | ||
63 | 55 | os.system("rm -f " + "/tmp/"+ myfile+"running") | ||
64 | 56 | |||
65 | 57 | else: | ||
66 | 58 | if workarround == "python "+ sys.argv[0] + " &": | ||
67 | 59 | print 'No workarround will be applied to your sistem , this screenlet will probably not work properly' | ||
68 | 60 | os.system (workarround) | ||
69 | 61 | fileObj = open("/tmp/"+ myfile+"running","w") #// open for for write | ||
70 | 62 | fileObj.write('gtkmozembed bug workarround') | ||
71 | 63 | |||
72 | 64 | fileObj.close() | ||
73 | 65 | sys.exit() | ||
74 | 66 | |||
75 | 67 | |||
76 | 68 | else: | ||
77 | 69 | pass | ||
79 | 70 | try: | 27 | try: |
81 | 71 | import gtkmozembed | 28 | import webkit |
82 | 72 | except: | 29 | except: |
88 | 73 | if sys.argv[0].endswith(myfile):screenlets.show_error(None,"You need Gtkmozembed to run this Screenlet , please install it") | 30 | if sys.argv[0].endswith(myfile):screenlets.show_error(None,"You need WebKit to run this Screenlet , please install it") |
89 | 74 | else: print "You need Gtkmozembed to run this Screenlet , please install it" | 31 | else: print "You need WebKit to run this Screenlet , please install it" |
85 | 75 | #########WORKARROUND FOR GTKOZEMBED BUG BY WHISE################ | ||
86 | 76 | |||
87 | 77 | |||
90 | 78 | 32 | ||
91 | 79 | class WebappScreenlet (screenlets.Screenlet): | 33 | class WebappScreenlet (screenlets.Screenlet): |
92 | 80 | """Brings Web applications to your desktop""" | 34 | """Brings Web applications to your desktop""" |
93 | @@ -93,21 +47,16 @@ | |||
94 | 93 | screenlets.Screenlet.__init__(self, width=325, height=370,uses_theme=True, | 47 | screenlets.Screenlet.__init__(self, width=325, height=370,uses_theme=True, |
95 | 94 | is_widget=False, is_sticky=True,draw_buttons=False, **keyword_args) | 48 | is_widget=False, is_sticky=True,draw_buttons=False, **keyword_args) |
96 | 95 | 49 | ||
103 | 96 | if hasattr(gtkmozembed, 'set_profile_path'): | 50 | self.view = webkit.WebView() |
98 | 97 | gtkmozembed.set_profile_path(self.mypath,'mozilla') | ||
99 | 98 | else: | ||
100 | 99 | gtkmozembed.gtk_moz_embed_set_profile_path(self.mypath ,'mozilla') | ||
101 | 100 | |||
102 | 101 | self.moz = gtkmozembed.MozEmbed() | ||
104 | 102 | self.win = gtk.Window() | 51 | self.win = gtk.Window() |
105 | 103 | 52 | ||
106 | 104 | #self.win.maximize() | 53 | #self.win.maximize() |
108 | 105 | self.win.add(self.moz) | 54 | self.win.add(self.view) |
109 | 106 | 55 | ||
111 | 107 | self.moz.load_url(self.url) | 56 | self.view.load_uri(self.url) |
112 | 108 | self.win.connect('destroy',self.quitall) | 57 | self.win.connect('destroy',self.quitall) |
113 | 109 | self.win.connect("configure-event", self.configure) | 58 | self.win.connect("configure-event", self.configure) |
115 | 110 | self.moz.connect("title",self.update) | 59 | self.view.connect("notify::title",self.update) |
116 | 111 | 60 | ||
117 | 112 | 61 | ||
118 | 113 | def configure (self, widget, event): | 62 | def configure (self, widget, event): |
119 | @@ -133,7 +82,7 @@ | |||
120 | 133 | 82 | ||
121 | 134 | def update(self,widget): | 83 | def update(self,widget): |
122 | 135 | 84 | ||
124 | 136 | title = self.moz.get_title() | 85 | title = self.view.get_title() |
125 | 137 | self.win.set_title(title) | 86 | self.win.set_title(title) |
126 | 138 | def quitall(self,widget): | 87 | def quitall(self,widget): |
127 | 139 | if len(self.session.instances) > 1: | 88 | if len(self.session.instances) > 1: |
128 | 140 | 89 | ||
129 | === modified file 'src/share/screenlets-manager/WidgetScreenlet.py' | |||
130 | --- src/share/screenlets-manager/WidgetScreenlet.py 2008-05-25 13:40:09 +0000 | |||
131 | +++ src/share/screenlets-manager/WidgetScreenlet.py 2011-06-08 20:36:52 +0000 | |||
132 | @@ -22,60 +22,14 @@ | |||
133 | 22 | import os | 22 | import os |
134 | 23 | from screenlets import sensors | 23 | from screenlets import sensors |
135 | 24 | 24 | ||
136 | 25 | |||
137 | 26 | |||
138 | 27 | #########WORKARROUND FOR GTKOZEMBED BUG BY WHISE################ | ||
139 | 28 | myfile = 'WidgetScreenlet.py' | 25 | myfile = 'WidgetScreenlet.py' |
184 | 29 | mypath = sys.argv[0][:sys.argv[0].find(myfile)].strip() | 26 | |
141 | 30 | |||
142 | 31 | if sys.argv[0].endswith(myfile): # Makes Shure its not the manager running... | ||
143 | 32 | # First workarround | ||
144 | 33 | c = None | ||
145 | 34 | workarround = "python "+ sys.argv[0] + " &" | ||
146 | 35 | a = str(commands.getoutput('whereis firefox')).replace('firefox: ','').split(' ') | ||
147 | 36 | for b in a: | ||
148 | 37 | if os.path.isfile(b + '/run-mozilla.sh'): | ||
149 | 38 | c = b + '/run-mozilla.sh' | ||
150 | 39 | workarround = c + " " + sys.argv[0] + " &" | ||
151 | 40 | |||
152 | 41 | |||
153 | 42 | if c == None: | ||
154 | 43 | # Second workarround | ||
155 | 44 | print 'First workarround didnt work let run a second manual workarround' | ||
156 | 45 | if str(sensors.sys_get_distrib_name()).lower().find('ubuntu') != -1: # Works for ubuntu 32 | ||
157 | 46 | workarround = "export LD_LIBRARY_PATH=/usr/lib/firefox \n export MOZILLA_FIVE_HOME=/usr/lib/firefox \n python "+ sys.argv[0] + " &" | ||
158 | 47 | elif str(sensors.sys_get_distrib_name()).lower().find('debian') != -1: # Works for debian 32 with iceweasel installed | ||
159 | 48 | workarround = "export LD_LIBRARY_PATH=/usr/lib/iceweasel \n export MOZILLA_FIVE_HOME=/usr/lib/iceweasel \n python " + sys.argv[0] + " &" | ||
160 | 49 | elif str(sensors.sys_get_distrib_name()).lower().find('suse') != -1: # Works for suse 32 with seamonkey installed | ||
161 | 50 | workarround = "export LD_LIBRARY_PATH=/usr/lib/seamonkey \n export MOZILLA_FIVE_HOME=/usr/lib/seamonkey \n python "+ sys.argv[0] + " &" | ||
162 | 51 | print 'Your running suse , make shure you have seamonkey installed' | ||
163 | 52 | elif str(sensors.sys_get_distrib_name()).lower().find('fedora') != -1: # Works for fedora 32 with seamonkey installed | ||
164 | 53 | workarround = "export LD_LIBRARY_PATH=/usr/lib/seamonkey \n export MOZILLA_FIVE_HOME=/usr/lib/seamonkey \n python "+ sys.argv[0] + " &" | ||
165 | 54 | print 'Your running fedora , make shure you have seamonkey installed' | ||
166 | 55 | |||
167 | 56 | |||
168 | 57 | if os.path.isfile("/tmp/"+ myfile+"running"): | ||
169 | 58 | os.system("rm -f " + "/tmp/"+ myfile+"running") | ||
170 | 59 | |||
171 | 60 | else: | ||
172 | 61 | if workarround == "python "+ sys.argv[0] + " &": | ||
173 | 62 | print 'No workarround will be applied to your sistem , this screenlet will probably not work properly' | ||
174 | 63 | os.system (workarround) | ||
175 | 64 | fileObj = open("/tmp/"+ myfile+"running","w") #// open for for write | ||
176 | 65 | fileObj.write('gtkmozembed bug workarround') | ||
177 | 66 | |||
178 | 67 | fileObj.close() | ||
179 | 68 | sys.exit() | ||
180 | 69 | |||
181 | 70 | |||
182 | 71 | else: | ||
183 | 72 | pass | ||
185 | 73 | try: | 27 | try: |
187 | 74 | import gtkmozembed | 28 | import webkit |
188 | 75 | except: | 29 | except: |
192 | 76 | if sys.argv[0].endswith(myfile):screenlets.show_error(None,"You need Gtkmozembed to run this Screenlet , please install it") | 30 | if sys.argv[0].endswith(myfile):screenlets.show_error(None,"You need WebKit to run this Screenlet , please install it") |
193 | 77 | else: print "You need Gtkmozembed to run this Screenlet , please install it" | 31 | else: print "You need WebKit to run this Screenlet , please install it" |
194 | 78 | #########WORKARROUND FOR GTKOZEMBED BUG BY WHISE################ | 32 | |
195 | 79 | #Check for internet connection required for web widgets | 33 | #Check for internet connection required for web widgets |
196 | 80 | 34 | ||
197 | 81 | if sys.argv[0].endswith(myfile):# Makes Shure its not the manager running... | 35 | if sys.argv[0].endswith(myfile):# Makes Shure its not the manager running... |
198 | @@ -97,7 +51,7 @@ | |||
199 | 97 | __desc__ = __doc__ | 51 | __desc__ = __doc__ |
200 | 98 | 52 | ||
201 | 99 | started = False | 53 | started = False |
203 | 100 | moz = None | 54 | view = None |
204 | 101 | box = None | 55 | box = None |
205 | 102 | mypath = sys.argv[0][:sys.argv[0].find('WidgetScreenlet.py')].strip() | 56 | mypath = sys.argv[0][:sys.argv[0].find('WidgetScreenlet.py')].strip() |
206 | 103 | url = mypath + 'index.html' | 57 | url = mypath + 'index.html' |
207 | @@ -130,12 +84,8 @@ | |||
208 | 130 | self.disable_option('scale') | 84 | self.disable_option('scale') |
209 | 131 | self.theme_name = 'default' | 85 | self.theme_name = 'default' |
210 | 132 | self.box = gtk.VBox(False, 0) | 86 | self.box = gtk.VBox(False, 0) |
217 | 133 | if hasattr(gtkmozembed, 'set_profile_path'): | 87 | self.view = webkit.WebView() |
218 | 134 | gtkmozembed.set_profile_path(self.mypath,'mozilla') | 88 | self.box.pack_start(self.view, False, False, 0) |
213 | 135 | else: | ||
214 | 136 | gtkmozembed.gtk_moz_embed_set_profile_path(self.mypath ,'mozilla') | ||
215 | 137 | self.moz = gtkmozembed.MozEmbed() | ||
216 | 138 | self.box.pack_start(self.moz, False, False, 0) | ||
219 | 139 | 89 | ||
220 | 140 | self.window.add(self.box) | 90 | self.window.add(self.box) |
221 | 141 | 91 | ||
222 | @@ -202,7 +152,7 @@ | |||
223 | 202 | #ctx.translate(0,10) | 152 | #ctx.translate(0,10) |
224 | 203 | self.draw_scaled_image(ctx,0,0,self.width,self.height,self.mypath + 'icon.png') | 153 | self.draw_scaled_image(ctx,0,0,self.width,self.height,self.mypath + 'icon.png') |
225 | 204 | 154 | ||
227 | 205 | self.moz.shape_combine_mask(self.bgpbms,0,0) | 155 | self.view.shape_combine_mask(self.bgpbms,0,0) |
228 | 206 | else: | 156 | else: |
229 | 207 | self.bgpb = gtk.gdk.pixbuf_new_from_file(self.mypath + 'icon.png').scale_simple(int(self.widget_width),int(self.widget_height),gtk.gdk.INTERP_HYPER) | 157 | self.bgpb = gtk.gdk.pixbuf_new_from_file(self.mypath + 'icon.png').scale_simple(int(self.widget_width),int(self.widget_height),gtk.gdk.INTERP_HYPER) |
230 | 208 | self.bgpbim, self.bgpbms = self.bgpb.render_pixmap_and_mask(alpha_threshold=128) | 158 | self.bgpbim, self.bgpbms = self.bgpb.render_pixmap_and_mask(alpha_threshold=128) |
231 | @@ -211,7 +161,7 @@ | |||
232 | 211 | ctx.translate(0,10) | 161 | ctx.translate(0,10) |
233 | 212 | self.draw_image(ctx,0,0,self.mypath + 'icon.png') | 162 | self.draw_image(ctx,0,0,self.mypath + 'icon.png') |
234 | 213 | 163 | ||
236 | 214 | self.moz.shape_combine_mask(self.bgpbms,8,8) | 164 | self.view.shape_combine_mask(self.bgpbms,8,8) |
237 | 215 | 165 | ||
238 | 216 | 166 | ||
239 | 217 | 167 | ||
240 | @@ -276,7 +226,7 @@ | |||
241 | 276 | self.url = self.widget_info[13:][:(len(self.widget_info)-24)] | 226 | self.url = self.widget_info[13:][:(len(self.widget_info)-24)] |
242 | 277 | 227 | ||
243 | 278 | self.engine = 'google' | 228 | self.engine = 'google' |
245 | 279 | self.moz.load_url(self.url) | 229 | self.view.load_uri(self.url) |
246 | 280 | print 'loading ' + self.url | 230 | print 'loading ' + self.url |
247 | 281 | 231 | ||
248 | 282 | self.width = int(self.widget_width)+30 | 232 | self.width = int(self.widget_width)+30 |
249 | @@ -291,9 +241,9 @@ | |||
250 | 291 | 241 | ||
251 | 292 | self.box.set_uposition(-1,7) | 242 | self.box.set_uposition(-1,7) |
252 | 293 | 243 | ||
254 | 294 | self.moz.set_size_request(-1,int(self.widget_height)) | 244 | self.view.set_size_request(-1,int(self.widget_height)) |
255 | 295 | else: | 245 | else: |
257 | 296 | self.moz.set_size_request(-1,int(self.height)) | 246 | self.view.set_size_request(-1,int(self.height)) |
258 | 297 | self.redraw_canvas() | 247 | self.redraw_canvas() |
259 | 298 | 248 | ||
260 | 299 | def on_mouse_down(self,event): | 249 | def on_mouse_down(self,event): |
261 | 300 | 250 | ||
262 | === modified file 'src/share/screenlets-manager/screenlets-manager.py' | |||
263 | --- src/share/screenlets-manager/screenlets-manager.py 2011-04-24 20:51:36 +0000 | |||
264 | +++ src/share/screenlets-manager/screenlets-manager.py 2011-06-08 20:36:52 +0000 | |||
265 | @@ -1060,7 +1060,6 @@ | |||
266 | 1060 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/WebappScreenlet.py ' +DIR_USER + '/' + a + '/' + a + 'Screenlet.py') | 1060 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/WebappScreenlet.py ' +DIR_USER + '/' + a + '/' + a + 'Screenlet.py') |
267 | 1061 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/webapp.png ' +DIR_USER + '/' + a + '/icon.png') | 1061 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/webapp.png ' +DIR_USER + '/' + a + '/icon.png') |
268 | 1062 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/webapp.png ' +DIR_USER + '/' + a + '/themes/default') | 1062 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/webapp.png ' +DIR_USER + '/' + a + '/themes/default') |
269 | 1063 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/prefs.js ' +DIR_USER + '/' + a + '/mozilla') | ||
270 | 1064 | 1063 | ||
271 | 1065 | enginecopy = open(DIR_USER + '/' + a + '/' + a + 'Screenlet.py','r') | 1064 | enginecopy = open(DIR_USER + '/' + a + '/' + a + 'Screenlet.py','r') |
272 | 1066 | enginesave = enginecopy.read() | 1065 | enginesave = enginecopy.read() |
273 | @@ -1147,7 +1146,6 @@ | |||
274 | 1147 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/WidgetScreenlet.py ' +DIR_USER + '/' + a + '/' + a + 'Screenlet.py') | 1146 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/WidgetScreenlet.py ' +DIR_USER + '/' + a + '/' + a + 'Screenlet.py') |
275 | 1148 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/widget.png ' +DIR_USER + '/' + a + '/icon.png') | 1147 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/widget.png ' +DIR_USER + '/' + a + '/icon.png') |
276 | 1149 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/widget.png ' +DIR_USER + '/' + a + '/themes/default') | 1148 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/widget.png ' +DIR_USER + '/' + a + '/themes/default') |
277 | 1150 | os.system('cp ' + screenlets.INSTALL_PREFIX + '/share/screenlets-manager/prefs.js ' +DIR_USER + '/' + a + '/mozilla') | ||
278 | 1151 | enginecopy = open(DIR_USER + '/' + a + '/' + a + 'Screenlet.py','r') | 1149 | enginecopy = open(DIR_USER + '/' + a + '/' + a + 'Screenlet.py','r') |
279 | 1152 | enginesave = enginecopy.read() | 1150 | enginesave = enginecopy.read() |
280 | 1153 | enginesave = enginesave.replace('WidgetScreenlet',a + 'Screenlet') | 1151 | enginesave = enginesave.replace('WidgetScreenlet',a + 'Screenlet') |