# HG changeset patch
# User ARIAS Santiago
# Date 1256470725 -3600
# Node ID d70ee2002f756c6487c51c5f29f4e8a685286558
# Parent e78e40b9d761096b25b6d2815c261f1898fd6472
Thumb Timeline Rotation and Debug Closing Panels
diff -r e78e40b9d761 -r d70ee2002f75 src/FingersDance.Control.Player/UserControlPlayer.xaml.cs
--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs Sun Oct 18 17:42:21 2009 +0200
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs Sun Oct 25 12:38:45 2009 +0100
@@ -30,6 +30,7 @@
public event EventHandler PlayerOpened;
public event EventHandler PlayerStopOrPause;
+
public UserControlPlayer()
{
this.InitializeComponent();
@@ -74,17 +75,19 @@
{
MediaElementVideo.Pause();
if (PlayerStopOrPause != null)
- PlayerStopOrPause(this, new EventArgs());
+ PlayerStopOrPause(false, new EventArgs());
}
public void playerPlay()
{
MediaElementVideo.Play();
+ if (PlayerStopOrPause != null)
+ PlayerStopOrPause(true, new EventArgs());
}
public void playerStop()
{
MediaElementVideo.Stop();
if (PlayerStopOrPause != null)
- PlayerStopOrPause(this, new EventArgs());
+ PlayerStopOrPause(false, new EventArgs());
}
#endregion
@@ -99,6 +102,8 @@
try
{
MediaElementVideo.Play();
+ if (PlayerStopOrPause != null)
+ PlayerStopOrPause(true, new EventArgs());
}
catch (Exception ex) { }
}
@@ -108,6 +113,8 @@
try
{
MediaElementVideo.Pause();
+ if (PlayerStopOrPause != null)
+ PlayerStopOrPause(false, new EventArgs());
}
catch (Exception exx) { }
}
@@ -122,6 +129,8 @@
try
{
MediaElementVideo.Play();
+ if (PlayerStopOrPause != null)
+ PlayerStopOrPause(true, new EventArgs());
}
catch (Exception ex) { }
@@ -132,6 +141,8 @@
try
{
MediaElementVideo.Pause();
+ if (PlayerStopOrPause != null)
+ PlayerStopOrPause(false, new EventArgs());
}
catch (Exception exx) { }
//ButtonPlayPause.Background = FindResource("[Skin_1]_Play_button_xaml") as Brush;
diff -r e78e40b9d761 -r d70ee2002f75 src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs
--- a/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs Sun Oct 18 17:42:21 2009 +0200
+++ b/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs Sun Oct 25 12:38:45 2009 +0100
@@ -52,8 +52,11 @@
}
public void UserControlPlayer_PlayerStopOrPause(object sender, EventArgs e)
- {
-
+ {
+ try
+ {
+ userControlTimeLine.thumbRotation((bool)sender);
+ }catch(Exception ){}
}
#endregion
@@ -73,6 +76,7 @@
{
OnSuccessAnnotation(this, new EventArgs());
}
+
#endregion
diff -r e78e40b9d761 -r d70ee2002f75 src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml
--- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml Sun Oct 18 17:42:21 2009 +0200
+++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml Sun Oct 25 12:38:45 2009 +0100
@@ -797,6 +797,780 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r e78e40b9d761 -r d70ee2002f75 src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs
--- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs Sun Oct 18 17:42:21 2009 +0200
+++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs Sun Oct 25 12:38:45 2009 +0100
@@ -98,17 +98,18 @@
}
}
#endregion
-
-
- public UserControlTimeLine()
+ #region Constructors
+
+ public UserControlTimeLine()
{
this.InitializeComponent();
// Insert code required on object creation below this point.
-
- }
+
+ }
+ #endregion
public void initslider(double totalmillisecondsPar)
{
@@ -219,6 +220,14 @@
}
#endregion
+ public void thumbRotation(bool isplaying)
+ {
+ //Templateslider.Style.Setters["Template"]
+ if(isplaying)
+ slider.Style = FindResource("FingersDance.Control.Slider") as Style;
+ else
+ slider.Style = FindResource("SurfaceSliderStylePause") as Style;
+ }
public Boolean isAnnotationAccepted(AnnotationViewModel avm)
{
Boolean annotOk = true;
diff -r e78e40b9d761 -r d70ee2002f75 src/FingersDance/MainSurfaceWindow.xaml.cs
--- a/src/FingersDance/MainSurfaceWindow.xaml.cs Sun Oct 18 17:42:21 2009 +0200
+++ b/src/FingersDance/MainSurfaceWindow.xaml.cs Sun Oct 25 12:38:45 2009 +0100
@@ -490,6 +490,8 @@
}
}
root.Children.Remove(((UserControlClose)sender));
+ if (Panel1 == null && Panel2 == null && Panel3 == null && Panel4 == null)
+ _mainviewmodel.CloseSession();
}