diff options
Diffstat (limited to 'win/CS')
| -rw-r--r-- | win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs | 17 | ||||
| -rw-r--r-- | win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs | 22 | ||||
| -rw-r--r-- | win/CS/HandBrake10.sln | 1 | ||||
| -rw-r--r-- | win/CS/HandBrakeCS.csproj | 3 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs | 96 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/HandBrakeWPF.csproj | 7 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Installer/Installer.nsi | 1 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Installer/Installer64.nsi | 1 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl | 1 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl | 1 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 6 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs | 7 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/AudioView.xaml | 26 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/MainView.xaml | 9 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/SubtitlesView.xaml | 13 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/releasenotes.html | 29 | ||||
| -rw-r--r-- | win/CS/build.xml | 65 | ||||
| -rw-r--r-- | win/CS/build2.xml | 79 |
18 files changed, 247 insertions, 137 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs index 3fcf7cb5a..14a87bd00 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs @@ -7,6 +7,8 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
+using System.Collections.Generic;
+
namespace HandBrake.ApplicationServices.Model.Encoding
{
using System;
@@ -198,6 +200,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding this.encoder = value;
this.OnPropertyChanged("Encoder");
this.OnPropertyChanged("IsPassthru");
+ this.OnPropertyChanged("TrackReference");
}
}
@@ -235,6 +238,7 @@ namespace HandBrake.ApplicationServices.Model.Encoding {
this.mixDown = value;
this.OnPropertyChanged("MixDown");
+ this.OnPropertyChanged("TrackReference");
}
}
@@ -358,6 +362,19 @@ namespace HandBrake.ApplicationServices.Model.Encoding return false;
}
}
+
+ public bool IsLossless
+ {
+ get
+ {
+ return this.IsPassthru || this.Encoder == AudioEncoder.ffflac;
+ }
+ }
+
+ public AudioTrack TrackReference
+ {
+ get { return this; }
+ }
#endregion
}
}
\ No newline at end of file diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs index b1ae05a0d..ab716e5fd 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs @@ -7,6 +7,8 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
+using System.IO;
+
namespace HandBrake.ApplicationServices.Model.Encoding
{
using System;
@@ -38,6 +40,11 @@ namespace HandBrake.ApplicationServices.Model.Encoding /// </summary>
private Subtitle sourceTrack;
+ /// <summary>
+ /// Backing field for the srt file name.
+ /// </summary>
+ private string srtFileName;
+
#endregion
#region Constructors and Destructors
@@ -170,10 +177,23 @@ namespace HandBrake.ApplicationServices.Model.Encoding /// </summary>
public string SrtCharCode { get; set; }
+
/// <summary>
/// Gets or sets the SRT Filename
/// </summary>
- public string SrtFileName { get; set; }
+ public string SrtFileName
+ {
+ get
+ {
+ return srtFileName;
+ }
+
+ set
+ {
+ srtFileName = value;
+ this.NotifyOfPropertyChange(() => this.IsSrtSubtitle);
+ }
+ }
/// <summary>
/// Gets or sets the SRT Language
diff --git a/win/CS/HandBrake10.sln b/win/CS/HandBrake10.sln index 77462c94f..fb031213b 100644 --- a/win/CS/HandBrake10.sln +++ b/win/CS/HandBrake10.sln @@ -12,7 +12,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5CB7BC74-449C-4E95-98AB-E1E4387E514B}"
ProjectSection(SolutionItems) = preProject
build.xml = build.xml
- build2.xml = build2.xml
EndProjectSection
EndProject
Global
diff --git a/win/CS/HandBrakeCS.csproj b/win/CS/HandBrakeCS.csproj index dddd46cd3..d5ca0c4d6 100644 --- a/win/CS/HandBrakeCS.csproj +++ b/win/CS/HandBrakeCS.csproj @@ -9,7 +9,7 @@ <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Handbrake</RootNamespace>
- <AssemblyName>Handbrake</AssemblyName>
+ <AssemblyName>Handbrake_old</AssemblyName>
<ApplicationIcon>handbrakepineapple.ico</ApplicationIcon>
<StartupObject>Handbrake.Program</StartupObject>
<TargetZone>LocalIntranet</TargetZone>
@@ -43,6 +43,7 @@ <OutputPath>bin\x86\Debug\</OutputPath>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<DefineConstants>DEBUG;TRACE</DefineConstants>
+ <WarningLevel>1</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs new file mode 100644 index 000000000..cc1915e4b --- /dev/null +++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs @@ -0,0 +1,96 @@ +// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioBitrateConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// A Converter to provide the available audio bitrate options.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Audio
+{
+ using System;
+ using System.Globalization;
+ using System.Windows.Data;
+ using System.Collections.Generic;
+ using System.Linq;
+ using HandBrake.ApplicationServices.Model.Encoding;
+ using HandBrake.Interop.Model.Encoding;
+
+ /// <summary>
+ /// A Converter to provide the available audio bitrate options.
+ /// </summary>
+ public class AudioBitrateConverter : IValueConverter
+ {
+ /// <summary>
+ /// Converts source values to a value for the binding target. The data binding engine calls this method when it propagates the values from source bindings to the binding target.
+ /// </summary>
+ /// <returns>
+ /// A converted value.If the method returns null, the valid null value is used.A return value of <see cref="T:System.Windows.DependencyProperty"/>.<see cref="F:System.Windows.DependencyProperty.UnsetValue"/> indicates that the converter did not produce a value, and that the binding will use the <see cref="P:System.Windows.Data.BindingBase.FallbackValue"/> if it is available, or else will use the default value.A return value of <see cref="T:System.Windows.Data.Binding"/>.<see cref="F:System.Windows.Data.Binding.DoNothing"/> indicates that the binding does not transfer the value or use the <see cref="P:System.Windows.Data.BindingBase.FallbackValue"/> or the default value.
+ /// </returns>
+ /// <param name="value">
+ /// The value.
+ /// </param>
+ /// <param name="targetType">
+ /// The type of the binding target property.
+ /// </param>
+ /// <param name="parameter">
+ /// The converter parameter to use.
+ /// </param>
+ /// <param name="culture">
+ /// The culture to use in the converter.
+ /// </param>
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ // Base set of bitrates available.
+ List<int> bitrates = new List<int> { 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 640, 768 };
+
+ int max = 160;
+ AudioTrack track = value as AudioTrack;
+ if (track != null)
+ {
+ switch (track.Encoder)
+ {
+ case AudioEncoder.Faac:
+ case AudioEncoder.ffaac:
+ max = track.MixDown == Mixdown.SixChannelDiscrete ? 768 : 320;
+ break;
+ case AudioEncoder.Lame:
+ max = 320;
+ break;
+ case AudioEncoder.Vorbis:
+ max = 384;
+ break;
+ case AudioEncoder.Ac3:
+ max = 640;
+ break;
+ case AudioEncoder.Ac3Passthrough:
+ case AudioEncoder.DtsPassthrough:
+ case AudioEncoder.DtsHDPassthrough:
+ case AudioEncoder.AacPassthru:
+ case AudioEncoder.Mp3Passthru:
+ case AudioEncoder.Passthrough:
+ case AudioEncoder.ffflac:
+ max = 768; // Since we don't care, just set it to the max.
+ break;
+ default:
+ max = 768;
+ break;
+ }
+
+ // Bring the bitrate down in-line with the max.
+ if (track.Bitrate > max)
+ {
+ track.Bitrate = max;
+ }
+ }
+
+ return bitrates.Where(bitrate => bitrate <= max);
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index 77665c7f8..3ed921e6c 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -9,7 +9,7 @@ <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HandBrakeWPF</RootNamespace>
- <AssemblyName>HandBrake</AssemblyName>
+ <AssemblyName>Handbrake</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
@@ -110,6 +110,7 @@ <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
+ <Compile Include="Converters\Audio\AudioBitrateConverter.cs" />
<Compile Include="Converters\BooleanToHiddenVisibilityConverter.cs" />
<Compile Include="ViewModels\Interfaces\ITitleSpecificViewModel.cs" />
<Compile Include="ViewModels\TitleSpecificViewModel.cs" />
@@ -325,6 +326,10 @@ <Content Include="defaultsettings.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="releasenotes.html">
+ <SubType>Designer</SubType>
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Resource Include="Views\Images\Refresh.ico" />
<Resource Include="Views\Images\WarningSmall.png" />
<Resource Include="Views\Images\Complete.png" />
diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi index c19c0e2ab..0bf909b58 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer.nsi @@ -132,6 +132,7 @@ Section "Handbrake" SEC01 File "*.config"
File "*.xml"
File "*.pdb"
+ File ".html"
; Copy the standard doc set into the doc folder
SetOutPath "$INSTDIR\doc"
diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi index 9e6ff4872..ca7f4db83 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi @@ -133,6 +133,7 @@ Section "Handbrake" SEC01 File "*.config"
File "*.xml"
File "*.pdb"
+ File ".html"
; Copy the standard doc set into the doc folder
SetOutPath "$INSTDIR\doc"
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl index 07b9d6240..19429202d 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl @@ -132,6 +132,7 @@ Section "Handbrake" SEC01 File "*.config"
File "*.xml"
File "*.pdb"
+ File "*.html"
; Copy the standard doc set into the doc folder
SetOutPath "$INSTDIR\doc"
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl index 15c35d248..b6e874051 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl @@ -132,6 +132,7 @@ Section "Handbrake" SEC01 File "*.config"
File "*.xml"
File "*.pdb"
+ File ".html"
; Copy the standard doc set into the doc folder
SetOutPath "$INSTDIR\doc"
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 55b53ffa1..7b3fede44 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -1154,9 +1154,11 @@ namespace HandBrakeWPF.ViewModels /// <summary>
/// Show Release Notes
/// </summary>
- public void ReleaseNotes()
+ public void ShowReleaseNotes()
{
- Process.Start("https://forum.handbrake.fr/viewtopic.php?f=11&t=23843");
+ string path =
+ Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);
+ Process.Start(path + "\\releasenotes.html");
}
#endregion
diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs index a67bc293e..b4d8d65ab 100644 --- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs @@ -7,6 +7,8 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
+using System.IO;
+
namespace HandBrakeWPF.ViewModels
{
using System.Collections.Generic;
@@ -156,11 +158,12 @@ namespace HandBrakeWPF.ViewModels {
SubtitleTrack track = new SubtitleTrack
{
- SrtFileName = srtFile,
+ SrtFileName = Path.GetFileNameWithoutExtension(srtFile),
SrtOffset = 0,
SrtCharCode = "UTF-8",
SrtLang = "English",
- SubtitleType = SubtitleType.SRT
+ SubtitleType = SubtitleType.SRT,
+ SrtPath = srtFile
};
this.Task.SubtitleTracks.Add(track);
}
diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml index c8d3ba88e..ea112a750 100644 --- a/win/CS/HandBrakeWPF/Views/AudioView.xaml +++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml @@ -7,12 +7,14 @@ xmlns:cal="http://www.caliburnproject.org"
xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
xmlns:Conveters="clr-namespace:HandBrakeWPF.Converters"
- xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop" mc:Ignorable="d">
-
+ xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
+ xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio" mc:Ignorable="d">
+
<UserControl.Resources>
<Conveters:EnumComboConverter x:Key="enumComboConverter" />
<Conveters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
<Conveters:BooleanToHiddenVisibilityConverter x:Key="boolToHiddenVisConverter" />
+ <Audio:AudioBitrateConverter x:Key="audioBitrateConverter" />
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
@@ -86,31 +88,31 @@ <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
-
+
<Grid.RowDefinitions>
<RowDefinition Height="28" />
<RowDefinition Height="28" />
</Grid.RowDefinitions>
-
+
<!-- Row 1-->
<TextBlock Text="Source" FontWeight="Bold" Grid.Column="0" VerticalAlignment="Center" />
<ComboBox Width="100" Grid.Column="1" Margin="5,0,5,0" Height="22"
ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
SelectedItem="{Binding ScannedTrack}"/>
-
+
<TextBlock Text="Codec" FontWeight="Bold" Grid.Column="2" VerticalAlignment="Center" />
<ComboBox Width="100" Grid.Column="3" Margin="5,0,5,0" Height="22"
ItemsSource="{Binding DataContext.AudioEncoders, Converter={StaticResource enumComboConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
SelectedItem="{Binding Encoder, Converter={StaticResource enumComboConverter}}"/>
-
+
<TextBlock Text="Bitrate" FontWeight="Bold" Grid.Column="4" VerticalAlignment="Center"
Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
<ComboBox Width="70" Grid.Column="5" Margin="5,0,5,0" Height="22"
- ItemsSource="{Binding DataContext.AudioBitrates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
- SelectedItem="{Binding Bitrate}" IsEnabled="{Binding}"
+ SelectedItem="{Binding Bitrate}"
+ ItemsSource="{Binding TrackReference, Converter={StaticResource audioBitrateConverter}}"
Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
-
+
<TextBlock Text="Samplerate" FontWeight="Bold" Grid.Column="6" VerticalAlignment="Center"
Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
<ComboBox Width="70" Grid.Column="7" Margin="5,0,5,0" Height="22"
@@ -125,19 +127,19 @@ ItemsSource="{Binding DataContext.AudioMixdowns, Converter={StaticResource enumComboConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
SelectedItem="{Binding MixDown, Converter={StaticResource enumComboConverter}}"
Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
-
+
<TextBlock Text="DRC" FontWeight="Bold" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center"
Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
<NumericUpDown:NumericUpDown Name="drcNumericCtl" Width="45" Value="{Binding DRC, Mode=TwoWay}" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Left" Margin="5,0,5,0"
Minimum="0" Maximum="4" DecimalPlace="1" LargeChange="0.1" SmallChange="0.1"
Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}" />
-
+
<TextBlock Text="Gain" FontWeight="Bold" Grid.Column="4" Grid.Row="1" VerticalAlignment="Center"
Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
<NumericUpDown:NumericUpDown Name="gainNumericCtl" Width="45" Value="{Binding Gain, Mode=TwoWay}" Grid.Row="1" Grid.Column="5" HorizontalAlignment="Left" Margin="5,0,5,0"
Minimum="-20" Maximum="20" DecimalPlace="0" SmallChange="1" LargeChange="1"
Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}"/>
-
+
</Grid>
<!-- Delete -->
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index 2161ac590..6d8e57b98 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -332,11 +332,10 @@ <StatusBar Padding="0" Margin="0" Grid.Row="6" Height="32" Grid.ColumnSpan="2" VerticalAlignment="Bottom" >
<Label Content="{Binding Path=StatusLabel}" FontSize="11" Padding="0,0,0,5" VerticalAlignment="Center" />
- <TextBlock VerticalAlignment="Top" HorizontalAlignment="Right" Padding="0,0,0,5" FontSize="11" FontWeight="Bold">
- <Hyperlink NavigateUri="http://forum.handbrake.fr/viewtopic.php?f=11&t=23843" RequestNavigate="Hyperlink_RequestNavigate">
- BETA WPF UI Release Notes
- </Hyperlink>
- </TextBlock>
+ <Button Content="BETA WPF UI RELEASE NOTES" Micro:Message.Attach="[Event Click] = [Action ShowReleaseNotes]"
+ FontWeight="Bold" Foreground="Blue" Padding="0,0,0,5" FontSize="11"
+ />
+
</StatusBar>
diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml index 0611bba0b..99097a0b0 100644 --- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml +++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml @@ -5,7 +5,12 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:cal="http://www.caliburnproject.org"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
- xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop" mc:Ignorable="d">
+ xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
+ xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" mc:Ignorable="d">
+ <UserControl.Resources>
+ <Converters:BooleanToVisibilityConverter x:Key="booleanToVisConverter" />
+ </UserControl.Resources>
+
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -75,7 +80,11 @@ <TextBlock Text="Source" FontWeight="Bold" Grid.Column="0" VerticalAlignment="Center" />
<ComboBox Width="120" ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
- SelectedItem="{Binding SourceTrack}" Grid.Column="1" Margin="5,0,5,0" Height="22" />
+ SelectedItem="{Binding SourceTrack}" Grid.Column="1" Margin="5,0,5,0" Height="22"
+ Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=true}"/>
+ <TextBlock Text="{Binding SrtFileName}" Grid.Column="1" VerticalAlignment="Center"
+ Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=false}" />
+
<TextBlock Text="Forced Only" FontWeight="Bold" Grid.Column="2" VerticalAlignment="Center" />
<CheckBox Grid.Column="3" IsChecked="{Binding Forced}" VerticalAlignment="Center" Margin="5,0,5,0"/>
<TextBlock Text="Burn In" FontWeight="Bold" Grid.Column="4" VerticalAlignment="Center" />
diff --git a/win/CS/HandBrakeWPF/releasenotes.html b/win/CS/HandBrakeWPF/releasenotes.html new file mode 100644 index 000000000..0d8beced5 --- /dev/null +++ b/win/CS/HandBrakeWPF/releasenotes.html @@ -0,0 +1,29 @@ +<html>
+
+ <h3>HandBrake WPF Relase Notes</h3>
+
+
+ <font color="#FF0000">
+ <b>!!! Warning !!!</b>
+ </font><br /><br />
+
+ This build is only recommended for Advanced Users!!! <br /><br />
+
+
+ <b> Whats Changed?</b><br /><br />
+
+ The Windows User Interface for HandBrake is currently being ported to WPF from the older WinForms technology. <br />
+ While there are minor improvements in the new UI, it reamins largely the same as the old forms UI at this stage. <br /><br />
+
+ <b> How do I continue using the old winforms GUI?</b><br /><br />
+ Until the WPF UI stabilizes, the build will include a copy of the old winforms based UI. <br />
+ In the directory which you installed HandBrake, there is a file called HandBrake_old.exe which is the old forms UI. <br />
+ You can simply swap the exe file names over if you wish to continue running the old one.<br /><br />
+
+
+
+ <b>Bug Reports and Comments</b><br /><br />
+
+ Please keep any bug reports to <a href="https://forum.handbrake.fr/viewtopic.php?f=11&t=23843" target="_blank">this thread.</a>
+
+</html>
\ No newline at end of file diff --git a/win/CS/build.xml b/win/CS/build.xml index 872b9f202..549044838 100644 --- a/win/CS/build.xml +++ b/win/CS/build.xml @@ -5,38 +5,40 @@ It may be used under the terms of the GNU General Public License
HandBrake Build Scipt for usage with Jenkins.
- Usage: msbuild build.xml /p:Platform=x86 /t:ReleaseInstaller
+ Usage:
+ msbuild build.xml /p:Platform=x86 /t:Nightly
+ msbuild build.xml /p:Platform=x86 /t:Release
Reuqires: HandBrakeCli.exe to be in the release folder.
+
-->
<Project DefaultTargets="NightlyBuild" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
+
<!-- Setup -->
<PropertyGroup>
<Configuration>Release</Configuration>
</PropertyGroup>
-
+
<!-- Build all the main cproj files.-->
<ItemGroup>
<ProjectsToBuild Include="HandBrake.Interop\HandBrakeInterop\*proj" Exclude="$(MSBuildProjectFile)"/>
<ProjectsToBuild Include="HandBrake.ApplicationServices\*proj" Exclude="$(MSBuildProjectFile)"/>
- <ProjectsToBuild Include="HandBrakeCS.*proj" Exclude="$(MSBuildProjectFile)"/>
+ <ProjectsToBuild Include="HandBrakeWPF\HandBrakeWPF.*proj" Exclude="$(MSBuildProjectFile)"/>
+ <ProjectsToBuild Include="HandBrakeWPF\HandBrakeCS.*proj" Exclude="$(MSBuildProjectFile)"/>
</ItemGroup>
<!-- Dependencies -->
<PropertyGroup>
- <NightlyDependsOn>PreBuild;BuildRelease;NightlyPostBuildEvent</NightlyDependsOn>
+ <NightlyDependsOn>PreBuild;BuildRelease;NightlyPostBuild</NightlyDependsOn>
</PropertyGroup>
<PropertyGroup>
- <InstallDependsOn>PreBuild;BuildRelease;CreateReleasePostBuildEvent</InstallDependsOn>
+ <InstallDependsOn>PreBuild;BuildRelease;ReleasePostBuild</InstallDependsOn>
</PropertyGroup>
-
<!-- Builds /t: -->
- <Target Name="NightlyBuild" DependsOnTargets="$(NightlyDependsOn)"/>
- <Target Name="ReleaseInstaller" DependsOnTargets="$(InstallDependsOn)"/>
- <Target Name="AlphaRelease" DependsOnTargets="$(AlphaDependsOn)"/>
-
+ <Target Name="Nightly" DependsOnTargets="$(NightlyDependsOn)"/>
+ <Target Name="Release" DependsOnTargets="$(InstallDependsOn)"/>
+
<!-- Build All Components (Forms, WPF, ApplicationServices, Interop -->
<Target Name="BuildRelease">
<MSBuild Projects ="@(ProjectsToBuild)"
@@ -45,33 +47,34 @@ <Output ItemName="OutputFiles" TaskParameter="TargetOutputs"/>
</MSBuild>
</Target>
-
+
<!-- Pre Build Events -->
<Target Name="PreBuild">
+ <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs" />
+ <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi" />
+ <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi" />
+ <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Installer\Installer.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\Installer.nsi" />
+ <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Installer\Installer64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\Installer64.nsi" />
<Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />
</Target>
-
+
<!-- Post Build Events -->
- <Target Name="NightlyPostBuildEvent">
- <Exec Command="copy $(ProjectDir)Installer\MakeNightly.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x86'" />
- <Exec Command="copy $(ProjectDir)Installer\MakeNightly64.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x64'" />
-
- <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)bin\$(Platform)\Release /Y" />
- <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)bin\$(Platform)\Release\doc /I /Y" />
-
- <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
- <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
+ <Target Name="NightlyPostBuild">
+ <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x86'" />
+ <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x64'" />
+ <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\Release /Y" />
+ <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\Release\doc /I /Y" />
+ <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
+ <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
</Target>
- <Target Name="CreateReleasePostBuildEvent">
- <Exec Command="copy $(ProjectDir)Installer\Installer.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x86'" />
- <Exec Command="copy $(ProjectDir)Installer\Installer64.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x64'" />
-
- <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)bin\$(Platform)\Release /Y" />
- <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)bin\$(Platform)\Release\doc /I /Y" />
-
- <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\Installer.nsi" Condition="$(Platform) == 'x86'" />
- <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />
+ <Target Name="ReleasePostBuild">
+ <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\Installer.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x86'" />
+ <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\Installer64.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x64'" />
+ <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\Release /Y" />
+ <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\Release\doc /I /Y" />
+ <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\Installer.nsi" Condition="$(Platform) == 'x86'" />
+ <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />
</Target>
</Project>
\ No newline at end of file diff --git a/win/CS/build2.xml b/win/CS/build2.xml deleted file mode 100644 index feec535ba..000000000 --- a/win/CS/build2.xml +++ /dev/null @@ -1,79 +0,0 @@ -<!--
- build.xml
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License
-
- HandBrake Build Scipt for usage with Jenkins.
- Usage:
- msbuild build2.xml /p:Platform=x86 /t:Nightly
- msbuild build2.xml /p:Platform=x86 /t:Release
- Reuqires: HandBrakeCli.exe to be in the release folder.
-
--->
-<Project DefaultTargets="NightlyBuild" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
- <!-- Setup -->
- <PropertyGroup>
- <Configuration>Release</Configuration>
- </PropertyGroup>
-
- <!-- Build all the main cproj files.-->
- <ItemGroup>
- <ProjectsToBuild Include="HandBrake.Interop\HandBrakeInterop\*proj" Exclude="$(MSBuildProjectFile)"/>
- <ProjectsToBuild Include="HandBrake.ApplicationServices\*proj" Exclude="$(MSBuildProjectFile)"/>
- <ProjectsToBuild Include="HandBrakeWPF\HandBrakeWPF.*proj" Exclude="$(MSBuildProjectFile)"/>
- </ItemGroup>
-
- <!-- Dependencies -->
- <PropertyGroup>
- <NightlyDependsOn>PreBuild;BuildRelease;NightlyPostBuild</NightlyDependsOn>
- </PropertyGroup>
-
- <PropertyGroup>
- <InstallDependsOn>PreBuild;BuildRelease;ReleasePostBuild</InstallDependsOn>
- </PropertyGroup>
-
- <!-- Builds /t: -->
- <Target Name="Nightly" DependsOnTargets="$(NightlyDependsOn)"/>
- <Target Name="Release" DependsOnTargets="$(InstallDependsOn)"/>
-
- <!-- Build All Components (Forms, WPF, ApplicationServices, Interop -->
- <Target Name="BuildRelease">
- <MSBuild Projects ="@(ProjectsToBuild)"
- ContinueOnError ="false"
- Properties="Configuration=$(Configuration)" >
- <Output ItemName="OutputFiles" TaskParameter="TargetOutputs"/>
- </MSBuild>
- </Target>
-
- <!-- Pre Build Events -->
- <Target Name="PreBuild">
- <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs" />
- <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi" />
- <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi" />
- <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Installer\Installer.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\Installer.nsi" />
- <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrakeWPF\Installer\Installer64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\Installer64.nsi" />
- <Exec Command="subwcrev.exe $(ProjectDir). $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />
- </Target>
-
- <!-- Post Build Events -->
- <Target Name="NightlyPostBuild">
- <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x86'" />
- <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x64'" />
- <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\Release /Y" />
- <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\Release\doc /I /Y" />
- <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
- <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
- </Target>
-
- <Target Name="ReleasePostBuild">
- <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\Installer.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x86'" />
- <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\Installer64.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x64'" />
- <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\Release /Y" />
- <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\Release\doc /I /Y" />
- <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\Installer.nsi" Condition="$(Platform) == 'x86'" />
- <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />
- </Target>
-
-</Project>
\ No newline at end of file |