Mercurial Mercurial > videolivre / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml
changeset 45 de06fa7242ae
parent 42 594fdedecf7f 
--- a/client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml	Fri Feb 12 12:04:11 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml	Fri Feb 12 12:24:46 2010 +0100
@@ -8,7 +8,7 @@
     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">
+	x:Class="Iri.Modernisation.Controls.View.BookTimeLine" Width="640" Background="Transparent">
 	<UserControl.Resources>
 		<Converter:BoolToVisibility x:Key="BoolToVisibility"/>
 		<SLExtensions_Data:BoolConverter x:Key="BoolConverter"/>
@@ -30,15 +30,8 @@
 			<StackPanel x:Name="TimeStripsPanel" Width="{Binding WidthTimeStrip}" RenderTransformOrigin="0,0.5" Background="#FF353535">
 				
 				<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,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"/>
-					<TestSpectrogramme:Spectrogramme ColorBar="Blue" x:Name="ReferenceSpec" Height="20" Canvas.ZIndex="-2"/>
-					<TestSpectrogramme:Spectrogramme ColorBar="Yellow" x:Name="QuestionSpec" Height="20" Canvas.ZIndex="-2"/>
-					<TestSpectrogramme:Spectrogramme ColorBar="Black" x:Name="GeneralSpec" Height="20" Canvas.ZIndex="-2"/> -->
-				</StackPanel>
+				<Canvas x:Name="BookTimeLineElementPanel" Height="20" />
+				<Canvas x:Name="BookTimeLineAnnotationPanel" Visibility="{Binding IsChecked, Converter={StaticResource BoolToVisibility}, ElementName=DisplayCommentButton, Mode=OneWay}" Margin="0,2,0,0" />
 			</StackPanel>
 		</ScrollViewer>
 	</StackPanel>
videolivre