--- a/client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml Wed Jan 27 10:55:59 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml Thu Feb 04 16:38:04 2010 +0100
@@ -2,14 +2,17 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:View="clr-namespace:Iri.Modernisation.Controls.View"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
+ xmlns:Input="clr-namespace:SLExtensions.Input;assembly=SLExtensions"
xmlns:Converter="clr-namespace:Iri.Modernisation.Controls.Converter"
xmlns:SLExtensions_Data="clr-namespace:SLExtensions.Data;assembly=SLExtensions"
x:Class="Iri.Modernisation.Controls.View.BookTimeLine" Height="272" Width="640" Background="Transparent">
<UserControl.Resources>
<Converter:BoolToVisibility x:Key="BoolToVisibility"/>
<SLExtensions_Data:BoolConverter x:Key="BoolConverter"/>
+
</UserControl.Resources>
<StackPanel x:Name="BookTimeLinePanel" Background="Transparent">
<StackPanel x:Name="HeaderBookTimeLinePanel" Height="31" Orientation="Horizontal">
@@ -18,14 +21,16 @@
<TextBlock x:Name="BookTitleLabel" Text="{Binding Title, Mode=TwoWay}" TextWrapping="Wrap" Width="200" Margin="0,0,0,15" Height="18" HorizontalAlignment="Left" RenderTransformOrigin="0.5,0.5"/>
</StackPanel>
<ToggleButton x:Name="DisplayCommentButton" Content="Display" Width="88" IsChecked="True"/>
- <Slider x:Name="ScaleTimeLine" Height="31" HorizontalAlignment="Left" Margin="143,0,1,0" Width="138" Value="600" Minimum="600" Maximum="10000" />
+ <Button x:Name="saveAnnotationsButton" Content="Save" Width="60" Input:CommandService.Command="SaveAnnotations"/>
+ <Slider x:Name="ScaleTimeLine" Height="31" HorizontalAlignment="Left" Margin="143,0,1,0" Width="138" Value="{Binding ScaleValue, Mode=TwoWay}" Minimum="1" Maximum="10" />
+
</StackPanel>
<ScrollViewer x:Name="TimeLineScroller" HorizontalScrollBarVisibility="Visible" Margin="0,0,8,0" VerticalScrollBarVisibility="Disabled" >
- <StackPanel x:Name="TimeStripsPanel" Width="{Binding Value, ElementName=ScaleTimeLine, Mode=OneWay}" RenderTransformOrigin="0,0.5">
+ <StackPanel x:Name="TimeStripsPanel" Width="{Binding WidthTimeStrip}" RenderTransformOrigin="0,0.5" Background="#FF353535">
- <Slider x:Name="BookTimeLineSlider" Canvas.ZIndex="10" Height="31" d:LayoutOverrides="Height" Maximum="{Binding TotalDuration}" Value="{Binding Position,Mode=TwoWay}" MouseLeftButtonDown="BookTimeLineSlider_MouseLeftButtonDown" />
+ <View:ExtendedSlider x:Name="BookTimeLineSlider" Canvas.ZIndex="10" Height="31" d:LayoutOverrides="Height" Maximum="{Binding TotalDuration}" Value="{Binding Position,Mode=TwoWay}" />
<Canvas x:Name="BookTimeLineElementPanel" />
- <Canvas x:Name="BookTimeLineAnnotationPanel" Visibility="{Binding IsChecked, Converter={StaticResource BoolToVisibility}, ElementName=DisplayCommentButton, Mode=OneWay}" Margin="0,12,0,0" />
+ <Canvas x:Name="BookTimeLineAnnotationPanel" Visibility="{Binding IsChecked, Converter={StaticResource BoolToVisibility}, ElementName=DisplayCommentButton, Mode=OneWay}" Margin="0,20,0,0" />
<StackPanel Margin="0,80,0,0">
<!-- <TestSpectrogramme:Spectrogramme ColorBar="Red" x:Name="PolemicSpec" Height="20" Canvas.ZIndex="-2"/>
<TestSpectrogramme:Spectrogramme ColorBar="#00FF00" x:Name="AdhesionSpec" Height="20" Canvas.ZIndex="-2"/>