Merge lp:~mandel/ubuntuone-windows-installer/connect_u1sync_gui into lp:ubuntuone-windows-installer/beta
- connect_u1sync_gui
- Merge into beta
Proposed by
Manuel de la Peña
Status: | Merged |
---|---|
Approved by: | Stuart Colville |
Approved revision: | 62 |
Merged at revision: | 74 |
Proposed branch: | lp:~mandel/ubuntuone-windows-installer/connect_u1sync_gui |
Merge into: | lp:ubuntuone-windows-installer/beta |
Prerequisite: | lp:~mandel/ubuntuone-windows-installer/include_u1sync_msi |
Diff against target: |
649 lines (+304/-162) 13 files modified
.bzrignore (+2/-0) install/UbuntuOne.wxs (+39/-0) main.build (+6/-0) src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj (+7/-5) src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml (+6/-1) src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs (+59/-0) src/Canonical.UbuntuOne.Client.Views/Resources/Resources.Designer.cs (+0/-153) src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx (+3/-0) src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs (+162/-0) src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs (+5/-0) src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs (+10/-0) src/setup.py (+4/-2) src/u1sync/main.py (+1/-1) |
To merge this branch: | bzr merge lp:~mandel/ubuntuone-windows-installer/connect_u1sync_gui |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stuart Colville (community) | Approve | ||
Rodrigo Moya (community) | Approve | ||
Review via email:
|
Commit message
Description of the change
Connects the UI with the currently developed sync.
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Rodrigo Moya (rodrigo-moya) : | # |
review:
Approve
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Stuart Colville (muffinresearch) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.bzrignore' |
2 | --- .bzrignore 2010-08-30 09:37:56 +0000 |
3 | +++ .bzrignore 2010-08-30 09:37:56 +0000 |
4 | @@ -33,3 +33,5 @@ |
5 | src/Canonical.UbuntuOne.SyncDaemon/bin |
6 | src/build |
7 | src/dist |
8 | +utils/UbuntuOne.msi |
9 | +build.number |
10 | |
11 | === modified file 'install/UbuntuOne.wxs' |
12 | --- install/UbuntuOne.wxs 2010-08-30 09:37:56 +0000 |
13 | +++ install/UbuntuOne.wxs 2010-08-30 09:37:56 +0000 |
14 | @@ -902,6 +902,41 @@ |
15 | Source="build_results\u1sync\zope.interface._zope_interface_coptimizations.pyd" |
16 | KeyPath="yes"/> |
17 | </Component> |
18 | + <Directory Id="Vc90Dir" |
19 | + Name="Microsoft.VC90.CRT"> |
20 | + <Component Id="MicrosoftVC90CRTManifestComponent" |
21 | + Guid="46354fd0-b3ac-11df-8d81-0800200c9a66"> |
22 | + <File Id="Microsoft.VC90.CRT.manifest" |
23 | + Name="Microsoft.VC90.CRT.manifest" |
24 | + DiskId="1" |
25 | + Source="build_results\u1sync\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" |
26 | + KeyPath="yes"/> |
27 | + </Component> |
28 | + <Component Id="Msvcm90Component" |
29 | + Guid="ae81e760-b3ac-11df-8d81-0800200c9a66"> |
30 | + <File Id="msvcm90.dll" |
31 | + Name="msvcm90.dll" |
32 | + DiskId="1" |
33 | + Source="build_results\u1sync\Microsoft.VC90.CRT\msvcm90.dll" |
34 | + KeyPath="yes"/> |
35 | + </Component> |
36 | + <Component Id="Msvcp90Component" |
37 | + Guid="f7dbacc0-b3ac-11df-8d81-0800200c9a66"> |
38 | + <File Id="msvcp90.dll" |
39 | + Name="msvcp90.dll" |
40 | + DiskId="1" |
41 | + Source="build_results\u1sync\Microsoft.VC90.CRT\msvcp90.dll" |
42 | + KeyPath="yes"/> |
43 | + </Component> |
44 | + <Component Id="Msvcr90Component" |
45 | + Guid="e5e63e30-b3ad-11df-8d81-0800200c9a66"> |
46 | + <File Id="msvcr90.dll" |
47 | + Name="msvcr90.dll" |
48 | + DiskId="1" |
49 | + Source="build_results\u1sync\Microsoft.VC90.CRT\msvcr90.dll" |
50 | + KeyPath="yes"/> |
51 | + </Component> |
52 | + </Directory> |
53 | </Directory> |
54 | </Directory> |
55 | </Directory> |
56 | @@ -1021,6 +1056,10 @@ |
57 | <ComponentRef Id="Win32WnetComponent" /> |
58 | <ComponentRef Id="ZLibComponent" /> |
59 | <ComponentRef Id="ZopeInterfaceComponent" /> |
60 | + <ComponentRef Id="MicrosoftVC90CRTManifestComponent" /> |
61 | + <ComponentRef Id="Msvcm90Component" /> |
62 | + <ComponentRef Id="Msvcp90Component" /> |
63 | + <ComponentRef Id="Msvcr90Component" /> |
64 | </Feature> |
65 | |
66 | <!-- Provide the UI extensions to be used --> |
67 | |
68 | === modified file 'main.build' |
69 | --- main.build 2010-08-30 09:37:56 +0000 |
70 | +++ main.build 2010-08-30 09:37:56 +0000 |
71 | @@ -233,6 +233,12 @@ |
72 | </fileset> |
73 | </copy> |
74 | |
75 | + <copy todir="${build_results}/u1sync/Microsoft.VC90.CRT" flatten="true"> |
76 | + <fileset basedir="src/dist/Microsoft.VC90.CRT"> |
77 | + <include name="*.*" /> |
78 | + </fileset> |
79 | + </copy> |
80 | + |
81 | <!-- copy the correct views lib --> |
82 | |
83 | <copy todir="${build_results}/Client" flatten="true"> |
84 | |
85 | === modified file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj' |
86 | --- src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj 2010-08-04 14:36:09 +0000 |
87 | +++ src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj 2010-08-30 09:37:56 +0000 |
88 | @@ -80,6 +80,11 @@ |
89 | </Compile> |
90 | </ItemGroup> |
91 | <ItemGroup> |
92 | + <Compile Include="Resources\Resources1.Designer.cs"> |
93 | + <AutoGen>True</AutoGen> |
94 | + <DesignTime>True</DesignTime> |
95 | + <DependentUpon>Resources.resx</DependentUpon> |
96 | + </Compile> |
97 | <Compile Include="UbuntuOneMessageBox.cs" /> |
98 | <Compile Include="..\Version.cs"> |
99 | <Link>Properties\Version.cs</Link> |
100 | @@ -95,11 +100,6 @@ |
101 | <DesignTime>True</DesignTime> |
102 | <DependentUpon>Resources.resx</DependentUpon> |
103 | </Compile> |
104 | - <Compile Include="Resources\Resources.Designer.cs"> |
105 | - <AutoGen>True</AutoGen> |
106 | - <DesignTime>True</DesignTime> |
107 | - <DependentUpon>Resources.resx</DependentUpon> |
108 | - </Compile> |
109 | <Compile Include="Update\DownloadingView.xaml.cs"> |
110 | <DependentUpon>DownloadingView.xaml</DependentUpon> |
111 | </Compile> |
112 | @@ -113,6 +113,8 @@ |
113 | </EmbeddedResource> |
114 | <EmbeddedResource Include="Resources\Resources.resx"> |
115 | <SubType>Designer</SubType> |
116 | + <Generator>PublicResXFileCodeGenerator</Generator> |
117 | + <LastGenOutput>Resources1.Designer.cs</LastGenOutput> |
118 | </EmbeddedResource> |
119 | </ItemGroup> |
120 | <ItemGroup> |
121 | |
122 | === modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml' |
123 | --- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml 2010-07-27 16:07:04 +0000 |
124 | +++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml 2010-08-30 09:37:56 +0000 |
125 | @@ -31,9 +31,14 @@ |
126 | ShowActivated="False"> |
127 | <DockPanel> |
128 | <StackPanel Margin="20"> |
129 | - <av:NotifyIcon Name="notifyIcon" Icon="/Canonical.UbuntuOne.Client.Views;component/Resources/ubuntu-logo-22x22.png" Text="Ubuntu One"> <!-- TODO: Add icon Icon="/AvalonLibraryTestPages;component/Properties/App.ico" Open preferences when click --> |
130 | + <av:NotifyIcon Name="notifyIcon" Icon="/Canonical.UbuntuOne.Client.Views;component/Resources/ubuntu-logo-22x22.png" |
131 | + Text="Ubuntu One"> <!-- TODO: Add icon Icon="/AvalonLibraryTestPages;component/Properties/App.ico" Open preferences when click --> |
132 | <FrameworkElement.ContextMenu> |
133 | <ContextMenu> |
134 | + <MenuItem x:Uid="UbuntuOneManualSync" |
135 | + Name="UbuntuOneManualSync" |
136 | + Header="{x:Static resx:Resources.UbuntuOneManualSync}" |
137 | + Click="OnUbuntuOneManualSyncClick"/> |
138 | <MenuItem x:Uid="UbuntuOnePreferencesMenuItem" |
139 | Name="UbuntuOnePreferencesMenuItem" |
140 | Header="{x:Static resx:Resources.UbuntuOnePreferences}" /> |
141 | |
142 | === modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs' |
143 | --- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs 2010-08-05 08:15:00 +0000 |
144 | +++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs 2010-08-30 09:37:56 +0000 |
145 | @@ -17,6 +17,8 @@ |
146 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
147 | using System; |
148 | using System.Collections.Generic; |
149 | +using System.Diagnostics; |
150 | +using System.IO; |
151 | using Canonical.UbuntuOne.Client.Notification; |
152 | |
153 | namespace Canonical.UbuntuOne.Client.Views |
154 | @@ -74,5 +76,62 @@ |
155 | } |
156 | |
157 | #endregion |
158 | + |
159 | + private void OnUbuntuOneManualSyncClick(object sender, System.Windows.RoutedEventArgs e) |
160 | + { |
161 | + // TODO: Used the bloddy presenter!!!!! |
162 | + // TODO: This has to be fixed, we should not call the command directly, user the |
163 | + // process dispatcher to prepare for the syncdaemon!!!! |
164 | + // TODO: Do not hardcode the folder, use an object to store that |
165 | + // TODO: Do not store oauth in the env vars!!!! |
166 | + var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), |
167 | + "UbuntuOne"); |
168 | + if(!Directory.Exists(oneDir)) |
169 | + { |
170 | + Directory.CreateDirectory(oneDir); |
171 | + } |
172 | + |
173 | + if(!Directory.Exists(Path.Combine(oneDir, ".ubuntuone-sync"))) |
174 | + { |
175 | + // init the directory |
176 | + var init = new Process |
177 | + { |
178 | + StartInfo = |
179 | + { |
180 | + WorkingDirectory = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync", |
181 | + FileName = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync\main.exe", |
182 | + Arguments = String.Format(" --init {0} --oauth {1}", |
183 | + oneDir, |
184 | + Environment.GetEnvironmentVariable("UbuntuOne", EnvironmentVariableTarget.User)), |
185 | + UseShellExecute = false, |
186 | + RedirectStandardOutput = false, |
187 | + RedirectStandardError = false, |
188 | + CreateNoWindow = true, |
189 | + WindowStyle = ProcessWindowStyle.Hidden |
190 | + } |
191 | + }; |
192 | + init.Start(); |
193 | + init.WaitForExit(); |
194 | + init.Close(); |
195 | + } |
196 | + |
197 | + var proc = new Process |
198 | + { |
199 | + StartInfo = |
200 | + { |
201 | + WorkingDirectory = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync", |
202 | + FileName = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync\main.exe", |
203 | + Arguments = String.Format("{0} --oauth {1}", |
204 | + oneDir, |
205 | + Environment.GetEnvironmentVariable("UbuntuOne", EnvironmentVariableTarget.User)), |
206 | + UseShellExecute = false, |
207 | + RedirectStandardOutput = false, |
208 | + RedirectStandardError = false, |
209 | + CreateNoWindow = true, |
210 | + WindowStyle = ProcessWindowStyle.Hidden |
211 | + } |
212 | + }; |
213 | + proc.Start(); |
214 | + } |
215 | } |
216 | } |
217 | |
218 | === removed file 'src/Canonical.UbuntuOne.Client.Views/Resources/Resources.Designer.cs' |
219 | --- src/Canonical.UbuntuOne.Client.Views/Resources/Resources.Designer.cs 2010-07-29 17:19:47 +0000 |
220 | +++ src/Canonical.UbuntuOne.Client.Views/Resources/Resources.Designer.cs 1970-01-01 00:00:00 +0000 |
221 | @@ -1,153 +0,0 @@ |
222 | -//------------------------------------------------------------------------------ |
223 | -// <auto-generated> |
224 | -// This code was generated by a tool. |
225 | -// Runtime Version:2.0.50727.4927 |
226 | -// |
227 | -// Changes to this file may cause incorrect behavior and will be lost if |
228 | -// the code is regenerated. |
229 | -// </auto-generated> |
230 | -//------------------------------------------------------------------------------ |
231 | - |
232 | -namespace Canonical.UbuntuOne.Client.Views.Resources { |
233 | - using System; |
234 | - |
235 | - |
236 | - /// <summary> |
237 | - /// A strongly-typed resource class, for looking up localized strings, etc. |
238 | - /// </summary> |
239 | - // This class was auto-generated by the StronglyTypedResourceBuilder |
240 | - // class via a tool like ResGen or Visual Studio. |
241 | - // To add or remove a member, edit your .ResX file then rerun ResGen |
242 | - // with the /str option, or rebuild your VS project. |
243 | - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] |
244 | - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |
245 | - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] |
246 | - public class Resources { |
247 | - |
248 | - private static global::System.Resources.ResourceManager resourceMan; |
249 | - |
250 | - private static global::System.Globalization.CultureInfo resourceCulture; |
251 | - |
252 | - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] |
253 | - internal Resources() { |
254 | - } |
255 | - |
256 | - /// <summary> |
257 | - /// Returns the cached ResourceManager instance used by this class. |
258 | - /// </summary> |
259 | - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] |
260 | - public static global::System.Resources.ResourceManager ResourceManager { |
261 | - get { |
262 | - if (object.ReferenceEquals(resourceMan, null)) { |
263 | - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Canonical.UbuntuOne.Client.Views.Resources.Resources", typeof(Resources).Assembly); |
264 | - resourceMan = temp; |
265 | - } |
266 | - return resourceMan; |
267 | - } |
268 | - } |
269 | - |
270 | - /// <summary> |
271 | - /// Overrides the current thread's CurrentUICulture property for all |
272 | - /// resource lookups using this strongly typed resource class. |
273 | - /// </summary> |
274 | - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] |
275 | - public static global::System.Globalization.CultureInfo Culture { |
276 | - get { |
277 | - return resourceCulture; |
278 | - } |
279 | - set { |
280 | - resourceCulture = value; |
281 | - } |
282 | - } |
283 | - |
284 | - /// <summary> |
285 | - /// Looks up a localized string similar to Ubuntu One. |
286 | - /// </summary> |
287 | - public static string ApplicationName { |
288 | - get { |
289 | - return ResourceManager.GetString("ApplicationName", resourceCulture); |
290 | - } |
291 | - } |
292 | - |
293 | - /// <summary> |
294 | - /// Looks up a localized string similar to Downloading updates.... |
295 | - /// </summary> |
296 | - public static string DownloadingDialogTitle { |
297 | - get { |
298 | - return ResourceManager.GetString("DownloadingDialogTitle", resourceCulture); |
299 | - } |
300 | - } |
301 | - |
302 | - /// <summary> |
303 | - /// Looks up a localized string similar to Exit. |
304 | - /// </summary> |
305 | - public static string Exit { |
306 | - get { |
307 | - return ResourceManager.GetString("Exit", resourceCulture); |
308 | - } |
309 | - } |
310 | - |
311 | - /// <summary> |
312 | - /// Looks up a localized string similar to Get Help and Support.... |
313 | - /// </summary> |
314 | - public static string Help { |
315 | - get { |
316 | - return ResourceManager.GetString("Help", resourceCulture); |
317 | - } |
318 | - } |
319 | - |
320 | - /// <summary> |
321 | - /// Looks up a localized string similar to Get More Space. |
322 | - /// </summary> |
323 | - public static string MoreSpace { |
324 | - get { |
325 | - return ResourceManager.GetString("MoreSpace", resourceCulture); |
326 | - } |
327 | - } |
328 | - |
329 | - /// <summary> |
330 | - /// Looks up a localized string similar to Open Share Folders. |
331 | - /// </summary> |
332 | - public static string OpenShares { |
333 | - get { |
334 | - return ResourceManager.GetString("OpenShares", resourceCulture); |
335 | - } |
336 | - } |
337 | - |
338 | - /// <summary> |
339 | - /// Looks up a localized string similar to Open Sync Folders. |
340 | - /// </summary> |
341 | - public static string OpenSync { |
342 | - get { |
343 | - return ResourceManager.GetString("OpenSync", resourceCulture); |
344 | - } |
345 | - } |
346 | - |
347 | - /// <summary> |
348 | - /// Looks up a localized string similar to Recently Modify Files. |
349 | - /// </summary> |
350 | - public static string RecentlyModifyFiles { |
351 | - get { |
352 | - return ResourceManager.GetString("RecentlyModifyFiles", resourceCulture); |
353 | - } |
354 | - } |
355 | - |
356 | - /// <summary> |
357 | - /// Looks up a localized string similar to Ubuntu One Preferences. |
358 | - /// </summary> |
359 | - public static string UbuntuOnePreferences { |
360 | - get { |
361 | - return ResourceManager.GetString("UbuntuOnePreferences", resourceCulture); |
362 | - } |
363 | - } |
364 | - |
365 | - /// <summary> |
366 | - /// Looks up a localized string similar to Updating Ubuntu One.... |
367 | - /// </summary> |
368 | - public static string UpdatingDialogTitle { |
369 | - get { |
370 | - return ResourceManager.GetString("UpdatingDialogTitle", resourceCulture); |
371 | - } |
372 | - } |
373 | - } |
374 | -} |
375 | |
376 | === modified file 'src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx' |
377 | --- src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx 2010-07-29 17:19:47 +0000 |
378 | +++ src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx 2010-08-30 09:37:56 +0000 |
379 | @@ -141,6 +141,9 @@ |
380 | <data name="RecentlyModifyFiles" xml:space="preserve"> |
381 | <value>Recently Modify Files</value> |
382 | </data> |
383 | + <data name="UbuntuOneManualSync" xml:space="preserve"> |
384 | + <value>Synchronize Now</value> |
385 | + </data> |
386 | <data name="UbuntuOnePreferences" xml:space="preserve"> |
387 | <value>Ubuntu One Preferences</value> |
388 | </data> |
389 | |
390 | === added file 'src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs' |
391 | --- src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs 1970-01-01 00:00:00 +0000 |
392 | +++ src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs 2010-08-30 09:37:56 +0000 |
393 | @@ -0,0 +1,162 @@ |
394 | +//------------------------------------------------------------------------------ |
395 | +// <auto-generated> |
396 | +// This code was generated by a tool. |
397 | +// Runtime Version:2.0.50727.4952 |
398 | +// |
399 | +// Changes to this file may cause incorrect behavior and will be lost if |
400 | +// the code is regenerated. |
401 | +// </auto-generated> |
402 | +//------------------------------------------------------------------------------ |
403 | + |
404 | +namespace Canonical.UbuntuOne.Client.Views.Resources { |
405 | + using System; |
406 | + |
407 | + |
408 | + /// <summary> |
409 | + /// A strongly-typed resource class, for looking up localized strings, etc. |
410 | + /// </summary> |
411 | + // This class was auto-generated by the StronglyTypedResourceBuilder |
412 | + // class via a tool like ResGen or Visual Studio. |
413 | + // To add or remove a member, edit your .ResX file then rerun ResGen |
414 | + // with the /str option, or rebuild your VS project. |
415 | + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] |
416 | + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |
417 | + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] |
418 | + public class Resources { |
419 | + |
420 | + private static global::System.Resources.ResourceManager resourceMan; |
421 | + |
422 | + private static global::System.Globalization.CultureInfo resourceCulture; |
423 | + |
424 | + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] |
425 | + internal Resources() { |
426 | + } |
427 | + |
428 | + /// <summary> |
429 | + /// Returns the cached ResourceManager instance used by this class. |
430 | + /// </summary> |
431 | + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] |
432 | + public static global::System.Resources.ResourceManager ResourceManager { |
433 | + get { |
434 | + if (object.ReferenceEquals(resourceMan, null)) { |
435 | + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Canonical.UbuntuOne.Client.Views.Resources.Resources", typeof(Resources).Assembly); |
436 | + resourceMan = temp; |
437 | + } |
438 | + return resourceMan; |
439 | + } |
440 | + } |
441 | + |
442 | + /// <summary> |
443 | + /// Overrides the current thread's CurrentUICulture property for all |
444 | + /// resource lookups using this strongly typed resource class. |
445 | + /// </summary> |
446 | + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] |
447 | + public static global::System.Globalization.CultureInfo Culture { |
448 | + get { |
449 | + return resourceCulture; |
450 | + } |
451 | + set { |
452 | + resourceCulture = value; |
453 | + } |
454 | + } |
455 | + |
456 | + /// <summary> |
457 | + /// Looks up a localized string similar to Ubuntu One. |
458 | + /// </summary> |
459 | + public static string ApplicationName { |
460 | + get { |
461 | + return ResourceManager.GetString("ApplicationName", resourceCulture); |
462 | + } |
463 | + } |
464 | + |
465 | + /// <summary> |
466 | + /// Looks up a localized string similar to Downloading updates.... |
467 | + /// </summary> |
468 | + public static string DownloadingDialogTitle { |
469 | + get { |
470 | + return ResourceManager.GetString("DownloadingDialogTitle", resourceCulture); |
471 | + } |
472 | + } |
473 | + |
474 | + /// <summary> |
475 | + /// Looks up a localized string similar to Exit. |
476 | + /// </summary> |
477 | + public static string Exit { |
478 | + get { |
479 | + return ResourceManager.GetString("Exit", resourceCulture); |
480 | + } |
481 | + } |
482 | + |
483 | + /// <summary> |
484 | + /// Looks up a localized string similar to Get Help and Support.... |
485 | + /// </summary> |
486 | + public static string Help { |
487 | + get { |
488 | + return ResourceManager.GetString("Help", resourceCulture); |
489 | + } |
490 | + } |
491 | + |
492 | + /// <summary> |
493 | + /// Looks up a localized string similar to Get More Space. |
494 | + /// </summary> |
495 | + public static string MoreSpace { |
496 | + get { |
497 | + return ResourceManager.GetString("MoreSpace", resourceCulture); |
498 | + } |
499 | + } |
500 | + |
501 | + /// <summary> |
502 | + /// Looks up a localized string similar to Open Share Folders. |
503 | + /// </summary> |
504 | + public static string OpenShares { |
505 | + get { |
506 | + return ResourceManager.GetString("OpenShares", resourceCulture); |
507 | + } |
508 | + } |
509 | + |
510 | + /// <summary> |
511 | + /// Looks up a localized string similar to Open Sync Folders. |
512 | + /// </summary> |
513 | + public static string OpenSync { |
514 | + get { |
515 | + return ResourceManager.GetString("OpenSync", resourceCulture); |
516 | + } |
517 | + } |
518 | + |
519 | + /// <summary> |
520 | + /// Looks up a localized string similar to Recently Modify Files. |
521 | + /// </summary> |
522 | + public static string RecentlyModifyFiles { |
523 | + get { |
524 | + return ResourceManager.GetString("RecentlyModifyFiles", resourceCulture); |
525 | + } |
526 | + } |
527 | + |
528 | + /// <summary> |
529 | + /// Looks up a localized string similar to Synchronize Now. |
530 | + /// </summary> |
531 | + public static string UbuntuOneManualSync { |
532 | + get { |
533 | + return ResourceManager.GetString("UbuntuOneManualSync", resourceCulture); |
534 | + } |
535 | + } |
536 | + |
537 | + /// <summary> |
538 | + /// Looks up a localized string similar to Ubuntu One Preferences. |
539 | + /// </summary> |
540 | + public static string UbuntuOnePreferences { |
541 | + get { |
542 | + return ResourceManager.GetString("UbuntuOnePreferences", resourceCulture); |
543 | + } |
544 | + } |
545 | + |
546 | + /// <summary> |
547 | + /// Looks up a localized string similar to Updating Ubuntu One.... |
548 | + /// </summary> |
549 | + public static string UpdatingDialogTitle { |
550 | + get { |
551 | + return ResourceManager.GetString("UpdatingDialogTitle", resourceCulture); |
552 | + } |
553 | + } |
554 | + } |
555 | +} |
556 | |
557 | === modified file 'src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs' |
558 | --- src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs 2010-08-05 08:01:59 +0000 |
559 | +++ src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs 2010-08-30 09:37:56 +0000 |
560 | @@ -24,6 +24,11 @@ |
561 | public interface INotificationIconPresenter |
562 | { |
563 | /// <summary> |
564 | + /// When implemented this method should for the sync of the ubuntu one folder. |
565 | + /// </summary> |
566 | + void ManuelSync(); |
567 | + |
568 | + /// <summary> |
569 | /// When implemented this method should open the Preferences window of Ubuntu One. |
570 | /// </summary> |
571 | void OpenUbuntuOnePreferences(); |
572 | |
573 | === modified file 'src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs' |
574 | --- src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs 2010-08-05 08:01:59 +0000 |
575 | +++ src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs 2010-08-30 09:37:56 +0000 |
576 | @@ -16,6 +16,7 @@ |
577 | // |
578 | // Authors: Manuel de la Peña <manuel.delapena@canonical.com> |
579 | using System; |
580 | +using System.Diagnostics; |
581 | using Canonical.UbuntuOne.Client.Preferences; |
582 | using Canonical.UbuntuOne.Common.Aop; |
583 | using Canonical.UbuntuOne.Common.Utils; |
584 | @@ -191,6 +192,15 @@ |
585 | #region Implementation of INotificationIconPresenter |
586 | |
587 | /// <summary> |
588 | + /// When implemented this method should for the sync of the ubuntu one folder. |
589 | + /// </summary> |
590 | + public void ManuelSync() |
591 | + { |
592 | + throw new NotImplementedException(); |
593 | + |
594 | + } |
595 | + |
596 | + /// <summary> |
597 | /// Opens the Preferences window of Ubuntu One. |
598 | /// </summary> |
599 | public void OpenUbuntuOnePreferences() |
600 | |
601 | === modified file 'src/setup.py' |
602 | --- src/setup.py 2010-08-30 09:37:56 +0000 |
603 | +++ src/setup.py 2010-08-30 09:37:56 +0000 |
604 | @@ -3,6 +3,7 @@ |
605 | |
606 | """ """ |
607 | import sys |
608 | +from glob import glob |
609 | |
610 | # ModuleFinder can't handle runtime changes to __path__, but win32com uses them |
611 | try: |
612 | @@ -18,7 +19,7 @@ |
613 | import win32com |
614 | for p in win32com.__path__[1:]: |
615 | modulefinder.AddPackagePath("win32com", p) |
616 | - for extra in ["win32com.shell"]: #,"win32com.mapi" |
617 | + for extra in ["win32com.shell" ,"win32com.api"]: |
618 | __import__(extra) |
619 | m = sys.modules[extra] |
620 | for p in m.__path__[1:]: |
621 | @@ -26,7 +27,7 @@ |
622 | except ImportError: |
623 | # no build path setup, no worries. |
624 | pass |
625 | - |
626 | + |
627 | from distutils.core import setup |
628 | import py2exe |
629 | |
630 | @@ -44,6 +45,7 @@ |
631 | Ubuntu One is a suite of on-line |
632 | services. This package contains the a synchronization client for the |
633 | Ubuntu One file sharing service.""", |
634 | + data_files = [("Microsoft.VC90.CRT", glob(r'C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*'))], |
635 | license='GPLv3', |
636 | console=['u1sync\\main.py'], |
637 | requires=[ |
638 | |
639 | === modified file 'src/u1sync/main.py' |
640 | --- src/u1sync/main.py 2010-08-30 09:37:56 +0000 |
641 | +++ src/u1sync/main.py 2010-08-30 09:37:56 +0000 |
642 | @@ -357,4 +357,4 @@ |
643 | if __name__ == "__main__": |
644 | # set the name of the process, this just works on windows |
645 | sys.argv[0] = "Ubuntuone" |
646 | - main(sys.argv[1:]) |
647 | \ No newline at end of file |
648 | + sys.exit(main(sys.argv[1:])) |
649 | \ No newline at end of file |