summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorsr55 <[email protected]>2014-09-05 22:35:20 +0000
committersr55 <[email protected]>2014-09-05 22:35:20 +0000
commit3bc51b0b0a02bda3346277ee3f26a96e6089ee19 (patch)
treeb6a8fdd48cb4df4dc9e75d453c9d0c9dbd781735 /win
parent4eccd975caa1d2ece174c70546da069df3e2ad08 (diff)
WinGui: The update checker will now show an update on 32bit versions of the app if the system supports the 64bit version, even if the version number is the same.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6393 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs5
-rw-r--r--win/CS/HandBrakeWPF/Views/OptionsView.xaml4
2 files changed, 8 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 504f692bc..85e74ed20 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -1680,6 +1680,11 @@ namespace HandBrakeWPF.ViewModels
this.UpdateMessage = "A New Update is Available!";
this.UpdateAvailable = true;
}
+ else if (Environment.Is64BitOperatingSystem && !System.Environment.Is64BitProcess)
+ {
+ this.UpdateMessage = "Your system supports the 64bit version of HandBrake! This offers performance and stability improvements over this 32bit version.";
+ this.UpdateAvailable = true;
+ }
else
{
this.UpdateMessage = "There are no new updates at this time.";
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index b36557a32..45a042136 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -375,9 +375,11 @@
<StackPanel Margin="20,10,0,0" Orientation="Horizontal">
<ProgressBar Minimum="0" Maximum="100" Height="20" Width="400" Value="{Binding DownloadProgressPercentage}"
Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" />
- <TextBlock Text="{Binding UpdateMessage}" Margin="10,0,10,0" VerticalAlignment="Center" />
+
</StackPanel>
+ <TextBlock Text="{Binding UpdateMessage}" Margin="20,5,10,0" VerticalAlignment="Center" TextWrapping="Wrap" />
+
</StackPanel>
<StackPanel Name="About" Orientation="Vertical" Margin="10,10,0,0"