Revision 96f88218
b/trunk/NetSparkle/NetSparkle2010.csproj | ||
---|---|---|
32 | 32 |
<IsWebBootstrapper>false</IsWebBootstrapper> |
33 | 33 |
<UseApplicationTrust>false</UseApplicationTrust> |
34 | 34 |
<BootstrapperEnabled>true</BootstrapperEnabled> |
35 |
<SccProjectName>SAK</SccProjectName> |
|
36 |
<SccLocalPath>SAK</SccLocalPath> |
|
37 |
<SccAuxPath>SAK</SccAuxPath> |
|
38 |
<SccProvider>SAK</SccProvider> |
|
35 |
<SccProjectName> |
|
36 |
</SccProjectName> |
|
37 |
<SccLocalPath> |
|
38 |
</SccLocalPath> |
|
39 |
<SccAuxPath> |
|
40 |
</SccAuxPath> |
|
41 |
<SccProvider> |
|
42 |
</SccProvider> |
|
39 | 43 |
</PropertyGroup> |
40 | 44 |
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
41 | 45 |
<DebugSymbols>true</DebugSymbols> |
b/trunk/Pithos.Client.WPF/Converters/SingleLineConverter.cs | ||
---|---|---|
1 |
#region |
|
2 |
/* ----------------------------------------------------------------------- |
|
3 |
* <copyright file="SingleLineConverter.cs" company="GRNet"> |
|
4 |
* |
|
5 |
* Copyright 2011-2012 GRNET S.A. All rights reserved. |
|
6 |
* |
|
7 |
* Redistribution and use in source and binary forms, with or |
|
8 |
* without modification, are permitted provided that the following |
|
9 |
* conditions are met: |
|
10 |
* |
|
11 |
* 1. Redistributions of source code must retain the above |
|
12 |
* copyright notice, this list of conditions and the following |
|
13 |
* disclaimer. |
|
14 |
* |
|
15 |
* 2. Redistributions in binary form must reproduce the above |
|
16 |
* copyright notice, this list of conditions and the following |
|
17 |
* disclaimer in the documentation and/or other materials |
|
18 |
* provided with the distribution. |
|
19 |
* |
|
20 |
* |
|
21 |
* THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS |
|
22 |
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
|
23 |
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
|
24 |
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR |
|
25 |
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
|
26 |
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
|
27 |
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF |
|
28 |
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED |
|
29 |
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
|
30 |
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
|
31 |
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
32 |
* POSSIBILITY OF SUCH DAMAGE. |
|
33 |
* |
|
34 |
* The views and conclusions contained in the software and |
|
35 |
* documentation are those of the authors and should not be |
|
36 |
* interpreted as representing official policies, either expressed |
|
37 |
* or implied, of GRNET S.A. |
|
38 |
* </copyright> |
|
39 |
* ----------------------------------------------------------------------- |
|
40 |
*/ |
|
41 |
#endregion |
|
42 |
using System.Globalization; |
|
43 |
using System.Windows.Data; |
|
44 |
|
|
45 |
namespace Pithos.Client.WPF.Converters |
|
46 |
{ |
|
47 |
using System; |
|
48 |
using System.Collections.Generic; |
|
49 |
using System.Linq; |
|
50 |
using System.Text; |
|
51 |
|
|
52 |
/// <summary> |
|
53 |
/// Returns only the first line of a string |
|
54 |
/// </summary> |
|
55 |
public class SingleLineConverter:IValueConverter |
|
56 |
{ |
|
57 |
public object Convert(object value, Type targetType, object parameter, CultureInfo culture) |
|
58 |
{ |
|
59 |
if (value is string) |
|
60 |
{ |
|
61 |
var lines = ((string) value).Split(new []{"\r\n"},StringSplitOptions.RemoveEmptyEntries); |
|
62 |
return lines.Length > 0 ? lines[0] : value; |
|
63 |
} |
|
64 |
return value; |
|
65 |
} |
|
66 |
|
|
67 |
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) |
|
68 |
{ |
|
69 |
throw new NotImplementedException(); |
|
70 |
} |
|
71 |
} |
|
72 |
} |
b/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj | ||
---|---|---|
282 | 282 |
<Compile Include="Converters\DummyConverter.cs" /> |
283 | 283 |
<Compile Include="Converters\EmptyToVisibilityConverter.cs" /> |
284 | 284 |
<Compile Include="Converters\NullToVisibilityConverter.cs" /> |
285 |
<Compile Include="Converters\SingleLineConverter.cs" /> |
|
285 | 286 |
<Compile Include="FileProperties\ContainerPolicy.cs" /> |
286 | 287 |
<Compile Include="FileProperties\NewContainerView.xaml.cs"> |
287 | 288 |
<DependentUpon>NewContainerView.xaml</DependentUpon> |
b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml | ||
---|---|---|
124 | 124 |
<ColumnDefinition Width="*"/> |
125 | 125 |
<ColumnDefinition Width="Auto"/> |
126 | 126 |
</Grid.ColumnDefinitions> |
127 |
<TextBox Name="CurrentAccount_RootPath" Margin="5" HorizontalAlignment="Stretch" Grid.Column="0" IsEnabled="False"/> |
|
127 |
<TextBox Name="CurrentAccount_RootPath" Margin="5" HorizontalAlignment="Stretch" Grid.Column="0" IsReadOnly="True" ToolTip="{Binding CurrentAccount.RootPath}"/> |
|
128 |
|
|
128 | 129 |
<Button Name="MoveAccountFolder" Content="Move ..." Width="60" Height="30" Grid.Column="1" /> |
129 | 130 |
</Grid> |
130 | 131 |
<CheckBox Name="CurrentAccount_IsActive" Content="Account is Active" Grid.Column="1" Grid.Row="4" Margin="5"/> |
b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs | ||
---|---|---|
93 | 93 |
// You can specify all the values or you can default the Build and Revision Numbers |
94 | 94 |
// by using the '*' as shown below: |
95 | 95 |
// [assembly: AssemblyVersion("1.0.*")] |
96 |
[assembly: AssemblyVersion("0.7.20305.0")] |
|
97 |
[assembly: AssemblyFileVersionAttribute("0.7.20305.0")] |
|
96 |
[assembly: AssemblyVersion("0.7.20306.0")] |
|
97 |
[assembly: AssemblyFileVersionAttribute("0.7.20306.0")] |
b/trunk/Pithos.Client.WPF/Shell/ShellView.xaml | ||
---|---|---|
5 | 5 |
xmlns:cal="http://www.caliburnproject.org" |
6 | 6 |
x:Name="TheView" WindowStartupLocation="CenterScreen" WindowStyle="None" |
7 | 7 |
Visibility="Collapsed" |
8 |
Width="700" Height="200" SizeToContent="Width" WindowState="Minimized" Icon="/Pithos.Client.WPF;component/Images/PithosTaskbar.png"> |
|
8 |
Width="700" Height="200" SizeToContent="Width" WindowState="Minimized" Icon="/Pithos.Client.WPF;component/Images/PithosTaskbar.png" xmlns:my="clr-namespace:Pithos.Client.WPF.Converters">
|
|
9 | 9 |
|
10 | 10 |
<!-- |
11 | 11 |
<Window.Background> |
... | ... | |
21 | 21 |
<ResourceDictionary Source="../PithosStyles.xaml" /> |
22 | 22 |
</ResourceDictionary.MergedDictionaries> |
23 | 23 |
<BooleanToVisibilityConverter x:Key="BooleanToVisible" /> |
24 |
<my:SingleLineConverter x:Key="SingleConverter" /> |
|
24 | 25 |
</ResourceDictionary> |
25 | 26 |
</Window.Resources> |
26 | 27 |
<Grid> |
... | ... | |
82 | 83 |
</MenuItem.ItemTemplate> |
83 | 84 |
</MenuItem> |
84 | 85 |
<Separator /> |
85 |
<MenuItem x:Name="StatusMessage"> |
|
86 |
<MenuItem.Header> |
|
87 |
<TextBlock Text="{Binding StatusMessage}" TextWrapping="WrapWithOverflow" Width="160" /> |
|
88 |
</MenuItem.Header> |
|
89 |
</MenuItem> |
|
86 |
<MenuItem x:Name="StatusMessage" Header="{Binding Path=StatusMessage, Converter={StaticResource SingleConverter}}" MaxWidth="200" /> |
|
90 | 87 |
<Separator /> |
91 | 88 |
<MenuItem Header="{Binding PauseSyncCaption}" x:Name="ToggleSynching" cal:Message.Attach="ToggleSynching" /> |
92 | 89 |
<Separator /> |
b/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj | ||
---|---|---|
70 | 70 |
"Entry" |
71 | 71 |
{ |
72 | 72 |
"MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C" |
73 |
"OwnerKey" = "8:_E79B572E4B64318A4A691D5E4B4BF3F5" |
|
74 |
"MsmSig" = "8:_UNDEFINED" |
|
75 |
} |
|
76 |
"Entry" |
|
77 |
{ |
|
78 |
"MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C" |
|
73 | 79 |
"OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9" |
74 | 80 |
"MsmSig" = "8:_UNDEFINED" |
75 | 81 |
} |
... | ... | |
315 | 321 |
} |
316 | 322 |
"Entry" |
317 | 323 |
{ |
324 |
"MsmKey" = "8:_E79B572E4B64318A4A691D5E4B4BF3F5" |
|
325 |
"OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9" |
|
326 |
"MsmSig" = "8:_UNDEFINED" |
|
327 |
} |
|
328 |
"Entry" |
|
329 |
{ |
|
318 | 330 |
"MsmKey" = "8:_F472AA6700476700D62AABE8262628BF" |
319 | 331 |
"OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6" |
320 | 332 |
"MsmSig" = "8:_UNDEFINED" |
... | ... | |
442 | 454 |
"Entry" |
443 | 455 |
{ |
444 | 456 |
"MsmKey" = "8:_UNDEFINED" |
457 |
"OwnerKey" = "8:_E79B572E4B64318A4A691D5E4B4BF3F5" |
|
458 |
"MsmSig" = "8:_UNDEFINED" |
|
459 |
} |
|
460 |
"Entry" |
|
461 |
{ |
|
462 |
"MsmKey" = "8:_UNDEFINED" |
|
445 | 463 |
"OwnerKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D" |
446 | 464 |
"MsmSig" = "8:_UNDEFINED" |
447 | 465 |
} |
... | ... | |
1133 | 1151 |
"IsDependency" = "11:TRUE" |
1134 | 1152 |
"IsolateTo" = "8:" |
1135 | 1153 |
} |
1154 |
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E79B572E4B64318A4A691D5E4B4BF3F5" |
|
1155 |
{ |
|
1156 |
"AssemblyRegister" = "3:1" |
|
1157 |
"AssemblyIsInGAC" = "11:FALSE" |
|
1158 |
"AssemblyAsmDisplayName" = "8:AppLimit.NetSparkle.Net40, Version=1.0.22.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL" |
|
1159 |
"ScatterAssemblies" |
|
1160 |
{ |
|
1161 |
"_E79B572E4B64318A4A691D5E4B4BF3F5" |
|
1162 |
{ |
|
1163 |
"Name" = "8:AppLimit.NetSparkle.Net40.dll" |
|
1164 |
"Attributes" = "3:512" |
|
1165 |
} |
|
1166 |
} |
|
1167 |
"SourcePath" = "8:AppLimit.NetSparkle.Net40.dll" |
|
1168 |
"TargetName" = "8:" |
|
1169 |
"Tag" = "8:" |
|
1170 |
"Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD" |
|
1171 |
"Condition" = "8:" |
|
1172 |
"Transitive" = "11:FALSE" |
|
1173 |
"Vital" = "11:TRUE" |
|
1174 |
"ReadOnly" = "11:FALSE" |
|
1175 |
"Hidden" = "11:FALSE" |
|
1176 |
"System" = "11:FALSE" |
|
1177 |
"Permanent" = "11:FALSE" |
|
1178 |
"SharedLegacy" = "11:FALSE" |
|
1179 |
"PackageAs" = "3:1" |
|
1180 |
"Register" = "3:1" |
|
1181 |
"Exclude" = "11:FALSE" |
|
1182 |
"IsDependency" = "11:TRUE" |
|
1183 |
"IsolateTo" = "8:" |
|
1184 |
} |
|
1136 | 1185 |
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F472AA6700476700D62AABE8262628BF" |
1137 | 1186 |
{ |
1138 | 1187 |
"AssemblyRegister" = "3:1" |
... | ... | |
1326 | 1375 |
{ |
1327 | 1376 |
"Name" = "8:Microsoft Visual Studio" |
1328 | 1377 |
"ProductName" = "8:Pithos" |
1329 |
"ProductCode" = "8:{F0D4CF43-1BE4-4B68-A247-781E31CF37B4}"
|
|
1330 |
"PackageCode" = "8:{D8D45676-4CC0-40A9-B6E5-0F58306DF8E7}"
|
|
1378 |
"ProductCode" = "8:{B83227E8-A064-475F-9BC8-38BBFBC55AB8}"
|
|
1379 |
"PackageCode" = "8:{DD9A6ECF-274E-41F9-9B5E-00B77D45DF24}"
|
|
1331 | 1380 |
"UpgradeCode" = "8:{205365D1-28AA-4322-A46C-FCB37502C6EF}" |
1332 | 1381 |
"AspNetVersion" = "8:4.0.30319.0" |
1333 | 1382 |
"RestartWWWService" = "11:FALSE" |
1334 | 1383 |
"RemovePreviousVersions" = "11:TRUE" |
1335 | 1384 |
"DetectNewerInstalledVersion" = "11:TRUE" |
1336 | 1385 |
"InstallAllUsers" = "11:FALSE" |
1337 |
"ProductVersion" = "8:0.7.20305"
|
|
1386 |
"ProductVersion" = "8:0.7.20306"
|
|
1338 | 1387 |
"Manufacturer" = "8:GRNET" |
1339 | 1388 |
"ARPHELPTELEPHONE" = "8:" |
1340 | 1389 |
"ARPHELPLINK" = "8:http://code.grnet.gr/projects/pithos-ms-client" |
b/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj | ||
---|---|---|
70 | 70 |
"Entry" |
71 | 71 |
{ |
72 | 72 |
"MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C" |
73 |
"OwnerKey" = "8:_E79B572E4B64318A4A691D5E4B4BF3F5" |
|
74 |
"MsmSig" = "8:_UNDEFINED" |
|
75 |
} |
|
76 |
"Entry" |
|
77 |
{ |
|
78 |
"MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C" |
|
73 | 79 |
"OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2" |
74 | 80 |
"MsmSig" = "8:_UNDEFINED" |
75 | 81 |
} |
... | ... | |
315 | 321 |
} |
316 | 322 |
"Entry" |
317 | 323 |
{ |
324 |
"MsmKey" = "8:_E79B572E4B64318A4A691D5E4B4BF3F5" |
|
325 |
"OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2" |
|
326 |
"MsmSig" = "8:_UNDEFINED" |
|
327 |
} |
|
328 |
"Entry" |
|
329 |
{ |
|
318 | 330 |
"MsmKey" = "8:_F472AA6700476700D62AABE8262628BF" |
319 | 331 |
"OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6" |
320 | 332 |
"MsmSig" = "8:_UNDEFINED" |
... | ... | |
442 | 454 |
"Entry" |
443 | 455 |
{ |
444 | 456 |
"MsmKey" = "8:_UNDEFINED" |
457 |
"OwnerKey" = "8:_E79B572E4B64318A4A691D5E4B4BF3F5" |
|
458 |
"MsmSig" = "8:_UNDEFINED" |
|
459 |
} |
|
460 |
"Entry" |
|
461 |
{ |
|
462 |
"MsmKey" = "8:_UNDEFINED" |
|
445 | 463 |
"OwnerKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D" |
446 | 464 |
"MsmSig" = "8:_UNDEFINED" |
447 | 465 |
} |
... | ... | |
1133 | 1151 |
"IsDependency" = "11:TRUE" |
1134 | 1152 |
"IsolateTo" = "8:" |
1135 | 1153 |
} |
1154 |
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E79B572E4B64318A4A691D5E4B4BF3F5" |
|
1155 |
{ |
|
1156 |
"AssemblyRegister" = "3:1" |
|
1157 |
"AssemblyIsInGAC" = "11:FALSE" |
|
1158 |
"AssemblyAsmDisplayName" = "8:AppLimit.NetSparkle.Net40, Version=1.0.22.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL" |
|
1159 |
"ScatterAssemblies" |
|
1160 |
{ |
|
1161 |
"_E79B572E4B64318A4A691D5E4B4BF3F5" |
|
1162 |
{ |
|
1163 |
"Name" = "8:AppLimit.NetSparkle.Net40.dll" |
|
1164 |
"Attributes" = "3:512" |
|
1165 |
} |
|
1166 |
} |
|
1167 |
"SourcePath" = "8:AppLimit.NetSparkle.Net40.dll" |
|
1168 |
"TargetName" = "8:" |
|
1169 |
"Tag" = "8:" |
|
1170 |
"Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD" |
|
1171 |
"Condition" = "8:" |
|
1172 |
"Transitive" = "11:FALSE" |
|
1173 |
"Vital" = "11:TRUE" |
|
1174 |
"ReadOnly" = "11:FALSE" |
|
1175 |
"Hidden" = "11:FALSE" |
|
1176 |
"System" = "11:FALSE" |
|
1177 |
"Permanent" = "11:FALSE" |
|
1178 |
"SharedLegacy" = "11:FALSE" |
|
1179 |
"PackageAs" = "3:1" |
|
1180 |
"Register" = "3:1" |
|
1181 |
"Exclude" = "11:FALSE" |
|
1182 |
"IsDependency" = "11:TRUE" |
|
1183 |
"IsolateTo" = "8:" |
|
1184 |
} |
|
1136 | 1185 |
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F472AA6700476700D62AABE8262628BF" |
1137 | 1186 |
{ |
1138 | 1187 |
"AssemblyRegister" = "3:1" |
... | ... | |
1326 | 1375 |
{ |
1327 | 1376 |
"Name" = "8:Microsoft Visual Studio" |
1328 | 1377 |
"ProductName" = "8:Pithos" |
1329 |
"ProductCode" = "8:{ABBA3B74-FF31-462C-800D-D59AED5562FB}"
|
|
1330 |
"PackageCode" = "8:{4BCE4514-9393-4BCB-B76C-5BC126DBD9D7}"
|
|
1378 |
"ProductCode" = "8:{EB522759-1C60-4F3E-8B4A-4CE50A7FD0D7}"
|
|
1379 |
"PackageCode" = "8:{FF62B781-2B1F-42DC-AF9D-DF8F98A74D95}"
|
|
1331 | 1380 |
"UpgradeCode" = "8:{205365D1-28AA-4322-A46C-FCB37502C6EF}" |
1332 | 1381 |
"AspNetVersion" = "8:4.0.30319.0" |
1333 | 1382 |
"RestartWWWService" = "11:FALSE" |
1334 | 1383 |
"RemovePreviousVersions" = "11:TRUE" |
1335 | 1384 |
"DetectNewerInstalledVersion" = "11:TRUE" |
1336 | 1385 |
"InstallAllUsers" = "11:FALSE" |
1337 |
"ProductVersion" = "8:0.7.20305"
|
|
1386 |
"ProductVersion" = "8:0.7.20306"
|
|
1338 | 1387 |
"Manufacturer" = "8:GRNET" |
1339 | 1388 |
"ARPHELPTELEPHONE" = "8:" |
1340 | 1389 |
"ARPHELPLINK" = "8:http://code.grnet.gr/projects/pithos-ms-client" |
Also available in: Unified diff