Merge lp://qastaging/~alexlauni/do-plugins/xrandr into lp://qastaging/~johannes-rudolph/do-plugins/xrandr-plugin

Proposed by Alex Launi
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~alexlauni/do-plugins/xrandr
Merge into: lp://qastaging/~johannes-rudolph/do-plugins/xrandr-plugin
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~alexlauni/do-plugins/xrandr
Reviewer Review Type Date Requested Status
Johannes Rudolph Approve
Do Plugins Team Pending
Review via email: mp+7970@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Alex Launi (alexlauni) wrote :

Brings branch up to speed with trunk and fixes a couple of formatting issues.

Revision history for this message
Johannes Rudolph (johannes-rudolph) wrote :

Thx for bringing the branch up to the current version again. I merged it.

review: Approve
548. By Johannes Rudolph

merge upstream changes and alex' format improvements

549. By Johannes Rudolph

xrandr-plugin: resurrected XRandR.addin.xml, which got lost while merging

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Alias/Alias.mdp'
2--- Alias/Alias.mdp 2009-01-09 07:03:47 +0000
3+++ Alias/Alias.mdp 2009-06-23 00:52:54 +0000
4@@ -1,4 +1,4 @@
5-<Project name="Alias" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
6+<Project name="Alias" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
7 <Configurations active="Debug">
8 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
9 <Output directory="bin/Debug" assembly="Alias" />
10@@ -23,9 +23,8 @@
11 <References>
12 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
13 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
14- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
15- <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
16- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
17+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
18+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
19+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
20 </References>
21- <GtkDesignInfo />
22 </Project>
23\ No newline at end of file
24
25=== modified file 'Alias/Makefile.am'
26--- Alias/Makefile.am 2009-01-09 05:04:13 +0000
27+++ Alias/Makefile.am 2009-06-22 04:05:16 +0000
28@@ -14,6 +14,5 @@
29 REFERENCES = \
30 System \
31 System.Core \
32- Mono.Posix \
33 $(DO_PLATFORM_LIBS) \
34 $(DO_UNIVERSE_LIBS)
35
36=== removed file 'Alias/Resources/Alias.addin.xml'
37--- Alias/Resources/Alias.addin.xml 2008-12-31 23:43:46 +0000
38+++ Alias/Resources/Alias.addin.xml 1970-01-01 00:00:00 +0000
39@@ -1,26 +0,0 @@
40-<Addin
41- id="Alias"
42- namespace="Do"
43- version="1.0"
44- name="Alias"
45- description="Assign alternate names to items."
46- author="David Siegel"
47- category="Official"
48- >
49-
50- <Runtime>
51- <Import assembly="Alias.dll"/>
52- </Runtime>
53-
54- <Dependencies>
55- <Addin id="Universe" version="1.0" />
56- </Dependencies>
57-
58- <Extension path="/Do/ItemSource">
59- <ItemSource type="Alias.AliasItemSource" />
60- </Extension>
61- <Extension path="/Do/Action">
62- <Action type="Alias.AliasAction" />
63- <Action type="Alias.DeleteAliasAction" />
64- </Extension>
65-</Addin>
66
67=== added file 'Alias/Resources/Alias.addin.xml.in'
68--- Alias/Resources/Alias.addin.xml.in 1970-01-01 00:00:00 +0000
69+++ Alias/Resources/Alias.addin.xml.in 2009-06-22 21:50:13 +0000
70@@ -0,0 +1,29 @@
71+<Addin
72+ id="Alias"
73+ namespace="Do"
74+ version="1.0"
75+ name="Alias"
76+ description="Assign alternate names to items."
77+ author="David Siegel"
78+ category="Official"
79+ defaultEnabled="false"
80+ >
81+
82+ <Runtime>
83+ <Import assembly="Alias.dll"/>
84+ </Runtime>
85+
86+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
87+
88+ <Dependencies>
89+ <Addin id="Universe" version="1.0" />
90+ </Dependencies>
91+
92+ <Extension path="/Do/ItemSource">
93+ <ItemSource type="Alias.AliasItemSource" />
94+ </Extension>
95+ <Extension path="/Do/Action">
96+ <Action type="Alias.AliasAction" />
97+ <Action type="Alias.DeleteAliasAction" />
98+ </Extension>
99+</Addin>
100
101=== modified file 'Alias/src/AliasAction.cs'
102--- Alias/src/AliasAction.cs 2008-12-31 23:40:35 +0000
103+++ Alias/src/AliasAction.cs 2009-06-22 04:05:16 +0000
104@@ -21,7 +21,7 @@
105 using System;
106 using System.Linq;
107 using System.Collections.Generic;
108-using Mono.Unix;
109+using Mono.Addins;
110
111 using Do.Universe;
112 using Do.Platform;
113@@ -33,11 +33,11 @@
114 {
115
116 public override string Name {
117- get { return Catalog.GetString ("Assign Alias..."); }
118+ get { return AddinManager.CurrentLocalizer.GetString ("Assign Alias..."); }
119 }
120
121 public override string Description {
122- get { return Catalog.GetString ("Give an item an alternate name."); }
123+ get { return AddinManager.CurrentLocalizer.GetString ("Give an item an alternate name."); }
124 }
125
126 public override string Icon {
127
128=== modified file 'Alias/src/AliasItemSource.cs'
129--- Alias/src/AliasItemSource.cs 2008-12-31 23:40:35 +0000
130+++ Alias/src/AliasItemSource.cs 2009-06-22 04:05:16 +0000
131@@ -25,7 +25,7 @@
132 using System.Runtime.Serialization;
133 using System.Runtime.Serialization.Formatters.Binary;
134
135-using Mono.Unix;
136+using Mono.Addins;
137
138 using Do.Universe;
139 using Do.Platform;
140@@ -49,7 +49,7 @@
141
142 public AliasItem MaybeGetItem ()
143 {
144- Item item = Services.Core.GetElement (UniqueId) as Item;
145+ Item item = Services.Core.GetItem (UniqueId) as Item;
146 return item == null ? null : new AliasItem (item, Alias);
147 }
148 }
149@@ -137,11 +137,11 @@
150 }
151
152 public override string Name {
153- get { return Catalog.GetString ("Alias items"); }
154+ get { return AddinManager.CurrentLocalizer.GetString ("Alias items"); }
155 }
156
157 public override string Description {
158- get { return Catalog.GetString ("Aliased items from Do's universe."); }
159+ get { return AddinManager.CurrentLocalizer.GetString ("Aliased items from Do's universe."); }
160 }
161
162 public override string Icon {
163
164=== modified file 'Alias/src/DeleteAliasAction.cs'
165--- Alias/src/DeleteAliasAction.cs 2008-12-31 23:40:35 +0000
166+++ Alias/src/DeleteAliasAction.cs 2009-06-22 04:05:16 +0000
167@@ -21,7 +21,7 @@
168 using System.Linq;
169 using System.Collections.Generic;
170
171-using Mono.Unix;
172+using Mono.Addins;
173
174 using Do.Universe;
175 using Do.Platform;
176@@ -31,13 +31,12 @@
177
178 class DeleteAliasAction : Act
179 {
180-
181 public override string Name {
182- get { return Catalog.GetString ("Delete Alias"); }
183+ get { return AddinManager.CurrentLocalizer.GetString ("Delete Alias"); }
184 }
185
186 public override string Description {
187- get { return Catalog.GetString ("Deletes an alias."); }
188+ get { return AddinManager.CurrentLocalizer.GetString ("Deletes an alias."); }
189 }
190
191 public override string Icon {
192
193=== modified file 'AptURL/AptURL.mdp'
194--- AptURL/AptURL.mdp 2009-01-09 07:03:47 +0000
195+++ AptURL/AptURL.mdp 2009-06-23 00:52:54 +0000
196@@ -1,4 +1,4 @@
197-<Project name="AptURL" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
198+<Project name="AptURL" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
199 <Configurations active="Debug">
200 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
201 <Output directory="bin/Debug" assembly="AptURL" />
202@@ -22,8 +22,8 @@
203 <References>
204 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
205 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
206- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
207- <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
208+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
209+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
210+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
211 </References>
212- <GtkDesignInfo />
213 </Project>
214\ No newline at end of file
215
216=== removed file 'AptURL/Resources/AptURL.addin.xml'
217--- AptURL/Resources/AptURL.addin.xml 2009-01-18 01:31:59 +0000
218+++ AptURL/Resources/AptURL.addin.xml 1970-01-01 00:00:00 +0000
219@@ -1,23 +0,0 @@
220-<Addin
221- id="AptURL"
222- namespace="Do"
223- version="1.0"
224- name="AptURL Package Installer"
225- description="Install apt packages by name."
226- author="Christer Edwards"
227- category="Community"
228- >
229-
230- <Runtime>
231- <Import assembly="AptURL.dll"/>
232- </Runtime>
233-
234- <Dependencies>
235- <Addin id="Universe" version="1.0" />
236- </Dependencies>
237-
238- <Extension path="/Do/Action">
239- <Action type="AptURL.AptAction" />
240- </Extension>
241-
242-</Addin>
243
244=== added file 'AptURL/Resources/AptURL.addin.xml.in'
245--- AptURL/Resources/AptURL.addin.xml.in 1970-01-01 00:00:00 +0000
246+++ AptURL/Resources/AptURL.addin.xml.in 2009-06-22 21:50:13 +0000
247@@ -0,0 +1,26 @@
248+<Addin
249+ id="AptURL"
250+ namespace="Do"
251+ version="1.0"
252+ name="AptURL Package Installer"
253+ description="Install apt packages by name."
254+ author="Christer Edwards"
255+ category="Community"
256+ defaultEnabled="false"
257+ >
258+
259+ <Runtime>
260+ <Import assembly="AptURL.dll"/>
261+ </Runtime>
262+
263+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
264+
265+ <Dependencies>
266+ <Addin id="Universe" version="1.0" />
267+ </Dependencies>
268+
269+ <Extension path="/Do/Action">
270+ <Action type="AptURL.AptAction" />
271+ </Extension>
272+
273+</Addin>
274
275=== modified file 'Archive/Archive.mdp'
276--- Archive/Archive.mdp 2009-01-17 23:17:09 +0000
277+++ Archive/Archive.mdp 2009-06-23 00:52:54 +0000
278@@ -1,4 +1,4 @@
279-<Project name="Archive" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
280+<Project name="Archive" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
281 <Configurations active="Debug">
282 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
283 <Output directory="bin/Debug" assembly="Archive" />
284@@ -23,9 +23,8 @@
285 </Contents>
286 <References>
287 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
288- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
289 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
290- <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
291+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
292+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
293 </References>
294- <GtkDesignInfo />
295 </Project>
296\ No newline at end of file
297
298=== modified file 'Archive/Makefile.am'
299--- Archive/Makefile.am 2009-01-09 05:04:13 +0000
300+++ Archive/Makefile.am 2009-06-22 04:05:16 +0000
301@@ -11,7 +11,6 @@
302 Resources/Archive.addin.xml
303
304 REFERENCES = \
305- Mono.Posix \
306 System \
307 System.Core \
308 $(DO_UNIVERSE_LIBS)
309
310=== removed file 'Archive/Resources/Archive.addin.xml'
311--- Archive/Resources/Archive.addin.xml 2009-01-09 03:22:05 +0000
312+++ Archive/Resources/Archive.addin.xml 1970-01-01 00:00:00 +0000
313@@ -1,23 +0,0 @@
314-<Addin
315- id="Archive"
316- namespace="Do"
317- version="1.0"
318- name="Archive"
319- description="Create and extract archive files."
320- author="Guillaume Beland"
321- category="Community"
322->
323-
324- <Runtime>
325- <Import assembly="Archive.dll"/>
326- </Runtime>
327-
328- <Dependencies>
329- <Addin id="Universe" version="1.0" />
330- </Dependencies>
331-
332- <Extension path = "/Do/Action">
333- <Action type="Archive.ArchiveAction" />
334- <Action type="Archive.ExtractAction" />
335- </Extension>
336-</Addin>
337
338=== added file 'Archive/Resources/Archive.addin.xml.in'
339--- Archive/Resources/Archive.addin.xml.in 1970-01-01 00:00:00 +0000
340+++ Archive/Resources/Archive.addin.xml.in 2009-06-22 21:50:13 +0000
341@@ -0,0 +1,26 @@
342+<Addin
343+ id="Archive"
344+ namespace="Do"
345+ version="1.0"
346+ name="Archive"
347+ description="Create and extract archive files."
348+ author="Guillaume Beland"
349+ category="Community"
350+ defaultEnabled="false"
351+>
352+
353+ <Runtime>
354+ <Import assembly="Archive.dll"/>
355+ </Runtime>
356+
357+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
358+
359+ <Dependencies>
360+ <Addin id="Universe" version="1.0" />
361+ </Dependencies>
362+
363+ <Extension path = "/Do/Action">
364+ <Action type="Archive.ArchiveAction" />
365+ <Action type="Archive.ExtractAction" />
366+ </Extension>
367+</Addin>
368
369=== modified file 'Archive/src/CreateArchiveAction.cs'
370--- Archive/src/CreateArchiveAction.cs 2008-12-21 23:44:34 +0000
371+++ Archive/src/CreateArchiveAction.cs 2009-06-22 04:05:16 +0000
372@@ -24,7 +24,7 @@
373 using System.Diagnostics;
374 using System.Linq;
375
376-using Mono.Unix;
377+using Mono.Addins;
378 using Do.Universe;
379
380 namespace Archive {
381@@ -38,11 +38,11 @@
382 }
383
384 public override string Name {
385- get { return Catalog.GetString ("Create archive"); }
386+ get { return AddinManager.CurrentLocalizer.GetString ("Create archive"); }
387 }
388
389 public override string Description {
390- get { return Catalog.GetString ("Create an archive with the selected item"); }
391+ get { return AddinManager.CurrentLocalizer.GetString ("Create an archive with the selected item"); }
392 }
393
394 public override string Icon {
395
396=== modified file 'Archive/src/ExtractArchiveAction.cs'
397--- Archive/src/ExtractArchiveAction.cs 2008-12-21 23:44:34 +0000
398+++ Archive/src/ExtractArchiveAction.cs 2009-06-22 04:05:16 +0000
399@@ -24,7 +24,7 @@
400 using System.Diagnostics;
401 using System.Linq;
402
403-using Mono.Unix;
404+using Mono.Addins;
405 using Do.Universe;
406
407 namespace Archive {
408@@ -37,11 +37,11 @@
409 }
410
411 public override string Name {
412- get { return Catalog.GetString ("Extract archive"); }
413+ get { return AddinManager.CurrentLocalizer.GetString ("Extract archive"); }
414 }
415
416 public override string Description {
417- get { return Catalog.GetString ("Extract an archive to a given folder"); }
418+ get { return AddinManager.CurrentLocalizer.GetString ("Extract an archive to a given folder"); }
419 }
420
421 public override string Icon {
422@@ -77,7 +77,7 @@
423 public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
424 {
425 ExtractArchive ( (items.First () as IFileItem), (modItems.First () as IFileItem));
426- return null;
427+ yield break;
428 }
429
430 private bool IsArchive (IFileItem item)
431
432=== modified file 'Banshee/Banshee.mdp'
433--- Banshee/Banshee.mdp 2009-01-23 04:17:06 +0000
434+++ Banshee/Banshee.mdp 2009-06-23 00:52:54 +0000
435@@ -1,17 +1,17 @@
436-<Project name="Banshee" fileversion="2.0" language="C#" DefaultNamespace="Banshee" clr-version="Net_2_0" ctype="DotNetProject">
437+<Project name="Banshee" fileversion="2.0" language="C#" DefaultNamespace="Banshee" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
438 <Configurations active="Debug">
439 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
440 <Output directory="bin/Debug" assembly="Banshee" />
441 <Build debugmode="True" target="Library" />
442 <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
443 <EnvironmentVariables />
444- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
445+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
446 </Configuration>
447 <Configuration name="Release" ctype="DotNetProjectConfiguration">
448 <Output directory="bin/Release" assembly="Banshee" />
449 <Build debugmode="False" target="Library" />
450 <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
451- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
452+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
453 </Configuration>
454 </Configurations>
455 <Contents>
456@@ -33,13 +33,13 @@
457 </Contents>
458 <References>
459 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
460- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
461 <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
462 <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
463 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
464- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
465- <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
466+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
467+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
468+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
469+ <ProjectReference type="Assembly" localcopy="True" specificVersion="False" refto="../../../../../../usr/lib/banshee-1/Banshee.CollectionIndexer.dll" />
470 </References>
471 <Deployment.LinuxDeployData scriptName="banshee-1" />
472- <GtkDesignInfo />
473 </Project>
474\ No newline at end of file
475
476=== modified file 'Banshee/Makefile.am'
477--- Banshee/Makefile.am 2009-01-23 04:17:06 +0000
478+++ Banshee/Makefile.am 2009-06-22 04:05:16 +0000
479@@ -1,4 +1,6 @@
480+if HAVE_BANSHEE
481 include $(top_srcdir)/build.rules.mk
482+endif
483
484 ASSEMBLY=Banshee
485
486@@ -21,7 +23,6 @@
487 Resources/Banshee.addin.xml
488
489 REFERENCES = \
490- Mono.Posix \
491 System \
492 System.Core \
493 $(BANSHEE_INDEXER_LIBS) \
494
495=== removed file 'Banshee/Resources/Banshee.addin.xml'
496--- Banshee/Resources/Banshee.addin.xml 2009-01-30 00:17:11 +0000
497+++ Banshee/Resources/Banshee.addin.xml 1970-01-01 00:00:00 +0000
498@@ -1,29 +0,0 @@
499-<Addin
500- id="Banshee"
501- namespace= "Do"
502- version="0.9"
503- name="Banshee (beta)"
504- description="Control Banshee Media Player playback and Search Collection"
505- author="Alex Launi"
506- category="Official"
507->
508-
509- <Runtime>
510- <Import assembly="Banshee.dll"/>
511- <Import assembly="Banshee.CollectionIndexer.dll"/>
512- </Runtime>
513-
514- <Dependencies>
515- <Addin id="Universe" version="1.0" />
516- </Dependencies>
517-
518- <!-- Extensions included in this assembly -->
519-
520- <!-- Actions -->
521- <Extension path = "/Do/Action">
522- <Action type = "Banshee.PlayAction" />
523- <Action type = "Banshee.PauseAction" />
524- <Action type = "Banshee.NextAction" />
525- <Action type = "Banshee.PreviousAction" />
526- </Extension>
527-</Addin>
528
529=== added file 'Banshee/Resources/Banshee.addin.xml.in'
530--- Banshee/Resources/Banshee.addin.xml.in 1970-01-01 00:00:00 +0000
531+++ Banshee/Resources/Banshee.addin.xml.in 2009-06-26 11:07:41 +0000
532@@ -0,0 +1,38 @@
533+<Addin
534+ id="Banshee"
535+ namespace= "Do"
536+ version="1.0"
537+ name="Banshee Media Player"
538+ description="Search your media collection and control playback."
539+ author="Alex Launi"
540+ category="Official"
541+ defaultEnabled="false"
542+>
543+
544+ <Runtime>
545+ <Import assembly="Banshee.dll"/>
546+ <Import assembly="@BANSHEE_INDEXER_DLL@"/>
547+ </Runtime>
548+
549+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
550+
551+ <Dependencies>
552+ <Addin id="Universe" version="1.0" />
553+ </Dependencies>
554+
555+ <!-- Extensions included in this assembly -->
556+ <!-- Itemsources -->
557+ <Extension path = "/Do/ItemSource">
558+ <ItemSource type = "Banshee.MediaItemSource" />
559+ </Extension>
560+
561+ <!-- Actions -->
562+ <Extension path = "/Do/Action">
563+ <Action type = "Banshee.PlayAction" />
564+ <Action type = "Banshee.PauseAction" />
565+ <Action type = "Banshee.NextAction" />
566+ <Action type = "Banshee.PreviousAction" />
567+ <Action type = "Banshee.EnqueueAction" />
568+ <Action type = "Banshee.SearchCollectionAction" />
569+ </Extension>
570+</Addin>
571
572=== modified file 'Banshee/src/Banshee.cs'
573--- Banshee/src/Banshee.cs 2009-01-23 07:32:12 +0000
574+++ Banshee/src/Banshee.cs 2009-01-27 04:01:24 +0000
575@@ -53,10 +53,11 @@
576 {
577 if (index_mutex.ThreadState == ThreadState.Running)
578 return;
579- if (index_mutex.ThreadState == ThreadState.Unstarted)
580+ else if (index_mutex.ThreadState == ThreadState.Unstarted)
581 index_mutex.Start ();
582- else
583+ else {
584 index_mutex = MakeIndexerThread ();
585+ }
586 }
587
588 public static bool IsPlaying {
589
590=== modified file 'Banshee/src/BansheeDBus.cs'
591--- Banshee/src/BansheeDBus.cs 2009-01-22 04:17:45 +0000
592+++ Banshee/src/BansheeDBus.cs 2009-05-17 07:57:14 +0000
593@@ -20,6 +20,7 @@
594
595 using System;
596 using System.Linq;
597+using System.Threading;
598 using System.Collections.Generic;
599
600 using NDesk.DBus;
601@@ -45,6 +46,7 @@
602 [Interface ("org.bansheeproject.Banshee.PlaybackController")]
603 interface IBansheeController
604 {
605+ void First ();
606 void Next (bool restart);
607 void Previous (bool restart);
608 int ShuffleMode { get; set; }
609@@ -53,12 +55,14 @@
610 public class BansheeDBus
611 {
612 const string BusName = "org.bansheeproject.Banshee";
613+ const string SessionBusName = "org.freedesktop.DBus";
614 const string ErrorMessage = "Banshee encountered an error in {0}; {1}";
615
616 # region static Banshee d-bus members
617
618 static Dictionary<Type, string> object_paths;
619
620+ static IBus session_bus;
621 static IBansheePlayer player;
622 static IBansheePlayQueue play_queue;
623 static IBansheeController controller;
624@@ -66,18 +70,39 @@
625 static BansheeDBus ()
626 {
627 BuildObjectPathsDict ();
628- }
629-
630- static T GetIBansheeObject<T> (string object_path)
631- {
632- if (!Bus.Session.NameHasOwner (BusName)) {
633- Bus.Session.StartServiceByName (BusName);
634- System.Threading.Thread.Sleep (5000);
635- if (!Bus.Session.NameHasOwner (BusName))
636- throw new Exception (string.Format("Name {0} has no owner.", BusName));
637- }
638+ session_bus = Bus.Session.GetObject<IBus> (SessionBusName, new ObjectPath (object_paths[typeof (IBus)]));
639+ session_bus.NameOwnerChanged += HandleNameOwnerChanged;
640+ }
641+
642+ static void HandleNameOwnerChanged(string name, string old_owner, string new_owner)
643+ {
644+ // when the owner changes on this path, we release our dbus objects.
645+ if (name == BusName) {
646+ player = null;
647+ controller = null;
648+ play_queue = null;
649+ }
650+ }
651+
652+ static bool FullApplicationAvailable {
653+ get { return Bus.Session.NameHasOwner (BusName); }
654+ }
655+
656+ static void MaybeStartFullApplication ()
657+ {
658+ if (FullApplicationAvailable) return;
659
660- return Bus.Session.GetObject<T> (BusName, new ObjectPath (object_path));
661+ Bus.Session.StartServiceByName (BusName);
662+ Thread.Sleep (5000);
663+
664+ if (!FullApplicationAvailable)
665+ throw new Exception (string.Format("Name {0} has no owner.", BusName));
666+ }
667+
668+ static T GetIBansheeObject<T> (string objectPath)
669+ {
670+ MaybeStartFullApplication ();
671+ return Bus.Session.GetObject<T> (BusName, new ObjectPath (objectPath));
672 }
673
674 static IBansheePlayer Player {
675@@ -115,9 +140,9 @@
676 }
677
678 public bool IsPlaying ()
679- {
680+ {
681 try {
682- return player != null && Player.CurrentState == "playing";
683+ return (player != null || FullApplicationAvailable) && Player.CurrentState == "playing";
684 } catch (Exception e) {
685 LogError ("IsPlaying", e);
686 }
687@@ -135,13 +160,17 @@
688
689 public void Play ()
690 {
691- Player.Play ();
692+ try {
693+ Player.Play ();
694+ } catch (Exception e) {
695+ LogError ("Play", e);
696+ }
697 }
698
699 public void Play (IEnumerable<IMediaFile> media)
700 {
701 Enqueue (media, true);
702- Next ();
703+ First ();
704 }
705
706 public void Enqueue (IEnumerable<IMediaFile> media)
707@@ -152,8 +181,11 @@
708 void Enqueue (IEnumerable<IMediaFile> media, bool prepend)
709 {
710 try {
711+ MaybeStartFullApplication (); //if banshee isn't already started the enqueue seems to fail
712+
713 // if we're prepending to the queue we need to queue in the uris in reverse order
714- if (prepend) media = media.Reverse ();
715+ if (prepend)
716+ media = media.Reverse ();
717
718 media.ForEach (item => PlayQueue.EnqueueUri (item.Path, prepend));
719
720@@ -161,7 +193,7 @@
721 LogError ("Enqueue", e);
722 }
723 }
724-
725+
726 public void Next ()
727 {
728 try {
729@@ -180,9 +212,19 @@
730 }
731 }
732
733+ void First ()
734+ {
735+ try {
736+ Controller.First ();
737+ } catch (Exception e) {
738+ LogError ("First", e);
739+ }
740+ }
741+
742 static void BuildObjectPathsDict ()
743 {
744 object_paths = new Dictionary<Type, string> ();
745+ object_paths.Add (typeof (IBus), "/org/freedesktop/DBus");
746 object_paths.Add (typeof (IBansheePlayer), "/org/bansheeproject/Banshee/PlayerEngine");
747 object_paths.Add (typeof (IBansheeController), "/org/bansheeproject/Banshee/PlaybackController");
748 object_paths.Add (typeof (IBansheePlayQueue), "/org/bansheeproject/Banshee/SourceManager/PlayQueue");
749
750=== modified file 'Banshee/src/BansheeIndexer.cs'
751--- Banshee/src/BansheeIndexer.cs 2009-01-23 07:31:12 +0000
752+++ Banshee/src/BansheeIndexer.cs 2009-06-22 04:05:16 +0000
753@@ -28,7 +28,7 @@
754
755 using Banshee.Collection.Indexer.RemoteHelper;
756
757-using Mono.Unix;
758+using Mono.Addins;
759
760 using Do.Platform;
761 using Do.Universe;
762
763=== modified file 'Banshee/src/BrowseMediaItems.cs'
764--- Banshee/src/BrowseMediaItems.cs 2009-01-22 03:02:27 +0000
765+++ Banshee/src/BrowseMediaItems.cs 2009-06-22 04:05:16 +0000
766@@ -21,7 +21,7 @@
767
768 using System;
769
770-using Mono.Unix;
771+using Mono.Addins;
772
773 using Do.Universe;
774
775@@ -53,8 +53,8 @@
776 public class BrowseArtistMusicItem : BrowseMediaItem
777 {
778 public BrowseArtistMusicItem () :
779- base (Catalog.GetString ("Browse Artists"),
780- Catalog.GetString ("Browse Music by Artist"))
781+ base (AddinManager.CurrentLocalizer.GetString ("Browse Artists"),
782+ AddinManager.CurrentLocalizer.GetString ("Browse Music by Artist"))
783 {
784 }
785
786@@ -66,24 +66,24 @@
787 public class BrowseAlbumsMusicItem : BrowseMediaItem
788 {
789 public BrowseAlbumsMusicItem () :
790- base (Catalog.GetString ("Browse Albums"),
791- Catalog.GetString ("Browse Music by Album"))
792+ base (AddinManager.CurrentLocalizer.GetString ("Browse Albums"),
793+ AddinManager.CurrentLocalizer.GetString ("Browse Music by Album"))
794 {
795 }
796 }
797
798 public class BrowsePublisherPodcastItem : BrowseMediaItem
799 {
800- public BrowsePublisherPodcastItem () : base (Catalog.GetString ("Browse Podcasts"),
801- Catalog.GetString ("Browse Podcasts by Publisher"))
802+ public BrowsePublisherPodcastItem () : base (AddinManager.CurrentLocalizer.GetString ("Browse Podcasts"),
803+ AddinManager.CurrentLocalizer.GetString ("Browse Podcasts by Publisher"))
804 {
805 }
806 }
807
808 public class BrowseVideoItem : BrowseMediaItem
809 {
810- public BrowseVideoItem () : base (Catalog.GetString ("Browse Videos"),
811- Catalog.GetString ("Browse All Videos"))
812+ public BrowseVideoItem () : base (AddinManager.CurrentLocalizer.GetString ("Browse Videos"),
813+ AddinManager.CurrentLocalizer.GetString ("Browse All Videos"))
814 {
815 }
816 }
817
818=== modified file 'Banshee/src/EnqueueAction.cs'
819--- Banshee/src/EnqueueAction.cs 2009-01-22 04:17:45 +0000
820+++ Banshee/src/EnqueueAction.cs 2009-06-22 04:05:16 +0000
821@@ -24,7 +24,7 @@
822 using System.Threading;
823 using System.Collections.Generic;
824
825-using Mono.Unix;
826+using Mono.Addins;
827
828 using Do.Platform;
829 using Do.Universe;
830@@ -34,11 +34,11 @@
831 public class EnqueueAction : Act
832 {
833 public override string Name {
834- get { return Catalog.GetString ("Add to Play Queue"); }
835+ get { return AddinManager.CurrentLocalizer.GetString ("Add to Play Queue"); }
836 }
837
838 public override string Description {
839- get { return Catalog.GetString ("Add media to play queue"); }
840+ get { return AddinManager.CurrentLocalizer.GetString ("Add media to play queue"); }
841 }
842
843 public override string Icon {
844
845=== modified file 'Banshee/src/MediaItemSource.cs'
846--- Banshee/src/MediaItemSource.cs 2009-01-23 04:17:06 +0000
847+++ Banshee/src/MediaItemSource.cs 2009-06-22 04:05:16 +0000
848@@ -22,7 +22,7 @@
849 using System;
850 using System.Collections.Generic;
851
852-using Mono.Unix;
853+using Mono.Addins;
854
855 using Do.Platform;
856 using Do.Universe;
857@@ -43,11 +43,11 @@
858 }
859
860 public override string Name {
861- get { return Catalog.GetString ("Banshee Media"); }
862+ get { return AddinManager.CurrentLocalizer.GetString ("Banshee Media"); }
863 }
864
865 public override string Description {
866- get { return Catalog.GetString ("Indexes Media from Banshee Media Player"); }
867+ get { return AddinManager.CurrentLocalizer.GetString ("Indexes Media from Banshee Media Player"); }
868 }
869
870 public override string Icon {
871
872=== modified file 'Banshee/src/MediaItems.cs'
873--- Banshee/src/MediaItems.cs 2009-01-22 04:17:45 +0000
874+++ Banshee/src/MediaItems.cs 2009-06-22 04:05:16 +0000
875@@ -21,7 +21,7 @@
876 using System;
877 using Do.Universe;
878
879-using Mono.Unix;
880+using Mono.Addins;
881
882 namespace Banshee
883 {
884@@ -188,7 +188,7 @@
885
886 public override string Description {
887 get { return string.Format ("{0} {1} {2}",
888- Catalog.GetString ("All Music by"), artist, Year); }
889+ AddinManager.CurrentLocalizer.GetString ("All Music by"), artist, Year); }
890 }
891
892 public override string Icon {
893
894=== modified file 'Banshee/src/NextAction.cs'
895--- Banshee/src/NextAction.cs 2009-01-22 03:02:27 +0000
896+++ Banshee/src/NextAction.cs 2009-06-22 04:05:16 +0000
897@@ -20,7 +20,7 @@
898
899 using System;
900
901-using Mono.Unix;
902+using Mono.Addins;
903
904 using Do.Universe;
905
906@@ -29,11 +29,11 @@
907 public class NextAction : AbstractPlayerAction
908 {
909 public override string Name {
910- get { return Catalog.GetString ("Next"); }
911+ get { return AddinManager.CurrentLocalizer.GetString ("Next"); }
912 }
913
914 public override string Description {
915- get { return Catalog.GetString ("Play next track"); }
916+ get { return AddinManager.CurrentLocalizer.GetString ("Play next track"); }
917 }
918
919 public override string Icon {
920
921=== modified file 'Banshee/src/PauseAction.cs'
922--- Banshee/src/PauseAction.cs 2009-01-22 03:02:27 +0000
923+++ Banshee/src/PauseAction.cs 2009-06-22 04:05:16 +0000
924@@ -20,8 +20,9 @@
925
926 using System;
927
928-using Mono.Unix;
929+using Mono.Addins;
930
931+using Do.Platform;
932 using Do.Universe;
933
934 namespace Banshee
935@@ -29,11 +30,11 @@
936 public class PauseAction : AbstractPlayerAction
937 {
938 public override string Name {
939- get { return Catalog.GetString ("Pause"); }
940+ get { return AddinManager.CurrentLocalizer.GetString ("Pause"); }
941 }
942
943 public override string Description {
944- get { return Catalog.GetString ("Pause playing track"); }
945+ get { return AddinManager.CurrentLocalizer.GetString ("Pause playing track"); }
946 }
947
948 public override string Icon {
949
950=== modified file 'Banshee/src/PlayAction.cs'
951--- Banshee/src/PlayAction.cs 2009-01-22 01:04:35 +0000
952+++ Banshee/src/PlayAction.cs 2009-06-22 04:05:16 +0000
953@@ -23,7 +23,7 @@
954 using System.Linq;
955 using System.Collections.Generic;
956
957-using Mono.Unix;
958+using Mono.Addins;
959
960 using Do.Universe;
961
962@@ -32,11 +32,11 @@
963 public class PlayAction : AbstractPlayerAction
964 {
965 public override string Name {
966- get { return Catalog.GetString ("Play"); }
967+ get { return AddinManager.CurrentLocalizer.GetString ("Play"); }
968 }
969
970 public override string Description {
971- get { return Catalog.GetString ("Play from your Banshee Collection"); }
972+ get { return AddinManager.CurrentLocalizer.GetString ("Play from your Banshee Collection"); }
973 }
974
975 public override string Icon {
976@@ -63,11 +63,16 @@
977 public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
978 {
979 if (items.First () is MediaItem)
980- Banshee.Play (items.Cast<MediaItem> ().First ());
981+ Banshee.Play (items.OfType<MediaItem> ().First ());
982 else
983 Banshee.Play ();
984
985 yield break;
986 }
987+
988+ protected override bool IsAvailable ()
989+ {
990+ return !Banshee.IsPlaying;
991+ }
992 }
993 }
994\ No newline at end of file
995
996=== modified file 'Banshee/src/PreviousAction.cs'
997--- Banshee/src/PreviousAction.cs 2009-01-22 03:02:27 +0000
998+++ Banshee/src/PreviousAction.cs 2009-06-22 04:05:16 +0000
999@@ -20,7 +20,7 @@
1000
1001 using System;
1002
1003-using Mono.Unix;
1004+using Mono.Addins;
1005
1006 using Do.Universe;
1007
1008@@ -29,11 +29,11 @@
1009 public class PreviousAction : AbstractPlayerAction
1010 {
1011 public override string Name {
1012- get { return Catalog.GetString ("Previous"); }
1013+ get { return AddinManager.CurrentLocalizer.GetString ("Previous"); }
1014 }
1015
1016 public override string Description {
1017- get { return Catalog.GetString ("Play previous track"); }
1018+ get { return AddinManager.CurrentLocalizer.GetString ("Play previous track"); }
1019 }
1020
1021 public override string Icon {
1022
1023=== modified file 'Banshee/src/SearchCollectionAction.cs'
1024--- Banshee/src/SearchCollectionAction.cs 2009-01-23 04:17:06 +0000
1025+++ Banshee/src/SearchCollectionAction.cs 2009-06-22 04:05:16 +0000
1026@@ -23,7 +23,7 @@
1027 using System.Linq;
1028 using System.Collections.Generic;
1029
1030-using Mono.Unix;
1031+using Mono.Addins;
1032
1033 using Do.Platform;
1034 using Do.Universe;
1035@@ -33,11 +33,11 @@
1036 public class SearchCollectionAction : Act
1037 {
1038 public override string Name {
1039- get { return Catalog.GetString ("Search Banshee Media"); }
1040+ get { return AddinManager.CurrentLocalizer.GetString ("Search Banshee Media"); }
1041 }
1042
1043 public override string Description {
1044- get { return Catalog.GetString ("Search your entire Banshee collection"); }
1045+ get { return AddinManager.CurrentLocalizer.GetString ("Search your entire Banshee collection"); }
1046 }
1047
1048 public override string Icon {
1049
1050=== modified file 'Bibtex/Bibtex.mdp'
1051--- Bibtex/Bibtex.mdp 2009-01-22 12:54:17 +0000
1052+++ Bibtex/Bibtex.mdp 2009-06-23 00:52:54 +0000
1053@@ -1,13 +1,13 @@
1054-<Project name="Bibtex" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
1055+<Project name="Bibtex" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
1056 <Configurations active="Debug">
1057 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
1058- <Output directory="bin/Debug" assembly="BibtexItemSource" />
1059+ <Output directory="bin/Debug" assembly="Bibtex" />
1060 <Build debugmode="True" target="Library" />
1061 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
1062 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
1063 </Configuration>
1064 <Configuration name="Release" ctype="DotNetProjectConfiguration">
1065- <Output directory="bin/Release" assembly="BibtexItemSource" />
1066+ <Output directory="bin/Release" assembly="Bibtex" />
1067 <Build debugmode="False" target="Library" />
1068 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
1069 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
1070@@ -30,11 +30,12 @@
1071 <References>
1072 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1073 <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
1074- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
1075 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1076- <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
1077- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform.Linux, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
1078- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
1079+ <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
1080+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
1081+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
1082+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform.Linux, Version=0.9.0.0, Culture=neutral" />
1083+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
1084 </References>
1085- <GtkDesignInfo />
1086+ <GtkDesignInfo gettextClass="Mono.Addins.AddinManager.CurrentLocalizer" />
1087 </Project>
1088\ No newline at end of file
1089
1090=== modified file 'Bibtex/Makefile.am'
1091--- Bibtex/Makefile.am 2009-02-02 01:12:58 +0000
1092+++ Bibtex/Makefile.am 2009-06-22 04:05:16 +0000
1093@@ -17,7 +17,6 @@
1094 gtk-gui/objects.xml
1095
1096 REFERENCES = \
1097- Mono.Posix \
1098 System \
1099 System.Core \
1100 $(GTK_SHARP_20_LIBS) \
1101
1102=== removed file 'Bibtex/Resources/Bibtex.addin.xml'
1103--- Bibtex/Resources/Bibtex.addin.xml 2009-01-22 12:54:17 +0000
1104+++ Bibtex/Resources/Bibtex.addin.xml 1970-01-01 00:00:00 +0000
1105@@ -1,25 +0,0 @@
1106-<Addin
1107- id="Bibtex"
1108- namespace="Do"
1109- version="1.8"
1110- name="Bibtex"
1111- description="Quickly open documents linked from BibTeX files."
1112- author="Niall Murphy"
1113- category="Community"
1114- >
1115-
1116- <Runtime>
1117- <Import assembly="Bibtex.dll"/>
1118- </Runtime>
1119-
1120- <Dependencies>
1121- <Addin id="Universe" version="1.0" />
1122- </Dependencies>
1123-
1124- <Extension path = "/Do/Action">
1125- <Action type="Bibtex.BibtexCiteAction" />
1126- </Extension>
1127- <Extension path = "/Do/ItemSource">
1128- <ItemSource type="Bibtex.BibtexItemSource" />
1129- </Extension>
1130-</Addin>
1131
1132=== added file 'Bibtex/Resources/Bibtex.addin.xml.in'
1133--- Bibtex/Resources/Bibtex.addin.xml.in 1970-01-01 00:00:00 +0000
1134+++ Bibtex/Resources/Bibtex.addin.xml.in 2009-06-22 21:50:13 +0000
1135@@ -0,0 +1,28 @@
1136+<Addin
1137+ id="Bibtex"
1138+ namespace="Do"
1139+ version="1.8"
1140+ name="Bibtex"
1141+ description="Quickly open documents linked from BibTeX files."
1142+ author="Niall Murphy"
1143+ category="Community"
1144+ defaultEnabled="false"
1145+ >
1146+
1147+ <Runtime>
1148+ <Import assembly="Bibtex.dll"/>
1149+ </Runtime>
1150+
1151+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
1152+
1153+ <Dependencies>
1154+ <Addin id="Universe" version="1.0" />
1155+ </Dependencies>
1156+
1157+ <Extension path = "/Do/Action">
1158+ <Action type="Bibtex.BibtexCiteAction" />
1159+ </Extension>
1160+ <Extension path = "/Do/ItemSource">
1161+ <ItemSource type="Bibtex.BibtexItemSource" />
1162+ </Extension>
1163+</Addin>
1164
1165=== modified file 'Bibtex/gtk-gui/Bibtex.Configuration.cs'
1166--- Bibtex/gtk-gui/Bibtex.Configuration.cs 2009-01-22 12:54:17 +0000
1167+++ Bibtex/gtk-gui/Bibtex.Configuration.cs 2009-06-23 00:52:54 +0000
1168@@ -1,7 +1,7 @@
1169 // ------------------------------------------------------------------------------
1170 // <autogenerated>
1171 // This code was generated by a tool.
1172-// Mono Runtime Version: 2.0.50727.42
1173+//
1174 //
1175 // Changes to this file may cause incorrect behavior and will be lost if
1176 // the code is regenerated.
1177@@ -41,13 +41,13 @@
1178 // Container child table1.Gtk.Table+TableChild
1179 this.bibtexFileLabel = new Gtk.Label();
1180 this.bibtexFileLabel.Name = "bibtexFileLabel";
1181- this.bibtexFileLabel.LabelProp = Mono.Unix.Catalog.GetString("Choose BibTeX file");
1182+ this.bibtexFileLabel.LabelProp = Mono.Addins.AddinManager.CurrentLocalizer.GetString("Choose BibTeX file");
1183 this.table1.Add(this.bibtexFileLabel);
1184 Gtk.Table.TableChild w1 = ((Gtk.Table.TableChild)(this.table1[this.bibtexFileLabel]));
1185 w1.XOptions = ((Gtk.AttachOptions)(4));
1186 w1.YOptions = ((Gtk.AttachOptions)(4));
1187 // Container child table1.Gtk.Table+TableChild
1188- this.chooseBibtexFileButton = new Gtk.FileChooserButton(Mono.Unix.Catalog.GetString("Select A File"), ((Gtk.FileChooserAction)(0)));
1189+ this.chooseBibtexFileButton = new Gtk.FileChooserButton(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Select A File"), ((Gtk.FileChooserAction)(0)));
1190 this.chooseBibtexFileButton.Name = "chooseBibtexFileButton";
1191 this.table1.Add(this.chooseBibtexFileButton);
1192 Gtk.Table.TableChild w2 = ((Gtk.Table.TableChild)(this.table1[this.chooseBibtexFileButton]));
1193@@ -55,7 +55,7 @@
1194 w2.RightAttach = ((uint)(2));
1195 w2.YOptions = ((Gtk.AttachOptions)(4));
1196 // Container child table1.Gtk.Table+TableChild
1197- this.chooseDocsFolderButton = new Gtk.FileChooserButton(Mono.Unix.Catalog.GetString("Select your documents folder"), ((Gtk.FileChooserAction)(2)));
1198+ this.chooseDocsFolderButton = new Gtk.FileChooserButton(Mono.Addins.AddinManager.CurrentLocalizer.GetString("Select your documents folder"), ((Gtk.FileChooserAction)(2)));
1199 this.chooseDocsFolderButton.Name = "chooseDocsFolderButton";
1200 this.table1.Add(this.chooseDocsFolderButton);
1201 Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.table1[this.chooseDocsFolderButton]));
1202@@ -67,7 +67,7 @@
1203 // Container child table1.Gtk.Table+TableChild
1204 this.docFolderLable = new Gtk.Label();
1205 this.docFolderLable.Name = "docFolderLable";
1206- this.docFolderLable.LabelProp = Mono.Unix.Catalog.GetString("Choose documents folder");
1207+ this.docFolderLable.LabelProp = Mono.Addins.AddinManager.CurrentLocalizer.GetString("Choose documents folder");
1208 this.table1.Add(this.docFolderLable);
1209 Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table1[this.docFolderLable]));
1210 w4.TopAttach = ((uint)(1));
1211
1212=== modified file 'Bibtex/gtk-gui/generated.cs'
1213--- Bibtex/gtk-gui/generated.cs 2009-01-05 01:32:46 +0000
1214+++ Bibtex/gtk-gui/generated.cs 2009-06-23 00:52:54 +0000
1215@@ -1,7 +1,7 @@
1216 // ------------------------------------------------------------------------------
1217 // <autogenerated>
1218 // This code was generated by a tool.
1219-// Mono Runtime Version: 2.0.50727.42
1220+//
1221 //
1222 // Changes to this file may cause incorrect behavior and will be lost if
1223 // the code is regenerated.
1224
1225=== modified file 'Bibtex/gtk-gui/gui.stetic'
1226--- Bibtex/gtk-gui/gui.stetic 2009-01-22 12:54:17 +0000
1227+++ Bibtex/gtk-gui/gui.stetic 2009-06-23 00:52:54 +0000
1228@@ -2,8 +2,12 @@
1229 <stetic-interface>
1230 <configuration>
1231 <images-root-path>..</images-root-path>
1232- <target-gtk-version>2.12.1</target-gtk-version>
1233+ <target-gtk-version>2.12</target-gtk-version>
1234 </configuration>
1235+ <import>
1236+ <widget-library name="Do.Platform.Linux, Version=0.9.0.0, Culture=neutral" />
1237+ <widget-library name="../bin/Debug/Bibtex.dll" internal="true" />
1238+ </import>
1239 <widget class="Gtk.Bin" id="Bibtex.Configuration" design-size="375 300">
1240 <property name="MemberName" />
1241 <child>
1242@@ -97,4 +101,4 @@
1243 </widget>
1244 </child>
1245 </widget>
1246-</stetic-interface>
1247+</stetic-interface>
1248\ No newline at end of file
1249
1250=== modified file 'Bibtex/gtk-gui/objects.xml'
1251--- Bibtex/gtk-gui/objects.xml 2008-12-29 18:23:07 +0000
1252+++ Bibtex/gtk-gui/objects.xml 2009-06-22 04:05:16 +0000
1253@@ -1,5 +1,5 @@
1254 <objects attr-sync="on">
1255- <object type="Do.Addins.Bibtex.Configuration" palette-category="Bibtex" allow-children="false" base-type="Gtk.Bin">
1256+ <object type="Bibtex.Configuration" palette-category="Bibtex" allow-children="false" base-type="Gtk.Bin">
1257 <itemgroups>
1258 <itemgroup label="Configuration Properties">
1259 <property name="BibtexFilePath" />
1260
1261=== modified file 'Bibtex/src/BibtexItemSource.cs'
1262--- Bibtex/src/BibtexItemSource.cs 2009-01-22 12:54:17 +0000
1263+++ Bibtex/src/BibtexItemSource.cs 2009-05-29 09:39:41 +0000
1264@@ -79,7 +79,7 @@
1265
1266 public override IEnumerable<Item> ChildrenOfItem (Item parent)
1267 {
1268- return null;
1269+ yield break;
1270 }
1271
1272 public override void UpdateItems ()
1273
1274=== removed file 'BundledLibraries/Google.GData.AccessControl.dll'
1275Binary files BundledLibraries/Google.GData.AccessControl.dll 2008-12-31 21:16:30 +0000 and BundledLibraries/Google.GData.AccessControl.dll 1970-01-01 00:00:00 +0000 differ
1276=== removed file 'BundledLibraries/Google.GData.Calendar.dll'
1277Binary files BundledLibraries/Google.GData.Calendar.dll 2008-12-31 21:16:30 +0000 and BundledLibraries/Google.GData.Calendar.dll 1970-01-01 00:00:00 +0000 differ
1278=== removed file 'BundledLibraries/Google.GData.Client.dll'
1279Binary files BundledLibraries/Google.GData.Client.dll 2008-12-31 21:16:30 +0000 and BundledLibraries/Google.GData.Client.dll 1970-01-01 00:00:00 +0000 differ
1280=== removed file 'BundledLibraries/Google.GData.Contacts.dll'
1281Binary files BundledLibraries/Google.GData.Contacts.dll 2008-12-31 21:16:30 +0000 and BundledLibraries/Google.GData.Contacts.dll 1970-01-01 00:00:00 +0000 differ
1282=== removed file 'BundledLibraries/Google.GData.Documents.dll'
1283Binary files BundledLibraries/Google.GData.Documents.dll 2008-12-31 21:16:30 +0000 and BundledLibraries/Google.GData.Documents.dll 1970-01-01 00:00:00 +0000 differ
1284=== removed file 'BundledLibraries/Google.GData.Extensions.dll'
1285Binary files BundledLibraries/Google.GData.Extensions.dll 2008-12-31 21:16:30 +0000 and BundledLibraries/Google.GData.Extensions.dll 1970-01-01 00:00:00 +0000 differ
1286=== modified file 'BundledLibraries/Makefile.am'
1287--- BundledLibraries/Makefile.am 2009-02-03 20:46:06 +0000
1288+++ BundledLibraries/Makefile.am 2009-06-26 20:44:02 +0000
1289@@ -1,19 +1,14 @@
1290-bundledir = ${datadir}/gnome-do/plugins
1291-
1292-bundle_DATA = \
1293- Google.GData.AccessControl.dll \
1294- Google.GData.Calendar.dll \
1295- Google.GData.Client.dll \
1296- Google.GData.Contacts.dll \
1297- Google.GData.Documents.dll \
1298- Google.GData.Extensions.dll
1299-
1300-EXTRA_DIST=$(bundle_DATA) gmcs.exe
1301-
1302-BANSHEE_INDEXER_DLL = $(shell $(PKG_CONFIG) --variable=Libraries banshee-1-collection-indexer)
1303+bundledir = ${libdir}/gnome-do/plugins
1304+
1305 install-data-hook:
1306- $(INSTALL) -d $(DESTDIR)/$(bundledir)
1307- $(INSTALL) -m 644 -t $(DESTDIR)/$(bundledir) $(BANSHEE_INDEXER_DLL)
1308+ if test -n "$(BANSHEE_INDEXER_DLL)"; then \
1309+ $(INSTALL) -d $(DESTDIR)/$(bundledir) && \
1310+ $(INSTALL) -m 644 -t $(DESTDIR)/$(bundledir) $(BANSHEE_INDEXER_DLL); \
1311+ fi;
1312
1313 uninstall-hook:
1314- rm $(DESTDIR)/$(bundledir)/$(notdir $(BANSHEE_INDEXER_DLL))
1315+ if test -n "$(BANSHEE_INDEXER_DLL)"; then \
1316+ rm $(DESTDIR)/$(bundledir)/$(notdir $(BANSHEE_INDEXER_DLL)) \
1317+ fi;
1318+
1319+EXTRA_DIST= gmcs.exe
1320
1321=== modified file 'Cl.ickable/Cl.ickable.mdp'
1322--- Cl.ickable/Cl.ickable.mdp 2009-01-17 23:17:09 +0000
1323+++ Cl.ickable/Cl.ickable.mdp 2009-06-23 00:52:54 +0000
1324@@ -1,4 +1,4 @@
1325-<Project name="Cl.ickable" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
1326+<Project name="Cl.ickable" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
1327 <Configurations active="Debug">
1328 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
1329 <Output directory="bin/Debug" assembly="Cl.ickable" />
1330@@ -23,11 +23,10 @@
1331 </Contents>
1332 <References>
1333 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1334- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
1335 <ProjectReference type="Gac" localcopy="True" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
1336 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1337- <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
1338- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
1339+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
1340+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
1341+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
1342 </References>
1343- <GtkDesignInfo />
1344 </Project>
1345\ No newline at end of file
1346
1347=== modified file 'Cl.ickable/Makefile.am'
1348--- Cl.ickable/Makefile.am 2009-01-09 05:04:13 +0000
1349+++ Cl.ickable/Makefile.am 2009-06-22 04:05:16 +0000
1350@@ -11,7 +11,6 @@
1351 Resources/Cl.ickable.addin.xml
1352
1353 REFERENCES = \
1354- Mono.Posix \
1355 System \
1356 System.Core \
1357 System.Web \
1358
1359=== removed file 'Cl.ickable/Resources/Cl.ickable.addin.xml'
1360--- Cl.ickable/Resources/Cl.ickable.addin.xml 2009-01-01 00:58:48 +0000
1361+++ Cl.ickable/Resources/Cl.ickable.addin.xml 1970-01-01 00:00:00 +0000
1362@@ -1,26 +0,0 @@
1363-<Addin
1364- id="Cl.ickable"
1365- namespace="Do"
1366- version="1.0"
1367- name="Cl.ickable WebClips"
1368- description="Save clips on Cl.ickable.com"
1369- author="Idealab"
1370- category="Community"
1371->
1372-
1373- <Runtime>
1374- <Import assembly="Cl.ickable.dll"/>
1375- </Runtime>
1376-
1377- <Dependencies>
1378- <Addin id="Universe" version="1.0" />
1379- </Dependencies>
1380-
1381- <Extension path="/Do/Action">
1382- <Action type="Cl.ickable.ClipAction" />
1383- </Extension>
1384-
1385- <Extension path="/Do/ItemSource">
1386- <ItemSource type="Cl.ickable.ClickableItemSource" />
1387- </Extension>
1388-</Addin>
1389
1390=== added file 'Cl.ickable/Resources/Cl.ickable.addin.xml.in'
1391--- Cl.ickable/Resources/Cl.ickable.addin.xml.in 1970-01-01 00:00:00 +0000
1392+++ Cl.ickable/Resources/Cl.ickable.addin.xml.in 2009-06-22 21:50:13 +0000
1393@@ -0,0 +1,29 @@
1394+<Addin
1395+ id="Cl.ickable"
1396+ namespace="Do"
1397+ version="1.0"
1398+ name="Cl.ickable WebClips"
1399+ description="Save clips on Cl.ickable.com"
1400+ author="Idealab"
1401+ category="Community"
1402+ defaultEnabled="false"
1403+>
1404+
1405+ <Runtime>
1406+ <Import assembly="Cl.ickable.dll"/>
1407+ </Runtime>
1408+
1409+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
1410+
1411+ <Dependencies>
1412+ <Addin id="Universe" version="1.0" />
1413+ </Dependencies>
1414+
1415+ <Extension path="/Do/Action">
1416+ <Action type="Cl.ickable.ClipAction" />
1417+ </Extension>
1418+
1419+ <Extension path="/Do/ItemSource">
1420+ <ItemSource type="Cl.ickable.ClickableItemSource" />
1421+ </Extension>
1422+</Addin>
1423
1424=== modified file 'Cl.ickable/src/ClickableItemSource.cs'
1425--- Cl.ickable/src/ClickableItemSource.cs 2008-12-21 23:44:34 +0000
1426+++ Cl.ickable/src/ClickableItemSource.cs 2009-06-22 04:05:16 +0000
1427@@ -18,7 +18,7 @@
1428
1429 using System;
1430 using System.Collections.Generic;
1431-using Mono.Unix;
1432+using Mono.Addins;
1433
1434 using Do.Universe;
1435
1436@@ -28,11 +28,11 @@
1437 {
1438
1439 public override string Name {
1440- get { return Catalog.GetString ("Cl.ickable Items"); }
1441+ get { return AddinManager.CurrentLocalizer.GetString ("Cl.ickable Items"); }
1442 }
1443
1444 public override string Description {
1445- get { return Catalog.GetString ("Usefull Cl.ickable Items"); }
1446+ get { return AddinManager.CurrentLocalizer.GetString ("Usefull Cl.ickable Items"); }
1447 }
1448
1449 public override string Icon {
1450
1451=== modified file 'Cl.ickable/src/ClipAction.cs'
1452--- Cl.ickable/src/ClipAction.cs 2009-01-15 17:55:40 +0000
1453+++ Cl.ickable/src/ClipAction.cs 2009-06-22 04:05:16 +0000
1454@@ -21,7 +21,7 @@
1455 using System.Linq;
1456 using System.Collections.Generic;
1457
1458-using Mono.Unix;
1459+using Mono.Addins;
1460
1461 using Do.Platform;
1462 using Do.Universe;
1463@@ -35,11 +35,11 @@
1464 const string ClipPostURL = "http://cl.ickable.com/cgi-bin/SaveClip.cgi";
1465
1466 public override string Name {
1467- get { return Catalog.GetString ("Clip"); }
1468+ get { return AddinManager.CurrentLocalizer.GetString ("Clip"); }
1469 }
1470
1471 public override string Description {
1472- get { return Catalog.GetString ("Create a clip with Cl.ickable"); }
1473+ get { return AddinManager.CurrentLocalizer.GetString ("Create a clip with Cl.ickable"); }
1474 }
1475
1476 public override string Icon {
1477
1478=== modified file 'Cl.ickable/src/WebClipsItem.cs'
1479--- Cl.ickable/src/WebClipsItem.cs 2008-12-21 23:44:34 +0000
1480+++ Cl.ickable/src/WebClipsItem.cs 2009-06-22 04:05:16 +0000
1481@@ -17,7 +17,7 @@
1482 //
1483
1484 using System;
1485-using Mono.Unix;
1486+using Mono.Addins;
1487
1488 using Do.Platform;
1489 using Do.Universe;
1490@@ -29,11 +29,11 @@
1491 const string WebClipsURL = "http://cl.ickable.com/clips/";
1492
1493 public override string Name {
1494- get { return Catalog.GetString ("Cl.ickable Clips"); }
1495+ get { return AddinManager.CurrentLocalizer.GetString ("Cl.ickable Clips"); }
1496 }
1497
1498 public override string Description {
1499- get { return Catalog.GetString ("Opens your cl.ickable clips"); }
1500+ get { return AddinManager.CurrentLocalizer.GetString ("Opens your cl.ickable clips"); }
1501 }
1502
1503 public override string Icon {
1504
1505=== modified file 'ClawsMail/ClawsMail.mdp'
1506--- ClawsMail/ClawsMail.mdp 2009-01-17 23:17:09 +0000
1507+++ ClawsMail/ClawsMail.mdp 2009-06-23 00:52:54 +0000
1508@@ -23,10 +23,9 @@
1509 <References>
1510 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1511 <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1512- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
1513- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
1514- <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
1515+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
1516+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
1517+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
1518 </References>
1519 <Deployment.LinuxDeployData scriptName="sylpheed-claws-address" />
1520- <GtkDesignInfo />
1521 </Project>
1522\ No newline at end of file
1523
1524=== modified file 'ClawsMail/Makefile.am'
1525--- ClawsMail/Makefile.am 2009-01-09 07:25:58 +0000
1526+++ ClawsMail/Makefile.am 2009-06-22 04:05:16 +0000
1527@@ -14,6 +14,5 @@
1528 System \
1529 System.Xml \
1530 System.Core \
1531- Mono.Posix \
1532 $(DO_PLATFORM_LIBS) \
1533 $(DO_UNIVERSE_LIBS)
1534
1535=== removed file 'ClawsMail/Resources/ClawsMail.addin.xml'
1536--- ClawsMail/Resources/ClawsMail.addin.xml 2009-01-07 20:29:35 +0000
1537+++ ClawsMail/Resources/ClawsMail.addin.xml 1970-01-01 00:00:00 +0000
1538@@ -1,23 +0,0 @@
1539-<Addin
1540- id="ClawsMail"
1541- namespace="Do"
1542- version="1.0"
1543- name="ClawsMail"
1544- description="Search contacts in your ClawsMail address book."
1545- author="Karol Będkowski"
1546- category="Community"
1547- >
1548-
1549- <Runtime>
1550- <Import assembly="ClawsMail.dll"/>
1551- </Runtime>
1552-
1553- <Dependencies>
1554- <Addin id="Universe" version="1.0" />
1555- </Dependencies>
1556-
1557- <Extension path = "/Do/ItemSource">
1558- <ItemSource type="Claws.ClawsContactsItemSource" />
1559- </Extension>
1560-
1561-</Addin>
1562
1563=== added file 'ClawsMail/Resources/ClawsMail.addin.xml.in'
1564--- ClawsMail/Resources/ClawsMail.addin.xml.in 1970-01-01 00:00:00 +0000
1565+++ ClawsMail/Resources/ClawsMail.addin.xml.in 2009-06-22 21:50:13 +0000
1566@@ -0,0 +1,26 @@
1567+<Addin
1568+ id="ClawsMail"
1569+ namespace="Do"
1570+ version="1.0"
1571+ name="ClawsMail"
1572+ description="Search contacts in your ClawsMail address book."
1573+ author="Karol Będkowski"
1574+ category="Community"
1575+ defaultEnabled="false"
1576+ >
1577+
1578+ <Runtime>
1579+ <Import assembly="ClawsMail.dll"/>
1580+ </Runtime>
1581+
1582+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
1583+
1584+ <Dependencies>
1585+ <Addin id="Universe" version="1.0" />
1586+ </Dependencies>
1587+
1588+ <Extension path = "/Do/ItemSource">
1589+ <ItemSource type="Claws.ClawsContactsItemSource" />
1590+ </Extension>
1591+
1592+</Addin>
1593
1594=== modified file 'ClawsMail/src/ClawsContactDetailItem.cs'
1595--- ClawsMail/src/ClawsContactDetailItem.cs 2009-01-07 04:28:04 +0000
1596+++ ClawsMail/src/ClawsContactDetailItem.cs 2009-06-22 04:05:16 +0000
1597@@ -19,7 +19,7 @@
1598 */
1599
1600 using System;
1601-using Mono.Unix;
1602+using Mono.Addins;
1603 using Do.Universe;
1604
1605 namespace Claws {
1606@@ -68,18 +68,18 @@
1607
1608 string remark = type.Substring (type.LastIndexOf (".") + 1);
1609 if (type.StartsWith (ClawsContactsItemSource.ClawsPrimaryEmailPrefix)) {
1610- name = Catalog.GetString ("Primary Email") + " " + remark;
1611+ name = AddinManager.CurrentLocalizer.GetString ("Primary Email") + " " + remark;
1612 } else {
1613 if (remark.Length > 0) {
1614- name = Catalog.GetString ("Email") + " " + remark;
1615+ name = AddinManager.CurrentLocalizer.GetString ("Email") + " " + remark;
1616 } else {
1617- name = Catalog.GetString ("Other email");
1618+ name = AddinManager.CurrentLocalizer.GetString ("Other email");
1619 }
1620 }
1621
1622 } else {
1623 icon = IconForOthers;
1624- name = Catalog.GetString ("Other");
1625+ name = AddinManager.CurrentLocalizer.GetString ("Other");
1626 }
1627 }
1628
1629
1630=== modified file 'ClawsMail/src/ClawsContactsItemSource.cs'
1631--- ClawsMail/src/ClawsContactsItemSource.cs 2009-01-07 04:28:04 +0000
1632+++ ClawsMail/src/ClawsContactsItemSource.cs 2009-06-22 04:05:16 +0000
1633@@ -23,7 +23,7 @@
1634 using System.IO;
1635 using System.Collections.Generic;
1636 using System.Xml;
1637-using Mono.Unix;
1638+using Mono.Addins;
1639 using Do.Universe;
1640 using Do.Platform;
1641
1642@@ -50,11 +50,11 @@
1643 #region std properties
1644
1645 public override string Name {
1646- get { return Catalog.GetString ("ClawsMail contacts"); }
1647+ get { return AddinManager.CurrentLocalizer.GetString ("ClawsMail contacts"); }
1648 }
1649
1650 public override string Description {
1651- get { return Catalog.GetString ("Contacts in ClawsMail address book"); }
1652+ get { return AddinManager.CurrentLocalizer.GetString ("Contacts in ClawsMail address book"); }
1653 }
1654
1655 public override string Icon {
1656
1657=== modified file 'Confluence/Confluence.mdp'
1658--- Confluence/Confluence.mdp 2009-01-09 08:10:40 +0000
1659+++ Confluence/Confluence.mdp 2009-06-23 00:52:54 +0000
1660@@ -1,4 +1,4 @@
1661-<Project name="Confluence" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
1662+<Project name="Confluence" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
1663 <Configurations active="Debug">
1664 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
1665 <Output directory="bin/Debug" assembly="Confluence" />
1666@@ -30,15 +30,15 @@
1667 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1668 <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
1669 <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
1670- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
1671- <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
1672 <ProjectReference type="Gac" localcopy="True" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
1673 <ProjectReference type="Gac" localcopy="True" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
1674 <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1675 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1676- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
1677- <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
1678- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform.Linux, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
1679+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
1680+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
1681+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform.Linux, Version=0.9.0.0, Culture=neutral" />
1682+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
1683+ <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
1684 </References>
1685- <GtkDesignInfo />
1686+ <GtkDesignInfo gettextClass="Mono.Addins.AddinManager.CurrentLocalizer" />
1687 </Project>
1688\ No newline at end of file
1689
1690=== modified file 'Confluence/Makefile.am'
1691--- Confluence/Makefile.am 2009-01-09 07:45:01 +0000
1692+++ Confluence/Makefile.am 2009-06-22 04:05:16 +0000
1693@@ -17,7 +17,6 @@
1694 gtk-gui/objects.xml
1695
1696 REFERENCES = \
1697- Mono.Posix \
1698 System \
1699 System.Core \
1700 System.Web \
1701
1702=== removed file 'Confluence/Resources/Confluence.addin.xml'
1703--- Confluence/Resources/Confluence.addin.xml 2009-01-09 03:22:05 +0000
1704+++ Confluence/Resources/Confluence.addin.xml 1970-01-01 00:00:00 +0000
1705@@ -1,23 +0,0 @@
1706-<Addin
1707- id="Confluence"
1708- namespace="Do"
1709- version="1.0"
1710- name="Confluence"
1711- description="Interact with Confluence wikis."
1712- author="John Wood"
1713- category="Community"
1714- >
1715-
1716- <Runtime>
1717- <Import assembly="Confluence.dll"/>
1718- </Runtime>
1719-
1720- <Dependencies>
1721- <Addin id="Universe" version="1.0" />
1722- </Dependencies>
1723-
1724- <Extension path = "/Do/Action">
1725- <Action type="Confluence.ConfluenceSearchAction" />
1726- </Extension>
1727-
1728-</Addin>
1729
1730=== added file 'Confluence/Resources/Confluence.addin.xml.in'
1731--- Confluence/Resources/Confluence.addin.xml.in 1970-01-01 00:00:00 +0000
1732+++ Confluence/Resources/Confluence.addin.xml.in 2009-06-22 21:50:13 +0000
1733@@ -0,0 +1,26 @@
1734+<Addin
1735+ id="Confluence"
1736+ namespace="Do"
1737+ version="1.0"
1738+ name="Confluence"
1739+ description="Interact with Confluence wikis."
1740+ author="John Wood"
1741+ category="Community"
1742+ defaultEnabled="false"
1743+ >
1744+
1745+ <Runtime>
1746+ <Import assembly="Confluence.dll"/>
1747+ </Runtime>
1748+
1749+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
1750+
1751+ <Dependencies>
1752+ <Addin id="Universe" version="1.0" />
1753+ </Dependencies>
1754+
1755+ <Extension path = "/Do/Action">
1756+ <Action type="Confluence.ConfluenceSearchAction" />
1757+ </Extension>
1758+
1759+</Addin>
1760
1761=== modified file 'Confluence/gtk-gui/Confluence.ConfluenceConfigWidget.cs'
1762--- Confluence/gtk-gui/Confluence.ConfluenceConfigWidget.cs 2009-01-05 01:32:46 +0000
1763+++ Confluence/gtk-gui/Confluence.ConfluenceConfigWidget.cs 2009-06-23 00:52:54 +0000
1764@@ -1,7 +1,7 @@
1765 // ------------------------------------------------------------------------------
1766 // <autogenerated>
1767 // This code was generated by a tool.
1768-// Mono Runtime Version: 2.0.50727.42
1769+//
1770 //
1771 // Changes to this file may cause incorrect behavior and will be lost if
1772 // the code is regenerated.
1773@@ -47,20 +47,19 @@
1774 this.table1.ColumnSpacing = ((uint)(6));
1775 // Container child table1.Gtk.Table+TableChild
1776 this._entryBaseUrl = new Gtk.Entry();
1777- Gtk.Tooltips w1 = new Gtk.Tooltips();
1778- w1.SetTip(this._entryBaseUrl, "The base url location to your Confluence install. ie. http://opensource.atlassian.com/confluence/spring", "The base url location to your Confluence install. ie. http://opensource.atlassian.com/confluence/spring");
1779+ this._entryBaseUrl.TooltipMarkup = "The base url location to your Confluence install. ie. http://opensource.atlassian.com/confluence/spring";
1780 this._entryBaseUrl.CanFocus = true;
1781 this._entryBaseUrl.Name = "_entryBaseUrl";
1782- this._entryBaseUrl.Text = Mono.Unix.Catalog.GetString("http://opensource.atlassian.com/confluence/spring");
1783+ this._entryBaseUrl.Text = Mono.Addins.AddinManager.CurrentLocalizer.GetString("http://opensource.atlassian.com/confluence/spring");
1784 this._entryBaseUrl.IsEditable = true;
1785 this._entryBaseUrl.WidthChars = 40;
1786 this._entryBaseUrl.InvisibleChar = '●';
1787 this.table1.Add(this._entryBaseUrl);
1788- Gtk.Table.TableChild w2 = ((Gtk.Table.TableChild)(this.table1[this._entryBaseUrl]));
1789- w2.LeftAttach = ((uint)(1));
1790- w2.RightAttach = ((uint)(2));
1791- w2.XOptions = ((Gtk.AttachOptions)(4));
1792- w2.YOptions = ((Gtk.AttachOptions)(4));
1793+ Gtk.Table.TableChild w1 = ((Gtk.Table.TableChild)(this.table1[this._entryBaseUrl]));
1794+ w1.LeftAttach = ((uint)(1));
1795+ w1.RightAttach = ((uint)(2));
1796+ w1.XOptions = ((Gtk.AttachOptions)(4));
1797+ w1.YOptions = ((Gtk.AttachOptions)(4));
1798 // Container child table1.Gtk.Table+TableChild
1799 this._entryMaxSearchResults = new Gtk.Entry();
1800 this._entryMaxSearchResults.CanFocus = true;
1801@@ -68,13 +67,13 @@
1802 this._entryMaxSearchResults.IsEditable = true;
1803 this._entryMaxSearchResults.InvisibleChar = '●';
1804 this.table1.Add(this._entryMaxSearchResults);
1805- Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.table1[this._entryMaxSearchResults]));
1806- w3.TopAttach = ((uint)(3));
1807- w3.BottomAttach = ((uint)(4));
1808- w3.LeftAttach = ((uint)(1));
1809- w3.RightAttach = ((uint)(2));
1810- w3.XOptions = ((Gtk.AttachOptions)(4));
1811- w3.YOptions = ((Gtk.AttachOptions)(4));
1812+ Gtk.Table.TableChild w2 = ((Gtk.Table.TableChild)(this.table1[this._entryMaxSearchResults]));
1813+ w2.TopAttach = ((uint)(3));
1814+ w2.BottomAttach = ((uint)(4));
1815+ w2.LeftAttach = ((uint)(1));
1816+ w2.RightAttach = ((uint)(2));
1817+ w2.XOptions = ((Gtk.AttachOptions)(4));
1818+ w2.YOptions = ((Gtk.AttachOptions)(4));
1819 // Container child table1.Gtk.Table+TableChild
1820 this._entryPassword = new Gtk.Entry();
1821 this._entryPassword.CanFocus = true;
1822@@ -83,78 +82,78 @@
1823 this._entryPassword.Visibility = false;
1824 this._entryPassword.InvisibleChar = '●';
1825 this.table1.Add(this._entryPassword);
1826- Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table1[this._entryPassword]));
1827- w4.TopAttach = ((uint)(2));
1828- w4.BottomAttach = ((uint)(3));
1829- w4.LeftAttach = ((uint)(1));
1830- w4.RightAttach = ((uint)(2));
1831- w4.XOptions = ((Gtk.AttachOptions)(4));
1832- w4.YOptions = ((Gtk.AttachOptions)(4));
1833+ Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.table1[this._entryPassword]));
1834+ w3.TopAttach = ((uint)(2));
1835+ w3.BottomAttach = ((uint)(3));
1836+ w3.LeftAttach = ((uint)(1));
1837+ w3.RightAttach = ((uint)(2));
1838+ w3.XOptions = ((Gtk.AttachOptions)(4));
1839+ w3.YOptions = ((Gtk.AttachOptions)(4));
1840 // Container child table1.Gtk.Table+TableChild
1841 this._entryUsername = new Gtk.Entry();
1842 this._entryUsername.CanFocus = true;
1843 this._entryUsername.Name = "_entryUsername";
1844- this._entryUsername.Text = Mono.Unix.Catalog.GetString("username1");
1845+ this._entryUsername.Text = Mono.Addins.AddinManager.CurrentLocalizer.GetString("username1");
1846 this._entryUsername.IsEditable = true;
1847 this._entryUsername.InvisibleChar = '●';
1848 this.table1.Add(this._entryUsername);
1849- Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table1[this._entryUsername]));
1850- w5.TopAttach = ((uint)(1));
1851- w5.BottomAttach = ((uint)(2));
1852+ Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table1[this._entryUsername]));
1853+ w4.TopAttach = ((uint)(1));
1854+ w4.BottomAttach = ((uint)(2));
1855+ w4.LeftAttach = ((uint)(1));
1856+ w4.RightAttach = ((uint)(2));
1857+ w4.XOptions = ((Gtk.AttachOptions)(4));
1858+ w4.YOptions = ((Gtk.AttachOptions)(4));
1859+ // Container child table1.Gtk.Table+TableChild
1860+ this._labelBaseUrl = new Gtk.Label();
1861+ this._labelBaseUrl.Name = "_labelBaseUrl";
1862+ this._labelBaseUrl.LabelProp = "* denotes a required field";
1863+ this.table1.Add(this._labelBaseUrl);
1864+ Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table1[this._labelBaseUrl]));
1865+ w5.TopAttach = ((uint)(5));
1866+ w5.BottomAttach = ((uint)(6));
1867 w5.LeftAttach = ((uint)(1));
1868 w5.RightAttach = ((uint)(2));
1869 w5.XOptions = ((Gtk.AttachOptions)(4));
1870 w5.YOptions = ((Gtk.AttachOptions)(4));
1871 // Container child table1.Gtk.Table+TableChild
1872- this._labelBaseUrl = new Gtk.Label();
1873- this._labelBaseUrl.Name = "_labelBaseUrl";
1874- this._labelBaseUrl.LabelProp = "* denotes a required field";
1875- this.table1.Add(this._labelBaseUrl);
1876- Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this._labelBaseUrl]));
1877- w6.TopAttach = ((uint)(5));
1878- w6.BottomAttach = ((uint)(6));
1879- w6.LeftAttach = ((uint)(1));
1880- w6.RightAttach = ((uint)(2));
1881- w6.XOptions = ((Gtk.AttachOptions)(4));
1882- w6.YOptions = ((Gtk.AttachOptions)(4));
1883- // Container child table1.Gtk.Table+TableChild
1884 this._labelBaseUrl1 = new Gtk.Label();
1885 this._labelBaseUrl1.Name = "_labelBaseUrl1";
1886 this._labelBaseUrl1.LabelProp = "Base Url*";
1887 this.table1.Add(this._labelBaseUrl1);
1888- Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.table1[this._labelBaseUrl1]));
1889- w7.XOptions = ((Gtk.AttachOptions)(4));
1890- w7.YOptions = ((Gtk.AttachOptions)(4));
1891+ Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this._labelBaseUrl1]));
1892+ w6.XOptions = ((Gtk.AttachOptions)(4));
1893+ w6.YOptions = ((Gtk.AttachOptions)(4));
1894 // Container child table1.Gtk.Table+TableChild
1895 this._labelMaxSearchResults = new Gtk.Label();
1896 this._labelMaxSearchResults.Name = "_labelMaxSearchResults";
1897 this._labelMaxSearchResults.LabelProp = "Max Search Results";
1898 this.table1.Add(this._labelMaxSearchResults);
1899- Gtk.Table.TableChild w8 = ((Gtk.Table.TableChild)(this.table1[this._labelMaxSearchResults]));
1900- w8.TopAttach = ((uint)(3));
1901- w8.BottomAttach = ((uint)(4));
1902- w8.XOptions = ((Gtk.AttachOptions)(4));
1903- w8.YOptions = ((Gtk.AttachOptions)(4));
1904+ Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.table1[this._labelMaxSearchResults]));
1905+ w7.TopAttach = ((uint)(3));
1906+ w7.BottomAttach = ((uint)(4));
1907+ w7.XOptions = ((Gtk.AttachOptions)(4));
1908+ w7.YOptions = ((Gtk.AttachOptions)(4));
1909 // Container child table1.Gtk.Table+TableChild
1910 this._labelPassword = new Gtk.Label();
1911 this._labelPassword.Name = "_labelPassword";
1912 this._labelPassword.LabelProp = "Password";
1913 this.table1.Add(this._labelPassword);
1914- Gtk.Table.TableChild w9 = ((Gtk.Table.TableChild)(this.table1[this._labelPassword]));
1915- w9.TopAttach = ((uint)(2));
1916- w9.BottomAttach = ((uint)(3));
1917- w9.XOptions = ((Gtk.AttachOptions)(4));
1918- w9.YOptions = ((Gtk.AttachOptions)(4));
1919+ Gtk.Table.TableChild w8 = ((Gtk.Table.TableChild)(this.table1[this._labelPassword]));
1920+ w8.TopAttach = ((uint)(2));
1921+ w8.BottomAttach = ((uint)(3));
1922+ w8.XOptions = ((Gtk.AttachOptions)(4));
1923+ w8.YOptions = ((Gtk.AttachOptions)(4));
1924 // Container child table1.Gtk.Table+TableChild
1925 this._labelUsername = new Gtk.Label();
1926 this._labelUsername.Name = "_labelUsername";
1927 this._labelUsername.LabelProp = "Username";
1928 this.table1.Add(this._labelUsername);
1929- Gtk.Table.TableChild w10 = ((Gtk.Table.TableChild)(this.table1[this._labelUsername]));
1930- w10.TopAttach = ((uint)(1));
1931- w10.BottomAttach = ((uint)(2));
1932- w10.XOptions = ((Gtk.AttachOptions)(4));
1933- w10.YOptions = ((Gtk.AttachOptions)(4));
1934+ Gtk.Table.TableChild w9 = ((Gtk.Table.TableChild)(this.table1[this._labelUsername]));
1935+ w9.TopAttach = ((uint)(1));
1936+ w9.BottomAttach = ((uint)(2));
1937+ w9.XOptions = ((Gtk.AttachOptions)(4));
1938+ w9.YOptions = ((Gtk.AttachOptions)(4));
1939 // Container child table1.Gtk.Table+TableChild
1940 this._saveButton = new Gtk.Button();
1941 this._saveButton.CanFocus = true;
1942@@ -163,13 +162,13 @@
1943 this._saveButton.Xalign = 0F;
1944 this._saveButton.Label = "Save";
1945 this.table1.Add(this._saveButton);
1946- Gtk.Table.TableChild w11 = ((Gtk.Table.TableChild)(this.table1[this._saveButton]));
1947- w11.TopAttach = ((uint)(4));
1948- w11.BottomAttach = ((uint)(5));
1949- w11.LeftAttach = ((uint)(1));
1950- w11.RightAttach = ((uint)(2));
1951- w11.XOptions = ((Gtk.AttachOptions)(0));
1952- w11.YOptions = ((Gtk.AttachOptions)(4));
1953+ Gtk.Table.TableChild w10 = ((Gtk.Table.TableChild)(this.table1[this._saveButton]));
1954+ w10.TopAttach = ((uint)(4));
1955+ w10.BottomAttach = ((uint)(5));
1956+ w10.LeftAttach = ((uint)(1));
1957+ w10.RightAttach = ((uint)(2));
1958+ w10.XOptions = ((Gtk.AttachOptions)(0));
1959+ w10.YOptions = ((Gtk.AttachOptions)(4));
1960 this.Add(this.table1);
1961 if ((this.Child != null)) {
1962 this.Child.ShowAll();
1963
1964=== modified file 'Confluence/gtk-gui/generated.cs'
1965--- Confluence/gtk-gui/generated.cs 2009-01-05 01:32:46 +0000
1966+++ Confluence/gtk-gui/generated.cs 2009-06-23 00:52:54 +0000
1967@@ -1,7 +1,7 @@
1968 // ------------------------------------------------------------------------------
1969 // <autogenerated>
1970 // This code was generated by a tool.
1971-// Mono Runtime Version: 2.0.50727.42
1972+//
1973 //
1974 // Changes to this file may cause incorrect behavior and will be lost if
1975 // the code is regenerated.
1976
1977=== modified file 'Confluence/gtk-gui/gui.stetic'
1978--- Confluence/gtk-gui/gui.stetic 2009-01-09 07:25:58 +0000
1979+++ Confluence/gtk-gui/gui.stetic 2009-06-23 00:52:54 +0000
1980@@ -5,6 +5,7 @@
1981 <target-gtk-version>2.12</target-gtk-version>
1982 </configuration>
1983 <import>
1984+ <widget-library name="Do.Platform.Linux, Version=0.9.0.0, Culture=neutral" />
1985 <widget-library name="../bin/Debug/Confluence.dll" internal="true" />
1986 </import>
1987 <widget class="Gtk.Bin" id="Confluence.ConfluenceConfigWidget" design-size="460 184">
1988
1989=== modified file 'Confluence/src/ConfluenceSearchAction.cs'
1990--- Confluence/src/ConfluenceSearchAction.cs 2008-12-24 04:37:17 +0000
1991+++ Confluence/src/ConfluenceSearchAction.cs 2009-06-22 04:05:16 +0000
1992@@ -21,7 +21,7 @@
1993 using System.Collections.Generic;
1994 using Do.Universe;
1995 using Do.Platform.Linux;
1996-using Mono.Unix;
1997+using Mono.Addins;
1998
1999
2000 /// <summary>
2001@@ -82,7 +82,7 @@
2002 /// </value>
2003 public override string Name
2004 {
2005- get { return Catalog.GetString ("Search Confluence"); }
2006+ get { return AddinManager.CurrentLocalizer.GetString ("Search Confluence"); }
2007 }
2008
2009 /// <value>
2010@@ -90,7 +90,7 @@
2011 /// </value>
2012 public override string Description
2013 {
2014- get { return Catalog.GetString ("Searches Confluence and returns results to Do"); }
2015+ get { return AddinManager.CurrentLocalizer.GetString ("Searches Confluence and returns results to Do"); }
2016 }
2017
2018 /// <value>
2019
2020=== modified file 'Del.icio.us/Makefile.am'
2021--- Del.icio.us/Makefile.am 2009-01-16 01:25:56 +0000
2022+++ Del.icio.us/Makefile.am 2009-06-22 04:05:16 +0000
2023@@ -17,7 +17,6 @@
2024 Resources/icons/delicious.png
2025
2026 REFERENCES = \
2027- Mono.Posix \
2028 System \
2029 System.Core \
2030 System.Web \
2031
2032=== removed file 'Del.icio.us/Resources/delicious.addin.xml'
2033--- Del.icio.us/Resources/delicious.addin.xml 2009-01-16 01:25:56 +0000
2034+++ Del.icio.us/Resources/delicious.addin.xml 1970-01-01 00:00:00 +0000
2035@@ -1,28 +0,0 @@
2036-<Addin
2037- id="delicious"
2038- namespace="Do"
2039- version="2.0"
2040- name="del.icio.us Tag Search"
2041- description="Search your del.icio.us bookmarks."
2042- author="Jacob Andreas, Alex Launi"
2043- category="Community"
2044->
2045-
2046- <Runtime>
2047- <Import assembly="del.icio.us.dll"/>
2048- </Runtime>
2049-
2050- <Dependencies>
2051- <Addin id="Universe" version="1.0" />
2052- </Dependencies>
2053-
2054- <!-- Extensions included in this assembly -->
2055- <Extension path="/Do/Action">
2056- <Action type="Delicious.SearchAction" />
2057- <!-- <Action type="Delicious.NewBookmarkAction" /> -->
2058- </Extension>
2059- <Extension path="/Do/ItemSource">
2060- <ItemSource type="Delicious.BookmarksItemSource" />
2061- <ItemSource type="Delicious.TagsItemSource" />
2062- </Extension>
2063-</Addin>
2064
2065=== added file 'Del.icio.us/Resources/delicious.addin.xml.in'
2066--- Del.icio.us/Resources/delicious.addin.xml.in 1970-01-01 00:00:00 +0000
2067+++ Del.icio.us/Resources/delicious.addin.xml.in 2009-06-22 21:50:13 +0000
2068@@ -0,0 +1,31 @@
2069+<Addin
2070+ id="delicious"
2071+ namespace="Do"
2072+ version="2.0"
2073+ name="del.icio.us Tag Search"
2074+ description="Search your del.icio.us bookmarks."
2075+ author="Jacob Andreas, Alex Launi"
2076+ category="Community"
2077+ defaultEnabled="false"
2078+>
2079+
2080+ <Runtime>
2081+ <Import assembly="del.icio.us.dll"/>
2082+ </Runtime>
2083+
2084+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
2085+
2086+ <Dependencies>
2087+ <Addin id="Universe" version="1.0" />
2088+ </Dependencies>
2089+
2090+ <!-- Extensions included in this assembly -->
2091+ <Extension path="/Do/Action">
2092+ <Action type="Delicious.SearchAction" />
2093+ <!-- <Action type="Delicious.NewBookmarkAction" /> -->
2094+ </Extension>
2095+ <Extension path="/Do/ItemSource">
2096+ <ItemSource type="Delicious.BookmarksItemSource" />
2097+ <ItemSource type="Delicious.TagsItemSource" />
2098+ </Extension>
2099+</Addin>
2100
2101=== modified file 'Del.icio.us/del.icio.us.mdp'
2102--- Del.icio.us/del.icio.us.mdp 2009-01-16 01:25:56 +0000
2103+++ Del.icio.us/del.icio.us.mdp 2009-06-23 00:52:54 +0000
2104@@ -1,4 +1,4 @@
2105-<Project name="del.icio.us" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
2106+<Project name="del.icio.us" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2107 <Configurations active="Debug">
2108 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
2109 <Output directory="bin/Debug" assembly="del.icio.us" />
2110@@ -30,13 +30,12 @@
2111 <References>
2112 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2113 <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2114- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
2115 <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2116 <ProjectReference type="Gac" localcopy="True" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
2117 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2118- <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
2119- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
2120- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform.Linux, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
2121+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform.Linux, Version=0.9.0.0, Culture=neutral" />
2122+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
2123+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
2124+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
2125 </References>
2126- <GtkDesignInfo />
2127 </Project>
2128\ No newline at end of file
2129
2130=== modified file 'Del.icio.us/src/BookmarksItemSource.cs'
2131--- Del.icio.us/src/BookmarksItemSource.cs 2009-01-16 01:25:56 +0000
2132+++ Del.icio.us/src/BookmarksItemSource.cs 2009-06-22 04:05:16 +0000
2133@@ -27,18 +27,18 @@
2134
2135 using Do.Platform.Linux;
2136
2137-using Mono.Unix;
2138+using Mono.Addins;
2139
2140 namespace Delicious
2141 {
2142 public class BookmarksItemSource : ItemSource, IConfigurable
2143 {
2144 public override string Name {
2145- get { return Catalog.GetString ("Del.icio.us bookmarks"); }
2146+ get { return AddinManager.CurrentLocalizer.GetString ("Del.icio.us bookmarks"); }
2147 }
2148
2149 public override string Description {
2150- get { return Catalog.GetString ("Indexes your del.icio.us bookmarks"); }
2151+ get { return AddinManager.CurrentLocalizer.GetString ("Indexes your del.icio.us bookmarks"); }
2152 }
2153
2154 public override string Icon {
2155@@ -59,7 +59,7 @@
2156
2157 public override IEnumerable<Item> ChildrenOfItem (Item item)
2158 {
2159- return null;
2160+ yield break;
2161 }
2162
2163 public override void UpdateItems ()
2164
2165=== modified file 'Del.icio.us/src/NewBookmarkAction.cs'
2166--- Del.icio.us/src/NewBookmarkAction.cs 2008-12-23 19:12:45 +0000
2167+++ Del.icio.us/src/NewBookmarkAction.cs 2009-06-22 04:05:16 +0000
2168@@ -23,7 +23,7 @@
2169 using System.Threading;
2170 using System.Text.RegularExpressions;
2171
2172-using Mono.Unix;
2173+using Mono.Addins;
2174 using Do.Universe;
2175
2176
2177@@ -55,11 +55,11 @@
2178 }
2179
2180 public override string Name {
2181- get { return Catalog.GetString ("New del.icio.us bookmark"); }
2182+ get { return AddinManager.CurrentLocalizer.GetString ("New del.icio.us bookmark"); }
2183 }
2184
2185 public override string Description {
2186- get { return Catalog.GetString ("Create a new bookmark at del.icio.us"); }
2187+ get { return AddinManager.CurrentLocalizer.GetString ("Create a new bookmark at del.icio.us"); }
2188 }
2189
2190 public override string Icon {
2191@@ -96,7 +96,7 @@
2192
2193 public override IEnumerable<Item> DynamicModifierItemsForItem (Item item)
2194 {
2195- return null;
2196+ yield break;
2197 }
2198
2199 public bool ModifierItemsOptional {
2200@@ -121,8 +121,8 @@
2201 newBookmark.IsBackground = true;
2202 newBookmark.Start ((object) url);
2203 }
2204- return null;
2205+ yield break;
2206 }
2207 }
2208 }
2209-*/
2210\ No newline at end of file
2211+*/
2212
2213=== modified file 'Del.icio.us/src/SearchAction.cs'
2214--- Del.icio.us/src/SearchAction.cs 2009-01-16 22:52:03 +0000
2215+++ Del.icio.us/src/SearchAction.cs 2009-06-22 04:05:16 +0000
2216@@ -26,7 +26,7 @@
2217 using System.Collections.Generic;
2218 using System.Security.Cryptography.X509Certificates;
2219
2220-using Mono.Unix;
2221+using Mono.Addins;
2222
2223 using Do.Universe;
2224 using Do.Universe.Common;
2225@@ -44,11 +44,11 @@
2226 public class SearchAction : Act
2227 {
2228 public override string Name {
2229- get { return Catalog.GetString ("Search del.icio.us"); }
2230+ get { return AddinManager.CurrentLocalizer.GetString ("Search del.icio.us"); }
2231 }
2232
2233 public override string Description {
2234- get { return Catalog.GetString ("del.icio.us tag search"); }
2235+ get { return AddinManager.CurrentLocalizer.GetString ("del.icio.us tag search"); }
2236 }
2237
2238 public override string Icon {
2239@@ -118,7 +118,7 @@
2240
2241 public override IEnumerable<Item> DynamicModifierItemsForItem (Item item)
2242 {
2243- return null;
2244+ yield break;
2245 }
2246
2247 }
2248
2249=== modified file 'Del.icio.us/src/TagItem.cs'
2250--- Del.icio.us/src/TagItem.cs 2008-12-21 23:44:34 +0000
2251+++ Del.icio.us/src/TagItem.cs 2009-06-22 04:05:16 +0000
2252@@ -21,7 +21,7 @@
2253
2254 using System;
2255 using Do.Universe;
2256-using Mono.Unix;
2257+using Mono.Addins;
2258
2259 namespace Delicious
2260 {
2261@@ -42,9 +42,9 @@
2262 public override string Description {
2263 get {
2264 if (tag.Equals ("Untagged"))
2265- return Catalog.GetString ("Untagged del.ico.us bookmarks");
2266+ return AddinManager.CurrentLocalizer.GetString ("Untagged del.ico.us bookmarks");
2267 return string.Format (
2268- Catalog.GetString ("del.icio.us bookmarks tagged with {0}"), Name);
2269+ AddinManager.CurrentLocalizer.GetString ("del.icio.us bookmarks tagged with {0}"), Name);
2270 }
2271 }
2272
2273
2274=== modified file 'Del.icio.us/src/TagsItemSource.cs'
2275--- Del.icio.us/src/TagsItemSource.cs 2009-01-16 01:25:56 +0000
2276+++ Del.icio.us/src/TagsItemSource.cs 2009-06-22 04:05:16 +0000
2277@@ -22,7 +22,7 @@
2278 using System;
2279 using System.Collections.Generic;
2280
2281-using Mono.Unix;
2282+using Mono.Addins;
2283
2284 using Do.Universe;
2285
2286@@ -31,11 +31,11 @@
2287 public class TagsItemSource : ItemSource
2288 {
2289 public override string Name {
2290- get { return Catalog.GetString ("Del.icio.us Tags"); }
2291+ get { return AddinManager.CurrentLocalizer.GetString ("Del.icio.us Tags"); }
2292 }
2293
2294 public override string Description {
2295- get { return Catalog.GetString ("Organizes your del.icio.bookmarks by tag"); }
2296+ get { return AddinManager.CurrentLocalizer.GetString ("Organizes your del.icio.us bookmarks by tag"); }
2297 }
2298
2299 public override string Icon {
2300
2301=== modified file 'DiskMounter/DiskMounter.mdp'
2302--- DiskMounter/DiskMounter.mdp 2009-02-01 04:00:44 +0000
2303+++ DiskMounter/DiskMounter.mdp 2009-06-23 00:52:54 +0000
2304@@ -1,4 +1,4 @@
2305-<Project name="DiskMounter" fileversion="2.0" language="C#" DefaultNamespace="DiskMounter" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
2306+<Project name="DiskMounter" fileversion="2.0" language="C#" DefaultNamespace="DiskMounter" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2307 <Configurations active="Debug">
2308 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
2309 <Output directory="bin/Debug" assembly="DiskMounter" />
2310@@ -24,11 +24,10 @@
2311 </Contents>
2312 <References>
2313 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2314- <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2315- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
2316+ <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2317 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2318- <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
2319- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
2320+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
2321+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
2322+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
2323 </References>
2324- <GtkDesignInfo />
2325 </Project>
2326\ No newline at end of file
2327
2328=== modified file 'DiskMounter/Makefile.am'
2329--- DiskMounter/Makefile.am 2009-01-09 05:04:13 +0000
2330+++ DiskMounter/Makefile.am 2009-06-22 04:05:16 +0000
2331@@ -13,7 +13,6 @@
2332 Resources/DiskMounter.addin.xml
2333
2334 REFERENCES = \
2335- Mono.Posix \
2336 System \
2337 System.Core \
2338 $(GNOME_VFS_SHARP_20_LIBS) \
2339
2340=== removed file 'DiskMounter/Resources/DiskMounter.addin.xml'
2341--- DiskMounter/Resources/DiskMounter.addin.xml 2009-01-09 03:22:05 +0000
2342+++ DiskMounter/Resources/DiskMounter.addin.xml 1970-01-01 00:00:00 +0000
2343@@ -1,28 +0,0 @@
2344-<Addin
2345- id="DiskMounter"
2346- namespace="Do"
2347- version="1.0"
2348- name="Disk Mounter"
2349- description="Mount and unmount drive volumes in GNOME."
2350- author="Guillaume Béland"
2351- category="Community"
2352->
2353-
2354- <Runtime>
2355- <Import assembly="DiskMounter.dll"/>
2356- </Runtime>
2357-
2358- <Dependencies>
2359- <Addin id="Universe" version="1.0" />
2360- </Dependencies>
2361-
2362- <Extension path="/Do/Action">
2363- <Action type="DiskMounter.OpenVolume" />
2364- <Action type="DiskMounter.MountAction" />
2365- <Action type="DiskMounter.UnmountAction" />
2366- </Extension>
2367-
2368- <Extension path="/Do/ItemSource">
2369- <ItemSource type="DiskMounter.DriveItemSource" />
2370- </Extension>
2371-</Addin>
2372
2373=== added file 'DiskMounter/Resources/DiskMounter.addin.xml.in'
2374--- DiskMounter/Resources/DiskMounter.addin.xml.in 1970-01-01 00:00:00 +0000
2375+++ DiskMounter/Resources/DiskMounter.addin.xml.in 2009-06-22 21:50:13 +0000
2376@@ -0,0 +1,31 @@
2377+<Addin
2378+ id="DiskMounter"
2379+ namespace="Do"
2380+ version="1.0"
2381+ name="Disk Mounter"
2382+ description="Mount and unmount drive volumes in GNOME."
2383+ author="Guillaume Béland"
2384+ category="Community"
2385+ defaultEnabled="false"
2386+>
2387+
2388+ <Runtime>
2389+ <Import assembly="DiskMounter.dll"/>
2390+ </Runtime>
2391+
2392+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
2393+
2394+ <Dependencies>
2395+ <Addin id="Universe" version="1.0" />
2396+ </Dependencies>
2397+
2398+ <Extension path="/Do/Action">
2399+ <Action type="DiskMounter.OpenVolume" />
2400+ <Action type="DiskMounter.MountAction" />
2401+ <Action type="DiskMounter.UnmountAction" />
2402+ </Extension>
2403+
2404+ <Extension path="/Do/ItemSource">
2405+ <ItemSource type="DiskMounter.DriveItemSource" />
2406+ </Extension>
2407+</Addin>
2408
2409=== modified file 'DiskMounter/src/DriveItem.cs'
2410--- DiskMounter/src/DriveItem.cs 2008-12-21 23:44:34 +0000
2411+++ DiskMounter/src/DriveItem.cs 2009-06-17 01:19:09 +0000
2412@@ -17,13 +17,15 @@
2413 //
2414
2415 using System;
2416+
2417 using Do.Universe;
2418+using Do.Platform;
2419
2420 using Gnome.Vfs;
2421
2422 namespace DiskMounter
2423 {
2424- public class DriveItem : Item
2425+ public class DriveItem : Item, IUriItem
2426 {
2427 private Drive drive;
2428
2429@@ -33,52 +35,79 @@
2430 }
2431
2432 public override string Name {
2433- get { return drive.DisplayName; }
2434+ get { return drive.DisplayName; }
2435 }
2436
2437 public override string Description {
2438- get { return String.Format("{0}",drive.DeviceType); }
2439+ get {
2440+ string status = IsMounted ? Uri : "Unmounted";
2441+ return drive.DeviceType.ToString () + " (" + status + ")";
2442+ }
2443 }
2444-
2445+
2446+ // It seems only the Icon property from obsolete MountedVolume can depict a mounted drive,
2447+ // Drive.Icon shows the same icon when the drive is umounted or mounted.
2448 public override string Icon {
2449- get { return drive.Icon; }
2450+ get { return IsMounted ? drive.MountedVolume.Icon : drive.Icon; }
2451 }
2452-
2453- public string Path {
2454- get { return drive.ActivationUri.ToString(); }
2455+
2456+ // It seems only the ActivationUri property from obsolete MountedVolume can return a valid URI,
2457+ // Drive.ActivationUri only returns null
2458+ public string Uri {
2459+ get { return IsMounted ? drive.MountedVolume.ActivationUri : ""; }
2460 }
2461
2462 public void Unmount ()
2463 {
2464 try {
2465- drive.Unmount (VolumeOpCallback);
2466- } catch
2467- { // error message will be handled by VolumeOpCallback
2468+ if (drive.NeedsEject ())
2469+ drive.Eject (new VolumeOpCallback (OnEject));
2470+ else
2471+ drive.Unmount (new VolumeOpCallback (OnUnmount));
2472+ } catch {
2473+ // error message will be handled by VolumeOpCallback
2474 }
2475 }
2476
2477 public void Mount ()
2478 {
2479 try {
2480- drive.Mount (VolumeOpCallback);
2481- } catch
2482- { // error message will be handled by VolumeOpCallback
2483+ drive.Mount (new VolumeOpCallback (OnMount));
2484+ } catch (Exception ex) {
2485+ Log.Debug ("An error occurred while executing the Mount operation.");
2486+ Log.Error (ex.Message);
2487 }
2488 }
2489
2490 public bool IsMounted
2491 {
2492 get {
2493- return drive.IsMounted;
2494+ return drive.IsMounted && drive.MountedVolumes.Count > 0;
2495 }
2496 }
2497-
2498- public void VolumeOpCallback (bool succeeded, string error, string detailed_error)
2499- {
2500- if ( succeeded )
2501- Console.WriteLine("Unmount operation succeeded");
2502- else
2503- Console.Error.WriteLine("Unmount operation failed {0}, detail : {1}" , error, detailed_error );
2504+
2505+ void OnMount (bool succeeded, string error, string detailed_error)
2506+ {
2507+ if (succeeded)
2508+ Log.Debug ("Mount operation succeeded");
2509+ else
2510+ Log.Error ("Mountt operation failed {0}, detail: {1}", error, detailed_error);
2511+ }
2512+
2513+ void OnUnmount (bool succeeded, string error, string detailed_error)
2514+ {
2515+ if (succeeded)
2516+ Log.Debug ("Unmount operation succeeded");
2517+ else
2518+ Log.Error ("Unmount operation failed {0}, detail: {1}", error, detailed_error);
2519+ }
2520+
2521+ void OnEject (bool succeeded, string error, string detailed_error)
2522+ {
2523+ if (succeeded)
2524+ Log.Debug ("Eject operation succeeded");
2525+ else
2526+ Log.Error ("Eject operation failed {0}, detail: {1}", error, detailed_error);
2527 }
2528 }
2529 }
2530
2531=== modified file 'DiskMounter/src/DriveItemSource.cs'
2532--- DiskMounter/src/DriveItemSource.cs 2008-12-21 23:44:34 +0000
2533+++ DiskMounter/src/DriveItemSource.cs 2009-06-17 01:07:23 +0000
2534@@ -27,48 +27,44 @@
2535 public class DriveItemSource : ItemSource {
2536
2537 List<Item> items;
2538- private static Gnome.Vfs.VolumeMonitor monitor;
2539-
2540+ private static VolumeMonitor monitor;
2541+
2542 public DriveItemSource ()
2543 {
2544 Vfs.Initialize ();
2545 monitor = Gnome.Vfs.VolumeMonitor.Get ();
2546 items = new List<Item> ();
2547 }
2548-
2549+
2550 public override string Name {
2551 get { return "Drives"; }
2552 }
2553-
2554+
2555 public override string Description {
2556 get { return "Available mounted and unmounted drives."; }
2557 }
2558-
2559+
2560 public override string Icon {
2561 get { return "harddrive"; }
2562 }
2563-
2564+
2565 public override IEnumerable<Type> SupportedItemTypes {
2566- get {
2567- return new Type[] {
2568- typeof (DriveItem),
2569- };
2570- }
2571+ get { yield return typeof (DriveItem); }
2572 }
2573-
2574+
2575 public override IEnumerable<Item> Items {
2576 get { return items; }
2577 }
2578-
2579+
2580 public override IEnumerable<Item> ChildrenOfItem (Item item)
2581 {
2582- return null;
2583+ yield break;
2584 }
2585-
2586+
2587 public override void UpdateItems ()
2588 {
2589 items.Clear ();
2590-
2591+
2592 foreach (Drive drive in monitor.ConnectedDrives){
2593 items.Add (new DriveItem (drive));
2594 }
2595
2596=== modified file 'DiskMounter/src/MountAction.cs'
2597--- DiskMounter/src/MountAction.cs 2008-12-21 23:44:34 +0000
2598+++ DiskMounter/src/MountAction.cs 2009-06-22 04:05:16 +0000
2599@@ -19,21 +19,21 @@
2600 using System.Collections.Generic;
2601 using System.Linq;
2602
2603-using Gnome.Vfs;
2604-using Mono.Unix;
2605+using Mono.Addins;
2606
2607 using Do.Universe;
2608+using Do.Platform;
2609
2610 namespace DiskMounter
2611 {
2612 public class MountAction : Act
2613 {
2614 public override string Name {
2615- get { return Catalog.GetString ("Mount"); }
2616+ get { return AddinManager.CurrentLocalizer.GetString ("Mount"); }
2617 }
2618
2619 public override string Description {
2620- get { return Catalog.GetString ("Mount volume"); }
2621+ get { return AddinManager.CurrentLocalizer.GetString ("Mount volume"); }
2622 }
2623
2624 public override string Icon {
2625@@ -41,11 +41,7 @@
2626 }
2627
2628 public override IEnumerable<Type> SupportedItemTypes {
2629- get {
2630- return new Type[] {
2631- typeof (DriveItem),
2632- };
2633- }
2634+ get { yield return typeof (DriveItem); }
2635 }
2636
2637 public override bool SupportsItem (Item item)
2638@@ -60,8 +56,10 @@
2639
2640 public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
2641 {
2642- (items.First () as DriveItem).Mount ();
2643- return null;
2644+ Services.Application.RunOnThread (() => {
2645+ (items.First () as DriveItem).Mount ();
2646+ });
2647+ yield break;
2648 }
2649 }
2650 }
2651
2652=== modified file 'DiskMounter/src/OpenVolumeAction.cs'
2653--- DiskMounter/src/OpenVolumeAction.cs 2008-12-21 23:58:17 +0000
2654+++ DiskMounter/src/OpenVolumeAction.cs 2009-06-22 04:05:16 +0000
2655@@ -22,7 +22,7 @@
2656 using System.Linq;
2657
2658 using Gnome.Vfs;
2659-using Mono.Unix;
2660+using Mono.Addins;
2661
2662 using Do.Universe;
2663 using Do.Platform;
2664@@ -37,11 +37,11 @@
2665 }
2666
2667 public override string Name {
2668- get { return Catalog.GetString ("Open"); }
2669+ get { return AddinManager.CurrentLocalizer.GetString ("Open"); }
2670 }
2671
2672 public override string Description {
2673- get { return Catalog.GetString ("Open a removable volume"); }
2674+ get { return AddinManager.CurrentLocalizer.GetString ("Open a removable volume"); }
2675 }
2676
2677 public override string Icon {
2678@@ -58,9 +58,9 @@
2679 try {
2680 if (!drive.IsMounted)
2681 drive.Mount ();
2682- Services.Environment.OpenPath (drive.Path);
2683+ Services.Environment.OpenPath (drive.Uri);
2684 } catch (Exception e) {
2685- Log.Error ("Error opening {0} - {1}", drive.Path, e.Message);
2686+ Log.Error ("Error opening {0} - {1}", drive.Uri, e.Message);
2687 Log.Debug (e.StackTrace);
2688 }
2689 yield break;
2690
2691=== modified file 'DiskMounter/src/UnmountAction.cs'
2692--- DiskMounter/src/UnmountAction.cs 2008-12-21 23:44:34 +0000
2693+++ DiskMounter/src/UnmountAction.cs 2009-06-22 04:05:16 +0000
2694@@ -20,31 +20,29 @@
2695 using System.Collections.Generic;
2696 using System.Linq;
2697
2698-using Mono.Unix;
2699+using Mono.Addins;
2700+
2701 using Do.Universe;
2702+using Do.Platform;
2703
2704 namespace DiskMounter
2705 {
2706 public class UnmountAction : Act
2707 {
2708 public override string Name {
2709- get { return Catalog.GetString ("Unmount"); }
2710+ get { return AddinManager.CurrentLocalizer.GetString ("Unmount"); }
2711 }
2712
2713 public override string Description {
2714- get { return Catalog.GetString ("Unmount volume"); }
2715+ get { return AddinManager.CurrentLocalizer.GetString ("Unmount or eject a volume"); }
2716 }
2717
2718 public override string Icon {
2719- get { return "hdd_unmount"; }
2720+ get { return "media-eject"; }
2721 }
2722
2723 public override IEnumerable<Type> SupportedItemTypes {
2724- get {
2725- return new Type[] {
2726- typeof (DriveItem),
2727- };
2728- }
2729+ get { yield return typeof (DriveItem); }
2730 }
2731
2732 public override bool SupportsItem (Item item)
2733@@ -59,9 +57,10 @@
2734
2735 public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
2736 {
2737- (items.First ()
2738- as DriveItem).Unmount ();
2739- return null;
2740+ Services.Application.RunOnThread (() => {
2741+ (items.First () as DriveItem).Unmount ();
2742+ });
2743+ yield break;
2744 }
2745 }
2746 }
2747
2748=== modified file 'DoPlugins.mds'
2749--- DoPlugins.mds 2009-02-05 17:01:04 +0000
2750+++ DoPlugins.mds 2009-06-27 17:26:11 +0000
2751@@ -1,4 +1,4 @@
2752-<Combine releaseversion="0.4.9.9" name="DoPlugins" fileversion="2.0" outputpath="build/bin/">
2753+<Combine fileversion="2.0" outputpath="build/bin/" name="DoPlugins" releaseversion="0.4.9.9">
2754 <Configurations active="Debug">
2755 <Configuration name="Debug" ctype="CombineConfiguration">
2756 <Entry build="True" name="Rhythmbox" configuration="Debug" />
2757@@ -64,11 +64,16 @@
2758 <Entry build="True" name="GoogleContacts" configuration="Debug" />
2759 <Entry build="True" name="GoogleSearch" configuration="Debug" />
2760 <Entry build="True" name="Stock Quote" configuration="Debug" />
2761+ <Entry build="True" name="RequestTracker" configuration="Debug" />
2762 <Entry build="True" name="TerminalServerClient" configuration="Debug" />
2763 <Entry build="True" name="xmms2" configuration="Debug" />
2764 <Entry build="True" name="TinyUrl" configuration="Debug" />
2765 <Entry build="True" name="Tracker" configuration="Debug" />
2766 <Entry build="True" name="XRandR" configuration="Debug" />
2767+ <Entry build="True" name="YouTube" configuration="Debug" />
2768+ <Entry build="True" name="Emesene" configuration="Debug" />
2769+ <Entry build="True" name="Dropbox" configuration="Debug" />
2770+ <Entry build="True" name="RemindMe" configuration="Debug" />
2771 </Configuration>
2772 <Configuration name="Release" ctype="CombineConfiguration">
2773 <Entry build="True" name="Rhythmbox" configuration="Release" />
2774@@ -134,11 +139,17 @@
2775 <Entry build="True" name="GoogleContacts" configuration="Release" />
2776 <Entry build="True" name="GoogleSearch" configuration="Release" />
2777 <Entry build="True" name="Stock Quote" configuration="Release" />
2778+ <Entry build="True" name="RequestTracker" configuration="Release" />
2779 <Entry build="True" name="TerminalServerClient" configuration="Release" />
2780 <Entry build="True" name="xmms2" configuration="Release" />
2781 <Entry build="True" name="TinyUrl" configuration="Release" />
2782 <Entry build="True" name="Tracker" configuration="Release" />
2783+
2784 <Entry build="True" name="XRandR" configuration="Release" />
2785+ <Entry build="True" name="YouTube" configuration="Release" />
2786+ <Entry build="True" name="Emesene" configuration="Release" />
2787+ <Entry build="True" name="Dropbox" configuration="Release" />
2788+ <Entry build="True" name="RemindMe" configuration="Release" />
2789 </Configuration>
2790 </Configurations>
2791 <StartMode startupentry="Rhythmbox" single="True">
2792@@ -205,11 +216,16 @@
2793 <Execute type="None" entry="GoogleContacts" />
2794 <Execute type="None" entry="GoogleSearch" />
2795 <Execute type="None" entry="Stock Quote" />
2796+ <Execute type="None" entry="RequestTracker" />
2797 <Execute type="None" entry="TerminalServerClient" />
2798 <Execute type="None" entry="xmms2" />
2799 <Execute type="None" entry="TinyUrl" />
2800 <Execute type="None" entry="Tracker" />
2801 <Execute type="None" entry="XRandR" />
2802+ <Execute type="None" entry="YouTube" />
2803+ <Execute type="None" entry="Emesene" />
2804+ <Execute type="None" entry="Dropbox" />
2805+ <Execute type="None" entry="RemindMe" />
2806 </StartMode>
2807 <MonoDevelop.ChangeLogAddIn.ChangeLogInfo policy="UpdateNearestChangeLog" />
2808 <Entries>
2809@@ -276,10 +292,15 @@
2810 <Entry filename="GoogleContacts/GMailContacts.mdp" />
2811 <Entry filename="GoogleSearch/GoogleSearch.mdp" />
2812 <Entry filename="StockQuote/Stock Quote.mdp" />
2813+ <Entry filename="RequestTracker/RequestTracker.mdp" />
2814 <Entry filename="TerminalServerClient/TerminalServerClient.mdp" />
2815 <Entry filename="Xmms2/xmms2.mdp" />
2816 <Entry filename="TinyUrl/TinyUrl.mdp" />
2817 <Entry filename="Tracker/Tracker.mdp" />
2818 <Entry filename="XRandR/XRandR.mdp" />
2819+ <Entry filename="YouTube/YouTube.mdp" />
2820+ <Entry filename="Emesene/Emesene.mdp" />
2821+ <Entry filename="Dropbox/Dropbox.mdp" />
2822+ <Entry filename="RemindMe/RemindMe.mdp" />
2823 </Entries>
2824 </Combine>
2825\ No newline at end of file
2826
2827=== added directory 'Dropbox'
2828=== added file 'Dropbox/Dropbox.mdp'
2829--- Dropbox/Dropbox.mdp 1970-01-01 00:00:00 +0000
2830+++ Dropbox/Dropbox.mdp 2009-06-23 00:52:54 +0000
2831@@ -0,0 +1,54 @@
2832+<Project name="Dropbox" fileversion="2.0" language="C#" targetFramework="3.5" ctype="DotNetProject">
2833+ <Configurations active="Debug">
2834+ <Configuration name="Debug" ctype="DotNetProjectConfiguration">
2835+ <Output directory="bin/Debug" assembly="Dropbox" />
2836+ <Build debugmode="True" target="Library" />
2837+ <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
2838+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2839+ </Configuration>
2840+ <Configuration name="Release" ctype="DotNetProjectConfiguration">
2841+ <Output directory="bin/Release" assembly="Dropbox" />
2842+ <Build debugmode="False" target="Library" />
2843+ <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" />
2844+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2845+ </Configuration>
2846+ </Configurations>
2847+ <Contents>
2848+ <File name="src" subtype="Directory" buildaction="Compile" />
2849+ <File name="Resources" subtype="Directory" buildaction="Compile" />
2850+ <File name="src/DropboxStartAction.cs" subtype="Code" buildaction="Compile" />
2851+ <File name="src/DropboxStopAction.cs" subtype="Code" buildaction="Compile" />
2852+ <File name="Resources/Dropbox.addin.xml" subtype="Code" buildaction="Nothing" />
2853+ <File name="src/DropboxPuburlAction.cs" subtype="Code" buildaction="Compile" />
2854+ <File name="src/Dropbox.cs" subtype="Code" buildaction="Compile" />
2855+ <File name="src/DropboxWebInterfaceAction.cs" subtype="Code" buildaction="Compile" />
2856+ <File name="src/DropboxRevisionsAction.cs" subtype="Code" buildaction="Compile" />
2857+ <File name="src/DropboxShareAction.cs" subtype="Code" buildaction="Compile" />
2858+ <File name="src/DropboxUnshareAction.cs" subtype="Code" buildaction="Compile" />
2859+ <File name="src/DropboxLinkAction.cs" subtype="Code" buildaction="Compile" />
2860+ <File name="src/DropboxAbstractAction.cs" subtype="Code" buildaction="Compile" />
2861+ <File name="gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" />
2862+ <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
2863+ <File name="gtk-gui/Dropbox.DropboxConfig.cs" subtype="Code" buildaction="Compile" />
2864+ <File name="src/Config/DropboxConfig.cs" subtype="Code" buildaction="Compile" />
2865+ <File name="Resources/icons" subtype="Directory" buildaction="Compile" />
2866+ <File name="Resources/icons/dropbox-add.png" subtype="Code" buildaction="Nothing" />
2867+ <File name="Resources/icons/dropbox-remove.png" subtype="Code" buildaction="Nothing" />
2868+ <File name="Resources/icons/dropbox-revisions.png" subtype="Code" buildaction="Nothing" />
2869+ <File name="Resources/icons/dropbox-share.png" subtype="Code" buildaction="Nothing" />
2870+ <File name="Resources/icons/dropbox-start.png" subtype="Code" buildaction="Nothing" />
2871+ <File name="Resources/icons/dropbox-stop.png" subtype="Code" buildaction="Nothing" />
2872+ <File name="Resources/icons/dropbox-web.png" subtype="Code" buildaction="Nothing" />
2873+ </Contents>
2874+ <References>
2875+ <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2876+ <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2877+ <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2878+ <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2879+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
2880+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
2881+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
2882+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform.Linux, Version=0.9.0.0, Culture=neutral" />
2883+ </References>
2884+ <GtkDesignInfo gettextClass="Mono.Addins.AddinManager.CurrentLocalizer" />
2885+</Project>
2886\ No newline at end of file
2887
2888=== added file 'Dropbox/Makefile.am'
2889--- Dropbox/Makefile.am 1970-01-01 00:00:00 +0000
2890+++ Dropbox/Makefile.am 2009-06-22 04:05:16 +0000
2891@@ -0,0 +1,36 @@
2892+include $(top_srcdir)/build.rules.mk
2893+
2894+ASSEMBLY=Dropbox
2895+
2896+FILES = \
2897+ gtk-gui/Dropbox.DropboxConfig.cs \
2898+ gtk-gui/generated.cs \
2899+ src/Config/DropboxConfig.cs \
2900+ src/DropboxWebInterfaceAction.cs \
2901+ src/DropboxAbstractAction.cs \
2902+ src/DropboxRevisionsAction.cs \
2903+ src/DropboxPuburlAction.cs \
2904+ src/DropboxUnshareAction.cs \
2905+ src/DropboxShareAction.cs \
2906+ src/DropboxStartAction.cs \
2907+ src/DropboxStopAction.cs \
2908+ src/DropboxLinkAction.cs \
2909+ src/Dropbox.cs
2910+
2911+RESOURCES = \
2912+ Resources/Dropbox.addin.xml \
2913+ gtk-gui/gui.stetic \
2914+ Resources/icons/dropbox-add.png \
2915+ Resources/icons/dropbox-remove.png \
2916+ Resources/icons/dropbox-revisions.png \
2917+ Resources/icons/dropbox-share.png \
2918+ Resources/icons/dropbox-start.png \
2919+ Resources/icons/dropbox-stop.png \
2920+ Resources/icons/dropbox-web.png
2921+
2922+REFERENCES = \
2923+ System \
2924+ System.Core \
2925+ $(DO_PLATFORM_LINUX_LIBS) \
2926+ $(DO_UNIVERSE_LIBS) \
2927+ $(GTK_SHARP_20_LIBS)
2928
2929=== added directory 'Dropbox/Resources'
2930=== added file 'Dropbox/Resources/Dropbox.addin.xml.in'
2931--- Dropbox/Resources/Dropbox.addin.xml.in 1970-01-01 00:00:00 +0000
2932+++ Dropbox/Resources/Dropbox.addin.xml.in 2009-06-22 21:50:13 +0000
2933@@ -0,0 +1,33 @@
2934+<Addin
2935+ id="Dropbox"
2936+ namespace="Do"
2937+ version="1.0"
2938+ name="Dropbox"
2939+ description="Share and manage files in Dropbox."
2940+ author="Stephen Elson"
2941+ category="Community"
2942+ defaultEnabled="false"
2943+ >
2944+
2945+ <Runtime>
2946+ <Import assembly="Dropbox.dll"/>
2947+ </Runtime>
2948+
2949+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
2950+
2951+ <Dependencies>
2952+ <Addin id="Universe" version="1.0" />
2953+ </Dependencies>
2954+
2955+ <Extension path="/Do/Action">
2956+ <Action type="Dropbox.DropboxLinkAction" />
2957+ <Action type="Dropbox.DropboxStopAction" />
2958+ <Action type="Dropbox.DropboxStartAction" />
2959+ <Action type="Dropbox.DropboxShareAction" />
2960+ <Action type="Dropbox.DropboxUnshareAction" />
2961+ <Action type="Dropbox.DropboxPuburlAction" />
2962+ <Action type="Dropbox.DropboxRevisionsAction" />
2963+ <Action type="Dropbox.DropboxWebInterfaceAction" />
2964+ </Extension>
2965+
2966+</Addin>
2967
2968=== added directory 'Dropbox/Resources/icons'
2969=== added file 'Dropbox/Resources/icons/dropbox-add.png'
2970Binary files Dropbox/Resources/icons/dropbox-add.png 1970-01-01 00:00:00 +0000 and Dropbox/Resources/icons/dropbox-add.png 2009-06-16 21:33:56 +0000 differ
2971=== added file 'Dropbox/Resources/icons/dropbox-remove.png'
2972Binary files Dropbox/Resources/icons/dropbox-remove.png 1970-01-01 00:00:00 +0000 and Dropbox/Resources/icons/dropbox-remove.png 2009-06-16 21:33:56 +0000 differ
2973=== added file 'Dropbox/Resources/icons/dropbox-revisions.png'
2974Binary files Dropbox/Resources/icons/dropbox-revisions.png 1970-01-01 00:00:00 +0000 and Dropbox/Resources/icons/dropbox-revisions.png 2009-06-16 18:52:00 +0000 differ
2975=== added file 'Dropbox/Resources/icons/dropbox-share.png'
2976Binary files Dropbox/Resources/icons/dropbox-share.png 1970-01-01 00:00:00 +0000 and Dropbox/Resources/icons/dropbox-share.png 2009-06-16 21:33:56 +0000 differ
2977=== added file 'Dropbox/Resources/icons/dropbox-start.png'
2978Binary files Dropbox/Resources/icons/dropbox-start.png 1970-01-01 00:00:00 +0000 and Dropbox/Resources/icons/dropbox-start.png 2009-06-16 18:52:00 +0000 differ
2979=== added file 'Dropbox/Resources/icons/dropbox-stop.png'
2980Binary files Dropbox/Resources/icons/dropbox-stop.png 1970-01-01 00:00:00 +0000 and Dropbox/Resources/icons/dropbox-stop.png 2009-06-16 18:52:00 +0000 differ
2981=== added file 'Dropbox/Resources/icons/dropbox-web.png'
2982Binary files Dropbox/Resources/icons/dropbox-web.png 1970-01-01 00:00:00 +0000 and Dropbox/Resources/icons/dropbox-web.png 2009-06-16 21:33:56 +0000 differ
2983=== added directory 'Dropbox/gtk-gui'
2984=== added file 'Dropbox/gtk-gui/Dropbox.DropboxConfig.cs'
2985--- Dropbox/gtk-gui/Dropbox.DropboxConfig.cs 1970-01-01 00:00:00 +0000
2986+++ Dropbox/gtk-gui/Dropbox.DropboxConfig.cs 2009-06-22 04:05:16 +0000
2987@@ -0,0 +1,97 @@
2988+// ------------------------------------------------------------------------------
2989+// <autogenerated>
2990+// This code was generated by a tool.
2991+//
2992+//
2993+// Changes to this file may cause incorrect behavior and will be lost if
2994+// the code is regenerated.
2995+// </autogenerated>
2996+// ------------------------------------------------------------------------------
2997+
2998+namespace Dropbox {
2999+
3000+
3001+ public partial class DropboxConfig {
3002+
3003+ private Gtk.VBox vbox2;
3004+
3005+ private Gtk.Frame frame2;
3006+
3007+ private Gtk.Alignment GtkAlignment;
3008+
3009+ private Gtk.HBox hbox2;
3010+
3011+ private Gtk.Entry base_path_entry;
3012+
3013+ private Gtk.Button base_path_button;
3014+
3015+ private Gtk.Label GtkLabel1;
3016+
3017+ protected virtual void Build() {
3018+ Stetic.Gui.Initialize(this);
3019+ // Widget Dropbox.DropboxConfig
3020+ Stetic.BinContainer.Attach(this);
3021+ this.Name = "Dropbox.DropboxConfig";
3022+ // Container child Dropbox.DropboxConfig.Gtk.Container+ContainerChild
3023+ this.vbox2 = new Gtk.VBox();
3024+ this.vbox2.Name = "vbox2";
3025+ this.vbox2.Spacing = 6;
3026+ // Container child vbox2.Gtk.Box+BoxChild
3027+ this.frame2 = new Gtk.Frame();
3028+ this.frame2.Name = "frame2";
3029+ this.frame2.ShadowType = ((Gtk.ShadowType)(0));
3030+ // Container child frame2.Gtk.Container+ContainerChild
3031+ this.GtkAlignment = new Gtk.Alignment(0F, 0F, 1F, 1F);
3032+ this.GtkAlignment.Name = "GtkAlignment";
3033+ this.GtkAlignment.LeftPadding = ((uint)(2));
3034+ this.GtkAlignment.TopPadding = ((uint)(8));
3035+ this.GtkAlignment.RightPadding = ((uint)(8));
3036+ this.GtkAlignment.BottomPadding = ((uint)(8));
3037+ // Container child GtkAlignment.Gtk.Container+ContainerChild
3038+ this.hbox2 = new Gtk.HBox();
3039+ this.hbox2.Name = "hbox2";
3040+ this.hbox2.Spacing = 6;
3041+ // Container child hbox2.Gtk.Box+BoxChild
3042+ this.base_path_entry = new Gtk.Entry();
3043+ this.base_path_entry.Sensitive = false;
3044+ this.base_path_entry.CanFocus = true;
3045+ this.base_path_entry.Name = "base_path_entry";
3046+ this.base_path_entry.IsEditable = false;
3047+ this.base_path_entry.InvisibleChar = '●';
3048+ this.hbox2.Add(this.base_path_entry);
3049+ Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.hbox2[this.base_path_entry]));
3050+ w1.Position = 0;
3051+ // Container child hbox2.Gtk.Box+BoxChild
3052+ this.base_path_button = new Gtk.Button();
3053+ this.base_path_button.CanFocus = true;
3054+ this.base_path_button.Name = "base_path_button";
3055+ this.base_path_button.UseStock = true;
3056+ this.base_path_button.UseUnderline = true;
3057+ this.base_path_button.Label = "gtk-open";
3058+ this.hbox2.Add(this.base_path_button);
3059+ Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox2[this.base_path_button]));
3060+ w2.Position = 1;
3061+ w2.Expand = false;
3062+ w2.Fill = false;
3063+ this.GtkAlignment.Add(this.hbox2);
3064+ this.frame2.Add(this.GtkAlignment);
3065+ this.GtkLabel1 = new Gtk.Label();
3066+ this.GtkLabel1.Name = "GtkLabel1";
3067+ this.GtkLabel1.LabelProp = Mono.Addins.AddinManager.CurrentLocalizer.GetString("Dropbox Location");
3068+ this.GtkLabel1.UseMarkup = true;
3069+ this.frame2.LabelWidget = this.GtkLabel1;
3070+ this.vbox2.Add(this.frame2);
3071+ Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.vbox2[this.frame2]));
3072+ w5.Position = 0;
3073+ w5.Expand = false;
3074+ w5.Fill = false;
3075+ w5.Padding = ((uint)(5));
3076+ this.Add(this.vbox2);
3077+ if ((this.Child != null)) {
3078+ this.Child.ShowAll();
3079+ }
3080+ this.Hide();
3081+ this.base_path_button.Clicked += new System.EventHandler(this.OnBasePathBtnClicked);
3082+ }
3083+ }
3084+}
3085
3086=== added file 'Dropbox/gtk-gui/generated.cs'
3087--- Dropbox/gtk-gui/generated.cs 1970-01-01 00:00:00 +0000
3088+++ Dropbox/gtk-gui/generated.cs 2009-06-01 20:24:58 +0000
3089@@ -0,0 +1,82 @@
3090+// ------------------------------------------------------------------------------
3091+// <autogenerated>
3092+// This code was generated by a tool.
3093+//
3094+//
3095+// Changes to this file may cause incorrect behavior and will be lost if
3096+// the code is regenerated.
3097+// </autogenerated>
3098+// ------------------------------------------------------------------------------
3099+
3100+namespace Stetic {
3101+
3102+
3103+ internal class Gui {
3104+
3105+ private static bool initialized;
3106+
3107+ internal static void Initialize(Gtk.Widget iconRenderer) {
3108+ if ((Stetic.Gui.initialized == false)) {
3109+ Stetic.Gui.initialized = true;
3110+ }
3111+ }
3112+ }
3113+
3114+ internal class BinContainer {
3115+
3116+ private Gtk.Widget child;
3117+
3118+ private Gtk.UIManager uimanager;
3119+
3120+ public static BinContainer Attach(Gtk.Bin bin) {
3121+ BinContainer bc = new BinContainer();
3122+ bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
3123+ bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
3124+ bin.Added += new Gtk.AddedHandler(bc.OnAdded);
3125+ return bc;
3126+ }
3127+
3128+ private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) {
3129+ if ((this.child != null)) {
3130+ args.Requisition = this.child.SizeRequest();
3131+ }
3132+ }
3133+
3134+ private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) {
3135+ if ((this.child != null)) {
3136+ this.child.Allocation = args.Allocation;
3137+ }
3138+ }
3139+
3140+ private void OnAdded(object sender, Gtk.AddedArgs args) {
3141+ this.child = args.Widget;
3142+ }
3143+
3144+ public void SetUiManager(Gtk.UIManager uim) {
3145+ this.uimanager = uim;
3146+ this.child.Realized += new System.EventHandler(this.OnRealized);
3147+ }
3148+
3149+ private void OnRealized(object sender, System.EventArgs args) {
3150+ if ((this.uimanager != null)) {
3151+ Gtk.Widget w;
3152+ w = this.child.Toplevel;
3153+ if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) {
3154+ ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
3155+ this.uimanager = null;
3156+ }
3157+ }
3158+ }
3159+ }
3160+
3161+ internal class ActionGroups {
3162+
3163+ public static Gtk.ActionGroup GetActionGroup(System.Type type) {
3164+ return Stetic.ActionGroups.GetActionGroup(type.FullName);
3165+ }
3166+
3167+ public static Gtk.ActionGroup GetActionGroup(string name) {
3168+ return null;
3169+ }
3170+ }
3171+}
3172
3173=== added file 'Dropbox/gtk-gui/gui.stetic'
3174--- Dropbox/gtk-gui/gui.stetic 1970-01-01 00:00:00 +0000
3175+++ Dropbox/gtk-gui/gui.stetic 2009-06-23 00:52:54 +0000
3176@@ -0,0 +1,96 @@
3177+<?xml version="1.0" encoding="utf-8"?>
3178+<stetic-interface>
3179+ <configuration>
3180+ <images-root-path>..</images-root-path>
3181+ <target-gtk-version>2.12.8</target-gtk-version>
3182+ </configuration>
3183+ <import>
3184+ <widget-library name="../bin/Debug/Dropbox.dll" internal="true" />
3185+ </import>
3186+ <widget class="Gtk.Bin" id="Dropbox.DropboxConfig" design-size="300 300">
3187+ <property name="MemberName" />
3188+ <property name="Visible">False</property>
3189+ <child>
3190+ <widget class="Gtk.VBox" id="vbox2">
3191+ <property name="MemberName" />
3192+ <property name="Spacing">6</property>
3193+ <child>
3194+ <widget class="Gtk.Frame" id="frame2">
3195+ <property name="MemberName" />
3196+ <property name="ShadowType">None</property>
3197+ <child>
3198+ <widget class="Gtk.Alignment" id="GtkAlignment">
3199+ <property name="MemberName" />
3200+ <property name="Xalign">0</property>
3201+ <property name="Yalign">0</property>
3202+ <property name="LeftPadding">2</property>
3203+ <property name="TopPadding">8</property>
3204+ <property name="RightPadding">8</property>
3205+ <property name="BottomPadding">8</property>
3206+ <child>
3207+ <widget class="Gtk.HBox" id="hbox2">
3208+ <property name="MemberName" />
3209+ <property name="Spacing">6</property>
3210+ <child>
3211+ <widget class="Gtk.Entry" id="base_path_entry">
3212+ <property name="MemberName" />
3213+ <property name="Sensitive">False</property>
3214+ <property name="CanFocus">True</property>
3215+ <property name="IsEditable">False</property>
3216+ <property name="InvisibleChar">●</property>
3217+ </widget>
3218+ <packing>
3219+ <property name="Position">0</property>
3220+ <property name="AutoSize">True</property>
3221+ </packing>
3222+ </child>
3223+ <child>
3224+ <widget class="Gtk.Button" id="base_path_button">
3225+ <property name="MemberName" />
3226+ <property name="CanFocus">True</property>
3227+ <property name="UseStock">True</property>
3228+ <property name="Type">StockItem</property>
3229+ <property name="StockId">gtk-open</property>
3230+ <signal name="Clicked" handler="OnBasePathBtnClicked" />
3231+ <property name="label">gtk-open</property>
3232+ </widget>
3233+ <packing>
3234+ <property name="Position">1</property>
3235+ <property name="AutoSize">True</property>
3236+ <property name="Expand">False</property>
3237+ <property name="Fill">False</property>
3238+ </packing>
3239+ </child>
3240+ </widget>
3241+ </child>
3242+ </widget>
3243+ </child>
3244+ <child>
3245+ <widget class="Gtk.Label" id="GtkLabel1">
3246+ <property name="MemberName" />
3247+ <property name="LabelProp" translatable="yes">Dropbox Location</property>
3248+ <property name="UseMarkup">True</property>
3249+ </widget>
3250+ <packing>
3251+ <property name="type">label_item</property>
3252+ </packing>
3253+ </child>
3254+ </widget>
3255+ <packing>
3256+ <property name="Position">0</property>
3257+ <property name="AutoSize">True</property>
3258+ <property name="Expand">False</property>
3259+ <property name="Fill">False</property>
3260+ <property name="Padding">5</property>
3261+ </packing>
3262+ </child>
3263+ <child>
3264+ <placeholder />
3265+ </child>
3266+ <child>
3267+ <placeholder />
3268+ </child>
3269+ </widget>
3270+ </child>
3271+ </widget>
3272+</stetic-interface>
3273\ No newline at end of file
3274
3275=== added directory 'Dropbox/src'
3276=== added directory 'Dropbox/src/Config'
3277=== added file 'Dropbox/src/Config/DropboxConfig.cs'
3278--- Dropbox/src/Config/DropboxConfig.cs 1970-01-01 00:00:00 +0000
3279+++ Dropbox/src/Config/DropboxConfig.cs 2009-06-22 04:05:16 +0000
3280@@ -0,0 +1,82 @@
3281+//
3282+// DropboxConfig.cs
3283+//
3284+// GNOME Do is the legal property of its developers. Please refer to the
3285+// COPYRIGHT file distributed with this
3286+// source distribution.
3287+//
3288+// This program is free software: you can redistribute it and/or modify
3289+// it under the terms of the GNU General Public License as published by
3290+// the Free Software Foundation, either version 3 of the License, or
3291+// (at your option) any later version.
3292+//
3293+// This program is distributed in the hope that it will be useful,
3294+// but WITHOUT ANY WARRANTY; without even the implied warranty of
3295+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3296+// GNU General Public License for more details.
3297+//
3298+// You should have received a copy of the GNU General Public License
3299+// along with this program. If not, see <http://www.gnu.org/licenses/>.
3300+//
3301+
3302+using System;
3303+using System.IO;
3304+
3305+using Mono.Addins;
3306+
3307+using Gtk;
3308+
3309+using Do.Platform;
3310+
3311+namespace Dropbox
3312+{
3313+
3314+ [System.ComponentModel.Category("File")]
3315+ [System.ComponentModel.ToolboxItem(true)]
3316+ public partial class DropboxConfig : Gtk.Bin
3317+ {
3318+ private static string home_path = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
3319+ private static string base_path = System.IO.Path.Combine (home_path, "Dropbox");
3320+
3321+ static IPreferences prefs;
3322+
3323+ public DropboxConfig()
3324+ {
3325+ Build ();
3326+ RefreshView ();
3327+ }
3328+
3329+ private void RefreshView ()
3330+ {
3331+ base_path_entry.Text = BasePath;
3332+ }
3333+
3334+ static DropboxConfig ()
3335+ {
3336+ prefs = Services.Preferences.Get<DropboxConfig> ();
3337+ }
3338+
3339+ public static string BasePath
3340+ {
3341+ get { return prefs.Get<string> ("BasePath", base_path); }
3342+ set { prefs.Set<string> ("BasePath", value); }
3343+ }
3344+
3345+ protected virtual void OnBasePathBtnClicked (object sender, System.EventArgs e)
3346+ {
3347+ FileChooserDialog chooser = new FileChooserDialog (
3348+ AddinManager.CurrentLocalizer.GetString ("Select location of Dropbox folder"),
3349+ new Dialog (), FileChooserAction.SelectFolder,
3350+ Gtk.Stock.Cancel, ResponseType.Cancel,
3351+ Gtk.Stock.Open, ResponseType.Accept);
3352+
3353+ chooser.SetCurrentFolder (BasePath);
3354+ if (chooser.Run () == (int) ResponseType.Accept) {
3355+ BasePath = chooser.Filename;
3356+ RefreshView ();
3357+ }
3358+
3359+ chooser.Destroy ();
3360+ }
3361+ }
3362+}
3363
3364=== added file 'Dropbox/src/Dropbox.cs'
3365--- Dropbox/src/Dropbox.cs 1970-01-01 00:00:00 +0000
3366+++ Dropbox/src/Dropbox.cs 2009-06-19 17:42:30 +0000
3367@@ -0,0 +1,118 @@
3368+//
3369+// Dropbox.cs
3370+//
3371+// GNOME Do is the legal property of its developers. Please refer to the
3372+// COPYRIGHT file distributed with this
3373+// source distribution.
3374+//
3375+// This program is free software: you can redistribute it and/or modify
3376+// it under the terms of the GNU General Public License as published by
3377+// the Free Software Foundation, either version 3 of the License, or
3378+// (at your option) any later version.
3379+//
3380+// This program is distributed in the hope that it will be useful,
3381+// but WITHOUT ANY WARRANTY; without even the implied warranty of
3382+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3383+// GNU General Public License for more details.
3384+//
3385+// You should have received a copy of the GNU General Public License
3386+// along with this program. If not, see <http://www.gnu.org/licenses/>.
3387+//
3388+
3389+using System;
3390+using System.IO;
3391+using System.Diagnostics;
3392+
3393+using Do.Platform;
3394+
3395+namespace Dropbox
3396+{
3397+
3398+
3399+ public class Dropbox
3400+ {
3401+ public readonly static string BasePath;
3402+ public readonly static string PublicPath;
3403+ public readonly static string DoSharedPath;
3404+
3405+ private const string cli_path = "/usr/bin/dropbox";
3406+ private const string db_url = "https://www.getdropbox.com/";
3407+
3408+ static Dropbox ()
3409+ {
3410+ BasePath = DropboxConfig.BasePath;
3411+ PublicPath = Path.Combine (BasePath, "Public");
3412+ DoSharedPath = Path.Combine (PublicPath, "Files Shared from GNOME Do");
3413+ }
3414+
3415+ public static bool IsRunning {
3416+ get {
3417+ return !Exec ("status").StartsWith ("Dropbox isn't running!");
3418+ }
3419+ }
3420+
3421+ public static bool HasCli {
3422+ get {
3423+ return File.Exists (cli_path);
3424+ }
3425+ }
3426+
3427+ public static void Start ()
3428+ {
3429+ Exec ("start -i");
3430+ }
3431+
3432+ public static void Stop ()
3433+ {
3434+ Exec ("stop");
3435+ }
3436+
3437+ public static string GetPubUrl (string path)
3438+ {
3439+ string url = Exec (String.Format ("puburl \"{0}\"", path));
3440+ if (!url.StartsWith ("http")) { url = null; }
3441+
3442+ return url;
3443+ }
3444+
3445+ public static string GetWebUrl ()
3446+ {
3447+ return db_url + "home#";
3448+ }
3449+
3450+ public static string GetWebUrl (string path)
3451+ {
3452+ return GetWebUrl () + path.Substring (BasePath.Length);
3453+ }
3454+
3455+ public static string GetRevisionsUrl (string path)
3456+ {
3457+ return db_url + "revisions" + path.Substring (BasePath.Length);
3458+ }
3459+
3460+ private static string Exec (string args)
3461+ {
3462+ string stdout = "";
3463+
3464+ try {
3465+ ProcessStartInfo cmd = new ProcessStartInfo ();
3466+ cmd.FileName = cli_path;
3467+ cmd.Arguments = args;
3468+ cmd.UseShellExecute = false;
3469+ cmd.RedirectStandardOutput = true;
3470+
3471+ Process run = Process.Start (cmd);
3472+ run.WaitForExit ();
3473+
3474+ stdout = run.StandardOutput.ReadLine ();
3475+
3476+ } catch (Exception e) {
3477+ Log<Dropbox>.Error ("Error running dropbox {0}: {1}", args, e.Message);
3478+ Log<Dropbox>.Debug (e.StackTrace);
3479+ }
3480+
3481+ return stdout;
3482+ }
3483+
3484+ }
3485+}
3486
3487=== added file 'Dropbox/src/DropboxAbstractAction.cs'
3488--- Dropbox/src/DropboxAbstractAction.cs 1970-01-01 00:00:00 +0000
3489+++ Dropbox/src/DropboxAbstractAction.cs 2009-06-22 04:05:16 +0000
3490@@ -0,0 +1,145 @@
3491+//
3492+// DropboxAbstractAction.cs
3493+//
3494+// GNOME Do is the legal property of its developers. Please refer to the
3495+// COPYRIGHT file distributed with this
3496+// source distribution.
3497+//
3498+// This program is free software: you can redistribute it and/or modify
3499+// it under the terms of the GNU General Public License as published by
3500+// the Free Software Foundation, either version 3 of the License, or
3501+// (at your option) any later version.
3502+//
3503+// This program is distributed in the hope that it will be useful,
3504+// but WITHOUT ANY WARRANTY; without even the implied warranty of
3505+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3506+// GNU General Public License for more details.
3507+//
3508+// You should have received a copy of the GNU General Public License
3509+// along with this program. If not, see <http://www.gnu.org/licenses/>.
3510+//
3511+
3512+using System;
3513+using System.IO;
3514+using System.Diagnostics;
3515+using System.Collections.Generic;
3516+
3517+using Mono.Addins;
3518+
3519+using Do.Universe;
3520+using Do.Platform;
3521+
3522+namespace Dropbox
3523+{
3524+
3525+
3526+ public abstract class DropboxAbstractAction : Act
3527+ {
3528+
3529+ protected static Random rand = new Random ();
3530+
3531+
3532+ public override IEnumerable<Type> SupportedItemTypes {
3533+ get { yield return typeof (IFileItem); }
3534+ }
3535+
3536+ protected void Notify (string message)
3537+ {
3538+ Notification notification = new Notification (AddinManager.CurrentLocalizer.GetString ("Dropbox"), message, "dropbox");
3539+ Services.Notifications.Notify (notification);
3540+ }
3541+
3542+ protected string ReadLink (string link_name)
3543+ {
3544+ return RunProcess ("readlink", string.Format ("\"{0}\"", link_name));
3545+ }
3546+
3547+ protected bool MakeLink (string target, string link_name)
3548+ {
3549+ string result = RunProcess ("ln",
3550+ string.Format ("-s \"{0}\" \"{1}\"", target, link_name));
3551+
3552+ return result != null;
3553+ }
3554+
3555+ protected bool Unlink (string link_name)
3556+ {
3557+ string result = RunProcess ("unlink",
3558+ string.Format ("\"{0}\"", link_name));
3559+
3560+ return result != null;
3561+ }
3562+
3563+ protected string GetLink (string target)
3564+ {
3565+ return GetLink (target, Dropbox.DoSharedPath);
3566+ }
3567+
3568+ protected string GetLink (string target, string directory)
3569+ {
3570+ if (!Directory.Exists (directory))
3571+ return null;
3572+
3573+ foreach (string file in Directory.GetFiles (directory))
3574+ if (ReadLink (file) == target)
3575+ return file;
3576+
3577+ return null;
3578+ }
3579+
3580+ protected bool HasLink (string target)
3581+ {
3582+ return GetLink (target) != null;
3583+ }
3584+
3585+ protected bool HasLink (string target, string directory)
3586+ {
3587+ return GetLink (target, directory) != null;
3588+ }
3589+
3590+ protected string GetPath (Item item)
3591+ {
3592+ if (item is IFileItem)
3593+ return GetPath (item as IFileItem);
3594+ if (item is ITextItem)
3595+ return GetPath (item as ITextItem);
3596+ throw new Exception ("Inappropriate Item type.");
3597+ }
3598+
3599+ protected string GetPath (IFileItem item)
3600+ {
3601+ return item.Path;
3602+ }
3603+
3604+ protected string GetPath (ITextItem item)
3605+ {
3606+ return item.Text.Replace ("~",
3607+ Environment.GetFolderPath (Environment.SpecialFolder.Personal));
3608+ }
3609+
3610+ protected string RunProcess (string command, string args)
3611+ {
3612+ try {
3613+ ProcessStartInfo cmd = new ProcessStartInfo ();
3614+ cmd.FileName = command;
3615+ cmd.Arguments = args;
3616+ cmd.UseShellExecute = false;
3617+ cmd.RedirectStandardOutput = true;
3618+
3619+ Process ps = Process.Start (cmd);
3620+ ps.WaitForExit ();
3621+
3622+ string stdout = ps.StandardOutput.ReadLine ();
3623+
3624+ if (stdout == null) return string.Empty;
3625+ return stdout;
3626+
3627+ } catch (Exception e) {
3628+ Log<Dropbox>.Error ("Error running {0} {1} : {2}", command, args, e.Message);
3629+ Log<Dropbox>.Debug (e.StackTrace);
3630+
3631+ return null;
3632+ }
3633+ }
3634+ }
3635+}
3636
3637=== added file 'Dropbox/src/DropboxLinkAction.cs'
3638--- Dropbox/src/DropboxLinkAction.cs 1970-01-01 00:00:00 +0000
3639+++ Dropbox/src/DropboxLinkAction.cs 2009-06-22 04:05:16 +0000
3640@@ -0,0 +1,87 @@
3641+//
3642+// DropboxLinkAction.cs
3643+//
3644+// GNOME Do is the legal property of its developers. Please refer to the
3645+// COPYRIGHT file distributed with this
3646+// source distribution.
3647+//
3648+// This program is free software: you can redistribute it and/or modify
3649+// it under the terms of the GNU General Public License as published by
3650+// the Free Software Foundation, either version 3 of the License, or
3651+// (at your option) any later version.
3652+//
3653+// This program is distributed in the hope that it will be useful,
3654+// but WITHOUT ANY WARRANTY; without even the implied warranty of
3655+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3656+// GNU General Public License for more details.
3657+//
3658+// You should have received a copy of the GNU General Public License
3659+// along with this program. If not, see <http://www.gnu.org/licenses/>.
3660+//
3661+
3662+using System;
3663+using System.IO;
3664+using System.Linq;
3665+using System.Collections.Generic;
3666+
3667+using Mono.Addins;
3668+
3669+using Do.Universe;
3670+using Do.Universe.Common;
3671+using Do.Platform;
3672+
3673+namespace Dropbox
3674+{
3675+
3676+ public class DropboxLinkAction : DropboxAbstractAction
3677+ {
3678+
3679+ public override string Name {
3680+ get { return AddinManager.CurrentLocalizer.GetString ("Add to Dropbox..."); }
3681+ }
3682+
3683+ public override string Description {
3684+ get { return AddinManager.CurrentLocalizer.GetString ("Links a file or folder to your Dropbox."); }
3685+ }
3686+
3687+ public override string Icon {
3688+ get { return ("dropbox-add.png@") + GetType ().Assembly.FullName; }
3689+ }
3690+
3691+ public override IEnumerable<Type> SupportedModifierItemTypes {
3692+ get { yield return typeof (IFileItem); }
3693+ }
3694+
3695+ public override bool SupportsItem (Item item)
3696+ {
3697+ string path = GetPath (item);
3698+
3699+ return !path.StartsWith (Dropbox.BasePath);
3700+ }
3701+
3702+ public override bool SupportsModifierItemForItems (IEnumerable<Item> items, Item modItem)
3703+ {
3704+ string path = GetPath (modItem);
3705+
3706+ return Directory.Exists (path) && path.StartsWith (Dropbox.BasePath);
3707+ }
3708+
3709+ public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
3710+ {
3711+ string target, folder, link_name;
3712+
3713+ foreach (Item i in items) {
3714+ target = GetPath (i);
3715+ folder = GetPath (modItems.First ());
3716+ link_name = Path.Combine (folder, Path.GetFileName (target));
3717+
3718+ if (MakeLink (target, link_name))
3719+ yield return Services.UniverseFactory.NewFileItem (link_name) as Item;
3720+ }
3721+
3722+ yield break;
3723+ }
3724+
3725+
3726+ }
3727+}
3728
3729=== added file 'Dropbox/src/DropboxPuburlAction.cs'
3730--- Dropbox/src/DropboxPuburlAction.cs 1970-01-01 00:00:00 +0000
3731+++ Dropbox/src/DropboxPuburlAction.cs 2009-06-22 04:05:16 +0000
3732@@ -0,0 +1,82 @@
3733+/* DropboxPuburlAction.cs
3734+ *
3735+ * GNOME Do is the legal property of its developers. Please refer to the
3736+ * COPYRIGHT file distributed with this
3737+ * source distribution.
3738+ *
3739+ * This program is free software: you can redistribute it and/or modify
3740+ * it under the terms of the GNU General Public License as published by
3741+ * the Free Software Foundation, either version 3 of the License, or
3742+ * (at your option) any later version.
3743+ *
3744+ * This program is distributed in the hope that it will be useful,
3745+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
3746+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3747+ * GNU General Public License for more details.
3748+ *
3749+ * You should have received a copy of the GNU General Public License
3750+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
3751+ */
3752+
3753+using System;
3754+using System.IO;
3755+using System.Linq;
3756+using System.Collections.Generic;
3757+
3758+using Mono.Addins;
3759+
3760+using Do.Universe;
3761+using Do.Universe.Common;
3762+using Do.Platform;
3763+
3764+
3765+namespace Dropbox
3766+{
3767+
3768+
3769+ public class DropboxPuburlAction : DropboxAbstractAction
3770+ {
3771+
3772+ public override string Name {
3773+ get { return AddinManager.CurrentLocalizer.GetString ("Get public URL"); }
3774+ }
3775+
3776+ public override string Description {
3777+ get { return AddinManager.CurrentLocalizer.GetString ("Gets public URL of a shared Dropbox file."); }
3778+ }
3779+
3780+ public override string Icon {
3781+ get { return ("dropbox-web.png@") + GetType ().Assembly.FullName; }
3782+ }
3783+
3784+ public override bool SupportsItem (Item item)
3785+ {
3786+ string path = GetPath(item);
3787+
3788+ return File.Exists (path) &&
3789+ Dropbox.HasCli &&
3790+ (path.StartsWith (Dropbox.PublicPath) ||
3791+ HasLink (path));
3792+ }
3793+
3794+ public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
3795+ {
3796+ string path;
3797+
3798+ foreach (Item i in items)
3799+ {
3800+ path = GetPath(i);
3801+
3802+ if (!path.StartsWith (Dropbox.PublicPath))
3803+ path = GetLink (path);
3804+
3805+ string url = Dropbox.GetPubUrl (path);
3806+
3807+ yield return new BookmarkItem (url, url);
3808+ }
3809+
3810+ yield break;
3811+ }
3812+
3813+ }
3814+}
3815
3816=== added file 'Dropbox/src/DropboxRevisionsAction.cs'
3817--- Dropbox/src/DropboxRevisionsAction.cs 1970-01-01 00:00:00 +0000
3818+++ Dropbox/src/DropboxRevisionsAction.cs 2009-06-22 04:05:16 +0000
3819@@ -0,0 +1,76 @@
3820+/* DropboxPuburlAction.cs
3821+ *
3822+ * GNOME Do is the legal property of its developers. Please refer to the
3823+ * COPYRIGHT file distributed with this
3824+ * source distribution.
3825+ *
3826+ * This program is free software: you can redistribute it and/or modify
3827+ * it under the terms of the GNU General Public License as published by
3828+ * the Free Software Foundation, either version 3 of the License, or
3829+ * (at your option) any later version.
3830+ *
3831+ * This program is distributed in the hope that it will be useful,
3832+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
3833+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3834+ * GNU General Public License for more details.
3835+ *
3836+ * You should have received a copy of the GNU General Public License
3837+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
3838+ */
3839+
3840+using System;
3841+using System.IO;
3842+using System.Linq;
3843+using System.Collections.Generic;
3844+
3845+using Mono.Addins;
3846+
3847+using Do.Universe;
3848+using Do.Universe.Common;
3849+using Do.Platform;
3850+
3851+
3852+namespace Dropbox
3853+{
3854+
3855+
3856+ public class DropboxRevisionsAction : DropboxAbstractAction
3857+ {
3858+
3859+ public override string Name {
3860+ get { return AddinManager.CurrentLocalizer.GetString ("View revisions"); }
3861+ }
3862+
3863+ public override string Description {
3864+ get { return AddinManager.CurrentLocalizer.GetString ("Views file history in Dropbox web interface."); }
3865+ }
3866+
3867+ public override string Icon {
3868+ get { return ("dropbox-revisions.png@") + GetType ().Assembly.FullName; }
3869+ }
3870+
3871+ public override bool SupportsItem (Item item)
3872+ {
3873+ string path = GetPath(item);
3874+
3875+ return File.Exists (path) &&
3876+ (path.StartsWith (Dropbox.BasePath) ||
3877+ HasLink (path));
3878+ }
3879+
3880+ public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
3881+ {
3882+ string path = GetPath(items.First ());
3883+
3884+ if (!path.StartsWith (Dropbox.BasePath))
3885+ path = GetLink (path);
3886+
3887+ string url = Dropbox.GetRevisionsUrl (path);
3888+
3889+ Services.Environment.OpenUrl (url);
3890+
3891+ yield break;
3892+ }
3893+
3894+ }
3895+}
3896
3897=== added file 'Dropbox/src/DropboxShareAction.cs'
3898--- Dropbox/src/DropboxShareAction.cs 1970-01-01 00:00:00 +0000
3899+++ Dropbox/src/DropboxShareAction.cs 2009-06-22 04:05:16 +0000
3900@@ -0,0 +1,85 @@
3901+//
3902+// DropboxShareAction.cs
3903+//
3904+// GNOME Do is the legal property of its developers. Please refer to the
3905+// COPYRIGHT file distributed with this
3906+// source distribution.
3907+//
3908+// This program is free software: you can redistribute it and/or modify
3909+// it under the terms of the GNU General Public License as published by
3910+// the Free Software Foundation, either version 3 of the License, or
3911+// (at your option) any later version.
3912+//
3913+// This program is distributed in the hope that it will be useful,
3914+// but WITHOUT ANY WARRANTY; without even the implied warranty of
3915+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3916+// GNU General Public License for more details.
3917+//
3918+// You should have received a copy of the GNU General Public License
3919+// along with this program. If not, see <http://www.gnu.org/licenses/>.
3920+//
3921+
3922+using System;
3923+using System.IO;
3924+using System.Linq;
3925+using System.Collections.Generic;
3926+
3927+using Mono.Addins;
3928+
3929+using Do.Universe;
3930+using Do.Universe.Common;
3931+using Do.Platform;
3932+
3933+
3934+namespace Dropbox
3935+{
3936+
3937+
3938+ public class DropboxShareAction : DropboxAbstractAction
3939+ {
3940+
3941+ public override string Name {
3942+ get { return AddinManager.CurrentLocalizer.GetString ("Share with Dropbox"); }
3943+ }
3944+
3945+ public override string Description {
3946+ get { return AddinManager.CurrentLocalizer.GetString ("Links a file to your Dropbox public folder."); }
3947+ }
3948+
3949+ public override string Icon {
3950+ get { return ("dropbox-share.png@") + GetType ().Assembly.FullName; }
3951+ }
3952+
3953+ public override bool SupportsItem (Item item)
3954+ {
3955+ string path = GetPath (item);
3956+
3957+ return File.Exists (path) &&
3958+ !path.StartsWith (Dropbox.PublicPath) &&
3959+ !HasLink (path);
3960+ }
3961+
3962+ public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
3963+ {
3964+ string target, extension, filename, linkName, url;
3965+
3966+ foreach (Item item in items) {
3967+ target = GetPath (item);
3968+ extension = Path.GetExtension (target);
3969+ filename = Path.GetFileNameWithoutExtension (target);
3970+ linkName = Path.Combine (Dropbox.DoSharedPath,
3971+ String.Format ("{0}-{1}{2}", filename, rand.Next (), extension));
3972+
3973+ Directory.CreateDirectory (Dropbox.DoSharedPath);
3974+
3975+ if (MakeLink (target, linkName)) {
3976+
3977+ url = Dropbox.GetPubUrl (linkName);
3978+ yield return new BookmarkItem (url, url);
3979+ }
3980+ }
3981+ }
3982+
3983+ }
3984+}
3985+
3986
3987=== added file 'Dropbox/src/DropboxStartAction.cs'
3988--- Dropbox/src/DropboxStartAction.cs 1970-01-01 00:00:00 +0000
3989+++ Dropbox/src/DropboxStartAction.cs 2009-06-22 04:05:16 +0000
3990@@ -0,0 +1,74 @@
3991+/* DropboxStartActions.cs
3992+ *
3993+ * GNOME Do is the legal property of its developers. Please refer to the
3994+ * COPYRIGHT file distributed with this
3995+ * source distribution.
3996+ *
3997+ * This program is free software: you can redistribute it and/or modify
3998+ * it under the terms of the GNU General Public License as published by
3999+ * the Free Software Foundation, either version 3 of the License, or
4000+ * (at your option) any later version.
4001+ *
4002+ * This program is distributed in the hope that it will be useful,
4003+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
4004+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4005+ * GNU General Public License for more details.
4006+ *
4007+ * You should have received a copy of the GNU General Public License
4008+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
4009+ */
4010+
4011+using System;
4012+using System.Linq;
4013+using System.Collections.Generic;
4014+
4015+using Mono.Addins;
4016+
4017+using Do.Universe;
4018+using Do.Universe.Common;
4019+using Do.Platform;
4020+using Do.Platform.Linux;
4021+
4022+
4023+namespace Dropbox
4024+{
4025+
4026+
4027+ public class DropboxStartAction : Act, IConfigurable
4028+ {
4029+
4030+ public override string Name {
4031+ get { return AddinManager.CurrentLocalizer.GetString ("Start Dropbox"); }
4032+ }
4033+
4034+ public override string Description {
4035+ get { return AddinManager.CurrentLocalizer.GetString ("Starts the Dropbox daemon."); }
4036+ }
4037+
4038+ public override string Icon {
4039+ get { return ("dropbox-start.png@") + GetType ().Assembly.FullName; }
4040+ }
4041+
4042+ public override IEnumerable<Type> SupportedItemTypes {
4043+ get { yield return typeof (IApplicationItem); }
4044+ }
4045+
4046+ public override bool SupportsItem (Item item)
4047+ {
4048+ return item.Name == "Dropbox" && Dropbox.HasCli && !Dropbox.IsRunning;
4049+ }
4050+
4051+ public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
4052+ {
4053+ Dropbox.Start ();
4054+
4055+ yield break;
4056+ }
4057+
4058+ public Gtk.Bin GetConfiguration ()
4059+ {
4060+ return new DropboxConfig();
4061+ }
4062+
4063+ }
4064+}
4065
4066=== added file 'Dropbox/src/DropboxStopAction.cs'
4067--- Dropbox/src/DropboxStopAction.cs 1970-01-01 00:00:00 +0000
4068+++ Dropbox/src/DropboxStopAction.cs 2009-06-22 04:05:16 +0000
4069@@ -0,0 +1,67 @@
4070+/* DropboxStopAction.cs
4071+ *
4072+ * GNOME Do is the legal property of its developers. Please refer to the
4073+ * COPYRIGHT file distributed with this
4074+ * source distribution.
4075+ *
4076+ * This program is free software: you can redistribute it and/or modify
4077+ * it under the terms of the GNU General Public License as published by
4078+ * the Free Software Foundation, either version 3 of the License, or
4079+ * (at your option) any later version.
4080+ *
4081+ * This program is distributed in the hope that it will be useful,
4082+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
4083+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4084+ * GNU General Public License for more details.
4085+ *
4086+ * You should have received a copy of the GNU General Public License
4087+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
4088+ */
4089+
4090+using System;
4091+using System.Linq;
4092+using System.Collections.Generic;
4093+
4094+using Mono.Addins;
4095+
4096+using Do.Universe;
4097+using Do.Platform;
4098+
4099+
4100+namespace Dropbox
4101+{
4102+
4103+
4104+ public class DropboxStopAction : Act
4105+ {
4106+
4107+ public override string Name {
4108+ get { return AddinManager.CurrentLocalizer.GetString ("Stop Dropbox"); }
4109+ }
4110+
4111+ public override string Description {
4112+ get { return AddinManager.CurrentLocalizer.GetString ("Stops the Dropbox daemon."); }
4113+ }
4114+
4115+ public override string Icon {
4116+ get { return ("dropbox-stop.png@") + GetType ().Assembly.FullName; }
4117+ }
4118+
4119+ public override IEnumerable<Type> SupportedItemTypes {
4120+ get { yield return typeof (IApplicationItem); }
4121+ }
4122+
4123+ public override bool SupportsItem (Item item)
4124+ {
4125+ return item.Name == "Dropbox" && Dropbox.HasCli && Dropbox.IsRunning;
4126+ }
4127+
4128+ public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
4129+ {
4130+ Dropbox.Stop ();
4131+
4132+ yield break;
4133+ }
4134+
4135+ }
4136+}
4137
4138=== added file 'Dropbox/src/DropboxUnshareAction.cs'
4139--- Dropbox/src/DropboxUnshareAction.cs 1970-01-01 00:00:00 +0000
4140+++ Dropbox/src/DropboxUnshareAction.cs 2009-06-22 04:05:16 +0000
4141@@ -0,0 +1,75 @@
4142+//
4143+// DropboxUnshareAction.cs
4144+//
4145+// GNOME Do is the legal property of its developers. Please refer to the
4146+// COPYRIGHT file distributed with this
4147+// source distribution.
4148+//
4149+// This program is free software: you can redistribute it and/or modify
4150+// it under the terms of the GNU General Public License as published by
4151+// the Free Software Foundation, either version 3 of the License, or
4152+// (at your option) any later version.
4153+//
4154+// This program is distributed in the hope that it will be useful,
4155+// but WITHOUT ANY WARRANTY; without even the implied warranty of
4156+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4157+// GNU General Public License for more details.
4158+//
4159+// You should have received a copy of the GNU General Public License
4160+// along with this program. If not, see <http://www.gnu.org/licenses/>.
4161+//
4162+
4163+using System;
4164+using System.IO;
4165+using System.Linq;
4166+using System.Collections.Generic;
4167+
4168+using Mono.Addins;
4169+
4170+using Do.Universe;
4171+using Do.Universe.Common;
4172+using Do.Platform;
4173+
4174+
4175+namespace Dropbox
4176+{
4177+
4178+ public class DropboxUnshareAction : DropboxAbstractAction
4179+ {
4180+
4181+ public override string Name {
4182+ get { return AddinManager.CurrentLocalizer.GetString ("Stop sharing with Dropbox"); }
4183+ }
4184+
4185+ public override string Description {
4186+ get { return AddinManager.CurrentLocalizer.GetString ("Unlinks a file from your Dropbox public folder."); }
4187+ }
4188+
4189+ public override string Icon {
4190+ get { return ("dropbox-remove.png@") + GetType ().Assembly.FullName; }
4191+ }
4192+
4193+ public override bool SupportsItem (Item item)
4194+ {
4195+ string path = GetPath(item);
4196+
4197+ return File.Exists (path) && HasLink (path);
4198+ }
4199+
4200+ public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
4201+ {
4202+ foreach (Item item in items) {
4203+ string path = GetPath (item);
4204+ string link_path = GetLink (path);
4205+
4206+ Unlink (link_path);
4207+
4208+ Notify (String.Format (AddinManager.CurrentLocalizer.GetString ("Stopped sharing") + " {0}", path));
4209+ }
4210+
4211+ yield break;
4212+ }
4213+
4214+ }
4215+}
4216+
4217
4218=== added file 'Dropbox/src/DropboxWebInterfaceAction.cs'
4219--- Dropbox/src/DropboxWebInterfaceAction.cs 1970-01-01 00:00:00 +0000
4220+++ Dropbox/src/DropboxWebInterfaceAction.cs 2009-06-22 04:05:16 +0000
4221@@ -0,0 +1,86 @@
4222+//
4223+// DropboxWebInterfaceAction.cs
4224+//
4225+// GNOME Do is the legal property of its developers. Please refer to the
4226+// COPYRIGHT file distributed with this
4227+// source distribution.
4228+//
4229+// This program is free software: you can redistribute it and/or modify
4230+// it under the terms of the GNU General Public License as published by
4231+// the Free Software Foundation, either version 3 of the License, or
4232+// (at your option) any later version.
4233+//
4234+// This program is distributed in the hope that it will be useful,
4235+// but WITHOUT ANY WARRANTY; without even the implied warranty of
4236+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4237+// GNU General Public License for more details.
4238+//
4239+// You should have received a copy of the GNU General Public License
4240+// along with this program. If not, see <http://www.gnu.org/licenses/>.
4241+//
4242+
4243+using System;
4244+using System.IO;
4245+using System.Linq;
4246+using System.Collections.Generic;
4247+
4248+using Mono.Addins;
4249+
4250+using Do.Universe;
4251+using Do.Platform;
4252+
4253+namespace Dropbox
4254+{
4255+
4256+ public class DropboxWebInterfaceAction : Act
4257+ {
4258+
4259+ public override string Name {
4260+ get { return AddinManager.CurrentLocalizer.GetString ("Dropbox web interface"); }
4261+ }
4262+
4263+ public override string Description {
4264+ get { return AddinManager.CurrentLocalizer.GetString ("View folder in Dropbox web interface."); }
4265+ }
4266+
4267+ public override string Icon {
4268+ get { return ("dropbox-web.png@") + GetType ().Assembly.FullName; }
4269+ }
4270+
4271+ public override IEnumerable<Type> SupportedItemTypes {
4272+ get {
4273+ yield return typeof (IApplicationItem);
4274+ yield return typeof (IFileItem);
4275+ }
4276+
4277+ }
4278+
4279+ public override bool SupportsItem (Item item)
4280+ {
4281+ if (item is IApplicationItem) {
4282+ return item.Name == "Dropbox";
4283+ } else {
4284+ string path = (item as IFileItem).Path;
4285+ return path.StartsWith (Dropbox.BasePath) &&
4286+ Directory.Exists (path);
4287+ }
4288+ }
4289+
4290+ public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
4291+ {
4292+ string url, path;
4293+ Item item = items.First ();
4294+
4295+ if (item is IApplicationItem) {
4296+ url = Dropbox.GetWebUrl ();
4297+ } else {
4298+ path = (item as IFileItem).Path;
4299+ url = Dropbox.GetWebUrl (path);
4300+ }
4301+
4302+ Services.Environment.OpenUrl (url);
4303+
4304+ yield break;
4305+ }
4306+ }
4307+}
4308
4309=== modified file 'EOG-Slideshow/EOG-Slideshow.mdp'
4310--- EOG-Slideshow/EOG-Slideshow.mdp 2009-01-09 07:03:47 +0000
4311+++ EOG-Slideshow/EOG-Slideshow.mdp 2009-06-23 00:52:54 +0000
4312@@ -1,4 +1,4 @@
4313-<Project name="EOG Slideshow" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
4314+<Project name="EOG Slideshow" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
4315 <Configurations active="Debug">
4316 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4317 <Output directory="bin/Debug" assembly="EOG Slideshow" />
4318@@ -22,7 +22,8 @@
4319 <References>
4320 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
4321 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
4322- <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
4323+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
4324+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
4325+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
4326 </References>
4327- <GtkDesignInfo />
4328 </Project>
4329\ No newline at end of file
4330
4331=== modified file 'EOG-Slideshow/Makefile.am'
4332--- EOG-Slideshow/Makefile.am 2009-01-14 18:25:25 +0000
4333+++ EOG-Slideshow/Makefile.am 2009-06-22 04:05:16 +0000
4334@@ -11,6 +11,5 @@
4335 REFERENCES = \
4336 System \
4337 System.Core \
4338- Mono.Posix \
4339 $(DO_PLATFORM_LIBS) \
4340 $(DO_UNIVERSE_LIBS)
4341
4342=== removed file 'EOG-Slideshow/Resources/EOG-Slideshow.addin.xml'
4343--- EOG-Slideshow/Resources/EOG-Slideshow.addin.xml 2009-01-09 03:22:05 +0000
4344+++ EOG-Slideshow/Resources/EOG-Slideshow.addin.xml 1970-01-01 00:00:00 +0000
4345@@ -1,23 +0,0 @@
4346-<Addin
4347- id="EyeOfGNOME"
4348- namespace="Do"
4349- version="1.0"
4350- name="Eye of GNOME Slideshow"
4351- description="Play slideshows in Eye of GNOME."
4352- author="David Siegel"
4353- category="Official"
4354- >
4355-
4356- <Runtime>
4357- <Import assembly="EOG-Slideshow.dll"/>
4358- </Runtime>
4359-
4360- <Dependencies>
4361- <Addin id="Universe" version="1.0" />
4362- </Dependencies>
4363-
4364- <Extension path="/Do/Action">
4365- <Action type="EOG.PlaySlideshowAction" />
4366- </Extension>
4367-
4368-</Addin>
4369
4370=== added file 'EOG-Slideshow/Resources/EOG-Slideshow.addin.xml.in'
4371--- EOG-Slideshow/Resources/EOG-Slideshow.addin.xml.in 1970-01-01 00:00:00 +0000
4372+++ EOG-Slideshow/Resources/EOG-Slideshow.addin.xml.in 2009-06-22 21:50:13 +0000
4373@@ -0,0 +1,26 @@
4374+<Addin
4375+ id="EyeOfGNOME"
4376+ namespace="Do"
4377+ version="1.0"
4378+ name="Eye of GNOME Slideshow"
4379+ description="Play slideshows in Eye of GNOME."
4380+ author="David Siegel"
4381+ category="Official"
4382+ defaultEnabled="false"
4383+ >
4384+
4385+ <Runtime>
4386+ <Import assembly="EOG-Slideshow.dll"/>
4387+ </Runtime>
4388+
4389+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
4390+
4391+ <Dependencies>
4392+ <Addin id="Universe" version="1.0" />
4393+ </Dependencies>
4394+
4395+ <Extension path="/Do/Action">
4396+ <Action type="EOG.PlaySlideshowAction" />
4397+ </Extension>
4398+
4399+</Addin>
4400
4401=== modified file 'EOG-Slideshow/src/PlaySlideshowAction.cs'
4402--- EOG-Slideshow/src/PlaySlideshowAction.cs 2009-01-14 18:25:25 +0000
4403+++ EOG-Slideshow/src/PlaySlideshowAction.cs 2009-06-22 04:05:16 +0000
4404@@ -23,7 +23,7 @@
4405 using System.Diagnostics;
4406 using System.Collections.Generic;
4407
4408-using Mono.Unix;
4409+using Mono.Addins;
4410
4411 using Do.Universe;
4412 using Do.Platform;
4413@@ -37,11 +37,11 @@
4414 }
4415
4416 public override string Name {
4417- get { return Catalog.GetString ("Play Slideshow"); }
4418+ get { return AddinManager.CurrentLocalizer.GetString ("Play Slideshow"); }
4419 }
4420
4421 public override string Description {
4422- get { return Catalog.GetString ("Plays a slideshow of images in a folder."); }
4423+ get { return AddinManager.CurrentLocalizer.GetString ("Plays a slideshow of images in a folder."); }
4424 }
4425
4426 public override string Icon {
4427
4428=== added directory 'Emesene'
4429=== added file 'Emesene/Emesene.mdp'
4430--- Emesene/Emesene.mdp 1970-01-01 00:00:00 +0000
4431+++ Emesene/Emesene.mdp 2009-06-23 00:52:54 +0000
4432@@ -0,0 +1,52 @@
4433+<Project name="Emesene" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
4434+ <Configurations active="Debug">
4435+ <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4436+ <Output directory="bin/Debug" assembly="Emesene" />
4437+ <Build debugmode="True" target="Library" />
4438+ <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
4439+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
4440+ </Configuration>
4441+ <Configuration name="Release" ctype="DotNetProjectConfiguration">
4442+ <Output directory="bin/Release" assembly="Emesene" />
4443+ <Build debugmode="False" target="Library" />
4444+ <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
4445+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
4446+ </Configuration>
4447+ </Configurations>
4448+ <Contents>
4449+ <File name="." subtype="Directory" buildaction="Compile" />
4450+ <File name="src/Emesene.cs" subtype="Code" buildaction="Compile" />
4451+ <File name="src/EmeseneAvatarItem.cs" subtype="Code" buildaction="Compile" />
4452+ <File name="src/EmeseneAvatarItemSource.cs" subtype="Code" buildaction="Compile" />
4453+ <File name="src/EmeseneChangeAvatarAction.cs" subtype="Code" buildaction="Compile" />
4454+ <File name="src/EmeseneChangeNickAction.cs" subtype="Code" buildaction="Compile" />
4455+ <File name="src/EmeseneChangePSMAction.cs" subtype="Code" buildaction="Compile" />
4456+ <File name="src/EmeseneChangeStatusAction.cs" subtype="Code" buildaction="Compile" />
4457+ <File name="src/EmeseneChatAction.cs" subtype="Code" buildaction="Compile" />
4458+ <File name="src/EmeseneContactItemSource.cs" subtype="Code" buildaction="Compile" />
4459+ <File name="src/EmeseneOpenAvatarHistoryAction.cs" subtype="Code" buildaction="Compile" />
4460+ <File name="src/EmeseneOpenConversationHistoryAction.cs" subtype="Code" buildaction="Compile" />
4461+ <File name="src/EmeseneStatusItem.cs" subtype="Code" buildaction="Compile" />
4462+ <File name="src/EmeseneStatusItemSource.cs" subtype="Code" buildaction="Compile" />
4463+ <File name="Resources/Emesene.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
4464+ <File name="Resources/statusIcons/away.png" subtype="Code" buildaction="EmbedAsResource" />
4465+ <File name="Resources/statusIcons/brb.png" subtype="Code" buildaction="EmbedAsResource" />
4466+ <File name="Resources/statusIcons/busy.png" subtype="Code" buildaction="EmbedAsResource" />
4467+ <File name="Resources/statusIcons/idle.png" subtype="Code" buildaction="EmbedAsResource" />
4468+ <File name="Resources/statusIcons/invisible.png" subtype="Code" buildaction="EmbedAsResource" />
4469+ <File name="Resources/statusIcons/lunch.png" subtype="Code" buildaction="EmbedAsResource" />
4470+ <File name="Resources/statusIcons/offline.png" subtype="Code" buildaction="EmbedAsResource" />
4471+ <File name="Resources/statusIcons/online.png" subtype="Code" buildaction="EmbedAsResource" />
4472+ <File name="Resources/statusIcons/phone.png" subtype="Code" buildaction="EmbedAsResource" />
4473+ </Contents>
4474+ <References>
4475+ <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
4476+ <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
4477+ <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
4478+ <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
4479+ <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
4480+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
4481+ <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.9.0.0, Culture=neutral" />
4482+ <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.9.0.0, Culture=neutral" />
4483+ </References>
4484+</Project>
4485\ No newline at end of file
4486
4487=== added file 'Emesene/Makefile.am'
4488--- Emesene/Makefile.am 1970-01-01 00:00:00 +0000
4489+++ Emesene/Makefile.am 2009-02-01 20:21:24 +0000
4490@@ -0,0 +1,41 @@
4491+include $(top_srcdir)/build.rules.mk
4492+
4493+ASSEMBLY=Emesene
4494+
4495+FILES = \
4496+ src/EmeseneAvatarItem.cs \
4497+ src/EmeseneContactItemSource.cs \
4498+ src/EmeseneAvatarItemSource.cs \
4499+ src/Emesene.cs \
4500+ src/EmeseneChangeAvatarAction.cs \
4501+ src/EmeseneOpenAvatarHistoryAction.cs \
4502+ src/EmeseneChangeNickAction.cs \
4503+ src/EmeseneOpenConversationHistoryAction.cs \
4504+ src/EmeseneChangePSMAction.cs \
4505+ src/EmeseneStatusItem.cs \
4506+ src/EmeseneChangeStatusAction.cs \
4507+ src/EmeseneStatusItemSource.cs \
4508+ src/EmeseneChatAction.cs
4509+
4510+
4511+RESOURCES = \
4512+ Resources/Emesene.addin.xml \
4513+ Resources/statusIcons/away.png \
4514+ Resources/statusIcons/busy.png \
4515+ Resources/statusIcons/invisible.png \
4516+ Resources/statusIcons/offline.png \
4517+ Resources/statusIcons/phone.png \
4518+ Resources/statusIcons/brb.png \
4519+ Resources/statusIcons/idle.png \
4520+ Resources/statusIcons/lunch.png \
4521+ Resources/statusIcons/online.png
4522+
4523+REFERENCES = \
4524+ System \
4525+ System.Core \
4526+ System.Xml \
4527+ $(NDESK_DBUS_10_LIBS) \
4528+ $(NDESK_DBUS_GLIB_LIBS) \
4529+ $(DO_UNIVERSE_LIBS) \
4530+ $(DO_PLATFORM_LIBS)
4531+
4532
4533=== added directory 'Emesene/Resources'
4534=== added file 'Emesene/Resources/Emesene.addin.xml.in'
4535--- Emesene/Resources/Emesene.addin.xml.in 1970-01-01 00:00:00 +0000
4536+++ Emesene/Resources/Emesene.addin.xml.in 2009-06-22 21:50:13 +0000
4537@@ -0,0 +1,41 @@
4538+<Addin
4539+ id="Emesene"
4540+ namespace="Do"
4541+ version="1.0"
4542+ name="Emesene"
4543+ description="Search your buddies and initiate chats."
4544+ author="Luis Miguel Montiel G"
4545+ category="Community"
4546+ defaultEnabled="false"
4547+>
4548+
4549+ <Runtime>
4550+ <Import assembly="Emesene.dll"/>
4551+ </Runtime>
4552+
4553+ <Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" />
4554+
4555+ <Dependencies>
4556+ <Addin id="Universe" version="1.0" />
4557+ </Dependencies>
4558+
4559+ <!-- Extensions included in this assembly -->
4560+ <!-- Sources -->
4561+ <Extension path="/Do/ItemSource">
4562+ <ItemSource type="Do.Universe.EmeseneContactItemSource" />
4563+ <ItemSource type="Do.Universe.EmeseneStatusItemSource" />
4564+ <ItemSource type="Do.Universe.EmeseneAvatarItemSource" />
4565+ </Extension>
4566+
4567+ <!--- Actions -->
4568+ <Extension path= "/Do/Action">
4569+ <Action type="Do.Universe.EmeseneChatAction" />
4570+ <Action type="Do.Universe.EmeseneChangeNickAction" />
4571+ <Action type="Do.Universe.EmeseneChangeAvatarAction" />
4572+ <Action type="Do.Universe.EmeseneChangePSMAction" />
4573+ <Action type="Do.Universe.EmeseneChangeStatusAction" />
4574+ <Action type="Do.Universe.EmeseneOpenConversationHistoryAction" />
4575+ <Action type="Do.Universe.EmeseneOpenAvatarHistoryAction" />
4576+ </Extension>
4577+
4578+</Addin>
4579
4580=== added directory 'Emesene/Resources/statusIcons'
4581=== added file 'Emesene/Resources/statusIcons/away.png'
4582Binary files Emesene/Resources/statusIcons/away.png 1970-01-01 00:00:00 +0000 and Emesene/Resources/statusIcons/away.png 2009-01-18 22:37:05 +0000 differ
4583=== added file 'Emesene/Resources/statusIcons/brb.png'
4584Binary files Emesene/Resources/statusIcons/brb.png 1970-01-01 00:00:00 +0000 and Emesene/Resources/statusIcons/brb.png 2009-01-18 22:37:05 +0000 differ
4585=== added file 'Emesene/Resources/statusIcons/busy.png'
4586Binary files Emesene/Resources/statusIcons/busy.png 1970-01-01 00:00:00 +0000 and Emesene/Resources/statusIcons/busy.png 2009-01-18 22:37:05 +0000 differ
4587=== added file 'Emesene/Resources/statusIcons/idle.png'
4588Binary files Emesene/Resources/statusIcons/idle.png 1970-01-01 00:00:00 +0000 and Emesene/Resources/statusIcons/idle.png 2009-01-18 22:37:05 +0000 differ
4589=== added file 'Emesene/Resources/statusIcons/invisible.png'
4590Binary files Emesene/Resources/statusIcons/invisible.png 1970-01-01 00:00:00 +0000 and Emesene/Resources/statusIcons/invisible.png 2009-01-18 22:37:05 +0000 differ
4591=== added file 'Emesene/Resources/statusIcons/lunch.png'
4592Binary files Emesene/Resources/statusIcons/lunch.png 1970-01-01 00:00:00 +0000 and Emesene/Resources/statusIcons/lunch.png 2009-01-18 22:37:05 +0000 differ
4593=== added file 'Emesene/Resources/statusIcons/offline.png'
4594Binary files Emesene/Resources/statusIcons/offline.png 1970-01-01 00:00:00 +0000 and Emesene/Resources/statusIcons/offline.png 2009-01-18 22:37:05 +0000 differ
4595=== added file 'Emesene/Resources/statusIcons/online.png'
4596Binary files Emesene/Resources/statusIcons/online.png 1970-01-01 00:00:00 +0000 and Emesene/Resources/statusIcons/online.png 2009-01-18 22:37:05 +0000 differ
4597=== added file 'Emesene/Resources/statusIcons/phone.png'
4598Binary files Emesene/Resources/statusIcons/phone.png 1970-01-01 00:00:00 +0000 and Emesene/Resources/statusIcons/phone.png 2009-01-18 22:37:05 +0000 differ
4599=== added directory 'Emesene/src'
4600=== added file 'Emesene/src/Emesene.cs'
4601--- Emesene/src/Emesene.cs 1970-01-01 00:00:00 +0000
4602+++ Emesene/src/Emesene.cs 2009-02-01 20:21:24 +0000
4603@@ -0,0 +1,168 @@
4604+using System;
4605+using NDesk.DBus;
4606+using org.freedesktop.DBus;
4607+using System.Collections.Generic;
4608+using Do.Universe;
4609+using Do.Platform;
4610+
4611+namespace Do.Universe
4612+{
4613+ public class Emesene
4614+ {
4615+
4616+ const string emeseneObjectPath = "/org/emesene/dbus";
4617+ const string emeseneServiceBusName = "org.emesene.dbus";
4618+ public static List<Item> status;
4619+
4620+ public static string getAvatarPathForUser()
4621+ {
4622+ return Emesene.getPathForUser()+"avatars";
4623+ }
4624+
4625+ public static string getCachePathForUser()
4626+ {
4627+ return Emesene.getPathForUser()+"cache";
4628+ }
4629+
4630+ private static string getPathForUser(){
4631+ string user = Emesene.getCurrentEmeseneUser();
4632+ user = user.Replace(".","_");
4633+ user = Environment.GetFolderPath(Environment.SpecialFolder.Personal)+
4634+ "/.config/emesene1.0/"+user.Replace("@","_")+
4635+ "/";
4636+ return user;
4637+ }
4638+
4639+ [Interface ("org.emesene.dbus")]
4640+ public interface EmeseneInterface
4641+ {
4642+ void open_conversation(string email, bool weStarted);
4643+ void open_conversation(string email);
4644+ string get_last_display_picture(string account, bool cache);
4645+ string get_user_account();
4646+ string set_nick(string nick);
4647+ bool set_avatar(string path);
4648+ string set_psm(string psm);
4649+ string set_status(string status);
4650+ void get_conversation_history(string email);
4651+ void get_avatar_history(string email);
4652+ string get_email_page();
4653+ }
4654+
4655+ static Emesene()
4656+ {
4657+ //Populate emesene status list
4658+ status = new List<Item>();
4659+ status.Add(new EmeseneStatusItem("online", "online status", "NLN"));
4660+ status.Add(new EmeseneStatusItem("away", "away status", "AWY"));
4661+ status.Add(new EmeseneStatusItem("brb", "brb status", "BRB"));
4662+ status.Add(new EmeseneStatusItem("busy", "busy status", "BSY"));
4663+ status.Add(new EmeseneStatusItem("idle", "idle status", "IDL"));
4664+ status.Add(new EmeseneStatusItem("lunch", "lunch status", "LUN"));
4665+ status.Add(new EmeseneStatusItem("invisible", "invisible status", "HDN"));
4666+ status.Add(new EmeseneStatusItem("phone", "phone status", "PHN"));
4667+ status.Add(new EmeseneStatusItem("offline", "offline status", "FLN"));
4668+
4669+ }
4670+
4671+ public static EmeseneInterface getEmeseneObject()
4672+ {
4673+ try
4674+ {
4675+ return Bus.Session.GetObject<EmeseneInterface>
4676+ (emeseneServiceBusName, new ObjectPath (emeseneObjectPath));
4677+ }
4678+ catch(Exception e)
4679+ {
4680+ Log<Emesene>.Error ("Emesene > Error getting EmeseneObject - {0}", e.Message);
4681+ Log<Emesene>.Debug (e.StackTrace);
4682+ return null;
4683+ }
4684+ }
4685+
4686+
4687+ public static bool checkForEmesene()
4688+ {
4689+ try
4690+ {
4691+ EmeseneInterface em = Bus.Session.GetObject<EmeseneInterface>
4692+ (emeseneServiceBusName, new ObjectPath (emeseneObjectPath));
4693+ em.get_user_account();
4694+ return true;
4695+ }
4696+ catch(Exception e)
4697+ {
4698+ return false;
4699+ }
4700+ }
4701+
4702+ public static void openChatWith(string mail)
4703+ {
4704+ EmeseneInterface em = Emesene.getEmeseneObject();
4705+ try{
4706+ em.open_conversation(mail, true);
4707+ }catch(Exception e){
4708+ //User is using older emesene
4709+ //em.open_conversation(mail);
4710+ Log<Emesene>.Debug ("Old version of emesene");
4711+ Log<Emesene>.Debug (e.StackTrace);
4712+ }
4713+
4714+ }
4715+
4716+ public static string getCurrentEmeseneUser()
4717+ {
4718+ EmeseneInterface em = Emesene.getEmeseneObject();
4719+ return em.get_user_account();
4720+ }
4721+
4722+ public static string get_last_display_picture(string account, bool cache)
4723+ {
4724+ EmeseneInterface em = Emesene.getEmeseneObject();
4725+ return em.get_last_display_picture(account, cache);
4726+ }
4727+
4728+ public static string set_nick(string nick)
4729+ {
4730+ EmeseneInterface em = Emesene.getEmeseneObject();
4731+ return em.set_nick(nick);
4732+ }
4733+
4734+ public static bool set_avatar(string path)
4735+ {
4736+ EmeseneInterface em = Emesene.getEmeseneObject();
4737+ return em.set_avatar(path);
4738+ }
4739+
4740+ public static string set_psm(string psm)
4741+ {
4742+ EmeseneInterface em = Emesene.getEmeseneObject();
4743+ return em.set_psm(psm);
4744+ }
4745+
4746+ public static string set_status(string status)
4747+ {
4748+ EmeseneInterface em = Emesene.getEmeseneObject();
4749+ return em.set_status(status);
4750+ }
4751+
4752+ public static void get_conversation_history(string email)
4753+ {
4754+ EmeseneInterface em = Emesene.getEmeseneObject();
4755+ em.get_conversation_history(email);
4756+ }
4757+
4758+ public static void get_avatar_history(string email)
4759+ {
4760+ EmeseneInterface em = Emesene.getEmeseneObject();
4761+ em.get_avatar_history(email);
4762+ }
4763+
4764+ public static string get_email_page()
4765+ {
4766+ EmeseneInterface em = Emesene.getEmeseneObject();
4767+ return em.get_email_page();
4768+ }
4769+
4770+ }
4771+}
4772
4773=== added file 'Emesene/src/EmeseneAvatarItem.cs'
4774--- Emesene/src/EmeseneAvatarItem.cs 1970-01-01 00:00:00 +0000
4775+++ Emesene/src/EmeseneAvatarItem.cs 2009-02-01 20:21:24 +0000
4776@@ -0,0 +1,57 @@
4777+using System;
4778+using Do.Universe;
4779+using Do.Platform;
4780+
4781+namespace Do.Universe
4782+{
4783+ public class EmeseneAvatarItem : Item, IFileItem
4784+ {
4785+
4786+ private string path;
4787+
4788+ public EmeseneAvatarItem(string path)
4789+ {
4790+ this.path = path;
4791+ }
4792+
4793+
4794+ public override string Name
4795+ {
4796+ get { return path; }
4797+ }
4798+
4799+ public override string Description
4800+ {
4801+ get { return "Emesene avatar."; }
4802+ }
4803+
4804+ public string Uri
4805+ {
4806+ get { return "file://" + Path; }
4807+ }
4808+
4809+ public string Path
4810+ {
4811+ get { return this.path; }
4812+ }
4813+
4814+ public override string Icon
4815+ {
4816+ get { return this.path; }
4817+ }
4818+
4819+ public override bool Equals(object obj)
4820+ {
4821+ if (obj == null) return false;
4822+
4823+ if (this.GetType() != obj.GetType()) return false;
4824+ EmeseneAvatarItem avatar = (EmeseneAvatarItem) obj;
4825+
4826+ // Check for paths
4827+ if (!Object.Equals(this.path, avatar.path)) return false;
4828+
4829+ return true;
4830+ }
4831+
4832+ }
4833+}
4834
4835=== added file 'Emesene/src/EmeseneAvatarItemSource.cs'
4836--- Emesene/src/EmeseneAvatarItemSource.cs 1970-01-01 00:00:00 +0000
4837+++ Emesene/src/EmeseneAvatarItemSource.cs 2009-02-01 20:21:24 +0000
4838@@ -0,0 +1,55 @@
4839+using System;
4840+using System.IO;
4841+using Do.Universe;
4842+using Do.Platform;
4843+using System.Collections.Generic;
4844+
4845+namespace Do.Universe
4846+{
4847+ public class EmeseneAvatarItemSource : ItemSource
4848+ {
4849+ private List<Item> avatars;
4850+
4851+ public EmeseneAvatarItemSource()
4852+ {
4853+ this.avatars = new List<Item>();
4854+ }
4855+
4856+ public override void UpdateItems ()
4857+ {
4858+ Log<EmeseneAvatarItemSource>.Debug ("Checking for emesene Dbus...");
4859+ if (Emesene.checkForEmesene())
4860+ {
4861+ Log<EmeseneAvatarItemSource>.Debug ("Emesene Dbus is ON");
4862+ string avatarsPath = Emesene.getAvatarPathForUser();
4863+ Log<EmeseneAvatarItemSource>.Debug ("Folder with emesene avatars: {0}", avatarsPath);
4864+ string [] fileEntries = Directory.GetFiles(avatarsPath);
4865+ foreach(string fileName in fileEntries)
4866+ {
4867+ if(!fileName.Contains("_thumb") && !this.avatars.Contains(new EmeseneAvatarItem(fileName)))
4868+ {
4869+ this.avatars.Add(new EmeseneAvatarItem(fileName));
4870+ }
4871+ }
4872+ }
4873+ else
4874+ {
4875+ Log<EmeseneAvatarItemSource>.Debug ("Emesene Dbus is OFF");
4876+ }
4877+ }
4878+
4879+ public override string Name { get { return "Emesene Avatars"; } }
4880+ public override string Description { get { return "Avaliable emesene avatars for your account."; }}
4881+ public override string Icon {get { return "emesene"; } }
4882+
4883+ public override IEnumerable<Type> SupportedItemTypes
4884+ {
4885+ get { yield return typeof (EmeseneAvatarItem); }
4886+ }
4887+
4888+ public override IEnumerable<Do.Universe.Item> Items
4889+ {
4890+ get { return this.avatars; }
4891+ }
4892+ }
4893+}
4894
4895=== added file 'Emesene/src/EmeseneChangeAvatarAction.cs'
4896--- Emesene/src/EmeseneChangeAvatarAction.cs 1970-01-01 00:00:00 +0000
4897+++ Emesene/src/EmeseneChangeAvatarAction.cs 2009-02-01 20:21:24 +0000
4898@@ -0,0 +1,63 @@
4899+using System;
4900+using Do.Universe;
4901+using System.Collections.Generic;
4902+using System.IO;
4903+using System.Linq;
4904+
4905+namespace Do.Universe
4906+{
4907+ public class EmeseneChangeAvatarAction : Act
4908+ {
4909+ public static Dictionary<string, string> imageMimeTypeMap = new Dictionary<string,string>
4910+ {
4911+ {".jpg", "image/jpeg"},
4912+ {".jpeg", "image/jpeg"},
4913+ {".png", "image/png"},
4914+ {".gif", "image/gif"},
4915+ {".bmp", "image/bmp"},
4916+ {".tif", "image/tiff"},
4917+ {".tiff", "image/tiff"}
4918+ };
4919+
4920+ public EmeseneChangeAvatarAction()
4921+ {
4922+ }
4923+
4924+ private bool IsImageFile (IFileItem file)
4925+ {
4926+ return imageMimeTypeMap.ContainsKey (Path.GetExtension (file.Path));
4927+ }
4928+
4929+ public override string Name
4930+ {
4931+ get { return "Change emesene display picture"; }
4932+ }
4933+
4934+ public override string Description
4935+ {
4936+ get { return "Change your emesene display picture"; }
4937+ }
4938+
4939+ public override string Icon
4940+ {
4941+ get { return "emesene"; }
4942+ }
4943+
4944+ public override IEnumerable<Type> SupportedItemTypes {
4945+ get { yield return typeof (IFileItem); }
4946+ }
4947+
4948+ public override bool SupportsItem (Item item)
4949+ {
4950+ if (item is IFileItem)
4951+ return IsImageFile((item as IFileItem));
4952+ return false;
4953+ }
4954+
4955+ public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
4956+ {
4957+ Emesene.set_avatar((items.First() as IFileItem).Path);
4958+ yield break;
4959+ }
4960+ }
4961+}
4962
4963=== added file 'Emesene/src/EmeseneChangeNickAction.cs'
4964--- Emesene/src/EmeseneChangeNickAction.cs 1970-01-01 00:00:00 +0000
4965+++ Emesene/src/EmeseneChangeNickAction.cs 2009-02-01 20:21:24 +0000
4966@@ -0,0 +1,44 @@
4967+using System;
4968+using System.Collections.Generic;
4969+using System.Linq;
4970+
4971+namespace Do.Universe
4972+{
4973+ public class EmeseneChangeNickAction : Act
4974+ {
4975+ public EmeseneChangeNickAction()
4976+ {
4977+ }
4978+
4979+ public override string Name
4980+ {
4981+ get { return "Change emesene nickname"; }
4982+ }
4983+
4984+ public override string Description
4985+ {
4986+ get { return "Change your emesene nickname."; }
4987+ }
4988+
4989+ public override string Icon
4990+ {
4991+ get { return "emesene"; }
4992+ }
4993+
4994+ public override IEnumerable<Type> SupportedItemTypes
4995+ {
4996+ get { yield return typeof (ITextItem); }
4997+ }
4998+
4999+ public override bool SupportsItem (Item item)
5000+ {
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: