Revision 4127d08d
| b/trunk/Pithos.Client.WPF/App.xaml.cs | ||
|---|---|---|
| 165 | 165 |
Thread.Sleep(Settings.Default.StartupDelay); |
| 166 | 166 |
} |
| 167 | 167 |
|
| 168 |
var splashScreen = new SplashScreen("images/logo.png");
|
|
| 168 |
var splashScreen = new SplashScreen("images/pithos_logo-title-margin-splash-600-whitebg.png");
|
|
| 169 | 169 |
splashScreen.Show(true); |
| 170 | 170 |
|
| 171 | 171 |
base.OnStartup(e); |
| b/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml | ||
|---|---|---|
| 37 | 37 |
<TextBlock x:Name="Container" Text="Container" /> |
| 38 | 38 |
</StackPanel> |
| 39 | 39 |
<StackPanel Orientation="Horizontal" Grid.Row="1"> |
| 40 |
<TextBlock Text="Synch Status: " />
|
|
| 40 |
<TextBlock Text="Sync Status: " /> |
|
| 41 | 41 |
<TextBlock x:Name="SynchStatus" Text="Normal" /> |
| 42 | 42 |
</StackPanel> |
| 43 | 43 |
|
| b/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj | ||
|---|---|---|
| 15 | 15 |
<FileAlignment>512</FileAlignment> |
| 16 | 16 |
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
| 17 | 17 |
<WarningLevel>4</WarningLevel> |
| 18 |
<IsWebBootstrapper>false</IsWebBootstrapper> |
|
| 19 |
<CodeContractsAssemblyMode>0</CodeContractsAssemblyMode> |
|
| 18 | 20 |
<PublishUrl>publish\</PublishUrl> |
| 19 | 21 |
<Install>true</Install> |
| 20 | 22 |
<InstallFrom>Disk</InstallFrom> |
| ... | ... | |
| 27 | 29 |
<MapFileExtensions>true</MapFileExtensions> |
| 28 | 30 |
<ApplicationRevision>0</ApplicationRevision> |
| 29 | 31 |
<ApplicationVersion>0.7.0.%2a</ApplicationVersion> |
| 30 |
<IsWebBootstrapper>false</IsWebBootstrapper> |
|
| 31 | 32 |
<UseApplicationTrust>false</UseApplicationTrust> |
| 32 | 33 |
<BootstrapperEnabled>true</BootstrapperEnabled> |
| 33 |
<CodeContractsAssemblyMode>0</CodeContractsAssemblyMode> |
|
| 34 | 34 |
</PropertyGroup> |
| 35 | 35 |
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |
| 36 | 36 |
<PlatformTarget>x86</PlatformTarget> |
| ... | ... | |
| 86 | 86 |
<AssemblyOriginatorKeyFile>pithos.snk</AssemblyOriginatorKeyFile> |
| 87 | 87 |
</PropertyGroup> |
| 88 | 88 |
<PropertyGroup> |
| 89 |
<ApplicationIcon>Images\Pithos.ico</ApplicationIcon>
|
|
| 89 |
<ApplicationIcon>Images\pithos_logo-icon.ico</ApplicationIcon>
|
|
| 90 | 90 |
</PropertyGroup> |
| 91 | 91 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Premium Debug|x86'"> |
| 92 | 92 |
<DebugSymbols>true</DebugSymbols> |
| ... | ... | |
| 588 | 588 |
<Install>true</Install> |
| 589 | 589 |
</BootstrapperPackage> |
| 590 | 590 |
</ItemGroup> |
| 591 |
<ItemGroup /> |
|
| 591 |
<ItemGroup> |
|
| 592 |
<Resource Include="Images\pithos_logo-title-80height.png" /> |
|
| 593 |
</ItemGroup> |
|
| 594 |
<ItemGroup> |
|
| 595 |
<Resource Include="Images\Bitmap1.bmp" /> |
|
| 596 |
</ItemGroup> |
|
| 597 |
<ItemGroup> |
|
| 598 |
<Resource Include="Images\pithos_logo-title-margin-splash-600-whitebg.png" /> |
|
| 599 |
</ItemGroup> |
|
| 600 |
<ItemGroup> |
|
| 601 |
<Resource Include="Images\pithos_logo-icon.ico" /> |
|
| 602 |
</ItemGroup> |
|
| 592 | 603 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
| 593 | 604 |
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. |
| 594 | 605 |
Other similar extension points exist, see Microsoft.Common.targets. |
| 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.20316.0")]
|
|
| 97 |
[assembly: AssemblyFileVersionAttribute("0.7.20316.0")]
|
|
| 96 |
[assembly: AssemblyVersion("0.7.20317.0")]
|
|
| 97 |
[assembly: AssemblyFileVersionAttribute("0.7.20317.0")]
|
|
| b/trunk/Pithos.Client.WPF/Shell/AboutView.xaml | ||
|---|---|---|
| 12 | 12 |
<RowDefinition Height="*"/> |
| 13 | 13 |
<RowDefinition Height="Auto"/> |
| 14 | 14 |
</Grid.RowDefinitions> |
| 15 |
<Image Grid.Row="0" Source="/PithosPlus;component/Images/SmallLogo.png" /> |
|
| 16 |
<TextBlock Grid.Row="0" Text="Pithos+ " HorizontalAlignment="Center" FontSize="28" FontWeight="Bold" FontFamily="Segoe UI" Width="200" TextWrapping="WrapWithOverflow" TextAlignment="Center" VerticalAlignment="Center"/> |
|
| 15 |
<Image Grid.Row="0" Source="/PithosPlus;component/Images/pithos_logo-title-80height.png" /> |
|
| 17 | 16 |
<StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,0"> |
| 18 | 17 |
<TextBlock Text="Version" VerticalAlignment="Center"/> |
| 19 | 18 |
<TextBlock x:Name="Version" Text="0.0.0.0" FontWeight="Bold" Margin="5" VerticalAlignment="Center"/> |
| b/trunk/Pithos.Core/Agents/NetworkAgent.cs | ||
|---|---|---|
| 938 | 938 |
throw new ArgumentException("Invalid container","cloudFile");
|
| 939 | 939 |
Contract.EndContractBlock(); |
| 940 | 940 |
|
| 941 |
StatusNotification.Notify(new StatusNotification(String.Format("Uploading {0} for Upload", fileInfo.Name)));
|
|
| 941 |
StatusNotification.Notify(new StatusNotification(String.Format("Uploading {0}", fileInfo.Name)));
|
|
| 942 | 942 |
|
| 943 | 943 |
var fullFileName = fileInfo.GetProperCapitalization(); |
| 944 | 944 |
|
| b/trunk/Pithos.Installer/PithosPlus.iss | ||
|---|---|---|
| 42 | 42 |
AppReadmeFile=My Readme |
| 43 | 43 |
UninstallDisplayIcon={app}\PithosPlus.exe
|
| 44 | 44 |
WizardImageFile=Images\ppWZDImage.bmp |
| 45 |
WizardSmallImageFile=Images\ppWZDSmall.bmp
|
|
| 45 |
WizardSmallImageFile=Images\pithos_logo-square-icon-35.bmp
|
|
| 46 | 46 |
VersionInfoVersion={#MyAppVersion}
|
| 47 | 47 |
MinVersion=0,5.01sp3 |
| 48 | 48 |
ArchitecturesInstallIn64BitMode=x64 |
| ... | ... | |
| 523 | 523 |
ExtractTemporaryFile(ExtractFileName(BitmapFileName)); |
| 524 | 524 |
|
| 525 | 525 |
Page.Surface.Color := clWhite; |
| 526 |
|
|
| 527 |
LabelWz := Tlabel.Create(Page); |
|
| 528 |
LabelWz.Top := Page.Surface.Top; |
|
| 529 |
LabelWz.Caption := 'To setup your account right click on the Pithos+ icon in the taskbar.'; |
|
| 530 |
LabelWz.Parent := Page.Surface; |
|
| 531 |
|
|
| 526 | 532 |
BitmapImage1 := TBitmapImage.Create(Page); |
| 527 | 533 |
BitmapImage1.width := Page.SurfaceWidth; |
| 528 |
BitmapImage1.height := PAge.SurfaceHeight;
|
|
| 534 |
BitmapImage1.height := Page.SurfaceHeight;
|
|
| 529 | 535 |
BitmapImage1.Bitmap.LoadFromFile(BitmapFileName); |
| 530 | 536 |
BitmapImage1.Left := 0 |
| 531 |
BitmapImage1.Top := Page.Surface.Top; |
|
| 537 |
BitmapImage1.Top := Page.Surface.Top + LabelWz.Height;
|
|
| 532 | 538 |
BitmapImage1.Parent := Page.Surface; |
| 533 | 539 |
|
| 534 |
LabelWz := Tlabel.Create(Page); |
|
| 535 |
LabelWz.Top := 0; |
|
| 536 |
LabelWz.Caption := 'To setup your account right click on the Pithos+ icon in the taskbar.'; |
|
| 537 |
LabelWz.Parent := Page.Surface; |
|
| 538 | 540 |
end; |
| 539 | 541 |
|
| 540 | 542 |
procedure InitializeWizard; |
| ... | ... | |
| 564 | 566 |
|
| 565 | 567 |
[Run] |
| 566 | 568 |
;Kill Running Task |
| 567 |
Filename: cmd; parameters: /c taskkill /f /im pithos.exe;Flags: runhidden |
|
| 568 |
Filename: cmd; parameters: /c taskkill /f /im pithos.client.WPF.exe;Flags: runhidden |
|
| 569 |
Filename: cmd; parameters: /c taskkill /f /im pithos.exe; Flags: runhidden
|
|
| 570 |
Filename: cmd; parameters: /c taskkill /f /im pithos.client.WPF.exe; Flags: runhidden
|
|
| 569 | 571 |
;Launch Redist |
| 570 | 572 |
Filename: {tmp}\dotNetFx40_Client_setup.exe; Description: Install Microsoft .Net Framework 4.0; Parameters: /q /noreboot; Flags: skipifdoesntexist; Check: ShouldInstalldotNET40
|
| 571 | 573 |
Filename: {app}\UninsHs.exe; Parameters: /r0=AppId,{language},{srcexe}; Flags: runminimized
|
| b/trunk/Pithos.Installer/PithosPlus.~is | ||
|---|---|---|
| 42 | 42 |
AppReadmeFile=My Readme |
| 43 | 43 |
UninstallDisplayIcon={app}\PithosPlus.exe
|
| 44 | 44 |
WizardImageFile=Images\ppWZDImage.bmp |
| 45 |
WizardSmallImageFile=Images\ppWZDSmall.bmp
|
|
| 45 |
WizardSmallImageFile=Images\pithos_logo-square-icon-35.bmp
|
|
| 46 | 46 |
VersionInfoVersion={#MyAppVersion}
|
| 47 | 47 |
MinVersion=0,5.01sp3 |
| 48 | 48 |
ArchitecturesInstallIn64BitMode=x64 |
| ... | ... | |
| 75 | 75 |
[Files] |
| 76 | 76 |
; NOTE: Don't use "Flags: ignoreversion" on any shared system files |
| 77 | 77 |
; Executable |
| 78 |
Source: "..\Pithos.Client.WPF\bin\Debug\PithosPlus.exe"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Tasks: desktopicon; Languages: english french german spanish greek
|
|
| 78 |
Source: "..\Pithos.Client.WPF\bin\Debug\PithosPlus.exe"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
|
|
| 79 | 79 |
Source: "..\Pithos.Client.WPF\bin\Debug\PithosPlus.exe.config"; DestDir: {app}; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
|
| 80 | 80 |
; Appearance |
| 81 | 81 |
Source: "Skin\ISSkin.dll"; DestDir: {app}; Flags: dontcopy
|
| ... | ... | |
| 523 | 523 |
ExtractTemporaryFile(ExtractFileName(BitmapFileName)); |
| 524 | 524 |
|
| 525 | 525 |
Page.Surface.Color := clWhite; |
| 526 |
|
|
| 527 |
LabelWz := Tlabel.Create(Page); |
|
| 528 |
LabelWz.Top := Page.Surface.Top; |
|
| 529 |
LabelWz.Caption := 'To setup your account right click on the Pithos+ icon in the taskbar.'; |
|
| 530 |
LabelWz.Parent := Page.Surface; |
|
| 531 |
|
|
| 526 | 532 |
BitmapImage1 := TBitmapImage.Create(Page); |
| 527 | 533 |
BitmapImage1.width := Page.SurfaceWidth; |
| 528 |
BitmapImage1.height := PAge.SurfaceHeight;
|
|
| 534 |
BitmapImage1.height := Page.SurfaceHeight;
|
|
| 529 | 535 |
BitmapImage1.Bitmap.LoadFromFile(BitmapFileName); |
| 530 | 536 |
BitmapImage1.Left := 0 |
| 531 |
BitmapImage1.Top := Page.Surface.Top; |
|
| 537 |
BitmapImage1.Top := Page.Surface.Top + LabelWz.Height;
|
|
| 532 | 538 |
BitmapImage1.Parent := Page.Surface; |
| 533 | 539 |
|
| 534 |
LabelWz := Tlabel.Create(Page); |
|
| 535 |
LabelWz.Top := 0; |
|
| 536 |
LabelWz.Caption := 'To setup your account right click on the Pithos+ icon in the taskbar.'; |
|
| 537 |
LabelWz.Parent := Page.Surface; |
|
| 538 | 540 |
end; |
| 539 | 541 |
|
| 540 | 542 |
procedure InitializeWizard; |
| ... | ... | |
| 564 | 566 |
|
| 565 | 567 |
[Run] |
| 566 | 568 |
;Kill Running Task |
| 567 |
Filename: cmd; parameters: /c taskkill /f /im pithos.exe;Flags: runhidden |
|
| 568 |
Filename: cmd; parameters: /c taskkill /f /im pithos.client.WPF.exe;Flags: runhidden |
|
| 569 |
Filename: cmd; parameters: /c taskkill /f /im pithos.exe; Flags: runhidden
|
|
| 570 |
Filename: cmd; parameters: /c taskkill /f /im pithos.client.WPF.exe; Flags: runhidden
|
|
| 569 | 571 |
;Launch Redist |
| 570 | 572 |
Filename: {tmp}\dotNetFx40_Client_setup.exe; Description: Install Microsoft .Net Framework 4.0; Parameters: /q /noreboot; Flags: skipifdoesntexist; Check: ShouldInstalldotNET40
|
| 571 | 573 |
Filename: {app}\UninsHs.exe; Parameters: /r0=AppId,{language},{srcexe}; Flags: runminimized
|
Also available in: Unified diff